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

perf: 优化战斗中识别的鲁棒性

Browse Source
This commit is contained in:
MistEO
2023-01-14 14:41:40 +08:00
parent 72500b191a
commit de6c35d2bf
4 changed files with 28 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/MaaCore/Task/BattleHelper.cpp
View File

@@ -225,7 +225,7 @@ bool asst::BattleHelper::update_deployment(bool init, const cv::Mat& reusable)
cancel_oper_selection();
}
}
check_pause_button(image);
check_in_battle(image);
return true;
}
@@ -377,15 +377,22 @@ bool asst::BattleHelper::check_pause_button(const cv::Mat& reusable)
MatchImageAnalyzer battle_flag_analyzer(image);
battle_flag_analyzer.set_task_info("BattleOfficiallyBegin");
bool ret = battle_flag_analyzer.analyze();
m_in_battle = ret;
return ret;
}
bool asst::BattleHelper::check_in_battle(const cv::Mat& reusable)
{
cv::Mat image = reusable.empty() ? m_inst_helper.ctrler()->get_image() : reusable;
BattleImageAnalyzer analyzer(image);
m_in_battle = analyzer.analyze();
return m_in_battle;
}
bool asst::BattleHelper::wait_until_start()
{
LogTraceFunction;
while (!m_inst_helper.need_exit() && !check_pause_button()) {
while (!m_inst_helper.need_exit() && !check_in_battle()) {
std::this_thread::yield();
}
return true;
@@ -395,7 +402,7 @@ bool asst::BattleHelper::wait_until_end()
{
LogTraceFunction;
while (!m_inst_helper.need_exit() && check_pause_button()) {
while (!m_inst_helper.need_exit() && check_in_battle()) {
do_strategic_action();
std::this_thread::yield();
}
@@ -404,8 +411,7 @@ bool asst::BattleHelper::wait_until_end()
bool asst::BattleHelper::do_strategic_action(const cv::Mat& reusable)
{
check_pause_button(reusable);
return use_all_ready_skill(reusable);
return check_in_battle(reusable) && use_all_ready_skill(reusable);
}
bool asst::BattleHelper::use_all_ready_skill(const cv::Mat& reusable)