From ab076c50f6b1224eac6e2b87e7972a34abd817c2 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 10 十月 2025 14:43:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Component/UI/Common/PopupWindowsProcessor.cs | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/Main/Component/UI/Common/PopupWindowsProcessor.cs b/Main/Component/UI/Common/PopupWindowsProcessor.cs
index 32e8c29..480b430 100644
--- a/Main/Component/UI/Common/PopupWindowsProcessor.cs
+++ b/Main/Component/UI/Common/PopupWindowsProcessor.cs
@@ -5,6 +5,7 @@
/// <summary>
/// 寮圭獥澶勭悊鍣� - 璐熻矗绠＄悊娓告垙涓殑寮圭獥闃熷垪锛屾寜椤哄簭鏄剧ず寮圭獥绐楀彛
/// 閬垮厤澶氫釜绐楀彛鍚屾椂寮瑰嚭閫犳垚鐣岄潰娣蜂贡
+/// 鍙湁鍦╤omewin鎵撳紑鐨勬儏鍐典笅鎵嶈Е鍙�
/// </summary>
public class PopupWindowsProcessor : SingletonMonobehaviour<PopupWindowsProcessor>
{
@@ -77,11 +78,10 @@
}
// 妫�鏌ユ槸鍚﹀湪鏂版墜寮曞涓�
- // 娉ㄦ剰锛歂ewBieCenter鍦ㄥ綋鍓嶄唬鐮佸簱涓笉瀛樺湪锛屾殏鏃舵敞閲婃帀鐩稿叧妫�鏌�
- // if (NewBieCenter.Instance.inGuiding)
- // {
- // return;
- // }
+ if (NewBieCenter.Instance.inGuiding)
+ {
+ return;
+ }
if (popupWindowQueue.Count == 0)
{
@@ -92,10 +92,14 @@
if (UIManager.Instance.IsOpened<LoadingWin>())
return;
- // 妫�鏌ユ槸鍚﹀瓨鍦ㄥ叏灞忔垨閬僵绐楀彛
- // 娉ㄦ剰锛欵xistAnyFullScreenOrMaskWin鏂规硶鍦ㄥ綋鍓峌IManager涓笉瀛樺湪锛屾殏鏃舵敞閲婃帀鐩稿叧妫�鏌�
- // if (UIManager.Instance.ExistAnyFullScreenOrMaskWin())
- // return;
+ if (!UIManager.Instance.IsOpened<HomeWin>())
+ return;
+
+ if (UIManager.Instance.IsOpened(popupWindowQueue[0].window))
+ {
+ //褰撳墠妯″紡鍙互鎵撳紑澶氫釜鐩稿悓绐楀彛锛屽鍔犻槻鑼�
+ return;
+ }
if (currentWindow.window != null)
{
@@ -104,18 +108,13 @@
if (ui != null && ui.IsActive())
return;
- currentWindow = popupWindowQueue[0];
- popupWindowQueue.RemoveAt(0);
- UIManager.Instance.OpenWindow(currentWindow.window, currentWindow.functionId);
- Debug.LogFormat("鎺ㄩ�佺獥鍙� " + currentWindow.window);
}
- else
- {
- currentWindow = popupWindowQueue[0];
- popupWindowQueue.RemoveAt(0);
- UIManager.Instance.OpenWindow(currentWindow.window, currentWindow.functionId);
- Debug.LogFormat("鎺ㄩ�佺獥鍙� " + currentWindow.window);
- }
+
+ currentWindow = popupWindowQueue[0];
+ popupWindowQueue.RemoveAt(0);
+ UIManager.Instance.OpenWindow(currentWindow.window, currentWindow.functionId);
+ Debug.LogFormat("鎺ㄩ�佺獥鍙� " + currentWindow.window);
+
lastTime = Time.realtimeSinceStartup;
}
--
Gitblit v1.8.0