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

Merge branch 'sk' into develop

This commit is contained in:
sk 2024-12-02 13:44:41 +08:00
parent 6b83e85469 fbc14799c1
commit 73157b41cf
11 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gamesrv/avengers/scenepolicy_avengers.go
View File

@ -937,7 +937,7 @@ func AvengersCheckAndSaveLog(sceneEx *AvengersSceneData, playerEx *AvengersPlaye
sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{ sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logid, LogId: logid,
Detail: info, Detail: info,
GameTime: 1, GameTime: 2,
}) })
totalin := int64(playerEx.RollGameType.BaseResult.TotalBet) totalin := int64(playerEx.RollGameType.BaseResult.TotalBet)
totalout := playerEx.RollGameType.BaseResult.ChangeCoin + playerEx.taxCoin + totalin totalout := playerEx.RollGameType.BaseResult.ChangeCoin + playerEx.taxCoin + totalin
@ -956,7 +956,7 @@ func AvengersCheckAndSaveLog(sceneEx *AvengersSceneData, playerEx *AvengersPlaye
IsFree: playerEx.RollGameType.BaseResult.IsFree, IsFree: playerEx.RollGameType.BaseResult.IsFree,
WinSmallGame: playerEx.RollGameType.BaseResult.WinSmallGame, WinSmallGame: playerEx.RollGameType.BaseResult.WinSmallGame,
WinTotal: playerEx.RollGameType.BaseResult.WinTotal, WinTotal: playerEx.RollGameType.BaseResult.WinTotal,
GameTime: 1, GameTime: 2,
}) })
} }
} }

4
gamesrv/caishen/scenepolicy_caishen.go
View File

@ -1026,7 +1026,7 @@ func CaiShenCheckAndSaveLog(sceneEx *CaiShenSceneData, playerEx *CaiShenPlayerDa
sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{ sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logid, LogId: logid,
Detail: info, Detail: info,
GameTime: 1, GameTime: 2,
}) })
totalin := int64(playerEx.RollGameType.BaseResult.TotalBet) totalin := int64(playerEx.RollGameType.BaseResult.TotalBet)
totalout := playerEx.RollGameType.BaseResult.ChangeCoin + playerEx.taxCoin + totalin totalout := playerEx.RollGameType.BaseResult.ChangeCoin + playerEx.taxCoin + totalin
@ -1046,7 +1046,7 @@ func CaiShenCheckAndSaveLog(sceneEx *CaiShenSceneData, playerEx *CaiShenPlayerDa
IsFree: playerEx.RollGameType.BaseResult.IsFree, IsFree: playerEx.RollGameType.BaseResult.IsFree,
WinSmallGame: playerEx.RollGameType.BaseResult.WinSmallGame, WinSmallGame: playerEx.RollGameType.BaseResult.WinSmallGame,
WinTotal: playerEx.RollGameType.BaseResult.WinTotal, WinTotal: playerEx.RollGameType.BaseResult.WinTotal,
GameTime: 1, GameTime: 2,
}) })
} }
} }

4
gamesrv/easterisland/scenepolicy_easterisland.go
View File

@ -895,7 +895,7 @@ func EasterIslandCheckAndSaveLog(sceneEx *EasterIslandSceneData, playerEx *Easte
sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{ sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logid, LogId: logid,
Detail: info, Detail: info,
GameTime: 1, GameTime: 2,
}) })
totalin := int64(playerEx.RollGameType.BaseResult.TotalBet) totalin := int64(playerEx.RollGameType.BaseResult.TotalBet)
totalout := playerEx.RollGameType.BaseResult.ChangeCoin + playerEx.taxCoin + totalin totalout := playerEx.RollGameType.BaseResult.ChangeCoin + playerEx.taxCoin + totalin
@ -915,7 +915,7 @@ func EasterIslandCheckAndSaveLog(sceneEx *EasterIslandSceneData, playerEx *Easte
IsFree: playerEx.RollGameType.BaseResult.IsFree, IsFree: playerEx.RollGameType.BaseResult.IsFree,
WinSmallGame: playerEx.RollGameType.BaseResult.WinSmallGame, WinSmallGame: playerEx.RollGameType.BaseResult.WinSmallGame,
WinTotal: playerEx.RollGameType.BaseResult.WinTotal, WinTotal: playerEx.RollGameType.BaseResult.WinTotal,
GameTime: 1, GameTime: 2,
}) })
} }
} }

5
gamesrv/fortunedragon/scenepolicy_fortunedragon.go
View File

