386 修复从其他战场切已结束的战场不弹结算的bug

lcy

2 天以前 481380963d45d7673b64d4532cfc0406a6c14b84

386 修复从其他战场切已结束的战场不弹结算的bug

 Main/Component/UI/Common/PopupWindowsProcessor.cs

@@ -27,12 +27,13 @@
    /// </summary>
    /// <param name="name">窗口名称</param>
    /// <param name="functionId">功能ID，用于指定窗口的具体功能或显示模式</param>
    public void Add(string name, bool isNeedHomeWin = true, int functionId = 0)
    public void Add(string name, bool isNeedHomeWin = true, string battleFieldName = "", int functionId = 0)
    {
        var popupWindow = new PopupWindow()
        {
            window = name,
            isNeedHomeWin = isNeedHomeWin,
            battleFieldName = battleFieldName,
            functionId = functionId,
        };

@@ -114,10 +115,10 @@
        // 等待x秒
        if (Time.realtimeSinceStartup - firstTime < stayTime)
            return;
        
        // 只在“没有战斗”和“主线战斗”时允许弹窗

        // 只在“没有战斗”和“主线战斗”和“自己的战场”时允许弹窗
        string activeBattleName = BattleManager.Instance.GetActiveBattleName();
        if (activeBattleName != "" && activeBattleName != "StoryBattleField")
        if (activeBattleName != "" && activeBattleName != "StoryBattleField" && activeBattleName != popupWindowQueue[0].battleFieldName)
            return;

        if (UIManager.Instance.IsOpened(popupWindowQueue[0].window))
@@ -158,6 +159,7 @@
        public int functionId;

        public bool isNeedHomeWin;
        public string battleFieldName;
    }

}

 Main/System/Settlement/BattleSettlementManager.cs

@@ -42,16 +42,16 @@
        switch (battleName)
        {
            case BattleConst.ArenaBattleField:
                PopupWindowsProcessor.Instance.Add(isWin ? "ArenaBattleVictoryWin" : "ArenaBattleFailWin", false);
                PopupWindowsProcessor.Instance.Add(isWin ? "ArenaBattleVictoryWin" : "ArenaBattleFailWin", false, BattleConst.ArenaBattleField);
                break;
            case BattleConst.BoneBattleField:
                PopupWindowsProcessor.Instance.Add(isWin ? "BoneBattleVictoryWin" : "BoneBattleFailWin", false);
                PopupWindowsProcessor.Instance.Add(isWin ? "BoneBattleVictoryWin" : "BoneBattleFailWin", false, BattleConst.BoneBattleField);
                break;
            case BattleConst.TianziBillboradBattleField:
                PopupWindowsProcessor.Instance.Add("TianziBillboradVictoryWin", false);
                PopupWindowsProcessor.Instance.Add("TianziBillboradVictoryWin", false, BattleConst.TianziBillboradBattleField);
                break;
            default:
                PopupWindowsProcessor.Instance.Add(isWin ? "BattleVictoryWin" : "BattleFailWin", false);
                PopupWindowsProcessor.Instance.Add(isWin ? "BattleVictoryWin" : "BattleFailWin", false, BattleConst.StoryBossBattleField);
                break;
        }
    }