Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion UnityPy/files/BundleFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ def __init__(
if signature == "UnityArchive":
raise NotImplementedError("BundleFile - UnityArchive")
elif signature in ["UnityWeb", "UnityRaw"]:
m_DirectoryInfo, blocksReader = self.read_web_raw(reader)
if self.version == 6:
m_DirectoryInfo, blocksReader = self.read_fs(reader)
else:
m_DirectoryInfo, blocksReader = self.read_web_raw(reader)
elif signature == "UnityFS":
m_DirectoryInfo, blocksReader = self.read_fs(reader)
else:
Expand Down Expand Up @@ -98,6 +101,10 @@ def read_fs(self, reader: EndianBinaryReader):
uncompressedSize = reader.read_u_int()
dataflagsValue = reader.read_u_int()

# UnityWeb version 6
if self.signature != "UnityFS":
reader.read_byte()

version = self.parse_version()
# https://issuetracker.unity3d.com/issues/files-within-assetbundles-do-not-start-on-aligned-boundaries-breaking-patching-on-nintendo-switch
# Unity CN introduced encryption before the alignment fix was introduced.
Expand Down