客户端rsa,冗余清理,bug修复,安卓build问题
This commit is contained in:
@@ -218,6 +218,12 @@ public class GameManager : MonoBehaviour
|
||||
|
||||
private Coroutine playbackDelayCoroutine;
|
||||
|
||||
private void BeginGameplayClock()
|
||||
{
|
||||
GameplayClock.Reset();
|
||||
GameplayClock.StartChart(0f);
|
||||
}
|
||||
|
||||
// Public helper to reliably unmute and start music playback, respecting delay.
|
||||
public void PlayMusicWithDelay(float delaySeconds)
|
||||
{
|
||||
@@ -275,7 +281,7 @@ public class GameManager : MonoBehaviour
|
||||
{
|
||||
float clampedStartTime = ClampAudioStartTime(delaySeconds < 0f ? -delaySeconds : 0f);
|
||||
musicSource.time = clampedStartTime;
|
||||
musicSource.Play();
|
||||
musicSource.Play();
|
||||
PlaybackStarted = true;
|
||||
}
|
||||
catch { }
|
||||
@@ -1287,6 +1293,7 @@ public class GameManager : MonoBehaviour
|
||||
|
||||
// Resume using PauseManager
|
||||
PauseManager.Instance?.Pause(false);
|
||||
BeginGameplayClock();
|
||||
|
||||
// Start spawning using the parsed beatmap
|
||||
if (beatmapManager.beatmap != null)
|
||||
@@ -1346,6 +1353,7 @@ public class GameManager : MonoBehaviour
|
||||
|
||||
// Resume
|
||||
PauseManager.Instance?.Pause(false);
|
||||
BeginGameplayClock();
|
||||
|
||||
// Start spawning using the existing parsed beatmap
|
||||
if (beatmapManager.beatmap != null)
|
||||
@@ -1380,13 +1388,6 @@ public class GameManager : MonoBehaviour
|
||||
float delay = beatmapManager.globalDelaySeconds;
|
||||
PlayMusicWithDelay(delay);
|
||||
|
||||
// ensure overlay shows and pause logic runs after loading the clip
|
||||
var pm2 = PauseManager.Instance ?? SceneObjectLookupCache.FindAny<PauseManager>();
|
||||
if (pm2 != null)
|
||||
{
|
||||
pm2.Pause(true);
|
||||
Debug.Log("PauseManager.Pause(true) invoked after assigning musicClip in normal startup");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1444,6 +1445,7 @@ public class GameManager : MonoBehaviour
|
||||
|
||||
// Resume
|
||||
PauseManager.Instance?.Pause(false);
|
||||
BeginGameplayClock();
|
||||
|
||||
// Start spawning
|
||||
if (beatmapManager.beatmap != null)
|
||||
@@ -1473,12 +1475,6 @@ public class GameManager : MonoBehaviour
|
||||
float delay = beatmapManager.globalDelaySeconds;
|
||||
PlayMusicWithDelay(delay);
|
||||
|
||||
var pm3 = PauseManager.Instance ?? SceneObjectLookupCache.FindAny<PauseManager>();
|
||||
if (pm3 != null)
|
||||
{
|
||||
pm3.Pause(true);
|
||||
Debug.Log("PauseManager.Pause(true) invoked after assigning parsedMusicFile clip");
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user