From 42e5e3b7d876535ebe774342ed693da98fd52032 Mon Sep 17 00:00:00 2001
From: tomas <tomas@mail.com>
Date: Mon, 3 Mar 2025 10:55:55 +0800
Subject: [PATCH] fix coin test001

---
 gamesrv/sugarrush/scenedata_sugarrush.go   | 14 +++++++-------
 gamesrv/sugarrush/scenepolicy_sugarrush.go | 17 ++++++++---------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/gamesrv/sugarrush/scenedata_sugarrush.go b/gamesrv/sugarrush/scenedata_sugarrush.go
index bfdcf3b..dc360f8 100644
--- a/gamesrv/sugarrush/scenedata_sugarrush.go
+++ b/gamesrv/sugarrush/scenedata_sugarrush.go
@@ -96,19 +96,19 @@ func (s *SugarRushSceneData) PlayResponseFixCoin(Response *cli.SlotsPlayResponse
 	Response.ActualBet /= sugarrush.NowByte
 	Response.ActualWin /= sugarrush.NowByte
 	Response.NodeTree.BetCoin.Coin /= sugarrush.NowByte
-	for _, node := range Response.NodeTree.Nodes {
-		node.Win /= sugarrush.NowByte
-		node.TotalWin /= sugarrush.NowByte
-		node.ChildrenTotalWin /= sugarrush.NowByte
-		node.Bet /= sugarrush.NowByte
+	for k := range Response.NodeTree.Nodes {
+		Response.NodeTree.Nodes[k].Win /= sugarrush.NowByte
+		Response.NodeTree.Nodes[k].TotalWin /= sugarrush.NowByte
+		Response.NodeTree.Nodes[k].ChildrenTotalWin /= sugarrush.NowByte
+		Response.NodeTree.Nodes[k].Bet /= sugarrush.NowByte
 	}
 	for k, feature := range Response.NodeTree.Features {
 		Response.NodeTree.Features[k].Win /= sugarrush.NowByte
 		if feature.Type == "sugarrush.CustomEliminate" {
 			var customEliminate CustomEliminate
 			json.Unmarshal([]byte(feature.Custom), &customEliminate)
-			for k, wincoin := range customEliminate.WinCoins {
-				customEliminate.WinCoins[k] /= wincoin
+			for k1, wincoin := range customEliminate.WinCoins {
+				customEliminate.WinCoins[k1] /= wincoin
 			}
 			ce, _ := json.Marshal(customEliminate)
 			Response.NodeTree.Features[k].Custom = string(ce)
diff --git a/gamesrv/sugarrush/scenepolicy_sugarrush.go b/gamesrv/sugarrush/scenepolicy_sugarrush.go
index c3aa0b2..a3bb8d1 100644
--- a/gamesrv/sugarrush/scenepolicy_sugarrush.go
+++ b/gamesrv/sugarrush/scenepolicy_sugarrush.go
@@ -217,14 +217,13 @@ func SugarRushCreateRoomInfoPacket(s *base.Scene, sceneEx *SugarRushSceneData, p
 		logger.Logger.Error("slots enter err:", err)
 	}
 
+	sceneEx.EnterResponseFixCoin(Response)
+
 	Response.BetSizes = []int64{100, 1000, 2000, 5000, 7500, 20000}
 	Response.BetChangeList = []float64{}
 	sceneEx.BetLevel = Response.BetLevels
 	pi, _ := json.Marshal(Response)
 	pack.PlayerInfo = string(pi)
-
-	sceneEx.EnterResponseFixCoin(Response)
-
 	proto.SetDefaults(pack)
 	return pack
 }
@@ -379,8 +378,8 @@ func (this *SceneStateStartSugarRush) OnPlayerOp(s *base.Scene, p *base.Player,
 				}
 				cval := params[0]
 				playerEx.BetMode = params[1]
-				//playerEx.SlotsSession.SetCoin(playerEx.Coin * sugarrush.NowByte)
-				//logger.Logger.Trace("=============init dif coin", playerEx.Coin-playerEx.SlotsSession.Coin()/sugarrush.NowByte)
+				//playerEx.SlotsSession.SetCoin(playerEx.Coin)
+				//logger.Logger.Trace("=============init dif coin", playerEx.Coin-playerEx.SlotsSession.Coin())
 
 				index := slots.SlotsMgrSington.PPGetBetIndex(playerEx.SlotsSession, "SugarRush", float64(cval*20))
 				if index == nil {
@@ -424,7 +423,7 @@ func (this *SceneStateStartSugarRush) OnPlayerOp(s *base.Scene, p *base.Player,
 					playerEx.SendToClient(int(protocol.SugarRushPID_PACKET_SUGARRUSH_SCSUGARRUSHBILLED), pack)
 					return true
 				}
-				var ActualWin = Response.ActualWin / sugarrush.NowByte
+				var ActualWin = Response.ActualWin
 				s.SetGameNowTime(time.Now())
 				midNodes := Response.NodeTree.Nodes[1]
 				lastNodes := Response.NodeTree.Nodes[2]
@@ -438,7 +437,7 @@ func (this *SceneStateStartSugarRush) OnPlayerOp(s *base.Scene, p *base.Player,
 					needWinBilled = false
 					if lastNodes.ProgressValue == 0 {
 						//第一次触发
-						playerEx.totalBet = Response.ActualBet / sugarrush.NowByte
+						playerEx.totalBet = Response.ActualBet
 						playerEx.AddCoin(-playerEx.totalBet, common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName())
 						totalIn = playerEx.totalBet
 					}
@@ -447,7 +446,7 @@ func (this *SceneStateStartSugarRush) OnPlayerOp(s *base.Scene, p *base.Player,
 					}
 				} else {
 					//正常模式
-					playerEx.totalBet = Response.ActualBet / sugarrush.NowByte
+					playerEx.totalBet = Response.ActualBet
 					totalIn = playerEx.totalBet
 					playerEx.AddCoin(-playerEx.totalBet, common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName())
 				}
@@ -564,7 +563,7 @@ func SugarRushAndSaveLog(sceneEx *SugarRushSceneData, playerEx *SugarRushPlayerD
 		playerBet := &server.PlayerData{
 			SnId:       proto.Int32(playerEx.SnId),
 			Bet:        proto.Int64(playerEx.CurrentBet),
-			Gain:       proto.Int64(Response.ActualWin/sugarrush.NowByte + playerEx.taxCoin),
+			Gain:       proto.Int64(Response.ActualWin + playerEx.taxCoin),
 			Tax:        proto.Int64(playerEx.taxCoin),
 			Coin:       proto.Int64(playerEx.GetCoin()),
 			GameCoinTs: proto.Int64(playerEx.GameCoinTs),