diff --git a/AssetGUI/MainProgram.cs b/AssetGUI/MainProgram.cs index 7542eda..bf6373b 100644 --- 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 index dfa4ab5..0e5fafd 100644 --- a/AssetGetterTools/AssetGetterTools.csproj +++ b/AssetGetterTools/AssetGetterTools.csproj @@ -30,7 +30,7 @@ - + @@ -41,7 +41,6 @@ - diff --git a/AssetGetterTools/helpers/Exporter.cs b/AssetGetterTools/helpers/Exporter.cs index 98707fd..697291d 100644 --- 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 index b09eb51..1f713d8 100644 --- 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 index 1c87a7b..b247355 160000 --- a/AssetStudio +++ b/AssetStudio @@ -1 +1 @@ -Subproject commit 1c87a7b1b99b60d72280b8f5562bb43f72ead36c +Subproject commit b247355bd66eff6679c439dcd032fa0c175682dc