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

fix ox 营收

This commit is contained in:
tomas 2024-12-02 10:26:47 +08:00
parent 2fb75da43e
commit 126f9579c5
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/constant.go
View File

@ -84,6 +84,8 @@ const (
GameId_FortuneRabbit = 310 // FortuneRabbit GameId_FortuneRabbit = 310 // FortuneRabbit
GameId_FortuneOx = 311 // FortuneOx GameId_FortuneOx = 311 // FortuneOx
GameId_FortuneMouse = 312 // FortuneMouse GameId_FortuneMouse = 312 // FortuneMouse
GameId_CashMania = 313 // CashMania
GameId_GatesOfOlympus = 314 // GatesOfOlympus
__GameId_Fishing_Min__ = 400 //################捕鱼类################ __GameId_Fishing_Min__ = 400 //################捕鱼类################
GameId_HFishing = 401 //欢乐捕鱼 GameId_HFishing = 401 //欢乐捕鱼
GameId_TFishing = 402 //天天捕鱼 GameId_TFishing = 402 //天天捕鱼

14
gamesrv/fortuneox/scenepolicy_fortuneox.go
View File

@ -510,19 +510,27 @@ 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 { 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
}
if respinStatus != 0 && respinStatus != 1 {
data.TotalBet = 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 var totalin, totalout int64
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 { if respinStatus == 1 {
totalin = playerEx.totalBet totalin = playerEx.totalBet
} }
if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 { if respinStatus == 0 || respinStatus == 3 {
totalout = int64(data.RoundReward) + playerEx.taxCoin totalout = int64(data.RoundReward) + playerEx.taxCoin
} }
validFlow := totalin + totalout validFlow := totalin + totalout