mirror of
https://github.com/aelurum/AssetStudio.git
synced 2025-06-03 00:58:13 -04:00
support 2021.2
This commit is contained in:
parent
2ef52afe1e
commit
d08b78c2cf
@ -31,6 +31,10 @@ namespace AssetStudio
|
|||||||
if (version[0] >= 5) //5.0 and up
|
if (version[0] >= 5) //5.0 and up
|
||||||
{
|
{
|
||||||
var m_LinearVelocityBlending = reader.ReadBoolean();
|
var m_LinearVelocityBlending = reader.ReadBoolean();
|
||||||
|
if (version[0] > 2021 || (version[0] == 2021 && version[1] >= 2)) //2021.2 and up
|
||||||
|
{
|
||||||
|
var m_StabilizeFeet = reader.ReadBoolean();
|
||||||
|
}
|
||||||
reader.AlignStream();
|
reader.AlignStream();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -583,7 +583,7 @@ namespace AssetStudio
|
|||||||
m_BlobIndex = reader.ReadUInt32();
|
m_BlobIndex = reader.ReadUInt32();
|
||||||
m_Channels = new ParserBindChannels(reader);
|
m_Channels = new ParserBindChannels(reader);
|
||||||
|
|
||||||
if (version[0] >= 2019) //2019 and up
|
if ((version[0] >= 2019 && version[0] < 2021) || (version[0] == 2021 && version[1] < 2)) //2019 ~2021.1
|
||||||
{
|
{
|
||||||
var m_GlobalKeywordIndices = reader.ReadUInt16Array();
|
var m_GlobalKeywordIndices = reader.ReadUInt16Array();
|
||||||
reader.AlignStream();
|
reader.AlignStream();
|
||||||
@ -742,6 +742,7 @@ namespace AssetStudio
|
|||||||
public string m_Name;
|
public string m_Name;
|
||||||
public string m_TextureName;
|
public string m_TextureName;
|
||||||
public SerializedTagMap m_Tags;
|
public SerializedTagMap m_Tags;
|
||||||
|
public ushort[] m_SerializedKeywordStateMask;
|
||||||
|
|
||||||
public SerializedPass(ObjectReader reader)
|
public SerializedPass(ObjectReader reader)
|
||||||
{
|
{
|
||||||
@ -758,10 +759,13 @@ namespace AssetStudio
|
|||||||
reader.AlignStream();
|
reader.AlignStream();
|
||||||
m_Platforms = reader.ReadUInt8Array();
|
m_Platforms = reader.ReadUInt8Array();
|
||||||
reader.AlignStream();
|
reader.AlignStream();
|
||||||
m_LocalKeywordMask = reader.ReadUInt16Array();
|
if (version[0] < 2021 || (version[0] == 2021 && version[1] < 2)) //2021.1 and down
|
||||||
reader.AlignStream();
|
{
|
||||||
m_GlobalKeywordMask = reader.ReadUInt16Array();
|
m_LocalKeywordMask = reader.ReadUInt16Array();
|
||||||
reader.AlignStream();
|
reader.AlignStream();
|
||||||
|
m_GlobalKeywordMask = reader.ReadUInt16Array();
|
||||||
|
reader.AlignStream();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int numIndices = reader.ReadInt32();
|
int numIndices = reader.ReadInt32();
|
||||||
@ -793,6 +797,11 @@ namespace AssetStudio
|
|||||||
m_Name = reader.ReadAlignedString();
|
m_Name = reader.ReadAlignedString();
|
||||||
m_TextureName = reader.ReadAlignedString();
|
m_TextureName = reader.ReadAlignedString();
|
||||||
m_Tags = new SerializedTagMap(reader);
|
m_Tags = new SerializedTagMap(reader);
|
||||||
|
if (version[0] > 2021 || (version[0] == 2021 && version[1] >= 2)) //2021.2 and up
|
||||||
|
{
|
||||||
|
m_SerializedKeywordStateMask = reader.ReadUInt16Array();
|
||||||
|
reader.AlignStream();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -859,6 +868,8 @@ namespace AssetStudio
|
|||||||
{
|
{
|
||||||
public SerializedProperties m_PropInfo;
|
public SerializedProperties m_PropInfo;
|
||||||
public SerializedSubShader[] m_SubShaders;
|
public SerializedSubShader[] m_SubShaders;
|
||||||
|
public string[] m_KeywordNames;
|
||||||
|
public byte[] m_KeywordFlags;
|
||||||
public string m_Name;
|
public string m_Name;
|
||||||
public string m_CustomEditorName;
|
public string m_CustomEditorName;
|
||||||
public string m_FallbackName;
|
public string m_FallbackName;
|
||||||
@ -879,6 +890,13 @@ namespace AssetStudio
|
|||||||
m_SubShaders[i] = new SerializedSubShader(reader);
|
m_SubShaders[i] = new SerializedSubShader(reader);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (version[0] > 2021 || (version[0] == 2021 && version[1] >= 2)) //2021.2 and up
|
||||||
|
{
|
||||||
|
m_KeywordNames = reader.ReadStringArray();
|
||||||
|
m_KeywordFlags = reader.ReadUInt8Array();
|
||||||
|
reader.AlignStream();
|
||||||
|
}
|
||||||
|
|
||||||
m_Name = reader.ReadAlignedString();
|
m_Name = reader.ReadAlignedString();
|
||||||
m_CustomEditorName = reader.ReadAlignedString();
|
m_CustomEditorName = reader.ReadAlignedString();
|
||||||
m_FallbackName = reader.ReadAlignedString();
|
m_FallbackName = reader.ReadAlignedString();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user