RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-17 20:35:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combine push logic and adjust transitions a bit more.

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

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

@ -33,10 +33,6 @@ namespace osu.Game.Screens.Play
{
this.player = player;
//By default, we want to load the player and never be returned to.
//Note that this may change if the player we load requested a re-run.
ValidForResume = false;
player.RestartRequested = () => {
showOverlays = false;
ValidForResume = true;
@ -77,20 +73,17 @@ namespace osu.Game.Screens.Play
RestartCount = player.RestartCount + 1,
RestartRequested = player.RestartRequested,
Beatmap = player.Beatmap,
}, p =>
{
contentOut();
if (!Push(player))
Exit();
ValidForResume = false;
});
Delay(400);
Schedule(pushWhenLoaded);
}
private void contentIn()
{
Content.ScaleTo(1, 750, EasingTypes.OutQuint);
Content.FadeInFromZero(500);
Content.ScaleTo(1, 650, EasingTypes.OutQuint);
Content.FadeInFromZero(400);
}
private void contentOut()
@ -118,6 +111,14 @@ namespace osu.Game.Screens.Play
Delay(1400, true);
Schedule(pushWhenLoaded);
}
private void pushWhenLoaded()
{
if (!player.IsLoaded)
Schedule(pushWhenLoaded);
contentOut();
Delay(250);
@ -128,6 +129,12 @@ namespace osu.Game.Screens.Play
if (!Push(player))
Exit();
else
{
//By default, we want to load the player and never be returned to.
//Note that this may change if the player we load requested a re-run.
ValidForResume = false;
}
});
}