fix 推币机奖池抽奖

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:      p.WelfData.PushCoin.Next,
+								Id:      k,
 								ItemId:  v.GetItemId(),
 								ItemNum: v.GetItemNum(),
 							}
@@ -582,7 +582,7 @@ func PushCoinDraw(p *Player) {
 								ItemId:  v.GetItemId(),
 								ItemNum: v.GetItemNum(),
 							})
-							logger.Logger.Tracef("刷新奖池奖品：%v", draw)
+							logger.Logger.Tracef("刷新奖池奖品：%v", draw1)
 							break
 						}
 					} else {
@@ -620,6 +620,11 @@ func PushCoinDraw(p *Player) {
 						break
 					}
 				}
+				if has && index == int(curIndex) {
+					// 重复
+					has = false
+				}
+
 				if !has {
 					// 替换
 					if slices.Contains(PoolIndex, index) {
@@ -633,12 +638,14 @@ func PushCoinDraw(p *Player) {
 					})
 					p.WelfData.PushCoin.Turn[index] = e.GetId()
 				} else {
-					p.WelfData.PushCoin.Turn[curIndex] = e1.GetId()
-					draw1 = append(draw1, &activity.DrawInfo{
-						Id:      curIndex,
-						ItemId:  e1.GetItemId(),
-						ItemNum: e1.GetItemNum(),
-					})
+					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.Next = int32(index)
 				logger.Logger.Tracef("下次中普通奖品：index:%v ItemId:%v Num:%v", index, e.GetItemId(), e.GetItemNum())