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

Fix skin version being incorrectly set to 1.0 when skin is missing skin.ini

Browse Source 
Closes https://github.com/ppy/osu/issues/24939.
This commit is contained in:
Dean Herbert 2023-09-27 16:45:38 +09:00
parent 84682b4227
commit c44cca2c23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Skinning/Skin.cs
View File

@ -105,7 +105,14 @@ namespace osu.Game.Skinning
Debug.Assert(Configuration != null); Debug.Assert(Configuration != null);
} }
else else
Configuration = new SkinConfiguration(); {
Configuration = new SkinConfiguration
{
// generally won't be hit as we always write a `skin.ini` on import, but best be safe than sorry.
// see https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/Graphics/Skinning/SkinManager.cs#L297-L298
LegacyVersion = SkinConfiguration.LATEST_VERSION,
};
}
// skininfo files may be null for default skin. // skininfo files may be null for default skin.
foreach (SkinComponentsContainerLookup.TargetArea skinnableTarget in Enum.GetValues<SkinComponentsContainerLookup.TargetArea>()) foreach (SkinComponentsContainerLookup.TargetArea skinnableTarget in Enum.GetValues<SkinComponentsContainerLookup.TargetArea>())

6
osu.Game/Skinning/SkinImporter.cs
View File

@ -118,7 +118,7 @@ namespace osu.Game.Skinning
string nameLine = @$"Name: {item.Name}"; string nameLine = @$"Name: {item.Name}";
string authorLine = @$"Author: {item.Creator}"; string authorLine = @$"Author: {item.Creator}";
string[] newLines = List<string> newLines = new List<string>
{ {
@"// The following content was automatically added by osu! during import, based on filename / folder metadata.", @"// The following content was automatically added by osu! during import, based on filename / folder metadata.",
@"[General]", @"[General]",
@ -130,6 +130,10 @@ namespace osu.Game.Skinning
if (existingFile == null) if (existingFile == null)
{ {
// skins without a skin.ini are supposed to import using the "latest version" spec.
// see https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/Graphics/Skinning/SkinManager.cs#L297-L298
newLines.Add($"Version: {SkinConfiguration.LATEST_VERSION}");
// In the case a skin doesn't have a skin.ini yet, let's create one. // In the case a skin doesn't have a skin.ini yet, let's create one.
writeNewSkinIni(); writeNewSkinIni();
} }