From 65169f512075feae2707dada736a5d7927e559ba Mon Sep 17 00:00:00 2001 From: VaDiM Date: Tue, 19 May 2026 02:18:11 +0300 Subject: [PATCH] Improve auto-detection of Tuanjie meshes --- AssetStudio/Classes/Mesh.cs | 13 +++++++++---- AssetStudio/SerializedType.cs | 7 +++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/AssetStudio/Classes/Mesh.cs b/AssetStudio/Classes/Mesh.cs index 4459005..ec0e4ad 100644 --- a/AssetStudio/Classes/Mesh.cs +++ b/AssetStudio/Classes/Mesh.cs @@ -1,10 +1,10 @@ -using AssetStudio.CustomOptions; -using System; +using System; using System.Collections; using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; +using static AssetStudio.CustomOptions.GameSpecificOptions.CustomMeshOptions; namespace AssetStudio { @@ -746,8 +746,13 @@ namespace AssetStudio } var tuanjieParsingMode = reader.assetsFile.assetsManager.Options.GameSpecific.Meshes.TuanjieMeshParsingMode; - var useSharedClusterData = tuanjieParsingMode == GameSpecificOptions.CustomMeshOptions.MeshParsingMode.Tuanjie - || (tuanjieParsingMode == GameSpecificOptions.CustomMeshOptions.MeshParsingMode.Auto && reader.version < (2022, 3, 61, 2)); + var useSharedClusterData = tuanjieParsingMode == MeshParsingMode.Tuanjie; + if (tuanjieParsingMode == MeshParsingMode.Auto) + { + //SharedClusterData becomes optional from v1.6.1, but idk in what cases + useSharedClusterData = version < (2022, 3, 61, 2) || !serializedType.Match(6165448184371784201); + } + if (version.IsTuanjie && useSharedClusterData) { if (version < (2022, 3, 48, 3)) //2022.3.48t3(1.4.0) down diff --git a/AssetStudio/SerializedType.cs b/AssetStudio/SerializedType.cs index a4e3db6..c498a19 100644 --- a/AssetStudio/SerializedType.cs +++ b/AssetStudio/SerializedType.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; namespace AssetStudio { @@ -17,5 +14,7 @@ namespace AssetStudio public string m_KlassName; public string m_NameSpace; public string m_AsmName; + + public bool Match(params ulong[] hashes) => hashes.Any(x => x == System.IO.Hashing.XxHash3.HashToUInt64(m_OldTypeHash)); } }