diff --git a/gamesrv/fortunedragon/playerdata_fortunedragon.go b/gamesrv/fortunedragon/playerdata_fortunedragon.go index e65dd97..973e7ec 100644 --- a/gamesrv/fortunedragon/playerdata_fortunedragon.go +++ b/gamesrv/fortunedragon/playerdata_fortunedragon.go @@ -20,6 +20,8 @@ type FortuneDragonPlayerData struct { winCoin int64 currentLogId string totalBet int64 + + isFree bool //只用于判断是否可以离开 } func (p *FortuneDragonPlayerData) init() { diff --git a/gamesrv/fortunedragon/scenedata_fortunedragon.go b/gamesrv/fortunedragon/scenedata_fortunedragon.go index 238d4ec..bb70530 100644 --- a/gamesrv/fortunedragon/scenedata_fortunedragon.go +++ b/gamesrv/fortunedragon/scenedata_fortunedragon.go @@ -1,10 +1,14 @@ package fortunedragon -import "mongo.games.com/game/gamesrv/base" +import ( + "mongo.games.com/game/gamesrv/base" + "mongo.games.com/game/gamesrv/slotspkg/assemble" +) type FortuneDragonSceneData struct { *base.Scene //场景 players map[int32]*FortuneDragonPlayerData //玩家信息 + BetConfig *assemble.BetConfig } func NewFortuneDragonSceneData(s *base.Scene) *FortuneDragonSceneData { diff --git a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go index f263509..ddab48e 100644 --- a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go +++ b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go @@ -217,6 +217,9 @@ func FortuneDragonCreateRoomInfoPacket(s *base.Scene, sceneEx *FortuneDragonScen data := assemble.DataToCli(Response).(assemble.TableInfo) pi, _ := json.Marshal(data) pack.PlayerInfo = string(pi) + if sceneEx.BetConfig == nil { + sceneEx.BetConfig = &data.BetConfig + } } else { logger.Logger.Error("slots enter err:", err) } @@ -327,11 +330,11 @@ func (this *SceneStateStartFortuneDragon) CanChangeTo(s base.SceneState) bool { // 当前状态能否换桌 func (this *SceneStateStartFortuneDragon) CanChangeCoinScene(s *base.Scene, p *base.Player) bool { - //if playerEx, ok := p.GetExtraData().(*FortuneDragonPlayerData); ok { - // if playerEx.IsOnLine() { - // return false - // } - //} + if playerEx, ok := p.GetExtraData().(*FortuneDragonPlayerData); ok { + if playerEx.isFree { + return false + } + } return true } @@ -375,6 +378,18 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play playerEx.BetSizeIndex = params[0] playerEx.BetLevelIndex = params[1] playerEx.BetLineIndex = params[2] + needCoin := sceneEx.BetConfig.BetSize[params[0]] * float64(sceneEx.BetConfig.BetLevel[params[1]]) * + float64(sceneEx.BetConfig.BetLines[params[2]]) + if needCoin < float64(playerEx.Coin) { + pack := &protocol.SCFortuneDragonBilled{ + OpRetCode: proto.Int32(1), + } + proto.SetDefaults(pack) + logger.Logger.Trace("SCFortuneDragonBilled:", pack.String()) + playerEx.SendToClient(int(protocol.FortuneDragonPID_PACKET_FORTUNEDRAGON_SCFORTUNEDRAGONBILLED), pack) + return true + } + playerEx.BetMode = params[3] playerEx.SlotsSession.SetCoin(playerEx.Coin * fortunedragon.NowByte) @@ -423,6 +438,11 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play IsAddTimes: true, }) } + if data.Results[0].FreeNum > 0 { + playerEx.isFree = true + } else { + playerEx.isFree = false + } } else { logger.Logger.Error("slots Play err:", err) } diff --git a/gamesrv/fortunerabbit/playerdata_fortunerabbit.go b/gamesrv/fortunerabbit/playerdata_fortunerabbit.go index aa109e6..29dc9aa 100644 --- a/gamesrv/fortunerabbit/playerdata_fortunerabbit.go +++ b/gamesrv/fortunerabbit/playerdata_fortunerabbit.go @@ -15,6 +15,8 @@ type FortuneRabbitPlayerData struct { BetLevelIndex int64 `json:"bli"` //选中的等级下标 BetLineIndex int64 `json:"bii"` //选中的线数下标 BetMode int64 `json:"bm,optional"` //0.常规 1.必中 + + isFree bool //只用于判断是否可以离开 } func (p *FortuneRabbitPlayerData) init() { diff --git a/gamesrv/fortunerabbit/scenedata_fortunerabbit.go b/gamesrv/fortunerabbit/scenedata_fortunerabbit.go index bdbd12a..2b3f42c 100644 --- a/gamesrv/fortunerabbit/scenedata_fortunerabbit.go +++ b/gamesrv/fortunerabbit/scenedata_fortunerabbit.go @@ -1,10 +1,14 @@ package fortunerabbit -import "mongo.games.com/game/gamesrv/base" +import ( + "mongo.games.com/game/gamesrv/base" + "mongo.games.com/game/gamesrv/slotspkg/assemble" +) type FortuneRabbitSceneData struct { *base.Scene //场景 players map[int32]*FortuneRabbitPlayerData //玩家信息 + BetConfig *assemble.BetConfig } func NewFortuneRabbitSceneData(s *base.Scene) *FortuneRabbitSceneData { diff --git a/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go b/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go index bd90277..2d8b7dc 100644 --- a/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go +++ b/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go @@ -109,11 +109,6 @@ func (this *ScenePolicyFortuneRabbit) OnPlayerLeave(s *base.Scene, p *base.Playe return } logger.Logger.Trace("(this *ScenePolicyFortuneRabbit) OnPlayerLeave, sceneId=", s.GetSceneId(), " player=", p.SnId) - if sceneEx, ok := s.ExtraData.(*FortuneRabbitSceneData); ok { - s.FirePlayerEvent(p, base.PlayerEventLeave, nil) - sceneEx.OnPlayerLeave(p, reason) - } - if playerEx, ok := p.ExtraData.(*FortuneRabbitPlayerData); ok { m := playerEx.PushPlayer() if m != nil && len(m) > 0 { @@ -130,6 +125,10 @@ func (this *ScenePolicyFortuneRabbit) OnPlayerLeave(s *base.Scene, p *base.Playe } } } + if sceneEx, ok := s.ExtraData.(*FortuneRabbitSceneData); ok { + s.FirePlayerEvent(p, base.PlayerEventLeave, nil) + sceneEx.OnPlayerLeave(p, reason) + } } // 玩家掉线 @@ -216,6 +215,9 @@ func FortuneRabbitCreateRoomInfoPacket(s *base.Scene, sceneEx *FortuneRabbitScen data := assemble.DataToCli(Response).(assemble.TableInfo) pi, _ := json.Marshal(data) pack.PlayerInfo = string(pi) + if sceneEx.BetConfig == nil { + sceneEx.BetConfig = &data.BetConfig + } } else { logger.Logger.Error("slots enter err:", err) } @@ -326,11 +328,11 @@ func (this *SceneStateStartFortuneRabbit) CanChangeTo(s base.SceneState) bool { // 当前状态能否换桌 func (this *SceneStateStartFortuneRabbit) CanChangeCoinScene(s *base.Scene, p *base.Player) bool { - //if playerEx, ok := p.GetExtraData().(*FortuneRabbitPlayerData); ok { - // if playerEx.IsOnLine() { - // return false - // } - //} + if playerEx, ok := p.GetExtraData().(*FortuneRabbitPlayerData); ok { + if playerEx.isFree { + return false + } + } return true } @@ -375,6 +377,17 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play playerEx.BetLevelIndex = params[1] playerEx.BetLineIndex = params[2] //playerEx.BetMode = params[3] + needCoin := sceneEx.BetConfig.BetSize[params[0]] * float64(sceneEx.BetConfig.BetLevel[params[1]]) * + float64(sceneEx.BetConfig.BetLines[params[2]]) + if needCoin < float64(playerEx.Coin) { + pack := &protocol.SCFortuneRabbitBilled{ + OpRetCode: proto.Int32(1), + } + proto.SetDefaults(pack) + logger.Logger.Trace("SCFortuneRabbitBilled:", pack.String()) + playerEx.SendToClient(int(protocol.FortuneRabbitPID_PACKET_FORTUNERABBIT_SCFORTUNERABBITBILLED), pack) + return true + } playerEx.SlotsSession.SetCoin(playerEx.Coin * fortunerabbit.NowByte) @@ -393,6 +406,12 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play pi, _ := json.Marshal(data) gameEndStr = string(pi) playerEx.Coin = int64(data.FinalCoin) + + if data.Results[0].FreeNum > 0 { + playerEx.isFree = true + } else { + playerEx.isFree = false + } } else { logger.Logger.Error("slots Play err:", err) }