feat: Compatible with Unity 2022.3

swgoh-utils · Jul 10, 2024 · d7c9dc9 · d7c9dc9
1 parent 70eac18
commit d7c9dc9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/AssetGUI/MainProgram.cs b/AssetGUI/MainProgram.cs
@@ -160,10 +160,19 @@ public void DownloadManifest()
         {
             Directory.CreateDirectory($"{workingFolder}/Manifest");
 
-            using (var client = new WebClient())
+            try
+            {
+                using (var client = new WebClient())
+                {
+                    Console.WriteLine($"Downloading Manifest");
+                    client.DownloadFile($"{AssetDownloadUrl}manifest.data", $"{workingFolder}/Manifest/{this.AssetVersion}_manifest.data");
+                    Console.WriteLine($"Done downloading Manifest");
+                }
+            }
+            catch (Exception ex)
             {
-                Console.WriteLine($"Downloading Manifest");
-                client.DownloadFile($"{AssetDownloadUrl}manifest.data", $"{workingFolder}/Manifest/{this.AssetVersion}_manifest.data");
+                Console.WriteLine($"Error downloading Manifest");
+                throw;
             }
         }
 

diff --git a/AssetGetterTools/AssetGetterTools.csproj b/AssetGetterTools/AssetGetterTools.csproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="protobuf-net" Version="3.0.101" />
     <PackageReference Include="SevenZip" Version="19.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
@@ -41,7 +41,6 @@
     <ProjectReference Include="..\AssetStudio\AssetStudioFBXWrapper\AssetStudioFBXWrapper.csproj" />
     <ProjectReference Include="..\AssetStudio\AssetStudioUtility\AssetStudioUtility.csproj" />
     <ProjectReference Include="..\AssetStudio\AssetStudio\AssetStudio.csproj" />
-    <ProjectReference Include="..\AssetStudio\Texture2DDecoderWrapper\Texture2DDecoderWrapper.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/AssetGetterTools/helpers/Exporter.cs b/AssetGetterTools/helpers/Exporter.cs
@@ -51,7 +51,7 @@ public static bool ExportAudioClip(AssetItem item, string exportPath)
             {
                 if (!TryExportFile(exportPath, item, ".wav", out var exportFullPath))
                     return false;
-                var buffer = converter.ConvertToWav();
+                var buffer = converter.ConvertToWav(m_AudioData, out var debugLog);
                 if (buffer == null)
                     return false;
                 File.WriteAllBytes(exportFullPath, buffer);

diff --git a/AssetGetterTools/helpers/Filehelper.cs b/AssetGetterTools/helpers/Filehelper.cs
@@ -29,7 +29,7 @@ public void UnpackBundle(string inFile, string targetFolder, string assetName, b
             var assetManager = new AssetsManager();
             exportableAssets.Clear();
 
-            assetManager.LoadFiles(pathes.ToArray());
+            assetManager.LoadFilesAndFolders(pathes.ToArray());
 
             foreach (var assetsFile in assetManager.assetsFileList)
             {

diff --git a/AssetStudio b/AssetStudio