diff --git a/resource/tasks.json b/resource/tasks.json index dc63d15d92..e39c14854c 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -879,6 +879,7 @@ 640, 360 ], + "rearDelay": 1000, "next": [ "CreditStoreOcr", "Mall" @@ -1173,6 +1174,28 @@ 400, 650, 160 + ], + "next": [ + "RecruitLoading", + "Stop" + ] + }, + "RecruitLoading": { + "algorithm": "OcrDetect", + "action": "doNothing", + "text": [ + "正在提交", + "反馈至神经" + ], + "roi": [ + 700, + 600, + 300, + 120 + ], + "next": [ + "RecruitLoading", + "Stop" ] }, "RecruitConfirm": { diff --git a/src/MeoAssistance/Assistance.cpp b/src/MeoAssistance/Assistance.cpp index bc6ad6b212..ed56a65640 100644 --- a/src/MeoAssistance/Assistance.cpp +++ b/src/MeoAssistance/Assistance.cpp @@ -248,6 +248,7 @@ bool asst::Assistance::append_recruit(unsigned max_times, const std::vector recruit_task_ptr->set_required_level(required_level); recruit_task_ptr->set_confirm_level(confirm_level); recruit_task_ptr->set_task_chain(TaskChain); + recruit_task_ptr->set_retry_times(AutoRecruitTaskRetryTimesDefault); m_tasks_queue.emplace(recruit_task_ptr); diff --git a/src/MeoAssistance/Assistance.h b/src/MeoAssistance/Assistance.h index cb40e73db6..01069bca1c 100644 --- a/src/MeoAssistance/Assistance.h +++ b/src/MeoAssistance/Assistance.h @@ -76,6 +76,7 @@ namespace asst static constexpr int ProcessTaskRetryTimesDefault = 20; static constexpr int OpenRecruitTaskRetryTimesDefault = 10; + static constexpr int AutoRecruitTaskRetryTimesDefault = 5; private: void working_proc(); diff --git a/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml index 838fc87c7f..2603b38e99 100644 --- a/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml +++ b/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml @@ -15,7 +15,7 @@ - diff --git a/src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml index 1bd5b5e96a..10519e1f26 100644 --- a/src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml +++ b/src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml @@ -9,7 +9,7 @@ d:DesignHeight="300" d:DesignWidth="550"> - + \ No newline at end of file