This commit is contained in:
aozhiwei 2019-06-20 11:33:50 +08:00
parent 91fc8e0c1a
commit a988f6bfde
4 changed files with 14 additions and 19 deletions

View File

@ -129,17 +129,12 @@ enum EquipAttr_e
EA_Volume = 3, EA_Volume = 3,
EA_AutoAngle = 4, //客户端用 EA_AutoAngle = 4, //客户端用
EA_BulletAngle = 5, EA_BulletAngle = 5,
EA_Atk = 6,
EA_Def = 7,
EA_Speed = 8,
EA_End EA_End
}; };
enum DressAttr_e
{
DA_Atk = 1,
DA_Def = 2,
DA_Speed = 3,
DA_End
};
const char* const PROJ_NAME_FMT = "game%d_gameserver"; const char* const PROJ_NAME_FMT = "game%d_gameserver";
const char* const PROJ_ROOT_FMT = "/data/logs/%s"; const char* const PROJ_ROOT_FMT = "/data/logs/%s";

View File

@ -1423,13 +1423,13 @@ void Human::RecalcBuff()
{ {
buff = HumanAbility(); buff = HumanAbility();
if (skin_jlf_meta) { if (skin_jlf_meta) {
buff.damage_add += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, DA_Atk); buff.damage_add += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, EA_Atk);
buff.def_add += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, DA_Def); buff.def_add += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, EA_Def);
buff.speed += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, DA_Speed); buff.speed += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, EA_Speed);
} else if (skin_meta) { } else if (skin_meta) {
buff.damage_add += skin_meta->GetAttrValue(skin.skin_lv, DA_Atk); buff.damage_add += skin_meta->GetAttrValue(skin.skin_lv, EA_Atk);
buff.def_add += skin_meta->GetAttrValue(skin.skin_lv, DA_Def); buff.def_add += skin_meta->GetAttrValue(skin.skin_lv, EA_Def);
buff.speed += skin_meta->GetAttrValue(skin.skin_lv, DA_Speed); buff.speed += skin_meta->GetAttrValue(skin.skin_lv, EA_Speed);
} }
} }

View File

@ -369,8 +369,8 @@ namespace MetaData
void Dress::Init() void Dress::Init()
{ {
for (size_t j = 0; j < i->max_lv(); ++j) { for (size_t j = 0; j < i->max_lv(); ++j) {
std::array<float, DA_End>& attrs = a8::FastAppend(level_attrs); std::array<float, EA_End>& attrs = a8::FastAppend(level_attrs);
for (size_t k = 0; k < DA_End; ++k) { for (size_t k = 0; k < EA_End; ++k) {
attrs[k] = 0; attrs[k] = 0;
} }
} }
@ -386,7 +386,7 @@ namespace MetaData
int attr_type = a8::XValue(strings2[0]); int attr_type = a8::XValue(strings2[0]);
int attr_level = a8::XValue(strings2[1]); int attr_level = a8::XValue(strings2[1]);
float attr_value = a8::XValue(strings2[2]).GetDouble(); float attr_value = a8::XValue(strings2[2]).GetDouble();
if (attr_type < DA_End) { if (attr_type < EA_End) {
if (attr_level >= 0 && attr_level < i->max_lv()) { if (attr_level >= 0 && attr_level < i->max_lv()) {
for (size_t j = 1; j < i->max_lv(); ++j) { for (size_t j = 1; j < i->max_lv(); ++j) {
if (j % attr_type == 0) { if (j % attr_type == 0) {
@ -407,7 +407,7 @@ namespace MetaData
if (level > level_attrs.size()) { if (level > level_attrs.size()) {
return 0; return 0;
} }
if (attr_type < DA_End) { if (attr_type < EA_End) {
return level_attrs[level][attr_type]; return level_attrs[level][attr_type];
} }
return 0; return 0;

View File

@ -157,7 +157,7 @@ namespace MetaData
float GetAttrValue(int level, int attr_type); float GetAttrValue(int level, int attr_type);
private: private:
std::vector<std::array<float, DA_End>> level_attrs; std::vector<std::array<float, EA_End>> level_attrs;
}; };
struct RankReward struct RankReward