From 4dc1c86671e53f830f2ef9996d9dba0ada58099e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 21 十月 2025 23:55:13 +0800
Subject: [PATCH] 0312 整理战场和主界面的关系；增加获取当前激活的战场接口GetActiveBattleName
---
Main/System/Main/MainWin.cs | 41 ++++++++---------------------------------
1 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 1ceda2d..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,26 +91,9 @@
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)
@@ -131,7 +106,7 @@
}
TabChangeEvent?.Invoke();
-
+
// 濡傛灉鐐瑰嚮褰撳墠宸查�変腑鐨勬爣绛撅紝涓嶅仛澶勭悊
if (functionOrder == index && currentSubUI != null)
{
@@ -141,6 +116,8 @@
ClickAnimation(index);
// 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
functionOrder = index;
+
+ DisplayTopBar();
// 鍏抽棴褰撳墠鎵撳紑鐨勫瓙鐣岄潰
CloseCurrentSubUI();
@@ -228,7 +205,6 @@
/// </summary>
protected override void OnTabButtonClicked(int index)
{
- this.index = index;
int funcId = 32;
bool isOtherBattleInProgress = BattleManager.Instance.IsOtherBattleInProgress();
// 濡傛灉姝ｅ湪闈炰富绾挎垬鏂椾腑锛屾病婊¤冻瑙ｉ攣鏉′欢鍒欎笉鍏佽鍒囨崲
@@ -236,7 +212,6 @@
{
string tip = FuncOpen.Instance.GetErrorTip(funcId);
SysNotifyMgr.Instance.ShowTip("SwitchOutOfBattle", tip);
- tabButtons[functionOrder].SelectBtn();
return;
}
@@ -256,7 +231,7 @@
return;
}
- DisplayTopBar(index);
+
SelectBottomTab(index);
}
--
Gitblit v1.8.0