mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-27 22:00:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Perfare 2018-09-25 22:30:59 +08:00
parent 99651a5d77
commit 61751eeb1b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AssetStudio/Classes/AnimationClip.cs
View File

@ -598,7 +598,7 @@ namespace AssetStudio
{ {
m_StreamedClip = new StreamedClip(reader); m_StreamedClip = new StreamedClip(reader);
m_DenseClip = new DenseClip(reader); m_DenseClip = new DenseClip(reader);
if ((version[0] > 4) || (version[0] == 4 && version[1] > 1) || (version[0] == 4 && version[1] == 1 && version[2] >= 5)) //4.1.5f1 and up if (version[0] > 4 || (version[0] == 4 && version[1] >= 3)) //4.3 and up
{ {
m_ConstantClip = new ConstantClip(reader); m_ConstantClip = new ConstantClip(reader);
} }
@ -676,7 +676,7 @@ namespace AssetStudio
int numIndices = reader.ReadInt32(); int numIndices = reader.ReadInt32();
m_IndexArray = reader.ReadInt32Array(numIndices); m_IndexArray = reader.ReadInt32Array(numIndices);
if ((version[0] < 4) || (version[0] == 4 && version[1] < 1) || (version[0] == 4 && version[1] == 1 && version[2] < 5)) //4.1.5f1 down if (version[0] < 4 || (version[0] == 4 && version[1] < 3)) //4.3 down
{ {
int numAdditionalCurveIndexs = reader.ReadInt32(); int numAdditionalCurveIndexs = reader.ReadInt32();
var m_AdditionalCurveIndexArray = new List<int>(numAdditionalCurveIndexs); var m_AdditionalCurveIndexArray = new List<int>(numAdditionalCurveIndexs);

4
AssetStudio/StudioClasses/Texture2DConverter.cs
View File

@ -967,7 +967,9 @@ namespace AssetStudio
IntPtr uncompressedData; IntPtr uncompressedData;
int uncompressedSize; int uncompressedSize;
bool result; bool result;
if (version[0] > 2017 || (version[0] == 2017 && version[1] >= 3)) //2017.3 and up if (version[0] > 2017 || (version[0] == 2017 && version[1] >= 3)
|| m_TextureFormat == TextureFormat.ETC_RGB4Crunched
|| m_TextureFormat == TextureFormat.ETC2_RGBA8Crunched) //2017.3 and up
{ {
result = DecompressUnityCRN(image_data, image_data_size, out uncompressedData, out uncompressedSize); result = DecompressUnityCRN(image_data, image_data_size, out uncompressedData, out uncompressedSize);
} }