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

Fixed #652

Browse Source
This commit is contained in:
Perfare 2021-01-15 02:12:54 +08:00
parent d7f652d572
commit 7ed5345b1b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
AssetStudio/BundleFile.cs
View File

@ -45,12 +45,19 @@ namespace AssetStudio
{ {
m_Header = new Header(); m_Header = new Header();
m_Header.signature = reader.ReadStringToNull(); m_Header.signature = reader.ReadStringToNull();
m_Header.version = reader.ReadUInt32();
m_Header.unityVersion = reader.ReadStringToNull();
m_Header.unityRevision = reader.ReadStringToNull();
switch (m_Header.signature) switch (m_Header.signature)
{ {
case "UnityArchive": case "UnityArchive":
break; //TODO break; //TODO
case "UnityWeb": case "UnityWeb":
case "UnityRaw": case "UnityRaw":
if (m_Header.version == 6)
{
goto case "UnityFS";
}
ReadHeaderAndBlocksInfo(reader); ReadHeaderAndBlocksInfo(reader);
using (var blocksStream = CreateBlocksStream(path)) using (var blocksStream = CreateBlocksStream(path))
{ {
@ -73,16 +80,13 @@ namespace AssetStudio
private void ReadHeaderAndBlocksInfo(EndianBinaryReader reader) private void ReadHeaderAndBlocksInfo(EndianBinaryReader reader)
{ {
var isCompressed = m_Header.signature == "UnityWeb"; var isCompressed = m_Header.signature == "UnityWeb";
m_Header.version = reader.ReadUInt32();
m_Header.unityVersion = reader.ReadStringToNull();
m_Header.unityRevision = reader.ReadStringToNull();
if (m_Header.version >= 4) if (m_Header.version >= 4)
{ {
var hash = reader.ReadBytes(16); var hash = reader.ReadBytes(16);
var crc = reader.ReadUInt32(); var crc = reader.ReadUInt32();
} }
var minimumStreamedBytes = reader.ReadUInt32(); var minimumStreamedBytes = reader.ReadUInt32();
var headerSize = reader.ReadUInt32(); m_Header.size = reader.ReadUInt32();
var numberOfLevelsToDownloadBeforeStreaming = reader.ReadUInt32(); var numberOfLevelsToDownloadBeforeStreaming = reader.ReadUInt32();
var levelCount = reader.ReadInt32(); var levelCount = reader.ReadInt32();
m_BlocksInfo = new StorageBlock[1]; m_BlocksInfo = new StorageBlock[1];
@ -107,7 +111,7 @@ namespace AssetStudio
{ {
var fileInfoHeaderSize = reader.ReadUInt32(); var fileInfoHeaderSize = reader.ReadUInt32();
} }
reader.Position = headerSize; reader.Position = m_Header.size;
} }
private Stream CreateBlocksStream(string path) private Stream CreateBlocksStream(string path)
@ -188,13 +192,14 @@ namespace AssetStudio
private void ReadHeader(EndianBinaryReader reader) private void ReadHeader(EndianBinaryReader reader)
{ {
m_Header.version = reader.ReadUInt32();
m_Header.unityVersion = reader.ReadStringToNull();
m_Header.unityRevision = reader.ReadStringToNull();
m_Header.size = reader.ReadInt64(); m_Header.size = reader.ReadInt64();
m_Header.compressedBlocksInfoSize = reader.ReadUInt32(); m_Header.compressedBlocksInfoSize = reader.ReadUInt32();
m_Header.uncompressedBlocksInfoSize = reader.ReadUInt32(); m_Header.uncompressedBlocksInfoSize = reader.ReadUInt32();
m_Header.flags = reader.ReadUInt32(); m_Header.flags = reader.ReadUInt32();
if (m_Header.signature != "UnityFS")
{
reader.ReadByte();
}
} }
private void ReadBlocksInfoAndDirectory(EndianBinaryReader reader) private void ReadBlocksInfoAndDirectory(EndianBinaryReader reader)