Gittes-archive/AssetRipper_AssetRipper
2
0
Fork 0
mirror of https://github.com/AssetRipper/AssetRipper.git synced 2025-12-11 20:15:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent an issue with files called maindata

Browse Source
This commit is contained in:
ds5678 2025-09-20 23:52:56 -07:00
parent b258459e63
commit 98759280e0
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/AssetRipper.Export.UnityProjects/Project/SceneExportCollection.cs
View File

@ -111,9 +111,8 @@ public class SceneExportCollection : ExportCollection, IComparer<IUnityObjectBas
private bool IsSceneDuplicate(IExportContainer container)
{
if (SceneHelpers.IsSceneName(File.Name))
if (SceneHelpers.TryGetFileNameToSceneIndex(File.Name, File.OriginalVersion, out int index))
{
int index = SceneHelpers.FileNameToSceneIndex(File.Name, File.OriginalVersion);
return container.IsSceneDuplicate(index);
}
return false;

25
Source/AssetRipper.Processing/Scenes/SceneHelpers.cs
View File

@ -17,21 +17,33 @@ public static partial class SceneHelpers
private const string LevelName = "level";
private const string MainSceneName = "maindata";
public static int FileNameToSceneIndex(string name, UnityVersion version)
public static bool TryGetFileNameToSceneIndex(string name, UnityVersion version, out int index)
{
if (HasMainData(version))
{
if (name == MainSceneName)
{
return 0;
index = 0;
return true;
}
return int.Parse(name.AsSpan(LevelName.Length)) + 1;
if (SceneNameFormat.IsMatch(name))
{
index = int.Parse(name.AsSpan(LevelName.Length)) + 1;
return true;
}
}
else
{
return int.Parse(name.AsSpan(LevelName.Length));
if (SceneNameFormat.IsMatch(name))
{
index = int.Parse(name.AsSpan(LevelName.Length));
return true;
}
}
index = -1;
return false;
}
/// <summary>
@ -70,9 +82,8 @@ public static partial class SceneHelpers
public static bool TryGetScenePath(AssetCollection collection, [NotNullWhen(true)] IBuildSettings? buildSettings, [NotNullWhen(true)] out string? result)
{
if (buildSettings is not null && IsSceneName(collection.Name))
if (buildSettings is not null && TryGetFileNameToSceneIndex(collection.Name, collection.OriginalVersion, out int index))
{
int index = FileNameToSceneIndex(collection.Name, collection.OriginalVersion);
if (index >= buildSettings.Scenes.Count)
{
//This can happen in the following situation:
@ -137,8 +148,6 @@ public static partial class SceneHelpers
return false;
}
public static bool IsSceneName(string name) => name == MainSceneName || SceneNameFormat.IsMatch(name);
[GeneratedRegex("^level(0|([1-9][0-9]*))$")]
private static partial Regex SceneNameFormat { get; }
}