This commit is contained in:
aozhiwei 2024-01-04 16:14:59 +08:00
parent df949ceea3
commit b00d07ba26
2 changed files with 8 additions and 5 deletions

View File

@ -424,6 +424,8 @@ void Ability::RecalcAttrRuduce(int attr_id)
list_head* next = nullptr; list_head* next = nullptr;
bool inited = false; bool inited = false;
float new_val = 0.0f; float new_val = 0.0f;
#ifdef NEW_NUM
#else
list_for_each_safe(pos, next, head) { list_for_each_safe(pos, next, head) {
AttrRuduce* e = list_entry(pos, AttrRuduce* e = list_entry(pos,
AttrRuduce, AttrRuduce,
@ -451,6 +453,7 @@ void Ability::RecalcAttrRuduce(int attr_id)
break; break;
} }
} }
#endif
if (IsValidHumanAttr(attr_id)) { if (IsValidHumanAttr(attr_id)) {
std::get<0>(attr_dec_[attr_id]) = new_val; std::get<0>(attr_dec_[attr_id]) = new_val;
} else if (IsValidHumanVirtualAttr(attr_id)) { } else if (IsValidHumanVirtualAttr(attr_id)) {

View File

@ -48,13 +48,13 @@ private:
void RecalcAttrDirect(int attr_id); void RecalcAttrDirect(int attr_id);
private: private:
CreatureWeakPtr owner_; CreatureWeakPtr owner_;
std::array<std::tuple<float, list_head>, kHAT_End> attr_abs_ = {}; std::array<std::tuple<float, list_head>, kNHAT_End> attr_abs_ = {};
std::array<std::tuple<float, list_head>, kHAT_End> attr_rate_ = {}; std::array<std::tuple<float, list_head>, kNHAT_End> attr_rate_ = {};
std::array<std::tuple<float, list_head>, kHAT_End> attr_add_ = {}; std::array<std::tuple<float, list_head>, kNHAT_End> attr_add_ = {};
std::array<std::tuple<float, list_head>, kHAT_End> attr_dec_ = {}; std::array<std::tuple<float, list_head>, kNHAT_End> attr_dec_ = {};
std::array<std::tuple<float, list_head>, kHVAT_End - kHVAT_Begin> vattr_add_ = {}; std::array<std::tuple<float, list_head>, kHVAT_End - kHVAT_Begin> vattr_add_ = {};
std::array<std::tuple<float, list_head>, kHVAT_End - kHVAT_Begin> vattr_dec_ = {}; std::array<std::tuple<float, list_head>, kHVAT_End - kHVAT_Begin> vattr_dec_ = {};
std::array<std::tuple<float, list_head>, kHAT_End> attr_direct_ = {}; std::array<std::tuple<float, list_head>, kNHAT_End> attr_direct_ = {};
std::array<int, kSwitchTimeEnd> switch_times_ = {}; std::array<int, kSwitchTimeEnd> switch_times_ = {};
std::map<int, int> immune_tags_; std::map<int, int> immune_tags_;