h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-19 05:02:53 +08:00
Code Issues Releases Wiki Activity

Merge pull request #29427 from frenzibyte/fix-ruleset-components-beatmap-skin

Browse Source 
Fix beatmap skin always overriding ruleset HUD components
This commit is contained in:
Dean Herbert 2024-08-15 17:53:13 +09:00 committed by GitHub
commit e7b4a2f451
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
View File

@ -43,6 +43,10 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
if (base.GetDrawableComponent(lookup) is UserConfiguredLayoutContainer d)
return d;
// we don't have enough assets to display these components (this is especially the case on a "beatmap" skin).
if (!IsProvidingLegacyResources)
return null;
// Our own ruleset components default.
// todo: remove CatchSkinComponents.CatchComboCounter and refactor LegacyCatchComboCounter to be added here instead.
return new DefaultSkinComponentsContainer(container =>

4
osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
View File

@ -53,6 +53,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
if (base.GetDrawableComponent(lookup) is UserConfiguredLayoutContainer d)
return d;
// we don't have enough assets to display these components (this is especially the case on a "beatmap" skin).
if (!IsProvidingLegacyResources)
return null;
// Our own ruleset components default.
switch (containerLookup.Target)
{