From 80f3bae4eac9efeac9e858a764e390701e2c35eb Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 10 Jan 2024 11:50:12 +0800 Subject: [PATCH] 1 --- server/gameserver/attrdefine.h | 10 ++++------ server/gameserver/attrhelper.cc | 5 +++++ server/gameserver/attrhelper.h | 1 + server/gameserver/netdata.cc | 6 +++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/server/gameserver/attrdefine.h b/server/gameserver/attrdefine.h index 385a3196..7e694f41 100644 --- a/server/gameserver/attrdefine.h +++ b/server/gameserver/attrdefine.h @@ -51,8 +51,7 @@ enum HumanAttrType_e kXHAT_End }; -enum NewHumanAttrType_e -{ +A8_DECLARE_ENUM(NewHumanAttrType_e, kNHAT_Begin = 0, kNHAT_vCurrnetHealth = 1, kNHAT_vHealth = 2, @@ -106,10 +105,9 @@ enum NewHumanAttrType_e kNHAT_Hold = 55, kNHAT_End -}; +); -enum HumanVirtualAttrType_e -{ +A8_DECLARE_ENUM(HumanVirtualAttrType_e, kHVAT_Begin = 1000, kHVAT_Dmg = 1001, kHVAT_BulletAngle = 1002, @@ -129,4 +127,4 @@ enum HumanVirtualAttrType_e kHVAT_Volume = 1015, kHVAT_FireRate = 1016, kHVAT_End -}; +); diff --git a/server/gameserver/attrhelper.cc b/server/gameserver/attrhelper.cc index 431109db..667dec45 100644 --- a/server/gameserver/attrhelper.cc +++ b/server/gameserver/attrhelper.cc @@ -46,3 +46,8 @@ bool AttrHelper::ParseAttr(std::shared_ptr xobj, } return true; } + +std::string AttrHelper::GetAttrName(int attr_id) +{ + +} diff --git a/server/gameserver/attrhelper.h b/server/gameserver/attrhelper.h index 462b5b6b..118138be 100644 --- a/server/gameserver/attrhelper.h +++ b/server/gameserver/attrhelper.h @@ -13,4 +13,5 @@ class AttrHelper std::array& attr_abs, std::array& attr_rate); + static std::string GetAttrName(int attr_id); }; diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index b29467a4..26178682 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -785,9 +785,9 @@ float BattleDataContext::CalcDmg(Creature* target, IBullet* bullet) g_calc_dmg_context.is_crit = 0; #ifdef MYDEBUG - if (hero_ability_->hero_meta->id() == 9011) { - int i = 0; - } + if (owner_.Get()->IsPlayer()) { + + } #endif float vEbc = 1.0f;