Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[deploy] minor fixes

This commit is contained in:
Nomango 2020-04-16 08:56:00 +08:00
parent 9fabadbdb8
commit ca884a59cd
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kiwano/2d/Actor.cpp
View File

@ -230,8 +230,14 @@ void Actor::DoSerialize(Serializer* serializer) const
void Actor::DoDeserialize(Deserializer* deserializer)
{
ObjectBase::DoDeserialize(deserializer);
(*deserializer) >> visible_ >> update_pausing_ >> cascade_opacity_ >> responsible_ >> z_order_ >> opacity_
>> anchor_ >> size_ >> transform_;
float opacity = 1.0f;
Transform transform;
(*deserializer) >> visible_ >> update_pausing_ >> cascade_opacity_ >> responsible_ >> z_order_ >> opacity >> anchor_
>> size_ >> transform;
SetOpacity(opacity);
SetTransform(transform);
}
bool Actor::HandleEvent(Event* evt)

10
src/kiwano/core/Serializable.h
View File

@ -233,17 +233,17 @@ public:
/// @brief 序列化为字符串
inline Vector<uint8_t> Serialize() const
{
Vector<uint8_t> result;
ByteSerializer serializer(result);
Vector<uint8_t> data;
ByteSerializer serializer(data);
this->DoSerialize(&serializer);
return result;
return data;
}
/// \~chinese
/// @brief 从字符串反序列化
inline void Deserialize(const Vector<uint8_t>& serialized)
inline void Deserialize(const Vector<uint8_t>& data)
{
ByteDeserializer deserializer(serialized);
ByteDeserializer deserializer(data);
this->DoDeserialize(&deserializer);
}