h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-22 15:52:55 +08:00
Code Issues Releases Wiki Activity

Fix animation changes incorrectly applying to successful completion of sliders

Browse Source
This commit is contained in:
Dean Herbert 2022-07-19 15:51:02 +09:00
parent 101d270615
commit e346624b14
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game.Rulesets.Osu/Skinning/Default/DefaultFollowCircle.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Diagnostics;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -33,8 +34,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
protected override void OnTrackingChanged(ValueChangedEvent<bool> tracking) protected override void OnTrackingChanged(ValueChangedEvent<bool> tracking)
{ {
Debug.Assert(ParentObject != null);
const float duration = 300f; const float duration = 300f;
if (ParentObject.Judged)
return;
if (tracking.NewValue) if (tracking.NewValue)
{ {
if (Precision.AlmostEquals(0, Alpha)) if (Precision.AlmostEquals(0, Alpha))
@ -52,10 +58,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
protected override void OnSliderEnd() protected override void OnSliderEnd()
{ {
const float fade_duration = 450f; const float fade_duration = 300;
// intentionally pile on an extra FadeOut to make it happen much faster // intentionally pile on an extra FadeOut to make it happen much faster
this.FadeOut(fade_duration / 4, Easing.Out); this.ScaleTo(1, fade_duration, Easing.OutQuint);
this.FadeOut(fade_duration / 2, Easing.OutQuint);
} }
} }
} }