Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2025-01-11 20:39:29 +08:00
Code Issues Projects Releases Wiki Activity

(UnityAssetOpener): fixed.

Browse Source
This commit is contained in:
morkt 2017-12-15 01:56:33 +04:00
parent f071bef660
commit 33b78b5853
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ArcFormats/Unity/ArcASSET.cs
View File

@ -46,6 +46,10 @@ namespace GameRes.Formats.Unity
uint file_size = Binary.BigEndian (file.View.ReadUInt32 (4)); uint file_size = Binary.BigEndian (file.View.ReadUInt32 (4));
if (file_size != file.MaxOffset || header_size > file_size || 0 == header_size) if (file_size != file.MaxOffset || header_size > file_size || 0 == header_size)
return null; return null;
int format = Binary.BigEndian (file.View.ReadInt32 (8));
uint data_offset = Binary.BigEndian (file.View.ReadUInt32 (12));
if (format <= 0 || format > 0x100 || data_offset >= file_size || data_offset < header_size)
return null;
using (var stream = file.CreateStream()) using (var stream = file.CreateStream())
using (var input = new AssetReader (stream)) using (var input = new AssetReader (stream))
{ {
@ -170,7 +174,6 @@ namespace GameRes.Formats.Unity
Offset = tex.m_StreamData.Offset, Offset = tex.m_StreamData.Offset,
Size = tex.m_StreamData.Size, Size = tex.m_StreamData.Size,
Bundle = GetBundle (tex.m_StreamData.Path), Bundle = GetBundle (tex.m_StreamData.Path),
AssetObject = obj,
}; };
} }
break; break;
@ -187,7 +190,6 @@ namespace GameRes.Formats.Unity
Offset = clip.m_Offset, Offset = clip.m_Offset,
Size = (uint)clip.m_Size, Size = (uint)clip.m_Size,
Bundle = GetBundle (clip.m_Source), Bundle = GetBundle (clip.m_Source),
AssetObject = obj,
}; };
} }
break; break;
@ -201,7 +203,6 @@ namespace GameRes.Formats.Unity
Name = name, Name = name,
Offset = input.Position, Offset = input.Position,
Size = size, Size = size,
AssetObject = obj,
}; };
break; break;
} }
@ -210,14 +211,14 @@ namespace GameRes.Formats.Unity
entry = new AssetEntry { entry = new AssetEntry {
Offset = obj.Offset, Offset = obj.Offset,
Size = obj.Size, Size = obj.Size,
AssetObject = obj,
}; };
break; break;
} }
} }
if (entry != null) if (entry != null)
{ {
if (string.IsNullOrEmpty (entry.Name) entry.AssetObject = obj;
if (string.IsNullOrEmpty (entry.Name))
entry.Name = string.Format ("{0:D4} [{1}]", obj.PathId, obj.TypeId); entry.Name = string.Format ("{0:D4} [{1}]", obj.PathId, obj.TypeId);
else if (!used_names.Add (entry.Name)) else if (!used_names.Add (entry.Name))
entry.Name = string.Format ("{0}-{1}", entry.Name, obj.PathId); entry.Name = string.Format ("{0}-{1}", entry.Name, obj.PathId);