From 274d275f4fae2c4416e099400ca2ff7b98fe7cd9 Mon Sep 17 00:00:00 2001 From: status102 Date: Sat, 7 Oct 2023 16:56:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E4=BA=8C=E6=AC=A1=E6=A3=80=E6=B5=8B=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E4=BF=9D=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 24 ++++++++++++++++++++++ src/MaaCore/Task/Interface/StartUpTask.cpp | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/resource/tasks.json b/resource/tasks.json index c316438a75..93b7b97caf 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -3308,6 +3308,30 @@ "StartUpConnectingFlag@LoadingIcon" ] }, + "StartAtHome": { + "baseTask": "Home", + "action": "DoNothing", + "template": [ + "Terminal.png", + "TerminalDark.png", + "TerminalSami.png" + ], + "next": [ + "StartAtHome2", + "StartUpBegin" + ], + "postDelay_Doc": "等待以防万一(StartUp还有双倍的任务延迟等待,默认0.5s x2", + "postDelay": 2000 + }, + "StartAtHome2": { + "baseTask": "Home", + "action": "Stop", + "template": [ + "Terminal.png", + "TerminalDark.png", + "TerminalSami.png" + ] + }, "StartWithSanity": { "roi": [ 700, diff --git a/src/MaaCore/Task/Interface/StartUpTask.cpp b/src/MaaCore/Task/Interface/StartUpTask.cpp index f689978093..6fd40485ea 100644 --- a/src/MaaCore/Task/Interface/StartUpTask.cpp +++ b/src/MaaCore/Task/Interface/StartUpTask.cpp @@ -17,7 +17,7 @@ asst::StartUpTask::StartUpTask(const AsstCallback& callback, Assistant* inst) LogTraceFunction; // 前两项认为用户已手动启动至首页 - m_start_up_task_ptr->set_tasks({ "Home", "StartWithSanity", "StartUpBegin" }) + m_start_up_task_ptr->set_tasks({ "StartAtHome", "StartWithSanity", "StartUpBegin" }) .set_times_limit("BlackReturn", 0) .set_task_delay(Config.get_options().task_delay * 2) .set_retry_times(30);