sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update state based on result during LoadComplete

Browse Source
This commit is contained in:
Derrick Timmermans
2022-11-27 20:57:00 +01:00
parent 61bfd2f6b2
commit cff3e06ad6
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,7 +199,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
comboColourBrightness.BindValueChanged(_ => UpdateComboColour()); comboColourBrightness.BindValueChanged(_ => UpdateComboColour());
// Apply transforms // Apply transforms
updateState(State.Value, true); updateStateBasedOnResults();
} }
/// <summary> /// <summary>
@ -265,6 +265,16 @@ namespace osu.Game.Rulesets.Objects.Drawables
// If not loaded, the state update happens in LoadComplete(). // If not loaded, the state update happens in LoadComplete().
if (IsLoaded) if (IsLoaded)
{
updateStateBasedOnResults();
// Combo colour may have been applied via a bindable flow while no object entry was attached.
// Update here to ensure we're in a good state.
UpdateComboColour();
}
}
private void updateStateBasedOnResults()
{ {
if (Result.IsHit) if (Result.IsHit)
updateState(ArmedState.Hit, true); updateState(ArmedState.Hit, true);
@ -272,11 +282,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
updateState(ArmedState.Miss, true); updateState(ArmedState.Miss, true);
else else
updateState(ArmedState.Idle, true); updateState(ArmedState.Idle, true);
// Combo colour may have been applied via a bindable flow while no object entry was attached.
// Update here to ensure we're in a good state.
UpdateComboColour();
}
} }
protected sealed override void OnFree(HitObjectLifetimeEntry entry) protected sealed override void OnFree(HitObjectLifetimeEntry entry)