h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 19:32:55 +08:00
Code Issues Releases Wiki Activity

Initialize skipOutroOverlay with alpha 0, other small changes

Browse Source
This commit is contained in:
Christine Chen 2021-04-17 17:45:38 -04:00
parent e40cb6797d
commit fdcb5e924c
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,6 +247,7 @@ namespace osu.Game.Screens.Play
HUDOverlay.ShowHud.Disabled = true; HUDOverlay.ShowHud.Disabled = true;
BreakOverlay.Hide(); BreakOverlay.Hide();
skipIntroOverlay.Hide(); skipIntroOverlay.Hide();
skipOutroOverlay.Hide();
} }
DrawableRuleset.FrameStableClock.WaitingOnFrames.BindValueChanged(waiting => DrawableRuleset.FrameStableClock.WaitingOnFrames.BindValueChanged(waiting =>
@ -368,7 +369,8 @@ namespace osu.Game.Screens.Play
}, },
skipOutroOverlay = new SkipOverlay(Beatmap.Value.Storyboard.LatestEventTime ?? 0) skipOutroOverlay = new SkipOverlay(Beatmap.Value.Storyboard.LatestEventTime ?? 0)
{ {
RequestSkip = scheduleCompletion RequestSkip = scheduleCompletion,
Alpha = 0
}, },
FailOverlay = new FailOverlay FailOverlay = new FailOverlay
{ {
@ -416,8 +418,6 @@ namespace osu.Game.Screens.Play
}); });
} }
skipOutroOverlay.Hide();
return container; return container;
} }
@ -539,13 +539,9 @@ namespace osu.Game.Screens.Play
return; return;
} }
// show the score if in storyboard outro (score has been set) // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
bool scoreReady = prepareScoreForDisplayTask != null && prepareScoreForDisplayTask.IsCompleted; if (prepareScoreForDisplayTask != null)
if (scoreReady)
{
scheduleCompletion(); scheduleCompletion();
}
} }
this.Exit(); this.Exit();
@ -639,7 +635,6 @@ namespace osu.Game.Screens.Play
if (storyboardHasOutro) if (storyboardHasOutro)
{ {
skipOutroOverlay.Show(); skipOutroOverlay.Show();
completionProgressDelegate = null;
return; return;
} }