From cc8b309e48d593a7f3b16619f900a1a60c68fdfc Mon Sep 17 00:00:00 2001 From: status102 Date: Sun, 17 Sep 2023 16:45:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=88=98=E6=96=97-=E6=88=98=E6=96=97=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E5=AF=BC=E8=88=AA=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 63 ++++++++++-------- resource/template/MissionFailed.png | Bin 3330 -> 0 bytes src/MaaCore/Task/Interface/CopilotTask.cpp | 2 +- .../Task/Miscellaneous/TaskFileReloadTask.cpp | 1 + src/MaaWpfGui/Main/AsstProxy.cs | 2 +- 5 files changed, 40 insertions(+), 28 deletions(-) delete mode 100644 resource/template/MissionFailed.png diff --git a/resource/tasks.json b/resource/tasks.json index 2b9dd9292d..194f9111b9 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -3994,7 +3994,8 @@ "l", "1" ] - ] + ], + "preDelay": 300 }, "UseMedicine": { "action": "DoNothing", @@ -13106,44 +13107,54 @@ 163 ] }, - "Copilot@ClickCornerUntilFailedOrStartButton": { + "Copilot@ClickCornerUntilFailedOrThreeStars": { "algorithm": "JustReturn", "action": "DoNothing", "next": [ - "Copilot@MissionFailed", + "Copilot@EndOfAction", + "Copilot@ClickCornerBeforeThreeStars" + ] + }, + "Copilot@EndOfAction": { + "template": "EndOfAction.png", + "action": "DoNothing", + "reduceOtherTimes": [], + "next": [ + "Copilot@StageDrops-Stars-3" + ] + }, + "Copilot@StageDrops-Stars-3": { + "Doc": "如果没有三星就终止", + "template": "StageDrops-Stars-3.png", + "action": "DoNothing", + "next": [ + "Copilot@ClickCornerUntilStartButton" + ] + }, + "Copilot@ClickCornerBeforeThreeStars": { + "Doc": "三星之前", + "baseTask": "Copilot@ClickCornerUntilStartButton", + "next": [ + "Copilot@ClickCornerUntilFailedOrThreeStars" + ] + }, + "Copilot@ClickCornerUntilStartButton": { + "Doc": "三星之后", + "next": [ "Copilot@BattleStartPreFlag", "Copilot@ClickCornerUntilStartButton" ] }, - "Copilot@ClickCornerUntilStartButton": { - "next": [ - "Copilot@ClickCornerUntilFailedOrStartButton" - ] - }, - "Copilot@MissionFailed": { - "Doc": "如果没有三星就终止", - "template": "MissionFailed.png", + "Copilot@BattleStartPreFlag": { + "baseTask": "BattleStartPreFlag", "action": "DoNothing", "roi": [ - 210, - 290, - 70, - 70 - ], - "next_Doc": "主动抛错", - "next": [ - "Copilot@BattleStartPreFlag" - ] - }, - "Copilot@BattleStartPreFlag": { - "baseTask": "BattleStartPre", - "action": "DoNothing", - "roi":[ 0, 0, 1280, 720 - ] + ], + "next": [] }, "ClickCornerUntilStartButton": { "algorithm": "JustReturn", diff --git a/resource/template/MissionFailed.png b/resource/template/MissionFailed.png deleted file mode 100644 index 5ffb1fec208ba6fbf5103c7fc214d76df83ace7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3330 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 M07*qoM6N<$g1+l`5&!@I diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp index 7e9f2779d4..9c114ffd97 100644 --- a/src/MaaCore/Task/Interface/CopilotTask.cpp +++ b/src/MaaCore/Task/Interface/CopilotTask.cpp @@ -148,7 +148,7 @@ bool asst::CopilotTask::set_params(const json::value& params) else if (need_navigate) { // 如果没三星就中止 Task.get("Copilot@BattleStartPreFlag")->text.emplace_back(m_navigate_name); - m_stop_task_ptr->set_tasks({ "Copilot@ClickCornerUntilFailedOrStartButton" }); + m_stop_task_ptr->set_tasks({ "Copilot@ClickCornerUntilFailedOrThreeStars" }); m_stop_task_ptr->set_enable(true); } diff --git a/src/MaaCore/Task/Miscellaneous/TaskFileReloadTask.cpp b/src/MaaCore/Task/Miscellaneous/TaskFileReloadTask.cpp index ee49794fbf..98e41c98d4 100644 --- a/src/MaaCore/Task/Miscellaneous/TaskFileReloadTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/TaskFileReloadTask.cpp @@ -35,6 +35,7 @@ bool asst::TaskFileReloadTask::_run() json::value info = basic_info_with_what("CopilotListLoadTaskFileSuccess"); info["details"]["stage_name"] = Copilot.get_stage_name(); + info["details"]["file_name"] = std::move(m_file); callback(AsstMsg::SubTaskExtraInfo, info); return true; } diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 8a6a7f3f92..ba323cbffa 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -1063,7 +1063,7 @@ namespace MaaWpfGui.Main break; case "CopilotListLoadTaskFileSuccess": - Instances.CopilotViewModel.AddLog("Parse " + subTaskDetails["stage_name"].ToString() + " Success"); + Instances.CopilotViewModel.AddLog($"Parse {subTaskDetails["file_name"]}[{subTaskDetails["stage_name"]}] Success"); break; case "CopilotListEnterSuccess": Instances.CopilotViewModel.EnterCopilotTask();