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

feat: 自动战斗剧情遇到剧情无法继续时, 回退到执行作业步骤

Browse Source
This commit is contained in:
status102
2026-05-12 19:25:49 +08:00
parent 07e01367e7
commit 61345d8126
2 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resource/tasks/tasks.json
View File

@@ -3685,11 +3685,13 @@
"next": ["EndOfPlot"]
},
"BattleAvatarDialog": {
"doc": "战斗中带头像对话框, 类似于 SkipThePreBattlePlot(可见于画中人关卡) 的, 但是缺少 跳过 按钮",
"doc": "战斗中带头像对话框, 类似于 SkipThePreBattlePlot(可见于画中人关卡, 17章主线TR28) 的, 但是缺少 跳过 按钮",
"action": "ClickSelf",
"roi": [70, 30, 120, 30],
"maxTimes": 5,
"next": ["BattleAvatarDialog", "Stop"],
"rectMove": [125, 20, 200, 60]
"rectMove": [125, 20, 200, 60],
"specialParams": [98]
},
"EndOfPlot": {
"roi": [520, 0, 243, 206],

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

@@ -621,14 +621,39 @@ bool asst::BattleHelper::check_skip_plot_button(const cv::Mat& reusable)
bool asst::BattleHelper::check_avatar_dialog(const cv::Mat& reusable)
{
cv::Mat image = reusable.empty() ? m_inst_helper.ctrler()->get_image() : reusable;
const static auto& task = Task.get("BattleAvatarDialog");
const static double threshold = task->special_params[0] / 100.0;
Matcher battle_plot_analyzer(image);
battle_plot_analyzer.set_task_info("BattleAvatarDialog");
battle_plot_analyzer.set_task_info(task);
bool ret = battle_plot_analyzer.analyze().has_value();
if (ret) {
ProcessTask(this_task(), { "BattleAvatarDialog" }).run();
if (!ret) {
return false;
}
return ret;
ProcessTask(this_task(), { "BattleAvatarDialog" }).run();
const auto match_rect = battle_plot_analyzer.get_result().rect.move(task->rect_move);
cv::Mat image2 = m_inst_helper.ctrler()->get_image();
int retry = 100;
while (!m_inst_helper.need_exit() && retry > 0) {
Matcher matcher(image2);
matcher.set_templ(make_roi(image, match_rect));
matcher.set_roi(match_rect);
matcher.set_threshold(threshold);
matcher.set_method(MatchMethod::Ccoeff);
if (matcher.analyze()) {
LogInfo << __FUNCTION__ << "still in dialog, but not detected change, maybe need deploy or skill";
break;
}
--retry;
ret = ProcessTask(this_task(), { "BattleAvatarDialog" }).run();
if (!ret) {
break;
}
image = image2;
image2 = m_inst_helper.ctrler()->get_image();
}
return true;
}
bool asst::BattleHelper::check_in_speedup(const cv::Mat& reusable)
@@ -655,13 +680,13 @@ bool asst::BattleHelper::check_in_battle(const cv::Mat& reusable, bool weak)
else if (check_avatar_dialog(image)) {
if (m_in_speedup && !check_in_speedup()) {
speed_up(); // 跳过剧情会退出2倍速
m_inst_helper.sleep(Config.get_options().task_delay);
int times = 0;
while (times < 20 && !m_inst_helper.need_exit() && !check_in_speedup()) {
speed_up(); // 跳过剧情会退出2倍速
m_inst_helper.sleep(Config.get_options().task_delay);
times++;
}
}
}
}
else if (m_in_battle && result->pause_button == BattlefieldMatcher::PauseStatus::Pausing) {
if (check_avatar_dialog(image)) {
if (m_in_speedup && !check_in_speedup()) {
speed_up(); // 跳过剧情会退出2倍速
}
}
}