From ba2f866628381ab9391779fdb9a17ba37f652b16 Mon Sep 17 00:00:00 2001 From: mslxl Date: Fri, 18 Mar 2022 12:18:33 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix.=20=E6=9E=81=E7=AB=AF=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E6=97=A0=E6=B3=95=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E5=85=AC=E6=8B=9B=E5=B9=B6=E8=BF=9B=E5=85=A5=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/resource/tasks.json b/resource/tasks.json index a01c44cdeb..bbd78559ef 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -898,6 +898,26 @@ 255 ], "next": [ + "RecruitBeginLoading", + "RecruitBegin" + ] + }, + "RecruitBeginLoading": { + "algorithm": "OcrDetect", + "action": "doNothing", + "text": [ + "正在提交", + "反馈至神经" + ], + "roi": [ + 700, + 600, + 300, + 120 + ], + "next": [ + "RecruitBeginLoading", + "Recruit", "RecruitBegin" ] }, From 8d2fc9254f901b770fa8564a8fd67ba121addd33 Mon Sep 17 00:00:00 2001 From: mslxl Date: Fri, 18 Mar 2022 13:15:45 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix.=20=E6=9E=81=E7=AB=AF=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E6=97=A0=E6=B3=95=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=85=AC=E6=8B=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 点击聘用候选人后游戏进入漫长的加载，此时MAA会执行尝试RecruitSkip, RecruitSkipWithoutButton等一系列任务（大概会全失败吧）后开始基建任务，待游戏加载完成后进入开简历界面，这时MAA既无法点击SKIP按钮，也无法正常执行基建任务 --- resource/tasks.json | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/resource/tasks.json b/resource/tasks.json index bbd78559ef..35d0e591b1 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -932,6 +932,27 @@ 420 ], "next": [ + "RecruitFinishLoading", + "RecruitFinish", + "RecruitSkip", + "RecruitSkipWithoutButton" + ] + }, + "RecruitFinishLoading":{ + "algorithm": "OcrDetect", + "action": "doNothing", + "text": [ + "正在提交", + "反馈至神经" + ], + "roi": [ + 700, + 600, + 300, + 120 + ], + "next": [ + "RecruitFinishLoading", "RecruitFinish", "RecruitSkip", "RecruitSkipWithoutButton" @@ -1720,6 +1741,25 @@ 80 ], "next": [ + "RecruitConfirmLoading", + "RecruitFlag" + ] + }, + "RecruitConfirmLoading":{ + "algorithm": "OcrDetect", + "action": "doNothing", + "text": [ + "正在提交", + "反馈至神经" + ], + "roi": [ + 700, + 600, + 300, + 120 + ], + "next": [ + "RecruitConfirmLoading", "RecruitFlag" ] }, From 0e24348b96e825835ea7ab0656c58969ca2293b1 Mon Sep 17 00:00:00 2001 From: mslxl Date: Mon, 21 Mar 2022 00:41:37 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix.=20=E6=9E=81=E7=AB=AF=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E4=B8=8B=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/resource/tasks.json b/resource/tasks.json index 35d0e591b1..3b4de73665 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -1965,6 +1965,27 @@ 150 ], "next": [ + "DroneConfirmLoading", + "DeliverableOrder", + "DroneAssist-Trade-Stop", + "DroneAssistMfg" + ] + }, + "DroneConfirmLoading": { + "algorithm": "OcrDetect", + "action": "doNothing", + "text": [ + "正在提交", + "反馈至神经" + ], + "roi": [ + 700, + 600, + 300, + 120 + ], + "next": [ + "DroneConfirmLoading", "DeliverableOrder", "DroneAssist-Trade-Stop", "DroneAssistMfg" From 8b9294da2c78016fc0bbeb2b4b575c15dc43ab5c Mon Sep 17 00:00:00 2001 From: mslxl Date: Mon, 21 Mar 2022 01:06:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix.=20=E6=9E=81=E7=AB=AF=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E4=B8=8B=E4=BC=A0=E9=80=92=E7=BA=BF=E7=B4=A2=E5=8D=A1=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原本在传递完一个线索后，会尝试传递下一个线索。在传递这个线索时，首先会在左侧选择它，然后在右边找能传的好友，找不到就翻页。由于方舟加载较慢，没有选中线索，右侧好友栏中找不到能传的对象，会不停的翻页后卡在最后一页。 --- resource/tasks.json | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/resource/tasks.json b/resource/tasks.json index 3b4de73665..eb080ba5d5 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -3117,6 +3117,25 @@ "ClueGiveTo1stConfirm" ] }, + "ClueGiveLoading": { + "algorithm": "OcrDetect", + "action": "doNothing", + "text": [ + "正在提交", + "反馈至神经" + ], + "roi": [ + 700, + 600, + 300, + 120 + ], + "next": [ + "ClueGiveLoading", + "SelectClue", + "CloseSendClue" + ] + }, "ClueGiveTo1st": { "template": "ClusCanBeSent.png", "action": "doNothing", @@ -3145,6 +3164,7 @@ 160 ], "next": [ + "ClueGiveLoading", "SelectClue", "CloseSendClue" ] @@ -3177,6 +3197,7 @@ 160 ], "next": [ + "ClueGiveLoading", "SelectClue", "CloseSendClue" ] @@ -3209,6 +3230,7 @@ 160 ], "next": [ + "ClueGiveLoading", "SelectClue", "CloseSendClue" ] @@ -3241,6 +3263,7 @@ 160 ], "next": [ + "ClueGiveLoading", "SelectClue", "CloseSendClue" ] From a80430fa0abf0c73e35b0e29917337e44cf696c3 Mon Sep 17 00:00:00 2001 From: mslxl Date: Mon, 21 Mar 2022 14:14:01 +0800 Subject: [PATCH 5/6] fix. typo --- src/MeoAssistant/AutoRecruitTask.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp index 38f766ae86..8a61da5b2c 100644 --- a/src/MeoAssistant/AutoRecruitTask.cpp +++ b/src/MeoAssistant/AutoRecruitTask.cpp @@ -108,25 +108,25 @@ bool asst::AutoRecruitTask::recruit_index(size_t index) bool asst::AutoRecruitTask::calc_and_recruit() { - RecruitTask recurit_task(m_callback, m_callback_arg, m_task_chain); - recurit_task.set_retry_times(m_retry_times); - recurit_task.set_param(m_select_level, true); + RecruitTask recruit_task(m_callback, m_callback_arg, m_task_chain); + recruit_task.set_retry_times(m_retry_times); + recruit_task.set_param(m_select_level, true); // 识别错误，放弃这个公招位，直接返回 - if (!recurit_task.run()) { + if (!recruit_task.run()) { callback(AsstMsg::SubTaskError, basic_info()); click_return_button(); return true; } - int maybe_level = recurit_task.get_maybe_level(); + int maybe_level = recruit_task.get_maybe_level(); if (need_exit()) { return false; } // 尝试刷新 if (m_need_refresh && maybe_level == 3 - && !recurit_task.get_has_special_tag() - && recurit_task.get_has_refresh()) { + && !recruit_task.get_has_special_tag() + && recruit_task.get_has_refresh()) { if (refresh()) { return calc_and_recruit(); } From 9c89c51f29ce491b9ad5021c1699acfa99b38c0f Mon Sep 17 00:00:00 2001 From: mslxl Date: Mon, 21 Mar 2022 17:53:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix.=20=E6=9E=81=E7=AB=AF=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E4=B8=8B=E5=85=AC=E6=8B=9B=E4=B8=8D=E8=B0=83=E6=95=B4=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 11 +++++++++++ src/MeoAssistant/AutoRecruitTask.cpp | 16 ++++++++++++++-- src/MeoAssistant/AutoRecruitTask.h | 1 + 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/resource/tasks.json b/resource/tasks.json index 3b4de73665..06847837b2 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -1732,6 +1732,17 @@ "Stop" ] }, + "RecruitCheckTimeUnreduced":{ + "action": "Stop", + "template": "RecruitTimeReduce.png", + "Doc": "检查时间是不是没有调整过", + "roi": [ + 350, + 150, + 200, + 150 + ] + }, "RecruitConfirm": { "action": "clickSelf", "roi": [ diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp index 8a61da5b2c..0fa9de580d 100644 --- a/src/MeoAssistant/AutoRecruitTask.cpp +++ b/src/MeoAssistant/AutoRecruitTask.cpp @@ -3,7 +3,6 @@ #include "Resource.h" #include "OcrImageAnalyzer.h" #include "Controller.h" -#include "RecruitImageAnalyzer.h" #include "ProcessTask.h" #include "RecruitTask.h" @@ -131,9 +130,16 @@ bool asst::AutoRecruitTask::calc_and_recruit() return calc_and_recruit(); } } + // 如果时间没调整过，那 tag 十有八九也没选，重新试一次 + // 造成时间没调的原因可见： https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/300#issuecomment-1073287984 + if (check_time_unreduced()) { + return calc_and_recruit(); + } + if (need_exit()) { return false; } + if (std::find(m_confirm_level.cbegin(), m_confirm_level.cend(), maybe_level) != m_confirm_level.cend()) { if (!confirm()) { return false; @@ -144,6 +150,12 @@ bool asst::AutoRecruitTask::calc_and_recruit() } return true; } +bool asst::AutoRecruitTask::check_time_unreduced() +{ + ProcessTask task(*this, {"RecruitCheckTimeUnreduced"}); + task.set_retry_times(1); + return task.run(); +} bool asst::AutoRecruitTask::check_recruit_home_page() { @@ -168,4 +180,4 @@ bool asst::AutoRecruitTask::refresh() { ProcessTask refresh_task(*this, { "RecruitRefresh" }); return refresh_task.run(); -} +} \ No newline at end of file diff --git a/src/MeoAssistant/AutoRecruitTask.h b/src/MeoAssistant/AutoRecruitTask.h index 6ab96df4da..727a294f2f 100644 --- a/src/MeoAssistant/AutoRecruitTask.h +++ b/src/MeoAssistant/AutoRecruitTask.h @@ -24,6 +24,7 @@ namespace asst bool recruit_index(size_t index); bool calc_and_recruit(); bool check_recruit_home_page(); + bool check_time_unreduced(); bool recruit_now(); bool confirm(); bool refresh();