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

Compare commits

base: tl_server_2:2aff7b19fb626d7f36dd095a509800452f8ad33f
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:79abb14bd31adc34661d6fbdcd7ddda05f99b961
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. "2aff7b19fb626d7f36dd095a509800452f8ad33f" and "79abb14bd31adc34661d6fbdcd7ddda05f99b961" have entirely different histories.
2aff7b19fb ... 79abb14bd3

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

4
worldsrv/welfmgr.go
View File

@ -2281,7 +2281,7 @@ func (this *WelfareMgr) SendRedPacketInfo(p *Player) *welfare.SCRedPacketInfo {
continue continue
} }
startTs, endTs := common.IntToTime(int(v.GetStartHMS())).Unix(), common.IntToTime(int(v.GetEndHMS())).Unix() startTs, endTs := common.IntToTime(int(v.GetStartHMS())).Unix(), common.IntToTime(int(v.GetEndHMS())).Unix()
if now >= endTs { if now < startTs || now >= endTs {
continue continue
} }
info := &welfare.RedPacketInfo{ info := &welfare.RedPacketInfo{
@ -2296,7 +2296,7 @@ func (this *WelfareMgr) SendRedPacketInfo(p *Player) *welfare.SCRedPacketInfo {
} }
} }
_, info.RemainCount = RedPacketMgrInst.GetRemainTimesByConfig(p, v) _, info.RemainCount = RedPacketMgrInst.GetRemainTimesByConfig(p, v)
if info.RemainCount > 0 || info.RemainCount == -1 { if info.RemainCount > 0 {
pack.Info = append(pack.Info, info) pack.Info = append(pack.Info, info)
} }
} }