1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-15 15:27:20 +08:00

Show metadata when loading between retries.

Also speeds up the display a bit.
This commit is contained in:
Dean Herbert 2017-04-18 17:00:58 +09:00
parent edd71c0560
commit ddff26d167
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49

View File

@ -69,6 +69,8 @@ namespace osu.Game.Screens.Play
{
base.OnResuming(last);
contentIn();
//we will only be resumed if the player has requested a re-run (see ValidForResume setting above)
LoadComponentAsync(player = new Player
{
@ -77,12 +79,26 @@ namespace osu.Game.Screens.Play
Beatmap = player.Beatmap,
}, p =>
{
contentOut();
if (!Push(player))
Exit();
ValidForResume = false;
});
}
private void contentIn()
{
Content.ScaleTo(1, 750, EasingTypes.OutQuint);
Content.FadeInFromZero(500);
}
private void contentOut()
{
Content.ScaleTo(0.7f, 300, EasingTypes.InQuint);
Content.FadeOut(250);
}
protected override void OnEntering(Screen last)
{
base.OnEntering(last);
@ -90,20 +106,19 @@ namespace osu.Game.Screens.Play
Background.FadeTo(0.4f, 250);
Content.ScaleTo(0.7f);
Content.ScaleTo(1, 750, EasingTypes.OutQuint);
Content.FadeInFromZero(500);
Delay(1000, true);
contentIn();
Delay(500, true);
logo.MoveToOffset(new Vector2(0, -180), 500, EasingTypes.InOutExpo);
Delay(250, true);
info.FadeIn(500);
Delay(2000, true);
Delay(1400, true);
Content.ScaleTo(0.7f, 300, EasingTypes.InQuint);
Content.FadeOut(250);
contentOut();
Delay(250);