UI换了很多,spine主视觉停用
This commit is contained in:
@@ -117,7 +117,7 @@ public class GameManager : MonoBehaviour
|
||||
{
|
||||
if (pauseSubscribed) return;
|
||||
// prefer the singleton, but try to find in scene if null
|
||||
var pm = PauseManager.Instance ?? FindAnyObjectByType<PauseManager>();
|
||||
var pm = PauseManager.Instance ?? SceneObjectLookupCache.FindAny<PauseManager>();
|
||||
if (pm != null)
|
||||
{
|
||||
pm.OnPauseStateChanged += HandlePauseStateChanged;
|
||||
@@ -128,7 +128,7 @@ public class GameManager : MonoBehaviour
|
||||
private void UnsubscribeFromPauseManager()
|
||||
{
|
||||
if (!pauseSubscribed) return;
|
||||
var pm = PauseManager.Instance ?? FindAnyObjectByType<PauseManager>();
|
||||
var pm = PauseManager.Instance ?? SceneObjectLookupCache.FindAny<PauseManager>();
|
||||
if (pm != null)
|
||||
{
|
||||
pm.OnPauseStateChanged -= HandlePauseStateChanged;
|
||||
@@ -503,16 +503,16 @@ public class GameManager : MonoBehaviour
|
||||
HoldNote.PrewarmRuntimeCaches();
|
||||
|
||||
var judgeFx = Animation_GenerateJudgementSituationPrefab.Instance
|
||||
?? FindAnyObjectByType<Animation_GenerateJudgementSituationPrefab>();
|
||||
?? SceneObjectLookupCache.FindAny<Animation_GenerateJudgementSituationPrefab>();
|
||||
judgeFx?.PrewarmJudgePrefabs(1);
|
||||
|
||||
var fxEvent = effectEventController.Instance ?? FindAnyObjectByType<effectEventController>();
|
||||
var fxEvent = effectEventController.Instance ?? SceneObjectLookupCache.FindAny<effectEventController>();
|
||||
if (fxEvent != null && fxEvent.isActiveAndEnabled)
|
||||
{
|
||||
// Cache target and pre-create SmoothShake via OnEnable/Awake path already present.
|
||||
}
|
||||
|
||||
var globalFx = globalNoteEffect.Instance ?? FindAnyObjectByType<globalNoteEffect>();
|
||||
var globalFx = globalNoteEffect.Instance ?? SceneObjectLookupCache.FindAny<globalNoteEffect>();
|
||||
globalFx?.PrewarmRuntime();
|
||||
}
|
||||
catch (System.Exception ex)
|
||||
@@ -1138,7 +1138,7 @@ public class GameManager : MonoBehaviour
|
||||
StartCoroutine(StopWarmupAfterFrame());
|
||||
|
||||
// After loading audio, enable overlay and pause via PauseManager
|
||||
var pm = PauseManager.Instance ?? FindAnyObjectByType<PauseManager>();
|
||||
var pm = PauseManager.Instance ?? SceneObjectLookupCache.FindAny<PauseManager>();
|
||||
if (pm != null)
|
||||
{
|
||||
pm.Pause(true);
|
||||
@@ -1279,12 +1279,10 @@ public class GameManager : MonoBehaviour
|
||||
yield return null;
|
||||
}
|
||||
}
|
||||
gNotice.recommendation.display("游戏开始!");
|
||||
gNotice.recommendation.display(LocalizationService.Get("gameplay.notice.game_start", "游戏开始!"));
|
||||
|
||||
// Resume using PauseManager
|
||||
PauseManager.Instance?.Pause(false);
|
||||
// Use scaled wait so pause (Escape) will pause this delay
|
||||
// yield return new WaitForSeconds(Mathf.Max(0f, playbackStartDelay));
|
||||
|
||||
// Start spawning using the parsed beatmap
|
||||
if (beatmapManager.beatmap != null)
|
||||
@@ -1340,12 +1338,10 @@ public class GameManager : MonoBehaviour
|
||||
yield return null;
|
||||
}
|
||||
}
|
||||
gNotice.recommendation.display("游戏开始!");
|
||||
gNotice.recommendation.display(LocalizationService.Get("gameplay.notice.game_start", "游戏开始!"));
|
||||
|
||||
// Resume
|
||||
PauseManager.Instance?.Pause(false);
|
||||
// Use scaled wait so pause (Escape) will pause this delay
|
||||
// yield return new WaitForSeconds(Mathf.Max(0f, playbackStartDelay));
|
||||
|
||||
// Start spawning using the existing parsed beatmap
|
||||
if (beatmapManager.beatmap != null)
|
||||
@@ -1381,7 +1377,7 @@ public class GameManager : MonoBehaviour
|
||||
PlayMusicWithDelay(delay);
|
||||
|
||||
// ensure overlay shows and pause logic runs after loading the clip
|
||||
var pm2 = PauseManager.Instance ?? FindAnyObjectByType<PauseManager>();
|
||||
var pm2 = PauseManager.Instance ?? SceneObjectLookupCache.FindAny<PauseManager>();
|
||||
if (pm2 != null)
|
||||
{
|
||||
pm2.Pause(true);
|
||||
@@ -1440,12 +1436,10 @@ public class GameManager : MonoBehaviour
|
||||
yield return null;
|
||||
}
|
||||
}
|
||||
gNotice.recommendation.display("游戏开始!");
|
||||
gNotice.recommendation.display(LocalizationService.Get("gameplay.notice.game_start", "游戏开始!"));
|
||||
|
||||
// Resume
|
||||
PauseManager.Instance?.Pause(false);
|
||||
// Use scaled wait so pause (Escape) will pause this delay
|
||||
// yield return new WaitForSeconds(Mathf.Max(0f, playbackStartDelay));
|
||||
|
||||
// Start spawning
|
||||
if (beatmapManager.beatmap != null)
|
||||
@@ -1475,7 +1469,7 @@ public class GameManager : MonoBehaviour
|
||||
float delay = beatmapManager.globalDelaySeconds;
|
||||
PlayMusicWithDelay(delay);
|
||||
|
||||
var pm3 = PauseManager.Instance ?? FindAnyObjectByType<PauseManager>();
|
||||
var pm3 = PauseManager.Instance ?? SceneObjectLookupCache.FindAny<PauseManager>();
|
||||
if (pm3 != null)
|
||||
{
|
||||
pm3.Pause(true);
|
||||
@@ -1524,7 +1518,7 @@ public class GameManager : MonoBehaviour
|
||||
private IEnumerator TriggerOnGameStartNextFrame()
|
||||
{
|
||||
yield return null;
|
||||
var builder = FindAnyObjectByType<SkillBuilder>();
|
||||
var builder = SceneObjectLookupCache.FindAny<SkillBuilder>();
|
||||
if (builder == null)
|
||||
{
|
||||
Debug.LogWarning("[GameManager] TriggerOnGameStartSkills: SkillBuilder not found.");
|
||||
|
||||
Reference in New Issue
Block a user