From 3661292558b8722bc2f2e54dc33c71f88a97877e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 22 十月 2025 14:06:02 +0800
Subject: [PATCH] 0312 界面关联整理
---
Main/System/Main/MainWin.cs | 156 ++++++++++++++++++++++++++-------------------------
1 files changed, 80 insertions(+), 76 deletions(-)
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 76d15e1..2af0c40 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -27,9 +27,9 @@
[SerializeField] UIEffectPlayer fightEffect;
[SerializeField] UIEffectPlayer openCloseAnim;
[SerializeField] FillTween cdTween;
-
- public bool isFirstOpen = true; //棣栨鎵撳紑
- public Text hammerText;
+ [SerializeField] Text hammerText;
+
+ bool isFirstOpen = true; //棣栨鎵撳紑
public static event Action TabChangeEvent;
protected override void InitComponent()
@@ -39,94 +39,37 @@
avatarCell.button.AddListener(() => { });
}
- public override void Refresh()
+ void Display()
{
UpdateCurrency();
UpdatePlayerInfo();
RefreshFightBtn();
- DisplayTopBar();
}
protected override void OnPreOpen()
{
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent += OnSkillCast;
- BattleManager.Instance.onBattleFieldCreate += OnBattleFieldCreate;
- BattleManager.Instance.onBattleFieldDestroy += OnBattleFieldDestroy;
base.OnPreOpen();
// 鍒锋柊UI
- Refresh();
+ Display();
}
protected override void OnPreClose()
{
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
- BattleManager.Instance.onBattleFieldCreate -= OnBattleFieldCreate;
- BattleManager.Instance.onBattleFieldDestroy -= OnBattleFieldDestroy;
base.OnPreClose();
}
- private void OnBattleFieldCreate(string guid, BattleField battleField)
- {
- Refresh();
- }
- private void OnBattleFieldDestroy()
- {
- Refresh();
- }
-
-
- //澶栭儴璋冪敤鐐瑰嚮鍔熻兘
- public void ClickFunc(int functionOrder)
- {
- tabButtons[functionOrder].onClick.Invoke();
- }
-
- //鎭㈠鍔熻兘鎸夐挳鐘舵��
- public void RestoreFuncBtn()
- {
- tabButtons[functionOrder].SelectBtn();
- }
-
- public void DisplayTopBar()
+ void DisplayTopBar()
{
topBar.SetActive(functionOrder == 0 || functionOrder == 2);
}
- protected override void SelectBottomTab(int index)
- {
- if (index == 3)
- {
- //鎸戞垬鐗规畩鏄剧ず閫昏緫
- UIManager.Instance.OpenWindow<ChallengeTabWin>();
- return;
- }
-
- TabChangeEvent?.Invoke();
-
- // 濡傛灉鐐瑰嚮褰撳墠宸查�変腑鐨勬爣绛撅紝涓嶅仛澶勭悊
- if (functionOrder == index && currentSubUI != null)
- {
- return;
- }
-
- ClickAnimation(index);
- // 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
- functionOrder = index;
-
- DisplayTopBar();
-
- // 鍏抽棴褰撳墠鎵撳紑鐨勫瓙鐣岄潰
- CloseCurrentSubUI();
-
- // 鏍规嵁閫変腑鐨勬爣绛炬墦寮�瀵瑰簲鐨勭晫闈�
- OpenSubUIByTabIndex();
-
- }
-
+
//鎴樻枟鎸夐挳鍔ㄧ敾
void ClickAnimation(int index)
{
@@ -200,22 +143,13 @@
hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
}
+
+
/// <summary>
/// 搴曢儴鏍囩鎸夐挳鐐瑰嚮
/// </summary>
protected override void OnTabButtonClicked(int 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)
{
if (currentSubUI != null && currentSubUI.name == "HomeWin")
@@ -231,10 +165,40 @@
return;
}
-
+
SelectBottomTab(index);
}
+ protected override void SelectBottomTab(int index)
+ {
+ if (index == 3)
+ {
+ //鎸戞垬鐗规畩鏄剧ず閫昏緫
+ UIManager.Instance.OpenWindow<ChallengeTabWin>();
+ return;
+ }
+
+ // 濡傛灉鐐瑰嚮褰撳墠宸查�変腑鐨勬爣绛撅紝涓嶅仛澶勭悊
+ if (functionOrder == index && currentSubUI != null)
+ {
+ return;
+ }
+
+ TabChangeEvent?.Invoke();
+
+ ClickAnimation(index);
+ // 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
+ functionOrder = index;
+
+ DisplayTopBar();
+
+ // 鍏抽棴褰撳墠鎵撳紑鐨勫瓙鐣岄潰
+ CloseCurrentSubUI();
+
+ // 鏍规嵁閫変腑鐨勬爣绛炬墦寮�瀵瑰簲鐨勭晫闈�
+ OpenSubUIByTabIndex();
+
+ }
/// <summary>
/// 鏍规嵁鏍囩绱㈠紩鎵撳紑瀵瑰簲鐨勫瓙鐣岄潰
@@ -384,4 +348,44 @@
RefreshFightBtn();
}
}
+
+ #region 澶栭儴璋冪敤
+ //澶栭儴璋冪敤鐐瑰嚮鍔熻兘
+ public void ClickFunc(int functionOrder)
+ {
+ tabButtons[functionOrder].onClick.Invoke();
+ }
+
+
+ //鎭㈠鍔熻兘鎸夐挳鐘舵��
+ public void RestoreFuncBtn()
+ {
+ tabButtons[functionOrder].SelectBtn();
+ }
+
+ // 澶栭儴鍏抽棴瀛愮晫闈�
+ int lastWinOrder = -1;
+ public void CloseSubUI()
+ {
+ if (currentSubUI != null)
+ {
+ lastWinOrder = functionOrder;
+ currentSubUI.CloseWindow();
+ currentSubUI = null;
+ functionOrder = -1;
+ }
+ }
+
+ // 澶栭儴鎭㈠瀛愮晫闈�
+ public void RestoreSubUI()
+ {
+ if (lastWinOrder == -1)
+ {
+ lastWinOrder = 0;
+ }
+ OnTabButtonClicked(lastWinOrder);
+ }
+
+
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.8.0