let play mode start if no song file is loaded

fix issue with loading large audio files
This commit is contained in:
minenice55 2023-06-13 16:55:02 -04:00
parent 8b0544246d
commit 50bc876509
3 changed files with 21 additions and 3 deletions

View file

@ -46,6 +46,9 @@ namespace HeavenStudio
[NonSerialized] public RiqEntity currentSection, nextSection; [NonSerialized] public RiqEntity currentSection, nextSection;
public double sectionProgress { get; private set; } public double sectionProgress { get; private set; }
bool AudioLoadDone;
bool ChartLoadError;
public event Action<double> onBeatChanged; public event Action<double> onBeatChanged;
public event Action<RiqEntity> onSectionChange; public event Action<RiqEntity> onSectionChange;
@ -104,6 +107,8 @@ namespace HeavenStudio
public void Init(bool preLoaded = false) public void Init(bool preLoaded = false)
{ {
AudioLoadDone = false;
ChartLoadError = false;
currentPreEvent= 0; currentPreEvent= 0;
currentPreSwitch = 0; currentPreSwitch = 0;
currentPreSequence = 0; currentPreSequence = 0;
@ -141,6 +146,7 @@ namespace HeavenStudio
} }
else else
{ {
RiqFileHandler.ClearCache();
NewRemix(); NewRemix();
} }
@ -164,6 +170,7 @@ namespace HeavenStudio
public void NewRemix() public void NewRemix()
{ {
AudioLoadDone = false;
Beatmap = new("1", "HeavenStudio"); Beatmap = new("1", "HeavenStudio");
Beatmap.data.properties = Minigames.propertiesModel; Beatmap.data.properties = Minigames.propertiesModel;
Beatmap.AddNewTempoChange(0, 120f); Beatmap.AddNewTempoChange(0, 120f);
@ -171,10 +178,12 @@ namespace HeavenStudio
Beatmap.data.offset = 0f; Beatmap.data.offset = 0f;
Conductor.instance.musicSource.clip = null; Conductor.instance.musicSource.clip = null;
RiqFileHandler.WriteRiq(Beatmap); RiqFileHandler.WriteRiq(Beatmap);
AudioLoadDone = true;
} }
public IEnumerator LoadMusic() public IEnumerator LoadMusic()
{ {
ChartLoadError = false;
IEnumerator load = RiqFileHandler.LoadSong(); IEnumerator load = RiqFileHandler.LoadSong();
while (true) while (true)
{ {
@ -191,20 +200,27 @@ namespace HeavenStudio
{ {
Debug.LogWarning("chart has no music: " + f.Message); Debug.LogWarning("chart has no music: " + f.Message);
Conductor.instance.musicSource.clip = null; Conductor.instance.musicSource.clip = null;
AudioLoadDone = true;
yield break;
} }
catch (Exception e) catch (Exception e)
{ {
Debug.LogError($"Failed to load music: {e.Message}"); Debug.LogError($"Failed to load music: {e.Message}");
GlobalGameManager.ShowErrorMessage("Error Loading Music", e.Message + "\n\n" + e.StackTrace); GlobalGameManager.ShowErrorMessage("Error Loading Music", e.Message + "\n\n" + e.StackTrace);
AudioLoadDone = true;
ChartLoadError = true;
yield break; yield break;
} }
yield return current; yield return current;
} }
Conductor.instance.musicSource.clip = RiqFileHandler.StreamedAudioClip; Conductor.instance.musicSource.clip = RiqFileHandler.StreamedAudioClip;
AudioLoadDone = true;
} }
public void LoadRemix(bool editor = false) public void LoadRemix(bool editor = false)
{ {
AudioLoadDone = false;
ChartLoadError = false;
try try
{ {
Beatmap = RiqFileHandler.ReadRiq(); Beatmap = RiqFileHandler.ReadRiq();
@ -213,6 +229,7 @@ namespace HeavenStudio
{ {
Debug.LogError($"Failed to load remix: {e.Message}"); Debug.LogError($"Failed to load remix: {e.Message}");
GlobalGameManager.ShowErrorMessage("Error Loading RIQ", e.Message + "\n\n" + e.StackTrace); GlobalGameManager.ShowErrorMessage("Error Loading RIQ", e.Message + "\n\n" + e.StackTrace);
ChartLoadError = true;
return; return;
} }
if (!editor) if (!editor)
@ -559,7 +576,7 @@ namespace HeavenStudio
// wait for first game to be loaded // wait for first game to be loaded
yield return new WaitUntil(() => Beatmap != null && Beatmap.Entities.Count > 0); yield return new WaitUntil(() => Beatmap != null && Beatmap.Entities.Count > 0);
//wait for audio clip to be loaded //wait for audio clip to be loaded
yield return new WaitUntil(() => Conductor.instance.musicSource.clip != null); yield return new WaitUntil(() => AudioLoadDone || (ChartLoadError && !GlobalGameManager.IsShowingDialog));
SkillStarManager.instance.KillStar(); SkillStarManager.instance.KillStar();
TimingAccuracyDisplay.instance.StopStarFlash(); TimingAccuracyDisplay.instance.StopStarFlash();

View file

@ -42,6 +42,7 @@ namespace HeavenStudio.Common
void Pause() void Pause()
{ {
if (GlobalGameManager.IsShowingDialog) return;
if (!Conductor.instance.isPlaying) return; if (!Conductor.instance.isPlaying) return;
Conductor.instance.Pause(); Conductor.instance.Pause();
pauseBeat = Conductor.instance.songPositionInBeatsAsDouble; pauseBeat = Conductor.instance.songPositionInBeatsAsDouble;

View file

@ -7,7 +7,7 @@
"dependencies": { "dependencies": {
"com.unity.nuget.newtonsoft-json": "3.2.1" "com.unity.nuget.newtonsoft-json": "3.2.1"
}, },
"hash": "769b4fe2c85792b34defb00e051e823442b78564" "hash": "f1813255c1d322b6fe207de4361bbf288f9cda03"
}, },
"com.unity.2d.sprite": { "com.unity.2d.sprite": {
"version": "1.0.0", "version": "1.0.0",