From 81a0e2b6ef83bbc5625b798886bbe03ecd33d552 Mon Sep 17 00:00:00 2001 From: MistEO Date: Wed, 21 Sep 2022 22:40:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9F=BA=E5=BB=BA?= =?UTF-8?q?=E7=BB=84=E5=90=88=E4=B8=8D=E5=8F=AF=E7=94=A8=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E6=95=88=E7=8E=87=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1895 --- resource/infrast.json | 4 ++-- src/MeoAssistant/InfrastProductionTask.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) 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 { // 否则这个组合人不够，就不可用了