diff --git a/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go b/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go index d9974b1..2c340ee 100644 --- a/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go +++ b/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go @@ -504,7 +504,7 @@ 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 { + if data.Results[0].FreeStatus != 1 && data.Results[0].FreeNumMax != 0 { data.TotalBet = 0 } info, err := model.MarshalGameNoteByROLL(data) @@ -517,7 +517,7 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR totalin = playerEx.totalBet } if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 { - totalout = int64(data.RoundReward) + playerEx.taxCoin - playerEx.totalBet + totalout = int64(data.RoundReward) + playerEx.taxCoin } validFlow := totalin + totalout validBet := common.AbsI64(totalin - totalout) @@ -532,7 +532,7 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR TotalOut: totalout, TaxCoin: playerEx.taxCoin, BetAmount: playerEx.totalBet, - WinAmountNoAnyTax: int64(data.RoundReward), + WinAmountNoAnyTax: int64(totalout - totalin - playerEx.taxCoin), ValidBet: validBet, ValidFlow: validFlow, IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),