diff --git a/resource/tasks/tasks.json b/resource/tasks/tasks.json index da06b54efb..e0d03aee02 100644 --- a/resource/tasks/tasks.json +++ b/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], diff --git a/resource/template/ControlCenter.png b/resource/template/ControlCenter.png index 15901bd545..fe0f1bdd48 100644 Binary files a/resource/template/ControlCenter.png and b/resource/template/ControlCenter.png differ diff --git a/resource/template/ControlCenterMini.png b/resource/template/ControlCenterMini.png index 0548404e02..1a3c9f9842 100644 Binary files a/resource/template/ControlCenterMini.png and b/resource/template/ControlCenterMini.png differ diff --git a/resource/template/InfrastOverview.png b/resource/template/InfrastOverview.png index 72a45f8622..d4880a6e7d 100644 Binary files a/resource/template/InfrastOverview.png and b/resource/template/InfrastOverview.png differ diff --git a/resource/template/InfrastProcessing.png b/resource/template/InfrastProcessing.png index e82b56acc1..9a580645ae 100644 Binary files a/resource/template/InfrastProcessing.png and b/resource/template/InfrastProcessing.png differ diff --git a/resource/template/InfrastProcessingMini.png b/resource/template/InfrastProcessingMini.png index 1600ab655a..ab69fdd2df 100644 Binary files a/resource/template/InfrastProcessingMini.png and b/resource/template/InfrastProcessingMini.png differ diff --git a/resource/template/Office.png b/resource/template/Office.png index bbea7ee3ec..0e6ef71f64 100644 Binary files a/resource/template/Office.png and b/resource/template/Office.png differ diff --git a/resource/template/OfficeMini.png b/resource/template/OfficeMini.png index da0145da19..e87a348173 100644 Binary files a/resource/template/OfficeMini.png and b/resource/template/OfficeMini.png differ diff --git a/resource/template/Reception.png b/resource/template/Reception.png index 730b764f05..dddd3afa63 100644 Binary files a/resource/template/Reception.png and b/resource/template/Reception.png differ diff --git a/resource/template/ReceptionMini.png b/resource/template/ReceptionMini.png index 74fb84f61d..cdc5e40b13 100644 Binary files a/resource/template/ReceptionMini.png and b/resource/template/ReceptionMini.png differ diff --git a/resource/template/Training.png b/resource/template/Training.png index 2ce7ef7133..3788a1ce95 100644 Binary files a/resource/template/Training.png and b/resource/template/Training.png differ diff --git a/resource/template/TrainingMini.png b/resource/template/TrainingMini.png index cd2bf5f475..594a17dc43 100644 Binary files a/resource/template/TrainingMini.png and b/resource/template/TrainingMini.png differ diff --git a/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp b/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp index fc41bfaaba..b7795bd04e 100644 --- a/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp +++ b/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); +} diff --git a/src/MaaCore/Task/Infrast/InfrastAbstractTask.h b/src/MaaCore/Task/Infrast/InfrastAbstractTask.h index 4f3c7a7fc2..c890285208 100644 --- a/src/MaaCore/Task/Infrast/InfrastAbstractTask.h +++ b/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(); diff --git a/src/MaaCore/Task/Infrast/InfrastDormTask.cpp b/src/MaaCore/Task/Infrast/InfrastDormTask.cpp index c2c4f88044..4fd701a334 100644 --- a/src/MaaCore/Task/Infrast/InfrastDormTask.cpp +++ b/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; diff --git a/src/MaaCore/Task/Infrast/InfrastOfficeTask.cpp b/src/MaaCore/Task/Infrast/InfrastOfficeTask.cpp index 28057728f9..7981ef1c7f 100644 --- a/src/MaaCore/Task/Infrast/InfrastOfficeTask.cpp +++ b/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; } diff --git a/src/MaaCore/Task/Infrast/InfrastProcessingTask.cpp b/src/MaaCore/Task/Infrast/InfrastProcessingTask.cpp index bd911dba61..6db8bbca38 100644 --- a/src/MaaCore/Task/Infrast/InfrastProcessingTask.cpp +++ b/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(); diff --git a/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp b/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp index 5a2f46f52b..7e8e2a2d3e 100644 --- a/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp +++ b/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) { diff --git a/src/MaaCore/Task/Infrast/InfrastTrainingTask.cpp b/src/MaaCore/Task/Infrast/InfrastTrainingTask.cpp index 167fb53efb..e865a1425f 100644 --- a/src/MaaCore/Task/Infrast/InfrastTrainingTask.cpp +++ b/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()) {