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

Merge branch 'dev_slots' into develop

This commit is contained in:
sk 2024-10-30 16:17:25 +08:00
parent 505b0f01ef a10ff0ecc7
commit 6a9c97c77c
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gamesrv/fortunedragon/scenepolicy_fortunedragon.go
View File

@ -446,6 +446,9 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
} else {
logger.Logger.Error("slots Play err:", err)
}
playerEx.SlotsSession.SetCoin(int64(data.FinalCoin) * fortunedragon.NowByte)
pack := &protocol.SCFortuneDragonBilled{
OpRetCode: proto.Int32(0),
GameEndStr: proto.String(gameEndStr),

12
gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go
View File

@ -391,6 +391,7 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play
}
//playerEx.SlotsSession.SetCoin(playerEx.Coin * fortunerabbit.NowByte)
//logger.Logger.Trace("=============init dif coin", playerEx.Coin-playerEx.SlotsSession.Coin()/fortunerabbit.NowByte)
//get data
Response, err := slots.SlotsMgrSington.Play(playerEx.SlotsSession, &base.SpinReq{
@ -407,8 +408,10 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play
data = assemble.DataToCli(Response).(assemble.GameEnd)
if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
//第一次触发或者正常模式
//logger.Logger.Trace("=============addcoin1111 ", -data.TotalBet)
playerEx.AddCoin(int64(-data.TotalBet), common.GainWay_HundredSceneLost, base.SyncFlag_ToClient, "system", s.GetSceneName())
playerEx.totalBet = int64(data.TotalBet)
//logger.Logger.Trace("=======bet======dif++++ ", float64(playerEx.Coin)-data.BetAfterCoin)
}
var taxCoin float64
if data.RoundReward > 0 {
@ -427,7 +430,9 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play
gameEndStr = string(pi)
if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 {
//logger.Logger.Trace("===win==========addcoin222 ", data.RoundReward)
playerEx.AddCoin(int64(data.RoundReward), common.GainWay_HundredSceneWin, 0, "system", s.GetSceneName())
//logger.Logger.Trace("=======win======dif++++ ", float64(playerEx.Coin)-data.FinalCoin)
//免费游戏结束或者正常模式
sceneEx.StaticsLaba(&base.StaticLabaParam{
SnId: playerEx.SnId,
@ -450,8 +455,13 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play
} else {
logger.Logger.Error("slots Play err:", err)
}
playerEx.SlotsSession.SetCoin(int64(data.FinalCoin) * fortunerabbit.NowByte)
//logger.Logger.Trace("======end=======init dif coin", playerEx.Coin-playerEx.SlotsSession.Coin()/fortunerabbit.NowByte)
if playerEx.Coin != int64(data.FinalCoin) {
logger.Logger.Error("==========playerEx.Coin != Response.Coin==============", playerEx.Coin, data.FinalCoin)
logger.Logger.Error("==========playerEx.Coin != data.FinalCoin==============", (float64(playerEx.Coin)-data.FinalCoin)/10000)
}
pack := &protocol.SCFortuneRabbitBilled{
OpRetCode: proto.Int32(0),