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

1

Browse Source
This commit is contained in:
aozhiwei 2020-08-21 16:57:48 +08:00
commit 72bfc3bd73
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/metadata.cc
View File

@ -104,8 +104,8 @@ namespace MetaData
} }
{ {
std::vector<std::string> strings; std::vector<std::string> strings;
if (!i->spera_type().empty()) { if (!i->spera_attr().empty()) {
a8::Split(i->spera_type(), strings, '|'); a8::Split(i->spera_attr(), strings, '|');
} else { } else {
a8::Split(i->attr_type(), strings, '|'); a8::Split(i->attr_type(), strings, '|');
} }

12
server/gameserver/room.cc
View File

@ -2731,7 +2731,8 @@ void Room::AddPlayerPostProc(Player* hum)
{ {
Human* hum = (Human*)param.sender.GetUserData(); Human* hum = (Human*)param.sender.GetUserData();
std::string debugmsg = a8::Format("weapon_id:%d weapon_lv:%d atk:%f fire_rate:%f " 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_id,
hum->curr_weapon->weapon_lv, 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_FireRate),
hum->curr_weapon->GetAttrValue(kHAT_Volume), hum->curr_weapon->GetAttrValue(kHAT_Volume),
hum->curr_weapon->GetAttrValue(kHAT_MaxHp), 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); hum->SendDebugMsg(debugmsg);
}, },

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

@ -104,7 +104,7 @@ message EquipUpgrade
{ {
optional int32 id = 1; optional int32 id = 1;
optional string attr_type = 4; optional string attr_type = 4;
optional string spera_type = 5; optional string spera_attr = 5;
} }
message Player message Player