Improve auto-detection of Tuanjie meshes

This commit is contained in:
VaDiM
2026-05-19 02:18:29 +03:00
parent b9d993e389
commit 65169f5120
2 changed files with 12 additions and 8 deletions
+9 -4
View File
@@ -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
+3 -4
View File
@@ -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));
}
}