mirror of
https://github.com/aelurum/AssetStudio.git
synced 2026-11-15 19:28:48 -05:00
Improve support for Unity 6.6+
This commit is contained in:
@@ -677,7 +677,7 @@ namespace AssetStudio
|
||||
break;
|
||||
case ClassIDType.AnimationClip when objectReader.version >= (1, 5):
|
||||
obj = parseByTypeTree
|
||||
? new AnimationClip(objectReader, TypeTreeHelper.ReadTypeByteArray(objectReader.serializedType.m_Type, objectReader), jsonOptions, objectInfo)
|
||||
? new AnimationClip(objectReader, jsonOptions, objectInfo)
|
||||
: new AnimationClip(objectReader);
|
||||
break;
|
||||
case ClassIDType.Animator:
|
||||
@@ -709,7 +709,7 @@ namespace AssetStudio
|
||||
break;
|
||||
case ClassIDType.Material:
|
||||
obj = parseByTypeTree
|
||||
? new Material(objectReader, TypeTreeHelper.ReadTypeByteArray(objectReader.serializedType.m_Type, objectReader), jsonOptions)
|
||||
? new Material(objectReader, jsonOptions)
|
||||
: new Material(objectReader);
|
||||
break;
|
||||
case ClassIDType.Mesh:
|
||||
@@ -720,7 +720,7 @@ namespace AssetStudio
|
||||
break;
|
||||
case ClassIDType.MeshRenderer:
|
||||
obj = parseByTypeTree
|
||||
? new MeshRenderer(objectReader, TypeTreeHelper.ReadTypeByteArray(objectReader.serializedType.m_Type, objectReader), jsonOptions)
|
||||
? new MeshRenderer(objectReader, jsonOptions)
|
||||
: new MeshRenderer(objectReader);
|
||||
break;
|
||||
case ClassIDType.MonoBehaviour:
|
||||
@@ -748,7 +748,7 @@ namespace AssetStudio
|
||||
obj = new Shader(objectReader);
|
||||
break;
|
||||
case ClassIDType.SkinnedMeshRenderer when parseByTypeTree:
|
||||
obj = new SkinnedMeshRenderer(objectReader, TypeTreeHelper.ReadTypeByteArray(objectReader.serializedType.m_Type, objectReader), jsonOptions);
|
||||
obj = new SkinnedMeshRenderer(objectReader, jsonOptions);
|
||||
break;
|
||||
case ClassIDType.SkinnedMeshRenderer:
|
||||
obj = objectReader.version < (2, 1)
|
||||
@@ -766,12 +766,12 @@ namespace AssetStudio
|
||||
break;
|
||||
case ClassIDType.Texture2D:
|
||||
obj = parseByTypeTree
|
||||
? new Texture2D(objectReader, TypeTreeHelper.ReadTypeByteArray(objectReader.serializedType.m_Type, objectReader), jsonOptions)
|
||||
? new Texture2D(objectReader, jsonOptions)
|
||||
: new Texture2D(objectReader);
|
||||
break;
|
||||
case ClassIDType.Texture2DArray:
|
||||
obj = parseByTypeTree
|
||||
? new Texture2DArray(objectReader, TypeTreeHelper.ReadTypeByteArray(objectReader.serializedType.m_Type, objectReader), jsonOptions)
|
||||
? new Texture2DArray(objectReader, jsonOptions)
|
||||
: new Texture2DArray(objectReader);
|
||||
break;
|
||||
case ClassIDType.Transform:
|
||||
|
||||
@@ -1054,9 +1054,9 @@ namespace AssetStudio
|
||||
|
||||
public AnimationClip() { }
|
||||
|
||||
public AnimationClip(ObjectReader reader, byte[] type, JsonSerializerOptions jsonOptions, ObjectInfo objInfo) : base(reader)
|
||||
public AnimationClip(ObjectReader reader, JsonSerializerOptions jsonOptions, ObjectInfo objInfo) : base(reader)
|
||||
{
|
||||
var parsedAnimClip = JsonSerializer.Deserialize<AnimationClip>(type, jsonOptions);
|
||||
var parsedAnimClip = JsonSerializer.Deserialize<AnimationClip>(TypeTreeHelper.ReadTypeByteArray(reader), jsonOptions);
|
||||
m_AnimationType = parsedAnimClip.m_AnimationType;
|
||||
if (version >= 5)//5.0 and up
|
||||
{
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
}
|
||||
|
||||
m_AudioData = !string.IsNullOrEmpty(m_Source)
|
||||
? new ResourceReader(m_Source, assetsFile, m_Offset, m_Size)
|
||||
? new ResourceReader(m_Source, assetsFile, m_Offset, m_Size, type)
|
||||
: new ResourceReader(reader, reader.BaseStream.Position, m_Size);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,9 +95,9 @@ namespace AssetStudio
|
||||
|
||||
public Material() { }
|
||||
|
||||
public Material(ObjectReader reader, byte[] type, JsonSerializerOptions jsonOptions) : base(reader)
|
||||
public Material(ObjectReader reader, JsonSerializerOptions jsonOptions) : base(reader)
|
||||
{
|
||||
var parsedMaterial = JsonSerializer.Deserialize<Material>(type, jsonOptions);
|
||||
var parsedMaterial = JsonSerializer.Deserialize<Material>(TypeTreeHelper.ReadTypeByteArray(reader), jsonOptions);
|
||||
m_Shader = parsedMaterial.m_Shader;
|
||||
m_ValidKeywords = parsedMaterial.m_ValidKeywords;
|
||||
m_InvalidKeywords = parsedMaterial.m_InvalidKeywords;
|
||||
|
||||
@@ -859,8 +859,8 @@ namespace AssetStudio
|
||||
{
|
||||
if (m_VertexData.m_VertexCount > 0)
|
||||
{
|
||||
m_VertexData.m_DataSize = BigArrayPool<byte>.Shared.Rent((int) m_StreamData.size);
|
||||
var resourceReader = new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, m_StreamData.size);
|
||||
m_VertexData.m_DataSize = BigArrayPool<byte>.Shared.Rent((int)m_StreamData.size);
|
||||
var resourceReader = new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, m_StreamData.size, type);
|
||||
resourceReader.GetData(m_VertexData.m_DataSize);
|
||||
isStreamedDataSize = true;
|
||||
}
|
||||
|
||||
@@ -6,10 +6,10 @@ namespace AssetStudio
|
||||
{
|
||||
public MeshRenderer() { }
|
||||
|
||||
public MeshRenderer(ObjectReader reader, byte[] type, JsonSerializerOptions jsonOptions)
|
||||
public MeshRenderer(ObjectReader reader, JsonSerializerOptions jsonOptions)
|
||||
{
|
||||
this.CopyObjectDataFromReader(reader);
|
||||
var parsedAsset = JsonSerializer.Deserialize<MeshRenderer>(type, jsonOptions);
|
||||
var parsedAsset = JsonSerializer.Deserialize<MeshRenderer>(TypeTreeHelper.ReadTypeByteArray(reader), jsonOptions);
|
||||
m_GameObject = parsedAsset.m_GameObject;
|
||||
m_Materials = parsedAsset.m_Materials;
|
||||
m_StaticBatchInfo = parsedAsset.m_StaticBatchInfo;
|
||||
|
||||
@@ -12,12 +12,12 @@ namespace AssetStudio
|
||||
|
||||
public SkinnedMeshRenderer() { }
|
||||
|
||||
public SkinnedMeshRenderer(ObjectReader reader, byte[] type, JsonSerializerOptions jsonOptions)
|
||||
public SkinnedMeshRenderer(ObjectReader reader, JsonSerializerOptions jsonOptions)
|
||||
{
|
||||
this.CopyObjectDataFromReader(reader);
|
||||
var parsedAsset = version < (2, 1)
|
||||
? JsonSerializer.Deserialize<SkinnedMeshFilter>(type, jsonOptions).ToSkinnedMeshRenderer()
|
||||
: JsonSerializer.Deserialize<SkinnedMeshRenderer>(type, jsonOptions);
|
||||
? JsonSerializer.Deserialize<SkinnedMeshFilter>(TypeTreeHelper.ReadTypeByteArray(reader), jsonOptions).ToSkinnedMeshRenderer()
|
||||
: JsonSerializer.Deserialize<SkinnedMeshRenderer>(TypeTreeHelper.ReadTypeByteArray(reader), jsonOptions);
|
||||
m_GameObject = parsedAsset.m_GameObject;
|
||||
m_Materials = parsedAsset.m_Materials;
|
||||
m_StaticBatchInfo = parsedAsset.m_StaticBatchInfo;
|
||||
|
||||
@@ -52,15 +52,15 @@ namespace AssetStudio
|
||||
var offset = layer * m_CompleteImageSize + m_Texture2DArray.image_data.Offset;
|
||||
|
||||
image_data = !string.IsNullOrEmpty(m_StreamData?.path)
|
||||
? new ResourceReader(m_StreamData.path, assetsFile, offset, m_CompleteImageSize)
|
||||
? new ResourceReader(m_StreamData.path, assetsFile, offset, m_CompleteImageSize, type)
|
||||
: new ResourceReader(reader, offset, m_CompleteImageSize);
|
||||
|
||||
byteSize = (uint)(m_Width * m_Height) * 4;
|
||||
}
|
||||
|
||||
public Texture2D(ObjectReader reader, byte[] type, JsonSerializerOptions jsonOptions) : base(reader)
|
||||
public Texture2D(ObjectReader reader, JsonSerializerOptions jsonOptions) : base(reader)
|
||||
{
|
||||
var parsedTex2d = JsonSerializer.Deserialize<Texture2D>(type, jsonOptions);
|
||||
var parsedTex2d = JsonSerializer.Deserialize<Texture2D>(TypeTreeHelper.ReadTypeByteArray(reader), jsonOptions);
|
||||
m_Width = parsedTex2d.m_Width;
|
||||
m_Height = parsedTex2d.m_Height;
|
||||
m_CompleteImageSize = parsedTex2d.m_CompleteImageSize;
|
||||
@@ -76,7 +76,7 @@ namespace AssetStudio
|
||||
m_PlatformBlob = parsedTex2d.m_PlatformBlob ?? Array.Empty<byte>();
|
||||
|
||||
image_data = !string.IsNullOrEmpty(m_StreamData?.path)
|
||||
? new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, m_StreamData.size)
|
||||
? new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, m_StreamData.size, type)
|
||||
: new ResourceReader(reader, parsedTex2d.image_data.Offset, parsedTex2d.image_data.Size);
|
||||
}
|
||||
|
||||
@@ -186,7 +186,7 @@ namespace AssetStudio
|
||||
}
|
||||
|
||||
image_data = !string.IsNullOrEmpty(m_StreamData?.path)
|
||||
? new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, m_StreamData.size)
|
||||
? new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, m_StreamData.size, type)
|
||||
: new ResourceReader(reader, reader.BaseStream.Position, image_data_size);
|
||||
}
|
||||
|
||||
|
||||
@@ -68,15 +68,15 @@ namespace AssetStudio
|
||||
}
|
||||
|
||||
image_data = !string.IsNullOrEmpty(m_StreamData?.path)
|
||||
? new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, (int)m_StreamData.size)
|
||||
? new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, (int)m_StreamData.size, type)
|
||||
: new ResourceReader(reader, reader.BaseStream.Position, image_data_size);
|
||||
|
||||
TextureList = new List<Texture2D>();
|
||||
}
|
||||
|
||||
public Texture2DArray(ObjectReader reader, byte[] type, JsonSerializerOptions jsonOptions) : base(reader)
|
||||
public Texture2DArray(ObjectReader reader, JsonSerializerOptions jsonOptions) : base(reader)
|
||||
{
|
||||
var parsedTex2dArray = JsonSerializer.Deserialize<Texture2DArray>(type, jsonOptions);
|
||||
var parsedTex2dArray = JsonSerializer.Deserialize<Texture2DArray>(TypeTreeHelper.ReadTypeByteArray(reader), jsonOptions);
|
||||
m_Width = parsedTex2dArray.m_Width;
|
||||
m_Height = parsedTex2dArray.m_Height;
|
||||
m_Depth = parsedTex2dArray.m_Depth;
|
||||
@@ -87,7 +87,7 @@ namespace AssetStudio
|
||||
m_StreamData = parsedTex2dArray.m_StreamData;
|
||||
|
||||
image_data = !string.IsNullOrEmpty(m_StreamData?.path)
|
||||
? new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, m_StreamData.size)
|
||||
? new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, m_StreamData.size, type)
|
||||
: new ResourceReader(reader, parsedTex2dArray.image_data.Offset, parsedTex2dArray.image_data.Size);
|
||||
|
||||
TextureList = new List<Texture2D>();
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
}
|
||||
|
||||
m_VideoData = !string.IsNullOrEmpty(m_ExternalResources.m_Source)
|
||||
? new ResourceReader(m_ExternalResources.m_Source, assetsFile, m_ExternalResources.m_Offset, m_ExternalResources.m_Size)
|
||||
? new ResourceReader(m_ExternalResources.m_Source, assetsFile, m_ExternalResources.m_Offset, m_ExternalResources.m_Size, type)
|
||||
: new ResourceReader(reader, reader.BaseStream.Position, m_ExternalResources.m_Size);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace AssetStudio
|
||||
|
||||
public ResourceReader() { }
|
||||
|
||||
public ResourceReader(string path, SerializedFile assetsFile, long offset, long size)
|
||||
public ResourceReader(string path, SerializedFile assetsFile, long offset, long size, ClassIDType type)
|
||||
{
|
||||
needSearch = true;
|
||||
this.path = path;
|
||||
@@ -30,6 +30,20 @@ namespace AssetStudio
|
||||
this.Offset = offset;
|
||||
this.size = size;
|
||||
this.Endian = assetsFile.reader.Endian;
|
||||
|
||||
if (assetsFile.version >= (6000, 6) && path.StartsWith("cah:/") && !Path.HasExtension(path)) //6000.6 and up
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
case ClassIDType.AudioClip:
|
||||
case ClassIDType.VideoClip:
|
||||
this.path += ".resource";
|
||||
break;
|
||||
default:
|
||||
this.path += ".resS";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public ResourceReader(EndianBinaryReader reader, long offset, long size)
|
||||
|
||||
@@ -256,7 +256,7 @@ namespace AssetStudio
|
||||
var objReader = new ObjectReader(reader, this, buildSettingsAsset);
|
||||
if (buildSettingsAsset.serializedType?.m_Type != null)
|
||||
{
|
||||
var settings = new BuildSettings(objReader, TypeTreeHelper.ReadTypeByteArray(objReader.serializedType.m_Type, objReader), Object.JsonOptions);
|
||||
var settings = new BuildSettings(objReader, TypeTreeHelper.ReadTypeByteArray(objReader), Object.JsonOptions);
|
||||
if (UnityVersion.TryParse(settings.m_Version, out var unityVer))
|
||||
{
|
||||
assetsManager.AutoLegacyVersion = unityVer.Major == 1 ? new UnityVersion(2, 1) : unityVer; //detected 1.x versions should mean unity-iphone
|
||||
@@ -451,16 +451,19 @@ namespace AssetStudio
|
||||
private void ReadTypeTreeHeader(FileReader typeTreeReader)
|
||||
{
|
||||
var typeTreeSign = typeTreeReader.ReadInt32(); //0x7474686d ("tthm")
|
||||
var serializedFileVersion = (SerializedFileFormatVersion)typeTreeReader.ReadInt32();
|
||||
|
||||
if (typeTreeSign != 0x7474686d)
|
||||
{
|
||||
Logger.Warning("Unknown TypeTree file format");
|
||||
}
|
||||
|
||||
if (serializedFileVersion != header.m_Version)
|
||||
var typeTreeVersion = typeTreeReader.ReadInt32();
|
||||
if (header.m_Version < SerializedFileFormatVersion.IndependentTypeTreeVersion) //6000.5.0a5 - 6000.7.0a6
|
||||
{
|
||||
Logger.Warning("Serialized file versions do not match");
|
||||
var serializedFileVersion = (SerializedFileFormatVersion)typeTreeVersion;
|
||||
if (serializedFileVersion != header.m_Version)
|
||||
{
|
||||
Logger.Warning("Serialized file versions do not match");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -81,5 +81,13 @@
|
||||
/// 6000.5.0a5 to x
|
||||
/// </summary>
|
||||
ExtractedTypeTreeSupport = 23,
|
||||
/// <summary>
|
||||
/// 6000.7.0a6 to x
|
||||
/// </summary>
|
||||
IndependentTypeTreeVersion = 24,
|
||||
/// <summary>
|
||||
/// 6000.7.0a6 to x
|
||||
/// </summary>
|
||||
SerializeReferenceRegistryFirst = 25,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,9 +201,9 @@ namespace AssetStudio
|
||||
reader.AlignStream();
|
||||
}
|
||||
|
||||
public static byte[] ReadTypeByteArray(TypeTree m_Types, ObjectReader reader)
|
||||
public static byte[] ReadTypeByteArray(ObjectReader reader)
|
||||
{
|
||||
var type = ReadType(m_Types, reader);
|
||||
var type = ReadType(reader.serializedType.m_Type, reader);
|
||||
var bytes = JsonSerializer.SerializeToUtf8Bytes(type, JsonOptions);
|
||||
type.Clear();
|
||||
return bytes;
|
||||
|
||||
Reference in New Issue
Block a user