diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index 57917ea..5161461 100755 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -129,17 +129,12 @@ enum EquipAttr_e EA_Volume = 3, EA_AutoAngle = 4, //客户端用 EA_BulletAngle = 5, + EA_Atk = 6, + EA_Def = 7, + EA_Speed = 8, 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_ROOT_FMT = "/data/logs/%s"; diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 94b81e5..a30417a 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -1423,13 +1423,13 @@ void Human::RecalcBuff() { buff = HumanAbility(); if (skin_jlf_meta) { - buff.damage_add += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, DA_Atk); - buff.def_add += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, DA_Def); - buff.speed += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, DA_Speed); + buff.damage_add += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, EA_Atk); + buff.def_add += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, EA_Def); + buff.speed += skin_jlf_meta->GetAttrValue(skin_jlf.skin_lv, EA_Speed); } else if (skin_meta) { - buff.damage_add += skin_meta->GetAttrValue(skin.skin_lv, DA_Atk); - buff.def_add += skin_meta->GetAttrValue(skin.skin_lv, DA_Def); - buff.speed += skin_meta->GetAttrValue(skin.skin_lv, DA_Speed); + buff.damage_add += skin_meta->GetAttrValue(skin.skin_lv, EA_Atk); + buff.def_add += skin_meta->GetAttrValue(skin.skin_lv, EA_Def); + buff.speed += skin_meta->GetAttrValue(skin.skin_lv, EA_Speed); } } diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc index 59f22c5..4653698 100644 --- a/server/gameserver/metadata.cc +++ b/server/gameserver/metadata.cc @@ -369,8 +369,8 @@ namespace MetaData void Dress::Init() { for (size_t j = 0; j < i->max_lv(); ++j) { - std::array& attrs = a8::FastAppend(level_attrs); - for (size_t k = 0; k < DA_End; ++k) { + std::array& attrs = a8::FastAppend(level_attrs); + for (size_t k = 0; k < EA_End; ++k) { attrs[k] = 0; } } @@ -386,7 +386,7 @@ namespace MetaData int attr_type = a8::XValue(strings2[0]); int attr_level = a8::XValue(strings2[1]); 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()) { for (size_t j = 1; j < i->max_lv(); ++j) { if (j % attr_type == 0) { @@ -407,7 +407,7 @@ namespace MetaData if (level > level_attrs.size()) { return 0; } - if (attr_type < DA_End) { + if (attr_type < EA_End) { return level_attrs[level][attr_type]; } return 0; diff --git a/server/gameserver/metadata.h b/server/gameserver/metadata.h index 4b806b0..fbeb4cb 100755 --- a/server/gameserver/metadata.h +++ b/server/gameserver/metadata.h @@ -157,7 +157,7 @@ namespace MetaData float GetAttrValue(int level, int attr_type); private: - std::vector> level_attrs; + std::vector> level_attrs; }; struct RankReward