diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc index 9035774..4d9a06e 100644 --- a/server/gameserver/metadata.cc +++ b/server/gameserver/metadata.cc @@ -104,8 +104,8 @@ namespace MetaData } { std::vector strings; - if (!i->spera_type().empty()) { - a8::Split(i->spera_type(), strings, '|'); + if (!i->spera_attr().empty()) { + a8::Split(i->spera_attr(), strings, '|'); } else { a8::Split(i->attr_type(), strings, '|'); } diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index e26e8da..1aab7f1 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2731,7 +2731,8 @@ void Room::AddPlayerPostProc(Player* hum) { Human* hum = (Human*)param.sender.GetUserData(); std::string debugmsg = a8::Format("weapon_id:%d weapon_lv:%d atk:%f fire_rate:%f " - "volume:%d maxhp:%f curr_hp:%f", + "volume:%d maxhp:%f hp:%f curr_hp:%f curr_max_hp:%f " + "base_reload_time:%f grow_reload_time:%f finaly_reload_time:%f", { hum->curr_weapon->weapon_id, hum->curr_weapon->weapon_lv, @@ -2739,7 +2740,14 @@ void Room::AddPlayerPostProc(Player* hum) hum->curr_weapon->GetAttrValue(kHAT_FireRate), hum->curr_weapon->GetAttrValue(kHAT_Volume), hum->curr_weapon->GetAttrValue(kHAT_MaxHp), - hum->GetHP() + hum->curr_weapon->GetAttrValue(kHAT_Hp), + hum->GetHP(), + hum->GetMaxHP(), + hum->curr_weapon->meta->i->reload_time(), + hum->curr_weapon->GetUpgradeMeta() ? + hum->curr_weapon->GetUpgradeMeta()->GetAttrValue + (hum->curr_weapon->weapon_lv, kHAT_ReloadTime) : 0, + hum->curr_weapon->GetAttrValue(kHAT_ReloadTime) }); hum->SendDebugMsg(debugmsg); }, diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index 9ff3ce9..112126c 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -104,7 +104,7 @@ message EquipUpgrade { optional int32 id = 1; optional string attr_type = 4; - optional string spera_type = 5; + optional string spera_attr = 5; } message Player