diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index eac21e0..f01e1fe 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -2099,8 +2099,7 @@ bool Human::IsEnemy(Human* hum) for(int i = 1;i <= maxtalent; i++) { auto talent = MetaMgr::Instance()->GetTalent(i); - std::string label(curr_weapon->meta->i.equip_label()); - if (talent->GetEquipLabel() == a8::XValue(label).GetInt()) { + if (talent->GetEquipLabel() == curr_weapon->meta->i->equip_label()) { talent_attr_abs_[kHAT_Atk] += talent->GetAtkPlus(); talent_attr_abs_[kHAT_MaxHp] += talent->GetHpPlus(); } diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index 82b36c4..d560ba2 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -96,6 +96,7 @@ message Equip optional int32 explosion_effect = 42; optional string param1 = 43; optional int32 reloadtype = 46; + optional int32 equip_label = 47; optional string inventory_slot = 31; //库存槽位 optional int32 _inventory_slot = 32; //库存槽位