fix: 适配新基建 (#12500)

* fix: 适配新基建

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 卡在会客室

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

resource/tasks/tasks.json

@@ -2402,6 +2402,7 @@
     },
     "InfrastEnteredFlag": {
         "template": "InfrastOverview.png",
+        "templThreshold": 0.95,
         "roi": [0, 100, 300, 150],
         "next": ["InfrastNotification", "Stop"],
         "postDelay": 5000
@@ -2429,6 +2430,8 @@
     },
     "InfrastEnterRotation": {
         "template": "InfrastOverviewEnter.png",
+        "method": "RGBCount",
+        "colorScales": [[250, 255]],
         "roi": [120, 50, 160, 160],
         "postDelay": 1000,
         "action": "ClickSelf",
@@ -2639,7 +2642,7 @@
     "InfrastOffice": {
         "template": "Office.png",
         "maskRange": [1, 255],
-        "roi": [378, 94, 589, 529],
+        "roi": [378, 94, 900, 529],
         "templThreshold": 0.9
     },
     "InfrastOfficeMini": {
@@ -2650,7 +2653,7 @@
     },
     "InfrastProcessing": {
         "maskRange": [1, 255],
-        "roi": [378, 94, 589, 529],
+        "roi": [378, 94, 900, 529],
         "templThreshold": 0.95
     },
     "InfrastProcessingMini": {
@@ -2668,7 +2671,7 @@
     "InfrastReception": {
         "template": "Reception.png",
         "maskRange": [1, 255],
-        "roi": [378, 94, 589, 529],
+        "roi": [378, 94, 900, 529],
         "templThreshold": 0.95
     },
     "InfrastReceptionMini": {
@@ -2757,7 +2760,7 @@
     "InfrastTraining": {
         "template": "Training.png",
         "maskRange": [1, 255],
-        "roi": [378, 94, 589, 529],
+        "roi": [378, 94, 900, 529],
         "templThreshold": 0.95
     },
     "InfrastTrainingMini": {
@@ -4162,6 +4165,11 @@
         "specificRect": [1000, 350, 20, 20],
         "rectMove": [400, 350, 20, 20]
     },
+    "InfrastSwipeToRightOfMainUi": {
+        "baseTask": "SlowlySwipeToTheRight",
+        "specificRect": [1080, 4, 1, 1],
+        "rectMove": [650, 4, 1, 1]
+    },
     "InfrastOperListSwipeToTheLeft": {
         "baseTask": "SwipeToTheLeft",
         "specificRect": [400, 350, 20, 20],

src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp

@@ -706,3 +706,9 @@ void asst::InfrastAbstractTask::swipe_to_the_right_of_main_ui()
     ProcessTask(*this, { "SwipeToTheRight" }).run();
     sleep(500);
 }
+
+void asst::InfrastAbstractTask::swipe_to_right_of_main_ui()
+{
+    ProcessTask(*this, { "InfrastSwipeToRightOfMainUi" }).run();
+    sleep(500);
+}

src/MaaCore/Task/Infrast/InfrastAbstractTask.h

@@ -43,6 +43,8 @@ protected:
     void swipe_to_the_left_of_main_ui();
     // 滑动基建的主界面到最右侧
     void swipe_to_the_right_of_main_ui();
+    // 往右滑一点
+    void swipe_to_right_of_main_ui();
     void swipe_of_operlist();
     bool is_use_custom_opers();
     infrast::CustomRoomConfig& current_room_config();

src/MaaCore/Task/Infrast/InfrastDormTask.cpp

@@ -39,9 +39,13 @@ bool asst::InfrastDormTask::_run()
             Log.info("skip this room");
             continue;
         }
+
         // 进不去说明设施数量不够
         if (!enter_facility(m_cur_facility_index)) {
-            break;
+            swipe_to_the_left_of_main_ui();
+            if (!enter_facility(m_cur_facility_index)) {
+                break;
+            }
         }
         if (!enter_oper_list_page()) {
             return false;

src/MaaCore/Task/Infrast/InfrastOfficeTask.cpp

@@ -14,10 +14,14 @@ bool asst::InfrastOfficeTask::_run()
         Log.info("skip this room");
         return true;
     }
-    swipe_to_the_right_of_main_ui();
+    swipe_to_the_left_of_main_ui();
     if (!enter_facility()) {
-        return false;
+        swipe_to_right_of_main_ui();
+        if (!enter_facility()) {
+            return false;
+        }
     }
+
     if (!enter_oper_list_page()) {
         return false;
     }

src/MaaCore/Task/Infrast/InfrastProcessingTask.cpp

@@ -22,10 +22,14 @@ bool asst::InfrastProcessingTask::_run()
         return true;
     }
 
-    swipe_to_the_right_of_main_ui();
+    swipe_to_the_left_of_main_ui();
     if (!enter_facility()) {
-        return false;
+        swipe_to_right_of_main_ui();
+        if (!enter_facility()) {
+            return false;
+        }
     }
+
     click_bottom_left_tab();
 
     ProcessTask(*this, { "InfrastProcessingEnterOperList" }).run();

src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp

@@ -14,9 +14,12 @@ bool asst::InfrastReceptionTask::_run()
 {
     m_all_available_opers.clear();
 
-    swipe_to_the_right_of_main_ui();
+    swipe_to_the_left_of_main_ui();
     if (!enter_facility()) {
-        return false;
+        swipe_to_right_of_main_ui();
+        if (!enter_facility()) {
+            return false;
+        }
     }
 
     if (m_receive_message_board) {

src/MaaCore/Task/Infrast/InfrastTrainingTask.cpp

@@ -16,10 +16,13 @@ bool asst::InfrastTrainingTask::_run()
 
     set_product("SkillLevel");
 
-    swipe_to_the_right_of_main_ui();
+    swipe_to_the_left_of_main_ui();
 
     if (!enter_facility()) {
-        return false;
+        swipe_to_right_of_main_ui();
+        if (!enter_facility()) {
+            return false;
+        }
     }
 
     if (!analyze_status()) {