mirror of
https://github.com/ppy/osu.git
synced 2024-12-16 14:22:55 +08:00
Merge branch 'master' into master
This commit is contained in:
commit
8ff86d560f
@ -455,7 +455,19 @@ namespace osu.Game.Screens.Play
|
||||
MetadataInfo.Loading = true;
|
||||
|
||||
content.FadeInFromZero(500, Easing.OutQuint);
|
||||
content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer);
|
||||
|
||||
if (quickRestart)
|
||||
{
|
||||
prepareNewPlayer();
|
||||
content.ScaleTo(1, 650, Easing.OutQuint);
|
||||
}
|
||||
else
|
||||
{
|
||||
content
|
||||
.ScaleTo(1, 650, Easing.OutQuint)
|
||||
.Then()
|
||||
.Schedule(prepareNewPlayer);
|
||||
}
|
||||
|
||||
using (BeginDelayedSequence(delayBeforeSideDisplays))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user