Merge remote-tracking branch 'origin/master' into h5version

yyl

2026-03-26 f4a702e212d1853735f8dae399da69d23bfa510e

 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)
                {