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/Component/UI/Common/GroupButtonEx.cs | 3
Main/System/Main/FuncsBaseWin.cs | 4 +
Main/System/UIBase/UIBase.cs | 10 +-
Main/Manager/UIManager.cs | 24 +----
Main/System/Main/MainWin.cs | 156 ++++++++++++++++++++-------------------
5 files changed, 97 insertions(+), 100 deletions(-)
diff --git a/Main/Component/UI/Common/GroupButtonEx.cs b/Main/Component/UI/Common/GroupButtonEx.cs
index 6886535..0edff16 100644
--- a/Main/Component/UI/Common/GroupButtonEx.cs
+++ b/Main/Component/UI/Common/GroupButtonEx.cs
@@ -78,6 +78,7 @@
set { m_SelectEffect = value; }
}
+ public bool isLock = false;
protected override void Awake()
{
@@ -100,6 +101,8 @@
public override void OnPointerClick(PointerEventData eventData)
{
+ if (isLock)
+ return;
base.OnPointerClick(eventData);
SelectBtn();
}
diff --git a/Main/Manager/UIManager.cs b/Main/Manager/UIManager.cs
index 7fab3ba..c77b59b 100644
--- a/Main/Manager/UIManager.cs
+++ b/Main/Manager/UIManager.cs
@@ -641,28 +641,16 @@
private UIBase GetLastSupportParentChildRelationUI()
{
- List<UIBase> tempList = new List<UIBase>();
- UIBase target = null;
-
- while (target == null && uiStack.Count > 0)
+ foreach (var uiBase in uiStack)
{
- UIBase uiBase = uiStack.Pop();
-
- if (uiBase != null && uiBase.supportParentChildRelation && !uiBase.isMainUI)
+ if (uiBase != null && uiBase.supportParentChildRelation)
{
- target = uiBase;
+ return uiBase;
}
-
- tempList.Add(uiBase);
}
- for (int i = tempList.Count - 1; i >= 0; i--)
- {
- uiStack.Push(tempList[i]);
- }
-
- return target;
+ return null;
}
public UIBase OpenWindow(string uiName, int functionOrder = 0)
@@ -704,8 +692,8 @@
returnValue.gameObject.SetActive(true);
- // 鑷姩璁剧疆鐖剁骇UI锛堝鏋滄湭鎸囧畾涓旀敮鎸佺埗瀛愬叧绯伙級
- if (returnValue.supportParentChildRelation && uiStack.Count > 0)
+ // 鑷姩璁剧疆鐖剁骇UI, 濡傛灉鍕鹃�変簡ismainui 鍒欎笉闇�瑕佹壘鐖剁骇UI
+ if (returnValue.supportParentChildRelation && uiStack.Count > 0 && !returnValue.isMainUI)
{
// 鑾峰彇鏍堥《UI
parentUI = GetLastSupportParentChildRelationUI();
diff --git a/Main/System/Main/FuncsBaseWin.cs b/Main/System/Main/FuncsBaseWin.cs
index f447b97..e773ae3 100644
--- a/Main/System/Main/FuncsBaseWin.cs
+++ b/Main/System/Main/FuncsBaseWin.cs
@@ -53,6 +53,10 @@
}
+ protected void SetBtnLockState(int index, bool _isLock)
+ {
+ tabButtons[index].isLock = _isLock;
+ }
/// <summary>
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
diff --git a/Main/System/UIBase/UIBase.cs b/Main/System/UIBase/UIBase.cs
index 5945b93..95b58f4 100644
--- a/Main/System/UIBase/UIBase.cs
+++ b/Main/System/UIBase/UIBase.cs
@@ -39,14 +39,12 @@
// UI鍩烘湰灞炴��
[SerializeField] public UILayer uiLayer = UILayer.Mid;
[SerializeField][HideInInspector] public string uiName;
- [SerializeField] public bool isMainUI = false;
+ [SerializeField] public bool isMainUI = false; //鍚屾椂鍕鹃�塻upportParentChildRelation 浼氬綋浣滄柊鐨勭埗鑺傜偣锛屼絾涓嶄綔涓哄瓙鑺傜偣
- // 鏂板锛氭槸鍚︽敮鎸佺埗瀛愬叧绯�
- // 鐖跺瓙鍏崇郴:UI鎷ユ湁鐨勪笂涓嬬骇閾惧紡鍏崇郴
+ // 鏄惁鏀寔鐖跺瓙鍏崇郴锛屽嵆UI鎷ユ湁鐨勪笂涓嬬骇閾惧紡鍏崇郴
+ // 鎷ユ湁鐖跺瓙鍏崇郴 鍦ㄥ叧闂埗鐣岄潰鐨勬椂鍊� 瀛愮晫闈細杩炲悓涓�璧峰叧闂� 瀛愮晫闈㈡墦寮�鏃�
// 鍦ㄩ潪鐗瑰畾鎯呭喌涓� 閮借鎷ユ湁鐖跺瓙鍏崇郴 锛堜竴鑸潵璇村姛鑳介兘瑕佹湁鐖跺瓙鍏崇郴 渚嬪鐨勬槸渚嬪绯荤粺寮圭獥
- // 涓荤晫闈㈣繖绉嶄笉闇�瑕� 鍦ㄥ埗浣淯I浼� 鐩墠鐨勯渶姹傛槸 鍔熻兘鍏ㄩ儴鍋氬湪Middle灞傦級
- // 鎷ユ湁鐖跺瓙鍏崇郴 鍦ㄥ叧闂埗鐣岄潰鐨勬椂鍊� 瀛愮晫闈細杩炲悓涓�璧峰叧闂� 瀛愮晫闈㈡墦寮�鏃� 鐖剁晫闈㈢殑鈥滃洖鍚堟暟鈥濅細鍒锋柊 鍥炲悎鏁拌瑙佹寔涔呭寲鐩稿叧鐨勬敞閲�
- //
+ // 闄勫姞璇存槑锛氬姛鑳藉熀鏈仛鍦∕iddle灞�
[SerializeField] public bool supportParentChildRelation = true;
// 鎸佷箙鍖栫浉鍏�
--
Gitblit v1.8.0