From d2f69432e4a01ff97e3d025959da52bfbe056f36 Mon Sep 17 00:00:00 2001 From: VaDiM Date: Fri, 8 Nov 2024 03:10:55 +0300 Subject: [PATCH] Add Tuanjie build targets --- AssetStudio/BuildTarget.cs | 17 +++++++++++------ AssetStudio/SerializedFile.cs | 9 ++++++++- AssetStudioGUI/AssetStudioGUIForm.cs | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/AssetStudio/BuildTarget.cs b/AssetStudio/BuildTarget.cs index 407e2eb..b34319f 100644 --- a/AssetStudio/BuildTarget.cs +++ b/AssetStudio/BuildTarget.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace AssetStudio +namespace AssetStudio { public enum BuildTarget { @@ -56,4 +51,14 @@ namespace AssetStudio VisionOS, UnknownPlatform = 9999 } + + public enum TuanjieBuildTarget + { + WeixinMiniGame = 47, + OpenHarmony, + HMIAndroid, + ArmLinux, + ArmLinuxServer, + VisionOS, + } } diff --git a/AssetStudio/SerializedFile.cs b/AssetStudio/SerializedFile.cs index af6183c..f16e349 100644 --- a/AssetStudio/SerializedFile.cs +++ b/AssetStudio/SerializedFile.cs @@ -18,6 +18,7 @@ namespace AssetStudio public SerializedFileHeader header; private byte m_FileEndianess; public BuildTarget m_TargetPlatform = BuildTarget.UnknownPlatform; + public string targetPlatformString; private bool m_EnableTypeTree = true; public List m_Types; public int bigIDEnabled = 0; @@ -76,11 +77,17 @@ namespace AssetStudio } if (header.m_Version >= SerializedFileFormatVersion.Unknown_8) { - m_TargetPlatform = (BuildTarget)reader.ReadInt32(); + var target = reader.ReadInt32(); + + m_TargetPlatform = (BuildTarget)target; if (!Enum.IsDefined(typeof(BuildTarget), m_TargetPlatform)) { m_TargetPlatform = BuildTarget.UnknownPlatform; } + + targetPlatformString = version.IsTuanjie && Enum.IsDefined(typeof(TuanjieBuildTarget), target) + ? ((TuanjieBuildTarget)target).ToString() + : m_TargetPlatform.ToString(); } if (header.m_Version >= SerializedFileFormatVersion.HasTypeTreeHashes) { diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index 9a3fefe..d77f38f 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -266,7 +266,7 @@ namespace AssetStudioGUI var typeMap = await Task.Run(() => BuildClassStructure()); productName = string.IsNullOrEmpty(productName) ? "no productName" : productName; - Text = $"{guiTitle} - {productName} - {assetsManager.assetsFileList[0].version} - {assetsManager.assetsFileList[0].m_TargetPlatform}"; + Text = $"{guiTitle} - {productName} - {assetsManager.assetsFileList[0].version} - {assetsManager.assetsFileList[0].targetPlatformString}"; assetListView.VirtualListSize = visibleAssets.Count;