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

Merge branch 'master' into combobreak

Browse Source
This commit is contained in:
welsar55
2019-06-29 11:55:10 -05:00
committed by GitHub
parent dbb1369eaf addc4ef968
commit d6561531a3
255 changed files with 11262 additions and 2484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play
{
public class Player : ScreenWithBeatmapBackground
{
protected override bool AllowBackButton => false; // handled by HoldForMenuButton
public override bool AllowBackButton => false; // handled by HoldForMenuButton
protected override UserActivity InitialActivity => new UserActivity.SoloGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
@ -181,6 +181,16 @@ namespace osu.Game.Screens.Play
Restart();
},
},
new HotkeyExitOverlay
{
Action = () =>
{
if (!this.IsCurrentScreen()) return;
fadeOut(true);
performImmediateExit();
},
},
failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, }
};
@ -245,6 +255,16 @@ namespace osu.Game.Screens.Play
return working;
}
private void performImmediateExit()
{
// if a restart has been requested, cancel any pending completion (user has shown intent to restart).
onCompletionEvent = null;
ValidForResume = false;
performUserRequestedExit();
}
private void performUserRequestedExit()
{
if (!this.IsCurrentScreen()) return;