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

K0lb3 · Sep 30, 2023 · 2da63aa · 2da63aa
2 parents 910b7c1 + 52ff053
commit 2da63aa
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -208,7 +208,7 @@ from PIL import Image
 for obj in env.objects:
     if obj.type.name == "Texture2D":
         # export texture
-        data = image.read()
+        data = obj.read()
         data.image.save(path)
         # edit texture
         fp = os.path.join(replace_dir, data.name)

diff --git a/UnityPy/export/SpriteHelper.py b/UnityPy/export/SpriteHelper.py
@@ -66,10 +66,10 @@ def get_image_from_sprite(m_Sprite) -> Image.Image:
     if settings_raw.packed == 1:
         rotation = settings_raw.packingRotation
         if rotation == SpritePackingRotation.kSPRFlipHorizontal:
-            sprite_image = sprite_image.transpose(Image.FLIP_TOP_BOTTOM)
+            sprite_image = sprite_image.transpose(Image.FLIP_LEFT_RIGHT)
         # spriteImage = RotateFlip(RotateFlipType.RotateNoneFlipX)
         elif rotation == SpritePackingRotation.kSPRFlipVertical:
-            sprite_image = sprite_image.transpose(Image.FLIP_LEFT_RIGHT)
+            sprite_image = sprite_image.transpose(Image.FLIP_TOP_BOTTOM)
         # spriteImage.RotateFlip(RotateFlipType.RotateNoneFlipY)
         elif rotation == SpritePackingRotation.kSPRRotate180:
             sprite_image = sprite_image.transpose(Image.ROTATE_180)

diff --git a/UnityPy/files/ObjectReader.py b/UnityPy/files/ObjectReader.py
@@ -139,11 +139,7 @@ def set_raw_data(self, data):
 
     @property
     def container(self):
-        return (
-            self.assets_file._container[self.path_id]
-            if self.path_id in self.assets_file._container
-            else None
-        )
+        return self.assets_file._container.path_dict.get(self.path_id)
 
     @property
     def Position(self):

diff --git a/UnityPy/files/SerializedFile.py b/UnityPy/files/SerializedFile.py
@@ -653,7 +653,7 @@ def __init__(self, container) -> None:
         self.container = container
         # support for getitem
         self.container_dict = {key: value.asset for key, value in container}
-        self.path_dict = {value.asset.path_id: value.asset for key, value in container}
+        self.path_dict = {value.asset.path_id: key for key, value in container}
 
     def items(self):
         return ((key, value.asset) for key, value in self.container)

diff --git a/UnityPy/tools/extractor.py b/UnityPy/tools/extractor.py
@@ -16,9 +16,8 @@
     GameObject,
 )
 from UnityPy.enums.ClassIDType import ClassIDType
-from typing import Union, List, Dict
+from typing import Union, List, Dict, Callable
 from pathlib import Path
-from collections.abc import Callable
 
 
 def export_obj(