From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/Settlement/BattleSettlementManager.cs | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/Main/System/Settlement/BattleSettlementManager.cs b/Main/System/Settlement/BattleSettlementManager.cs
index 199809f..4b74d1b 100644
--- a/Main/System/Settlement/BattleSettlementManager.cs
+++ b/Main/System/Settlement/BattleSettlementManager.cs
@@ -55,6 +55,9 @@
WarlordPavilionManager.Instance.isAutoNext = isWin;
PopupWindowsProcessor.Instance.Add(isWin ? "WarlordPavilionVictoryWin" : "WarlordPavilionFailWin", false, BattleConst.WarlordPavilionBattleField);
break;
+ case BattleConst.QYBattleField:
+ PopupWindowsProcessor.Instance.Add(isWin ? "QYBattleVictoryWin" : "QYBattleFailWin", false, BattleConst.QYBattleField);
+ break;
default:
PopupWindowsProcessor.Instance.Add(isWin ? "BattleVictoryWin" : "BattleFailWin", false, BattleConst.StoryBossBattleField);
break;
@@ -101,6 +104,19 @@
UIManager.Instance.OpenWindowAsync<WarlordPavilionFailWin>().Forget();
}
break;
+ case BattleConst.PriviewBattleField:
+ UIManager.Instance.CloseWindow<PreviewBattleWin>();
+ break;
+ case BattleConst.QYBattleField:
+ if (isWin)
+ {
+ UIManager.Instance.OpenWindow<QYBattleVictoryWin>();
+ }
+ else
+ {
+ UIManager.Instance.OpenWindow<QYBattleFailWin>();
+ }
+ break;
default:
if (isWin)
{
--
Gitblit v1.8.0