diff --git a/AssetStudio/AssetStudio.csproj b/AssetStudio/AssetStudio.csproj index 788850d..d4ee28b 100644 --- a/AssetStudio/AssetStudio.csproj +++ b/AssetStudio/AssetStudio.csproj @@ -23,7 +23,7 @@ 4 - pdbonly + none true bin\Release\ TRACE diff --git a/AssetStudio/Properties/AssemblyInfo.cs b/AssetStudio/Properties/AssemblyInfo.cs index f583678..ec4ebff 100644 --- a/AssetStudio/Properties/AssemblyInfo.cs +++ b/AssetStudio/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.14.38.3")] +[assembly: AssemblyFileVersion("0.14.38.3")] diff --git a/AssetStudioFBX/AssetStudioFBX.vcxproj b/AssetStudioFBX/AssetStudioFBX.vcxproj index 7248d4d..103aa88 100644 --- a/AssetStudioFBX/AssetStudioFBX.vcxproj +++ b/AssetStudioFBX/AssetStudioFBX.vcxproj @@ -24,34 +24,34 @@ v4.7.2 ManagedCProj AssetStudioFBX - 10.0.18362.0 + 10.0 DynamicLibrary true - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary true - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode diff --git a/AssetStudioGUI/AssetStudioGUI.csproj b/AssetStudioGUI/AssetStudioGUI.csproj index 134cd58..d95fe31 100644 --- a/AssetStudioGUI/AssetStudioGUI.csproj +++ b/AssetStudioGUI/AssetStudioGUI.csproj @@ -12,6 +12,7 @@ 512 true true + true @@ -28,7 +29,7 @@ bin\x64\Release\ TRACE true - pdbonly + none x64 7.3 prompt @@ -50,7 +51,7 @@ bin\x86\Release\ TRACE true - pdbonly + none x86 7.3 prompt diff --git a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs index 7fbf1fd..d0ce881 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs @@ -116,6 +116,7 @@ this.exportAnimatorwithselectedAnimationClipMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.goToSceneHierarchyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showOriginalFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dumpSelectedAssetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -146,7 +147,7 @@ this.debugMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(1264, 25); + this.menuStrip1.Size = new System.Drawing.Size(1264, 24); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // @@ -159,39 +160,39 @@ this.extractFileToolStripMenuItem, this.extractFolderToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(39, 21); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "File"; // // loadFileToolStripMenuItem // this.loadFileToolStripMenuItem.Name = "loadFileToolStripMenuItem"; - this.loadFileToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.loadFileToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.loadFileToolStripMenuItem.Text = "Load file"; this.loadFileToolStripMenuItem.Click += new System.EventHandler(this.loadFile_Click); // // loadFolderToolStripMenuItem // this.loadFolderToolStripMenuItem.Name = "loadFolderToolStripMenuItem"; - this.loadFolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.loadFolderToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.loadFolderToolStripMenuItem.Text = "Load folder"; this.loadFolderToolStripMenuItem.Click += new System.EventHandler(this.loadFolder_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(151, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(141, 6); // // extractFileToolStripMenuItem // this.extractFileToolStripMenuItem.Name = "extractFileToolStripMenuItem"; - this.extractFileToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.extractFileToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.extractFileToolStripMenuItem.Text = "Extract file"; this.extractFileToolStripMenuItem.Click += new System.EventHandler(this.extractFileToolStripMenuItem_Click); // // extractFolderToolStripMenuItem // this.extractFolderToolStripMenuItem.Name = "extractFolderToolStripMenuItem"; - this.extractFolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.extractFolderToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.extractFolderToolStripMenuItem.Text = "Extract folder"; this.extractFolderToolStripMenuItem.Click += new System.EventHandler(this.extractFolderToolStripMenuItem_Click); // @@ -203,14 +204,14 @@ this.displayInfo, this.showExpOpt}); this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(66, 21); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); this.optionsToolStripMenuItem.Text = "Options"; // // displayAll // this.displayAll.CheckOnClick = true; this.displayAll.Name = "displayAll"; - this.displayAll.Size = new System.Drawing.Size(223, 22); + this.displayAll.Size = new System.Drawing.Size(207, 22); this.displayAll.Text = "Display all assets"; this.displayAll.ToolTipText = "Check this option will display all types assets. Not extractable assets can expor" + "t the RAW file."; @@ -222,7 +223,7 @@ this.enablePreview.CheckOnClick = true; this.enablePreview.CheckState = System.Windows.Forms.CheckState.Checked; this.enablePreview.Name = "enablePreview"; - this.enablePreview.Size = new System.Drawing.Size(223, 22); + this.enablePreview.Size = new System.Drawing.Size(207, 22); this.enablePreview.Text = "Enable preview"; this.enablePreview.ToolTipText = "Toggle the loading and preview of readable assets, such as images, sounds, text, " + "etc.\r\nDisable preview if you have performance or compatibility issues."; @@ -234,7 +235,7 @@ this.displayInfo.CheckOnClick = true; this.displayInfo.CheckState = System.Windows.Forms.CheckState.Checked; this.displayInfo.Name = "displayInfo"; - this.displayInfo.Size = new System.Drawing.Size(223, 22); + this.displayInfo.Size = new System.Drawing.Size(207, 22); this.displayInfo.Text = "Display asset infromation"; this.displayInfo.ToolTipText = "Toggle the overlay that shows information about each asset, eg. image size, forma" + "t, audio bitrate, etc."; @@ -243,7 +244,7 @@ // showExpOpt // this.showExpOpt.Name = "showExpOpt"; - this.showExpOpt.Size = new System.Drawing.Size(223, 22); + this.showExpOpt.Size = new System.Drawing.Size(207, 22); this.showExpOpt.Text = "Export options"; this.showExpOpt.Click += new System.EventHandler(this.showExpOpt_Click); // @@ -257,46 +258,46 @@ this.exportSelectedObjectsmergeToolStripMenuItem, this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem}); this.modelToolStripMenuItem.Name = "modelToolStripMenuItem"; - this.modelToolStripMenuItem.Size = new System.Drawing.Size(58, 21); + this.modelToolStripMenuItem.Size = new System.Drawing.Size(53, 20); this.modelToolStripMenuItem.Text = "Model"; // // exportAllObjectssplitToolStripMenuItem1 // this.exportAllObjectssplitToolStripMenuItem1.Name = "exportAllObjectssplitToolStripMenuItem1"; - this.exportAllObjectssplitToolStripMenuItem1.Size = new System.Drawing.Size(417, 22); + this.exportAllObjectssplitToolStripMenuItem1.Size = new System.Drawing.Size(382, 22); this.exportAllObjectssplitToolStripMenuItem1.Text = "Export all objects (split)"; this.exportAllObjectssplitToolStripMenuItem1.Click += new System.EventHandler(this.exportAllObjectssplitToolStripMenuItem1_Click); // // exportSelectedObjectsToolStripMenuItem // this.exportSelectedObjectsToolStripMenuItem.Name = "exportSelectedObjectsToolStripMenuItem"; - this.exportSelectedObjectsToolStripMenuItem.Size = new System.Drawing.Size(417, 22); + this.exportSelectedObjectsToolStripMenuItem.Size = new System.Drawing.Size(382, 22); this.exportSelectedObjectsToolStripMenuItem.Text = "Export selected objects (split)"; this.exportSelectedObjectsToolStripMenuItem.Click += new System.EventHandler(this.exportSelectedObjectsToolStripMenuItem_Click); // // exportSelectedObjectsWithAnimationClipToolStripMenuItem // this.exportSelectedObjectsWithAnimationClipToolStripMenuItem.Name = "exportSelectedObjectsWithAnimationClipToolStripMenuItem"; - this.exportSelectedObjectsWithAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(417, 22); + this.exportSelectedObjectsWithAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(382, 22); this.exportSelectedObjectsWithAnimationClipToolStripMenuItem.Text = "Export selected objects (split) + selected AnimationClips"; this.exportSelectedObjectsWithAnimationClipToolStripMenuItem.Click += new System.EventHandler(this.exportObjectswithAnimationClipMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(414, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(379, 6); // // exportSelectedObjectsmergeToolStripMenuItem // this.exportSelectedObjectsmergeToolStripMenuItem.Name = "exportSelectedObjectsmergeToolStripMenuItem"; - this.exportSelectedObjectsmergeToolStripMenuItem.Size = new System.Drawing.Size(417, 22); + this.exportSelectedObjectsmergeToolStripMenuItem.Size = new System.Drawing.Size(382, 22); this.exportSelectedObjectsmergeToolStripMenuItem.Text = "Export selected objects (merge)"; this.exportSelectedObjectsmergeToolStripMenuItem.Click += new System.EventHandler(this.exportSelectedObjectsmergeToolStripMenuItem_Click); // // exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem // this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Name = "exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem"; - this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(417, 22); + this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(382, 22); this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Text = "Export selected objects (merge) + selected AnimationClips"; this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Click += new System.EventHandler(this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem_Click); // @@ -312,46 +313,46 @@ this.toolStripMenuItem2, this.toolStripMenuItem3}); this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; - this.exportToolStripMenuItem.Size = new System.Drawing.Size(58, 21); + this.exportToolStripMenuItem.Size = new System.Drawing.Size(53, 20); this.exportToolStripMenuItem.Text = "Export"; // // exportAllAssetsMenuItem // this.exportAllAssetsMenuItem.Name = "exportAllAssetsMenuItem"; - this.exportAllAssetsMenuItem.Size = new System.Drawing.Size(284, 22); + this.exportAllAssetsMenuItem.Size = new System.Drawing.Size(266, 22); this.exportAllAssetsMenuItem.Text = "All assets"; this.exportAllAssetsMenuItem.Click += new System.EventHandler(this.exportAllAssetsMenuItem_Click); // // exportSelectedAssetsMenuItem // this.exportSelectedAssetsMenuItem.Name = "exportSelectedAssetsMenuItem"; - this.exportSelectedAssetsMenuItem.Size = new System.Drawing.Size(284, 22); + this.exportSelectedAssetsMenuItem.Size = new System.Drawing.Size(266, 22); this.exportSelectedAssetsMenuItem.Text = "Selected assets"; this.exportSelectedAssetsMenuItem.Click += new System.EventHandler(this.exportSelectedAssetsMenuItem_Click); // // exportFilteredAssetsMenuItem // this.exportFilteredAssetsMenuItem.Name = "exportFilteredAssetsMenuItem"; - this.exportFilteredAssetsMenuItem.Size = new System.Drawing.Size(284, 22); + this.exportFilteredAssetsMenuItem.Size = new System.Drawing.Size(266, 22); this.exportFilteredAssetsMenuItem.Text = "Filtered assets"; this.exportFilteredAssetsMenuItem.Click += new System.EventHandler(this.exportFilteredAssetsMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(281, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(263, 6); // // exportAnimatorWithSelectedAnimationClipToolStripMenuItem // this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Name = "exportAnimatorWithSelectedAnimationClipToolStripMenuItem"; - this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(284, 22); + this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(266, 22); this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Text = "Animator + selected AnimationClips"; this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Click += new System.EventHandler(this.exportAnimatorwithAnimationClipMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(281, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(263, 6); // // toolStripMenuItem2 // @@ -360,27 +361,27 @@ this.toolStripMenuItem5, this.toolStripMenuItem6}); this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(284, 22); + this.toolStripMenuItem2.Size = new System.Drawing.Size(266, 22); this.toolStripMenuItem2.Text = "Raw"; // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(165, 22); + this.toolStripMenuItem4.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem4.Text = "All assets"; this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 22); + this.toolStripMenuItem5.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem5.Text = "Selected assets"; this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); // // toolStripMenuItem6 // this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(165, 22); + this.toolStripMenuItem6.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem6.Text = "Filtered assets"; this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); // @@ -391,27 +392,27 @@ this.toolStripMenuItem8, this.toolStripMenuItem9}); this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(284, 22); + this.toolStripMenuItem3.Size = new System.Drawing.Size(266, 22); this.toolStripMenuItem3.Text = "Dump"; // // toolStripMenuItem7 // this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(165, 22); + this.toolStripMenuItem7.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem7.Text = "All assets"; this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); // // toolStripMenuItem8 // this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(165, 22); + this.toolStripMenuItem8.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem8.Text = "Selected assets"; this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); // // toolStripMenuItem9 // this.toolStripMenuItem9.Name = "toolStripMenuItem9"; - this.toolStripMenuItem9.Size = new System.Drawing.Size(165, 22); + this.toolStripMenuItem9.Size = new System.Drawing.Size(152, 22); this.toolStripMenuItem9.Text = "Filtered assets"; this.toolStripMenuItem9.Click += new System.EventHandler(this.toolStripMenuItem9_Click); // @@ -420,7 +421,7 @@ this.filterTypeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.allToolStripMenuItem}); this.filterTypeToolStripMenuItem.Name = "filterTypeToolStripMenuItem"; - this.filterTypeToolStripMenuItem.Size = new System.Drawing.Size(80, 21); + this.filterTypeToolStripMenuItem.Size = new System.Drawing.Size(72, 20); this.filterTypeToolStripMenuItem.Text = "Filter Type"; // // allToolStripMenuItem @@ -429,7 +430,7 @@ this.allToolStripMenuItem.CheckOnClick = true; this.allToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.allToolStripMenuItem.Name = "allToolStripMenuItem"; - this.allToolStripMenuItem.Size = new System.Drawing.Size(90, 22); + this.allToolStripMenuItem.Size = new System.Drawing.Size(88, 22); this.allToolStripMenuItem.Text = "All"; this.allToolStripMenuItem.Click += new System.EventHandler(this.typeToolStripMenuItem_Click); // @@ -438,13 +439,13 @@ this.debugMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.exportClassStructuresMenuItem}); this.debugMenuItem.Name = "debugMenuItem"; - this.debugMenuItem.Size = new System.Drawing.Size(59, 21); + this.debugMenuItem.Size = new System.Drawing.Size(54, 20); this.debugMenuItem.Text = "Debug"; // // exportClassStructuresMenuItem // this.exportClassStructuresMenuItem.Name = "exportClassStructuresMenuItem"; - this.exportClassStructuresMenuItem.Size = new System.Drawing.Size(207, 22); + this.exportClassStructuresMenuItem.Size = new System.Drawing.Size(191, 22); this.exportClassStructuresMenuItem.Text = "Export class structures"; this.exportClassStructuresMenuItem.Click += new System.EventHandler(this.exportClassStructuresMenuItem_Click); // @@ -452,7 +453,7 @@ // this.splitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(0, 25); + this.splitContainer1.Location = new System.Drawing.Point(0, 24); this.splitContainer1.Name = "splitContainer1"; // // splitContainer1.Panel1 @@ -467,7 +468,7 @@ this.splitContainer1.Panel2.Controls.Add(this.classPreviewPanel); this.splitContainer1.Panel2.Controls.Add(this.statusStrip1); this.splitContainer1.Panel2MinSize = 400; - this.splitContainer1.Size = new System.Drawing.Size(1264, 656); + this.splitContainer1.Size = new System.Drawing.Size(1264, 714); this.splitContainer1.SplitterDistance = 482; this.splitContainer1.TabIndex = 2; this.splitContainer1.TabStop = false; @@ -482,7 +483,7 @@ this.tabControl1.Name = "tabControl1"; this.tabControl1.Padding = new System.Drawing.Point(17, 3); this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(480, 634); + this.tabControl1.Size = new System.Drawing.Size(480, 690); this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 0; this.tabControl1.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabPageSelected); @@ -493,7 +494,7 @@ this.tabPage1.Controls.Add(this.treeSearch); this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Size = new System.Drawing.Size(472, 608); + this.tabPage1.Size = new System.Drawing.Size(472, 664); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Scene Hierarchy"; this.tabPage1.UseVisualStyleBackColor = true; @@ -503,9 +504,9 @@ this.sceneTreeView.CheckBoxes = true; this.sceneTreeView.Dock = System.Windows.Forms.DockStyle.Fill; this.sceneTreeView.HideSelection = false; - this.sceneTreeView.Location = new System.Drawing.Point(0, 21); + this.sceneTreeView.Location = new System.Drawing.Point(0, 20); this.sceneTreeView.Name = "sceneTreeView"; - this.sceneTreeView.Size = new System.Drawing.Size(472, 587); + this.sceneTreeView.Size = new System.Drawing.Size(472, 644); this.sceneTreeView.TabIndex = 1; this.sceneTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.sceneTreeView_AfterCheck); // @@ -515,7 +516,7 @@ this.treeSearch.ForeColor = System.Drawing.SystemColors.GrayText; this.treeSearch.Location = new System.Drawing.Point(0, 0); this.treeSearch.Name = "treeSearch"; - this.treeSearch.Size = new System.Drawing.Size(472, 21); + this.treeSearch.Size = new System.Drawing.Size(472, 20); this.treeSearch.TabIndex = 0; this.treeSearch.Text = " Search "; this.treeSearch.TextChanged += new System.EventHandler(this.treeSearch_TextChanged); @@ -529,7 +530,7 @@ this.tabPage2.Controls.Add(this.listSearch); this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Size = new System.Drawing.Size(472, 608); + this.tabPage2.Size = new System.Drawing.Size(472, 661); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Asset List"; this.tabPage2.UseVisualStyleBackColor = true; @@ -546,9 +547,9 @@ this.assetListView.FullRowSelect = true; this.assetListView.GridLines = true; this.assetListView.HideSelection = false; - this.assetListView.Location = new System.Drawing.Point(0, 21); + this.assetListView.Location = new System.Drawing.Point(0, 20); this.assetListView.Name = "assetListView"; - this.assetListView.Size = new System.Drawing.Size(472, 587); + this.assetListView.Size = new System.Drawing.Size(472, 641); this.assetListView.TabIndex = 1; this.assetListView.UseCompatibleStateImageBehavior = false; this.assetListView.View = System.Windows.Forms.View.Details; @@ -588,7 +589,7 @@ this.listSearch.ForeColor = System.Drawing.SystemColors.GrayText; this.listSearch.Location = new System.Drawing.Point(0, 0); this.listSearch.Name = "listSearch"; - this.listSearch.Size = new System.Drawing.Size(472, 21); + this.listSearch.Size = new System.Drawing.Size(472, 20); this.listSearch.TabIndex = 0; this.listSearch.Text = " Filter "; this.listSearch.TextChanged += new System.EventHandler(this.ListSearchTextChanged); @@ -600,7 +601,7 @@ this.tabPage3.Controls.Add(this.classesListView); this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(472, 608); + this.tabPage3.Size = new System.Drawing.Size(472, 661); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "Asset Classes"; this.tabPage3.UseVisualStyleBackColor = true; @@ -616,7 +617,7 @@ this.classesListView.Location = new System.Drawing.Point(0, 0); this.classesListView.MultiSelect = false; this.classesListView.Name = "classesListView"; - this.classesListView.Size = new System.Drawing.Size(472, 608); + this.classesListView.Size = new System.Drawing.Size(472, 661); this.classesListView.TabIndex = 0; this.classesListView.UseCompatibleStateImageBehavior = false; this.classesListView.View = System.Windows.Forms.View.Details; @@ -638,18 +639,18 @@ // this.progressbarPanel.Controls.Add(this.progressBar1); this.progressbarPanel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressbarPanel.Location = new System.Drawing.Point(0, 634); + this.progressbarPanel.Location = new System.Drawing.Point(0, 690); this.progressbarPanel.Name = "progressbarPanel"; this.progressbarPanel.Padding = new System.Windows.Forms.Padding(1, 3, 1, 1); - this.progressbarPanel.Size = new System.Drawing.Size(480, 20); + this.progressbarPanel.Size = new System.Drawing.Size(480, 22); this.progressbarPanel.TabIndex = 2; // // progressBar1 // this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(1, 2); + this.progressBar1.Location = new System.Drawing.Point(1, 3); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(478, 17); + this.progressBar1.Size = new System.Drawing.Size(478, 18); this.progressBar1.Step = 1; this.progressBar1.TabIndex = 1; // @@ -666,7 +667,7 @@ this.previewPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.previewPanel.Location = new System.Drawing.Point(0, 0); this.previewPanel.Name = "previewPanel"; - this.previewPanel.Size = new System.Drawing.Size(776, 632); + this.previewPanel.Size = new System.Drawing.Size(776, 690); this.previewPanel.TabIndex = 1; this.previewPanel.Resize += new System.EventHandler(this.preview_Resize); // @@ -675,9 +676,9 @@ this.assetInfoLabel.AutoSize = true; this.assetInfoLabel.BackColor = System.Drawing.Color.Transparent; this.assetInfoLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.assetInfoLabel.Location = new System.Drawing.Point(4, 7); + this.assetInfoLabel.Location = new System.Drawing.Point(4, 8); this.assetInfoLabel.Name = "assetInfoLabel"; - this.assetInfoLabel.Size = new System.Drawing.Size(0, 12); + this.assetInfoLabel.Size = new System.Drawing.Size(0, 13); this.assetInfoLabel.TabIndex = 0; // // FMODpanel @@ -696,7 +697,7 @@ this.FMODpanel.Dock = System.Windows.Forms.DockStyle.Fill; this.FMODpanel.Location = new System.Drawing.Point(0, 0); this.FMODpanel.Name = "FMODpanel"; - this.FMODpanel.Size = new System.Drawing.Size(776, 632); + this.FMODpanel.Size = new System.Drawing.Size(776, 690); this.FMODpanel.TabIndex = 2; this.FMODpanel.Visible = false; // @@ -704,9 +705,9 @@ // this.FMODcopyright.AutoSize = true; this.FMODcopyright.ForeColor = System.Drawing.SystemColors.ControlLight; - this.FMODcopyright.Location = new System.Drawing.Point(232, 350); + this.FMODcopyright.Location = new System.Drawing.Point(232, 379); this.FMODcopyright.Name = "FMODcopyright"; - this.FMODcopyright.Size = new System.Drawing.Size(341, 12); + this.FMODcopyright.Size = new System.Drawing.Size(283, 13); this.FMODcopyright.TabIndex = 9; this.FMODcopyright.Text = "Audio Engine supplied by FMOD by Firelight Technologies."; // @@ -714,17 +715,17 @@ // this.FMODinfoLabel.AutoSize = true; this.FMODinfoLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.FMODinfoLabel.Location = new System.Drawing.Point(287, 248); + this.FMODinfoLabel.Location = new System.Drawing.Point(287, 269); this.FMODinfoLabel.Name = "FMODinfoLabel"; - this.FMODinfoLabel.Size = new System.Drawing.Size(0, 12); + this.FMODinfoLabel.Size = new System.Drawing.Size(0, 13); this.FMODinfoLabel.TabIndex = 8; // // FMODtimerLabel // this.FMODtimerLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.FMODtimerLabel.Location = new System.Drawing.Point(422, 248); + this.FMODtimerLabel.Location = new System.Drawing.Point(422, 269); this.FMODtimerLabel.Name = "FMODtimerLabel"; - this.FMODtimerLabel.Size = new System.Drawing.Size(155, 12); + this.FMODtimerLabel.Size = new System.Drawing.Size(155, 13); this.FMODtimerLabel.TabIndex = 7; this.FMODtimerLabel.Text = "0:00.0 / 0:00.0"; this.FMODtimerLabel.TextAlign = System.Drawing.ContentAlignment.TopRight; @@ -732,19 +733,19 @@ // FMODstatusLabel // this.FMODstatusLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.FMODstatusLabel.Location = new System.Drawing.Point(231, 248); + this.FMODstatusLabel.Location = new System.Drawing.Point(231, 269); this.FMODstatusLabel.Name = "FMODstatusLabel"; - this.FMODstatusLabel.Size = new System.Drawing.Size(50, 12); + this.FMODstatusLabel.Size = new System.Drawing.Size(50, 13); this.FMODstatusLabel.TabIndex = 6; this.FMODstatusLabel.Text = "Stopped"; // // FMODprogressBar // this.FMODprogressBar.AutoSize = false; - this.FMODprogressBar.Location = new System.Drawing.Point(231, 266); + this.FMODprogressBar.Location = new System.Drawing.Point(231, 288); this.FMODprogressBar.Maximum = 1000; this.FMODprogressBar.Name = "FMODprogressBar"; - this.FMODprogressBar.Size = new System.Drawing.Size(350, 22); + this.FMODprogressBar.Size = new System.Drawing.Size(350, 24); this.FMODprogressBar.TabIndex = 5; this.FMODprogressBar.TickStyle = System.Windows.Forms.TickStyle.None; this.FMODprogressBar.Scroll += new System.EventHandler(this.FMODprogressBar_Scroll); @@ -754,7 +755,7 @@ // FMODvolumeBar // this.FMODvolumeBar.LargeChange = 2; - this.FMODvolumeBar.Location = new System.Drawing.Point(478, 293); + this.FMODvolumeBar.Location = new System.Drawing.Point(478, 317); this.FMODvolumeBar.Name = "FMODvolumeBar"; this.FMODvolumeBar.Size = new System.Drawing.Size(104, 45); this.FMODvolumeBar.TabIndex = 4; @@ -765,9 +766,9 @@ // FMODloopButton // this.FMODloopButton.Appearance = System.Windows.Forms.Appearance.Button; - this.FMODloopButton.Location = new System.Drawing.Point(417, 293); + this.FMODloopButton.Location = new System.Drawing.Point(417, 317); this.FMODloopButton.Name = "FMODloopButton"; - this.FMODloopButton.Size = new System.Drawing.Size(55, 42); + this.FMODloopButton.Size = new System.Drawing.Size(55, 46); this.FMODloopButton.TabIndex = 3; this.FMODloopButton.Text = "Loop"; this.FMODloopButton.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -776,9 +777,9 @@ // // FMODstopButton // - this.FMODstopButton.Location = new System.Drawing.Point(356, 293); + this.FMODstopButton.Location = new System.Drawing.Point(356, 317); this.FMODstopButton.Name = "FMODstopButton"; - this.FMODstopButton.Size = new System.Drawing.Size(55, 42); + this.FMODstopButton.Size = new System.Drawing.Size(55, 46); this.FMODstopButton.TabIndex = 2; this.FMODstopButton.Text = "Stop"; this.FMODstopButton.UseVisualStyleBackColor = true; @@ -786,9 +787,9 @@ // // FMODpauseButton // - this.FMODpauseButton.Location = new System.Drawing.Point(295, 293); + this.FMODpauseButton.Location = new System.Drawing.Point(295, 317); this.FMODpauseButton.Name = "FMODpauseButton"; - this.FMODpauseButton.Size = new System.Drawing.Size(55, 42); + this.FMODpauseButton.Size = new System.Drawing.Size(55, 46); this.FMODpauseButton.TabIndex = 1; this.FMODpauseButton.Text = "Pause"; this.FMODpauseButton.UseVisualStyleBackColor = true; @@ -796,9 +797,9 @@ // // FMODplayButton // - this.FMODplayButton.Location = new System.Drawing.Point(234, 293); + this.FMODplayButton.Location = new System.Drawing.Point(234, 317); this.FMODplayButton.Name = "FMODplayButton"; - this.FMODplayButton.Size = new System.Drawing.Size(55, 42); + this.FMODplayButton.Size = new System.Drawing.Size(55, 46); this.FMODplayButton.TabIndex = 0; this.FMODplayButton.Text = "Play"; this.FMODplayButton.UseVisualStyleBackColor = true; @@ -811,7 +812,7 @@ this.fontPreviewBox.Location = new System.Drawing.Point(0, 0); this.fontPreviewBox.Name = "fontPreviewBox"; this.fontPreviewBox.ReadOnly = true; - this.fontPreviewBox.Size = new System.Drawing.Size(776, 632); + this.fontPreviewBox.Size = new System.Drawing.Size(776, 690); this.fontPreviewBox.TabIndex = 0; this.fontPreviewBox.Text = resources.GetString("fontPreviewBox.Text"); this.fontPreviewBox.Visible = false; @@ -826,7 +827,7 @@ this.textPreviewBox.Name = "textPreviewBox"; this.textPreviewBox.ReadOnly = true; this.textPreviewBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.textPreviewBox.Size = new System.Drawing.Size(776, 632); + this.textPreviewBox.Size = new System.Drawing.Size(776, 690); this.textPreviewBox.TabIndex = 2; this.textPreviewBox.Visible = false; this.textPreviewBox.WordWrap = false; @@ -837,7 +838,7 @@ this.glControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.glControl1.Location = new System.Drawing.Point(0, 0); this.glControl1.Name = "glControl1"; - this.glControl1.Size = new System.Drawing.Size(776, 632); + this.glControl1.Size = new System.Drawing.Size(776, 690); this.glControl1.TabIndex = 4; this.glControl1.Visible = false; this.glControl1.VSync = false; @@ -854,7 +855,7 @@ this.classPreviewPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.classPreviewPanel.Location = new System.Drawing.Point(0, 0); this.classPreviewPanel.Name = "classPreviewPanel"; - this.classPreviewPanel.Size = new System.Drawing.Size(776, 632); + this.classPreviewPanel.Size = new System.Drawing.Size(776, 690); this.classPreviewPanel.TabIndex = 3; this.classPreviewPanel.Visible = false; // @@ -866,7 +867,7 @@ this.classTextBox.Name = "classTextBox"; this.classTextBox.ReadOnly = true; this.classTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.classTextBox.Size = new System.Drawing.Size(776, 632); + this.classTextBox.Size = new System.Drawing.Size(776, 690); this.classTextBox.TabIndex = 3; this.classTextBox.WordWrap = false; // @@ -874,7 +875,7 @@ // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel1}); - this.statusStrip1.Location = new System.Drawing.Point(0, 632); + this.statusStrip1.Location = new System.Drawing.Point(0, 690); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Size = new System.Drawing.Size(776, 22); this.statusStrip1.TabIndex = 2; @@ -912,30 +913,31 @@ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.copyToolStripMenuItem, this.exportSelectedAssetsToolStripMenuItem, + this.dumpSelectedAssetsToolStripMenuItem, this.exportAnimatorwithselectedAnimationClipMenuItem, this.goToSceneHierarchyToolStripMenuItem, this.showOriginalFileToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(327, 114); + this.contextMenuStrip1.Size = new System.Drawing.Size(304, 158); // // copyToolStripMenuItem // this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - this.copyToolStripMenuItem.Size = new System.Drawing.Size(326, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(303, 22); this.copyToolStripMenuItem.Text = "Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); // // exportSelectedAssetsToolStripMenuItem // this.exportSelectedAssetsToolStripMenuItem.Name = "exportSelectedAssetsToolStripMenuItem"; - this.exportSelectedAssetsToolStripMenuItem.Size = new System.Drawing.Size(326, 22); + this.exportSelectedAssetsToolStripMenuItem.Size = new System.Drawing.Size(303, 22); this.exportSelectedAssetsToolStripMenuItem.Text = "Export selected assets"; this.exportSelectedAssetsToolStripMenuItem.Click += new System.EventHandler(this.exportSelectedAssetsToolStripMenuItem_Click); // // exportAnimatorwithselectedAnimationClipMenuItem // this.exportAnimatorwithselectedAnimationClipMenuItem.Name = "exportAnimatorwithselectedAnimationClipMenuItem"; - this.exportAnimatorwithselectedAnimationClipMenuItem.Size = new System.Drawing.Size(326, 22); + this.exportAnimatorwithselectedAnimationClipMenuItem.Size = new System.Drawing.Size(303, 22); this.exportAnimatorwithselectedAnimationClipMenuItem.Text = "Export Animator + selected AnimationClips"; this.exportAnimatorwithselectedAnimationClipMenuItem.Visible = false; this.exportAnimatorwithselectedAnimationClipMenuItem.Click += new System.EventHandler(this.exportAnimatorwithAnimationClipMenuItem_Click); @@ -943,7 +945,7 @@ // goToSceneHierarchyToolStripMenuItem // this.goToSceneHierarchyToolStripMenuItem.Name = "goToSceneHierarchyToolStripMenuItem"; - this.goToSceneHierarchyToolStripMenuItem.Size = new System.Drawing.Size(326, 22); + this.goToSceneHierarchyToolStripMenuItem.Size = new System.Drawing.Size(303, 22); this.goToSceneHierarchyToolStripMenuItem.Text = "Go to scene hierarchy"; this.goToSceneHierarchyToolStripMenuItem.Visible = false; this.goToSceneHierarchyToolStripMenuItem.Click += new System.EventHandler(this.goToSceneHierarchyToolStripMenuItem_Click); @@ -951,22 +953,29 @@ // showOriginalFileToolStripMenuItem // this.showOriginalFileToolStripMenuItem.Name = "showOriginalFileToolStripMenuItem"; - this.showOriginalFileToolStripMenuItem.Size = new System.Drawing.Size(326, 22); + this.showOriginalFileToolStripMenuItem.Size = new System.Drawing.Size(303, 22); this.showOriginalFileToolStripMenuItem.Text = "Show original file"; this.showOriginalFileToolStripMenuItem.Visible = false; this.showOriginalFileToolStripMenuItem.Click += new System.EventHandler(this.showOriginalFileToolStripMenuItem_Click); // + // dumpSelectedAssetsToolStripMenuItem + // + this.dumpSelectedAssetsToolStripMenuItem.Name = "dumpSelectedAssetsToolStripMenuItem"; + this.dumpSelectedAssetsToolStripMenuItem.Size = new System.Drawing.Size(303, 22); + this.dumpSelectedAssetsToolStripMenuItem.Text = "Dump selected assets"; + this.dumpSelectedAssetsToolStripMenuItem.Click += new System.EventHandler(this.dumpSelectedAssetsToolStripMenuItem_Click); + // // AssetStudioGUIForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1264, 681); + this.ClientSize = new System.Drawing.Size(1264, 738); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.menuStrip1); this.Icon = global::AssetStudioGUI.Properties.Resources._as; this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; - this.MinimumSize = new System.Drawing.Size(620, 372); + this.MinimumSize = new System.Drawing.Size(620, 400); this.Name = "AssetStudioGUIForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "AssetStudioGUI"; @@ -1089,6 +1098,7 @@ private System.Windows.Forms.ColumnHeader columnHeaderContainer; private System.Windows.Forms.ColumnHeader columnHeaderPathID; private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem dumpSelectedAssetsToolStripMenuItem; } } diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index 27fb77e..c23ff5d 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -99,6 +99,35 @@ namespace AssetStudioGUI Logger.Default = new GUILogger(StatusStripUpdate); Progress.Default = new GUIProgress(SetProgressBarValue); Studio.StatusStripUpdate = StatusStripUpdate; + + this.AllowDrop = true; + this.DragEnter += AssetStudioGUIForm_DragEnter; + this.DragDrop += AssetStudioGUIForm_DragDrop; + } + + private void AssetStudioGUIForm_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(DataFormats.FileDrop)) e.Effect = DragDropEffects.Move; + } + + private async void AssetStudioGUIForm_DragDrop(object sender, DragEventArgs e) + { + string[] paths = (string[])e.Data.GetData(DataFormats.FileDrop); + if (paths.Length > 0) + { + ResetForm(); + + if (paths.Length == 1 && Directory.Exists(paths[0])) + { + await Task.Run(() => assetsManager.LoadFolder(paths[0])); + } + else + { + await Task.Run(() => assetsManager.LoadFiles(paths)); + } + + BuildAssetStructures(); + } } private async void loadFile_Click(object sender, EventArgs e) @@ -442,7 +471,7 @@ namespace AssetStudioGUI private void treeSearch_Leave(object sender, EventArgs e) { - if (treeSearch.Text == "") + if (string.IsNullOrEmpty(treeSearch.Text)) { treeSearch.Text = " Search "; treeSearch.ForeColor = SystemColors.GrayText; @@ -512,7 +541,7 @@ namespace AssetStudioGUI private void listSearch_Leave(object sender, EventArgs e) { - if (listSearch.Text == "") + if (string.IsNullOrEmpty(listSearch.Text)) { enableFiltering = false; listSearch.Text = " Filter "; @@ -564,6 +593,15 @@ namespace AssetStudioGUI return reverseSort ? bsf.CompareTo(asf) : asf.CompareTo(bsf); }); } + else if (sortColumn == 3) // PathID + { + visibleAssets.Sort((x, y) => + { + long pathID_X = x.m_PathID; + long pathID_Y = y.m_PathID; + return reverseSort ? pathID_Y.CompareTo(pathID_X) : pathID_X.CompareTo(pathID_Y); + }); + } else { visibleAssets.Sort((a, b) => @@ -1214,6 +1252,11 @@ namespace AssetStudioGUI ExportAssets(2, ExportType.Convert); } + private void dumpSelectedAssetsToolStripMenuItem_Click(object sender, EventArgs e) + { + ExportAssets(2, ExportType.Dump); + } + private void showOriginalFileToolStripMenuItem_Click(object sender, EventArgs e) { var selectasset = (AssetItem)assetListView.Items[assetListView.SelectedIndices[0]]; diff --git a/AssetStudioGUI/AssetStudioGUIForm.resx b/AssetStudioGUI/AssetStudioGUIForm.resx index 2ba6a7a..f5d72e1 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.resx +++ b/AssetStudioGUI/AssetStudioGUIForm.resx @@ -120,6 +120,9 @@ 312, 17 + + 432, 17 + abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWYZ 1234567890.:,;'\"(!?)+-*/= @@ -138,9 +141,6 @@ The quick brown fox jumps over the lazy dog. 1234567890 The quick brown fox jumps over the lazy dog. 1234567890 - - 432, 17 - 553, 17 diff --git a/AssetStudioGUI/Components/TreeViewExtensions.cs b/AssetStudioGUI/Components/TreeViewExtensions.cs index d06bfa7..6a46b98 100644 --- a/AssetStudioGUI/Components/TreeViewExtensions.cs +++ b/AssetStudioGUI/Components/TreeViewExtensions.cs @@ -40,7 +40,7 @@ namespace AssetStudioGUI hItem = node.Handle, mask = TVIF_STATE, stateMask = TVIS_STATEIMAGEMASK, - state = 0 + state = node.StateImageIndex //freeze bugfix (no) }; SendMessage(node.TreeView.Handle, TVM_SETITEM, IntPtr.Zero, ref tvi); } diff --git a/AssetStudioGUI/ExportOptions.Designer.cs b/AssetStudioGUI/ExportOptions.Designer.cs index b8e9198..26cece0 100644 --- a/AssetStudioGUI/ExportOptions.Designer.cs +++ b/AssetStudioGUI/ExportOptions.Designer.cs @@ -59,6 +59,7 @@ this.castToBone = new System.Windows.Forms.CheckBox(); this.exportAllNodes = new System.Windows.Forms.CheckBox(); this.eulerFilter = new System.Windows.Forms.CheckBox(); + this.pathIDAsImageName = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); this.panel1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -69,9 +70,9 @@ // // OKbutton // - this.OKbutton.Location = new System.Drawing.Point(308, 320); + this.OKbutton.Location = new System.Drawing.Point(308, 347); this.OKbutton.Name = "OKbutton"; - this.OKbutton.Size = new System.Drawing.Size(75, 21); + this.OKbutton.Size = new System.Drawing.Size(75, 23); this.OKbutton.TabIndex = 6; this.OKbutton.Text = "OK"; this.OKbutton.UseVisualStyleBackColor = true; @@ -80,9 +81,9 @@ // Cancel // this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.Cancel.Location = new System.Drawing.Point(389, 320); + this.Cancel.Location = new System.Drawing.Point(389, 347); this.Cancel.Name = "Cancel"; - this.Cancel.Size = new System.Drawing.Size(75, 21); + this.Cancel.Size = new System.Drawing.Size(75, 23); this.Cancel.TabIndex = 7; this.Cancel.Text = "Cancel"; this.Cancel.UseVisualStyleBackColor = true; @@ -91,6 +92,7 @@ // groupBox1 // this.groupBox1.AutoSize = true; + this.groupBox1.Controls.Add(this.pathIDAsImageName); this.groupBox1.Controls.Add(this.openAfterExport); this.groupBox1.Controls.Add(this.restoreExtensionName); this.groupBox1.Controls.Add(this.assetGroupOptions); @@ -98,9 +100,9 @@ this.groupBox1.Controls.Add(this.convertAudio); this.groupBox1.Controls.Add(this.panel1); this.groupBox1.Controls.Add(this.converttexture); - this.groupBox1.Location = new System.Drawing.Point(12, 12); + this.groupBox1.Location = new System.Drawing.Point(12, 13); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(232, 302); + this.groupBox1.Size = new System.Drawing.Size(232, 327); this.groupBox1.TabIndex = 9; this.groupBox1.TabStop = false; this.groupBox1.Text = "Export"; @@ -110,9 +112,9 @@ this.openAfterExport.AutoSize = true; this.openAfterExport.Checked = true; this.openAfterExport.CheckState = System.Windows.Forms.CheckState.Checked; - this.openAfterExport.Location = new System.Drawing.Point(6, 160); + this.openAfterExport.Location = new System.Drawing.Point(6, 173); this.openAfterExport.Name = "openAfterExport"; - this.openAfterExport.Size = new System.Drawing.Size(168, 16); + this.openAfterExport.Size = new System.Drawing.Size(137, 17); this.openAfterExport.TabIndex = 10; this.openAfterExport.Text = "Open folder after export"; this.openAfterExport.UseVisualStyleBackColor = true; @@ -122,9 +124,9 @@ this.restoreExtensionName.AutoSize = true; this.restoreExtensionName.Checked = true; this.restoreExtensionName.CheckState = System.Windows.Forms.CheckState.Checked; - this.restoreExtensionName.Location = new System.Drawing.Point(6, 58); + this.restoreExtensionName.Location = new System.Drawing.Point(6, 63); this.restoreExtensionName.Name = "restoreExtensionName"; - this.restoreExtensionName.Size = new System.Drawing.Size(216, 16); + this.restoreExtensionName.Size = new System.Drawing.Size(190, 17); this.restoreExtensionName.TabIndex = 9; this.restoreExtensionName.Text = "Restore TextAsset extension name"; this.restoreExtensionName.UseVisualStyleBackColor = true; @@ -138,17 +140,17 @@ "container path", "source file name", "do not group"}); - this.assetGroupOptions.Location = new System.Drawing.Point(6, 32); + this.assetGroupOptions.Location = new System.Drawing.Point(6, 35); this.assetGroupOptions.Name = "assetGroupOptions"; - this.assetGroupOptions.Size = new System.Drawing.Size(149, 20); + this.assetGroupOptions.Size = new System.Drawing.Size(149, 21); this.assetGroupOptions.TabIndex = 8; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(6, 17); + this.label6.Location = new System.Drawing.Point(6, 18); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(149, 12); + this.label6.Size = new System.Drawing.Size(127, 13); this.label6.TabIndex = 7; this.label6.Text = "Group exported assets by"; // @@ -157,9 +159,9 @@ this.convertAudio.AutoSize = true; this.convertAudio.Checked = true; this.convertAudio.CheckState = System.Windows.Forms.CheckState.Checked; - this.convertAudio.Location = new System.Drawing.Point(6, 138); + this.convertAudio.Location = new System.Drawing.Point(6, 150); this.convertAudio.Name = "convertAudio"; - this.convertAudio.Size = new System.Drawing.Size(198, 16); + this.convertAudio.Size = new System.Drawing.Size(179, 17); this.convertAudio.TabIndex = 6; this.convertAudio.Text = "Convert AudioClip to WAV(PCM)"; this.convertAudio.UseVisualStyleBackColor = true; @@ -170,17 +172,17 @@ this.panel1.Controls.Add(this.tojpg); this.panel1.Controls.Add(this.topng); this.panel1.Controls.Add(this.tobmp); - this.panel1.Location = new System.Drawing.Point(20, 102); + this.panel1.Location = new System.Drawing.Point(20, 111); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(202, 30); + this.panel1.Size = new System.Drawing.Size(202, 33); this.panel1.TabIndex = 5; // // totga // this.totga.AutoSize = true; - this.totga.Location = new System.Drawing.Point(150, 6); + this.totga.Location = new System.Drawing.Point(150, 7); this.totga.Name = "totga"; - this.totga.Size = new System.Drawing.Size(41, 16); + this.totga.Size = new System.Drawing.Size(47, 17); this.totga.TabIndex = 2; this.totga.Text = "TGA"; this.totga.UseVisualStyleBackColor = true; @@ -188,9 +190,9 @@ // tojpg // this.tojpg.AutoSize = true; - this.tojpg.Location = new System.Drawing.Point(97, 6); + this.tojpg.Location = new System.Drawing.Point(97, 7); this.tojpg.Name = "tojpg"; - this.tojpg.Size = new System.Drawing.Size(47, 16); + this.tojpg.Size = new System.Drawing.Size(52, 17); this.tojpg.TabIndex = 4; this.tojpg.Text = "JPEG"; this.tojpg.UseVisualStyleBackColor = true; @@ -199,9 +201,9 @@ // this.topng.AutoSize = true; this.topng.Checked = true; - this.topng.Location = new System.Drawing.Point(50, 6); + this.topng.Location = new System.Drawing.Point(50, 7); this.topng.Name = "topng"; - this.topng.Size = new System.Drawing.Size(41, 16); + this.topng.Size = new System.Drawing.Size(48, 17); this.topng.TabIndex = 3; this.topng.TabStop = true; this.topng.Text = "PNG"; @@ -210,9 +212,9 @@ // tobmp // this.tobmp.AutoSize = true; - this.tobmp.Location = new System.Drawing.Point(3, 6); + this.tobmp.Location = new System.Drawing.Point(3, 7); this.tobmp.Name = "tobmp"; - this.tobmp.Size = new System.Drawing.Size(41, 16); + this.tobmp.Size = new System.Drawing.Size(48, 17); this.tobmp.TabIndex = 2; this.tobmp.Text = "BMP"; this.tobmp.UseVisualStyleBackColor = true; @@ -222,9 +224,9 @@ this.converttexture.AutoSize = true; this.converttexture.Checked = true; this.converttexture.CheckState = System.Windows.Forms.CheckState.Checked; - this.converttexture.Location = new System.Drawing.Point(6, 80); + this.converttexture.Location = new System.Drawing.Point(6, 87); this.converttexture.Name = "converttexture"; - this.converttexture.Size = new System.Drawing.Size(126, 16); + this.converttexture.Size = new System.Drawing.Size(116, 17); this.converttexture.TabIndex = 1; this.converttexture.Text = "Convert Texture2D"; this.converttexture.UseVisualStyleBackColor = true; @@ -248,9 +250,9 @@ this.groupBox2.Controls.Add(this.castToBone); this.groupBox2.Controls.Add(this.exportAllNodes); this.groupBox2.Controls.Add(this.eulerFilter); - this.groupBox2.Location = new System.Drawing.Point(250, 12); + this.groupBox2.Location = new System.Drawing.Point(250, 13); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(214, 302); + this.groupBox2.Size = new System.Drawing.Size(214, 327); this.groupBox2.TabIndex = 11; this.groupBox2.TabStop = false; this.groupBox2.Text = "Fbx"; @@ -260,9 +262,9 @@ this.exportBlendShape.AutoSize = true; this.exportBlendShape.Checked = true; this.exportBlendShape.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportBlendShape.Location = new System.Drawing.Point(6, 127); + this.exportBlendShape.Location = new System.Drawing.Point(6, 138); this.exportBlendShape.Name = "exportBlendShape"; - this.exportBlendShape.Size = new System.Drawing.Size(126, 16); + this.exportBlendShape.Size = new System.Drawing.Size(114, 17); this.exportBlendShape.TabIndex = 22; this.exportBlendShape.Text = "Export blendshape"; this.exportBlendShape.UseVisualStyleBackColor = true; @@ -272,9 +274,9 @@ this.exportAnimations.AutoSize = true; this.exportAnimations.Checked = true; this.exportAnimations.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportAnimations.Location = new System.Drawing.Point(6, 105); + this.exportAnimations.Location = new System.Drawing.Point(6, 114); this.exportAnimations.Name = "exportAnimations"; - this.exportAnimations.Size = new System.Drawing.Size(126, 16); + this.exportAnimations.Size = new System.Drawing.Size(109, 17); this.exportAnimations.TabIndex = 21; this.exportAnimations.Text = "Export animations"; this.exportAnimations.UseVisualStyleBackColor = true; @@ -287,9 +289,9 @@ 0, 0, 131072}); - this.scaleFactor.Location = new System.Drawing.Point(83, 202); + this.scaleFactor.Location = new System.Drawing.Point(83, 219); this.scaleFactor.Name = "scaleFactor"; - this.scaleFactor.Size = new System.Drawing.Size(60, 21); + this.scaleFactor.Size = new System.Drawing.Size(60, 20); this.scaleFactor.TabIndex = 20; this.scaleFactor.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.scaleFactor.Value = new decimal(new int[] { @@ -301,9 +303,9 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(6, 204); + this.label5.Location = new System.Drawing.Point(6, 221); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(71, 12); + this.label5.Size = new System.Drawing.Size(64, 13); this.label5.TabIndex = 19; this.label5.Text = "ScaleFactor"; // @@ -314,17 +316,17 @@ this.fbxFormat.Items.AddRange(new object[] { "Binary", "Ascii"}); - this.fbxFormat.Location = new System.Drawing.Point(77, 233); + this.fbxFormat.Location = new System.Drawing.Point(77, 252); this.fbxFormat.Name = "fbxFormat"; - this.fbxFormat.Size = new System.Drawing.Size(61, 20); + this.fbxFormat.Size = new System.Drawing.Size(61, 21); this.fbxFormat.TabIndex = 18; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(6, 236); + this.label4.Location = new System.Drawing.Point(6, 256); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(59, 12); + this.label4.Size = new System.Drawing.Size(59, 13); this.label4.TabIndex = 17; this.label4.Text = "FBXFormat"; // @@ -339,25 +341,25 @@ "7.3", "7.4", "7.5"}); - this.fbxVersion.Location = new System.Drawing.Point(77, 262); + this.fbxVersion.Location = new System.Drawing.Point(77, 284); this.fbxVersion.Name = "fbxVersion"; - this.fbxVersion.Size = new System.Drawing.Size(47, 20); + this.fbxVersion.Size = new System.Drawing.Size(47, 21); this.fbxVersion.TabIndex = 16; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(6, 265); + this.label3.Location = new System.Drawing.Point(6, 287); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(65, 12); + this.label3.Size = new System.Drawing.Size(62, 13); this.label3.TabIndex = 15; this.label3.Text = "FBXVersion"; // // boneSize // - this.boneSize.Location = new System.Drawing.Point(65, 175); + this.boneSize.Location = new System.Drawing.Point(65, 190); this.boneSize.Name = "boneSize"; - this.boneSize.Size = new System.Drawing.Size(46, 21); + this.boneSize.Size = new System.Drawing.Size(46, 20); this.boneSize.TabIndex = 11; this.boneSize.Value = new decimal(new int[] { 10, @@ -368,9 +370,9 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(6, 177); + this.label2.Location = new System.Drawing.Point(6, 192); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.Size = new System.Drawing.Size(52, 13); this.label2.TabIndex = 10; this.label2.Text = "BoneSize"; // @@ -379,9 +381,9 @@ this.exportSkins.AutoSize = true; this.exportSkins.Checked = true; this.exportSkins.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportSkins.Location = new System.Drawing.Point(6, 83); + this.exportSkins.Location = new System.Drawing.Point(6, 90); this.exportSkins.Name = "exportSkins"; - this.exportSkins.Size = new System.Drawing.Size(96, 16); + this.exportSkins.Size = new System.Drawing.Size(83, 17); this.exportSkins.TabIndex = 8; this.exportSkins.Text = "Export skins"; this.exportSkins.UseVisualStyleBackColor = true; @@ -389,9 +391,9 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(26, 39); + this.label1.Location = new System.Drawing.Point(26, 42); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(95, 12); + this.label1.Size = new System.Drawing.Size(72, 13); this.label1.TabIndex = 7; this.label1.Text = "FilterPrecision"; // @@ -403,9 +405,9 @@ 0, 0, 131072}); - this.filterPrecision.Location = new System.Drawing.Point(127, 37); + this.filterPrecision.Location = new System.Drawing.Point(127, 40); this.filterPrecision.Name = "filterPrecision"; - this.filterPrecision.Size = new System.Drawing.Size(51, 21); + this.filterPrecision.Size = new System.Drawing.Size(51, 20); this.filterPrecision.TabIndex = 6; this.filterPrecision.Value = new decimal(new int[] { 25, @@ -416,9 +418,9 @@ // castToBone // this.castToBone.AutoSize = true; - this.castToBone.Location = new System.Drawing.Point(6, 149); + this.castToBone.Location = new System.Drawing.Point(6, 161); this.castToBone.Name = "castToBone"; - this.castToBone.Size = new System.Drawing.Size(156, 16); + this.castToBone.Size = new System.Drawing.Size(131, 17); this.castToBone.TabIndex = 5; this.castToBone.Text = "All nodes cast to bone"; this.castToBone.UseVisualStyleBackColor = true; @@ -428,9 +430,9 @@ this.exportAllNodes.AutoSize = true; this.exportAllNodes.Checked = true; this.exportAllNodes.CheckState = System.Windows.Forms.CheckState.Checked; - this.exportAllNodes.Location = new System.Drawing.Point(6, 61); + this.exportAllNodes.Location = new System.Drawing.Point(6, 66); this.exportAllNodes.Name = "exportAllNodes"; - this.exportAllNodes.Size = new System.Drawing.Size(120, 16); + this.exportAllNodes.Size = new System.Drawing.Size(101, 17); this.exportAllNodes.TabIndex = 4; this.exportAllNodes.Text = "Export all nodes"; this.exportAllNodes.UseVisualStyleBackColor = true; @@ -440,20 +442,32 @@ this.eulerFilter.AutoSize = true; this.eulerFilter.Checked = true; this.eulerFilter.CheckState = System.Windows.Forms.CheckState.Checked; - this.eulerFilter.Location = new System.Drawing.Point(6, 20); + this.eulerFilter.Location = new System.Drawing.Point(6, 22); this.eulerFilter.Name = "eulerFilter"; - this.eulerFilter.Size = new System.Drawing.Size(90, 16); + this.eulerFilter.Size = new System.Drawing.Size(72, 17); this.eulerFilter.TabIndex = 3; this.eulerFilter.Text = "EulerFilter"; this.eulerFilter.UseVisualStyleBackColor = true; // + // pathIDAsImageName + // + this.pathIDAsImageName.AutoSize = true; + this.pathIDAsImageName.Checked = true; + this.pathIDAsImageName.CheckState = System.Windows.Forms.CheckState.Checked; + this.pathIDAsImageName.Location = new System.Drawing.Point(6, 196); + this.pathIDAsImageName.Name = "pathIDAsImageName"; + this.pathIDAsImageName.Size = new System.Drawing.Size(212, 17); + this.pathIDAsImageName.TabIndex = 11; + this.pathIDAsImageName.Text = "Use PathID as a name for image assets"; + this.pathIDAsImageName.UseVisualStyleBackColor = true; + // // ExportOptions // this.AcceptButton = this.OKbutton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.Cancel; - this.ClientSize = new System.Drawing.Size(477, 351); + this.ClientSize = new System.Drawing.Size(477, 380); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.Cancel); @@ -512,5 +526,6 @@ private System.Windows.Forms.Label label6; private System.Windows.Forms.CheckBox restoreExtensionName; private System.Windows.Forms.CheckBox openAfterExport; + private System.Windows.Forms.CheckBox pathIDAsImageName; } } \ No newline at end of file diff --git a/AssetStudioGUI/ExportOptions.cs b/AssetStudioGUI/ExportOptions.cs index b00744a..05ef2f6 100644 --- a/AssetStudioGUI/ExportOptions.cs +++ b/AssetStudioGUI/ExportOptions.cs @@ -40,6 +40,7 @@ namespace AssetStudioGUI scaleFactor.Value = Properties.Settings.Default.scaleFactor; fbxVersion.SelectedIndex = Properties.Settings.Default.fbxVersion; fbxFormat.SelectedIndex = Properties.Settings.Default.fbxFormat; + pathIDAsImageName.Checked = Properties.Settings.Default.pathIDAsImageName; } private void OKbutton_Click(object sender, EventArgs e) @@ -68,6 +69,7 @@ namespace AssetStudioGUI Properties.Settings.Default.scaleFactor = scaleFactor.Value; Properties.Settings.Default.fbxVersion = fbxVersion.SelectedIndex; Properties.Settings.Default.fbxFormat = fbxFormat.SelectedIndex; + Properties.Settings.Default.pathIDAsImageName = pathIDAsImageName.Checked; Properties.Settings.Default.Save(); DialogResult = DialogResult.OK; Close(); diff --git a/AssetStudioGUI/Exporter.cs b/AssetStudioGUI/Exporter.cs index 4926b6f..62ef4a2 100644 --- a/AssetStudioGUI/Exporter.cs +++ b/AssetStudioGUI/Exporter.cs @@ -12,6 +12,7 @@ namespace AssetStudioGUI { public static bool ExportTexture2D(AssetItem item, string exportPathName) { + string exportFullName; var m_Texture2D = (Texture2D)item.Asset; if (Properties.Settings.Default.convertTexture) { @@ -36,7 +37,10 @@ namespace AssetStudioGUI tga = true; break; } - var exportFullName = exportPathName + item.Text + "." + ext.ToLower(); + if (Properties.Settings.Default.pathIDAsImageName) + exportFullName = exportPathName + item.m_PathID.ToString() + "." + ext.ToLower(); + else + exportFullName = exportPathName + item.Text + "." + ext.ToLower(); if (ExportFileExists(exportFullName)) return false; if (tga) @@ -51,7 +55,10 @@ namespace AssetStudioGUI } else { - var exportFullName = exportPathName + item.Text + ".tex"; + if (Properties.Settings.Default.pathIDAsImageName) + exportFullName = exportPathName + item.m_PathID.ToString() + ".tex"; + else + exportFullName = exportPathName + item.Text + ".tex"; if (ExportFileExists(exportFullName)) return false; File.WriteAllBytes(exportFullName, m_Texture2D.image_data.GetData()); @@ -267,6 +274,7 @@ namespace AssetStudioGUI public static bool ExportSprite(AssetItem item, string exportPath) { ImageFormat format = null; + string exportFullName; var type = Properties.Settings.Default.convertType; bool tga = false; switch (type) @@ -284,7 +292,10 @@ namespace AssetStudioGUI tga = true; break; } - var exportFullName = exportPath + item.Text + "." + type.ToLower(); + if (Properties.Settings.Default.pathIDAsImageName) + exportFullName = exportPath + item.m_PathID.ToString() + "." + type.ToLower(); + else + exportFullName = exportPath + item.Text + "." + type.ToLower(); if (ExportFileExists(exportFullName)) return false; var bitmap = ((Sprite)item.Asset).GetImage(); diff --git a/AssetStudioGUI/Properties/AssemblyInfo.cs b/AssetStudioGUI/Properties/AssemblyInfo.cs index f0b98d4..83e1106 100644 --- a/AssetStudioGUI/Properties/AssemblyInfo.cs +++ b/AssetStudioGUI/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 // 控制。更改这些特性值可修改 // 与程序集关联的信息。 -[assembly: AssemblyTitle("AssetStudioGUI")] +[assembly: AssemblyTitle("AssetStudioGUI Mod by VaDiM")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.14.38.3")] +[assembly: AssemblyFileVersion("0.14.38.3")] diff --git a/AssetStudioGUI/Properties/Settings.Designer.cs b/AssetStudioGUI/Properties/Settings.Designer.cs index 4074970..9827144 100644 --- a/AssetStudioGUI/Properties/Settings.Designer.cs +++ b/AssetStudioGUI/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 // -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace AssetStudioGUI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -262,5 +262,17 @@ namespace AssetStudioGUI.Properties { this["restoreExtensionName"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool pathIDAsImageName { + get { + return ((bool)(this["pathIDAsImageName"])); + } + set { + this["pathIDAsImageName"] = value; + } + } } } diff --git a/AssetStudioGUI/Properties/Settings.settings b/AssetStudioGUI/Properties/Settings.settings index 3700b01..eeba0c0 100644 --- a/AssetStudioGUI/Properties/Settings.settings +++ b/AssetStudioGUI/Properties/Settings.settings @@ -62,5 +62,8 @@ True + + False + \ No newline at end of file diff --git a/AssetStudioGUI/app.config b/AssetStudioGUI/app.config index 0088836..3865947 100644 --- a/AssetStudioGUI/app.config +++ b/AssetStudioGUI/app.config @@ -70,6 +70,9 @@ True + + False + \ No newline at end of file diff --git a/AssetStudioUtility/AssetStudioUtility.csproj b/AssetStudioUtility/AssetStudioUtility.csproj index e0acd12..6e32139 100644 --- a/AssetStudioUtility/AssetStudioUtility.csproj +++ b/AssetStudioUtility/AssetStudioUtility.csproj @@ -27,7 +27,7 @@ bin\x64\Release\ TRACE true - pdbonly + none x64 7.3 prompt diff --git a/AssetStudioUtility/Properties/AssemblyInfo.cs b/AssetStudioUtility/Properties/AssemblyInfo.cs index aa7e183..be5646a 100644 --- a/AssetStudioUtility/Properties/AssemblyInfo.cs +++ b/AssetStudioUtility/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.14.38.3")] +[assembly: AssemblyFileVersion("0.14.38.3")] diff --git a/Texture2DDecoder/Texture2DDecoder.vcxproj b/Texture2DDecoder/Texture2DDecoder.vcxproj index 8d6df7d..e0c43a7 100644 --- a/Texture2DDecoder/Texture2DDecoder.vcxproj +++ b/Texture2DDecoder/Texture2DDecoder.vcxproj @@ -24,34 +24,34 @@ v4.7.2 ManagedCProj Texture2DDecoder - 10.0.18362.0 + 10.0 DynamicLibrary true - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary true - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode