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

Move implementation to transformer

Browse Source
This commit is contained in:
Endrik Tombak 2020-04-04 11:13:25 +03:00
parent d73c791a10
commit e1a67bdb96
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
View File

@ -62,9 +62,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
} }
}; };
bool? numberSetting = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value; bool overlayAboveNumber = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value ?? true;
bool? numerSetting = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumer)?.Value;
bool overlayAboveNumber = numberSetting ?? numerSetting ?? true;
if (!overlayAboveNumber) if (!overlayAboveNumber)
ChangeInternalChildDepth(hitCircleText, -float.MaxValue); ChangeInternalChildDepth(hitCircleText, -float.MaxValue);

6
osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
View File

@ -132,6 +132,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
return SkinUtils.As<TValue>(new BindableFloat(LEGACY_CIRCLE_RADIUS)); return SkinUtils.As<TValue>(new BindableFloat(LEGACY_CIRCLE_RADIUS));
break; break;
case OsuSkinConfiguration.HitCircleOverlayAboveNumber:
// Quote from https://osu.ppy.sh/help/wiki/Skinning/skin.ini#%5Bgeneral%5D
// Old command: HitCircleOverlayAboveNumer (with typo) still works for legacy support
var rv = source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber);
return rv ?? source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
} }
break; break;