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

Compare commits

base: tl_server_2:94e1effc632229ea436433c1b9725f910276c195
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:36708d2af6be350924c67091fd8388ec001ba200
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

No commits in common. "94e1effc632229ea436433c1b9725f910276c195" and "36708d2af6be350924c67091fd8388ec001ba200" have entirely different histories.
94e1effc63 ... 36708d2af6

2 changed files with 4 additions and 3 deletions
Show Stats Expand all files Collapse all files

1
model/config.go
View File

@ -170,7 +170,6 @@ type AllConfig struct {
*webapi.GamePigBankPropConfig *webapi.GamePigBankPropConfig
//年兽配置 //年兽配置
*webapi.ActivityNianConfig *webapi.ActivityNianConfig
*webapi.NianRankReward
// 红包配置 // 红包配置
*webapi.RedPacketConfig *webapi.RedPacketConfig
} }

6
worldsrv/action_nian.go
View File

@ -84,8 +84,10 @@ func CSNianData(s *netlib.Session, packetid int, data interface{}, sid int64) er
pack.BossHp = p.WelfData.NianData.BossHp pack.BossHp = p.WelfData.NianData.BossHp
pack.BossMaxHp = BossMaxHp pack.BossMaxHp = BossMaxHp
pack.ActivityStartTime = timestamp // pack.ActivityStartTime = timestamp
pack.ActivityEndTime = endTimestamp //pack.ActivityEndTime = endTimestamp
pack.ActivityStartTime = 0
pack.ActivityEndTime = 0
pack.AwardTime = p.WelfData.NianData.SignAwardTime pack.AwardTime = p.WelfData.NianData.SignAwardTime
pack.BuffCount = p.WelfData.NianData.BuffCount pack.BuffCount = p.WelfData.NianData.BuffCount
pack.BuffStatus = p.WelfData.NianData.BuffStatus pack.BuffStatus = p.WelfData.NianData.BuffStatus