Compare commits
2 Commits
d96cc23c84
...
345e4db7a5
Author | SHA1 | Date |
---|---|---|
|
345e4db7a5 | |
|
bcb97edff2 |
|
@ -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 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)
|
||||||
|
@ -512,11 +512,13 @@ 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 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{
|
||||||
|
@ -530,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(data.RoundReward),
|
WinAmountNoAnyTax: int64(totalout - totalin - playerEx.taxCoin),
|
||||||
ValidBet: validBet,
|
ValidBet: validBet,
|
||||||
ValidFlow: validFlow,
|
ValidFlow: validFlow,
|
||||||
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),
|
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),
|
||||||
|
|
Loading…
Reference in New Issue