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

修改fortune牌局记录

This commit is contained in:
sk 2024-11-28 17:48:56 +08:00
parent ce5e66b148
commit 10d494e9a8
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gamesrv/fortunedragon/scenepolicy_fortunedragon.go
View File

@ -505,7 +505,7 @@ func (this *ScenePolicyFortuneDragon) GetSceneState(s *base.Scene, stateid int)
func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneDragonPlayerData, data assemble.GameEnd) { func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneDragonPlayerData, data assemble.GameEnd) {
if !playerEx.IsRob { if !playerEx.IsRob {
data.SnId = playerEx.SnId data.SnId = playerEx.SnId
if playerEx.isFree { if data.Results[0].FreeStatus != 1 && data.Results[0].FreeNumMax != 0 {
data.TotalBet = 0 data.TotalBet = 0
} }
info, err := model.MarshalGameNoteByROLL(data) info, err := model.MarshalGameNoteByROLL(data)
@ -513,11 +513,13 @@ func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneD
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 int64 var totalin, totalout int64
if !playerEx.isFree { if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
totalin = playerEx.totalBet totalin = playerEx.totalBet
} }
totalout := int64(data.RoundReward) + playerEx.taxCoin if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 {
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{
@ -531,7 +533,7 @@ func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneD
TotalOut: totalout, TotalOut: totalout,
TaxCoin: playerEx.taxCoin, TaxCoin: playerEx.taxCoin,
BetAmount: totalin, BetAmount: totalin,
WinAmountNoAnyTax: int64(data.RoundReward), WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
ValidBet: validBet, ValidBet: validBet,
ValidFlow: validFlow, ValidFlow: validFlow,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player), IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),

14
gamesrv/fortuneox/scenepolicy_fortuneox.go
View File

@ -510,13 +510,21 @@ func (this *ScenePolicyFortuneOx) GetSceneState(s *base.Scene, stateid int) base
func FortuneOxAndSaveLog(sceneEx *FortuneOxSceneData, playerEx *FortuneOxPlayerData, data assemble.GameEnd) { func FortuneOxAndSaveLog(sceneEx *FortuneOxSceneData, playerEx *FortuneOxPlayerData, 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 {
data.TotalBet = 0
}
info, err := model.MarshalGameNoteByROLL(data) info, err := model.MarshalGameNoteByROLL(data)
if err == nil { if err == nil {
logid, _ := model.AutoIncGameLogId() logid, _ := model.AutoIncGameLogId()
playerEx.currentLogId = logid playerEx.currentLogId = logid
sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{}) sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{})
totalin := playerEx.totalBet var totalin, totalout int64
totalout := int64(data.RoundReward) + playerEx.taxCoin if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
totalin = playerEx.totalBet
}
if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 {
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{
@ -530,7 +538,7 @@ func FortuneOxAndSaveLog(sceneEx *FortuneOxSceneData, playerEx *FortuneOxPlayerD
TotalOut: totalout, TotalOut: totalout,
TaxCoin: playerEx.taxCoin, TaxCoin: playerEx.taxCoin,
BetAmount: playerEx.totalBet, BetAmount: playerEx.totalBet,
WinAmountNoAnyTax: int64(data.RoundReward) + playerEx.taxCoin, WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
ValidBet: validBet, ValidBet: validBet,
ValidFlow: validFlow, ValidFlow: validFlow,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player), IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),

2
gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go
View File

@ -532,7 +532,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: totalout - totalin - playerEx.taxCoin,
ValidBet: validBet, ValidBet: validBet,
ValidFlow: validFlow, ValidFlow: validFlow,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player), IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),

14
gamesrv/fortunetiger/scenepolicy_fortunetiger.go
View File

@ -507,13 +507,21 @@ func (this *ScenePolicyFortuneTiger) GetSceneState(s *base.Scene, stateid int) b
func FortuneTigerAndSaveLog(sceneEx *FortuneTigerSceneData, playerEx *FortuneTigerPlayerData, data assemble.GameEnd) { func FortuneTigerAndSaveLog(sceneEx *FortuneTigerSceneData, playerEx *FortuneTigerPlayerData, 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 {
data.TotalBet = 0
}
info, err := model.MarshalGameNoteByROLL(data) info, err := model.MarshalGameNoteByROLL(data)
if err == nil { if err == nil {
logid, _ := model.AutoIncGameLogId() logid, _ := model.AutoIncGameLogId()
playerEx.currentLogId = logid playerEx.currentLogId = logid
sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{}) sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{})
totalin := playerEx.totalBet var totalin, totalout int64
totalout := int64(data.RoundReward) + playerEx.taxCoin if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
totalin = playerEx.totalBet
}
if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 {
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{
@ -527,7 +535,7 @@ func FortuneTigerAndSaveLog(sceneEx *FortuneTigerSceneData, playerEx *FortuneTig
TotalOut: totalout, TotalOut: totalout,
TaxCoin: playerEx.taxCoin, TaxCoin: playerEx.taxCoin,
BetAmount: playerEx.totalBet, BetAmount: playerEx.totalBet,
WinAmountNoAnyTax: int64(data.RoundReward) + playerEx.taxCoin, WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
ValidBet: validBet, ValidBet: validBet,
ValidFlow: validFlow, ValidFlow: validFlow,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player), IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),