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

Compare commits

base: tl_server_2:6265822463a80b56604dc02b62f8a3d9dbc04fb7
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:73b9436768718817340185eb64bd0d86f14e39ee
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. "6265822463a80b56604dc02b62f8a3d9dbc04fb7" and "73b9436768718817340185eb64bd0d86f14e39ee" have entirely different histories.
6265822463 ... 73b9436768

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

25
worldsrv/action_pushcoin.go
View File

@ -510,7 +510,7 @@ func PushCoinDraw(p *Player) {
p.WelfData.PushCoin.PoolV[i] = poolInfo.Version p.WelfData.PushCoin.PoolV[i] = poolInfo.Version
// 下次中奖位置 // 下次中奖位置
p.WelfData.PushCoin.Next = int32(PoolIndex[i]) p.WelfData.PushCoin.Next = int32(PoolIndex[i])
logger.Logger.Tracef("下次中奖池：%+v", p.WelfData.PushCoin) logger.Logger.Tracef("下次中奖池：%v", p.WelfData.PushCoin)
return true return true
} }
} }
@ -562,7 +562,7 @@ func PushCoinDraw(p *Player) {
if i < len(list) { if i < len(list) {
for _, v := range list[i].GetAward() { for _, v := range list[i].GetAward() {
draw = &activity.DrawInfo{ draw = &activity.DrawInfo{
Id: k, Id: p.WelfData.PushCoin.Next,
ItemId: v.GetItemId(), ItemId: v.GetItemId(),
ItemNum: v.GetItemNum(), ItemNum: v.GetItemNum(),
} }
@ -582,7 +582,7 @@ func PushCoinDraw(p *Player) {
ItemId: v.GetItemId(), ItemId: v.GetItemId(),
ItemNum: v.GetItemNum(), ItemNum: v.GetItemNum(),
}) })
logger.Logger.Tracef("刷新奖池奖品：%v", draw1) logger.Logger.Tracef("刷新奖池奖品：%v", draw)
break break
} }
} else { } else {
@ -620,11 +620,6 @@ func PushCoinDraw(p *Player) {
break break
} }
} }
if has && index == int(curIndex) {
// 重复
has = false
}
if !has { if !has {
// 替换 // 替换
if slices.Contains(PoolIndex, index) { if slices.Contains(PoolIndex, index) {
@ -638,14 +633,12 @@ func PushCoinDraw(p *Player) {
}) })
p.WelfData.PushCoin.Turn[index] = e.GetId() p.WelfData.PushCoin.Turn[index] = e.GetId()
} else { } else {
if !slices.Contains(PoolIndex, int(curIndex)) { p.WelfData.PushCoin.Turn[curIndex] = e1.GetId()
p.WelfData.PushCoin.Turn[curIndex] = e1.GetId() draw1 = append(draw1, &activity.DrawInfo{
draw1 = append(draw1, &activity.DrawInfo{ Id: curIndex,
Id: curIndex, ItemId: e1.GetItemId(),
ItemId: e1.GetItemId(), ItemNum: e1.GetItemNum(),
ItemNum: e1.GetItemNum(), })
})
}
} }
p.WelfData.PushCoin.Next = int32(index) p.WelfData.PushCoin.Next = int32(index)
logger.Logger.Tracef("下次中普通奖品：index:%v ItemId:%v Num:%v", index, e.GetItemId(), e.GetItemNum()) logger.Logger.Tracef("下次中普通奖品：index:%v ItemId:%v Num:%v", index, e.GetItemId(), e.GetItemNum())