From fdfedab7718250b531ee770272e1ca7528c841aa Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Thu, 28 Oct 2021 22:04:40 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E5=8F=91=E7=94=B5?=
 =?UTF-8?q?=E7=AB=99=E6=8A=8A=E5=B7=B2=E6=9C=89=E5=B9=B2=E5=91=98=E5=8F=88?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=8B=E6=9D=A5=E4=BA=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAssistance/InfrastPowerTask.cpp | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/MeoAssistance/InfrastPowerTask.cpp b/src/MeoAssistance/InfrastPowerTask.cpp
index bf3f732e34..b7887d603b 100644
--- a/src/MeoAssistance/InfrastPowerTask.cpp
+++ b/src/MeoAssistance/InfrastPowerTask.cpp
@@ -13,6 +13,9 @@ bool asst::InfrastPowerTask::run()
     set_facility(FacilityName);
     m_all_available_opers.clear();
 
+    // 发电站只能造这一个
+    set_product("Drone");
+
     swipe_to_the_left_of_main_ui();
 
     for (int i = 0; i != 3; ++i) {
@@ -21,11 +24,6 @@ bool asst::InfrastPowerTask::run()
         if (!enter_oper_list_page()) {
             return false;
         }
-
-        // 发电站只能造这一个
-        set_product("Drone");
-        /* 进入干员选择页面 */
-        click_clear_button();
         swipe_to_the_left_of_operlist();
 
         if (m_all_available_opers.empty()) {
@@ -35,8 +33,20 @@ bool asst::InfrastPowerTask::run()
         else {
             opers_detect();
         }
-        optimal_calc();
-        opers_choose();
+
+        auto find_iter = std::find_if(m_all_available_opers.begin(), m_all_available_opers.end(),
+            [&](const InfrastOperSkillInfo& info) -> bool {
+                return info.selected;
+            });
+        // 如果之前有干员在，那就不换人，直接退出当前发电站
+        if (find_iter != m_all_available_opers.end()) {
+            m_all_available_opers.erase(find_iter);
+        }
+        else {
+            optimal_calc();
+            opers_choose();
+        }
+
         click_confirm_button();
         click_return_button();
     }