From 9c6df6b2073b31cb4165fc5ab3f4374a5cc93a8a Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 04 二月 2026 12:17:06 +0800
Subject: [PATCH] 386 修复不同战场挑战的时候，在当前战场不弹自己的结算bug
---
Main/Component/UI/Common/PopupWindowsProcessor.cs | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Main/Component/UI/Common/PopupWindowsProcessor.cs b/Main/Component/UI/Common/PopupWindowsProcessor.cs
index ec4d9b9..c06415e 100644
--- a/Main/Component/UI/Common/PopupWindowsProcessor.cs
+++ b/Main/Component/UI/Common/PopupWindowsProcessor.cs
@@ -118,16 +118,30 @@
// 鍙湪鈥滄病鏈夋垬鏂椻�濆拰鈥滀富绾挎垬鏂椻�濆拰鈥滆嚜宸辩殑鎴樺満鈥濇椂鍏佽寮圭獥
string activeBattleName = BattleManager.Instance.GetActiveBattleName();
- if (activeBattleName != "" && activeBattleName != "StoryBattleField" && activeBattleName != popupWindowQueue[0].battleFieldName)
+ // 鏌ユ壘闃熷垪涓涓�涓彲浠ュ脊鍑虹殑寮圭獥
+ PopupWindow targetPopup = null;
+ int targetIndex = -1;
+ for (int i = 0; i < popupWindowQueue.Count; i++)
+ {
+ var popup = popupWindowQueue[i];
+ if (activeBattleName == "" || activeBattleName == "StoryBattleField" || activeBattleName == popup.battleFieldName)
+ {
+ targetPopup = popup;
+ targetIndex = i;
+ break;
+ }
+ }
+
+ if (targetPopup == null)
return;
- if (UIManager.Instance.IsOpened(popupWindowQueue[0].window))
+ if (UIManager.Instance.IsOpened(targetPopup.window))
{
//褰撳墠妯″紡鍙互鎵撳紑澶氫釜鐩稿悓绐楀彛锛屽鍔犻槻鑼�
return;
}
- if (UIManager.Instance.ExistAnyFullScreenOrMaskWin(popupWindowQueue[0].window))
+ if (UIManager.Instance.ExistAnyFullScreenOrMaskWin(targetPopup.window))
return;
if (currentWindow != null && currentWindow.window != null)
@@ -138,8 +152,8 @@
return;
}
- currentWindow = popupWindowQueue[0];
- popupWindowQueue.RemoveAt(0);
+ currentWindow = targetPopup;
+ popupWindowQueue.RemoveAt(targetIndex);
UIManager.Instance.OpenWindow(currentWindow.window, currentWindow.functionId);
Debug.LogFormat("鎺ㄩ�佺獥鍙� " + currentWindow.window);
--
Gitblit v1.8.0