Skip to content

Commit 15f7d19

Browse files
authored
Disambiguate path_id collision using obj type. Change extract/export return type. (K0lb3#140)
* Disambiguate path_id collision using obj type * Pass asset_filter from extract_assets to export_obj (K0lb3#139) * Handle exportMonoBehavior for Object without serialized type or nodes (K0lb3#138) * Use obj.assets_file instead of .type to disambiguate .path_id
1 parent d1f9f97 commit 15f7d19

1 file changed

Lines changed: 18 additions & 14 deletions

File tree

‎UnityPy/tools/extractor.py‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def defaulted_export_index(type: ClassIDType):
131131
for obj in objects:
132132
if asset_filter is not None and not asset_filter(obj):
133133
continue
134-
if obj.path_id not in exported:
134+
if (obj.assets_file, obj.path_id) not in exported:
135135
exported.extend(
136136
export_obj(
137137
obj,
@@ -156,7 +156,7 @@ def exportTextAsset(obj: TextAsset, fp: str, extension: str = ".txt") -> List[in
156156
extension = ".txt"
157157
with open(f"{fp}{extension}", "wb") as f:
158158
f.write(obj.script)
159-
return [obj.path_id]
159+
return [(obj.assets_file, obj.path_id)]
160160

161161

162162
def exportFont(obj: Font, fp: str, extension: str = "") -> List[int]:
@@ -167,23 +167,23 @@ def exportFont(obj: Font, fp: str, extension: str = "") -> List[int]:
167167
extension = ".otf"
168168
with open(f"{fp}{extension}", "wb") as f:
169169
f.write(obj.m_FontData)
170-
return [obj.path_id]
170+
return [(obj.assets_file, obj.path_id)]
171171

172172

173173
def exportMesh(obj: Mesh, fp: str, extension=".obj") -> List[int]:
174174
if not extension:
175175
extension = ".obj"
176176
with open(f"{fp}{extension}", "wt", encoding="utf8", newline="") as f:
177177
f.write(obj.export())
178-
return [obj.path_id]
178+
return [(obj.assets_file, obj.path_id)]
179179

180180

181181
def exporShader(obj: Shader, fp: str, extension=".txt") -> List[int]:
182182
if not extension:
183183
extension = ".txt"
184184
with open(f"{fp}{extension}", "wt", encoding="utf8", newline="") as f:
185185
f.write(obj.export())
186-
return [obj.path_id]
186+
return [(obj.assets_file, obj.path_id)]
187187

188188

189189
def exportMonoBehaviour(
@@ -224,7 +224,7 @@ def exportMonoBehaviour(
224224
export = obj.raw_data
225225
with open(f"{fp}{extension}", "wb") as f:
226226
f.write(export)
227-
return [obj.path_id]
227+
return [(obj.assets_file, obj.path_id)]
228228

229229

230230
def exportAudioClip(obj: AudioClip, fp: str, extension: str = "") -> List[int]:
@@ -239,18 +239,22 @@ def exportAudioClip(obj: AudioClip, fp: str, extension: str = "") -> List[int]:
239239
for name, clip_data in samples.items():
240240
with open(os.path.join(fp, f"{name}.wav"), "wb") as f:
241241
f.write(clip_data)
242-
return [obj.path_id]
242+
return [(obj.assets_file, obj.path_id)]
243243

244244

245245
def exportSprite(obj: Sprite, fp: str, extension: str = ".png") -> List[int]:
246246
if not extension:
247247
extension = ".png"
248248
obj.image.save(f"{fp}{extension}")
249-
return [
250-
obj.path_id,
251-
obj.m_RD.texture.path_id,
252-
getattr(obj.m_RD.alphaTexture, "path_id", None),
249+
exported = [
250+
(obj.assets_file, obj.path_id),
251+
(obj.m_RD.texture.assets_file, obj.m_RD.texture.path_id),
253252
]
253+
alpha_assets_file = getattr(obj.m_RD.alphaTexture, "assets_file", None)
254+
alpha_path_id = getattr(obj.m_RD.alphaTexture, "path_id", None)
255+
if alpha_path_id and alpha_assets_file:
256+
exported.append((alpha_assets_file, alpha_path_id))
257+
return exported
254258

255259

256260
def exportTexture2D(obj: Texture2D, fp: str, extension: str = ".png") -> List[int]:
@@ -259,19 +263,19 @@ def exportTexture2D(obj: Texture2D, fp: str, extension: str = ".png") -> List[in
259263
if obj.m_Width:
260264
# textures can be empty
261265
obj.image.save(f"{fp}{extension}")
262-
return [obj.path_id]
266+
return [(obj.assets_file, obj.path_id)]
263267

264268

265269
def exportGameObject(obj: GameObject, fp: str, extension: str = "") -> List[int]:
266-
exported = [obj.path_id]
270+
exported = [(obj.assets_file, obj.path_id)]
267271
refs = crawl_obj(obj)
268272
if refs:
269273
os.makedirs(fp, exist_ok=True)
270274
for ref_id, ref in refs.items():
271275
# Don't export already exported objects a second time
272276
# and prevent circular calls by excluding other GameObjects.
273277
# The other GameObjects were already exported in the this call.
274-
if ref_id in exported or ref_id.type == ClassIDType.GameObject:
278+
if (ref.assets_file, ref_id) in exported or ref.type == ClassIDType.GameObject:
275279
continue
276280
try:
277281
exported.extend(export_obj(ref, fp, True, True))

0 commit comments

Comments
 (0)