1

2026-06-30 01:31:53 +08:00
parent 4fba8adf25
commit a0229d44c9
110 changed files with 9965 additions and 2830 deletions
@@ -110,6 +110,27 @@ namespace Assets.MyGame.Scripts.Net
                UIManager.Instance.Close(UIPanel.HomeMainPanel);
                WebSocketManager.Instance.isGame = true;
            }
+            else
+            {
+                // 面板已存在 → 新玩家加入，转发给现有面板激活座位
+                var panel = UIManager.Instance.Get<GameMainPanel_Base>(uIPanel);
+                if (panel is GameMainPanel_FishBase fishPanel)
+                {
+                    var v = JsonConvert.DeserializeObject<WebSocketResponseBase<RoomJoinNotice>>(msg);
+                    if (v.arguments.Count > 0)
+                    {
+                        var notice = v.arguments[0];
+                        // 如果座位被bot占用则替换
+                        var targetSit = fishPanel.list_Sits.Find(s => s.posID == notice.position);
+                        if (targetSit != null && targetSit.isBot)
+                        {
+                            targetSit.isBot = false;
+                            targetSit.gameObject.SetActive(false);
+                        }
+                        fishPanel.JoinGame(notice.position, notice.gold, notice.diamond, notice.cannonMultiple, 0, notice.userId, notice.cannonId, notice.wingsId);
+                    }
+                }
+            }
           

        }
@@ -217,6 +238,9 @@ namespace Assets.MyGame.Scripts.Net
                case FrameDataType.changeCannonMultiple:
                    EventCenter.Instance.EventTrigger<SyncGameData>(ConstEventString.SyncGameData_ChangeCannonMultiple, syncGameData);
                    break;
+                case FrameDataType.changeWing:
+                    EventCenter.Instance.EventTrigger<SyncGameData>(ConstEventString.SyncGameData_ChangeWing, syncGameData);
+                    break;
                default:
                    break;
            }