Merge branch 'master' into master

This commit is contained in:
Cameron Taylor
2020-11-25 00:22:22 -08:00
committed by GitHub
7 changed files with 30 additions and 11 deletions

View File

@ -598,9 +598,6 @@ class PlayState extends MusicBeatState
{
super.update(elapsed);
trace("FlxG.sound.music.time: " + FlxG.sound.music.time);
trace("Conductor.songPosition: " + Conductor.songPosition);
scoreTxt.text = "Score:" + songScore;
if (FlxG.keys.justPressed.ENTER && startedCountdown && canPause)
@ -854,6 +851,7 @@ class PlayState extends MusicBeatState
{
canPause = false;
#if !switch
Highscore.saveScore(SONG.song, songScore, storyDifficulty);
#end
@ -872,10 +870,9 @@ class PlayState extends MusicBeatState
StoryMenuState.weekUnlocked[2] = true;
#if !switch
NGio.unlockMedal(60961);
Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty);
#end
FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked;
FlxG.save.flush();