From b777f0f6aaff0b43c8ff41805e6b3e5991f0d41d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Thu, 24 Sep 2026 23:53:02 +0800 Subject: [PATCH] 1 --- .../Windows/addressables_content_state.bin | Bin 4130 -> 4130 bytes Assets/Art/FengLei/Fish/24.prefab | 8 +++++++- .../Scripts/Net/WebSocketManager_Message.cs | 17 +++++++++++++++++ .../Net/WebSocketSendList_ChineseChess.cs | 14 ++++++++++++++ .../Game/HHWK/Fish/Fish_2011 Variant.prefab | 3 +++ .../Game/HHWK/Fish/Fish_2012 Variant.prefab | 3 +++ .../Game/HHWK/Fish/Fish_2013 Variant.prefab | 3 +++ .../Game/HHWK/Fish/Fish_2014 Variant.prefab | 3 +++ .../Game/HHWK/Fish/Fish_3002 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_1017 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_1019 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_1020 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_1021 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_1024 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_1025 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_1026 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_1027 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_1028 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_2010 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_3001 Variant.prefab | 3 +++ .../Game/HHWK/Fish/fish_3003 Variant.prefab | 3 +++ 21 files changed, 89 insertions(+), 1 deletion(-) diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin index 1ae4c501f99aa4c03a72b70237d2e9796bb174ca..7e42c64b7668637f79abd23cff181c2ecd19b759 100644 GIT binary patch delta 532 zcmaiwy-LJD6ooelt_$mKECdVLHDU@IWo9yyxzk82wXzWwL2xoZf?#7Qm|6s@0fjA7 zY9pku*S8Q6wQy^F0>>xF<^D7W?)grg)XC#TlrSa`5W@)pgfP~lA(t_LVR*BI5 z6(tM=5Ue#wRZ>nRRVLGf0%>O5aj+_71`3eWB2$31rQQ|)S7=*eD_q*E5~g^`^AZ`u zGlHZPOc0!TsWDkjh;5#GYhl{PcMdUk^ZlD}>$|z_Zv<%@YF)oQxvz!8v<-LVY&LPn zgJS#oeze%}75Ev`_&r8QFQX*-Umgvv+t7O-Fizbo73Xgy$*}$vifwRcsXs0 Sh`pR1xJg`uojo^=ul@iel9-eL delta 532 zcmaiwyGjE=6o%adV<0yJ0UMKSa0!-Y?lX-niiIN9!A56xcAh~}q*f%=fI{rjY7yAR z+9HLIU?F0omEapVZ?K1RY0lw4-@lBP@oHL)1yvX$A&qp-V&#m^v85Ts5*eKlQ!J`~ zQLGuwsa7BWE9)>5IIPgjg0qS-!~N6dECx#{Fo}iHoG9f$WEwLhfhl99bpE6^i@DKO zYoNvvFqA4KIdEhV%?0P-hvK_7h=!oC=9Xv!3J_x$V`3#S1~P`hBA?V}F)>_c$SSJ{ z7m8|tJcw#=dAME?XGThbg*{;88 zr3ZJt{`N+QDC8i_UZ@%mt<;Re?(LiZXr&c<>f`pqUWqM_=aZ&?Z>QDc&xP-Ic9JrS Sx-aWXKk1~E>5*S_ZvFw6$CJhY diff --git a/Assets/Art/FengLei/Fish/24.prefab b/Assets/Art/FengLei/Fish/24.prefab index 0cbbcfeb4..480e99b11 100644 --- a/Assets/Art/FengLei/Fish/24.prefab +++ b/Assets/Art/FengLei/Fish/24.prefab @@ -93,7 +93,10 @@ MonoBehaviour: - {fileID: 5085328304069200089} needLockEvent: 0 createVideoClip: {fileID: 0} - rotationPY: 60 + rotationPY: -120 + useMirrorCompensate: 1 + useRollSignFlip: 1 + useRouteFlipX: 1 baseMmove: 0 isRotate: 1 isNot1: 0 @@ -101,6 +104,9 @@ MonoBehaviour: depthOffset: 550 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!1 &275721532689243691 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs index 7c0d33e5e..95908ac36 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs @@ -313,6 +313,23 @@ namespace Assets.MyGame.Scripts.Net } break; + case "PlayerAfkNotice": + { + // 玩家挂起通知 { userId }（房间组推送；挂起仅表现提示，不影响服务端操作校验） + // 表现层（座位挂起标记）由 UI 对话接入 + var va = JsonConvert.DeserializeObject>(msg).arguments[0]; + Debug.Log($"[Chess] 玩家挂起: userId={va?.userId}"); + } + break; + + case "PlayerCancelAfkNotice": + { + // 玩家取消挂起通知 { userId }（房间组推送；发起者本人另收 BeginGame 恢复房间同步） + var va = JsonConvert.DeserializeObject>(msg).arguments[0]; + Debug.Log($"[Chess] 玩家取消挂起: userId={va?.userId}"); + } + break; + default: break; } diff --git a/Assets/MyGame/Scripts/Net/WebSocketSendList_ChineseChess.cs b/Assets/MyGame/Scripts/Net/WebSocketSendList_ChineseChess.cs index c9e583182..334b39ad0 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketSendList_ChineseChess.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketSendList_ChineseChess.cs @@ -34,6 +34,8 @@ public partial class WebSocketSendList } public static void GameOperationChineseChess(string roomId, int operateID, string userId) { + // ⚠ 文档定义: invoke("GameOperation", gameId, type, data)，type: 1=求和 2=认输 3=悔棋，data=附加数据。 + // 现有 UI 层调用第三参传的是玩家编号，operateID 还含 4/5 等 UI 扩展值——与文档的语义对齐由 UI 层对话处理，协议层保持原样。 WebSocketManager.Instance.Send(SocketType.chess, "{\"type\":1,\"target\":\"GameOperation\",\"invocationId\":\"1\",\"arguments\":[\"" + roomId + "\"," + operateID + ",\"" + userId + "\"]}"); } @@ -66,4 +68,16 @@ public partial class WebSocketSendList string escaped = data == null ? "\"\"" : JsonConvert.SerializeObject(data); WebSocketManager.Instance.Send(SocketType.chess, "{\"type\":1,\"target\":\"SyncGameData\",\"invocationId\":\"1\",\"arguments\":[\"" + gameId + "\"," + escaped + "]}"); } + + /// 玩家挂起（2.13）：对局中将自己标记为挂起状态，房间内其他玩家收到 PlayerAfkNotice + public static void SetPlayerAfkChineseChess(string gameId, string userId) + { + WebSocketManager.Instance.Send(SocketType.chess, "{\"type\":1,\"target\":\"SetPlayerAfk\",\"invocationId\":\"1\",\"arguments\":[\"" + gameId + "\",\"" + userId + "\"]}"); + } + + /// 取消挂起（2.13）：房间内其他玩家收到 PlayerCancelAfkNotice，本人收到 BeginGame 恢复房间同步 + public static void CancelPlayerAfkChineseChess(string gameId, string userId) + { + WebSocketManager.Instance.Send(SocketType.chess, "{\"type\":1,\"target\":\"CancelPlayerAfk\",\"invocationId\":\"1\",\"arguments\":[\"" + gameId + "\",\"" + userId + "\"]}"); + } } diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab index f4e5a7d95..044da7934 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab @@ -697,3 +697,6 @@ MonoBehaviour: depthOffset: 840 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2012 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2012 Variant.prefab index d916c1d9a..9c7d58693 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2012 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2012 Variant.prefab @@ -701,3 +701,6 @@ MonoBehaviour: depthOffset: -850 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab index 4bc8fe5d7..a2e23a856 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab @@ -397,6 +397,9 @@ MonoBehaviour: depthOffset: 860 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!1001 &6537198470344860617 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2014 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2014 Variant.prefab index 0c56652dd..49c906415 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2014 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2014 Variant.prefab @@ -429,6 +429,9 @@ MonoBehaviour: depthOffset: 870 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!1001 &6972630653134549612 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_3002 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_3002 Variant.prefab index f0c399bc5..a1ac1806a 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_3002 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_3002 Variant.prefab @@ -911,3 +911,6 @@ MonoBehaviour: depthOffset: 890 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab index 6f2557172..220441190 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab @@ -214,6 +214,9 @@ MonoBehaviour: depthOffset: 1000 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!4 &3932267669272526887 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab index a1179956c..997e8c143 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab @@ -220,6 +220,9 @@ MonoBehaviour: depthOffset: 1000 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!1001 &6761791426332002869 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab index 4fd32d04e..44783e77b 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab @@ -374,6 +374,9 @@ MonoBehaviour: depthOffset: 1000 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!4 &7024093533638435985 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: d0d8725bed789824bb1b0462fde12f45, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab index ecdea8997..02c69a3b1 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab @@ -214,6 +214,9 @@ MonoBehaviour: depthOffset: 1000 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!4 &4331926983231046282 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 51618a9fa649dc84bbbb0f2b2ae34548, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab index 25061a092..bc1759edd 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab @@ -214,6 +214,9 @@ MonoBehaviour: depthOffset: 1000 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!4 &7201521853190922041 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab index 731969a23..4081a0e4d 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab @@ -220,6 +220,9 @@ MonoBehaviour: depthOffset: 1000 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!1001 &6202979445234625319 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab index 0230e71be..beb97aa7d 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab @@ -292,6 +292,9 @@ MonoBehaviour: depthOffset: 1000 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!1001 &2585595305865003636 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab index 6f3b8bbe3..da5dccc63 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab @@ -214,6 +214,9 @@ MonoBehaviour: depthOffset: 1000 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!4 &3527731164989796449 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 10dcab870ce73d24abf17f9ea84712ad, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab index 7a933445f..c92cbf1f5 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab @@ -214,6 +214,9 @@ MonoBehaviour: depthOffset: 1000 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!4 &3079608771229918319 stripped Transform: m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: d441aa2f2c0f8524e9a494199140b726, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab index 05108ee21..65ca90976 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab @@ -353,6 +353,9 @@ MonoBehaviour: depthOffset: 830 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!4 &4073602345332461237 stripped Transform: m_CorrespondingSourceObject: {fileID: 4472185465350827, guid: c61d7b09b58215148aaffc1b82f11bf4, diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3001 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3001 Variant.prefab index 1af7b5849..5e10d9ed2 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3001 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3001 Variant.prefab @@ -509,6 +509,9 @@ MonoBehaviour: depthOffset: 880 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!1001 &8244822918661465325 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab index bb02c79ad..bda18227c 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab @@ -735,6 +735,9 @@ MonoBehaviour: depthOffset: 900 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!4 &7952344689971121780 stripped Transform: m_CorrespondingSourceObject: {fileID: 4918264173551851, guid: a87bdbcfa12d35644b5c34825a6e6591,