h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 11:42:55 +08:00
Code Issues Releases Wiki Activity

Fix osu logo shockwave playing when transition is aborted

Browse Source 
This is a very nice use-case scenario for TransformSequence.OnComplete
This commit is contained in:
Thomas Müller 2017-07-18 15:28:56 +03:00
parent ed793328f1
commit b40c897dbd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -250,15 +250,13 @@ namespace osu.Game.Screens.Menu
case MenuState.TopLevel: case MenuState.TopLevel:
buttonAreaBackground.ScaleTo(Vector2.One, 200, EasingTypes.Out); buttonAreaBackground.ScaleTo(Vector2.One, 200, EasingTypes.Out);
osuLogo.ClearTransforms();
osuLogo.MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In); osuLogo.MoveTo(buttonFlow.DrawPosition, 200, EasingTypes.In);
osuLogo.ScaleTo(0.5f, 200, EasingTypes.In); var sequence = osuLogo.ScaleTo(0.5f, 200, EasingTypes.In);
buttonArea.FadeIn(300);
if (fromInitial && osuLogo.Scale.X > 0.5f) if (fromInitial && osuLogo.Scale.X > 0.5f)
using (osuLogo.BeginDelayedSequence(200, true)) sequence.OnComplete(o => o.Impact());
osuLogo.Impact();
buttonArea.FadeIn(300);
Scheduler.AddDelayed(() => toolbar?.Show(), 150); Scheduler.AddDelayed(() => toolbar?.Show(), 150);