tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tl_server_2:345e4db7a59303a8dd5104d39e243a35a17a852d
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:d96cc23c841cfc40eaa1830faff5c2beb96ad04b
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

No commits in common. "345e4db7a59303a8dd5104d39e243a35a17a852d" and "d96cc23c841cfc40eaa1830faff5c2beb96ad04b" have entirely different histories.
345e4db7a5 ... d96cc23c84

1 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

12
gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go
View File

@ -504,7 +504,7 @@ func (this *ScenePolicyFortuneRabbit) GetSceneState(s *base.Scene, stateid int)
func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneRabbitPlayerData, data assemble.GameEnd) { func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneRabbitPlayerData, data assemble.GameEnd) {
if !playerEx.IsRob { if !playerEx.IsRob {
data.SnId = playerEx.SnId data.SnId = playerEx.SnId
if data.Results[0].FreeStatus != 1 && data.Results[0].FreeNumMax != 0 { if playerEx.isFree {
data.TotalBet = 0 data.TotalBet = 0
} }
info, err := model.MarshalGameNoteByROLL(data) info, err := model.MarshalGameNoteByROLL(data)
@ -512,13 +512,11 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR
logid, _ := model.AutoIncGameLogId() logid, _ := model.AutoIncGameLogId()
playerEx.currentLogId = logid playerEx.currentLogId = logid
sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{}) sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{})
var totalin, totalout int64 var totalin int64
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { if !playerEx.isFree {
totalin = playerEx.totalBet totalin = playerEx.totalBet
} }
if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 { totalout := int64(data.RoundReward) + playerEx.taxCoin
totalout = int64(data.RoundReward) + playerEx.taxCoin
}
validFlow := totalin + totalout validFlow := totalin + totalout
validBet := common.AbsI64(totalin - totalout) validBet := common.AbsI64(totalin - totalout)
logParam := &base.SaveGamePlayerListLogParam{ logParam := &base.SaveGamePlayerListLogParam{
@ -532,7 +530,7 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR
TotalOut: totalout, TotalOut: totalout,
TaxCoin: playerEx.taxCoin, TaxCoin: playerEx.taxCoin,
BetAmount: playerEx.totalBet, BetAmount: playerEx.totalBet,
WinAmountNoAnyTax: int64(totalout - totalin - playerEx.taxCoin), WinAmountNoAnyTax: int64(data.RoundReward),
ValidBet: validBet, ValidBet: validBet,
ValidFlow: validFlow, ValidFlow: validFlow,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player), IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),