mirror of
https://github.com/aelurum/AssetStudio.git
synced 2026-11-15 19:28:48 -05:00
Move BuildType to UnityVersion class
This commit is contained in:
@@ -546,7 +546,7 @@ namespace AssetStudio
|
||||
|
||||
//Unity fixed it in 2017.3.1p1 and later versions
|
||||
if (version >= (2017, 4) //2017.4
|
||||
|| version == (2017, 3, 1) && buildType.IsPatch //fixed after 2017.3.1px
|
||||
|| version == (2017, 3, 1) && version.IsPatch //fixed after 2017.3.1px
|
||||
|| version == (2017, 3) && m_MeshCompression == 0)//2017.3.xfx with no compression
|
||||
{
|
||||
var m_IndexFormat = reader.ReadInt32();
|
||||
|
||||
@@ -14,7 +14,6 @@ namespace AssetStudio
|
||||
public long m_PathID;
|
||||
[JsonIgnore]
|
||||
public UnityVersion version;
|
||||
protected BuildType buildType;
|
||||
[JsonIgnore]
|
||||
public BuildTarget platform;
|
||||
[JsonConverter(typeof(JsonStringEnumConverter))]
|
||||
@@ -48,7 +47,6 @@ namespace AssetStudio
|
||||
type = reader.type;
|
||||
m_PathID = reader.m_PathID;
|
||||
version = reader.version;
|
||||
buildType = reader.buildType;
|
||||
platform = reader.platform;
|
||||
serializedType = reader.serializedType;
|
||||
classID = reader.classID;
|
||||
|
||||
@@ -214,7 +214,7 @@ namespace AssetStudio
|
||||
|
||||
m_PixelsToUnits = reader.ReadSingle();
|
||||
if (version >= (5, 4, 2)
|
||||
|| version == (5, 4, 1) && buildType.IsPatch && version.Build >= 3) //5.4.1p3 and up
|
||||
|| version == (5, 4, 1) && version.IsPatch && version.Build >= 3) //5.4.1p3 and up
|
||||
{
|
||||
m_Pivot = reader.ReadVector2();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user