@ -407,6 +407,7 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
var gameEndStr string var gameEndStr string
var data assemble.GameEnd var data assemble.GameEnd
if err == nil { if err == nil {
s.SetGameNowTime(time.Now())
data = assemble.DataToCli(Response).(assemble.GameEnd) data = assemble.DataToCli(Response).(assemble.GameEnd)
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
//logger.Logger.Trace("=====================AddCoin=====TotalBet===", -data.TotalBet) //logger.Logger.Trace("=====================AddCoin=====TotalBet===", -data.TotalBet)
@ -515,7 +516,7 @@ func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneD
sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{ sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logid, LogId: logid,
Detail: info, Detail: info,
GameTime: 1, GameTime: 2,
}) })
var totalin, totalout int64 var totalin, totalout int64
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
@ -538,7 +539,7 @@ func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneD
WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin, WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player), IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),
IsFree: playerEx.isFree, IsFree: playerEx.isFree,
GameTime: 1, GameTime: 2,
}) })
} }
} }

5
gamesrv/fortuneox/scenepolicy_fortuneox.go
View File

@ -405,6 +405,7 @@ func (this *SceneStateStartFortuneOx) OnPlayerOp(s *base.Scene, p *base.Player,
var gameEndStr string var gameEndStr string
var data assemble.GameEnd var data assemble.GameEnd
if err == nil { if err == nil {
s.SetGameNowTime(time.Now())
data = assemble.DataToCli(Response).(assemble.GameEnd) data = assemble.DataToCli(Response).(assemble.GameEnd)
var respinStatus int var respinStatus int
if data.Results[0].ArrSpins[0].Special != nil { if data.Results[0].ArrSpins[0].Special != nil {
@ -528,7 +529,7 @@ func FortuneOxAndSaveLog(sceneEx *FortuneOxSceneData, playerEx *FortuneOxPlayerD
sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{ sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logid, LogId: logid,
Detail: info, Detail: info,
GameTime: 1, GameTime: 2,
}) })
var totalin, totalout int64 var totalin, totalout int64
if respinStatus == 0 || respinStatus == 1 { if respinStatus == 0 || respinStatus == 1 {
@ -551,7 +552,7 @@ func FortuneOxAndSaveLog(sceneEx *FortuneOxSceneData, playerEx *FortuneOxPlayerD
WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin, WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player), IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),
IsFree: totalin == 0, IsFree: totalin == 0,
GameTime: 1, GameTime: 2,
}) })
} }
} }

5
gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go
View File

@ -405,6 +405,7 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play
var gameEndStr string var gameEndStr string
var data assemble.GameEnd var data assemble.GameEnd
if err == nil { if err == nil {
s.SetGameNowTime(time.Now())
data = assemble.DataToCli(Response).(assemble.GameEnd) data = assemble.DataToCli(Response).(assemble.GameEnd)
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
//第一次触发或者正常模式 //第一次触发或者正常模式
@ -514,7 +515,7 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR
sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{ sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logid, LogId: logid,
Detail: info, Detail: info,
GameTime: 1, GameTime: 2,
}) })
var totalin, totalout int64 var totalin, totalout int64
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
@ -537,7 +538,7 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR
WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin, WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player), IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),
IsFree: playerEx.isFree, IsFree: playerEx.isFree,
GameTime: 1, GameTime: 2,
}) })
} }
} }

5
gamesrv/fortunetiger/scenepolicy_fortunetiger.go
View File

@ -405,6 +405,7 @@ func (this *SceneStateStartFortuneTiger) OnPlayerOp(s *base.Scene, p *base.Playe
var gameEndStr string var gameEndStr string
var data assemble.GameEnd var data assemble.GameEnd
if err == nil { if err == nil {
s.SetGameNowTime(time.Now())
data = assemble.DataToCli(Response).(assemble.GameEnd) data = assemble.DataToCli(Response).(assemble.GameEnd)
var respinStatus int var respinStatus int
if data.Results[0].ArrSpins[0].Special != nil { if data.Results[0].ArrSpins[0].Special != nil {
@ -517,7 +518,7 @@ func FortuneTigerAndSaveLog(sceneEx *FortuneTigerSceneData, playerEx *FortuneTig
sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{ sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logid, LogId: logid,
Detail: info, Detail: info,
GameTime: 1, GameTime: 2,
}) })
var totalin, totalout int64 var totalin, totalout int64
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
@ -540,7 +541,7 @@ func FortuneTigerAndSaveLog(sceneEx *FortuneTigerSceneData, playerEx *FortuneTig
WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin, WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player), IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),
IsFree: totalin == 0, IsFree: totalin == 0,
GameTime: 1, GameTime: 2,
}) })
} }
} }

4
gamesrv/fruits/scenedata_fruits.go
View File

