diff --git a/resource/tasks.json b/resource/tasks.json index f4780558a7..aa0789a015 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -7372,6 +7372,15 @@ 255 ] }, + "SkipForbiddenOperConfirm": { + "action": "ClickSelf", + "roi": [ + 640, + 554, + 632, + 76 + ] + }, "BattleStartAll": { "action": "DoNothing", "algorithm": "JustReturn", diff --git a/resource/template/SkipForbiddenOperConfirm.png b/resource/template/SkipForbiddenOperConfirm.png new file mode 100644 index 0000000000..90b57b0bd3 Binary files /dev/null and b/resource/template/SkipForbiddenOperConfirm.png differ diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp index 3c549f2690..027ab8e9dd 100644 --- a/src/MaaCore/Task/Interface/CopilotTask.cpp +++ b/src/MaaCore/Task/Interface/CopilotTask.cpp @@ -43,6 +43,11 @@ asst::CopilotTask::CopilotTask(const AsstCallback& callback, Assistant* inst) m_copilot_list_notification_ptr = start_2_tp->register_plugin(); m_subtasks.emplace_back(start_2_tp); + //跳过“以下干员出战后将被禁用,是否继续?”对话框 + auto start_3_tp = std::make_shared(callback, inst, TaskType); + start_3_tp->set_tasks({ "SkipForbiddenOperConfirm", "Stop" }).set_ignore_error(false); + m_subtasks.emplace_back(start_3_tp); + m_subtasks.emplace_back(m_battle_task_ptr)->set_retry_times(0); m_stop_task_ptr->set_enable(false);