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

Merge pull request #25493 from peppy/adjust-slider-tick-animation

Browse Source 
Adjust slider follow circle animation to not abruptly scale on early ticks
This commit is contained in:
Bartłomiej Dach 2023-11-20 17:58:15 +09:00 committed by GitHub
commit 3d569850b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowCircle.cs
View File

@ -88,9 +88,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
protected override void OnSliderTick() protected override void OnSliderTick()
{ {
this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 1.08f, 40, Easing.OutQuint) if (Scale.X >= DrawableSliderBall.FOLLOW_AREA * 0.98f)
.Then() {
.ScaleTo(DrawableSliderBall.FOLLOW_AREA, 200f, Easing.OutQuint); this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 1.08f, 40, Easing.OutQuint)
.Then()
.ScaleTo(DrawableSliderBall.FOLLOW_AREA, 200f, Easing.OutQuint);
}
} }
protected override void OnSliderBreak() protected override void OnSliderBreak()

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

@ -59,9 +59,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
protected override void OnSliderTick() protected override void OnSliderTick()
{ {
this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 1.08f, 40, Easing.OutQuint) if (Scale.X >= DrawableSliderBall.FOLLOW_AREA * 0.98f)
.Then() {
.ScaleTo(DrawableSliderBall.FOLLOW_AREA, 200f, Easing.OutQuint); this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 1.08f, 40, Easing.OutQuint)
.Then()
.ScaleTo(DrawableSliderBall.FOLLOW_AREA, 200f, Easing.OutQuint);
}
} }
protected override void OnSliderBreak() protected override void OnSliderBreak()

7
osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyFollowCircle.cs
View File

@ -44,8 +44,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
protected override void OnSliderTick() protected override void OnSliderTick()
{ {
this.ScaleTo(2.2f) if (Scale.X >= 2f)
.ScaleTo(2f, 200); {
this.ScaleTo(2.2f)
.ScaleTo(2f, 200);
}
} }
protected override void OnSliderBreak() protected override void OnSliderBreak()