diff --git a/resource/infrast.json b/resource/infrast.json index be61c70818..75818fe6a0 100644 --- a/resource/infrast.json +++ b/resource/infrast.json @@ -2991,7 +2991,7 @@ ] }, { - "allowExternal": true, + "allowExternal": false, "desc": "巫恋组", "necessary": [ { @@ -3182,4 +3182,4 @@ "Dorm", "Mfg" ] -} \ No newline at end of file +} diff --git a/src/MeoAssistant/InfrastProductionTask.cpp b/src/MeoAssistant/InfrastProductionTask.cpp index d0a6bdca85..d38922566a 100644 --- a/src/MeoAssistant/InfrastProductionTask.cpp +++ b/src/MeoAssistant/InfrastProductionTask.cpp @@ -471,10 +471,10 @@ bool asst::InfrastProductionTask::optimal_calc() if (cur_combs.size() < cur_max_num_of_opers) { // 允许外部的话,就把单个干员凑进来 if (group.allow_external) { - for (size_t i = cur_combs.size(); i != cur_max_num_of_opers; ++i) { - size_t index = i - cur_combs.size(); - cur_combs.emplace_back(cur_available_opers.at(index)); - cur_efficient += cur_available_opers.at(index).efficient.at(m_product); + for (size_t index = 0; index < cur_max_num_of_opers - cur_combs.size(); ++index) { + const auto& comb = cur_available_opers.at(index); + cur_combs.emplace_back(comb); + cur_efficient += comb.efficient.at(m_product); } } else { // 否则这个组合人不够,就不可用了