diff --git a/resource/tasks.json b/resource/tasks.json index 55bc9003ef..3dccb38022 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -5943,6 +5943,18 @@ 255 ] }, + "BattleStartAll": { + "action": "DoNothing", + "algorithm": "JustReturn", + "next": [ + "BattleStartNormal", + "BattleStartRaid", + "BattleStartExercise", + "BattleStartSimulation", + "BattleStartTrials", + "BattleStartTrialsRaid" + ] + }, "BattleStartNormal": { "baseTask": "BattleStart" }, @@ -5955,6 +5967,9 @@ "BattleStartTrials": { "baseTask": "BattleStart" }, + "BattleStartTrialsRaid": { + "baseTask": "BattleStart" + }, "BattleStartSimulation": { "action": "ClickSelf", "roi": [ diff --git a/resource/template/BattleStartTrialsRaid.png b/resource/template/BattleStartTrialsRaid.png new file mode 100644 index 0000000000..00d1ea2cbf Binary files /dev/null and b/resource/template/BattleStartTrialsRaid.png differ diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp index 0e99f73c9f..10ad69e711 100644 --- a/src/MaaCore/Task/Interface/CopilotTask.cpp +++ b/src/MaaCore/Task/Interface/CopilotTask.cpp @@ -19,10 +19,7 @@ asst::CopilotTask::CopilotTask(const AsstCallback& callback, Assistant* inst) m_subtasks.emplace_back(m_formation_task_ptr); auto start_2_tp = std::make_shared(callback, inst, TaskType); - start_2_tp - ->set_tasks({ "BattleStartNormal", "BattleStartRaid", "BattleStartExercise", "BattleStartSimulation", - "BattleStartTrials" }) - .set_ignore_error(false); + 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);