h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 17:52:56 +08:00
Code Issues Releases Wiki Activity

Match up fade behavior with current master

Browse Source
This commit is contained in:
David Zhao 2019-02-18 16:34:11 +09:00
parent 9be25c3758
commit 80800f2931
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,9 +248,6 @@ namespace osu.Game.Screens.Play
foreach (var mod in Beatmap.Value.Mods.Value.OfType<IApplicableToScoreProcessor>())
mod.ApplyToScoreProcessor(ScoreProcessor);
if (Background != null)
Background.UpdateDim.Value = true;
}
private void applyRateFromMods()
@ -302,6 +299,8 @@ namespace osu.Game.Screens.Play
this.Push(CreateResults(score));
Background.UpdateDim.Value = false;
onCompletionEvent = null;
});
}
@ -349,6 +348,8 @@ namespace osu.Game.Screens.Play
.Delay(250)
.FadeIn(250);
Background.UpdateDim.Value = true;
Task.Run(() =>
{
sourceClock.Reset();
@ -391,7 +392,6 @@ namespace osu.Game.Screens.Play
{
// In the case of replays, we may have changed the playback rate.
applyRateFromMods();
Background.UpdateDim.Value = false;
fadeOut();
return base.OnExiting(next);
}
@ -409,7 +409,7 @@ namespace osu.Game.Screens.Play
{
float fadeOutDuration = instant ? 0 : 250;
this.FadeOut(fadeOutDuration);
Background?.FadeColour(Color4.White, fadeOutDuration, Easing.OutQuint);
Background.UpdateDim.Value = false;
}
protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !pauseContainer.IsPaused;