From 06630b8240ac07dd5e2cda11051951fa475403df Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 27 Dec 2022 17:36:44 +0800 Subject: [PATCH] 1 --- server/gameserver/creature.h | 1 + server/gameserver/mt/Hero.h | 2 +- server/gameserver/mtb/{Player.h => Hero.h} | 2 +- server/gameserver/mtb/mtb.all.cc | 104 ++++++++++----------- server/tools/protobuild/mt.proto | 2 +- 5 files changed, 56 insertions(+), 55 deletions(-) rename server/gameserver/mtb/{Player.h => Hero.h} (99%) diff --git a/server/gameserver/creature.h b/server/gameserver/creature.h index b3520bee..86086e05 100644 --- a/server/gameserver/creature.h +++ b/server/gameserver/creature.h @@ -218,6 +218,7 @@ class Creature : public MoveableEntity void DecInventory(int slot_id, int num); std::array& GetInventoryData() { return inventory_; }; virtual void _UpdateMove(int speed) {}; + virtual void Goto(); bool HasSpecMove(); void _UpdateSpecMove(); diff --git a/server/gameserver/mt/Hero.h b/server/gameserver/mt/Hero.h index 86e466c1..0bf01e4b 100644 --- a/server/gameserver/mt/Hero.h +++ b/server/gameserver/mt/Hero.h @@ -33,7 +33,7 @@ namespace mt }; - DECLARE_ID_TABLE(Hero, mtb::Player, + DECLARE_ID_TABLE(Hero, mtb::Hero, "hero@hero.csv", "id") public: diff --git a/server/gameserver/mtb/Player.h b/server/gameserver/mtb/Hero.h similarity index 99% rename from server/gameserver/mtb/Player.h rename to server/gameserver/mtb/Hero.h index debb1c86..164c31f5 100644 --- a/server/gameserver/mtb/Player.h +++ b/server/gameserver/mtb/Hero.h @@ -5,7 +5,7 @@ namespace mtb { - class Player + class Hero { public: diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc index 1d673bfe..dfca90af 100644 --- a/server/gameserver/mtb/mtb.all.cc +++ b/server/gameserver/mtb/mtb.all.cc @@ -10,7 +10,7 @@ #include "mtb/Item.h" #include "mtb/Equip.h" #include "mtb/EquipUpgrade.h" -#include "mtb/Player.h" +#include "mtb/Hero.h" #include "mtb/Robot.h" #include "mtb/Skill.h" #include "mtb/SkillNumber.h" @@ -287,60 +287,60 @@ namespace mtb return meta_class; } - a8::reflect::Class* Player::GetClass() const + a8::reflect::Class* Hero::GetClass() const { a8::reflect::Class* meta_class = nullptr; if (!meta_class) { - meta_class = new a8::reflect::Class("Player", 49, 0); - meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(Player, id_)); - meta_class->SetSimpleField(1, "move_offset_x", a8::reflect::ET_FLOAT, my_offsetof2(Player, move_offset_x_)); - meta_class->SetSimpleField(2, "move_offset_y", a8::reflect::ET_FLOAT, my_offsetof2(Player, move_offset_y_)); - meta_class->SetSimpleField(3, "radius", a8::reflect::ET_FLOAT, my_offsetof2(Player, radius_)); - meta_class->SetSimpleField(4, "move_speed", a8::reflect::ET_INT32, my_offsetof2(Player, move_speed_)); - meta_class->SetSimpleField(5, "jump_speed", a8::reflect::ET_INT32, my_offsetof2(Player, jump_speed_)); - meta_class->SetSimpleField(6, "move_speed3", a8::reflect::ET_INT32, my_offsetof2(Player, move_speed3_)); - meta_class->SetSimpleField(7, "shot_speed", a8::reflect::ET_INT32, my_offsetof2(Player, shot_speed_)); - meta_class->SetSimpleField(8, "aiming_speed", a8::reflect::ET_INT32, my_offsetof2(Player, aiming_speed_)); - meta_class->SetSimpleField(9, "move_speed4", a8::reflect::ET_INT32, my_offsetof2(Player, move_speed4_)); - meta_class->SetSimpleField(10, "reload_speed", a8::reflect::ET_INT32, my_offsetof2(Player, reload_speed_)); - meta_class->SetSimpleField(11, "useitem_speed", a8::reflect::ET_INT32, my_offsetof2(Player, useitem_speed_)); - meta_class->SetSimpleField(12, "volume", a8::reflect::ET_STRING, my_offsetof2(Player, volume_)); - meta_class->SetSimpleField(13, "level", a8::reflect::ET_INT32, my_offsetof2(Player, level_)); - meta_class->SetSimpleField(14, "race", a8::reflect::ET_INT32, my_offsetof2(Player, race_)); - meta_class->SetSimpleField(15, "active_skill", a8::reflect::ET_INT32, my_offsetof2(Player, active_skill_)); - meta_class->SetSimpleField(16, "passive_skill", a8::reflect::ET_INT32, my_offsetof2(Player, passive_skill_)); - meta_class->SetSimpleField(17, "exp", a8::reflect::ET_INT32, my_offsetof2(Player, exp_)); - meta_class->SetSimpleField(18, "dead_exp", a8::reflect::ET_INT32, my_offsetof2(Player, dead_exp_)); - meta_class->SetSimpleField(19, "killer_exp", a8::reflect::ET_INT32, my_offsetof2(Player, killer_exp_)); - meta_class->SetSimpleField(20, "revive_time", a8::reflect::ET_INT32, my_offsetof2(Player, revive_time_)); - meta_class->SetSimpleField(21, "name", a8::reflect::ET_STRING, my_offsetof2(Player, name_)); - meta_class->SetSimpleField(22, "normal_skill", a8::reflect::ET_INT32, my_offsetof2(Player, normal_skill_)); - meta_class->SetSimpleField(23, "hit_offset_x", a8::reflect::ET_FLOAT, my_offsetof2(Player, hit_offset_x_)); - meta_class->SetSimpleField(24, "hit_offset_y", a8::reflect::ET_FLOAT, my_offsetof2(Player, hit_offset_y_)); - meta_class->SetSimpleField(25, "hit_radius", a8::reflect::ET_FLOAT, my_offsetof2(Player, hit_radius_)); - meta_class->SetSimpleField(26, "ai_script", a8::reflect::ET_STRING, my_offsetof2(Player, ai_script_)); - meta_class->SetSimpleField(27, "init_buffs", a8::reflect::ET_STRING, my_offsetof2(Player, init_buffs_)); - meta_class->SetSimpleField(28, "default_weapon", a8::reflect::ET_INT32, my_offsetof2(Player, default_weapon_)); - meta_class->SetSimpleField(29, "dead_drop", a8::reflect::ET_STRING, my_offsetof2(Player, dead_drop_)); - meta_class->SetSimpleField(30, "delay_delete", a8::reflect::ET_INT32, my_offsetof2(Player, delay_delete_)); - meta_class->SetSimpleField(31, "ai", a8::reflect::ET_INT32, my_offsetof2(Player, ai_)); - meta_class->SetSimpleField(32, "delay_remove", a8::reflect::ET_INT32, my_offsetof2(Player, delay_remove_)); - meta_class->SetSimpleField(33, "skinlist", a8::reflect::ET_INT32, my_offsetof2(Player, skinlist_)); - meta_class->SetSimpleField(34, "pre_appear_effect", a8::reflect::ET_STRING, my_offsetof2(Player, pre_appear_effect_)); - meta_class->SetSimpleField(35, "pve_score", a8::reflect::ET_STRING, my_offsetof2(Player, pve_score_)); - meta_class->SetSimpleField(36, "hp", a8::reflect::ET_INT32, my_offsetof2(Player, hp_)); - meta_class->SetSimpleField(37, "damage", a8::reflect::ET_INT32, my_offsetof2(Player, damage_)); - meta_class->SetSimpleField(38, "defence", a8::reflect::ET_INT32, my_offsetof2(Player, defence_)); - meta_class->SetSimpleField(39, "crit_atk", a8::reflect::ET_FLOAT, my_offsetof2(Player, crit_atk_)); - meta_class->SetSimpleField(40, "crit_atk_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Player, crit_atk_ratio_)); - meta_class->SetSimpleField(41, "miss", a8::reflect::ET_FLOAT, my_offsetof2(Player, miss_)); - meta_class->SetSimpleField(42, "miss_damage_ruduce", a8::reflect::ET_FLOAT, my_offsetof2(Player, miss_damage_ruduce_)); - meta_class->SetSimpleField(43, "skill1list", a8::reflect::ET_INT32, my_offsetof2(Player, skill1list_)); - meta_class->SetSimpleField(44, "skill2list", a8::reflect::ET_INT32, my_offsetof2(Player, skill2list_)); - meta_class->SetSimpleField(45, "skill3list", a8::reflect::ET_INT32, my_offsetof2(Player, skill3list_)); - meta_class->SetSimpleField(46, "hp_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Player, hp_ratio_)); - meta_class->SetSimpleField(47, "damage_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Player, damage_ratio_)); - meta_class->SetSimpleField(48, "defence_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Player, defence_ratio_)); + meta_class = new a8::reflect::Class("Hero", 49, 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_)); } return meta_class; } diff --git a/server/tools/protobuild/mt.proto b/server/tools/protobuild/mt.proto index fd191496..42b51984 100755 --- a/server/tools/protobuild/mt.proto +++ b/server/tools/protobuild/mt.proto @@ -208,7 +208,7 @@ message EquipUpgrade optional string spera_attr = 5; } -message Player +message Hero { optional int32 id = 1; //唯一id optional float move_offset_x = 40;