RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs
View File

@ -54,9 +54,10 @@ protected override void UpdatePreemptState()
{
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)

4
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
View File

@ -52,9 +52,7 @@ protected override void UpdatePreemptState()
{
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)
);
}