mirror of
https://github.com/aelurum/AssetStudio.git
synced 2025-05-27 22:00:23 -04:00
support Unity 2017.3, Fixed #126
This commit is contained in:
parent
40153f6f19
commit
17d2140909
9
Unity Studio/ShaderResource.Designer.cs
generated
9
Unity Studio/ShaderResource.Designer.cs
generated
@ -78,6 +78,15 @@ namespace Unity_Studio {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 [{"Level":0,"Type":"string","Name":"m_Name","Size":-1,"Flag":32769},{"Level":1,"Type":"Array","Name":"Array","Size":-1,"Flag":16385},{"Level":2,"Type":"int","Name":"size","Size":4,"Flag":1},{"Level":2,"Type":"char","Name":"data","Size":1,"Flag":1},{"Level":0,"Type":"SerializedShader","Name":"m_ParsedForm","Size":-1,"Flag":32768},{"Level":1,"Type":"SerializedProperties","Name":"m_PropInfo","Size":-1,"Flag":32768},{"Level":2,"Type":"vector","Name":"m_Props","Size":-1,"Flag":32768},{"Level":3,"Type":"Arr... 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
internal static string Shader20173 {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Shader20173", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 [{"Level":0,"Type":"string","Name":"m_Name","Size":-1,"Flag":32769},{"Level":1,"Type":"Array","Name":"Array","Size":-1,"Flag":16385},{"Level":2,"Type":"int","Name":"size","Size":4,"Flag":1},{"Level":2,"Type":"char","Name":"data","Size":1,"Flag":1},{"Level":0,"Type":"SerializedShader","Name":"m_ParsedForm","Size":-1,"Flag":32768},{"Level":1,"Type":"SerializedProperties","Name":"m_PropInfo","Size":-1,"Flag":32768},{"Level":2,"Type":"vector","Name":"m_Props","Size":-1,"Flag":32768},{"Level":3,"Type":"Arr... 的本地化字符串。
|
/// 查找类似 [{"Level":0,"Type":"string","Name":"m_Name","Size":-1,"Flag":32769},{"Level":1,"Type":"Array","Name":"Array","Size":-1,"Flag":16385},{"Level":2,"Type":"int","Name":"size","Size":4,"Flag":1},{"Level":2,"Type":"char","Name":"data","Size":1,"Flag":1},{"Level":0,"Type":"SerializedShader","Name":"m_ParsedForm","Size":-1,"Flag":32768},{"Level":1,"Type":"SerializedProperties","Name":"m_PropInfo","Size":-1,"Flag":32768},{"Level":2,"Type":"vector","Name":"m_Props","Size":-1,"Flag":32768},{"Level":3,"Type":"Arr... 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
File diff suppressed because one or more lines are too long
@ -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)
|
||||||
{
|
{
|
||||||
|
@ -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();
|
||||||
|
@ -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();
|
||||||
|
@ -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" />
|
||||||
|
Loading…
Reference in New Issue
Block a user