h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 13:22:55 +08:00
Code Issues Releases Wiki Activity

HasStoryboardEnded doesn't trigger updateCompletionState()

Browse Source 
Scores won't be shown prematurely if the storyboard ends before the playable portion of the beatmap.
This commit is contained in:
Christine Chen 2021-04-17 21:49:07 -04:00
parent 97bacbdc76
commit c77f838fb0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Play/Player.cs
View File

@ -284,14 +284,16 @@ namespace osu.Game.Screens.Play
ScoreProcessor.RevertResult(r); ScoreProcessor.RevertResult(r);
}; };
DimmableStoryboard.HasStoryboardEnded.ValueChanged += _ =>
{
if (ScoreProcessor.HasCompleted.Value)
scheduleCompletion();
};
// Bind the judgement processors to ourselves // Bind the judgement processors to ourselves
ScoreProcessor.HasCompleted.ValueChanged += updateCompletionState; ScoreProcessor.HasCompleted.ValueChanged += updateCompletionState;
HealthProcessor.Failed += onFail; HealthProcessor.Failed += onFail;
// Keep track of whether the storyboard ended after the playable portion
if (DimmableStoryboard.HasStoryboardEnded != null)
DimmableStoryboard.HasStoryboardEnded.ValueChanged += updateCompletionState;
foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>()) foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
mod.ApplyToScoreProcessor(ScoreProcessor); mod.ApplyToScoreProcessor(ScoreProcessor);
@ -630,7 +632,7 @@ namespace osu.Game.Screens.Play
return score.ScoreInfo; return score.ScoreInfo;
}); });
var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && (!DimmableStoryboard.HasStoryboardEnded?.Value ?? false); var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
if (storyboardHasOutro) if (storyboardHasOutro)
{ {