fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: update recruit time settings

Browse Source
This commit is contained in:
Horror Proton
2022-08-11 23:44:31 +08:00
parent 99943a4e3c
commit 973d9e503b
4 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/MeoAssistant/AutoRecruitTask.cpp
View File

@@ -141,11 +141,9 @@ asst::AutoRecruitTask& asst::AutoRecruitTask::set_set_time(bool set_time) noexce
return *this;
}
asst::AutoRecruitTask& asst::AutoRecruitTask::set_recruitment_time(int minutes) noexcept
asst::AutoRecruitTask& asst::AutoRecruitTask::set_recruitment_time(std::unordered_map<int, int> time_map) noexcept
{
minutes = std::clamp(minutes, 60, 9 * 60);
minutes -= minutes % 10;
m_desired_time = minutes;
m_desired_time_map = std::move(time_map);
return *this;
}
@@ -247,7 +245,7 @@ bool asst::AutoRecruitTask::recruit_one(const Rect& button)
if (need_exit()) return false;
if (m_set_time && !check_timer()) {
if (m_set_time && !check_timer(calc_result.recruitment_time)) {
// timer was not set to 09:00:00 properly, likely the tag selection was also corrupted
// see https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/300#issuecomment-1073287984
// return and try later
@@ -460,13 +458,17 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc
}
}
int recruitment_time = m_desired_time_map[(std::max)(final_combination.min_level, 3)];
if (recruitment_time == 0) recruitment_time = 9 * 60;
// try to set the timer to desired value
if (m_set_time) {
int desired_hour = m_desired_time / 60;
int desired_minute_div_10 = (m_desired_time % 60) / 10;
int temp = desired_hour + (desired_minute_div_10 != 0);
int hour_delta = (1 < temp) ? (1 + 9 - temp) : (temp - 1);
int minute_delta = (0 < desired_minute_div_10) ? (0 + 6 - desired_minute_div_10) : (0);
Log.info("recruitment time:", recruitment_time, "min");
const int desired_hour = recruitment_time / 60;
const int desired_minute_div_10 = (recruitment_time % 60) / 10;
const int temp = desired_hour + (desired_minute_div_10 != 0);
const int hour_delta = (1 < temp) ? (1 + 9 - temp) : (temp - 1);
const int minute_delta = (0 < desired_minute_div_10) ? (0 + 6 - desired_minute_div_10) : (0);
for (int i = 0; i < hour_delta; ++i)
m_ctrler->click(image_analyzer.get_hour_decrement_rect());
for (int i = 0; i < minute_delta; ++i)
@@ -478,6 +480,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc
calc_task_result_type result;
result.success = true;
result.force_skip = false;
result.recruitment_time = recruitment_time;
result.tags_selected = 0;
return result;
}
@@ -503,6 +506,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc
calc_task_result_type result;
result.success = true;
result.force_skip = false;
result.recruitment_time = recruitment_time;
result.tags_selected = static_cast<int>(final_combination.tags.size());
return result;
}
@@ -515,7 +519,7 @@ bool asst::AutoRecruitTask::recruit_begin()
return task.run();
}
bool asst::AutoRecruitTask::check_timer()
bool asst::AutoRecruitTask::check_timer(int minutes_expected)
{
const auto image = m_ctrler->get_image();
@@ -524,17 +528,17 @@ bool asst::AutoRecruitTask::check_timer()
hour_ocr.set_task_info("RecruitTimerH");
hour_ocr.analyze();
if (hour_ocr.get_result().empty()) return false;
std::string desired_hour_str = std::string("0") + std::to_string(m_desired_time / 60);
std::string desired_hour_str = std::string("0") + std::to_string(minutes_expected / 60);
if (hour_ocr.get_result().front().text != desired_hour_str) return false;
}
if (m_desired_time % 60 == 0) return true; // minute counter stays untouched
if (minutes_expected % 60 == 0) return true; // minute counter stays untouched
{
OcrImageAnalyzer minute_ocr(image);
minute_ocr.set_task_info("RecruitTimerM");
minute_ocr.analyze();
if (minute_ocr.get_result().empty()) return false;
std::string desired_minute_str = std::to_string((m_desired_time % 60) / 10) + "0";
std::string desired_minute_str = std::to_string((minutes_expected % 60) / 10) + "0";
if (minute_ocr.get_result().front().text != desired_minute_str) return false;
}
return true;