From 523213c7a31408e4ce538b25c5a6004cf68e1980 Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Sat, 18 Jan 2025 09:32:38 +0800
Subject: [PATCH] =?UTF-8?q?modify=20=E6=8E=A8=E5=B8=81=E6=9C=BA=E8=BD=AC?=
 =?UTF-8?q?=E7=9B=98=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/gameconfig/cashmania.json      | 10 ++++++++++
 data/gameconfig/gatesofolympus.json | 10 ++++++++++
 worldsrv/action_pushcoin.go         |  9 +++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 data/gameconfig/cashmania.json
 create mode 100644 data/gameconfig/gatesofolympus.json

diff --git a/data/gameconfig/cashmania.json b/data/gameconfig/cashmania.json
new file mode 100644
index 0000000..ceab787
--- /dev/null
+++ b/data/gameconfig/cashmania.json
@@ -0,0 +1,10 @@
+{
+	"GameName":"cashmania",
+	"GameId":313,
+	"GameMode":[0],
+	"SceneType":[1,2,3,4],
+	"CanForceStart":true,
+	"DefaultPlayerCnt":1,
+	"DependentPlayerCnt":true,
+	"EnterAfterStart":true
+}
\ No newline at end of file
diff --git a/data/gameconfig/gatesofolympus.json b/data/gameconfig/gatesofolympus.json
new file mode 100644
index 0000000..23cf922
--- /dev/null
+++ b/data/gameconfig/gatesofolympus.json
@@ -0,0 +1,10 @@
+{
+	"GameName":"gatesofolympus",
+	"GameId":314,
+	"GameMode":[0],
+	"SceneType":[1,2,3,4],
+	"CanForceStart":true,
+	"DefaultPlayerCnt":1,
+	"DependentPlayerCnt":true,
+	"EnterAfterStart":true
+}
\ No newline at end of file
diff --git a/worldsrv/action_pushcoin.go b/worldsrv/action_pushcoin.go
index 0a194ec..4e8d607 100644
--- a/worldsrv/action_pushcoin.go
+++ b/worldsrv/action_pushcoin.go
@@ -605,8 +605,10 @@ func PushCoinDraw(p *Player) {
 		// 奖池返奖 或 普通抽奖
 		if !f1() {
 			// 普通抽奖
+			curIndex := p.WelfData.PushCoin.Next
 			index := int(p.WelfData.PushCoin.Next) // 奖品位置
 			e := PushCoinNormalRandom(0)
+			e1 := PushCoinNormalRandom(0)
 			if e != nil {
 				var has bool
 				for k, v := range p.WelfData.PushCoin.Turn {
@@ -628,6 +630,13 @@ func PushCoinDraw(p *Player) {
 						ItemNum: e.GetItemNum(),
 					})
 					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(),
+					})
 				}
 				p.WelfData.PushCoin.Next = int32(index)
 				logger.Logger.Tracef("下次中普通奖品：index:%v ItemId:%v Num:%v", index, e.GetItemId(), e.GetItemNum())