From 94f5ae9093fbdb3dc9ca5c8d37064160edcae750 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 15 Jan 2024 17:31:56 +0800 Subject: [PATCH] 1 --- server/gameserver/mt/BattleHeroGrow.cc | 8 ++++---- server/gameserver/mt/BattleHeroGrow.h | 2 ++ server/gameserver/mtb/BattleHeroGrow.h | 4 ++-- server/gameserver/mtb/mtb.all.cc | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/server/gameserver/mt/BattleHeroGrow.cc b/server/gameserver/mt/BattleHeroGrow.cc index fca2d9bf..91263d67 100644 --- a/server/gameserver/mt/BattleHeroGrow.cc +++ b/server/gameserver/mt/BattleHeroGrow.cc @@ -23,22 +23,22 @@ namespace mt bool BattleHeroGrow::IsFullLevel() const { - return false; + return levelExp() <= 0; } std::shared_ptr>> BattleHeroGrow::GetLevelAttrs() const { - return nullptr; + return attrs_; } std::shared_ptr> BattleHeroGrow::GetEquipEffects() const { - return nullptr; + return effects_; } int BattleHeroGrow::GetSkillEffect() const { - return 0; + return currentSkillEffect(); } } diff --git a/server/gameserver/mt/BattleHeroGrow.h b/server/gameserver/mt/BattleHeroGrow.h index 67c3f297..0294d419 100644 --- a/server/gameserver/mt/BattleHeroGrow.h +++ b/server/gameserver/mt/BattleHeroGrow.h @@ -21,6 +21,8 @@ namespace mt int GetSkillEffect() const; private: + std::shared_ptr>> attrs_; + std::shared_ptr> effects_; }; } diff --git a/server/gameserver/mtb/BattleHeroGrow.h b/server/gameserver/mtb/BattleHeroGrow.h index a7c9e951..b0d2c8de 100644 --- a/server/gameserver/mtb/BattleHeroGrow.h +++ b/server/gameserver/mtb/BattleHeroGrow.h @@ -19,7 +19,7 @@ namespace mtb int lootExp() const { return lootExp_; }; const std::string currentLevelAttribute() const { return currentLevelAttribute_; }; const std::string currentEquipEffect() const { return currentEquipEffect_; }; - const std::string currentSkillEffect() const { return currentSkillEffect_; }; + int currentSkillEffect() const { return currentSkillEffect_; }; const std::string currentSkillDesc() const { return currentSkillDesc_; }; bool has_id() const { return __flags__.test(0);}; @@ -45,7 +45,7 @@ namespace mtb int lootExp_ = 0; std::string currentLevelAttribute_; std::string currentEquipEffect_; - std::string currentSkillEffect_; + int currentSkillEffect_ = 0; std::string currentSkillDesc_; public: diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc index d9a44c4c..3cd012cb 100644 --- a/server/gameserver/mtb/mtb.all.cc +++ b/server/gameserver/mtb/mtb.all.cc @@ -1048,7 +1048,7 @@ namespace mtb meta_class->SetSimpleField(6, "lootExp", a8::reflect::ET_INT32, my_offsetof2(BattleHeroGrow, lootExp_)); meta_class->SetSimpleField(7, "currentLevelAttribute", a8::reflect::ET_STRING, my_offsetof2(BattleHeroGrow, currentLevelAttribute_)); meta_class->SetSimpleField(8, "currentEquipEffect", a8::reflect::ET_STRING, my_offsetof2(BattleHeroGrow, currentEquipEffect_)); - meta_class->SetSimpleField(9, "currentSkillEffect", a8::reflect::ET_STRING, my_offsetof2(BattleHeroGrow, currentSkillEffect_)); + meta_class->SetSimpleField(9, "currentSkillEffect", a8::reflect::ET_INT32, my_offsetof2(BattleHeroGrow, currentSkillEffect_)); meta_class->SetSimpleField(10, "currentSkillDesc", a8::reflect::ET_STRING, my_offsetof2(BattleHeroGrow, currentSkillDesc_)); } return meta_class;