From 700f6ae80331f307b115cfb609cad1cfdf5481af Mon Sep 17 00:00:00 2001
From: Hydrogina <2221964239@qq.com>
Date: Sun, 14 Aug 2022 00:27:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AF=B9=E6=8C=89=E9=92=AE=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=A8=A1=E6=9D=BF=E5=8C=B9=E9=85=8D=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=B4=E6=98=8E=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                              |  15 +++++++--------
 .../InfrastFilterMenuNotStationedButton.png      | Bin 0 -> 2826 bytes
 src/MeoAssistant/InfrastDormTask.cpp             |   8 ++++++--
 3 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 resource/template/InfrastFilterMenuNotStationedButton.png

diff --git a/resource/tasks.json b/resource/tasks.json
index 9d2d4ef60c..ab2423d219 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -4532,17 +4532,16 @@
         "rearDelay": 1000
     },
     "InfrastFilterMenuNotStationedButton": {
-        "algorithm": "OcrDetect",
         "action": "ClickSelf",
-        "text": [
-            "未进驻"
-        ],
+        "template": "InfrastFilterMenuNotStationedButton.png",
+        "cache": false,
         "roi": [
-            362,
-            338,
-            151,
-            43
+            359,
+            335,
+            158,
+            49
         ],
+        "rearDelay": 1000,
         "next": [
             "InfrastFilterMenuConfirmButton"
         ]
diff --git a/resource/template/InfrastFilterMenuNotStationedButton.png b/resource/template/InfrastFilterMenuNotStationedButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..4283b9d612c917b83c53e634cd0a02fc389f1a85
GIT binary patch
literal 2826
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

literal 0
HcmV?d00001

diff --git a/src/MeoAssistant/InfrastDormTask.cpp b/src/MeoAssistant/InfrastDormTask.cpp
index 0ea988b91a..77f8c58396 100644
--- a/src/MeoAssistant/InfrastDormTask.cpp
+++ b/src/MeoAssistant/InfrastDormTask.cpp
@@ -65,7 +65,7 @@ bool asst::InfrastDormTask::opers_choose()
             }
             switch (oper.smiley.type) {
             case infrast::SmileyType::Rest:
-                // 如果当前页面休息完成的人数超过5个，说明已经已经把所有心情不满的滑过一遍、没有更多的了
+                // 如果所有心情不满的干员已经放入宿舍，就把信赖不满的干员放入宿舍
                 if (m_finished_stage > 0 && oper.selected == false && oper.doing != infrast::Doing::Working && oper.doing != infrast::Doing::Resting) {
                     m_ctrler->click(oper.rect);
                     if (++num_of_selected >= max_num_of_opers()) {
@@ -73,13 +73,14 @@ bool asst::InfrastDormTask::opers_choose()
                         break;
                     }
                 }
+                // 如果当前页面休息完成的人数超过5个，说明已经已经把所有心情不满的滑过一遍、没有更多的了
                 else if (++num_of_resting > max_num_of_opers()) {
                     Log.trace("num_of_resting:", num_of_resting, ", dorm finished");
                     Log.trace("click_filter_menu_not_stationed_button");
                     click_filter_menu_not_stationed_button();
                     Log.trace("click_sort_by_trust_button");
                     click_sort_by_trust_button();
-                    m_finished_stage = 1;
+                    m_finished_stage = 1;// 选中未进驻标签并按信赖值排序
                 }
                 break;
             case infrast::SmileyType::Work:
@@ -96,18 +97,21 @@ bool asst::InfrastDormTask::opers_choose()
             default:
                 break;
             }
+            // 按信赖排序后需要重新识图，中断循环
             if (m_finished_stage == 1) {
                 break;
             }
         }
         if (num_of_selected >= max_num_of_opers()) {
             Log.trace("num_of_selected:", num_of_selected, ", just break");
+            // 若当前宿舍已满人，则按信赖排序后不需要跳过滑动列表
             if (m_finished_stage == 1) {
                 m_finished_stage = 2;
             }
             break;
         }
 
+        // 若当前宿舍未满人，则按信赖排序后需要跳过一次滑动列表
         if (m_finished_stage == 1) {
             m_finished_stage = 2;
         }