diff --git a/server/gameserver/mtb/Hero.h b/server/gameserver/mtb/Hero.h index 164c31f5..589d1abc 100644 --- a/server/gameserver/mtb/Hero.h +++ b/server/gameserver/mtb/Hero.h @@ -11,8 +11,6 @@ namespace mtb a8::reflect::Class* GetClass() const; int id() const { return id_; }; - float move_offset_x() const { return move_offset_x_; }; - float move_offset_y() const { return move_offset_y_; }; float radius() const { return radius_; }; int move_speed() const { return move_speed_; }; int jump_speed() const { return jump_speed_; }; @@ -25,14 +23,7 @@ namespace mtb const std::string volume() const { return volume_; }; int level() const { return level_; }; int race() const { return race_; }; - int active_skill() const { return active_skill_; }; - int passive_skill() const { return passive_skill_; }; - int exp() const { return exp_; }; - int dead_exp() const { return dead_exp_; }; - int killer_exp() const { return killer_exp_; }; - int revive_time() const { return revive_time_; }; const std::string name() const { return name_; }; - int normal_skill() const { return normal_skill_; }; float hit_offset_x() const { return hit_offset_x_; }; float hit_offset_y() const { return hit_offset_y_; }; float hit_radius() const { return hit_radius_; }; @@ -61,60 +52,49 @@ namespace mtb float defence_ratio() const { return defence_ratio_; }; bool has_id() const { return __flags__.test(0);}; - bool has_move_offset_x() const { return __flags__.test(1);}; - bool has_move_offset_y() const { return __flags__.test(2);}; - bool has_radius() const { return __flags__.test(3);}; - bool has_move_speed() const { return __flags__.test(4);}; - bool has_jump_speed() const { return __flags__.test(5);}; - bool has_move_speed3() const { return __flags__.test(6);}; - bool has_shot_speed() const { return __flags__.test(7);}; - bool has_aiming_speed() const { return __flags__.test(8);}; - bool has_move_speed4() const { return __flags__.test(9);}; - bool has_reload_speed() const { return __flags__.test(10);}; - bool has_useitem_speed() const { return __flags__.test(11);}; - bool has_volume() const { return __flags__.test(12);}; - bool has_level() const { return __flags__.test(13);}; - bool has_race() const { return __flags__.test(14);}; - bool has_active_skill() const { return __flags__.test(15);}; - bool has_passive_skill() const { return __flags__.test(16);}; - bool has_exp() const { return __flags__.test(17);}; - bool has_dead_exp() const { return __flags__.test(18);}; - bool has_killer_exp() const { return __flags__.test(19);}; - bool has_revive_time() const { return __flags__.test(20);}; - bool has_name() const { return __flags__.test(21);}; - bool has_normal_skill() const { return __flags__.test(22);}; - bool has_hit_offset_x() const { return __flags__.test(23);}; - bool has_hit_offset_y() const { return __flags__.test(24);}; - bool has_hit_radius() const { return __flags__.test(25);}; - bool has_ai_script() const { return __flags__.test(26);}; - bool has_init_buffs() const { return __flags__.test(27);}; - bool has_default_weapon() const { return __flags__.test(28);}; - bool has_dead_drop() const { return __flags__.test(29);}; - bool has_delay_delete() const { return __flags__.test(30);}; - bool has_ai() const { return __flags__.test(31);}; - bool has_delay_remove() const { return __flags__.test(32);}; - bool has_skinlist() const { return __flags__.test(33);}; - bool has_pre_appear_effect() const { return __flags__.test(34);}; - bool has_pve_score() const { return __flags__.test(35);}; - bool has_hp() const { return __flags__.test(36);}; - bool has_damage() const { return __flags__.test(37);}; - bool has_defence() const { return __flags__.test(38);}; - bool has_crit_atk() const { return __flags__.test(39);}; - bool has_crit_atk_ratio() const { return __flags__.test(40);}; - bool has_miss() const { return __flags__.test(41);}; - bool has_miss_damage_ruduce() const { return __flags__.test(42);}; - bool has_skill1list() const { return __flags__.test(43);}; - bool has_skill2list() const { return __flags__.test(44);}; - bool has_skill3list() const { return __flags__.test(45);}; - bool has_hp_ratio() const { return __flags__.test(46);}; - bool has_damage_ratio() const { return __flags__.test(47);}; - bool has_defence_ratio() const { return __flags__.test(48);}; + bool has_radius() const { return __flags__.test(1);}; + bool has_move_speed() const { return __flags__.test(2);}; + bool has_jump_speed() const { return __flags__.test(3);}; + bool has_move_speed3() const { return __flags__.test(4);}; + bool has_shot_speed() const { return __flags__.test(5);}; + bool has_aiming_speed() const { return __flags__.test(6);}; + bool has_move_speed4() const { return __flags__.test(7);}; + bool has_reload_speed() const { return __flags__.test(8);}; + bool has_useitem_speed() const { return __flags__.test(9);}; + bool has_volume() const { return __flags__.test(10);}; + bool has_level() const { return __flags__.test(11);}; + bool has_race() const { return __flags__.test(12);}; + bool has_name() const { return __flags__.test(13);}; + bool has_hit_offset_x() const { return __flags__.test(14);}; + bool has_hit_offset_y() const { return __flags__.test(15);}; + bool has_hit_radius() const { return __flags__.test(16);}; + bool has_ai_script() const { return __flags__.test(17);}; + bool has_init_buffs() const { return __flags__.test(18);}; + bool has_default_weapon() const { return __flags__.test(19);}; + bool has_dead_drop() const { return __flags__.test(20);}; + bool has_delay_delete() const { return __flags__.test(21);}; + bool has_ai() const { return __flags__.test(22);}; + bool has_delay_remove() const { return __flags__.test(23);}; + bool has_skinlist() const { return __flags__.test(24);}; + bool has_pre_appear_effect() const { return __flags__.test(25);}; + bool has_pve_score() const { return __flags__.test(26);}; + bool has_hp() const { return __flags__.test(27);}; + bool has_damage() const { return __flags__.test(28);}; + bool has_defence() const { return __flags__.test(29);}; + bool has_crit_atk() const { return __flags__.test(30);}; + bool has_crit_atk_ratio() const { return __flags__.test(31);}; + bool has_miss() const { return __flags__.test(32);}; + bool has_miss_damage_ruduce() const { return __flags__.test(33);}; + bool has_skill1list() const { return __flags__.test(34);}; + bool has_skill2list() const { return __flags__.test(35);}; + bool has_skill3list() const { return __flags__.test(36);}; + bool has_hp_ratio() const { return __flags__.test(37);}; + bool has_damage_ratio() const { return __flags__.test(38);}; + bool has_defence_ratio() const { return __flags__.test(39);}; protected: int id_ = 0; - float move_offset_x_ = 0.0f; - float move_offset_y_ = 0.0f; float radius_ = 0.0f; int move_speed_ = 0; int jump_speed_ = 0; @@ -127,14 +107,7 @@ namespace mtb std::string volume_; int level_ = 0; int race_ = 0; - int active_skill_ = 0; - int passive_skill_ = 0; - int exp_ = 0; - int dead_exp_ = 0; - int killer_exp_ = 0; - int revive_time_ = 0; std::string name_; - int normal_skill_ = 0; float hit_offset_x_ = 0.0f; float hit_offset_y_ = 0.0f; float hit_radius_ = 0.0f; @@ -163,7 +136,7 @@ namespace mtb float defence_ratio_ = 0.0f; public: - std::bitset<49> __flags__; + std::bitset<40> __flags__; }; }; diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc index ac4b1558..b9f0cfbc 100644 --- a/server/gameserver/mtb/mtb.all.cc +++ b/server/gameserver/mtb/mtb.all.cc @@ -293,56 +293,47 @@ namespace mtb { a8::reflect::Class* meta_class = nullptr; if (!meta_class) { - meta_class = new a8::reflect::Class("Hero", 49, 0); + meta_class = new a8::reflect::Class("Hero", 40, 0); meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(Hero, id_)); - meta_class->SetSimpleField(1, "move_offset_x", a8::reflect::ET_FLOAT, my_offsetof2(Hero, move_offset_x_)); - meta_class->SetSimpleField(2, "move_offset_y", a8::reflect::ET_FLOAT, my_offsetof2(Hero, move_offset_y_)); - meta_class->SetSimpleField(3, "radius", a8::reflect::ET_FLOAT, my_offsetof2(Hero, radius_)); - meta_class->SetSimpleField(4, "move_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, move_speed_)); - meta_class->SetSimpleField(5, "jump_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, jump_speed_)); - meta_class->SetSimpleField(6, "move_speed3", a8::reflect::ET_INT32, my_offsetof2(Hero, move_speed3_)); - meta_class->SetSimpleField(7, "shot_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, shot_speed_)); - meta_class->SetSimpleField(8, "aiming_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, aiming_speed_)); - meta_class->SetSimpleField(9, "move_speed4", a8::reflect::ET_INT32, my_offsetof2(Hero, move_speed4_)); - meta_class->SetSimpleField(10, "reload_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, reload_speed_)); - meta_class->SetSimpleField(11, "useitem_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, useitem_speed_)); - meta_class->SetSimpleField(12, "volume", a8::reflect::ET_STRING, my_offsetof2(Hero, volume_)); - meta_class->SetSimpleField(13, "level", a8::reflect::ET_INT32, my_offsetof2(Hero, level_)); - meta_class->SetSimpleField(14, "race", a8::reflect::ET_INT32, my_offsetof2(Hero, race_)); - meta_class->SetSimpleField(15, "active_skill", a8::reflect::ET_INT32, my_offsetof2(Hero, active_skill_)); - meta_class->SetSimpleField(16, "passive_skill", a8::reflect::ET_INT32, my_offsetof2(Hero, passive_skill_)); - meta_class->SetSimpleField(17, "exp", a8::reflect::ET_INT32, my_offsetof2(Hero, exp_)); - meta_class->SetSimpleField(18, "dead_exp", a8::reflect::ET_INT32, my_offsetof2(Hero, dead_exp_)); - meta_class->SetSimpleField(19, "killer_exp", a8::reflect::ET_INT32, my_offsetof2(Hero, killer_exp_)); - meta_class->SetSimpleField(20, "revive_time", a8::reflect::ET_INT32, my_offsetof2(Hero, revive_time_)); - meta_class->SetSimpleField(21, "name", a8::reflect::ET_STRING, my_offsetof2(Hero, name_)); - meta_class->SetSimpleField(22, "normal_skill", a8::reflect::ET_INT32, my_offsetof2(Hero, normal_skill_)); - meta_class->SetSimpleField(23, "hit_offset_x", a8::reflect::ET_FLOAT, my_offsetof2(Hero, hit_offset_x_)); - meta_class->SetSimpleField(24, "hit_offset_y", a8::reflect::ET_FLOAT, my_offsetof2(Hero, hit_offset_y_)); - meta_class->SetSimpleField(25, "hit_radius", a8::reflect::ET_FLOAT, my_offsetof2(Hero, hit_radius_)); - meta_class->SetSimpleField(26, "ai_script", a8::reflect::ET_STRING, my_offsetof2(Hero, ai_script_)); - meta_class->SetSimpleField(27, "init_buffs", a8::reflect::ET_STRING, my_offsetof2(Hero, init_buffs_)); - meta_class->SetSimpleField(28, "default_weapon", a8::reflect::ET_INT32, my_offsetof2(Hero, default_weapon_)); - meta_class->SetSimpleField(29, "dead_drop", a8::reflect::ET_STRING, my_offsetof2(Hero, dead_drop_)); - meta_class->SetSimpleField(30, "delay_delete", a8::reflect::ET_INT32, my_offsetof2(Hero, delay_delete_)); - meta_class->SetSimpleField(31, "ai", a8::reflect::ET_INT32, my_offsetof2(Hero, ai_)); - meta_class->SetSimpleField(32, "delay_remove", a8::reflect::ET_INT32, my_offsetof2(Hero, delay_remove_)); - meta_class->SetSimpleField(33, "skinlist", a8::reflect::ET_INT32, my_offsetof2(Hero, skinlist_)); - meta_class->SetSimpleField(34, "pre_appear_effect", a8::reflect::ET_STRING, my_offsetof2(Hero, pre_appear_effect_)); - meta_class->SetSimpleField(35, "pve_score", a8::reflect::ET_STRING, my_offsetof2(Hero, pve_score_)); - meta_class->SetSimpleField(36, "hp", a8::reflect::ET_INT32, my_offsetof2(Hero, hp_)); - meta_class->SetSimpleField(37, "damage", a8::reflect::ET_INT32, my_offsetof2(Hero, damage_)); - meta_class->SetSimpleField(38, "defence", a8::reflect::ET_INT32, my_offsetof2(Hero, defence_)); - meta_class->SetSimpleField(39, "crit_atk", a8::reflect::ET_FLOAT, my_offsetof2(Hero, crit_atk_)); - meta_class->SetSimpleField(40, "crit_atk_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Hero, crit_atk_ratio_)); - meta_class->SetSimpleField(41, "miss", a8::reflect::ET_FLOAT, my_offsetof2(Hero, miss_)); - meta_class->SetSimpleField(42, "miss_damage_ruduce", a8::reflect::ET_FLOAT, my_offsetof2(Hero, miss_damage_ruduce_)); - meta_class->SetSimpleField(43, "skill1list", a8::reflect::ET_INT32, my_offsetof2(Hero, skill1list_)); - meta_class->SetSimpleField(44, "skill2list", a8::reflect::ET_INT32, my_offsetof2(Hero, skill2list_)); - meta_class->SetSimpleField(45, "skill3list", a8::reflect::ET_INT32, my_offsetof2(Hero, skill3list_)); - meta_class->SetSimpleField(46, "hp_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Hero, hp_ratio_)); - meta_class->SetSimpleField(47, "damage_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Hero, damage_ratio_)); - meta_class->SetSimpleField(48, "defence_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Hero, defence_ratio_)); + meta_class->SetSimpleField(1, "radius", a8::reflect::ET_FLOAT, my_offsetof2(Hero, radius_)); + meta_class->SetSimpleField(2, "move_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, move_speed_)); + meta_class->SetSimpleField(3, "jump_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, jump_speed_)); + meta_class->SetSimpleField(4, "move_speed3", a8::reflect::ET_INT32, my_offsetof2(Hero, move_speed3_)); + meta_class->SetSimpleField(5, "shot_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, shot_speed_)); + meta_class->SetSimpleField(6, "aiming_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, aiming_speed_)); + meta_class->SetSimpleField(7, "move_speed4", a8::reflect::ET_INT32, my_offsetof2(Hero, move_speed4_)); + meta_class->SetSimpleField(8, "reload_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, reload_speed_)); + meta_class->SetSimpleField(9, "useitem_speed", a8::reflect::ET_INT32, my_offsetof2(Hero, useitem_speed_)); + meta_class->SetSimpleField(10, "volume", a8::reflect::ET_STRING, my_offsetof2(Hero, volume_)); + meta_class->SetSimpleField(11, "level", a8::reflect::ET_INT32, my_offsetof2(Hero, level_)); + meta_class->SetSimpleField(12, "race", a8::reflect::ET_INT32, my_offsetof2(Hero, race_)); + meta_class->SetSimpleField(13, "name", a8::reflect::ET_STRING, my_offsetof2(Hero, name_)); + meta_class->SetSimpleField(14, "hit_offset_x", a8::reflect::ET_FLOAT, my_offsetof2(Hero, hit_offset_x_)); + meta_class->SetSimpleField(15, "hit_offset_y", a8::reflect::ET_FLOAT, my_offsetof2(Hero, hit_offset_y_)); + meta_class->SetSimpleField(16, "hit_radius", a8::reflect::ET_FLOAT, my_offsetof2(Hero, hit_radius_)); + meta_class->SetSimpleField(17, "ai_script", a8::reflect::ET_STRING, my_offsetof2(Hero, ai_script_)); + meta_class->SetSimpleField(18, "init_buffs", a8::reflect::ET_STRING, my_offsetof2(Hero, init_buffs_)); + meta_class->SetSimpleField(19, "default_weapon", a8::reflect::ET_INT32, my_offsetof2(Hero, default_weapon_)); + meta_class->SetSimpleField(20, "dead_drop", a8::reflect::ET_STRING, my_offsetof2(Hero, dead_drop_)); + meta_class->SetSimpleField(21, "delay_delete", a8::reflect::ET_INT32, my_offsetof2(Hero, delay_delete_)); + meta_class->SetSimpleField(22, "ai", a8::reflect::ET_INT32, my_offsetof2(Hero, ai_)); + meta_class->SetSimpleField(23, "delay_remove", a8::reflect::ET_INT32, my_offsetof2(Hero, delay_remove_)); + meta_class->SetSimpleField(24, "skinlist", a8::reflect::ET_INT32, my_offsetof2(Hero, skinlist_)); + meta_class->SetSimpleField(25, "pre_appear_effect", a8::reflect::ET_STRING, my_offsetof2(Hero, pre_appear_effect_)); + meta_class->SetSimpleField(26, "pve_score", a8::reflect::ET_STRING, my_offsetof2(Hero, pve_score_)); + meta_class->SetSimpleField(27, "hp", a8::reflect::ET_INT32, my_offsetof2(Hero, hp_)); + meta_class->SetSimpleField(28, "damage", a8::reflect::ET_INT32, my_offsetof2(Hero, damage_)); + meta_class->SetSimpleField(29, "defence", a8::reflect::ET_INT32, my_offsetof2(Hero, defence_)); + meta_class->SetSimpleField(30, "crit_atk", a8::reflect::ET_FLOAT, my_offsetof2(Hero, crit_atk_)); + meta_class->SetSimpleField(31, "crit_atk_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Hero, crit_atk_ratio_)); + meta_class->SetSimpleField(32, "miss", a8::reflect::ET_FLOAT, my_offsetof2(Hero, miss_)); + meta_class->SetSimpleField(33, "miss_damage_ruduce", a8::reflect::ET_FLOAT, my_offsetof2(Hero, miss_damage_ruduce_)); + meta_class->SetSimpleField(34, "skill1list", a8::reflect::ET_INT32, my_offsetof2(Hero, skill1list_)); + meta_class->SetSimpleField(35, "skill2list", a8::reflect::ET_INT32, my_offsetof2(Hero, skill2list_)); + meta_class->SetSimpleField(36, "skill3list", a8::reflect::ET_INT32, my_offsetof2(Hero, skill3list_)); + meta_class->SetSimpleField(37, "hp_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Hero, hp_ratio_)); + meta_class->SetSimpleField(38, "damage_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Hero, damage_ratio_)); + meta_class->SetSimpleField(39, "defence_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Hero, defence_ratio_)); } return meta_class; } diff --git a/server/tools/protobuild/mt.proto b/server/tools/protobuild/mt.proto index 39eabd95..50f1bd42 100755 --- a/server/tools/protobuild/mt.proto +++ b/server/tools/protobuild/mt.proto @@ -215,8 +215,6 @@ message Equip message Hero { optional int32 id = 1; //唯一id - optional float move_offset_x = 40; - optional float move_offset_y = 41; optional float radius = 2; //半径 optional int32 move_speed = 4; //移动速度 optional int32 jump_speed = 5; //跳伞速度 @@ -229,14 +227,7 @@ message Hero optional string volume = 12; //初始库存 optional int32 level = 13; optional int32 race = 14; - optional int32 active_skill = 15; - optional int32 passive_skill = 16; - optional int32 exp = 17; - optional int32 dead_exp = 18; - optional int32 killer_exp = 19; - optional int32 revive_time = 22; optional string name = 23; - optional int32 normal_skill = 24; optional float hit_offset_x = 42; optional float hit_offset_y = 43; optional float hit_radius = 25;