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

Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

This commit is contained in:
sk 2024-09-06 15:39:57 +08:00
parent c20f0fa69c 8a19cd642f
commit 2f74e5bfab
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gamesrv/clawdoll/scenepolicy_clawdoll.go
View File

@ -677,12 +677,6 @@ func (this *PlayGame) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, para
//1-弱力抓 2 -强力抓 //1-弱力抓 2 -强力抓
sceneEx.OnPlayerSMGrabOp(p.SnId, int32(sceneEx.machineId), grapType) sceneEx.OnPlayerSMGrabOp(p.SnId, int32(sceneEx.machineId), grapType)
s.ChangeSceneState(rule.ClawDollSceneStateBilled)
sceneEx.SetPlayingState(int32(rule.ClawDollSceneStateBilled))
ClawdollBroadcastRoomState(s)
ClawdollSendPlayerInfo(s)
case rule.ClawDollPlayerOpMove: case rule.ClawDollPlayerOpMove:
if !sceneEx.CheckMoveOp(playerEx) { if !sceneEx.CheckMoveOp(playerEx) {
@ -713,11 +707,6 @@ func (this *PlayGame) OnTick(s *base.Scene) {
logger.Logger.Trace("PlayGame OnTick TimeOutPlayGrab SnId", sceneEx.playingSnid, " machineId:", sceneEx.machineId) logger.Logger.Trace("PlayGame OnTick TimeOutPlayGrab SnId", sceneEx.playingSnid, " machineId:", sceneEx.machineId)
} }
s.ChangeSceneState(rule.ClawDollSceneStateBilled)
sceneEx.SetPlayingState(int32(rule.ClawDollSceneStateBilled))
ClawdollBroadcastRoomState(s)
ClawdollSendPlayerInfo(s)
return return
} }
} }

2
public

@ -1 +1 @@
Subproject commit 9d355215710228e4481fc6334f6e14b902a03e95 Subproject commit 00b9fce886af5b6a926aa804d3cad33be9ea0793