This commit is contained in:
aozhiwei 2023-02-21 11:21:28 +08:00
parent d6aafe8202
commit 648b4e5ee1

View File

@ -62,23 +62,38 @@ namespace mt
} }
} }
}); });
auto merge_func =
[] (mt::GraspBuffs* a, mt::GraspBuffs* b)
{
};
for (auto& pair : hero_weapon_hash_) { for (auto& pair : hero_weapon_hash_) {
if (!pair.second.empty()) { if (!pair.second.empty()) {
std::vector<std::tuple<int, mt::GraspBuffs*>> buffs; std::vector<std::tuple<int, mt::GraspBuffs*>> tuples;
{ {
for (auto& pair2 : pair.second) { for (auto& pair2 : pair.second) {
buffs.push_back(std::make_tuple(pair2.first, &pair2.second)); tuples.push_back(std::make_tuple(pair2.first, &pair2.second));
} }
} }
#if 0 std::sort
auto& parent_buffs = pair.second[i]; (tuples.begin(), tuples.end(),
for (size_t ii = 0; ii < i; ++ii) { [] (std::tuple<int, mt::GraspBuffs*>& a, std::tuple<int, mt::GraspBuffs*>& b) -> bool
auto& child_buffs = pair.second[ii]; {
for (size_t iii = 0; iii < parent_buffs.size(); ++iii) { if (std::get<0>(a) == std::get<0>(b)) {
abort();
} else {
return std::get<0>(a) > std::get<0>(b);
}
});
for (size_t i = tuples.size() - 1; i >= 0; ++i) {
int lv = std::get<0>(tuples[i]);
auto buffs = std::get<1>(tuples[i]);
for (size_t ii = 0; ii < tuples.size(); ++ii) {
if (std::get<0>(tuples[ii]) < lv) {
merge_func(buffs, std::get<1>(tuples[ii]));
}
} }
} }
#endif
} }
} }
} }