diff --git a/resource/tasks.json b/resource/tasks.json index e2c300f139..1cf49ecaf6 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -5620,6 +5620,16 @@ "CloseCluePageThenSendClue" ] }, + "BackToReceptionMain": { + "algorithm": "JustReturn", + "action": "ClickRect", + "specificRect": [ + 280, + 96, + 130, + 32 + ] + }, "CloseCluePageThenSendClue": { "template": "CloseCluePage.png", "action": "ClickSelf", diff --git a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp index 61f8f2112d..46845e2cd8 100644 --- a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp @@ -20,16 +20,19 @@ bool asst::InfrastReceptionTask::_run() close_end_of_clue_exchange(); + // 防止送线索把可以填入的送了 + proc_clue_vacancy(); + if (unlock_clue_exchange()) { + proc_clue_vacancy(); + } + back_to_reception_main(); + get_clue(); if (need_exit()) { return false; } use_clue(); - if (need_exit()) { - return false; - } - click_return_button(); - click_bottom_left_tab(); + back_to_reception_main(); if (need_exit()) { return false; } @@ -133,6 +136,12 @@ bool asst::InfrastReceptionTask::unlock_clue_exchange() return task.run(); } +bool asst::InfrastReceptionTask::back_to_reception_main() +{ + ProcessTask task(*this, { "BackToReceptionMain" }); + return task.run(); +} + bool asst::InfrastReceptionTask::send_clue() { ProcessTask task(*this, { "SendClues" }); @@ -204,4 +213,4 @@ bool asst::InfrastReceptionTask::shift() } click_confirm_button(); return true; -} \ No newline at end of file +} diff --git a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.h b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.h index 9781344cc2..1cd6a90f42 100644 --- a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.h +++ b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.h @@ -19,6 +19,7 @@ namespace asst bool use_clue(); bool proc_clue_vacancy(); bool unlock_clue_exchange(); + bool back_to_reception_main(); bool send_clue(); bool shift(); };