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

Merge branch 'master' into catch-drawable-namespace

Browse Source
This commit is contained in:
Dean Herbert
2020-02-21 10:31:31 +09:00
parent ea0bbd2926 f84f829fe5
commit a7e3e8ace9
82 changed files with 1725 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
{
public override bool CanBePlated => true;
protected Container ScaleContainer;
protected Container ScaleContainer { get; private set; }
protected PalpableCatchHitObject(TObject hitObject)
: base(hitObject)
@ -45,11 +45,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
ScaleContainer.Scale = new Vector2(HitObject.Scale);
}
protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
{
// ignore the incoming combo colour as we use a custom lookup
AccentColour.Value = comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
}
protected override Color4 GetComboColour(IReadOnlyList<Color4> comboColours) =>
comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
}
public abstract class DrawableCatchHitObject<TObject> : DrawableCatchHitObject