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

Fix CI issues

Browse Source
This commit is contained in:
iiSaLMaN 2019-10-03 11:06:38 +03:00
parent dabc224030
commit 2d7acef080
3 changed files with 5 additions and 6 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

@ -10,7 +10,6 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables;
using osu.Game.Skinning; using osu.Game.Skinning;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
@ -41,7 +40,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
private void load() private void load()
{ {
OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject; OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
DrawableHitCircle drawableCircle = (DrawableHitCircle)drawableObject;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
@ -95,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
hitCircleSprite.ScaleTo(1.4f, legacy_fade_duration, Easing.Out); hitCircleSprite.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
hitCircleOverlay.ScaleTo(1.4f, legacy_fade_duration, Easing.Out); hitCircleOverlay.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
if (skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece).Value) if (skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece)?.Value ?? true)
hitCircleText.ScaleTo(1.4f, legacy_fade_duration, Easing.Out); hitCircleText.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
break; break;

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

@ -125,7 +125,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
break; break;
case OsuSkinConfiguration.ExpandNumberPiece: case OsuSkinConfiguration.ExpandNumberPiece:
return SkinUtils.As<TValue>(new BindableBool(source.GetConfig<LegacySkinConfiguration, double>(LegacySkinConfiguration.LegacyVersion).Value < 2.0)); double legacyVersion = source.GetConfig<LegacySkinConfiguration, double>(LegacySkinConfiguration.LegacyVersion)?.Value ?? 1.0;
return SkinUtils.As<TValue>(new BindableBool(legacyVersion < 2.0));
} }
break; break;

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

@ -74,9 +74,9 @@ namespace osu.Game.Skinning
switch (legacy) switch (legacy)
{ {
case LegacySkinConfiguration.LegacyVersion: case LegacySkinConfiguration.LegacyVersion:
var versionString = GetConfig<string, string>("Version").Value; var versionString = GetConfig<string, string>("Version")?.Value ?? "1";
if (!double.TryParse(versionString, out double version)) if (!double.TryParse(versionString, out double version))
version = versionString == "latest" ? 2.7 : 1; version = versionString == "latest" ? 2.7 : 1.0;
return SkinUtils.As<TValue>(new BindableDouble(version)); return SkinUtils.As<TValue>(new BindableDouble(version));
} }