Compare commits

..

No commits in common. "2ab2ffafdd7904fa3416a9d5c9d683988eb07995" and "bdac067402b06c8dc7b54f87608e0166fdbe6265" have entirely different histories.

2 changed files with 13 additions and 18 deletions

View File

@ -405,7 +405,6 @@ func (this *SceneStateStartFortuneMouse) OnPlayerOp(s *base.Scene, p *base.Playe
var gameEndStr string
var data assemble.GameEnd
if err == nil {
s.SetGameNowTime(time.Now())
data = assemble.DataToCli(Response).(assemble.GameEnd)
var respinStatus int
if data.Results[0].ArrSpins[0].Special != nil {
@ -525,11 +524,7 @@ func FortuneMouseAndSaveLog(sceneEx *FortuneMouseSceneData, playerEx *FortuneMou
if err == nil {
logid, _ := model.AutoIncGameLogId()
playerEx.currentLogId = logid
sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logid,
Detail: info,
GameTime: 2,
})
sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{})
var totalin, totalout int64
if respinStatus == 0 || respinStatus == 1 {
totalin = playerEx.totalBet
@ -537,22 +532,25 @@ func FortuneMouseAndSaveLog(sceneEx *FortuneMouseSceneData, playerEx *FortuneMou
if respinStatus == 0 || respinStatus == 3 {
totalout = int64(data.RoundReward) + playerEx.taxCoin
}
sceneEx.SaveGamePlayerListLog(&base.SaveGamePlayerListLogParam{
LogId: logid,
validFlow := totalin + totalout
validBet := common.AbsI64(totalin - totalout)
logParam := &base.SaveGamePlayerListLogParam{
Platform: playerEx.Platform,
Snid: playerEx.SnId,
PlayerName: playerEx.Name,
Channel: playerEx.Channel,
ChannelId: playerEx.ChannelId,
Promoter: playerEx.BeUnderAgentCode,
PackageTag: playerEx.PackageID,
InviterId: playerEx.InviterId,
LogId: logid,
TotalIn: totalin,
TotalOut: totalout,
TaxCoin: playerEx.taxCoin,
BetAmount: playerEx.totalBet,
WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
ValidBet: validBet,
ValidFlow: validFlow,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),
IsFree: totalin == 0,
GameTime: 2,
})
}
sceneEx.SaveGamePlayerListLog(playerEx.SnId, logParam)
}
}

View File

@ -409,10 +409,7 @@ func (this *SceneStateStartFortuneTiger) OnPlayerOp(s *base.Scene, p *base.Playe
data = assemble.DataToCli(Response).(assemble.GameEnd)
var respinStatus int
if data.Results[0].ArrSpins[0].Special != nil {
sp, _ := json.Marshal(data.Results[0].ArrSpins[0].Special)
var spinLock SpinLock
json.Unmarshal(sp, &spinLock)
respinStatus = spinLock.ReSpinStatus
respinStatus = data.Results[0].ArrSpins[0].Special.(SpinLock).ReSpinStatus
}
if respinStatus == 0 || respinStatus == 1 {
//第一次触发或者正常模式