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

1

Browse Source
This commit is contained in:
aozhiwei 2019-07-26 11:27:45 +08:00
parent 8c0bc41e93
commit 536a930d80
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/gameserver/human.cc
View File

@ -1615,16 +1615,25 @@ void Human::RecalcBaseAttr()
}
}
if (driver_meta_ && tank_meta_ && driver_meta_->i->g_type() == tank_meta_->i->type()) {
std::map<int, float> attr_coeff_hash;
for (auto& pair : driver_meta_->attr_up) {
float* p_attr = GetAbilityById(pair.first);
if (p_attr) {
*p_attr += (driver.driver_lv / std::get<1>(pair.second)) * std::get<0>(pair.second);
if (attr_coeff_hash.find(pair.first) == attr_coeff_hash.end()) {
attr_coeff_hash[pair.first] = 0.0f;
}
attr_coeff_hash[pair.first] += std::get<0>(pair.second) + driver.driver_lv * std::get<1>(pair.second);
}
for (auto& pair : driver_meta_->passive_skill_attr) {
if (driver.driver_lv >= std::get<1>(pair.second)) {
if (attr_coeff_hash.find(pair.first) == attr_coeff_hash.end()) {
attr_coeff_hash[pair.first] = 0.0f;
}
attr_coeff_hash[pair.first] += std::get<0>(pair.second);
}
}
for (auto& pair : attr_coeff_hash) {
float* p_attr = GetAbilityById(pair.first);
if (p_attr && driver.driver_lv >= std::get<1>(pair.second)) {
*p_attr += std::get<0>(pair.second);
if (p_attr) {
*p_attr = (*p_attr) * (1 + pair.second);
}
}
}

6
server/gameserver/metadata.cc
View File

@ -392,9 +392,9 @@ namespace MetaData
abort();
}
int attr_type = a8::XValue(strings2[0]);
float attr_value = a8::XValue(strings2[1]).GetDouble();
int attr_level = a8::XValue(strings2[2]).GetDouble();
attr_up[attr_type] = std::make_tuple(attr_value, attr_level);
float base_value = a8::XValue(strings2[1]).GetDouble();
float up_value = a8::XValue(strings2[2]).GetDouble();
attr_up[attr_type] = std::make_tuple(base_value, up_value);
}
}
{

2
server/gameserver/metadata.h
View File

@ -184,7 +184,7 @@ namespace MetaData
const metatable::Driver* i = nullptr;
void Init();
std::map<int, std::tuple<float, int>> attr_up;
std::map<int, std::tuple<float, float>> attr_up;
std::map<int, std::tuple<float, int>> passive_skill_attr;
};