From d96cc23c841cfc40eaa1830faff5c2beb96ad04b Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Thu, 28 Nov 2024 15:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=94=E5=AD=90=E6=8B=89?=
 =?UTF-8?q?=E9=9C=B8=E6=B8=B8=E6=88=8F=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gamesrv/fortunedragon/scenepolicy_fortunedragon.go | 12 +++++++++---
 gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go | 10 ++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go
index 747886c..ed98382 100644
--- a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go
+++ b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go
@@ -505,12 +505,18 @@ func (this *ScenePolicyFortuneDragon) GetSceneState(s *base.Scene, stateid int)
 func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneDragonPlayerData, data assemble.GameEnd) {
 	if !playerEx.IsRob {
 		data.SnId = playerEx.SnId
+		if playerEx.isFree {
+			data.TotalBet = 0
+		}
 		info, err := model.MarshalGameNoteByROLL(data)
 		if err == nil {
 			logid, _ := model.AutoIncGameLogId()
 			playerEx.currentLogId = logid
 			sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{})
-			totalin := playerEx.totalBet
+			var totalin int64
+			if !playerEx.isFree {
+				totalin = playerEx.totalBet
+			}
 			totalout := int64(data.RoundReward) + playerEx.taxCoin
 			validFlow := totalin + totalout
 			validBet := common.AbsI64(totalin - totalout)
@@ -524,8 +530,8 @@ func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneD
 				TotalIn:           totalin,
 				TotalOut:          totalout,
 				TaxCoin:           playerEx.taxCoin,
-				BetAmount:         playerEx.totalBet,
-				WinAmountNoAnyTax: int64(data.RoundReward) + playerEx.taxCoin,
+				BetAmount:         totalin,
+				WinAmountNoAnyTax: int64(data.RoundReward),
 				ValidBet:          validBet,
 				ValidFlow:         validFlow,
 				IsFirstGame:       sceneEx.IsPlayerFirst(playerEx.Player),
diff --git a/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go b/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go
index 60ed868..954921e 100644
--- a/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go
+++ b/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go
@@ -504,12 +504,18 @@ func (this *ScenePolicyFortuneRabbit) GetSceneState(s *base.Scene, stateid int)
 func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneRabbitPlayerData, data assemble.GameEnd) {
 	if !playerEx.IsRob {
 		data.SnId = playerEx.SnId
+		if playerEx.isFree {
+			data.TotalBet = 0
+		}
 		info, err := model.MarshalGameNoteByROLL(data)
 		if err == nil {
 			logid, _ := model.AutoIncGameLogId()
 			playerEx.currentLogId = logid
 			sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{})
-			totalin := playerEx.totalBet
+			var totalin int64
+			if !playerEx.isFree {
+				totalin = playerEx.totalBet
+			}
 			totalout := int64(data.RoundReward) + playerEx.taxCoin
 			validFlow := totalin + totalout
 			validBet := common.AbsI64(totalin - totalout)
@@ -524,7 +530,7 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR
 				TotalOut:          totalout,
 				TaxCoin:           playerEx.taxCoin,
 				BetAmount:         playerEx.totalBet,
-				WinAmountNoAnyTax: int64(data.RoundReward) + playerEx.taxCoin,
+				WinAmountNoAnyTax: int64(data.RoundReward),
 				ValidBet:          validBet,
 				ValidFlow:         validFlow,
 				IsFirstGame:       sceneEx.IsPlayerFirst(playerEx.Player),