diff --git a/AssetStudio.sln b/AssetStudio.sln index 91725e0..8a212a9 100644 --- a/AssetStudio.sln +++ b/AssetStudio.sln @@ -1,17 +1,17 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.29806.167 +VisualStudioVersion = 16.0.29920.165 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudioGUI", "AssetStudioGUI\AssetStudioGUI.csproj", "{24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudio", "AssetStudio\AssetStudio.csproj", "{7662F8C2-7BFD-442E-A948-A43B4F7EB06E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetStudioFBX", "AssetStudioFBX\AssetStudioFBX.vcxproj", "{4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetStudioFBX", "AssetStudioFBX\AssetStudioFBX.vcxproj", "{B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudioUtility", "AssetStudioUtility\AssetStudioUtility.csproj", "{9131C403-7FE8-444D-9AF5-5FE5DF76FF24}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Texture2DDecoder", "Texture2DDecoder\Texture2DDecoder.vcxproj", "{BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudio", "AssetStudio\AssetStudio.csproj", "{AF56B63C-1764-41B7-9E60-8D485422AC3B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudioUtility", "AssetStudioUtility\AssetStudioUtility.csproj", "{80AEC261-21EE-4E4F-A93B-7A744DC84888}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Texture2DDecoder", "Texture2DDecoder\Texture2DDecoder.vcxproj", "{57CFF625-57AB-424A-9B6B-B5ED01282E92}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudioGUI", "AssetStudioGUI\AssetStudioGUI.csproj", "{52B196FB-4C8A-499B-B877-1A0EB4F33EC0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,51 +21,51 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|x64.ActiveCfg = Debug|x64 - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|x64.Build.0 = Debug|x64 - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|x86.ActiveCfg = Debug|x86 - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Debug|x86.Build.0 = Debug|x86 - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|x64.ActiveCfg = Release|x64 - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|x64.Build.0 = Release|x64 - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|x86.ActiveCfg = Release|x86 - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853}.Release|x86.Build.0 = Release|x86 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Debug|x64.ActiveCfg = Debug|x64 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Debug|x64.Build.0 = Debug|x64 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Debug|x86.ActiveCfg = Debug|Win32 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Debug|x86.Build.0 = Debug|Win32 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Release|x64.ActiveCfg = Release|x64 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Release|x64.Build.0 = Release|x64 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Release|x86.ActiveCfg = Release|Win32 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267}.Release|x86.Build.0 = Release|Win32 - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Debug|x64.ActiveCfg = Debug|x64 - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Debug|x64.Build.0 = Debug|x64 - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Debug|x86.ActiveCfg = Debug|x86 - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Debug|x86.Build.0 = Debug|x86 - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Release|x64.ActiveCfg = Release|x64 - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Release|x64.Build.0 = Release|x64 - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Release|x86.ActiveCfg = Release|x86 - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24}.Release|x86.Build.0 = Release|x86 - {AF56B63C-1764-41B7-9E60-8D485422AC3B}.Debug|x64.ActiveCfg = Debug|Any CPU - {AF56B63C-1764-41B7-9E60-8D485422AC3B}.Debug|x64.Build.0 = Debug|Any CPU - {AF56B63C-1764-41B7-9E60-8D485422AC3B}.Debug|x86.ActiveCfg = Debug|Any CPU - {AF56B63C-1764-41B7-9E60-8D485422AC3B}.Debug|x86.Build.0 = Debug|Any CPU - {AF56B63C-1764-41B7-9E60-8D485422AC3B}.Release|x64.ActiveCfg = Release|Any CPU - {AF56B63C-1764-41B7-9E60-8D485422AC3B}.Release|x64.Build.0 = Release|Any CPU - {AF56B63C-1764-41B7-9E60-8D485422AC3B}.Release|x86.ActiveCfg = Release|Any CPU - {AF56B63C-1764-41B7-9E60-8D485422AC3B}.Release|x86.Build.0 = Release|Any CPU - {57CFF625-57AB-424A-9B6B-B5ED01282E92}.Debug|x64.ActiveCfg = Debug|x64 - {57CFF625-57AB-424A-9B6B-B5ED01282E92}.Debug|x64.Build.0 = Debug|x64 - {57CFF625-57AB-424A-9B6B-B5ED01282E92}.Debug|x86.ActiveCfg = Debug|Win32 - {57CFF625-57AB-424A-9B6B-B5ED01282E92}.Debug|x86.Build.0 = Debug|Win32 - {57CFF625-57AB-424A-9B6B-B5ED01282E92}.Release|x64.ActiveCfg = Release|x64 - {57CFF625-57AB-424A-9B6B-B5ED01282E92}.Release|x64.Build.0 = Release|x64 - {57CFF625-57AB-424A-9B6B-B5ED01282E92}.Release|x86.ActiveCfg = Release|Win32 - {57CFF625-57AB-424A-9B6B-B5ED01282E92}.Release|x86.Build.0 = Release|Win32 + {7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Debug|x64.ActiveCfg = Debug|Any CPU + {7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Debug|x64.Build.0 = Debug|Any CPU + {7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Debug|x86.ActiveCfg = Debug|Any CPU + {7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Debug|x86.Build.0 = Debug|Any CPU + {7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Release|x64.ActiveCfg = Release|Any CPU + {7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Release|x64.Build.0 = Release|Any CPU + {7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Release|x86.ActiveCfg = Release|Any CPU + {7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Release|x86.Build.0 = Release|Any CPU + {B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Debug|x64.ActiveCfg = Debug|x64 + {B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Debug|x64.Build.0 = Debug|x64 + {B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Debug|x86.ActiveCfg = Debug|Win32 + {B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Debug|x86.Build.0 = Debug|Win32 + {B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Release|x64.ActiveCfg = Release|x64 + {B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Release|x64.Build.0 = Release|x64 + {B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Release|x86.ActiveCfg = Release|Win32 + {B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Release|x86.Build.0 = Release|Win32 + {BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Debug|x64.ActiveCfg = Debug|x64 + {BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Debug|x64.Build.0 = Debug|x64 + {BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Debug|x86.ActiveCfg = Debug|Win32 + {BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Debug|x86.Build.0 = Debug|Win32 + {BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Release|x64.ActiveCfg = Release|x64 + {BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Release|x64.Build.0 = Release|x64 + {BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Release|x86.ActiveCfg = Release|Win32 + {BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Release|x86.Build.0 = Release|Win32 + {80AEC261-21EE-4E4F-A93B-7A744DC84888}.Debug|x64.ActiveCfg = Debug|x64 + {80AEC261-21EE-4E4F-A93B-7A744DC84888}.Debug|x64.Build.0 = Debug|x64 + {80AEC261-21EE-4E4F-A93B-7A744DC84888}.Debug|x86.ActiveCfg = Debug|x86 + {80AEC261-21EE-4E4F-A93B-7A744DC84888}.Debug|x86.Build.0 = Debug|x86 + {80AEC261-21EE-4E4F-A93B-7A744DC84888}.Release|x64.ActiveCfg = Release|x64 + {80AEC261-21EE-4E4F-A93B-7A744DC84888}.Release|x64.Build.0 = Release|x64 + {80AEC261-21EE-4E4F-A93B-7A744DC84888}.Release|x86.ActiveCfg = Release|x86 + {80AEC261-21EE-4E4F-A93B-7A744DC84888}.Release|x86.Build.0 = Release|x86 + {52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Debug|x64.ActiveCfg = Debug|x64 + {52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Debug|x64.Build.0 = Debug|x64 + {52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Debug|x86.ActiveCfg = Debug|x86 + {52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Debug|x86.Build.0 = Debug|x86 + {52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Release|x64.ActiveCfg = Release|x64 + {52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Release|x64.Build.0 = Release|x64 + {52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Release|x86.ActiveCfg = Release|x86 + {52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F5C476A6-2B3B-416F-8BD5-6FE454FF3972} + SolutionGuid = {F8734F96-97B6-40CA-B791-6D5467F2F713} EndGlobalSection EndGlobal diff --git a/AssetStudio/AssetStudio.csproj b/AssetStudio/AssetStudio.csproj index fd3a6ae..3736a60 100644 --- a/AssetStudio/AssetStudio.csproj +++ b/AssetStudio/AssetStudio.csproj @@ -4,12 +4,12 @@ Debug AnyCPU - {AF56B63C-1764-41B7-9E60-8D485422AC3B} + {7662F8C2-7BFD-442E-A948-A43B4F7EB06E} Library Properties AssetStudio AssetStudio - v4.0 + v4.7.2 512 true @@ -38,6 +38,7 @@ + @@ -56,22 +57,7 @@ - - - - - - - - - - - - - - - @@ -114,8 +100,10 @@ + + @@ -128,26 +116,38 @@ + + + + + + + + + + + + - + + - + - \ No newline at end of file diff --git a/AssetStudio/Classes/Texture2D.cs b/AssetStudio/Classes/Texture2D.cs index e11671b..db249b7 100644 --- a/AssetStudio/Classes/Texture2D.cs +++ b/AssetStudio/Classes/Texture2D.cs @@ -1,9 +1,4 @@ using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices; namespace AssetStudio { diff --git a/AssetStudio/Properties/AssemblyInfo.cs b/AssetStudio/Properties/AssemblyInfo.cs index 3b4181e..f583678 100644 --- a/AssetStudio/Properties/AssemblyInfo.cs +++ b/AssetStudio/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("AssetStudio")] -[assembly: AssemblyCopyright("Copyright © Perfare 2018-2019")] +[assembly: AssemblyCopyright("Copyright © Perfare 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,7 +20,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("af56b63c-1764-41b7-9e60-8d485422ac3b")] +[assembly: Guid("7662f8c2-7bfd-442e-a948-a43b4f7eb06e")] // 程序集的版本信息由下列四个值组成: // @@ -29,7 +29,7 @@ using System.Runtime.InteropServices; // 生成号 // 修订号 // -// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] diff --git a/AssetStudioFBX/AssemblyInfo.cpp b/AssetStudioFBX/AssemblyInfo.cpp index c73d9e4..acdec3e 100644 --- a/AssetStudioFBX/AssemblyInfo.cpp +++ b/AssetStudioFBX/AssemblyInfo.cpp @@ -9,7 +9,7 @@ using namespace System::Security::Permissions; [assembly:AssemblyConfigurationAttribute(L"")]; [assembly:AssemblyCompanyAttribute(L"")]; [assembly:AssemblyProductAttribute(L"AssetStudioFBX")]; -[assembly:AssemblyCopyrightAttribute(L"Copyright © Perfare 2018-2019")]; +[assembly:AssemblyCopyrightAttribute(L"Copyright © Perfare 2018-2020")]; [assembly:AssemblyTrademarkAttribute(L"")]; [assembly:AssemblyCultureAttribute(L"")]; diff --git a/AssetStudioFBX/AssetStudioFBX.vcxproj b/AssetStudioFBX/AssetStudioFBX.vcxproj index 50e77b8..7248d4d 100644 --- a/AssetStudioFBX/AssetStudioFBX.vcxproj +++ b/AssetStudioFBX/AssetStudioFBX.vcxproj @@ -1,40 +1,47 @@ - + Debug Win32 - - Debug - x64 - Release Win32 + + Debug + x64 + Release x64 - 15.0 - {4F8EF5EF-732B-49CF-9EB3-B23E19AE6267} - v4.0 + 16.0 + {B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8} + v4.7.2 ManagedCProj AssetStudioFBX 10.0.18362.0 - + DynamicLibrary true v141 true Unicode - + + DynamicLibrary + false + v141 + true + Unicode + + DynamicLibrary true v141 @@ -48,47 +55,39 @@ true Unicode - - DynamicLibrary - false - v141 - true - Unicode - - + - + + + + - - - - - true - - - true - - - false - - - false - + + + + Level3 + FBXSDK_SHARED;WIN32;_DEBUG;%(PreprocessorDefinitions) + C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\include;%(AdditionalIncludeDirectories) + + + libfbxsdk.lib;%(AdditionalDependencies) + C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\lib\vs2017\x86\release;%(AdditionalLibraryDirectories) + + Level3 - Disabled FBXSDK_SHARED;_DEBUG;%(PreprocessorDefinitions) C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\include;%(AdditionalIncludeDirectories) @@ -97,11 +96,10 @@ C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\lib\vs2017\x64\release;%(AdditionalLibraryDirectories) - + Level3 - Disabled - FBXSDK_SHARED;_DEBUG;%(PreprocessorDefinitions) + FBXSDK_SHARED;WIN32;NDEBUG;%(PreprocessorDefinitions) C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\include;%(AdditionalIncludeDirectories) @@ -120,32 +118,21 @@ C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\lib\vs2017\x64\release;%(AdditionalLibraryDirectories) - - - Level3 - FBXSDK_SHARED;NDEBUG;%(PreprocessorDefinitions) - C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\include;%(AdditionalIncludeDirectories) - - - libfbxsdk.lib;%(AdditionalDependencies) - C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\lib\vs2017\x86\release;%(AdditionalLibraryDirectories) - - + + + - - - - {af56b63c-1764-41b7-9e60-8d485422ac3b} + {7662f8c2-7bfd-442e-a948-a43b4f7eb06e} diff --git a/AssetStudioFBX/AssetStudioFBX.vcxproj.filters b/AssetStudioFBX/AssetStudioFBX.vcxproj.filters index 203b81e..c2abcdc 100644 --- a/AssetStudioFBX/AssetStudioFBX.vcxproj.filters +++ b/AssetStudioFBX/AssetStudioFBX.vcxproj.filters @@ -3,12 +3,21 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + 头文件 + @@ -21,9 +30,4 @@ 源文件 - - - 头文件 - - \ No newline at end of file diff --git a/AssetStudioGUI/AssetStudioGUI.csproj b/AssetStudioGUI/AssetStudioGUI.csproj index 72401c3..6d35c3b 100644 --- a/AssetStudioGUI/AssetStudioGUI.csproj +++ b/AssetStudioGUI/AssetStudioGUI.csproj @@ -1,37 +1,17 @@  - + + Debug - x86 - 8.0.30703 - 2.0 - {24551E2D-E9B6-4CD6-8F2A-D9F4A13E7853} + AnyCPU + {52B196FB-4C8A-499B-B877-1A0EB4F33EC0} WinExe - Properties AssetStudioGUI AssetStudioGUI - v4.0 - - + v4.7.2 512 - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - Resources\as.ico + true + true true @@ -39,8 +19,10 @@ DEBUG;TRACE full x64 + 7.3 prompt MinimumRecommendedRules.ruleset + true bin\x64\Release\ @@ -48,11 +30,10 @@ true pdbonly x64 + 7.3 prompt MinimumRecommendedRules.ruleset - - - OnBuildSuccess + true true @@ -60,8 +41,10 @@ DEBUG;TRACE full x86 + 7.3 prompt MinimumRecommendedRules.ruleset + true bin\x86\Release\ @@ -69,8 +52,10 @@ true pdbonly x86 + 7.3 prompt MinimumRecommendedRules.ruleset + true @@ -85,38 +70,43 @@ + + - - - - - - - - - Form - - - ExportOptions.cs - - - Component - - - Form - + AssetStudioGUIForm.cs - + + + + Component + + + + + + Form + + + ExportOptions.cs + + + + + + + + AssetStudioGUIForm.cs + ExportOptions.cs @@ -130,11 +120,6 @@ Resources.resx True - - AssetStudioGUIForm.cs - Designer - - @@ -148,21 +133,7 @@ - - False - Microsoft .NET Framework 4 Client Profile %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 4.5 - true - + @@ -170,16 +141,6 @@ - - - {9131c403-7fe8-444d-9af5-5fe5df76ff24} - AssetStudioUtility - - - {af56b63c-1764-41b7-9e60-8d485422ac3b} - AssetStudio - - PreserveNewest @@ -200,5 +161,15 @@ libfbxsdk.dll + + + {80aec261-21ee-4e4f-a93b-7a744dc84888} + AssetStudioUtility + + + {7662f8c2-7bfd-442e-a948-a43b4f7eb06e} + AssetStudio + + \ No newline at end of file diff --git a/AssetStudioGUI/Program.cs b/AssetStudioGUI/Program.cs index d8ed104..c45d907 100644 --- a/AssetStudioGUI/Program.cs +++ b/AssetStudioGUI/Program.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using System.Windows.Forms; namespace AssetStudioGUI @@ -8,7 +9,7 @@ namespace AssetStudioGUI static class Program { /// - /// The main entry point for the application. + /// 应用程序的主入口点。 /// [STAThread] static void Main() diff --git a/AssetStudioGUI/Properties/AssemblyInfo.cs b/AssetStudioGUI/Properties/AssemblyInfo.cs index 7612b63..f0b98d4 100644 --- a/AssetStudioGUI/Properties/AssemblyInfo.cs +++ b/AssetStudioGUI/Properties/AssemblyInfo.cs @@ -2,35 +2,35 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 [assembly: AssemblyTitle("AssetStudioGUI")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("AssetStudioGUI")] -[assembly: AssemblyCopyright("Copyright © Perfare 2018-2019")] +[assembly: AssemblyCopyright("Copyright © Perfare 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 [assembly: ComVisible(false)] -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("05c04c20-dd89-4895-9f06-33d5cfbfe925")] +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("52b196fb-4c8a-499b-b877-1a0eb4f33ec0")] -// Version information for an assembly consists of the following four values: +// 程序集的版本信息由下列四个值组成: // -// Major Version -// Minor Version -// Build Number -// Revision +// 主版本 +// 次版本 +// 生成号 +// 修订号 // -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: +//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 +//通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/AssetStudioGUI/Properties/Resources.Designer.cs b/AssetStudioGUI/Properties/Resources.Designer.cs index 9fd284b..eda7a71 100644 --- a/AssetStudioGUI/Properties/Resources.Designer.cs +++ b/AssetStudioGUI/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace AssetStudioGUI.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -48,6 +48,7 @@ namespace AssetStudioGUI.Properties { /// /// 重写当前线程的 CurrentUICulture 属性 + /// 重写当前线程的 CurrentUICulture 属性。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/AssetStudioGUI/app.config b/AssetStudioGUI/app.config index 82a8c4c..0088836 100644 --- a/AssetStudioGUI/app.config +++ b/AssetStudioGUI/app.config @@ -1,72 +1,75 @@  - - -
- - - - - - False - - - True - - - True - - - True - - - 0 - - - True - - - True - - - PNG - - - True - - - 0.25 - - - True - - - True - - - True - - - 10 - - - 3 - - - 0 - - - 1 - - - True - - - False - - - True - - - + + +
+ + + + + + + + + False + + + True + + + True + + + True + + + 0 + + + True + + + True + + + PNG + + + True + + + 0.25 + + + True + + + True + + + True + + + 10 + + + 3 + + + 0 + + + 1 + + + True + + + False + + + True + + + \ No newline at end of file diff --git a/AssetStudioGUI/packages.config b/AssetStudioGUI/packages.config index eea5e7d..ec75cf5 100644 --- a/AssetStudioGUI/packages.config +++ b/AssetStudioGUI/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/AssetStudioUtility/AssetStudioUtility.csproj b/AssetStudioUtility/AssetStudioUtility.csproj index 12fb331..e0acd12 100644 --- a/AssetStudioUtility/AssetStudioUtility.csproj +++ b/AssetStudioUtility/AssetStudioUtility.csproj @@ -4,13 +4,14 @@ Debug AnyCPU - {9131C403-7FE8-444D-9AF5-5FE5DF76FF24} + {80AEC261-21EE-4E4F-A93B-7A744DC84888} Library Properties - AssetStudio + AssetStudioUtility AssetStudioUtility - v4.0 + v4.7.2 512 + true true @@ -18,6 +19,7 @@ DEBUG;TRACE full x64 + 7.3 prompt MinimumRecommendedRules.ruleset @@ -27,6 +29,7 @@ true pdbonly x64 + 7.3 prompt MinimumRecommendedRules.ruleset @@ -36,6 +39,7 @@ DEBUG;TRACE full x86 + 7.3 prompt MinimumRecommendedRules.ruleset @@ -45,6 +49,7 @@ true pdbonly x86 + 7.3 prompt MinimumRecommendedRules.ruleset @@ -59,6 +64,7 @@ + @@ -77,15 +83,15 @@ - {4f8ef5ef-732b-49cf-9eb3-b23e19ae6267} + {b82dd1ba-4eec-4f29-a686-03d7f0df39b8} AssetStudioFBX - {af56b63c-1764-41b7-9e60-8d485422ac3b} + {7662f8c2-7bfd-442e-a948-a43b4f7eb06e} AssetStudio - {57cff625-57ab-424a-9b6b-b5ed01282e92} + {bec7b5e6-0a7b-4824-97a7-eea04d9eba29} Texture2DDecoder diff --git a/AssetStudioUtility/Properties/AssemblyInfo.cs b/AssetStudioUtility/Properties/AssemblyInfo.cs index 77a1d3b..aa7e183 100644 --- a/AssetStudioUtility/Properties/AssemblyInfo.cs +++ b/AssetStudioUtility/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 // 控制。更改这些特性值可修改 // 与程序集关联的信息。 -[assembly: AssemblyTitle("AssetStudioTools")] +[assembly: AssemblyTitle("AssetStudioUtility")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("AssetStudioTools")] -[assembly: AssemblyCopyright("Copyright © Perfare 2018-2019")] +[assembly: AssemblyProduct("AssetStudioUtility")] +[assembly: AssemblyCopyright("Copyright © Perfare 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,7 +20,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("9131c403-7fe8-444d-9af5-5fe5df76ff24")] +[assembly: Guid("80aec261-21ee-4e4f-a93b-7a744dc84888")] // 程序集的版本信息由下列四个值组成: // @@ -29,7 +29,7 @@ using System.Runtime.InteropServices; // 生成号 // 修订号 // -// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] diff --git a/Texture2DDecoder/Texture2DDecoder.vcxproj b/Texture2DDecoder/Texture2DDecoder.vcxproj index cdf97ef..8d6df7d 100644 --- a/Texture2DDecoder/Texture2DDecoder.vcxproj +++ b/Texture2DDecoder/Texture2DDecoder.vcxproj @@ -20,8 +20,8 @@ 16.0 - {57CFF625-57AB-424A-9B6B-B5ED01282E92} - v4.0 + {BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29} + v4.7.2 ManagedCProj Texture2DDecoder 10.0.18362.0 @@ -74,19 +74,19 @@ - + Level3 - _DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;%(PreprocessorDefinitions) - + Level3 - WIN32;_DEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) @@ -110,17 +110,6 @@ - - - - - - - - - - - @@ -129,10 +118,6 @@ - - - - @@ -140,6 +125,21 @@ + + + + + + + + + + + + + + + diff --git a/Texture2DDecoder/Texture2DDecoder.vcxproj.filters b/Texture2DDecoder/Texture2DDecoder.vcxproj.filters index 6ce1374..b62082a 100644 --- a/Texture2DDecoder/Texture2DDecoder.vcxproj.filters +++ b/Texture2DDecoder/Texture2DDecoder.vcxproj.filters @@ -3,77 +3,46 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - 源文件 - - - 源文件 - - - 源文件 - - - 源文件 - - - 源文件 - - - 源文件 - - - 源文件 - - - 源文件 - - - 源文件 - - - - + 头文件 - + + 头文件 + + 头文件 头文件 + + 头文件 + 头文件 - - 头文件 - - - 头文件 - - - 头文件 - 头文件 - + 头文件 - + 头文件 - - 头文件 - - + 头文件 @@ -88,11 +57,46 @@ 头文件 - + 头文件 - + + 头文件 + + + 头文件 + + 头文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + \ No newline at end of file