mirror of
https://github.com/ppy/osu.git
synced 2026-05-30 04:39:54 +08:00
Fix race conditions causing menu transitions to look wrong when executed in very fast succession.
This commit is contained in:
@@ -146,7 +146,7 @@ namespace osu.Game.Screens.Menu
|
||||
State = MenuState.Initial;
|
||||
return true;
|
||||
case MenuState.Play:
|
||||
State = MenuState.TopLevel;
|
||||
backButton.TriggerClick();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -216,7 +216,7 @@ namespace osu.Game.Screens.Menu
|
||||
{
|
||||
case MenuState.Initial:
|
||||
buttonAreaBackground.ScaleTo(Vector2.One, 500, EasingTypes.Out);
|
||||
buttonArea.FadeOut(500);
|
||||
buttonArea.FadeOut(300);
|
||||
|
||||
osuLogo.Delay(150);
|
||||
osuLogo.MoveTo(Vector2.Zero, 800, EasingTypes.OutExpo);
|
||||
@@ -229,6 +229,8 @@ namespace osu.Game.Screens.Menu
|
||||
b.State = ButtonState.Contracted;
|
||||
break;
|
||||
case MenuState.TopLevel:
|
||||
buttonArea.Flush(true);
|
||||
|
||||
buttonAreaBackground.ScaleTo(Vector2.One, 200, EasingTypes.Out);
|
||||
|
||||
osuLogo.MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In);
|
||||
|
||||
Reference in New Issue
Block a user