RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-04 13:22:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nullability and remove extra preempt from SliderEndCircle calculation

Browse Source
This commit is contained in:
Dean Herbert 2023-05-02 16:36:43 +09:00
parent 1a04be15c7
commit a619812cab
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,13 +88,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
protected override void UpdateInitialTransforms() protected override void UpdateInitialTransforms()
{ {
// When snaking in is enabled, the first end circle needs to be delayed until the snaking completes. // When snaking in is enabled, the first end circle needs to be delayed until the snaking completes.
bool delayFadeIn = DrawableSlider.SliderBody!.SnakingIn.Value && HitObject.RepeatIndex == 0; bool delayFadeIn = DrawableSlider.SliderBody?.SnakingIn.Value == true && HitObject.RepeatIndex == 0;
animDuration = Math.Min(300, HitObject.SpanDuration); animDuration = Math.Min(300, HitObject.SpanDuration);
this this
.FadeOut() .FadeOut()
.Delay(delayFadeIn ? Slider!.TimePreempt / 3f : 0) .Delay(delayFadeIn ? (Slider?.TimePreempt ?? 0) / 3 : 0)
.FadeIn(HitObject.RepeatIndex == 0 ? HitObject.TimeFadeIn : animDuration); .FadeIn(HitObject.RepeatIndex == 0 ? HitObject.TimeFadeIn : animDuration);
} }

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

@ -92,11 +92,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
base.UpdateInitialTransforms(); base.UpdateInitialTransforms();
// When snaking in is enabled, the first end circle needs to be delayed until the snaking completes. // When snaking in is enabled, the first end circle needs to be delayed until the snaking completes.
bool delayFadeIn = DrawableSlider.SliderBody!.SnakingIn.Value && HitObject.RepeatIndex == 0; bool delayFadeIn = DrawableSlider.SliderBody?.SnakingIn.Value == true && HitObject.RepeatIndex == 0;
CirclePiece CirclePiece
.FadeOut() .FadeOut()
.Delay(delayFadeIn ? Slider!.TimePreempt / 3f : 0) .Delay(delayFadeIn ? (Slider?.TimePreempt ?? 0) / 3 : 0)
.FadeIn(HitObject.TimeFadeIn); .FadeIn(HitObject.TimeFadeIn);
} }

2
osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
View File

@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Osu.Objects
else else
{ {
// The first end circle should fade in with the slider. // The first end circle should fade in with the slider.
TimePreempt = (StartTime - slider.StartTime) + slider.TimePreempt; TimePreempt += StartTime - slider.StartTime;
} }
} }