This commit is contained in:
aozhiwei 2024-04-26 15:26:31 +08:00
parent 665c9a26a2
commit ca53f58ac6
4 changed files with 23 additions and 2 deletions

View File

@ -8,10 +8,23 @@ namespace mt
class BattleBasicAttribute; class BattleBasicAttribute;
const int SHOT_HAND_RIGHT = 0;
const int SHOT_HAND_LEFT = 1;
struct HeroShotAnimationOther
{
int hand = 0;
int t = 0;
float x = 0.0f;
float y = 0.0f;
float z = 0.0f;
};
struct HeroShotAnimation struct HeroShotAnimation
{ {
int id = 0; int id = 0;
int t = 0; int t = 0;
int is_other = 0;
float r_x = 0; float r_x = 0;
float r_y = 0; float r_y = 0;
@ -33,6 +46,7 @@ namespace mt
float p5_y = 0; float p5_y = 0;
float p5_z = 0; float p5_z = 0;
std::vector<HeroShotAnimationOther> other_list;
}; };
DECLARE_ID_TABLE(Hero, mtb::Hero, DECLARE_ID_TABLE(Hero, mtb::Hero,
@ -47,7 +61,9 @@ namespace mt
bool HasDrop() const { return !_dead_drop.empty();}; bool HasDrop() const { return !_dead_drop.empty();};
std::tuple<int, int> _pve_score; std::tuple<int, int> _pve_score;
std::map<int, HeroShotAnimation> shot_animations; std::map<int, HeroShotAnimation> shot_animations;
std::map<int, HeroShotAnimation> other_shot_animations;
std::vector<int> _drop_list; std::vector<int> _drop_list;
std::vector<int> _other_keys;
void Init1(); void Init1();
static void StaticPostInit(); static void StaticPostInit();

View File

@ -53,6 +53,7 @@ namespace mtb
const std::string bt() const { return bt_; }; const std::string bt() const { return bt_; };
const std::string drop() const { return drop_; }; const std::string drop() const { return drop_; };
const std::string new_bt() const { return new_bt_; }; const std::string new_bt() const { return new_bt_; };
const std::string other_key_time() const { return other_key_time_; };
bool has_id() const { return __flags__.test(0);}; bool has_id() const { return __flags__.test(0);};
bool has_radius() const { return __flags__.test(1);}; bool has_radius() const { return __flags__.test(1);};
@ -97,6 +98,7 @@ namespace mtb
bool has_bt() const { return __flags__.test(40);}; bool has_bt() const { return __flags__.test(40);};
bool has_drop() const { return __flags__.test(41);}; bool has_drop() const { return __flags__.test(41);};
bool has_new_bt() const { return __flags__.test(42);}; bool has_new_bt() const { return __flags__.test(42);};
bool has_other_key_time() const { return __flags__.test(43);};
protected: protected:
@ -143,9 +145,10 @@ namespace mtb
std::string bt_; std::string bt_;
std::string drop_; std::string drop_;
std::string new_bt_; std::string new_bt_;
std::string other_key_time_;
public: public:
std::bitset<43> __flags__; std::bitset<44> __flags__;
}; };
}; };

View File

@ -388,7 +388,7 @@ namespace mtb
{ {
std::shared_ptr<a8::reflect::Class> meta_class = nullptr; std::shared_ptr<a8::reflect::Class> meta_class = nullptr;
if (!meta_class) { if (!meta_class) {
meta_class = std::make_shared<a8::reflect::Class>("Hero", 43, 0); meta_class = std::make_shared<a8::reflect::Class>("Hero", 44, 0);
meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(Hero, id_)); meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(Hero, id_));
meta_class->SetSimpleField(1, "radius", a8::reflect::ET_FLOAT, my_offsetof2(Hero, radius_)); meta_class->SetSimpleField(1, "radius", a8::reflect::ET_FLOAT, my_offsetof2(Hero, radius_));
meta_class->SetSimpleField(2, "move_speed", a8::reflect::ET_FLOAT, my_offsetof2(Hero, move_speed_)); meta_class->SetSimpleField(2, "move_speed", a8::reflect::ET_FLOAT, my_offsetof2(Hero, move_speed_));
@ -432,6 +432,7 @@ namespace mtb
meta_class->SetSimpleField(40, "bt", a8::reflect::ET_STRING, my_offsetof2(Hero, bt_)); meta_class->SetSimpleField(40, "bt", a8::reflect::ET_STRING, my_offsetof2(Hero, bt_));
meta_class->SetSimpleField(41, "drop", a8::reflect::ET_STRING, my_offsetof2(Hero, drop_)); meta_class->SetSimpleField(41, "drop", a8::reflect::ET_STRING, my_offsetof2(Hero, drop_));
meta_class->SetSimpleField(42, "new_bt", a8::reflect::ET_STRING, my_offsetof2(Hero, new_bt_)); meta_class->SetSimpleField(42, "new_bt", a8::reflect::ET_STRING, my_offsetof2(Hero, new_bt_));
meta_class->SetSimpleField(43, "other_key_time", a8::reflect::ET_STRING, my_offsetof2(Hero, other_key_time_));
} }
return meta_class; return meta_class;
} }

View File

@ -326,6 +326,7 @@ message Hero
optional string drop = 71; optional string drop = 71;
optional string new_bt = 72; optional string new_bt = 72;
optional string other_key_time = 73;
} }
message Robot message Robot