sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 09:03:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #607 from peppy/general-fixes

Browse Source 
General improvements
This commit is contained in:
Thomas Müller
2017-04-07 18:31:02 +02:00
committed by GitHub
parent 53c491d4ef 06a655af5d
commit e2756b7f8b
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Modes/UI/StandardHudOverlay.cs
View File

@ -40,6 +40,7 @@ namespace osu.Game.Modes.UI
Anchor = Anchor.BottomRight, Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
Margin = new MarginPadding(10), Margin = new MarginPadding(10),
Y = - TwoLayerButton.SIZE_RETRACTED.Y,
}; };
protected override ScoreCounter CreateScoreCounter() => new ScoreCounter(6) protected override ScoreCounter CreateScoreCounter() => new ScoreCounter(6)

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

@ -292,6 +292,10 @@ namespace osu.Game.Screens.Play
sourceClock.Start(); sourceClock.Start();
initializeSkipButton(); initializeSkipButton();
}); });
//keep in mind this is using the interpolatedSourceClock so won't be run as early as we may expect.
HitRenderer.Alpha = 0;
HitRenderer.FadeIn(750, EasingTypes.OutQuint);
} }
protected override void OnSuspending(Screen next) protected override void OnSuspending(Screen next)
@ -304,26 +308,25 @@ 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) //pause screen override logic.
return false; if (pauseOverlay?.State == Visibility.Hidden && !canPause) return true;
if (pauseOverlay.State != Visibility.Visible && !canPause) return true;
if (!IsPaused && sourceClock.IsRunning) // For if the user presses escape quickly when entering the map if (!IsPaused && sourceClock.IsRunning) // For if the user presses escape quickly when entering the map
{ {
Pause(); Pause();
return true; return true;
} }
else }
{
HitRenderer?.FadeOut(60);
FadeOut(250); FadeOut(250);
Content.ScaleTo(0.7f, 750, EasingTypes.InQuint); Content.ScaleTo(0.7f, 750, EasingTypes.InQuint);
Background?.FadeTo(1f, 200); Background?.FadeTo(1f, 200);
return base.OnExiting(next); return base.OnExiting(next);
} }
}
private Bindable<bool> mouseWheelDisabled; private Bindable<bool> mouseWheelDisabled;