From 4bd2cee327429669f9752a90bd8873c7b7592bbd Mon Sep 17 00:00:00 2001 From: kxdd Date: Fri, 6 Sep 2024 14:49:51 +0800 Subject: [PATCH 1/4] public --- public | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public b/public index 9d35521..00b9fce 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit 9d355215710228e4481fc6334f6e14b902a03e95 +Subproject commit 00b9fce886af5b6a926aa804d3cad33be9ea0793 From 09dc4f45882d498a5aa95a4c93b683bad67a92f3 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Fri, 6 Sep 2024 14:55:44 +0800 Subject: [PATCH 2/4] public --- public | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public b/public index 00b9fce..d789cca 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit 00b9fce886af5b6a926aa804d3cad33be9ea0793 +Subproject commit d789cca81a36ddbaf30e5414b6c4fe530e0631f6 From 98a834b357030e7089bde36c50781fc3c4b65e61 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Fri, 6 Sep 2024 14:56:40 +0800 Subject: [PATCH 3/4] public --- public | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public b/public index 00b9fce..d789cca 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit 00b9fce886af5b6a926aa804d3cad33be9ea0793 +Subproject commit d789cca81a36ddbaf30e5414b6c4fe530e0631f6 From 8a19cd642f49f96fc111d6ce75ddc4a163fed0eb Mon Sep 17 00:00:00 2001 From: kxdd Date: Fri, 6 Sep 2024 15:36:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A8=83=E5=A8=83=E6=9C=BA=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamesrv/clawdoll/scenepolicy_clawdoll.go | 11 ----------- public | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/gamesrv/clawdoll/scenepolicy_clawdoll.go b/gamesrv/clawdoll/scenepolicy_clawdoll.go index 36886fa..f60bbfa 100644 --- a/gamesrv/clawdoll/scenepolicy_clawdoll.go +++ b/gamesrv/clawdoll/scenepolicy_clawdoll.go @@ -677,12 +677,6 @@ func (this *PlayGame) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, para //1-弱力抓 2 -强力抓 sceneEx.OnPlayerSMGrabOp(p.SnId, int32(sceneEx.machineId), grapType) - s.ChangeSceneState(rule.ClawDollSceneStateBilled) - sceneEx.SetPlayingState(int32(rule.ClawDollSceneStateBilled)) - - ClawdollBroadcastRoomState(s) - ClawdollSendPlayerInfo(s) - case rule.ClawDollPlayerOpMove: 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) } - s.ChangeSceneState(rule.ClawDollSceneStateBilled) - sceneEx.SetPlayingState(int32(rule.ClawDollSceneStateBilled)) - - ClawdollBroadcastRoomState(s) - ClawdollSendPlayerInfo(s) return } } diff --git a/public b/public index d789cca..00b9fce 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit d789cca81a36ddbaf30e5414b6c4fe530e0631f6 +Subproject commit 00b9fce886af5b6a926aa804d3cad33be9ea0793