add "Dump with PathID as filename" feature

aelurum · Jul 27, 2020 · 0426625 · 0426625
1 parent c5f7ef6
commit 0426625
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 30 deletions.
diff --git a/AssetStudio/Properties/AssemblyInfo.cs b/AssetStudio/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.14.38.3")]
-[assembly: AssemblyFileVersion("0.14.38.3")]
+[assembly: AssemblyVersion("0.14.38.4")]
+[assembly: AssemblyFileVersion("0.14.38.4")]
diff --git a/AssetStudioGUI/ExportOptions.Designer.cs b/AssetStudioGUI/ExportOptions.Designer.cs
diff --git a/AssetStudioGUI/ExportOptions.cs b/AssetStudioGUI/ExportOptions.cs
@@ -1,11 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace AssetStudioGUI
@@ -41,6 +34,7 @@ public ExportOptions()
             fbxVersion.SelectedIndex = Properties.Settings.Default.fbxVersion;
             fbxFormat.SelectedIndex = Properties.Settings.Default.fbxFormat;
             pathIDAsImageName.Checked = Properties.Settings.Default.pathIDAsImageName;
+            pathIDAsDumpName.Checked = Properties.Settings.Default.pathIDAsDumpName;
         }
 
         private void OKbutton_Click(object sender, EventArgs e)
@@ -70,6 +64,7 @@ private void OKbutton_Click(object sender, EventArgs e)
             Properties.Settings.Default.fbxVersion = fbxVersion.SelectedIndex;
             Properties.Settings.Default.fbxFormat = fbxFormat.SelectedIndex;
             Properties.Settings.Default.pathIDAsImageName = pathIDAsImageName.Checked;
+            Properties.Settings.Default.pathIDAsDumpName = pathIDAsDumpName.Checked;
             Properties.Settings.Default.Save();
             DialogResult = DialogResult.OK;
             Close();

diff --git a/AssetStudioGUI/Exporter.cs b/AssetStudioGUI/Exporter.cs
@@ -375,7 +375,15 @@ private static void ExportFbx(IImported convert, string exportPath)
 
         public static bool ExportDumpFile(AssetItem item, string exportPath)
         {
-            var exportFullName = exportPath + item.Text + ".txt";
+            string exportFullName;
+            if (Properties.Settings.Default.pathIDAsDumpName)
+            {
+                exportFullName = exportPath + item.m_PathID.ToString() + ".txt";
+            }
+            else
+            {
+                exportFullName = exportPath + item.Text + ".txt";
+            }
             if (ExportFileExists(exportFullName))
                 return false;
             var str = item.Asset.Dump();

diff --git a/AssetStudioGUI/Properties/AssemblyInfo.cs b/AssetStudioGUI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.14.38.3")]
-[assembly: AssemblyFileVersion("0.14.38.3")]
+[assembly: AssemblyVersion("0.14.38.4")]
+[assembly: AssemblyFileVersion("0.14.38.4")]
diff --git a/AssetStudioGUI/Properties/Settings.Designer.cs b/AssetStudioGUI/Properties/Settings.Designer.cs
diff --git a/AssetStudioGUI/Properties/Settings.settings b/AssetStudioGUI/Properties/Settings.settings
@@ -65,5 +65,8 @@
     <Setting Name="pathIDAsImageName" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="pathIDAsDumpName" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/AssetStudioGUI/app.config b/AssetStudioGUI/app.config
@@ -73,6 +73,9 @@
             <setting name="pathIDAsImageName" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="pathIDAsDumpName" serializeAs="String">
+                <value>False</value>
+            </setting>
         </AssetStudioGUI.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/AssetStudioUtility/Properties/AssemblyInfo.cs b/AssetStudioUtility/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.14.38.3")]
-[assembly: AssemblyFileVersion("0.14.38.3")]
+[assembly: AssemblyVersion("0.14.38.4")]
+[assembly: AssemblyFileVersion("0.14.38.4")]