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

Merge pull request #31390 from peppy/slider-end-suppress-fix

Browse Source 
Fix slider end circles not remaining for long enough when hit animations disabled
This commit is contained in:
Bartłomiej Dach 2025-01-07 14:49:25 +01:00 committed by GitHub
commit d2918894a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
View File

@ -626,7 +626,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
{ {
if (BodyPiece.ReceivePositionalInputAt(screenSpacePos)) if (BodyPiece.ReceivePositionalInputAt(screenSpacePos) && DrawableObject.Body.Alpha > 0)
return true; return true;
if (ControlPointVisualiser == null) if (ControlPointVisualiser == null)

13
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -382,6 +382,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
repeat.SuppressHitAnimations(); repeat.SuppressHitAnimations();
TailCircle.SuppressHitAnimations(); TailCircle.SuppressHitAnimations();
// This method is called every frame in editor contexts, thus the lack of need for transforms.
if (Time.Current >= HitStateUpdateTime)
{
// Apply the slider's alpha to *only* the body.
// This allows start and – more importantly – end circles to fade slower than the overall slider.
if (Alpha < 1)
Body.Alpha = Alpha;
Alpha = 1;
}
LifetimeEnd = HitStateUpdateTime + 700;
} }
internal void RestoreHitAnimations() internal void RestoreHitAnimations()