tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

道具时限类道具修改

This commit is contained in:
kxdd 2024-04-26 17:46:21 +08:00
parent e2e2a446bf
commit ec0d303cb6
10 changed files with 1330 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/DB_GameItem.dat
View File

Binary file not shown.

1196
data/DB_GameItem.json
View File

File diff suppressed because it is too large Load Diff

204
protocol/server/server.pb.go
View File

@ -392,7 +392,7 @@ func (SGBindGroupTag_OpCode) EnumDescriptor() ([]byte, []int) {
return file_server_proto_rawDescGZIP(), []int{0, 0}
}
// PACKET_SG_BINDGROUPTAG
//PACKET_SG_BINDGROUPTAG
type SGBindGroupTag struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -456,7 +456,7 @@ func (x *SGBindGroupTag) GetTags() []string {
return nil
}
// PACKET_SS_CUSTOMTAG_MULTICAST
//PACKET_SS_CUSTOMTAG_MULTICAST
type SSCustomTagMulticast struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -567,7 +567,7 @@ func (x *OpResultParam) GetParamString() string {
return ""
}
// PACKET_GB_CUR_LOAD
//PACKET_GB_CUR_LOAD
type ServerLoad struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -631,7 +631,7 @@ func (x *ServerLoad) GetCurLoad() int32 {
return 0
}
// PACKET_GB_STATE_SWITCH
//PACKET_GB_STATE_SWITCH
type ServerStateSwitch struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -687,7 +687,7 @@ func (x *ServerStateSwitch) GetSrvId() int32 {
return 0
}
// PACKET_WG_SERVER_STATE
//PACKET_WG_SERVER_STATE
type ServerState struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -735,7 +735,7 @@ func (x *ServerState) GetSrvState() int32 {
return 0
}
// PACKET_MS_SRVCTRL
//PACKET_MS_SRVCTRL
type ServerCtrl struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -791,7 +791,7 @@ func (x *ServerCtrl) GetParams() []*OpResultParam {
return nil
}
// PACKET_SC_NOTICE
//PACKET_SC_NOTICE
type ServerNotice struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -839,7 +839,7 @@ func (x *ServerNotice) GetText() string {
return ""
}
// PACKET_WG_CREATESCENE
//PACKET_WG_CREATESCENE
type WGCreateScene struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1063,7 +1063,7 @@ func (x *WGCreateScene) GetChessRank() []int32 {
return nil
}
// PACKET_WG_DESTROYSCENE
//PACKET_WG_DESTROYSCENE
type WGDestroyScene struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1119,7 +1119,7 @@ func (x *WGDestroyScene) GetIsCompleted() bool {
return false
}
// PACKET_GW_DESTROYSCENE
//PACKET_GW_DESTROYSCENE
type GWDestroyScene struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1175,7 +1175,7 @@ func (x *GWDestroyScene) GetIsCompleted() bool {
return false
}
// PACKET_WG_GRACE_DESTROYSCENE
//PACKET_WG_GRACE_DESTROYSCENE
type WGGraceDestroyScene struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1229,8 +1229,7 @@ type ItemParam struct {
unknownFields protoimpl.UnknownFields
ItemNum int64 `protobuf:"varint,1,opt,name=ItemNum,proto3" json:"ItemNum,omitempty"` // 物品数量
ObtainTime int64 `protobuf:"varint,2,opt,name=ObtainTime,proto3" json:"ObtainTime,omitempty"` //获取的时间
ExpireTime int64 `protobuf:"varint,3,opt,name=ExpireTime,proto3" json:"ExpireTime,omitempty"` //有效期截止时间
ExpireTime int64 `protobuf:"varint,2,opt,name=ExpireTime,proto3" json:"ExpireTime,omitempty"` //有效期截止时间
}
func (x *ItemParam) Reset() {
@ -1272,13 +1271,6 @@ func (x *ItemParam) GetItemNum() int64 {
return 0
}
func (x *ItemParam) GetObtainTime() int64 {
if x != nil {
return x.ObtainTime
}
return 0
}
func (x *ItemParam) GetExpireTime() int64 {
if x != nil {
return x.ExpireTime
@ -1341,8 +1333,8 @@ func (x *RebateTask) GetRebateGameCfg() []string {
return nil
}
// PACKET_WG_PLAYERENTER
// PACKET_WG_AUDIENCEENTER
//PACKET_WG_PLAYERENTER
//PACKET_WG_AUDIENCEENTER
type WGPlayerEnter struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1534,8 +1526,8 @@ func (x *WGPlayerEnter) GetRankScore() map[int32]int64 {
return nil
}
// 从观众席坐到座位
// PACKET_WG_AUDIENCESIT
//从观众席坐到座位
//PACKET_WG_AUDIENCESIT
type WGAudienceSit struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1607,7 +1599,7 @@ func (x *WGAudienceSit) GetPos() int32 {
return 0
}
// PACKET_WG_PLAYERRETURN
//PACKET_WG_PLAYERRETURN
type WGPlayerReturn struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1679,8 +1671,8 @@ func (x *WGPlayerReturn) GetEnterTs() int64 {
return 0
}
// PACKET_GW_PLAYERLEAVE
// PACKET_GW_AUDIENCELEAVE
//PACKET_GW_PLAYERLEAVE
//PACKET_GW_AUDIENCELEAVE
type GWPlayerLeave struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1872,7 +1864,7 @@ func (x *GWPlayerLeave) GetRankScore() map[int32]int64 {
return nil
}
// PACKET_WG_PLAYERDROPLINE
//PACKET_WG_PLAYERDROPLINE
type WGPlayerDropLine struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1928,7 +1920,7 @@ func (x *WGPlayerDropLine) GetSceneId() int32 {
return 0
}
// PACKET_WG_PLAYERREHOLD
//PACKET_WG_PLAYERREHOLD
type WGPlayerRehold struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2000,7 +1992,7 @@ func (x *WGPlayerRehold) GetGateSid() int64 {
return 0
}
// PACKET_GW_BILLEDROOMCARD
//PACKET_GW_BILLEDROOMCARD
type GWBilledRoomCard struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2056,7 +2048,7 @@ func (x *GWBilledRoomCard) GetSnId() []int32 {
return nil
}
// PACKET_GG_PLAYERSESSIONBIND
//PACKET_GG_PLAYERSESSIONBIND
type GGPlayerSessionBind struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2144,7 +2136,7 @@ func (x *GGPlayerSessionBind) GetPlatform() string {
return ""
}
// PACKET_GG_PLAYERSESSIONUNBIND
//PACKET_GG_PLAYERSESSIONUNBIND
type GGPlayerSessionUnBind struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2374,7 +2366,7 @@ func (x *ReplayPlayerData) GetCoin() int64 {
return 0
}
// 录像回放相关
//录像回放相关
type ReplayRecord struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2684,7 +2676,7 @@ func (x *GRReplaySequene) GetDatasVer() int32 {
return 0
}
// PACKET_WR_LoginRec
//PACKET_WR_LoginRec
type WRLoginRec struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2780,7 +2772,7 @@ func (x *WRLoginRec) GetLogId() string {
return ""
}
// PACKET_WR_GameDetail
//PACKET_WR_GameDetail
type WRGameDetail struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2828,7 +2820,7 @@ func (x *WRGameDetail) GetGameDetail() []byte {
return nil
}
// PACKET_WR_PlayerData
//PACKET_WR_PlayerData
type WRPlayerData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2884,7 +2876,7 @@ func (x *WRPlayerData) GetPlayerData() []byte {
return nil
}
// PACKET_WT_PlayerPay
//PACKET_WT_PlayerPay
type WTPlayerPay struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -3027,7 +3019,7 @@ func (x *PlayerGameRec) GetOtherParams() []int32 {
return nil
}
// PACKET_GW_GAMEREC
//PACKET_GW_GAMEREC
type GWGameRec struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -3107,7 +3099,7 @@ func (x *GWGameRec) GetReplayCode() string {
return ""
}
// PACKET_GW_SCENESTART
//PACKET_GW_SCENESTART
type GWSceneStart struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -3234,15 +3226,13 @@ func (x *PlayerCtx) GetCoin() int64 {
return 0
}
// 该协议废弃掉,统一由
// PACKET_GW_SCENEEND
//
// message GWSceneEnd {
// int32 GameFreeId = 1;
// repeated PlayerCtx Players = 2;
// }
//
// PACKET_GW_SCFISHRECORD
//该协议废弃掉,统一由
//PACKET_GW_SCENEEND
//message GWSceneEnd {
// int32 GameFreeId = 1;
// repeated PlayerCtx Players = 2;
//}
//PACKET_GW_SCFISHRECORD
type FishRecord struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -3361,8 +3351,8 @@ func (x *GWFishRecord) GetFishRecords() []*FishRecord {
return nil
}
// 场景状态
// PACKET_GW_SCENESTATE
//场景状态
//PACKET_GW_SCENESTATE
type GWSceneState struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -3426,7 +3416,7 @@ func (x *GWSceneState) GetFishing() int32 {
return 0
}
// PACKET_WR_INVITEROBOT
//PACKET_WR_INVITEROBOT
type WRInviteRobot struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -3514,7 +3504,7 @@ func (x *WRInviteRobot) GetNeedAwait() bool {
return false
}
// PACKET_WR_INVITECREATEROOM
//PACKET_WR_INVITECREATEROOM
type WRInviteCreateRoom struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -3570,7 +3560,7 @@ func (x *WRInviteCreateRoom) GetMatchId() int32 {
return 0
}
// PACKET_WG_AGENTKICKOUTPLAYER
//PACKET_WG_AGENTKICKOUTPLAYER
type WGAgentKickOutPlayer struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -3642,7 +3632,7 @@ func (x *WGAgentKickOutPlayer) GetAgentSid() int64 {
return 0
}
// PACKET_WD_DATANALYSIS
//PACKET_WD_DATANALYSIS
type WDDataAnalysis struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -3950,8 +3940,8 @@ func (x *GNPlayerParam) GetPlayerdata() []*RobotData {
return nil
}
// PACKET_GW_REBUILDSCENE
// 重建场景关系
//PACKET_GW_REBUILDSCENE
//重建场景关系
type GWRebuildScene struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -4007,7 +3997,7 @@ func (x *GWRebuildScene) GetPlayerIds() []int32 {
return nil
}
// PACKET_WG_REBIND_SNID 1122
//PACKET_WG_REBIND_SNID 1122
type WGRebindPlayerSnId struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -4063,7 +4053,7 @@ func (x *WGRebindPlayerSnId) GetNewSnId() int32 {
return 0
}
// PACKET_GW_PLAYERSTATE
//PACKET_GW_PLAYERSTATE
type GWPlayerFlag struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -4127,8 +4117,8 @@ func (x *GWPlayerFlag) GetFlag() int32 {
return 0
}
// 玩家操作返回
// PACKET_WG_RECHARGE
//玩家操作返回
//PACKET_WG_RECHARGE
type WGHundredOp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -4192,7 +4182,7 @@ func (x *WGHundredOp) GetParams() []int64 {
return nil
}
// 系统广播
//系统广播
type GWNewNotice struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -4715,8 +4705,8 @@ func (x *GWAutoRelieveWBLevel) GetSnId() int32 {
return 0
}
// PACKET_GW_SCENEPLAYERLOG
// 通知world房间里都是谁跟谁打牌的，配桌用的数据
//PACKET_GW_SCENEPLAYERLOG
//通知world房间里都是谁跟谁打牌的，配桌用的数据
type GWScenePlayerLog struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -4788,7 +4778,7 @@ func (x *GWScenePlayerLog) GetIsGameing() []bool {
return nil
}
// PACKET_GW_PLAYERFORCELEAVE
//PACKET_GW_PLAYERFORCELEAVE
type GWPlayerForceLeave struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -4860,7 +4850,7 @@ func (x *GWPlayerForceLeave) GetEnterTs() int64 {
return 0
}
// PACKET_GW_PLAYERDATA
//PACKET_GW_PLAYERDATA
type PlayerData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -5067,7 +5057,7 @@ func (x *GWPlayerData) GetSceneId() int32 {
return 0
}
// PACKET_GW_PLAYERWINSOCORE
//PACKET_GW_PLAYERWINSOCORE
type PlayerWinScore struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -5399,7 +5389,7 @@ func (x *WGSyncPlayerSafeBoxCoin) GetSafeBoxCoin() int64 {
return 0
}
// PACKET_WG_CLUB_MESSAGE
//PACKET_WG_CLUB_MESSAGE
type WGClubMessage struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -5471,7 +5461,7 @@ func (x *WGClubMessage) GetDBGameFree() *DB_GameFree {
return nil
}
// datasrv=>worldsrv用户在三方平台的流水信息
//datasrv=>worldsrv用户在三方平台的流水信息
type DWThirdRebateMessage struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -5678,7 +5668,7 @@ func (x *DWThirdRoundMessage) GetPlatform() int32 {
return 0
}
// worldsrv=>datasrv确认信息
//worldsrv=>datasrv确认信息
type WDACKThirdRebateMessage struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -5734,7 +5724,7 @@ func (x *WDACKThirdRebateMessage) GetResult() int32 {
return 0
}
// PACKET_GW_GAMESTATELOG
//PACKET_GW_GAMESTATELOG
type GWGameStateLog struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -5798,7 +5788,7 @@ func (x *GWGameStateLog) GetLogCnt() int32 {
return 0
}
// PACKET_GW_GAMESTATE
//PACKET_GW_GAMESTATE
type GWGameState struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -5878,7 +5868,7 @@ func (x *GWGameState) GetBankerListNum() int32 {
return 0
}
// PACKET_GW_JACKPOTLIST
//PACKET_GW_JACKPOTLIST
type GWGameJackList struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -5982,7 +5972,7 @@ func (x *GWGameJackList) GetName() string {
return ""
}
// PACKET_GW_JACKPOTCOIN
//PACKET_GW_JACKPOTCOIN
type GWGameJackCoin struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -6038,7 +6028,7 @@ func (x *GWGameJackCoin) GetCoin() []int64 {
return nil
}
// PACKET_GW_NICEIDREBIND
//PACKET_GW_NICEIDREBIND
type WGNiceIdRebind struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -6157,7 +6147,7 @@ func (x *PLAYERWINCOININFO) GetWinCoin() int32 {
return 0
}
// PACKET_GW_PLAYERWINCOIN
//PACKET_GW_PLAYERWINCOIN
type GWPLAYERWINCOIN struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -6205,7 +6195,7 @@ func (x *GWPLAYERWINCOIN) GetPlayer() []*PLAYERWINCOININFO {
return nil
}
// PACKET_GW_PLAYERAUTOMARKTAG
//PACKET_GW_PLAYERAUTOMARKTAG
type GWPlayerAutoMarkTag struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -6261,7 +6251,7 @@ func (x *GWPlayerAutoMarkTag) GetTag() int32 {
return 0
}
// PACKET_WG_INVITEROBENTERCOINSCENEQUEUE
//PACKET_WG_INVITEROBENTERCOINSCENEQUEUE
type WGInviteRobEnterCoinSceneQueue struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -6325,7 +6315,7 @@ func (x *WGInviteRobEnterCoinSceneQueue) GetRobNum() int32 {
return 0
}
// PACKET_WG_GAMEFORCESTART
//PACKET_WG_GAMEFORCESTART
type WGGameForceStart struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -6507,7 +6497,7 @@ func (x *ProfitControlPlatformCfg) GetGameCfg() []*ProfitControlGameCfg {
return nil
}
// PACKET_WG_PROFITCONTROL_CORRECT
//PACKET_WG_PROFITCONTROL_CORRECT
type WGProfitControlCorrect struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -6555,7 +6545,7 @@ func (x *WGProfitControlCorrect) GetCfg() []*ProfitControlPlatformCfg {
return nil
}
// PACKET_GW_CHANGESCENEEVENT
//PACKET_GW_CHANGESCENEEVENT
type GWChangeSceneEvent struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -6823,7 +6813,7 @@ func (x *PlayerMatchCoin) GetCoin() int32 {
return 0
}
// PACKET_GW_PLAYERMATCHBILLED
//PACKET_GW_PLAYERMATCHBILLED
type GWPlayerMatchBilled struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -6895,7 +6885,7 @@ func (x *GWPlayerMatchBilled) GetWinPos() int32 {
return 0
}
// PACKET_GW_PLAYERMATCHGRADE
//PACKET_GW_PLAYERMATCHGRADE
type GWPlayerMatchGrade struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -6983,8 +6973,8 @@ func (x *GWPlayerMatchGrade) GetPlayers() []*PlayerMatchCoin {
return nil
}
// 玩家退赛
// PACKET_WG_PLAYERQUITMATCH
//玩家退赛
//PACKET_WG_PLAYERQUITMATCH
type WGPlayerQuitMatch struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7048,8 +7038,8 @@ func (x *WGPlayerQuitMatch) GetMatchId() int32 {
return 0
}
// 比赛房间底分变化
// PACKET_WG_SCENEMATCHBASECHANGE
//比赛房间底分变化
//PACKET_WG_SCENEMATCHBASECHANGE
type WGSceneMatchBaseChange struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7129,7 +7119,7 @@ func (x *WGSceneMatchBaseChange) GetNextTs() int32 {
return 0
}
// PACKET_SS_REDIRECTTOPLAYER
//PACKET_SS_REDIRECTTOPLAYER
type SSRedirectToPlayer struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7201,7 +7191,7 @@ func (x *SSRedirectToPlayer) GetData() []byte {
return nil
}
// PACKET_WG_INVITEMATCHROB
//PACKET_WG_INVITEMATCHROB
type WGInviteMatchRob struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7344,7 +7334,7 @@ func (x *GameInfo) GetGameType() int32 {
return 0
}
// PACKET_WG_GAMEJACKPOT
//PACKET_WG_GAMEJACKPOT
type WGGameJackpot struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7520,7 +7510,7 @@ func (x *BigWinHistoryInfo) GetCards() []int32 {
return nil
}
// PACKET_WG_PLAYERENTER_MINIGAME
//PACKET_WG_PLAYERENTER_MINIGAME
type WGPlayerEnterMiniGame struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7640,7 +7630,7 @@ func (x *WGPlayerEnterMiniGame) GetSingleAdjust() []byte {
return nil
}
// PACKET_WG_PLAYERLEAVE_MINIGAME
//PACKET_WG_PLAYERLEAVE_MINIGAME
type WGPlayerLeaveMiniGame struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7712,7 +7702,7 @@ func (x *WGPlayerLeaveMiniGame) GetSceneId() int32 {
return 0
}
// PACKET_WG_PlayerLEAVE
//PACKET_WG_PlayerLEAVE
type WGPlayerLeave struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7760,7 +7750,7 @@ func (x *WGPlayerLeave) GetSnId() int32 {
return 0
}
// PACKET_GW_PLAYERLEAVE_MINIGAME
//PACKET_GW_PLAYERLEAVE_MINIGAME
type GWPlayerLeaveMiniGame struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7840,7 +7830,7 @@ func (x *GWPlayerLeaveMiniGame) GetPlayerData() []byte {
return nil
}
// PACKET_GW_DESTROYMINISCENE
//PACKET_GW_DESTROYMINISCENE
type GWDestroyMiniScene struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7888,7 +7878,7 @@ func (x *GWDestroyMiniScene) GetSceneId() int32 {
return 0
}
// PACKET_GR_DESTROYSCENE
//PACKET_GR_DESTROYSCENE
type GRDestroyScene struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7936,7 +7926,7 @@ func (x *GRDestroyScene) GetSceneId() int32 {
return 0
}
// 失效的机器人账号
//失效的机器人账号
type RWAccountInvalid struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -7984,7 +7974,7 @@ func (x *RWAccountInvalid) GetAcc() string {
return ""
}
// PACKET_WG_DTROOMINFO
//PACKET_WG_DTROOMINFO
type WGDTRoomInfo struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -8198,7 +8188,7 @@ func (x *EResult) GetResult() int32 {
return 0
}
// PACKET_GW_DTROOMINFO
//PACKET_GW_DTROOMINFO
type GWDTRoomInfo struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -8350,7 +8340,7 @@ func (x *GWDTRoomInfo) GetTDCoin() int32 {
return 0
}
// PACKET_WG_DTROOMRESULTS
//PACKET_WG_DTROOMRESULTS
type WGRoomResults struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -8422,7 +8412,7 @@ func (x *WGRoomResults) GetDataKey() string {
return ""
}
// PACKET_GW_DTROOMRESULTS
//PACKET_GW_DTROOMRESULTS
type GWRoomResults struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -8486,7 +8476,7 @@ func (x *GWRoomResults) GetMsg() string {
return ""
}
// PACKET_GW_ADDSINGLEADJUST
//PACKET_GW_ADDSINGLEADJUST
type GWAddSingleAdjust struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -8550,7 +8540,7 @@ func (x *GWAddSingleAdjust) GetGameFreeId() int32 {
return 0
}
// PACKET_WG_SINGLEADJUST
//PACKET_WG_SINGLEADJUST
type WGSingleAdjust struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -8614,7 +8604,7 @@ func (x *WGSingleAdjust) GetPlayerSingleAdjust() []byte {
return nil
}
// PACKET_WG_WBCtrlCfg
//PACKET_WG_WBCtrlCfg
type WbCtrlCfg struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -8802,13 +8792,11 @@ var file_server_proto_rawDesc = []byte{
0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x49, 0x73, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
0x74, 0x65, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x57, 0x47, 0x47, 0x72, 0x61, 0x63, 0x65, 0x44, 0x65,
0x73, 0x74, 0x72, 0x6f, 0x79, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x49, 0x64,
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x49, 0x64, 0x73, 0x22, 0x65, 0x0a, 0x09,
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x49, 0x64, 0x73, 0x22, 0x45, 0x0a, 0x09,
0x49, 0x74, 0x65, 0x6d, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65,
0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d,
0x4e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x4f, 0x62, 0x74, 0x61, 0x69, 0x6e, 0x54, 0x69, 0x6d,
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x4f, 0x62, 0x74, 0x61, 0x69, 0x6e, 0x54,
0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d,
0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54,
0x4e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d,
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54,
0x69, 0x6d, 0x65, 0x22, 0x56, 0x0a, 0x0a, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x54, 0x61, 0x73,
0x6b, 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x53, 0x77, 0x69, 0x74, 0x63,
0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x53,

3
protocol/server/server.proto
View File

@ -205,8 +205,7 @@ message WGGraceDestroyScene {
message ItemParam {
int64 ItemNum = 1; // 物品数量
int64 ObtainTime = 2; //获取的时间
int64 ExpireTime = 3; //有效期截止时间
int64 ExpireTime = 2; //有效期截止时间
}
message RebateTask {

66
protocol/shop/shop.pb.go
View File

@ -20,7 +20,7 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
// 操作结果
//操作结果
type OpResultCode int32
const (
@ -199,7 +199,7 @@ func (SPacketID) EnumDescriptor() ([]byte, []int) {
return file_shop_proto_rawDescGZIP(), []int{1}
}
// 商品信息
//商品信息
type ShopInfo struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -491,7 +491,7 @@ func (x *ShopInfo) GetAmountFinal() int64 {
return 0
}
// PACKET_CS_SHOP_INFO
//PACKET_CS_SHOP_INFO
type CSShopInfo struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -539,7 +539,7 @@ func (x *CSShopInfo) GetNowLocation() int32 {
return 0
}
// PACKET_SC_SHOP_INFO
//PACKET_SC_SHOP_INFO
type SCShopInfo struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -587,7 +587,7 @@ func (x *SCShopInfo) GetInfos() []*ShopInfo {
return nil
}
// PACKET_CS_SHOP_ADLOOKED
//PACKET_CS_SHOP_ADLOOKED
type CSAdLooked struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -651,7 +651,7 @@ func (x *CSAdLooked) GetPosition() int32 {
return 0
}
// PACKET_SC_SHOP_ADLOOKED
//PACKET_SC_SHOP_ADLOOKED
type SCAdLooked struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -707,7 +707,7 @@ func (x *SCAdLooked) GetShopInfo() *ShopInfo {
return nil
}
// PACKET_CS_SHOP_VCPAYSHOP
//PACKET_CS_SHOP_VCPAYSHOP
type CSVCPayShop struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -779,7 +779,7 @@ func (x *CSVCPayShop) GetPosition() int32 {
return 0
}
// PACKET_SC_SHOP_VCPAYSHOP
//PACKET_SC_SHOP_VCPAYSHOP
type SCVCPayShop struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -906,8 +906,8 @@ func (x *SCNotifyGiveCoinInfo) GetGiveTag() int32 {
return 0
}
// 商城兑换记录
// PACKET_CS_SHOP_EXCHANGERECORD
//商城兑换记录
//PACKET_CS_SHOP_EXCHANGERECORD
type CSShopExchangeRecord struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1066,7 +1066,7 @@ func (x *ShopExchangeRecord) GetGoodsId() int32 {
return 0
}
// PACKET_SC_SHOP_EXCHANGERECORD
//PACKET_SC_SHOP_EXCHANGERECORD
type SCShopExchangeRecord struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1138,8 +1138,8 @@ func (x *SCShopExchangeRecord) GetInfos() []*ShopExchangeRecord {
return nil
}
// 商城兑换
// PACKET_CS_SHOP_EXCHANGERECORD
//商城兑换
//PACKET_CS_SHOP_EXCHANGERECORD
type CSShopExchange struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1290,7 +1290,7 @@ func (x *SCShopExchange) GetOrderId() string {
return ""
}
// PACKET_CS_SHOP_EXCHANGELIST
//PACKET_CS_SHOP_EXCHANGELIST
type CSShopExchangeList struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1574,7 +1574,7 @@ func (x *SCShopExchangeList) GetInfos() []*ShopExchangeInfo {
return nil
}
// PACKET_CSPAYINFO
//PACKET_CSPAYINFO
type CSPayInfo struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1662,7 +1662,7 @@ func (x *CSPayInfo) GetExchangeNum() int32 {
return 0
}
// PACKET_SCPAYINFO
//PACKET_SCPAYINFO
type SCPayInfo struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1718,7 +1718,7 @@ func (x *SCPayInfo) GetUrl() string {
return ""
}
// PACKET_CSGETPAYINFOLIST
//PACKET_CSGETPAYINFOLIST
type CSGetPayInfoList struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1771,9 +1771,8 @@ type ItemInfo struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
ItemId int32 `protobuf:"varint,1,opt,name=ItemId,proto3" json:"ItemId,omitempty"`
ItemNum int64 `protobuf:"varint,2,opt,name=ItemNum,proto3" json:"ItemNum,omitempty"`
ExpireTime int64 `protobuf:"varint,3,opt,name=ExpireTime,proto3" json:"ExpireTime,omitempty"`
ItemId int32 `protobuf:"varint,1,opt,name=ItemId,proto3" json:"ItemId,omitempty"`
ItemNum int64 `protobuf:"varint,2,opt,name=ItemNum,proto3" json:"ItemNum,omitempty"`
}
func (x *ItemInfo) Reset() {
@ -1822,13 +1821,6 @@ func (x *ItemInfo) GetItemNum() int64 {
return 0
}
func (x *ItemInfo) GetExpireTime() int64 {
if x != nil {
return x.ExpireTime
}
return 0
}
type PayInfoList struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1924,7 +1916,7 @@ func (x *PayInfoList) GetTs() int64 {
return 0
}
// PACKET_SCGETPAYINFOLIST
//PACKET_SCGETPAYINFOLIST
type SCGetPayInfoList struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -1972,8 +1964,8 @@ func (x *SCGetPayInfoList) GetInfo() []*PayInfoList {
return nil
}
// 玩家添加地址
// PACKET_CSPLAYERADDR
//玩家添加地址
//PACKET_CSPLAYERADDR
type CSPlayerAddr struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2037,7 +2029,7 @@ func (x *CSPlayerAddr) GetId() int32 {
return 0
}
// PACKET_SCPLAYEADDRS
//PACKET_SCPLAYEADDRS
type SCGetPlayerAddrs struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2140,8 +2132,8 @@ func (x *AddrData) GetAddr() string {
return ""
}
// VIP商城刷新物品
// PACKET_CS_UPDATE_VIP_SHOP
//VIP商城刷新物品
//PACKET_CS_UPDATE_VIP_SHOP
type CSUpdateVipShop struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2180,8 +2172,8 @@ func (*CSUpdateVipShop) Descriptor() ([]byte, []int) {
return file_shop_proto_rawDescGZIP(), []int{26}
}
// VIP商城刷新物品返回
// PACKET_SC_UPDATE_VIP_SHOP
//VIP商城刷新物品返回
//PACKET_SC_UPDATE_VIP_SHOP
type SCUpdateVipShop struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -2439,12 +2431,10 @@ var file_shop_proto_rawDesc = []byte{
0x09, 0x52, 0x03, 0x55, 0x72, 0x6c, 0x22, 0x2a, 0x0a, 0x10, 0x43, 0x53, 0x47, 0x65, 0x74, 0x50,
0x61, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70,
0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x4f, 0x70, 0x54, 0x79,
0x70, 0x65, 0x22, 0x5c, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16,
0x70, 0x65, 0x22, 0x3c, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16,
0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75,
0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d,
0x12, 0x1e, 0x0a, 0x0a, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03,
0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65,
0x22, 0xd3, 0x01, 0x0a, 0x0b, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74,
0x12, 0x18, 0x0a, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f,

1
protocol/shop/shop.proto
View File

@ -208,7 +208,6 @@ message CSGetPayInfoList{
message ItemInfo{
int32 ItemId = 1;
int64 ItemNum = 2;
int64 ExpireTime = 3;
}
message PayInfoList{
string OrderId = 1;

4
worldsrv/action_bag.go
View File

@ -47,7 +47,7 @@ func (this *CSBagInfoHandler) Process(s *netlib.Session, packetid int, data inte
if bagInfo != nil {
for _, v := range bagInfo.BagItem {
item := srvdata.PBDB_GameItemMgr.GetData(v.ItemId)
if v.ExpireTime < time.Now().Unix() {
if item.Type == common.ItemTypeExpireTime && v.ExpireTime < time.Now().Unix() {
continue
}
@ -200,7 +200,6 @@ func (this *CSUpBagInfoHandler) Process(s *netlib.Session, packetid int, data in
ItemId: int32(k),
ItemNum: vv,
ObtainTime: ts,
ExpireTime: items[int32(k)].ExpireTime,
}
} else {
item.ItemNum += vv
@ -235,7 +234,6 @@ func (this *CSUpBagInfoHandler) Process(s *netlib.Session, packetid int, data in
ItemId: int32(k),
ItemNum: vv,
ObtainTime: ts,
ExpireTime: items[int32(k)].ExpireTime,
}
} else {
item.ItemNum += vv

29
worldsrv/bagmgr.go
View File

@ -216,16 +216,26 @@ func (this *BagMgr) AddJybBagInfo(p *Player, addItems []*Item, add int64, gainWa
changeItems = append(changeItems, v.ItemId)
if itm, exist := newBagInfo.BagItem[v.ItemId]; exist {
if common.ItemTypeExpireTime == item.Type {
itm.ExpireTime += int64(item.Time * 3600)
itm.ExpireTime += int64(item.Time*3600) * v.ItemNum
itm.ItemNum = 1
} else {
itm.ItemNum += v.ItemNum
}
} else {
newBagInfo.BagItem[v.ItemId] = &Item{
ItemId: item.Id, // 物品id
ItemNum: v.ItemNum, // 数量
ObtainTime: time.Now().Unix(),
ExpireTime: time.Now().Unix() + int64(item.Time*3600),
if common.ItemTypeExpireTime == item.Type {
newBagInfo.BagItem[v.ItemId] = &Item{
ItemId: item.Id, // 物品id
ItemNum: 1, // 数量
ObtainTime: time.Now().Unix(),
ExpireTime: time.Now().Unix() + int64(item.Time*3600)*v.ItemNum,
}
} else {
newBagInfo.BagItem[v.ItemId] = &Item{
ItemId: item.Id, // 物品id
ItemNum: v.ItemNum, // 数量
ObtainTime: time.Now().Unix(),
ExpireTime: 0,
}
}
}
if v.ItemId == common.ItemIDWeekScore && v.ItemNum != 0 {
@ -349,7 +359,6 @@ func (this *BagMgr) VerifyUpJybInfo(p *Player, args *model.VerifyUpJybInfoArgs)
ItemId: v.ItemId, // 物品id
ItemNum: v.ItemNum, // 数量
ObtainTime: time.Now().Unix(),
ExpireTime: v.ExpireTime,
})
}
if _, code := this.AddJybBagInfo(p, items, 0, common.GainWay_ActJybAward, "system", "礼包码兑换"); code != bag.OpResultCode_OPRC_Sucess { //TODO 添加失败 要回退礼包
@ -459,10 +468,8 @@ func (this *BagMgr) RefreshExpireItem(snid int32) {
itemcfg := srvdata.PBDB_GameItemMgr.GetData(bi.ItemId)
if itemcfg != nil {
// 去掉时限到期的道具
if itemcfg.Type == common.ItemTypeExpireTime {
if bi.ExpireTime < time.Now().Unix() {
delete(bagInfo.BagItem, k)
}
if itemcfg.Type == common.ItemTypeExpireTime && bi.ExpireTime < time.Now().Unix() {
delete(bagInfo.BagItem, k)
}
}
}

2
worldsrv/shopmgr.go
View File

@ -685,7 +685,7 @@ func (this *ShopMgr) GetAmountFinal(p *Player, shopId, vipShopId int32) int64 {
func (this *ShopMgr) ShopAddItem(shopInfo *model.ShopInfo, p *Player) {
if shopInfo.AddItemInfo != nil {
for _, info := range shopInfo.AddItemInfo {
item := &Item{ItemId: info.ItemId, ItemNum: info.ItemNum, ObtainTime: time.Now().Unix(), ExpireTime: time.Now().Unix() + info.ExpireTime*3600}
item := &Item{ItemId: info.ItemId, ItemNum: info.ItemNum, ObtainTime: time.Now().Unix()}
BagMgrSingleton.AddJybBagInfo(p, []*Item{item}, 0, common.GainWay_Shop_Buy, "system", shopInfo.Name)
data := srvdata.PBDB_GameItemMgr.GetData(item.ItemId)
if data != nil {

BIN
xlsx/DB_GameItem.xlsx
View File

Binary file not shown.