mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-25 05:40:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some minor fixes

Browse Source
This commit is contained in:
VaDiM 2023-07-09 05:47:04 +03:00
parent 007e5c7e4d
commit dcd7b98229
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AssetStudio/AssetsManager.cs
View File

@ -592,7 +592,7 @@ namespace AssetStudio
private void ProcessAssets() private void ProcessAssets()
{ {
Logger.Info("Process Assets..."); Logger.Info("Process assets...");
foreach (var assetsFile in assetsFileList) foreach (var assetsFile in assetsFileList)
{ {

4
AssetStudioCLI/Studio.cs
View File

@ -158,6 +158,10 @@ namespace AssetStudioCLI
} }
parsedAssetsList.AddRange(fileAssetsList); parsedAssetsList.AddRange(fileAssetsList);
fileAssetsList.Clear(); fileAssetsList.Clear();
if (options.o_workMode.Value != WorkMode.ExportLive2D)
{
containers.Clear();
}
} }
} }

9
AssetStudioGUI/AssetStudioGUIForm.cs
View File

@ -1300,10 +1300,15 @@ namespace AssetStudioGUI
{ {
if (InvokeRequired) if (InvokeRequired)
{ {
BeginInvoke(new Action(() => { progressBar1.Value = value; })); BeginInvoke(new Action(() =>
{
progressBar1.Value = value;
progressBar1.Style = ProgressBarStyle.Continuous;
}));
} }
else else
{ {
progressBar1.Style = ProgressBarStyle.Continuous;
progressBar1.Value = value; progressBar1.Value = value;
} }
@ -1905,6 +1910,8 @@ namespace AssetStudioGUI
{ {
timer.Stop(); timer.Stop();
saveDirectoryBackup = saveFolderDialog.Folder; saveDirectoryBackup = saveFolderDialog.Folder;
Progress.Reset();
BeginInvoke(new Action(() => { progressBar1.Style = ProgressBarStyle.Marquee; }));
Studio.ExportLive2D(cubismMocs, saveFolderDialog.Folder); Studio.ExportLive2D(cubismMocs, saveFolderDialog.Folder);
} }
} }

3
AssetStudioGUI/Studio.cs
View File

@ -439,7 +439,7 @@ namespace AssetStudioGUI
break; break;
} }
exportPath += Path.DirectorySeparatorChar; exportPath += Path.DirectorySeparatorChar;
Logger.Info($"[{exportedCount}/{toExportCount}] Exporting {asset.TypeString}: {asset.Text}"); Logger.Info($"[{exportedCount + 1}/{toExportCount}] Exporting {asset.TypeString}: {asset.Text}");
try try
{ {
switch (exportType) switch (exportType)
@ -748,7 +748,6 @@ namespace AssetStudioGUI
ThreadPool.QueueUserWorkItem(state => ThreadPool.QueueUserWorkItem(state =>
{ {
Progress.Reset();
Logger.Info($"Searching for Live2D files..."); Logger.Info($"Searching for Live2D files...");
var useFullContainerPath = false; var useFullContainerPath = false;