1

2026-07-12 00:26:17 +08:00
parent b080747b56
commit 7d90624a8a
8 changed files with 2819 additions and 15 deletions
@@ -113,8 +113,22 @@ namespace Assets.MyGame.Scripts.Net

                            break;
                        case "ReadyNotice":
-                            //roomMainPanel.subUIManager.CloseAll();
-                            roomMainPanel.InitRoomData();
+                            {
+                                // ReadyNotice arguments[0] 是用户ID字符串，不是房间对象
+                                var userId = JsonConvert.DeserializeObject<WebSocketResponseBase<string>>(msg).arguments[0];
+                                // 标记该玩家已准备
+                                if (roomMainPanel.roomData != null && roomMainPanel.roomData.users != null)
+                                {
+                                    var u = roomMainPanel.roomData.users.Find(x => x.userId == userId);
+                                    if (u != null) u.isReady = true;
+                                    // 只有双方都准备好才进入游戏
+                                    if (roomMainPanel.roomData.users.Count >= 2
+                                        && roomMainPanel.roomData.users.TrueForAll(x => x.isReady))
+                                    {
+                                        roomMainPanel.InitRoomData();
+                                    }
+                                }
+                            }
                            break;
                        case "GameOperation":
                            {