h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 14:42:56 +08:00
Code Issues Releases Wiki Activity

Also add support in LegacyComboCounter

Browse Source
This commit is contained in:
Dean Herbert 2020-10-16 17:40:15 +09:00
parent 24b0a1b84b
commit a774de2270
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics.Sprites;
using osu.Game.Skinning; using osu.Game.Skinning;
using osuTK; using osuTK;
@ -246,6 +247,6 @@ namespace osu.Game.Screens.Play.HUD
return difference * rolling_duration; return difference * rolling_duration;
} }
private Drawable createSpriteText() => new LegacySpriteText(skin); private OsuSpriteText createSpriteText() => (OsuSpriteText)skin.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ComboText));
} }
} }

1
osu.Game/Skinning/HUDSkinComponents.cs
View File

@ -8,6 +8,7 @@ namespace osu.Game.Skinning
ComboCounter, ComboCounter,
ScoreCounter, ScoreCounter,
ScoreText, ScoreText,
ComboText,
AccuracyCounter, AccuracyCounter,
} }
} }

8
osu.Game/Skinning/LegacySkin.cs
View File

@ -327,6 +327,8 @@ namespace osu.Game.Skinning
private string scorePrefix => GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score"; private string scorePrefix => GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score";
private string comboPrefix => GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ComboPrefix)?.Value ?? "score";
private bool hasScoreFont => this.HasFont(scorePrefix); private bool hasScoreFont => this.HasFont(scorePrefix);
public override Drawable GetDrawableComponent(ISkinComponent component) public override Drawable GetDrawableComponent(ISkinComponent component)
@ -349,6 +351,12 @@ namespace osu.Game.Skinning
case HUDSkinComponents.AccuracyCounter: case HUDSkinComponents.AccuracyCounter:
return new LegacyAccuracyCounter(this); return new LegacyAccuracyCounter(this);
case HUDSkinComponents.ComboText:
return new LegacySpriteText(this, comboPrefix)
{
Spacing = new Vector2(-(GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ComboOverlap)?.Value ?? -2), 0)
};
case HUDSkinComponents.ScoreText: case HUDSkinComponents.ScoreText:
return new LegacySpriteText(this, scorePrefix) return new LegacySpriteText(this, scorePrefix)
{ {