mirror of
https://github.com/ppy/osu.git
synced 2024-09-22 01:27:29 +08:00
Update in line with combo colour API changes
This commit is contained in:
parent
f593bc8d9e
commit
2869128e11
@ -16,10 +16,10 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
|
|||||||
|
|
||||||
private Color4? colour;
|
private Color4? colour;
|
||||||
|
|
||||||
protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
|
protected override Color4 GetComboColour(IReadOnlyList<Color4> comboColours)
|
||||||
{
|
{
|
||||||
// override any external colour changes with banananana
|
// override any external colour changes with banananana
|
||||||
AccentColour.Value = (colour ??= getBananaColour());
|
return colour ??= getBananaColour();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Color4 getBananaColour()
|
private Color4 getBananaColour()
|
||||||
|
@ -45,11 +45,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
|
|||||||
ScaleContainer.Scale = new Vector2(HitObject.Scale);
|
ScaleContainer.Scale = new Vector2(HitObject.Scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
|
protected override Color4 GetComboColour(IReadOnlyList<Color4> comboColours) =>
|
||||||
{
|
comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
|
||||||
// ignore the incoming combo colour as we use a custom lookup
|
|
||||||
AccentColour.Value = comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract class DrawableCatchHitObject<TObject> : DrawableCatchHitObject
|
public abstract class DrawableCatchHitObject<TObject> : DrawableCatchHitObject
|
||||||
|
Loading…
Reference in New Issue
Block a user