diff --git a/src/MeoAssistant/InfrastAbstractTask.cpp b/src/MeoAssistant/InfrastAbstractTask.cpp
index 14ea74c6fb..e53412d7fc 100644
--- a/src/MeoAssistant/InfrastAbstractTask.cpp
+++ b/src/MeoAssistant/InfrastAbstractTask.cpp
@@ -151,7 +151,7 @@ bool asst::InfrastAbstractTask::click_confirm_button()
 {
     LogTraceFunction;
 
-    ProcessTask task(*this, { "InfrastConfirmButton" });
+    ProcessTask task(*this, { "InfrastDormConfirmButton" });
     return task.run();
 }
 
diff --git a/src/MeoAssistant/InfrastDormTask.cpp b/src/MeoAssistant/InfrastDormTask.cpp
index 88ec7a067d..0c4703b9fa 100644
--- a/src/MeoAssistant/InfrastDormTask.cpp
+++ b/src/MeoAssistant/InfrastDormTask.cpp
@@ -95,10 +95,10 @@ bool asst::InfrastDormTask::opers_choose()
     return true;
 }
 
-bool asst::InfrastDormTask::click_confirm_button()
-{
-    LogTraceFunction;
-
-    ProcessTask task(*this, { "InfrastDormConfirmButton" });
-    return task.run();
-}
+//bool asst::InfrastDormTask::click_confirm_button()
+//{
+//    LogTraceFunction;
+//
+//    ProcessTask task(*this, { "InfrastDormConfirmButton" });
+//    return task.run();
+//}
diff --git a/src/MeoAssistant/InfrastDormTask.h b/src/MeoAssistant/InfrastDormTask.h
index 49ea57b67a..564adfe441 100644
--- a/src/MeoAssistant/InfrastDormTask.h
+++ b/src/MeoAssistant/InfrastDormTask.h
@@ -13,7 +13,7 @@ namespace asst
 
     private:
         virtual bool _run() override;
-        virtual bool click_confirm_button() override;
+        //virtual bool click_confirm_button() override;
 
         bool opers_choose();
 
diff --git a/src/MeoAssistant/InfrastPowerTask.cpp b/src/MeoAssistant/InfrastPowerTask.cpp
index ea6815e8dd..44d2eff2cb 100644
--- a/src/MeoAssistant/InfrastPowerTask.cpp
+++ b/src/MeoAssistant/InfrastPowerTask.cpp
@@ -9,14 +9,14 @@ bool asst::InfrastPowerTask::_run()
     // 发电站只能造这一个
     set_product("Drone");
 
-    for (int i = 0; i != max_num_of_facilities(); ++i) {
+    for (; m_cur_facility_index != max_num_of_facilities(); ++m_cur_facility_index) {
         if (need_exit()) {
             return false;
         }
         swipe_to_the_left_of_main_ui();
 
         // 进不去说明设施数量不够
-        if (!enter_facility(i)) {
+        if (!enter_facility(m_cur_facility_index)) {
             break;
         }
         if (!enter_oper_list_page()) {
diff --git a/src/MeoAssistant/InfrastProductionTask.cpp b/src/MeoAssistant/InfrastProductionTask.cpp
index ac400267db..797a47f93d 100644
--- a/src/MeoAssistant/InfrastProductionTask.cpp
+++ b/src/MeoAssistant/InfrastProductionTask.cpp
@@ -45,18 +45,15 @@ bool asst::InfrastProductionTask::shift_facility_list()
     MultiMatchImageAnalyzer locked_analyzer;
     locked_analyzer.set_task_info("InfrastOperLocked" + facility_name());
 
-    int index = 0;
-    for (const Rect& tab : m_facility_list_tabs) {
-        m_cur_facility_index = index;
+    for (; m_cur_facility_index < m_facility_list_tabs.size(); ++m_cur_facility_index) {
+        Rect tab = m_facility_list_tabs.at(m_cur_facility_index);
         if (need_exit()) {
             return false;
         }
-        if (index != 0) {
+        if (m_cur_facility_index != 0) {
             callback(AsstMsg::SubTaskExtraInfo, basic_info_with_what("EnterFacility"));
         }
 
-        ++index;
-
         Ctrler.click(tab);
         sleep(tab_task_ptr->rear_delay);
 
@@ -625,4 +622,4 @@ bool asst::InfrastProductionTask::facility_list_detect()
     }
 
     return true;
-}
\ No newline at end of file
+}