h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 07:42:57 +08:00
Code Issues Releases Wiki Activity

Reverted to applying the color change in OnUpdate, removed EnableComboColour flag from DrawableHitObject.cs

Browse Source
This commit is contained in:
John 2023-05-30 01:43:08 -07:00
parent b7dc8d49ba
commit ed850196d9
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game.Rulesets.Osu/Mods/OsuModSnapColour.cs
View File

@ -31,13 +31,10 @@ namespace osu.Game.Rulesets.Osu.Mods
{
if (currentBeatmap.IsNull() || drawable.IsNull()) return;
drawable.ApplyCustomUpdateState += (drawableObject, state) =>
{
int snapDivisor = currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(drawableObject.HitObject.StartTime);
drawableObject.EnableComboColour = false;
drawableObject.AccentColour.Value = BindableBeatDivisor.GetColourFor(snapDivisor, colours);
};
drawable.OnUpdate += _ =>
drawable.AccentColour.Value = BindableBeatDivisor.GetColourFor(
currentBeatmap.ControlPointInfo.GetClosestBeatDivisor(drawable.HitObject.StartTime),
colours);
}
}
}

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

@ -74,11 +74,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
public override bool PropagateNonPositionalInputSubTree => HandleUserInput;
/// <summary>
/// Whether this object should be coloured using its combo position
/// </summary>
public bool EnableComboColour { get; set; } = true;
/// <summary>
/// Invoked by this or a nested <see cref="DrawableHitObject"/> after a <see cref="JudgementResult"/> has been applied.
/// </summary>
@ -533,7 +528,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
protected void UpdateComboColour()
{
if (!(HitObject is IHasComboInformation combo)) return;
if (!EnableComboColour) return;
Color4 colour = combo.GetComboColour(CurrentSkin);