mirror of
https://github.com/aelurum/AssetStudio.git
synced 2026-11-15 19:28:48 -05:00
Improve auto-detection of Tuanjie meshes
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
using AssetStudio.CustomOptions;
|
using System;
|
||||||
using System;
|
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
using static AssetStudio.CustomOptions.GameSpecificOptions.CustomMeshOptions;
|
||||||
|
|
||||||
namespace AssetStudio
|
namespace AssetStudio
|
||||||
{
|
{
|
||||||
@@ -746,8 +746,13 @@ namespace AssetStudio
|
|||||||
}
|
}
|
||||||
|
|
||||||
var tuanjieParsingMode = reader.assetsFile.assetsManager.Options.GameSpecific.Meshes.TuanjieMeshParsingMode;
|
var tuanjieParsingMode = reader.assetsFile.assetsManager.Options.GameSpecific.Meshes.TuanjieMeshParsingMode;
|
||||||
var useSharedClusterData = tuanjieParsingMode == GameSpecificOptions.CustomMeshOptions.MeshParsingMode.Tuanjie
|
var useSharedClusterData = tuanjieParsingMode == MeshParsingMode.Tuanjie;
|
||||||
|| (tuanjieParsingMode == GameSpecificOptions.CustomMeshOptions.MeshParsingMode.Auto && reader.version < (2022, 3, 61, 2));
|
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.IsTuanjie && useSharedClusterData)
|
||||||
{
|
{
|
||||||
if (version < (2022, 3, 48, 3)) //2022.3.48t3(1.4.0) down
|
if (version < (2022, 3, 48, 3)) //2022.3.48t3(1.4.0) down
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
using System;
|
using System.Linq;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace AssetStudio
|
namespace AssetStudio
|
||||||
{
|
{
|
||||||
@@ -17,5 +14,7 @@ namespace AssetStudio
|
|||||||
public string m_KlassName;
|
public string m_KlassName;
|
||||||
public string m_NameSpace;
|
public string m_NameSpace;
|
||||||
public string m_AsmName;
|
public string m_AsmName;
|
||||||
|
|
||||||
|
public bool Match(params ulong[] hashes) => hashes.Any(x => x == System.IO.Hashing.XxHash3.HashToUInt64(m_OldTypeHash));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user