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

Compare commits

base: tl_server_2:10d494e9a86598994aaa1deaf1654207a8bf0c75
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:f71ea6ca19e49098b8411a590f8bc710dc93a76a
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. "10d494e9a86598994aaa1deaf1654207a8bf0c75" and "f71ea6ca19e49098b8411a590f8bc710dc93a76a" have entirely different histories.
10d494e9a8 ... f71ea6ca19

4 changed files with 13 additions and 45 deletions
Show Stats Expand all files Collapse all files

16
gamesrv/fortunedragon/scenepolicy_fortunedragon.go
View File

@ -505,21 +505,13 @@ 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 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{})
var totalin, totalout int64 totalin := playerEx.totalBet
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { totalout := int64(data.RoundReward) + playerEx.taxCoin
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{
@ -532,8 +524,8 @@ func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneD
TotalIn: totalin, TotalIn: totalin,
TotalOut: totalout, TotalOut: totalout,
TaxCoin: playerEx.taxCoin, TaxCoin: playerEx.taxCoin,
BetAmount: totalin, BetAmount: playerEx.totalBet,
WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin, WinAmountNoAnyTax: int64(data.RoundReward) + 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,21 +510,13 @@ 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{})
var totalin, totalout int64 totalin := playerEx.totalBet
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { totalout := int64(data.RoundReward) + playerEx.taxCoin
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{
@ -538,7 +530,7 @@ func FortuneOxAndSaveLog(sceneEx *FortuneOxSceneData, playerEx *FortuneOxPlayerD
TotalOut: totalout, TotalOut: totalout,
TaxCoin: playerEx.taxCoin, TaxCoin: playerEx.taxCoin,
BetAmount: playerEx.totalBet, BetAmount: playerEx.totalBet,
WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin, WinAmountNoAnyTax: int64(data.RoundReward) + playerEx.taxCoin,
ValidBet: validBet, ValidBet: validBet,
ValidFlow: validFlow, ValidFlow: validFlow,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player), IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),

14
gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go
View File

@ -504,21 +504,13 @@ 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 {
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{})
var totalin, totalout int64 totalin := playerEx.totalBet
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { totalout := int64(data.RoundReward) + playerEx.taxCoin
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{
@ -532,7 +524,7 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR
TotalOut: totalout, TotalOut: totalout,
TaxCoin: playerEx.taxCoin, TaxCoin: playerEx.taxCoin,
BetAmount: playerEx.totalBet, BetAmount: playerEx.totalBet,
WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin, WinAmountNoAnyTax: int64(data.RoundReward) + 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,21 +507,13 @@ 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{})
var totalin, totalout int64 totalin := playerEx.totalBet
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { totalout := int64(data.RoundReward) + playerEx.taxCoin
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{
@ -535,7 +527,7 @@ func FortuneTigerAndSaveLog(sceneEx *FortuneTigerSceneData, playerEx *FortuneTig
TotalOut: totalout, TotalOut: totalout,
TaxCoin: playerEx.taxCoin, TaxCoin: playerEx.taxCoin,
BetAmount: playerEx.totalBet, BetAmount: playerEx.totalBet,
WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin, WinAmountNoAnyTax: int64(data.RoundReward) + playerEx.taxCoin,
ValidBet: validBet, ValidBet: validBet,
ValidFlow: validFlow, ValidFlow: validFlow,
IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player), IsFirstGame: sceneEx.IsPlayerFirst(playerEx.Player),