mirror of
https://github.com/aelurum/AssetStudio.git
synced 2026-11-15 19:28:48 -05:00
Add support for Unity 6.5
This commit is contained in:
@@ -926,6 +926,7 @@ namespace AssetStudio
|
||||
public byte isPPtrCurve;
|
||||
public byte isIntCurve;
|
||||
public byte isSerializeReferenceCurve;
|
||||
public ushort metaData;
|
||||
|
||||
public GenericBinding() { }
|
||||
|
||||
@@ -953,6 +954,10 @@ namespace AssetStudio
|
||||
{
|
||||
isSerializeReferenceCurve = reader.ReadByte();
|
||||
}
|
||||
if ((!version.IsAlpha && version >= (6000, 5)) || (version.IsAlpha && version >= (6000, 5, 0, 7))) //6000.5.0a7 and up
|
||||
{
|
||||
metaData = reader.ReadUInt16();
|
||||
}
|
||||
reader.AlignStream();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -497,7 +497,13 @@ namespace AssetStudio
|
||||
}
|
||||
|
||||
m_DefaultState = reader.ReadUInt32();
|
||||
m_MotionSetCount = reader.ReadUInt32();
|
||||
m_MotionSetCount = reader.ReadUInt32(); //m_SynchronizedLayerCount from 2018.2
|
||||
|
||||
if (version >= (6000, 4))
|
||||
{
|
||||
var m_EvaluateTransitionsOnStart = reader.ReadBoolean();
|
||||
reader.AlignStream();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -604,6 +610,11 @@ namespace AssetStudio
|
||||
|
||||
public AnimatorController(ObjectReader reader) : base(reader)
|
||||
{
|
||||
if (reader.version >= (6000, 4))
|
||||
{
|
||||
var m_EvaluateTransitionsOnStart = reader.ReadBoolean();
|
||||
reader.AlignStream();
|
||||
}
|
||||
var m_ControllerSize = reader.ReadUInt32();
|
||||
var m_Controller = new ControllerConstant(reader);
|
||||
|
||||
|
||||
@@ -87,6 +87,7 @@ namespace AssetStudio
|
||||
public ushort[] indices;
|
||||
public Matrix4x4[] m_Bindpose;
|
||||
public BoneWeights4[] m_SourceSkin;
|
||||
public BlendShapeData m_BlendShapes;
|
||||
public Rectf textureRect;
|
||||
public Vector2 textureRectOffset;
|
||||
public Vector2 atlasRectOffset;
|
||||
@@ -154,6 +155,11 @@ namespace AssetStudio
|
||||
}
|
||||
}
|
||||
|
||||
if ((!version.IsAlpha && version >= (6000, 5)) || (version.IsAlpha && version >= (6000, 5, 0, 7))) //6000.5.0a7 and up
|
||||
{
|
||||
m_BlendShapes = new BlendShapeData(reader);
|
||||
}
|
||||
|
||||
textureRect = new Rectf(reader);
|
||||
textureRectOffset = reader.ReadVector2();
|
||||
if (version >= (5, 6)) //5.6 and up
|
||||
@@ -222,7 +228,7 @@ namespace AssetStudio
|
||||
}
|
||||
|
||||
m_Extrude = reader.ReadUInt32();
|
||||
if (version >= (5, 3)) //5.3 and up
|
||||
if (version.IsInRange((5, 3), (6000, 5))) //5.3 - 6000.4
|
||||
{
|
||||
m_IsPolygon = reader.ReadBoolean();
|
||||
reader.AlignStream();
|
||||
|
||||
@@ -46,9 +46,12 @@ namespace AssetStudio
|
||||
public sealed class SpriteAtlas : NamedObject
|
||||
{
|
||||
public List<PPtr<Sprite>> m_PackedSprites;
|
||||
public string[] m_PackedSpriteNamesToIndex;
|
||||
[JsonConverter(typeof(JsonConverterHelper.RenderDataMapConverter))]
|
||||
public Dictionary<KeyValuePair<Guid, long>, SpriteAtlasData> m_RenderDataMap;
|
||||
public string m_Tag;
|
||||
public bool m_IsVariant;
|
||||
public Guid m_Guid;
|
||||
|
||||
public SpriteAtlas(ObjectReader reader) : base(reader)
|
||||
{
|
||||
@@ -59,7 +62,7 @@ namespace AssetStudio
|
||||
m_PackedSprites.Add(new PPtr<Sprite>(reader));
|
||||
}
|
||||
|
||||
var m_PackedSpriteNamesToIndex = reader.ReadStringArray();
|
||||
m_PackedSpriteNamesToIndex = reader.ReadStringArray();
|
||||
|
||||
var m_RenderDataMapSize = reader.ReadInt32();
|
||||
m_RenderDataMap = new Dictionary<KeyValuePair<Guid, long>, SpriteAtlasData>();
|
||||
@@ -70,9 +73,14 @@ namespace AssetStudio
|
||||
var value = new SpriteAtlasData(reader);
|
||||
m_RenderDataMap.Add(new KeyValuePair<Guid, long>(first, second), value);
|
||||
}
|
||||
var m_Tag = reader.ReadAlignedString();
|
||||
m_Tag = reader.ReadAlignedString();
|
||||
m_IsVariant = reader.ReadBoolean();
|
||||
reader.AlignStream();
|
||||
|
||||
if ((!version.IsAlpha && version >= (6000, 5)) || (version.IsAlpha && version >= (6000, 5, 0, 4))) //6000.5.0a4 and up
|
||||
{
|
||||
m_Guid = new Guid(reader.ReadBytes(16));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user