From 69fdc58cb97714f856df268f08451f2ba7e5ecf2 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 21 一月 2026 10:40:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Tip/ServerTipDetails.cs | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/Main/System/Tip/ServerTipDetails.cs b/Main/System/Tip/ServerTipDetails.cs
index 370d149..56e7a02 100644
--- a/Main/System/Tip/ServerTipDetails.cs
+++ b/Main/System/Tip/ServerTipDetails.cs
@@ -27,20 +27,20 @@
return;
}
- // if (!UIManager.Instance.IsOpened<MarqueeWin>())
- // {
- // UIManager.Instance.OpenWindow<MarqueeWin>();
- // }
+ if (!UIManager.Instance.IsOpened<MarqueeWin>())
+ {
+ UIManager.Instance.OpenWindow<MarqueeWin>();
+ }
}
public static void OnStageLoadFinish()
{
- // if (StageLoad.Instance.currentStage is LoginStage)
- // {
- // m_Marquees.Clear();
- // return;
- // }
- // Co_StageLoadFinish().Forget();
+ if (StageManager.Instance.currentStage == StageName.Login)
+ {
+ m_Marquees.Clear();
+ return;
+ }
+ Co_StageLoadFinish().Forget();
}
private static async UniTask Co_StageLoadFinish()
@@ -55,12 +55,9 @@
}
}
-
static bool CheckOpenMarquee()
{
- return true;
- // TODO YYL
- // return (StageLoad.Instance.currentStage is DungeonStage) && !StageLoad.Instance.isLoading;
+ return StageManager.Instance.currentStage == StageName.Game;
}
public static SystemHintData RequireMarquee()
--
Gitblit v1.8.0