fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 01:59:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: 增加重试次数限制

Browse Source
This commit is contained in:
status102
2023-11-15 09:27:17 +08:00
parent b2f2e69b99
commit dbea012bbf
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.cpp
View File

@@ -12,13 +12,13 @@ bool asst::RoguelikeSettlementTaskPlugin::verify(AsstMsg msg, const json::value&
}
auto task_name = details.at("details").at("task").as_string();
if (m_config->get_mode() == RoguelikeMode::Exp && task_name.ends_with("Roguelike@GamePass")) {
if (task_name.ends_with("Roguelike@GamePass")) {
m_game_pass = true;
return true;
return m_config->get_mode() == RoguelikeMode::Exp;
}
else if (m_config->get_mode() == RoguelikeMode::Exp && task_name.ends_with("Roguelike@MissionFailedFlag2")) {
else if (task_name.ends_with("Roguelike@MissionFailedFlag2")) {
m_game_pass = false;
return true;
return m_config->get_mode() == RoguelikeMode::Exp;
}
else {
return false;
@@ -115,6 +115,7 @@ bool asst::RoguelikeSettlementTaskPlugin::get_settlement_info(json::value& info,
bool asst::RoguelikeSettlementTaskPlugin::wait_for_whole_page()
{
int retry = 0;
cv::Mat image;
Matcher matcher;
matcher.set_task_info("RoguelikeSettlementConfirm");
@@ -124,7 +125,9 @@ bool asst::RoguelikeSettlementTaskPlugin::wait_for_whole_page()
if (matcher.analyze()) {
return true;
}
Log.error(__FUNCTION__, "RoguelikeSettlementConfirm match failed, retry:", retry);
++retry;
sleep(Config.get_options().task_delay);
} while (!need_exit());
} while (!need_exit() && retry < 20);
return false;
}