Adjust appear animations of repeats and ticks

This commit is contained in:
Dean Herbert
2018-02-06 18:10:15 +09:00
parent e417aaa23f
commit 27fd42fb17
2 changed files with 5 additions and 6 deletions

View File

@ -54,9 +54,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{ {
animDuration = Math.Min(150, repeatPoint.SpanDuration / 2); animDuration = Math.Min(150, repeatPoint.SpanDuration / 2);
this.FadeIn(animDuration).ScaleTo(1.2f, animDuration / 2) this.Animate(
.Then() d => d.FadeIn(animDuration),
.ScaleTo(1, animDuration / 2, Easing.Out); d => d.ScaleTo(0.5f).ScaleTo(1f, animDuration * 4, Easing.OutElasticHalf)
);
} }
protected override void UpdateCurrentState(ArmedState state) protected override void UpdateCurrentState(ArmedState state)

View File

@ -52,9 +52,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{ {
this.Animate( this.Animate(
d => d.FadeIn(anim_duration), d => d.FadeIn(anim_duration),
d => d.ScaleTo(0.5f).ScaleTo(1.2f, anim_duration / 2) d => d.ScaleTo(0.5f).ScaleTo(1f, anim_duration * 4, Easing.OutElasticHalf)
).Then(
d => d.ScaleTo(1, anim_duration / 2, Easing.Out)
); );
} }