chizui/AssetStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some minor fixes

Browse Source
This commit is contained in:
VaDiM
2025-10-07 00:40:28 +03:00
parent 6c3ff89dbf
commit 6d5b633d55
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AssetStudio/BundleFile.cs
View File

@@ -87,9 +87,7 @@ namespace AssetStudio
m_Header.signature = reader.ReadStringToNull(); m_Header.signature = reader.ReadStringToNull();
m_Header.version = reader.ReadUInt32(); m_Header.version = reader.ReadUInt32();
m_Header.unityVersion = reader.ReadStringToNull(); m_Header.unityVersion = reader.ReadStringToNull();
var revStr = reader.ReadStringToNull(); m_Header.unityRevision = UnityVersion.TryParse(reader.ReadStringToNull(), out var ver) ? ver : new UnityVersion();
if (!UnityVersion.TryParse(revStr, out m_Header.unityRevision))
m_Header.unityRevision = new UnityVersion();
switch (m_Header.signature) switch (m_Header.signature)
{ {

5
AssetStudioCLI/Studio.cs
View File

@@ -30,6 +30,7 @@ namespace AssetStudioCLI
{ {
Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US"); Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
Progress.Default = new Progress<int>(ShowCurProgressValue); Progress.Default = new Progress<int>(ShowCurProgressValue);
Progress.SetInstance(1, new Progress<int>(ShowCurProgressValue));
assetsManager.LoadViaTypeTree = !CLIOptions.f_avoidLoadingViaTypetree.Value; assetsManager.LoadViaTypeTree = !CLIOptions.f_avoidLoadingViaTypetree.Value;
assetsManager.Options.CustomUnityVersion = CLIOptions.o_unityVersion.Value; assetsManager.Options.CustomUnityVersion = CLIOptions.o_unityVersion.Value;
assetsManager.Options.BundleOptions.CustomBlockInfoCompression = CLIOptions.o_bundleBlockInfoCompression.Value; assetsManager.Options.BundleOptions.CustomBlockInfoCompression = CLIOptions.o_bundleBlockInfoCompression.Value;
@@ -519,11 +520,11 @@ namespace AssetStudioCLI
info += $"\n#\n# Total: {parsedAssetsList.Count} assets"; info += $"\n#\n# Total: {parsedAssetsList.Count} assets";
} }
info += $"\n\n# Exportable Live2D Models: {l2dModelDict.Count}"; info += $"\n\n[Cubism Live2D]\n# Exportable Models: {l2dModelDict.Count}";
} }
else else
{ {
info += "No exportable assets found."; info += "\n\nNo exportable assets found.";
} }
if (CLIOptions.o_logLevel.Value > LoggerEvent.Info) if (CLIOptions.o_logLevel.Value > LoggerEvent.Info)

20
AssetStudioGUI/AssetStudioGUIForm.Designer.cs generated
View File

@@ -48,7 +48,7 @@
this.useDumpTreeViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.useDumpTreeViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.buildTreeStructureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.buildTreeStructureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.importOptionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.importOptionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.specifyUnityVersionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.customUnityVersionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.specifyUnityVersionTextBox = new System.Windows.Forms.ToolStripTextBox(); this.specifyUnityVersionTextBox = new System.Windows.Forms.ToolStripTextBox();
this.bundleDecompressionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bundleDecompressionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.alwaysDecompressToDiskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.alwaysDecompressToDiskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -377,7 +377,7 @@
// importOptionsToolStripMenuItem // importOptionsToolStripMenuItem
// //
this.importOptionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.importOptionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.specifyUnityVersionToolStripMenuItem, this.customUnityVersionToolStripMenuItem,
this.specifyUnityVersionTextBox, this.specifyUnityVersionTextBox,
this.bundleDecompressionToolStripMenuItem, this.bundleDecompressionToolStripMenuItem,
this.alwaysDecompressToDiskToolStripMenuItem, this.alwaysDecompressToDiskToolStripMenuItem,
@@ -393,17 +393,17 @@
this.importOptionsToolStripMenuItem.DropDownClosed += new System.EventHandler(this.importOptions_DropDownClose); this.importOptionsToolStripMenuItem.DropDownClosed += new System.EventHandler(this.importOptions_DropDownClose);
this.importOptionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.importOptions_DropDownOpened); this.importOptionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.importOptions_DropDownOpened);
// //
// specifyUnityVersionToolStripMenuItem // customUnityVersionToolStripMenuItem
// //
this.specifyUnityVersionToolStripMenuItem.Enabled = false; this.customUnityVersionToolStripMenuItem.Enabled = false;
this.specifyUnityVersionToolStripMenuItem.Name = "specifyUnityVersionToolStripMenuItem"; this.customUnityVersionToolStripMenuItem.Name = "customUnityVersionToolStripMenuItem";
this.specifyUnityVersionToolStripMenuItem.ShowShortcutKeys = false; this.customUnityVersionToolStripMenuItem.ShowShortcutKeys = false;
this.specifyUnityVersionToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.customUnityVersionToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
this.specifyUnityVersionToolStripMenuItem.Text = "Specify Unity version"; this.customUnityVersionToolStripMenuItem.Text = "Custom Unity version";
this.specifyUnityVersionToolStripMenuItem.ToolTipText = "Specify full Unity version, including letters at the end\r\nExample: 2017.4.39f1";
// //
// specifyUnityVersionTextBox // specifyUnityVersionTextBox
// //
this.specifyUnityVersionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.specifyUnityVersionTextBox.Font = new System.Drawing.Font("Segoe UI", 9F); this.specifyUnityVersionTextBox.Font = new System.Drawing.Font("Segoe UI", 9F);
this.specifyUnityVersionTextBox.Name = "specifyUnityVersionTextBox"; this.specifyUnityVersionTextBox.Name = "specifyUnityVersionTextBox";
this.specifyUnityVersionTextBox.Size = new System.Drawing.Size(100, 23); this.specifyUnityVersionTextBox.Size = new System.Drawing.Size(100, 23);
@@ -1860,7 +1860,7 @@
private System.Windows.Forms.ToolStripMenuItem autoPlayAudioAssetsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem autoPlayAudioAssetsToolStripMenuItem;
private System.Windows.Forms.CheckBox sceneExactSearchCheckBox; private System.Windows.Forms.CheckBox sceneExactSearchCheckBox;
private System.Windows.Forms.ToolStripMenuItem importOptionsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem importOptionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem specifyUnityVersionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem customUnityVersionToolStripMenuItem;
private System.Windows.Forms.ToolStripTextBox specifyUnityVersionTextBox; private System.Windows.Forms.ToolStripTextBox specifyUnityVersionTextBox;
private System.Windows.Forms.ToolStripMenuItem bundleDecompressionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem bundleDecompressionToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem alwaysDecompressToDiskToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem alwaysDecompressToDiskToolStripMenuItem;

6
AssetStudioGUI/AssetStudioGUIForm.cs
View File

@@ -89,10 +89,10 @@ namespace AssetStudioGUI
private int sortColumn = -1; private int sortColumn = -1;
private bool reverseSort; private bool reverseSort;
#if NET6_0_OR_GREATER #if NETFRAMEWORK
private AlphanumComparatorFastNet alphanumComparator = new AlphanumComparatorFastNet();
#else
private AlphanumComparatorFast alphanumComparator = new AlphanumComparatorFast(); private AlphanumComparatorFast alphanumComparator = new AlphanumComparatorFast();
#else
private AlphanumComparatorFastNet alphanumComparator = new AlphanumComparatorFastNet();
#endif #endif
//asset list selection //asset list selection