Skip to content

Commit f311314

Browse files
committed
1.10.6 - fix Sprite bones for good
fixes K0lb3#182
1 parent 99c240c commit f311314

4 files changed

Lines changed: 33 additions & 16 deletions

File tree

‎UnityPy/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "1.10.5"
1+
__version__ = "1.10.6"
22

33
from .environment import Environment
44
from .helpers.ArchiveStorageManager import set_assetbundle_decrypt_key

‎UnityPy/classes/Sprite.py‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,7 @@ def __init__(self, reader):
5050

5151
if version >= (2018,): # 2018 and up
5252
m_BonesSize = reader.read_int()
53-
# TODO: might occur in earlier 2020 versions - 2020.3.13 reported
54-
if version >= (
55-
2020,
56-
3,
57-
):
58-
self.m_Bones = [SpriteBone(self.reader) for _ in range(m_BonesSize)]
59-
else:
60-
self.m_Bones = [reader.read_vector2_array() for _ in range(m_BonesSize)]
53+
self.m_Bones = [SpriteBone(self.reader) for _ in range(m_BonesSize)]
6154

6255
def save(self, writer: EndianBinaryWriter = None):
6356
if writer is None:
@@ -96,12 +89,8 @@ def save(self, writer: EndianBinaryWriter = None):
9689

9790
if version >= (2018,): # 2018 and up
9891
writer.write_int(len(self.m_Bones))
99-
if version >= (2020, 3):
100-
for bone in self.m_Bones:
101-
bone.save(writer)
102-
else:
103-
for bone in self.m_Bones:
104-
writer.write_vector2_array(bone)
92+
for bone in self.m_Bones:
93+
bone.save(writer, version)
10594

10695
self.set_raw_data(writer.bytes)
10796

@@ -241,14 +230,28 @@ class SpriteBone:
241230

242231
def __init__(self, reader: EndianBinaryReader) -> None:
243232
self.name = reader.read_aligned_string()
233+
234+
if reader.version >= (2021,):
235+
self.guid = reader.read_aligned_string()
236+
244237
self.position = reader.read_vector3()
245238
self.rotation = reader.read_quaternion()
246239
self.length = reader.read_float()
247240
self.parentId = reader.read_int()
248241

249-
def save(self, writer: EndianBinaryWriter):
242+
if reader.version >= (2021,):
243+
self.color = reader.read_color_uint()
244+
245+
def save(self, writer: EndianBinaryWriter, version):
250246
writer.write_aligned_string(self.name)
247+
248+
if version >= (2021,):
249+
writer.write_aligned_string(self.guid)
250+
251251
writer.write_vector3(self.position)
252252
writer.write_quaternion(self.rotation)
253253
writer.write_float(self.length)
254254
writer.write_int(self.parentId)
255+
256+
if version >= (2021,):
257+
writer.write_color_uint(self.color)

‎UnityPy/streams/EndianBinaryReader.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,14 @@ def read_rectangle_f(self) -> Rectangle:
178178
self.read_float(), self.read_float(), self.read_float(), self.read_float()
179179
)
180180

181+
def read_color_uint(self):
182+
r = self.read_u_byte()
183+
g = self.read_u_byte()
184+
b = self.read_u_byte()
185+
a = self.read_u_byte()
186+
187+
return Color(r / 255.0, g / 255.0, b / 255.0, a / 255.0)
188+
181189
def read_color4(self) -> Color:
182190
return Color(
183191
self.read_float(), self.read_float(), self.read_float(), self.read_float()

‎UnityPy/streams/EndianBinaryWriter.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@ def write_rectangle_f(self, value: Rectangle):
123123
self.write_float(value.width)
124124
self.write_float(value.height)
125125

126+
def write_color_uint(self, value: Color):
127+
self.write_u_byte(value.R * 255)
128+
self.write_u_byte(value.G * 255)
129+
self.write_u_byte(value.B * 255)
130+
self.write_u_byte(value.A * 255)
131+
126132
def write_color4(self, value: Color):
127133
self.write_float(value.R)
128134
self.write_float(value.G)

0 commit comments

Comments
 (0)