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 remove-judgement-occurred

Browse Source
This commit is contained in:
Dean Herbert
2019-09-06 15:32:34 +09:00
committed by GitHub
parent 07f662071d fbdef97498
commit c379480e7b
70 changed files with 752 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,7 +239,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
base.SkinChanged(skin, allowFallback);
if (HitObject is IHasComboInformation combo)
AccentColour.Value = skin.GetValue<SkinConfiguration, Color4?>(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : (Color4?)null) ?? Color4.White;
{
var comboColours = skin.GetConfig<GlobalSkinConfiguration, List<Color4>>(GlobalSkinConfiguration.ComboColours)?.Value;
AccentColour.Value = comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White;
}
}
/// <summary>