Skip to content
Closed
Show file tree
Hide file tree
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/classes/AnimationClip.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from .NamedObject import NamedObject
from .PPtr import PPtr
from ..enums import ClassIDType
from ..enums import ClassIDType, makeClassID
from ..math import Quaternion, Vector3
from ..streams import EndianBinaryReader

Expand Down Expand Up @@ -225,7 +225,7 @@ def __init__(self, reader):
self.curve = AnimationCurve(reader, reader.read_float) # Float
self.attribute = reader.read_aligned_string()
self.path = reader.read_aligned_string()
self.classID = ClassIDType(reader.read_int())
self.classID = makeClassID(reader.read_int())
self.script = PPtr(reader) # MonoScript


Expand Down Expand Up @@ -496,9 +496,9 @@ def __init__(self, reader):
self.attribute = reader.read_u_int()
self.script = PPtr(reader) # Object
if version >= (5, 6): # 5.6 and up
self.typeID = ClassIDType(reader.read_int())
self.typeID = makeClassID(reader.read_int())
else:
self.typeID = ClassIDType(reader.read_u_short())
self.typeID = makeClassID(reader.read_u_short())
self.customType = reader.read_byte()
self.isPPtrCurve = reader.read_byte()
reader.align_stream()
Expand Down
33 changes: 26 additions & 7 deletions UnityPy/enums/BuildTarget.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,31 @@ class BuildTarget(IntEnum):
Switch = 38
NoTarget = -2

def __str__(self):
return self.name

def __format__(self, fmt):
return self.name

def __eq__(self, value):
if isinstance(value, str):
return self.name == value
elif isinstance(value, BuildTarget):
return self._value_ == value._value_
elif isinstance(value, int):
if self.has_value(value):
return self._value_ == value
return False
return self._value_ == value

@classmethod
def _missing_(cls, value):
ret = BuildTarget.UnknownPlatform
ret._value = value
return ret
def has_value(cls, value):
return value in cls._value2member_map_


@property
def value(self):
return getattr(self, "_value", self._value_)
def makeBuildTarget(_bt):
if isinstance(_bt, BuildTarget):
return _bt
elif BuildTarget.has_value(_bt):
return BuildTarget(_bt)
return _bt
32 changes: 23 additions & 9 deletions UnityPy/enums/ClassIDType.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,18 +375,32 @@ class ClassIDType(IntEnum):
def __str__(self):
return self.name

def __format__(self, fmt):
return self.name

def __eq__(self, value):
if isinstance(value, str):
return self.name == value
else:
return self.value == value
elif isinstance(value, ClassIDType):
return self._value_ == value._value_
elif isinstance(value, int):
if self.has_value(value):
return self._value_ == value
elif self._value_ == -1 and not self.has_value(value):
return True
return False
return self._value_ == value

@classmethod
def _missing_(cls, value):
ret = ClassIDType.UnknownType
ret._value = value
return ret
def has_value(cls, value):
return value in cls._value2member_map_


@property
def value(self):
return getattr(self, "_value", self._value_)
def makeClassID(_cid):
if isinstance(_cid, ClassIDType):
return _cid
elif _cid == -1:
return ClassIDType.UnknownType
elif ClassIDType.has_value(_cid):
return ClassIDType(_cid)
return _cid
4 changes: 2 additions & 2 deletions UnityPy/enums/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .Audio import AudioType, AudioCompressionFormat, AUDIO_TYPE_EXTEMSION
from .BuildTarget import BuildTarget
from .ClassIDType import ClassIDType
from .BuildTarget import BuildTarget, makeBuildTarget
from .ClassIDType import ClassIDType, makeClassID
from .FileType import FileType
from .TextureFormat import TextureFormat
from .SpriteMeshType import SpriteMeshType
Expand Down
4 changes: 2 additions & 2 deletions UnityPy/files/ObjectReader.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ..enums import ClassIDType
from ..enums import ClassIDType, makeClassID
from . import SerializedFile
from .. import classes
from ..streams import EndianBinaryReader, EndianBinaryWriter
Expand Down Expand Up @@ -67,7 +67,7 @@ def __init__(self, assets_file, reader: EndianBinaryReader):
self.serialized_type = typ
self.class_id = typ.class_id

self.type = ClassIDType(self.class_id)
self.type = makeClassID(self.class_id)

if header.version < 11:
self.is_destroyed = reader.read_u_short()
Expand Down
4 changes: 2 additions & 2 deletions UnityPy/files/SerializedFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys

from . import File, ObjectReader
from ..enums import BuildTarget, ClassIDType, CommonString
from ..enums import BuildTarget, makeBuildTarget, ClassIDType, CommonString
from ..streams import EndianBinaryReader, EndianBinaryWriter

RECURSION_LIMIT = sys.getrecursionlimit()
Expand Down Expand Up @@ -237,7 +237,7 @@ def __init__(self, reader: EndianBinaryReader, parent=None):

if header.version >= 8:
self._m_target_platform = reader.read_int()
self.target_platform = BuildTarget(self._m_target_platform)
self.target_platform = makeBuildTarget(self._m_target_platform)

if header.version >= 13:
self._enable_type_tree = reader.read_boolean()
Expand Down