From 3a0fcfe56c6d2eb9597132d7e0679bffd3caae17 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 22 十月 2025 14:30:42 +0800
Subject: [PATCH] 143 演武场-客户端 修改切出界面
---
Main/System/Battle/BattleManager.cs | 20 ----------
Main/System/Battle/BattleField/ArenaBattleField.cs | 11 -----
Main/System/Arena/ArenaChallengeWin.cs | 7 ---
Main/System/Battle/ArenaBattleWin.cs | 26 ++++++------
4 files changed, 13 insertions(+), 51 deletions(-)
diff --git a/Main/System/Arena/ArenaChallengeWin.cs b/Main/System/Arena/ArenaChallengeWin.cs
index 4b74ad5..161abd1 100644
--- a/Main/System/Arena/ArenaChallengeWin.cs
+++ b/Main/System/Arena/ArenaChallengeWin.cs
@@ -26,25 +26,18 @@
protected override void OnPreOpen()
{
base.OnPreOpen();
- // RankModel.Instance.onRankRefresh += OnRankRefresh;
scrollerController.OnRefreshCell += OnRefreshCell;
ArenaManager.Instance.OnArenaMatchListEvent += OnArenaMatchListEvent;
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
- // ArenaManager.Instance.OnUpdateArenaPlayerInfo += OnUpdateArenaPlayerInfo;
- // ArenaManager.Instance.OnUpdateGameRecInfo += OnUpdateGameRecInfo;
- // Display();
Display();
}
protected override void OnPreClose()
{
base.OnPreClose();
- // RankModel.Instance.onRankRefresh -= OnRankRefresh;
scrollerController.OnRefreshCell -= OnRefreshCell;
ArenaManager.Instance.OnArenaMatchListEvent -= OnArenaMatchListEvent;
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
- // ArenaManager.Instance.OnUpdateArenaPlayerInfo -= OnUpdateArenaPlayerInfo;
- // ArenaManager.Instance.OnUpdateGameRecInfo -= OnUpdateGameRecInfo;
}
private void PlayerDataRefresh(PlayerDataType type)
diff --git a/Main/System/Battle/ArenaBattleWin.cs b/Main/System/Battle/ArenaBattleWin.cs
index 18574a8..8bb0fb5 100644
--- a/Main/System/Battle/ArenaBattleWin.cs
+++ b/Main/System/Battle/ArenaBattleWin.cs
@@ -76,7 +76,7 @@
BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
EventBroadcast.Instance.AddListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
EventBroadcast.Instance.AddListener<string, JsonData>(EventName.BATTLE_END, OnBattleEnd);
- UIManager.Instance.CloseWindow<BattleWin>();
+ UIManager.Instance.GetUI<MainWin>()?.CloseSubUI();
}
protected override void OnPreClose()
@@ -87,7 +87,8 @@
BattleManager.Instance.onBattleFieldCreate -= OnCreateBattleField;
EventBroadcast.Instance.RemoveListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
EventBroadcast.Instance.RemoveListener<string, JsonData>(EventName.BATTLE_END, OnBattleEnd);
- UIManager.Instance.OpenWindow<BattleWin>();
+ UIManager.Instance.GetUI<MainWin>()?.RestoreSubUI();
+
}
private void OnTabChangeEvent()
@@ -300,17 +301,16 @@
txtWaveInfo.text = Language.Get("BoneField09", battleField.round, battleField.turnMax);
}
- public void DisplayBattleWin()
+ bool IsBlockBattleChangeTab()
{
- if (!UIManager.Instance.IsOpened<BattleWin>())
- {
- BattleWin battleWin = UIManager.Instance.OpenWindow<BattleWin>();
- battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
- }
- else
- {
- BattleWin battleWin = UIManager.Instance.GetUI<BattleWin>();
- battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
- }
+ string activeBattleName = BattleManager.Instance.GetActiveBattleName();
+ // 娌℃湁姝ｅ湪杩涜鐨勬垬鏂�
+ if (activeBattleName == null || activeBattleName == "")
+ return false;
+ // 涓荤嚎閬撲腑涓嶉樆姝㈠垏鍑�
+ if (activeBattleName == "StoryBattleField")
+ return false;
+ return true;
}
+
}
diff --git a/Main/System/Battle/BattleField/ArenaBattleField.cs b/Main/System/Battle/BattleField/ArenaBattleField.cs
index 1d92dae..f229bea 100644
--- a/Main/System/Battle/BattleField/ArenaBattleField.cs
+++ b/Main/System/Battle/BattleField/ArenaBattleField.cs
@@ -140,17 +140,6 @@
fsBattleWin = UIManager.Instance.OpenWindow<ArenaBattleWin>();
}
fsBattleWin.SetBattleField(this);
-
- if (UIManager.Instance.IsOpened<ArenaRecordWin>())
- {
- UIManager.Instance.CloseWindow<ArenaRecordWin>();
- }
-
- if (UIManager.Instance.IsOpened<ArenaChallengeWin>())
- {
- UIManager.Instance.CloseWindow<ArenaChallengeWin>();
- }
-
if (UIManager.Instance.IsOpened<ArenaWin>())
{
UIManager.Instance.CloseWindow<ArenaWin>();
diff --git a/Main/System/Battle/BattleManager.cs b/Main/System/Battle/BattleManager.cs
index 906f27b..39b6c02 100644
--- a/Main/System/Battle/BattleManager.cs
+++ b/Main/System/Battle/BattleManager.cs
@@ -586,26 +586,6 @@
return null;
}
- /// <summary>
- /// 妫�鏌ユ槸鍚︽湁闈炰富绾挎垬鏂楋紙濡傜珵鎶�鍦恒�佺櫧楠ㄧ瓑锛夋鍦ㄨ繘琛�
- /// </summary>
- /// <returns>濡傛灉鏈変换浣曢潪涓荤嚎鎴樻枟涓旀湭缁撴潫锛屽垯杩斿洖true</returns>
- public bool IsOtherBattleInProgress()
- {
- foreach (var kvp in battleFields)
- {
- BattleField battleField = kvp.Value;
- // 妫�鏌ユ垬鍦烘槸鍚︽湁鏁堜笖灏氭湭缁撴潫
- if (battleField == null || battleField.IsBattleFinish)
- continue;
- // MapID 1 (StoryBattleField) 鍜� 2 (StoryBossBattleField) 閮芥槸涓荤嚎
- if (battleField.MapID == 1 || battleField.MapID == 2)
- continue;
- return true;
- }
- return false;
- }
-
// 鑾峰彇褰撳墠姝ｅ湪鏄剧ず鐨勬垬鏂楀満鏅悕绉帮紝濡傛灉娌℃湁鍒欒繑鍥炵┖瀛楃涓�
public string GetActiveBattleName()
{
--
Gitblit v1.8.0