diff --git a/server/gameserver/buff/callfunc.h b/server/gameserver/buff/callfunc.h index d21b8384..a54c5052 100644 --- a/server/gameserver/buff/callfunc.h +++ b/server/gameserver/buff/callfunc.h @@ -15,7 +15,8 @@ A8_DECLARE_CLASS_ENUM(BuffCallFunc_e, int, kAddEnergyShield = 10, kAddHp = 11, kFlashMoveToPos = 12, - kLightCircle = 13 + kLightCircle = 13, + kDmgAddition = 14 ); diff --git a/server/gameserver/mt/Grasp.cc b/server/gameserver/mt/Grasp.cc index ffa23683..f5ca10b6 100644 --- a/server/gameserver/mt/Grasp.cc +++ b/server/gameserver/mt/Grasp.cc @@ -1,6 +1,7 @@ #include "precompile.h" #include "mt/Grasp.h" +#include "mt/Item.h" IMPL_TABLE(mt::Grasp) std::map>> mt::Grasp::hero_id_lv_gun_hash_; @@ -33,6 +34,11 @@ namespace mt if (weapon_id() == 0) { abort(); } + const mt::Item* item_meta = mt::Item::GetById(weapon_id()); + if (!item_meta){ + abort(); + } + weapon_id_ = item_meta->relationship(); } void Grasp::Init2() diff --git a/server/gameserver/mt/SkillNumber.cc b/server/gameserver/mt/SkillNumber.cc index 1b587bd3..1f293c17 100644 --- a/server/gameserver/mt/SkillNumber.cc +++ b/server/gameserver/mt/SkillNumber.cc @@ -2,6 +2,8 @@ #include +#include "app.h" + #include "mt/SkillNumber.h" #include "mt/Skill.h" @@ -108,8 +110,10 @@ namespace mt if (!skill_meta) { abort(); } -#if 1 - _float_cd = 6; +#ifdef DEBUG + if (App::Instance()->instance_id == 6) { + _float_cd = 6; + } #endif //metatable::Skill* skill_pb = (metatable::Skill*)(skill_meta->pb); //skill_pb->set_skill_cd(float_cd);