diff --git a/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp index 747db83479..314c5db0b2 100644 --- a/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp @@ -207,6 +207,7 @@ asst::AutoRecruitTask& asst::AutoRecruitTask::set_server(std::string server) noe bool asst::AutoRecruitTask::_run() { if (is_calc_only_task()) { + // 小工具中的公招计算,不需要点击确认按钮 return recruit_calc_task().success; } @@ -215,6 +216,7 @@ bool asst::AutoRecruitTask::_run() } { + // 领取一下已完成的招募 const auto image = ctrler()->get_image(); // initialize_dirty_slot_info(image); m_dirty_slots = { 0, 1, 2, 3 }; @@ -427,7 +429,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc } #endif - const std::vector& tags = image_analyzer.get_tags_result(); + const std::vector& tags = image_analyzer.get_tags_result(); // 中文的招募tag m_has_refresh = !image_analyzer.get_refresh_rect().empty(); m_has_permit = image_analyzer.get_permit_rect().empty(); diff --git a/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.h b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.h index 2ded492fcf..8b3531f37b 100644 --- a/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.h +++ b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.h @@ -50,6 +50,7 @@ protected: bool recruit_now(); bool confirm(); bool refresh(); + // 检查是否有已完成且未领取的招募,有则领取,无则返回true bool hire_all(const cv::Mat&); bool hire_all(); bool initialize_dirty_slot_info(const cv::Mat&); @@ -155,7 +156,7 @@ protected: std::vector m_select_level; std::vector m_confirm_level; bool m_need_refresh = false; - bool m_use_expedited = false; + bool m_use_expedited = false; // 是否使用加急许可 ExtraTagsMode m_select_extra_tags_mode = ExtraTagsMode::NoExtra; std::vector m_first_tags; int m_max_times = 0;