Some minor fixes

gartia · Jul 9, 2023 · dcd7b98 · dcd7b98
1 parent 007e5c7
commit dcd7b98
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/AssetStudio/AssetsManager.cs b/AssetStudio/AssetsManager.cs
@@ -592,7 +592,7 @@ private void ReadAssets()
 
         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
@@ -158,6 +158,10 @@ public void ParseAssets()
                 }
                 parsedAssetsList.AddRange(fileAssetsList);
                 fileAssetsList.Clear();
+                if (options.o_workMode.Value != WorkMode.ExportLive2D)
+                {
+                    containers.Clear();
+                }
             }
         }
 

diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs
@@ -1300,10 +1300,15 @@ private void SetProgressBarValue(int value)
         {
             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 @@ private void allLive2DModelsToolStripMenuItem_Click(object sender, EventArgs e)
                 {
                     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
@@ -439,7 +439,7 @@ public static void ExportAssets(string savePath, List<AssetItem> toExportAssets,
                             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 @@ public static void ExportLive2D(Object[] cubismMocs, string exportPath)
 
             ThreadPool.QueueUserWorkItem(state =>
             {
-                Progress.Reset();
                 Logger.Info($"Searching for Live2D files...");
 
                 var useFullContainerPath = false;