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

fixed some bug

Browse Source
This commit is contained in:
Perfare 2016-09-02 12:50:55 +08:00
parent aeccee3fbc
commit f7948e58b4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Unity Studio/Unity Classes/PlayerSettings.cs
View File

@ -33,7 +33,7 @@ namespace Unity_Studio
if (sourceFile.version[0] == 5 && (sourceFile.version[1] > 2 || (sourceFile.version[1] == 2 && sourceFile.version[2] >= 1))) if (sourceFile.version[0] == 5 && (sourceFile.version[1] > 2 || (sourceFile.version[1] == 2 && sourceFile.version[2] >= 1)))
{ bool useOnDemandResources = a_Stream.ReadBoolean(); a_Stream.AlignStream(4); } { bool useOnDemandResources = a_Stream.ReadBoolean(); a_Stream.AlignStream(4); }
if (sourceFile.version[0] == 5 && sourceFile.version[1] < 3) if (sourceFile.version[0] < 5 || (sourceFile.version[0] == 5 && sourceFile.version[1] < 3))
{ int targetResolution = a_Stream.ReadInt32(); } { int targetResolution = a_Stream.ReadInt32(); }
if (sourceFile.version[0] == 3 && sourceFile.version[1] <= 1) { bool OverrideIPodMusic = a_Stream.ReadBoolean(); a_Stream.AlignStream(4); } if (sourceFile.version[0] == 3 && sourceFile.version[1] <= 1) { bool OverrideIPodMusic = a_Stream.ReadBoolean(); a_Stream.AlignStream(4); }

4
Unity Studio/Unity Classes/Texture2D.cs
View File

@ -144,10 +144,11 @@ namespace Unity_Studio
dwCaps += 0x400008; dwCaps += 0x400008;
} }
if((sourceFile.version[0] == 5 && sourceFile.version[1] >= 3) || sourceFile.version[0] > 5)//5.3.0 and up if (image_data_size == 0 && ((sourceFile.version[0] == 5 && sourceFile.version[1] >= 3) || sourceFile.version[0] > 5))//5.3.0 and up
{ {
offset = a_Stream.ReadUInt32(); offset = a_Stream.ReadUInt32();
size = a_Stream.ReadUInt32(); size = a_Stream.ReadUInt32();
image_data_size = (int)size;
path = a_Stream.ReadAlignedString(a_Stream.ReadInt32()); path = a_Stream.ReadAlignedString(a_Stream.ReadInt32());
} }
@ -155,7 +156,6 @@ namespace Unity_Studio
{ {
if (!string.IsNullOrEmpty(path)) if (!string.IsNullOrEmpty(path))
{ {
image_data_size = (int)size;
path = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), path.Replace("archive:/", "")); path = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), path.Replace("archive:/", ""));
if (File.Exists(path) || if (File.Exists(path) ||
File.Exists(path = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), Path.GetFileName(path)))) File.Exists(path = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), Path.GetFileName(path))))