Make animation a bit more subtle

This commit is contained in:
Dean Herbert 2018-01-04 20:43:42 +09:00
parent 155e84d2b7
commit 1f62fe19d5
2 changed files with 9 additions and 7 deletions

View File

@ -161,15 +161,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
using (BeginDelayedSequence(slider.Duration, true))
{
Body.FadeOut(450, Easing.OutQuint);
Ball.FadeOut(450, Easing.OutQuint);
const float fade_out_time = 450;
Body.FadeOut(fade_out_time, Easing.Out);
Ball.FadeOut(fade_out_time / 4, Easing.Out);
switch (state)
{
case ArmedState.Idle:
break;
case ArmedState.Hit:
Ball.ScaleTo(HitObject.Scale * 1.5f, 450, Easing.OutQuint);
Ball.ScaleTo(HitObject.Scale * 1.4f, fade_out_time, Easing.Out);
break;
case ArmedState.Miss:
break;

View File

@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
}
private readonly Slider slider;
private readonly Box follow;
public readonly Box FollowCircle;
private readonly Box ball;
public SliderBall(Slider slider)
@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
Children = new Drawable[]
{
follow = new Box
FollowCircle = new Box
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
@ -118,8 +118,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
return;
tracking = value;
follow.ScaleTo(tracking ? 2.8f : 1, 300, Easing.OutQuint);
follow.FadeTo(tracking ? 0.2f : 0, 300, Easing.OutQuint);
FollowCircle.ScaleTo(tracking ? 2.8f : 1, 300, Easing.OutQuint);
FollowCircle.FadeTo(tracking ? 0.2f : 0, 300, Easing.OutQuint);
}
}