@@ -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 )
0 commit comments