server/game2004
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
yangduo 2025-04-23 15:48:24 +08:00
parent 088b45189a
commit cae20c8783
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/human.cc
View File

@ -2099,8 +2099,7 @@ bool Human::IsEnemy(Human* hum)
for(int i = 1;i <= maxtalent; i++) for(int i = 1;i <= maxtalent; i++)
{ {
auto talent = MetaMgr::Instance()->GetTalent(i); auto talent = MetaMgr::Instance()->GetTalent(i);
std::string label(curr_weapon->meta->i.equip_label()); if (talent->GetEquipLabel() == curr_weapon->meta->i->equip_label()) {
if (talent->GetEquipLabel() == a8::XValue(label).GetInt()) {
talent_attr_abs_[kHAT_Atk] += talent->GetAtkPlus(); talent_attr_abs_[kHAT_Atk] += talent->GetAtkPlus();
talent_attr_abs_[kHAT_MaxHp] += talent->GetHpPlus(); talent_attr_abs_[kHAT_MaxHp] += talent->GetHpPlus();
} }

1
server/tools/protobuild/metatable.proto
View File

@ -96,6 +96,7 @@ message Equip
optional int32 explosion_effect = 42; optional int32 explosion_effect = 42;
optional string param1 = 43; optional string param1 = 43;
optional int32 reloadtype = 46; optional int32 reloadtype = 46;
optional int32 equip_label = 47;
optional string inventory_slot = 31; //库存槽位 optional string inventory_slot = 31; //库存槽位
optional int32 _inventory_slot = 32; //库存槽位 optional int32 _inventory_slot = 32; //库存槽位