Skip to content
Merged
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
8 changes: 4 additions & 4 deletions UnityPy/tools/extractor.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ def export_obj(
return []

if append_name:
fp = os.path.join(fp, obj.m_Name if getattr(obj, "m_Name") else obj.type.name)
fp = os.path.join(fp, obj.m_Name if getattr(obj, "m_Name") else obj.object_reader.type.name)

fp, extension = os.path.splitext(fp)

if append_path_id:
fp = f"{fp}_{obj.path_id}"
fp = f"{fp}_{obj.object_reader.path_id}"

# export
return export_func(obj, fp, extension)
Expand Down Expand Up @@ -261,10 +261,10 @@ def exportTexture2D(obj: Texture2D, fp: str, extension: str = ".png") -> List[Tu
if obj.m_Width:
# textures can be empty
obj.image.save(f"{fp}{extension}")
return [(obj.assets_file, obj.path_id)]
return [(obj.assets_file, obj.object_reader.path_id)]

def exportGameObject(obj: GameObject, fp: str, extension: str = "") -> List[Tuple[SerializedFile, int]]:
exported = [(obj.assets_file, obj.path_id)]
exported = [(obj.assets_file, obj.object_reader.path_id)]
refs = crawl_obj(obj)
if refs:
os.makedirs(fp, exist_ok=True)
Expand Down