worldsrv/action_pushcoin.go

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