diff --git a/AssetStudio/AssetsManager.cs b/AssetStudio/AssetsManager.cs index ac871e8..acb142c 100644 --- a/AssetStudio/AssetsManager.cs +++ b/AssetStudio/AssetsManager.cs @@ -592,7 +592,7 @@ namespace AssetStudio private void ProcessAssets() { - Logger.Info("Process Assets..."); + Logger.Info("Process assets..."); foreach (var assetsFile in assetsFileList) { diff --git a/AssetStudioCLI/Studio.cs b/AssetStudioCLI/Studio.cs index 0e0b170..4099b14 100644 --- a/AssetStudioCLI/Studio.cs +++ b/AssetStudioCLI/Studio.cs @@ -158,6 +158,10 @@ namespace AssetStudioCLI } parsedAssetsList.AddRange(fileAssetsList); fileAssetsList.Clear(); + if (options.o_workMode.Value != WorkMode.ExportLive2D) + { + containers.Clear(); + } } } diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index 5f31b85..22e49b8 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -1300,10 +1300,15 @@ namespace AssetStudioGUI { if (InvokeRequired) { - BeginInvoke(new Action(() => { progressBar1.Value = value; })); + BeginInvoke(new Action(() => + { + progressBar1.Value = value; + progressBar1.Style = ProgressBarStyle.Continuous; + })); } else { + progressBar1.Style = ProgressBarStyle.Continuous; progressBar1.Value = value; } @@ -1905,6 +1910,8 @@ namespace AssetStudioGUI { timer.Stop(); saveDirectoryBackup = saveFolderDialog.Folder; + Progress.Reset(); + BeginInvoke(new Action(() => { progressBar1.Style = ProgressBarStyle.Marquee; })); Studio.ExportLive2D(cubismMocs, saveFolderDialog.Folder); } } diff --git a/AssetStudioGUI/Studio.cs b/AssetStudioGUI/Studio.cs index 505321d..6d55393 100644 --- a/AssetStudioGUI/Studio.cs +++ b/AssetStudioGUI/Studio.cs @@ -439,7 +439,7 @@ namespace AssetStudioGUI break; } exportPath += Path.DirectorySeparatorChar; - Logger.Info($"[{exportedCount}/{toExportCount}] Exporting {asset.TypeString}: {asset.Text}"); + Logger.Info($"[{exportedCount + 1}/{toExportCount}] Exporting {asset.TypeString}: {asset.Text}"); try { switch (exportType) @@ -748,7 +748,6 @@ namespace AssetStudioGUI ThreadPool.QueueUserWorkItem(state => { - Progress.Reset(); Logger.Info($"Searching for Live2D files..."); var useFullContainerPath = false;