From 61751eeb1b634348a3352dba2636a071415c47a0 Mon Sep 17 00:00:00 2001 From: Perfare Date: Tue, 25 Sep 2018 22:30:59 +0800 Subject: [PATCH] Fixes --- AssetStudio/Classes/AnimationClip.cs | 4 ++-- AssetStudio/StudioClasses/Texture2DConverter.cs | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/AssetStudio/Classes/AnimationClip.cs b/AssetStudio/Classes/AnimationClip.cs index bbd9bfc..224154d 100644 --- a/AssetStudio/Classes/AnimationClip.cs +++ b/AssetStudio/Classes/AnimationClip.cs @@ -598,7 +598,7 @@ namespace AssetStudio { m_StreamedClip = new StreamedClip(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); } @@ -676,7 +676,7 @@ namespace AssetStudio int numIndices = reader.ReadInt32(); 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(); var m_AdditionalCurveIndexArray = new List(numAdditionalCurveIndexs); diff --git a/AssetStudio/StudioClasses/Texture2DConverter.cs b/AssetStudio/StudioClasses/Texture2DConverter.cs index 635e524..fb7ec4f 100644 --- a/AssetStudio/StudioClasses/Texture2DConverter.cs +++ b/AssetStudio/StudioClasses/Texture2DConverter.cs @@ -967,7 +967,9 @@ namespace AssetStudio IntPtr uncompressedData; int uncompressedSize; 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); }