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 5ffb1fec20..0000000000 Binary files a/resource/template/MissionFailed.png and /dev/null differ 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();