From 27fd42fb17d2b54bba4acd4d9c0b91c48a1963ec Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 6 Feb 2018 18:10:15 +0900 Subject: [PATCH] Adjust appear animations of repeats and ticks --- .../Objects/Drawables/DrawableRepeatPoint.cs | 7 ++++--- .../Objects/Drawables/DrawableSliderTick.cs | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs index dc3660ba5e..dcd191214a 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs @@ -54,9 +54,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables { animDuration = Math.Min(150, repeatPoint.SpanDuration / 2); - this.FadeIn(animDuration).ScaleTo(1.2f, animDuration / 2) - .Then() - .ScaleTo(1, animDuration / 2, Easing.Out); + this.Animate( + d => d.FadeIn(animDuration), + d => d.ScaleTo(0.5f).ScaleTo(1f, animDuration * 4, Easing.OutElasticHalf) + ); } protected override void UpdateCurrentState(ArmedState state) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs index 8b3c361945..41d73a745a 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs @@ -52,9 +52,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables { this.Animate( d => d.FadeIn(anim_duration), - d => d.ScaleTo(0.5f).ScaleTo(1.2f, anim_duration / 2) - ).Then( - d => d.ScaleTo(1, anim_duration / 2, Easing.Out) + d => d.ScaleTo(0.5f).ScaleTo(1f, anim_duration * 4, Easing.OutElasticHalf) ); }