From b1f98c42a6b859b35c26e0722efb38a6e9c215be Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 22 十月 2025 11:25:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Main/MainWin.cs |   59 +++++++++++++++++++----------------------------------------
 1 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index a629719..76d15e1 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -27,7 +27,6 @@
     [SerializeField] UIEffectPlayer fightEffect;
     [SerializeField] UIEffectPlayer openCloseAnim;
     [SerializeField] FillTween cdTween;
-    int index = 0;
 
     public bool isFirstOpen = true; //棣栨鎵撳紑
     public Text hammerText;
@@ -45,14 +44,13 @@
         UpdateCurrency();
         UpdatePlayerInfo();
         RefreshFightBtn();
-        DisplayTopBar(index);
+        DisplayTopBar();
     }
 
     protected override void OnPreOpen()
     {
         PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
         AutoFightModel.Instance.OnFightEvent += OnSkillCast;
-        ChallengeTabWin.OnCloseChallengeTabWin += OnCloseChallengeTabWin;
         BattleManager.Instance.onBattleFieldCreate += OnBattleFieldCreate;
         BattleManager.Instance.onBattleFieldDestroy += OnBattleFieldDestroy;
         base.OnPreOpen();
@@ -65,7 +63,6 @@
     {
         PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
         AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
-        ChallengeTabWin.OnCloseChallengeTabWin -= OnCloseChallengeTabWin;
         BattleManager.Instance.onBattleFieldCreate -= OnBattleFieldCreate;
         BattleManager.Instance.onBattleFieldDestroy -= OnBattleFieldDestroy;
         base.OnPreClose();
@@ -76,16 +73,11 @@
         Refresh();
     }
 
-    private void OnBattleFieldDestroy(string guid, BattleField battleField)
+    private void OnBattleFieldDestroy()
     {
         Refresh();
     }
 
-    private void OnCloseChallengeTabWin()
-    {
-        tabButtons[3].state = TitleBtnState.Normal;
-        tabButtons[3].UpdateButtonState();
-    }
 
     //澶栭儴璋冪敤鐐瑰嚮鍔熻兘
     public void ClickFunc(int functionOrder)
@@ -99,37 +91,13 @@
         tabButtons[functionOrder].SelectBtn();
     }
 
-    public void DisplayTopBar(int index)
+    public void DisplayTopBar()
     {
-        bool isOtherBattleInProgress = BattleManager.Instance.IsOtherBattleInProgress();
-        switch (index)
-        {
-            case 0:
-            case 2:
-                topBar.SetActive(true);
-                break;
-            case 1:
-            case 4:
-                topBar.SetActive(false);
-                break;
-            case 3:
-                topBar.SetActive(!isOtherBattleInProgress);
-                break;
-            default:
-                topBar.SetActive(true);
-                break;
-        }
+        topBar.SetActive(functionOrder == 0 || functionOrder == 2);
     }
 
     protected override void SelectBottomTab(int index)
     {
-        bool isOtherBattleInProgress = BattleManager.Instance.IsOtherBattleInProgress();
-        if (isOtherBattleInProgress)
-        {
-            // 濡傛灉姝ｅ湪闈炰富绾挎垬鏂椾腑锛屾病婊¤冻瑙ｉ攣鏉′欢鍒欎笉鍏佽鍒囨崲
-        }
-        DisplayTopBar(index);
-
         if (index == 3)
         {
             //鎸戞垬鐗规畩鏄剧ず閫昏緫
@@ -137,8 +105,8 @@
             return;
         }
 
-
-
+        TabChangeEvent?.Invoke();
+        
         // 濡傛灉鐐瑰嚮褰撳墠宸查�変腑鐨勬爣绛撅紝涓嶅仛澶勭悊
         if (functionOrder == index && currentSubUI != null)
         {
@@ -149,13 +117,14 @@
         // 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
         functionOrder = index;
 
+        DisplayTopBar();
+
         // 鍏抽棴褰撳墠鎵撳紑鐨勫瓙鐣岄潰
         CloseCurrentSubUI();
 
         // 鏍规嵁閫変腑鐨勬爣绛炬墦寮�瀵瑰簲鐨勭晫闈�
         OpenSubUIByTabIndex();
 
-        TabChangeEvent?.Invoke();
     }
 
     //鎴樻枟鎸夐挳鍔ㄧ敾
@@ -236,7 +205,15 @@
     /// </summary>
     protected override void OnTabButtonClicked(int index)
     {
-        this.index = index;
+        int funcId = 32;
+        bool isOtherBattleInProgress = BattleManager.Instance.IsOtherBattleInProgress();
+        // 濡傛灉姝ｅ湪闈炰富绾挎垬鏂椾腑锛屾病婊¤冻瑙ｉ攣鏉′欢鍒欎笉鍏佽鍒囨崲
+        if (isOtherBattleInProgress && !FuncOpen.Instance.IsFuncOpen(funcId))
+        {
+            string tip = FuncOpen.Instance.GetErrorTip(funcId);
+            SysNotifyMgr.Instance.ShowTip("SwitchOutOfBattle", tip);
+            return;
+        }
 
 
         if (index == 0)
@@ -253,6 +230,8 @@
             UIManager.Instance.OpenWindow<GuildJoinWin>();
             return;
         }
+
+        
         SelectBottomTab(index);
     }
 

--
Gitblit v1.8.0