wz1531/5.24BuYu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wz1531
2026-09-24 23:53:02 +08:00
parent bb11d58f7b
commit b777f0f6aa
21 changed files with 89 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/Windows/addressables_content_state.bin
BIN
View File
Binary file not shown.
Assets/Art/FengLei/Fish/24.prefab
+7 -1
View File
@@ -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
Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs
+17
View File
@@ -313,6 +313,23 @@ namespace Assets.MyGame.Scripts.Net
}
break;
case "PlayerAfkNotice":
{
// 玩家挂起通知 { userId }（房间组推送；挂起仅表现提示，不影响服务端操作校验）
// 表现层（座位挂起标记）由 UI 对话接入
var va = JsonConvert.DeserializeObject<WebSocketResponseBase<PlayerAfkNoticeData>>(msg).arguments[0];
Debug.Log($"[Chess] 玩家挂起: userId={va?.userId}");
}
break;
case "PlayerCancelAfkNotice":
{
// 玩家取消挂起通知 { userId }（房间组推送；发起者本人另收 BeginGame 恢复房间同步）
var va = JsonConvert.DeserializeObject<WebSocketResponseBase<PlayerAfkNoticeData>>(msg).arguments[0];
Debug.Log($"[Chess] 玩家取消挂起: userId={va?.userId}");
}
break;
default:
break;
}
Assets/MyGame/Scripts/Net/WebSocketSendList_ChineseChess.cs
+14
View File
@@ -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 + "]}");
}
/// <summary>玩家挂起（2.13）：对局中将自己标记为挂起状态，房间内其他玩家收到 PlayerAfkNotice</summary>
public static void SetPlayerAfkChineseChess(string gameId, string userId)
{
WebSocketManager.Instance.Send(SocketType.chess, "{\"type\":1,\"target\":\"SetPlayerAfk\",\"invocationId\":\"1\",\"arguments\":[\"" + gameId + "\",\"" + userId + "\"]}");
}
/// <summary>取消挂起（2.13）：房间内其他玩家收到 PlayerCancelAfkNotice，本人收到 BeginGame 恢复房间同步</summary>
public static void CancelPlayerAfkChineseChess(string gameId, string userId)
{
WebSocketManager.Instance.Send(SocketType.chess, "{\"type\":1,\"target\":\"CancelPlayerAfk\",\"invocationId\":\"1\",\"arguments\":[\"" + gameId + "\",\"" + userId + "\"]}");
}
}
Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab
+3
View File
@@ -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}
Assets/MyGame/aa/Game/HHWK/Fish/Fish_2012 Variant.prefab
+3
View File
@@ -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}
Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab
+3
View File
@@ -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
Assets/MyGame/aa/Game/HHWK/Fish/Fish_2014 Variant.prefab
+3
View File
@@ -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
Assets/MyGame/aa/Game/HHWK/Fish/Fish_3002 Variant.prefab
+3
View File
@@ -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}
Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab
+3
View File
@@ -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,
Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab
+3
View File
@@ -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
Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab
+3
View File
@@ -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,
Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab
+3
View File
@@ -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,
Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab
+3
View File
@@ -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,
Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab
+3
View File
@@ -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
Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab
+3
View File
@@ -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
Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab
+3
View File
@@ -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,
Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab
+3
View File
@@ -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,
Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab
+3
View File
@@ -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,
Assets/MyGame/aa/Game/HHWK/Fish/fish_3001 Variant.prefab
+3
View File
@@ -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
Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab
+3
View File
@@ -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,