From 6fabf19c71cc139f3c9e2cfda0e9b0086d6a8208 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 28 Nov 2023 10:34:57 +0800 Subject: [PATCH] 1 --- server/gameserver/mtb/Skill.h | 5 ++++- server/gameserver/mtb/mtb.all.cc | 5 +++-- server/tools/protobuild/mt.proto | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/server/gameserver/mtb/Skill.h b/server/gameserver/mtb/Skill.h index 7ff4fb2d..7ce214cd 100644 --- a/server/gameserver/mtb/Skill.h +++ b/server/gameserver/mtb/Skill.h @@ -38,6 +38,7 @@ namespace mtb int up_exp() const { return up_exp_; }; int nextlv_skill() const { return nextlv_skill_; }; int attack_dir_lock_time() const { return attack_dir_lock_time_; }; + int skill_hold_buff() const { return skill_hold_buff_; }; bool has_skill_id() const { return __flags__.test(0);}; bool has_skill_type() const { return __flags__.test(1);}; @@ -67,6 +68,7 @@ namespace mtb bool has_up_exp() const { return __flags__.test(25);}; bool has_nextlv_skill() const { return __flags__.test(26);}; bool has_attack_dir_lock_time() const { return __flags__.test(27);}; + bool has_skill_hold_buff() const { return __flags__.test(28);}; protected: @@ -98,9 +100,10 @@ namespace mtb int up_exp_ = 0; int nextlv_skill_ = 0; int attack_dir_lock_time_ = 0; + int skill_hold_buff_ = 0; public: - std::bitset<28> __flags__; + std::bitset<29> __flags__; }; }; diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc index dea3990b..29ec5ebd 100644 --- a/server/gameserver/mtb/mtb.all.cc +++ b/server/gameserver/mtb/mtb.all.cc @@ -397,7 +397,7 @@ namespace mtb { std::shared_ptr meta_class = nullptr; if (!meta_class) { - meta_class = std::make_shared("Skill", 28, 0); + meta_class = std::make_shared("Skill", 29, 0); meta_class->SetSimpleField(0, "skill_id", a8::reflect::ET_INT32, my_offsetof2(Skill, skill_id_)); meta_class->SetSimpleField(1, "skill_type", a8::reflect::ET_INT32, my_offsetof2(Skill, skill_type_)); meta_class->SetSimpleField(2, "value_up", a8::reflect::ET_STRING, my_offsetof2(Skill, value_up_)); @@ -426,6 +426,7 @@ namespace mtb meta_class->SetSimpleField(25, "up_exp", a8::reflect::ET_INT32, my_offsetof2(Skill, up_exp_)); meta_class->SetSimpleField(26, "nextlv_skill", a8::reflect::ET_INT32, my_offsetof2(Skill, nextlv_skill_)); meta_class->SetSimpleField(27, "attack_dir_lock_time", a8::reflect::ET_INT32, my_offsetof2(Skill, attack_dir_lock_time_)); + meta_class->SetSimpleField(28, "skill_hold_buff", a8::reflect::ET_INT32, my_offsetof2(Skill, skill_hold_buff_)); } return meta_class; } @@ -463,7 +464,7 @@ namespace mtb meta_class->SetSimpleField(25, "time3", a8::reflect::ET_STRING, my_offsetof2(SkillNumber, time3_)); meta_class->SetSimpleField(26, "time4", a8::reflect::ET_STRING, my_offsetof2(SkillNumber, time4_)); meta_class->SetSimpleField(27, "time5", a8::reflect::ET_STRING, my_offsetof2(SkillNumber, time5_)); - meta_class->SetSimpleField(28, "time5", a8::reflect::ET_STRING, my_offsetof2(SkillNumber, time6_)); + meta_class->SetSimpleField(28, "time6", a8::reflect::ET_STRING, my_offsetof2(SkillNumber, time6_)); } return meta_class; } diff --git a/server/tools/protobuild/mt.proto b/server/tools/protobuild/mt.proto index b64c7ebe..89569583 100755 --- a/server/tools/protobuild/mt.proto +++ b/server/tools/protobuild/mt.proto @@ -338,6 +338,7 @@ message Skill optional int32 nextlv_skill = 51; optional int32 attack_dir_lock_time = 52; + optional int32 skill_hold_buff = 53; } message SkillNumber