Compare commits
No commits in common. "13042959c9a57611d6b1bd488709422368fb0c11" and "b46db9b36b198d1b3998c3d9cd14a3d09aeb7ada" have entirely different histories.
13042959c9
...
b46db9b36b
|
@ -78,19 +78,9 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data
|
||||||
logger.Logger.Tracef("上分成功!!!!!!!!!!!!snid = ", msg.Snid)
|
logger.Logger.Tracef("上分成功!!!!!!!!!!!!snid = ", msg.Snid)
|
||||||
//发送向前移动指令
|
//发送向前移动指令
|
||||||
sceneEx.OnPlayerSMPerateOp(p.SnId, int32(sceneEx.machineId), rule.ButtonFront)
|
sceneEx.OnPlayerSMPerateOp(p.SnId, int32(sceneEx.machineId), rule.ButtonFront)
|
||||||
|
|
||||||
s.ChangeSceneState(rule.ClawDollSceneStateStart)
|
|
||||||
sceneEx.SetPlayingState(int32(rule.ClawDollSceneStateStart))
|
|
||||||
|
|
||||||
ClawdollBroadcastRoomState(s)
|
|
||||||
ClawdollSendPlayerInfo(s)
|
|
||||||
|
|
||||||
ClawdollBroadcastPlayingInfo(s)
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
logger.Logger.Tracef("上分失败!!!!!!!!!!!!snid = ", msg.Snid)
|
logger.Logger.Tracef("上分失败!!!!!!!!!!!!snid = ", msg.Snid)
|
||||||
}
|
}
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
if msg.Result == 1 {
|
if msg.Result == 1 {
|
||||||
// 获得娃娃卡
|
// 获得娃娃卡
|
||||||
|
|
|
@ -531,6 +531,13 @@ func (this *StateWait) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, par
|
||||||
|
|
||||||
if sceneEx.CanStart() {
|
if sceneEx.CanStart() {
|
||||||
sceneEx.playingSnid = playerEx.SnId
|
sceneEx.playingSnid = playerEx.SnId
|
||||||
|
s.ChangeSceneState(rule.ClawDollSceneStateStart)
|
||||||
|
sceneEx.SetPlayingState(int32(rule.ClawDollSceneStateStart))
|
||||||
|
|
||||||
|
ClawdollBroadcastRoomState(s)
|
||||||
|
ClawdollSendPlayerInfo(s)
|
||||||
|
|
||||||
|
ClawdollBroadcastPlayingInfo(s)
|
||||||
|
|
||||||
sceneEx.OnPlayerSCOp(p, opcode, clawdoll.OpResultCode_OPRC_Success, params)
|
sceneEx.OnPlayerSCOp(p, opcode, clawdoll.OpResultCode_OPRC_Success, params)
|
||||||
}
|
}
|
||||||
|
@ -879,26 +886,6 @@ func (this *StateWaitPayCoin) OnPlayerOp(s *base.Scene, p *base.Player, opcode i
|
||||||
func (this *StateWaitPayCoin) OnEnter(s *base.Scene) {
|
func (this *StateWaitPayCoin) OnEnter(s *base.Scene) {
|
||||||
logger.Logger.Trace("(this *StateWaitPayCoin) OnEnter, sceneid=", s.GetSceneId())
|
logger.Logger.Trace("(this *StateWaitPayCoin) OnEnter, sceneid=", s.GetSceneId())
|
||||||
this.BaseState.OnEnter(s)
|
this.BaseState.OnEnter(s)
|
||||||
|
|
||||||
sceneEx, ok := s.ExtraData.(*SceneEx)
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
playerEx := sceneEx.GetPlayingEx()
|
|
||||||
if playerEx != nil {
|
|
||||||
pack := &clawdoll.SCCLAWDOLLRoundGameBilled{
|
|
||||||
RoundId: proto.Int32(int32(sceneEx.RoundId)),
|
|
||||||
ClowResult: proto.Int32(0),
|
|
||||||
Award: proto.Int64(playerEx.gainCoin),
|
|
||||||
Balance: proto.Int64(playerEx.Coin),
|
|
||||||
}
|
|
||||||
|
|
||||||
// logger.Logger.Trace("SCSmallRocketRoundGameBilled is pack: ", pack)
|
|
||||||
proto.SetDefaults(pack)
|
|
||||||
|
|
||||||
playerEx.SendToClient(int(clawdoll.CLAWDOLLPacketID_PACKET_SC_GAMEBILLED), pack)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *StateWaitPayCoin) OnLeave(s *base.Scene) {
|
func (this *StateWaitPayCoin) OnLeave(s *base.Scene) {
|
||||||
|
|
Loading…
Reference in New Issue