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

Improve transitions when exiting play mode.

Browse Source
This commit is contained in:
Dean Herbert 2017-04-07 20:46:35 +09:00
parent 54d1afb655
commit 0d4f457265
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,25 +308,24 @@ namespace osu.Game.Screens.Play
protected override bool OnExiting(Screen next) protected override bool OnExiting(Screen next)
{ {
if (pauseOverlay == null) return false; if (pauseOverlay != null && !HitRenderer.HasReplayLoaded)
if (HitRenderer.HasReplayLoaded)
return false;
if (pauseOverlay.State != Visibility.Visible && !canPause) return true;
if (!IsPaused && sourceClock.IsRunning) // For if the user presses escape quickly when entering the map
{ {
Pause(); //pause screen override logic.
return true; if (pauseOverlay?.State == Visibility.Hidden && !canPause) return true;
}
else if (!IsPaused && sourceClock.IsRunning) // For if the user presses escape quickly when entering the map
{ {
FadeOut(250); Pause();
Content.ScaleTo(0.7f, 750, EasingTypes.InQuint); return true;
Background?.FadeTo(1f, 200); }
return base.OnExiting(next);
} }
HitRenderer?.FadeOut(60);
FadeOut(250);
Content.ScaleTo(0.7f, 750, EasingTypes.InQuint);
Background?.FadeTo(1f, 200);
return base.OnExiting(next);
} }
private Bindable<bool> mouseWheelDisabled; private Bindable<bool> mouseWheelDisabled;