zzy/bansonic_beta_main
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

好多新内容

Browse Source
This commit is contained in:
akangz
2026-07-22 05:35:53 +08:00
parent b5d1cdcbc5
commit 15649d02f8
128 changed files with 5956 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/scripts/gamePlay_gameplay/GameManager.cs
+35
View File
@@ -1331,6 +1331,22 @@ public class GameManager : MonoBehaviour
private IEnumerator HandleNormalModeStartup()
{
bool hasStartupSongDataBeforeParse =
BeatmapManager.pendingSongData != null
|| SongDataHolder.SelectedSongData != null
|| (beatmapManager != null && beatmapManager.assignedSongData != null);
if (hasStartupSongDataBeforeParse && beatmapManager != null && beatmapManager.beatmap == null)
{
const int parseWaitFrameLimit = 120;
int waitedFrames = 0;
while (waitedFrames < parseWaitFrameLimit && beatmapManager != null && beatmapManager.beatmap == null)
{
waitedFrames++;
yield return null;
}
}
// If a Beatmap was already provided by previous scene (pendingSongData path), skip loading default JSON
if (beatmapManager != null && beatmapManager.beatmap != null)
{
@@ -1411,6 +1427,25 @@ public class GameManager : MonoBehaviour
yield break;
}
bool hasStartupSongData =
BeatmapManager.pendingSongData != null
|| SongDataHolder.SelectedSongData != null
|| (beatmapManager != null && beatmapManager.assignedSongData != null);
if (!hasStartupSongData)
{
Debug.LogWarning("[GameManager] No SongData available for normal gameplay startup. Returning to selectYourSongFirst.");
yield return FadeToBlackAndLoad("selectYourSongFirst", 0.25f);
yield break;
}
if (hasStartupSongData)
{
Debug.LogWarning("[GameManager] SongData was available, but BeatmapManager did not produce a beatmap. Returning to selectYourSongFirst.");
yield return FadeToBlackAndLoad("selectYourSongFirst", 0.25f);
yield break;
}
// Original default demo load commented out; manual load only when needed
string beatmapFilePath = Path.Combine(Application.streamingAssetsPath, "Emilia_demo.json");