@ -329,7 +329,7 @@ func (s *FruitsSceneData) SaveLog(p *FruitsPlayerData, isOffline int) {
s.SaveGameDetailedLog(&base.SaveGameDetailedParam{ s.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logId, LogId: logId,
Detail: info, Detail: info,
GameTime: 1, GameTime: 2,
}) })
//水池上下文环境s //水池上下文环境s
s.CpCtx = p.cpCtx s.CpCtx = p.cpCtx
@ -354,7 +354,7 @@ func (s *FruitsSceneData) SaveLog(p *FruitsPlayerData, isOffline int) {
WinAmountNoAnyTax: p.Coin - p.startCoin, WinAmountNoAnyTax: p.Coin - p.startCoin,
IsFirstGame: s.IsPlayerFirst(p.Player), IsFirstGame: s.IsPlayerFirst(p.Player),
IsFree: totalIn == 0, IsFree: totalIn == 0,
GameTime: 1, GameTime: 2,
}) })
} }
s.GameNowTime = time.Now() s.GameNowTime = time.Now()

4
gamesrv/iceage/scenepolicy_iceage.go
View File

@ -945,7 +945,7 @@ func IceAgeCheckAndSaveLog(sceneEx *IceAgeSceneData, playerEx *IceAgePlayerData)
sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{ sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logid, LogId: logid,
Detail: info, Detail: info,
GameTime: 1, GameTime: 2,
}) })
totalin := int64(playerEx.RollGameType.BaseResult.TotalBet) totalin := int64(playerEx.RollGameType.BaseResult.TotalBet)
totalout := playerEx.RollGameType.BaseResult.ChangeCoin + playerEx.taxCoin + totalin totalout := playerEx.RollGameType.BaseResult.ChangeCoin + playerEx.taxCoin + totalin
@ -965,7 +965,7 @@ func IceAgeCheckAndSaveLog(sceneEx *IceAgeSceneData, playerEx *IceAgePlayerData)
IsFree: playerEx.RollGameType.BaseResult.IsFree, IsFree: playerEx.RollGameType.BaseResult.IsFree,
WinSmallGame: playerEx.RollGameType.BaseResult.WinSmallGame, WinSmallGame: playerEx.RollGameType.BaseResult.WinSmallGame,
WinTotal: playerEx.RollGameType.BaseResult.WinTotal, WinTotal: playerEx.RollGameType.BaseResult.WinTotal,
GameTime: 1, GameTime: 2,
}) })
} }
} }

4
gamesrv/richblessed/scenedata_richblessed.go
View File

@ -351,7 +351,7 @@ func (s *RichBlessedSceneData) SaveLog(p *RichBlessedPlayerData, isOffline int)
s.SaveGameDetailedLog(&base.SaveGameDetailedParam{ s.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logId, LogId: logId,
Detail: info, Detail: info,
GameTime: 1, GameTime: 2,
}) })
//水池上下文环境s //水池上下文环境s
s.CpCtx = p.cpCtx s.CpCtx = p.cpCtx
@ -376,7 +376,7 @@ func (s *RichBlessedSceneData) SaveLog(p *RichBlessedPlayerData, isOffline int)
WinAmountNoAnyTax: p.Coin - p.startCoin, WinAmountNoAnyTax: p.Coin - p.startCoin,
IsFirstGame: s.IsPlayerFirst(p.Player), IsFirstGame: s.IsPlayerFirst(p.Player),
IsFree: totalIn == 0, IsFree: totalIn == 0,
GameTime: 1, GameTime: 2,
}) })
} }
s.GameNowTime = time.Now() s.GameNowTime = time.Now()

4
gamesrv/tamquoc/scenepolicy_tamquoc.go
View File

@ -781,7 +781,7 @@ func TamQuocCheckAndSaveLog(sceneEx *TamQuocSceneData, playerEx *TamQuocPlayerDa
sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{ sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
LogId: logid, LogId: logid,
Detail: info, Detail: info,
GameTime: 1, GameTime: 2,
}) })
totalin := int64(playerEx.RollGameType.BaseResult.TotalBet) totalin := int64(playerEx.RollGameType.BaseResult.TotalBet)
totalout := playerEx.RollGameType.BaseResult.ChangeCoin + playerEx.taxCoin + totalin totalout := playerEx.RollGameType.BaseResult.ChangeCoin + playerEx.taxCoin + totalin
@ -801,7 +801,7 @@ func TamQuocCheckAndSaveLog(sceneEx *TamQuocSceneData, playerEx *TamQuocPlayerDa
IsFree: playerEx.RollGameType.BaseResult.IsFree, IsFree: playerEx.RollGameType.BaseResult.IsFree,
WinSmallGame: playerEx.RollGameType.BaseResult.WinSmallGame, WinSmallGame: playerEx.RollGameType.BaseResult.WinSmallGame,
WinTotal: playerEx.RollGameType.BaseResult.WinTotal, WinTotal: playerEx.RollGameType.BaseResult.WinTotal,
GameTime: 1, GameTime: 2,
}) })
} }
} }