From 6d5b633d55ced544141f68a647658155c1e01887 Mon Sep 17 00:00:00 2001 From: VaDiM Date: Tue, 7 Oct 2025 00:40:28 +0300 Subject: [PATCH] Some minor fixes --- AssetStudio/BundleFile.cs | 4 +--- AssetStudioCLI/Studio.cs | 5 +++-- AssetStudioGUI/AssetStudioGUIForm.Designer.cs | 20 +++++++++---------- AssetStudioGUI/AssetStudioGUIForm.cs | 6 +++--- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/AssetStudio/BundleFile.cs b/AssetStudio/BundleFile.cs index 625bcc0..040bf80 100644 --- a/AssetStudio/BundleFile.cs +++ b/AssetStudio/BundleFile.cs @@ -87,9 +87,7 @@ namespace AssetStudio m_Header.signature = reader.ReadStringToNull(); m_Header.version = reader.ReadUInt32(); m_Header.unityVersion = reader.ReadStringToNull(); - var revStr = reader.ReadStringToNull(); - if (!UnityVersion.TryParse(revStr, out m_Header.unityRevision)) - m_Header.unityRevision = new UnityVersion(); + m_Header.unityRevision = UnityVersion.TryParse(reader.ReadStringToNull(), out var ver) ? ver : new UnityVersion(); switch (m_Header.signature) { diff --git a/AssetStudioCLI/Studio.cs b/AssetStudioCLI/Studio.cs index 4c0e8d4..762588f 100644 --- a/AssetStudioCLI/Studio.cs +++ b/AssetStudioCLI/Studio.cs @@ -30,6 +30,7 @@ namespace AssetStudioCLI { Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US"); Progress.Default = new Progress(ShowCurProgressValue); + Progress.SetInstance(1, new Progress(ShowCurProgressValue)); assetsManager.LoadViaTypeTree = !CLIOptions.f_avoidLoadingViaTypetree.Value; assetsManager.Options.CustomUnityVersion = CLIOptions.o_unityVersion.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# Exportable Live2D Models: {l2dModelDict.Count}"; + info += $"\n\n[Cubism Live2D]\n# Exportable Models: {l2dModelDict.Count}"; } else { - info += "No exportable assets found."; + info += "\n\nNo exportable assets found."; } if (CLIOptions.o_logLevel.Value > LoggerEvent.Info) diff --git a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs index a45e1b8..fd92504 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs @@ -48,7 +48,7 @@ this.useDumpTreeViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.buildTreeStructureToolStripMenuItem = 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.bundleDecompressionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.alwaysDecompressToDiskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -377,7 +377,7 @@ // importOptionsToolStripMenuItem // this.importOptionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.specifyUnityVersionToolStripMenuItem, + this.customUnityVersionToolStripMenuItem, this.specifyUnityVersionTextBox, this.bundleDecompressionToolStripMenuItem, this.alwaysDecompressToDiskToolStripMenuItem, @@ -393,17 +393,17 @@ this.importOptionsToolStripMenuItem.DropDownClosed += new System.EventHandler(this.importOptions_DropDownClose); this.importOptionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.importOptions_DropDownOpened); // - // specifyUnityVersionToolStripMenuItem + // customUnityVersionToolStripMenuItem // - this.specifyUnityVersionToolStripMenuItem.Enabled = false; - this.specifyUnityVersionToolStripMenuItem.Name = "specifyUnityVersionToolStripMenuItem"; - this.specifyUnityVersionToolStripMenuItem.ShowShortcutKeys = false; - this.specifyUnityVersionToolStripMenuItem.Size = new System.Drawing.Size(217, 22); - this.specifyUnityVersionToolStripMenuItem.Text = "Specify Unity version"; - this.specifyUnityVersionToolStripMenuItem.ToolTipText = "Specify full Unity version, including letters at the end\r\nExample: 2017.4.39f1"; + this.customUnityVersionToolStripMenuItem.Enabled = false; + this.customUnityVersionToolStripMenuItem.Name = "customUnityVersionToolStripMenuItem"; + this.customUnityVersionToolStripMenuItem.ShowShortcutKeys = false; + this.customUnityVersionToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.customUnityVersionToolStripMenuItem.Text = "Custom Unity version"; // // specifyUnityVersionTextBox // + this.specifyUnityVersionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.specifyUnityVersionTextBox.Font = new System.Drawing.Font("Segoe UI", 9F); this.specifyUnityVersionTextBox.Name = "specifyUnityVersionTextBox"; this.specifyUnityVersionTextBox.Size = new System.Drawing.Size(100, 23); @@ -1860,7 +1860,7 @@ private System.Windows.Forms.ToolStripMenuItem autoPlayAudioAssetsToolStripMenuItem; private System.Windows.Forms.CheckBox sceneExactSearchCheckBox; 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.ToolStripMenuItem bundleDecompressionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem alwaysDecompressToDiskToolStripMenuItem; diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index 48dbd40..7665deb 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -89,10 +89,10 @@ namespace AssetStudioGUI private int sortColumn = -1; private bool reverseSort; -#if NET6_0_OR_GREATER - private AlphanumComparatorFastNet alphanumComparator = new AlphanumComparatorFastNet(); -#else +#if NETFRAMEWORK private AlphanumComparatorFast alphanumComparator = new AlphanumComparatorFast(); +#else + private AlphanumComparatorFastNet alphanumComparator = new AlphanumComparatorFastNet(); #endif //asset list selection