sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of AddDelay & ResetDelay in osu.Game.Rulesets.Osu

Browse Source
This commit is contained in:
Thomas Müller
2017-07-17 17:05:24 +03:00
parent 87bcd526f3
commit 546efc0181
6 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -189,30 +189,28 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
disc.RotateTo(-720);
symbol.RotateTo(-720);
mainContainer.ScaleTo(0);
mainContainer.ScaleTo(spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, TIME_PREEMPT - 150, EasingTypes.OutQuint);
mainContainer.AddDelay(TIME_PREEMPT - 150);
mainContainer.ScaleTo(1, 500, EasingTypes.OutQuint);
mainContainer
.ScaleTo(0)
.ScaleTo(spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, TIME_PREEMPT - 150, EasingTypes.OutQuint)
.Then()
.ScaleTo(1, 500, EasingTypes.OutQuint);
}
protected override void UpdateCurrentState(ArmedState state)
{
AddDelay(spinner.Duration, true);
this.FadeOut(160);
var sequence = this.Delay(spinner.Duration).FadeOut(160);
switch (state)
{
case ArmedState.Hit:
this.ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
Expire();
sequence.ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
break;
case ArmedState.Miss:
this.ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
Expire();
sequence.ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
break;
}
sequence.Expire();
}
}
}