support Unity 2017.3, Fixed #126

This commit is contained in:
Perfare 2018-01-03 04:24:17 +08:00
parent 40153f6f19
commit 17d2140909
6 changed files with 31 additions and 6 deletions

View File

@ -78,6 +78,15 @@ namespace Unity_Studio {
} }
} }
/// <summary>
/// 查找类似 [{&quot;Level&quot;:0,&quot;Type&quot;:&quot;string&quot;,&quot;Name&quot;:&quot;m_Name&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32769},{&quot;Level&quot;:1,&quot;Type&quot;:&quot;Array&quot;,&quot;Name&quot;:&quot;Array&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:16385},{&quot;Level&quot;:2,&quot;Type&quot;:&quot;int&quot;,&quot;Name&quot;:&quot;size&quot;,&quot;Size&quot;:4,&quot;Flag&quot;:1},{&quot;Level&quot;:2,&quot;Type&quot;:&quot;char&quot;,&quot;Name&quot;:&quot;data&quot;,&quot;Size&quot;:1,&quot;Flag&quot;:1},{&quot;Level&quot;:0,&quot;Type&quot;:&quot;SerializedShader&quot;,&quot;Name&quot;:&quot;m_ParsedForm&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32768},{&quot;Level&quot;:1,&quot;Type&quot;:&quot;SerializedProperties&quot;,&quot;Name&quot;:&quot;m_PropInfo&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32768},{&quot;Level&quot;:2,&quot;Type&quot;:&quot;vector&quot;,&quot;Name&quot;:&quot;m_Props&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32768},{&quot;Level&quot;:3,&quot;Type&quot;:&quot;Arr... 的本地化字符串。
/// </summary>
internal static string Shader20173 {
get {
return ResourceManager.GetString("Shader20173", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 [{&quot;Level&quot;:0,&quot;Type&quot;:&quot;string&quot;,&quot;Name&quot;:&quot;m_Name&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32769},{&quot;Level&quot;:1,&quot;Type&quot;:&quot;Array&quot;,&quot;Name&quot;:&quot;Array&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:16385},{&quot;Level&quot;:2,&quot;Type&quot;:&quot;int&quot;,&quot;Name&quot;:&quot;size&quot;,&quot;Size&quot;:4,&quot;Flag&quot;:1},{&quot;Level&quot;:2,&quot;Type&quot;:&quot;char&quot;,&quot;Name&quot;:&quot;data&quot;,&quot;Size&quot;:1,&quot;Flag&quot;:1},{&quot;Level&quot;:0,&quot;Type&quot;:&quot;SerializedShader&quot;,&quot;Name&quot;:&quot;m_ParsedForm&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32768},{&quot;Level&quot;:1,&quot;Type&quot;:&quot;SerializedProperties&quot;,&quot;Name&quot;:&quot;m_PropInfo&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32768},{&quot;Level&quot;:2,&quot;Type&quot;:&quot;vector&quot;,&quot;Name&quot;:&quot;m_Props&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32768},{&quot;Level&quot;:3,&quot;Type&quot;:&quot;Arr... 的本地化字符串。 /// 查找类似 [{&quot;Level&quot;:0,&quot;Type&quot;:&quot;string&quot;,&quot;Name&quot;:&quot;m_Name&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32769},{&quot;Level&quot;:1,&quot;Type&quot;:&quot;Array&quot;,&quot;Name&quot;:&quot;Array&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:16385},{&quot;Level&quot;:2,&quot;Type&quot;:&quot;int&quot;,&quot;Name&quot;:&quot;size&quot;,&quot;Size&quot;:4,&quot;Flag&quot;:1},{&quot;Level&quot;:2,&quot;Type&quot;:&quot;char&quot;,&quot;Name&quot;:&quot;data&quot;,&quot;Size&quot;:1,&quot;Flag&quot;:1},{&quot;Level&quot;:0,&quot;Type&quot;:&quot;SerializedShader&quot;,&quot;Name&quot;:&quot;m_ParsedForm&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32768},{&quot;Level&quot;:1,&quot;Type&quot;:&quot;SerializedProperties&quot;,&quot;Name&quot;:&quot;m_PropInfo&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32768},{&quot;Level&quot;:2,&quot;Type&quot;:&quot;vector&quot;,&quot;Name&quot;:&quot;m_Props&quot;,&quot;Size&quot;:-1,&quot;Flag&quot;:32768},{&quot;Level&quot;:3,&quot;Type&quot;:&quot;Arr... 的本地化字符串。
/// </summary> /// </summary>

File diff suppressed because one or more lines are too long

View File

@ -387,7 +387,11 @@ namespace Unity_Studio
} }
if (version[0] >= 3) if (version[0] >= 3)
{ {
m_SubMeshes[s].firstVertex = a_Stream.ReadUInt32(); if (version[0] > 2017 || (version[0] == 2017 && version[1] >= 3))//2017.3 and up
{
var baseVertex = a_Stream.ReadUInt32();
}
m_SubMeshes[s].firstVertex = a_Stream.ReadUInt32();
m_SubMeshes[s].vertexCount = a_Stream.ReadUInt32(); m_SubMeshes[s].vertexCount = a_Stream.ReadUInt32();
a_Stream.Position += 24; //Axis-Aligned Bounding Box a_Stream.Position += 24; //Axis-Aligned Bounding Box
} }
@ -465,8 +469,11 @@ namespace Unity_Studio
bool m_KeepIndices = a_Stream.ReadBoolean(); bool m_KeepIndices = a_Stream.ReadBoolean();
} }
a_Stream.AlignStream(4); a_Stream.AlignStream(4);
if (version[0] > 2017 || (version[0] == 2017 && version[1] >= 3))//2017.3 and up
int m_IndexBuffer_size = a_Stream.ReadInt32(); {
var m_IndexFormat = a_Stream.ReadInt32();
}
int m_IndexBuffer_size = a_Stream.ReadInt32();
if (m_Use16BitIndices) if (m_Use16BitIndices)
{ {

View File

@ -112,6 +112,12 @@ namespace Unity_Studio
} }
m_Name = a_Stream.ReadAlignedString(a_Stream.ReadInt32()); m_Name = a_Stream.ReadAlignedString(a_Stream.ReadInt32());
if (sourceFile.version[0] > 2017 || (sourceFile.version[0] == 2017 && sourceFile.version[1] >= 3))//2017.3 and up
{
var m_ForcedFallbackFormat = a_Stream.ReadInt32();
var m_DownscaleFallback = a_Stream.ReadBoolean();
a_Stream.AlignStream(4);
}
m_Width = a_Stream.ReadInt32(); m_Width = a_Stream.ReadInt32();
m_Height = a_Stream.ReadInt32(); m_Height = a_Stream.ReadInt32();
m_CompleteImageSize = a_Stream.ReadInt32(); m_CompleteImageSize = a_Stream.ReadInt32();
@ -137,7 +143,7 @@ namespace Unity_Studio
m_Aniso = a_Stream.ReadInt32(); m_Aniso = a_Stream.ReadInt32();
m_MipBias = a_Stream.ReadSingle(); m_MipBias = a_Stream.ReadSingle();
m_WrapMode = a_Stream.ReadInt32(); m_WrapMode = a_Stream.ReadInt32();
if (sourceFile.version[0] == 2017)//2017.x if (sourceFile.version[0] >= 2017)//2017.x and up
{ {
int m_WrapV = a_Stream.ReadInt32(); int m_WrapV = a_Stream.ReadInt32();
int m_WrapW = a_Stream.ReadInt32(); int m_WrapW = a_Stream.ReadInt32();

View File

@ -24,7 +24,7 @@ namespace Unity_Studio
var m_ProxyHeight = a_Stream.ReadUInt32(); var m_ProxyHeight = a_Stream.ReadUInt32();
var Width = a_Stream.ReadUInt32(); var Width = a_Stream.ReadUInt32();
var Height = a_Stream.ReadUInt32(); var Height = a_Stream.ReadUInt32();
if (sourceFile.version[0] == 2017)//2017.x if (sourceFile.version[0] >= 2017)//2017.x and up
{ {
var m_PixelAspecRatioNum = a_Stream.ReadUInt32(); var m_PixelAspecRatioNum = a_Stream.ReadUInt32();
var m_PixelAspecRatioDen = a_Stream.ReadUInt32(); var m_PixelAspecRatioDen = a_Stream.ReadUInt32();

View File

@ -169,7 +169,7 @@
<Compile Include="Unity Classes\Material.cs" /> <Compile Include="Unity Classes\Material.cs" />
<Compile Include="Unity Classes\Mesh.cs" /> <Compile Include="Unity Classes\Mesh.cs" />
<Compile Include="Unity Classes\GameObject.cs" /> <Compile Include="Unity Classes\GameObject.cs" />
<Compile Include="Unity Studio Classes\Helpers.cs" /> <Compile Include="Unity Studio Classes\helpers.cs" />
<Compile Include="Unity Classes\MonoBehaviour.cs" /> <Compile Include="Unity Classes\MonoBehaviour.cs" />
<Compile Include="Unity Classes\PlayerSettings.cs" /> <Compile Include="Unity Classes\PlayerSettings.cs" />
<Compile Include="Unity Classes\RectTransform.cs" /> <Compile Include="Unity Classes\RectTransform.cs" />