Skip to content

Commit 98a4d5f

Browse files
committed
Fix atlastool taking to long to load on v1
1 parent 57e0959 commit 98a4d5f

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

AssetStudio/AssetStudio/AssetsManager.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void LoadFiles(params string[] files)
3232
public void LoadFolder(string path)
3333
{
3434
MergeSplitAssets(path, true);
35-
var files = Directory.GetFiles(path, "*.*", SearchOption.AllDirectories).ToList();
35+
var files = Directory.GetFiles(path, "*.*", SearchOption.TopDirectoryOnly).ToList();
3636
var toReadFile = ProcessingSplitFiles(files);
3737
Load(toReadFile);
3838
}
@@ -450,9 +450,9 @@ private void ReadAssets()
450450
case ClassIDType.RectTransform:
451451
obj = new RectTransform(objectReader);
452452
break;
453-
case ClassIDType.Shader:
454-
obj = new Shader(objectReader);
455-
break;
453+
// case ClassIDType.Shader:
454+
// obj = new Shader(objectReader);
455+
// break;
456456
case ClassIDType.SkinnedMeshRenderer:
457457
obj = new SkinnedMeshRenderer(objectReader);
458458
break;

atlascore/AssetStudioUtil.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public static class AssetStudioUtil
1212
{
1313
public static AssetsManager LoadAssetManager(string path)
1414
{
15+
AssetStudio.Progress.Default = new Progress<int>((int val) => Console.Write($"\rLoading assets: {val,3}%"));
1516
AssetsManager assetManager = new();
1617

1718
if (File.Exists(path))

atlascore/AtlasOps.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,21 +117,23 @@ public static void LoadTextures(AtlasData atlasData, string outputDir)
117117

118118
public static AtlasData? ReadAtlasDataFromAssets(string assetPath)
119119
{
120+
Console.Write("Loading assets");
120121
AssetStudio.AssetsManager assetManager = AssetStudioUtil.LoadAssetManager(assetPath);
121122
if (assetManager == null)
122123
{
123124
Console.WriteLine("Error: Could not load game data. Please ensure the input path is for the game's data folder or data.unity3d.");
124125
return null;
125126
}
126-
127+
Console.WriteLine("\nReading game version");
127128
var gameVersion = AssetStudioUtil.GetGameVersion(assetManager.assetsFileList);
128129

129-
130+
Console.WriteLine("Enumerating assets");
130131
foreach (var atlas in assetManager.assetsFileList.EnumerateAssets<AssetStudio.SpriteAtlas>())
131132
{
132133
// Limit to just the fiveFretAtlas for now
133134
if (atlas.m_Name != "fiveFretAtlas")
134135
continue;
136+
Console.WriteLine("Loading sprite data");
135137

136138
AtlasData atlasData = new(gameVersion, assetPath, atlas.m_Name, (int)atlas.m_PathID);
137139
foreach (var sprite in atlas.EnumerateAtlasSprites())
@@ -222,12 +224,14 @@ public static void ExtractToFolder(string input, string output)
222224
if (atlasData == null)
223225
return;
224226

227+
Console.WriteLine($"Slicing sprites");
225228
SliceSprites(atlasData);
226229

227230
var outputDir = Path.Combine(output, atlasData.GameVersion);
228231
Directory.CreateDirectory(outputDir);
229232
Directory.CreateDirectory(Path.Combine(outputDir, atlasData.Name));
230233

234+
Console.WriteLine($"Saving sprites to: {outputDir}");
231235
SaveTextures(atlasData, outputDir);
232236
byte[]?[] filesData = new byte[]?[atlasData.Sprites.Count];
233237

@@ -274,7 +278,10 @@ public static void ExtractToFolder(string input, string output)
274278
{
275279
Console.WriteLine($"error saving texture: {sprite.Name}-{sprite.PathID}.png");
276280
}
281+
277282
}
283+
284+
Console.WriteLine($"Done");
278285
}
279286

280287
}

0 commit comments

Comments
 (0)