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

Merge branch 'master' into fix-editor-unnecessary-object-updates

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-11-29 21:34:17 +01:00 committed by GitHub
commit 4057ca0a57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
View File

@ -248,7 +248,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
} }
private void trackingChanged(ValueChangedEvent<bool> tracking) => private void trackingChanged(ValueChangedEvent<bool> tracking) =>
box.FadeTo(tracking.NewValue ? 0.6f : 0.05f, 200, Easing.OutQuint); box.FadeTo(tracking.NewValue ? 0.3f : 0.05f, 200, Easing.OutQuint);
} }
} }
} }

17
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -263,18 +263,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
OnApply(); OnApply();
HitObjectApplied?.Invoke(this); HitObjectApplied?.Invoke(this);
// If not loaded, the state update happens in LoadComplete(). Otherwise, the update is scheduled to allow for lifetime updates. // If not loaded, the state update happens in LoadComplete().
if (IsLoaded) if (IsLoaded)
{ {
Scheduler.Add(() => if (Result.IsHit)
{ updateState(ArmedState.Hit, true);
if (Result.IsHit) else if (Result.HasResult)
updateState(ArmedState.Hit, true); updateState(ArmedState.Miss, true);
else if (Result.HasResult) else
updateState(ArmedState.Miss, true); updateState(ArmedState.Idle, true);
else
updateState(ArmedState.Idle, true);
});
} }
hasHitObjectApplied = true; hasHitObjectApplied = true;