Merge branch 'master' of https://github.com/K0lb3/UnityPy

Author: K0lb3

UnityPy/files/BundleFile.py

@@ -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:
@@ -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.
@@ -116,19 +123,12 @@ def read_fs(self, reader: EndianBinaryReader):
         if self.dataflags & self.dataflags.UsesAssetBundleEncryption:
             self.decryptor = ArchiveStorageManager.ArchiveStorageDecryptor(reader)
 
-        # check if we need to align the reader
-        # - align to 16 bytes and check if all are 0
-        # - if not, reset the reader to the previous position
-        if self.version >= 7:
+        # if header version is 7 or later we need to align the reader
+        # for 2019.4.15 and later, version should be 7 and aligned
+        # but some games in these versions somehow has version 6 while aligned
+        if self.version >= 7 or (version[0] == 2019 and version >= (2019, 4, 15)):
             reader.align_stream(16)
             self._uses_block_alignment = True
-        elif version >= (2019, 4):
-            pre_align = reader.Position
-            align_data = reader.read((16 - pre_align % 16) % 16)
-            if any(align_data):
-                reader.Position = pre_align
-            else:
-                self._uses_block_alignment = True
 
         start = reader.Position
         if self.dataflags & ArchiveFlags.BlocksInfoAtTheEnd:  # kArchiveBlocksInfoAtTheEnd

UnityPy/files/SerializedFile.py

@@ -414,7 +414,7 @@ def save(self, packer: Optional[str] = None) -> bytes:
 
         # ReadObjects
         meta_writer.write_int(len(self.objects))
-        for obj in self.objects.values():
+        for obj in sorted(self.objects.values(), key=lambda x: x.path_id):
             obj.write(header, meta_writer, data_writer)
             data_writer.align_stream(8)
 

UnityPy/helpers/TypeTreeGenerator.py

@@ -30,8 +30,10 @@ def load_local_game(self, root_dir: str):
         if "GameAssembly.dll" in root_files:
             ga_fp = os.path.join(root_dir, "GameAssembly.dll")
             gm_fp = os.path.join(data_dir, "il2cpp_data", "Metadata", "global-metadata.dat")
-            ga_raw = open(ga_fp, "rb").read()
-            gm_raw = open(gm_fp, "rb").read()
+            with open(ga_fp, "rb") as f:
+                ga_raw = f.read()
+            with open(gm_fp, "rb") as f:
+                gm_raw = f.read()
             self.load_il2cpp(ga_raw, gm_raw)
         else:
             self.load_local_dll_folder(os.path.join(data_dir, "Managed"))

UnityPy/helpers/UnityVersion.py

@@ -77,18 +77,15 @@ def from_str(cls, version: str):
     def __repr__(self) -> str:
         return f"UnityVersion {self.major}.{self.minor}{self.type_str}{self.type_number}"
 
-    def __getitem__(self, idx: int) -> int:
-        if idx == 0:
-            return self.major
-        elif idx == 1:
-            return self.minor
-        elif idx == 2:
-            return self.build
-        elif idx == 3:
-            return self.type.value
-        elif idx == 4:
-            return self.type_number
-        raise IndexError("Invalid UnityVersion index")
+    def __getitem__(self, idx: Union[int, slice]) -> Union[int, Tuple[int, ...]]:
+        values = (
+            self.major,
+            self.minor,
+            self.build,
+            self.type.value,
+            self.type_number,
+        )
+        return values[idx]
 
     def as_tuple(self) -> Tuple[int, int, int, int, int]:
         return (self.major, self.minor, self.build, self.type.value, self.type_number)