From 737a754ced86a4156017e579e0261b92c66ad52d Mon Sep 17 00:00:00 2001 From: MistEO Date: Wed, 11 Jan 2023 00:18:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E6=88=98=E6=96=97?= =?UTF-8?q?=EF=BC=8C=E5=BE=AA=E7=8E=AF1000=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 18 ++++++++++++++++++ src/MaaCore/Task/Interface/CopilotTask.cpp | 22 ++++++++++++++-------- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/resource/tasks.json b/resource/tasks.json index 3dccb38022..9531d26847 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -9643,5 +9643,23 @@ 175, 132 ] + }, + "ClickCornerUntilStartButton": { + "algorithm": "JustReturn", + "action": "ClickRect", + "specificRect": [ + 1000, + 120, + 270, + 10 + ], + "next": [ + "BattleStartPreFlag", + "ClickCornerUntilStartButton" + ] + }, + "BattleStartPreFlag": { + "baseTask": "BattleStartPre", + "action": "DoNothing" } } diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp index 10ad69e711..72d4c300a1 100644 --- a/src/MaaCore/Task/Interface/CopilotTask.cpp +++ b/src/MaaCore/Task/Interface/CopilotTask.cpp @@ -12,17 +12,23 @@ asst::CopilotTask::CopilotTask(const AsstCallback& callback, Assistant* inst) m_formation_task_ptr(std::make_shared(callback, inst, TaskType)), m_battle_task_ptr(std::make_shared(callback, inst, TaskType)) { - auto start_1_tp = std::make_shared(callback, inst, TaskType); - start_1_tp->set_tasks({ "BattleStartPre" }).set_retry_times(0).set_ignore_error(true); - m_subtasks.emplace_back(start_1_tp); + for (int i = 0; i != 1000; ++i) { + auto start_1_tp = std::make_shared(callback, inst, TaskType); + start_1_tp->set_tasks({ "BattleStartPre" }).set_retry_times(0).set_ignore_error(true); + m_subtasks.emplace_back(start_1_tp); - m_subtasks.emplace_back(m_formation_task_ptr); + m_subtasks.emplace_back(m_formation_task_ptr); - auto start_2_tp = std::make_shared(callback, inst, TaskType); - start_2_tp->set_tasks({ "BattleStartAll" }).set_ignore_error(false); - m_subtasks.emplace_back(start_2_tp); + auto start_2_tp = std::make_shared(callback, inst, TaskType); + start_2_tp->set_tasks({ "BattleStartAll" }).set_ignore_error(false); + m_subtasks.emplace_back(start_2_tp); - m_subtasks.emplace_back(m_battle_task_ptr)->set_retry_times(0); + m_subtasks.emplace_back(m_battle_task_ptr)->set_retry_times(0); + + auto stop_task_ptr = std::make_shared(callback, inst, TaskType); + stop_task_ptr->set_tasks({ "ClickCornerUntilStartButton" }); + m_subtasks.emplace_back(stop_task_ptr); + } } bool asst::CopilotTask::set_params(const json::value& params)