From 81c8e3faa9d3d9b00baa2138005d69bdbcc694fc Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 09:28:33 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=9A=90=E5=BC=8F?= =?UTF-8?q?=E5=85=A8=E5=B1=8F=20roi=20=E7=9B=B8=E5=85=B3=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 修复 DropsFlag 相关 task 的 roi 为全屏的问题 * perf: 统一肉鸽 Stage 类任务 baseTask 继承到对应 theme * fix: 修复 Sami@Roguelike@StageBoonsAI6 的 roi 为全屏的问题 fix #9557 --- resource/tasks.json | 130 ++++++++------------------------ src/MaaCore/Config/TaskData.cpp | 2 +- 2 files changed, 31 insertions(+), 101 deletions(-) diff --git a/resource/tasks.json b/resource/tasks.json index 809febefc5..8d093b4763 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -310,6 +310,7 @@ "ClickStageName": { "algorithm": "OcrDetect", "action": "ClickSelf", + "roi": [0, 0, 1280, 720], "fullMatch": true, "isAscii": true, "text": [], @@ -5429,6 +5430,7 @@ }, "ClickPlotStage": { "action": "ClickSelf", + "roi": [0, 0, 1280, 720], "next": ["BattleStartPlot"], "maxTimes": 1 }, @@ -6265,6 +6267,28 @@ "Roguelike@DropsFlag": { "roi": [875, 601, 152, 119] }, + "Roguelike@DropsFlag_default": { + "template": "Roguelike@DropsFlag.png", + "baseTask": "Roguelike@DropsFlag", + "next": [ + "Roguelike@GetDrops#next", + "Roguelike@GetDropCompleted", + "Roguelike@GetDropLeave", + "Roguelike@Stages#next", + "Roguelike@StageEncounterOptions#next", + "Roguelike@StageEncounterSpecialClose", + "Roguelike@EnterAfterRecruit", + "Roguelike@StageTraderLeave", + "Roguelike@CloseEvent", + "Roguelike@DialogSkip", + "Roguelike@RecruitOther" + ] + }, + "Roguelike@DropsFlag_mode1": { + "template": "Roguelike@DropsFlag.png", + "baseTask": "Roguelike@DropsFlag", + "next": ["Roguelike@GetDropLeave", "Roguelike@DropsFlag_default#next"] + }, "Roguelike@EnterAfterRecruit": { "Doc": "base_task", "template": "empty.png", @@ -7318,38 +7342,6 @@ "template": "Roguelike@DropsFlag.png", "baseTask": "Phantom@Roguelike@DropsFlag_default" }, - "Phantom@Roguelike@DropsFlag_default": { - "template": "Roguelike@DropsFlag.png", - "next": [ - "Phantom@Roguelike@GetDrops#next", - "Phantom@Roguelike@GetDropCompleted", - "Phantom@Roguelike@GetDropLeave", - "Phantom@Roguelike@Stages#next", - "Phantom@Roguelike@StageEncounterOptions#next", - "Phantom@Roguelike@StageEncounterSpecialClose", - "Phantom@Roguelike@EnterAfterRecruit", - "Phantom@Roguelike@StageTraderLeave", - "Phantom@Roguelike@CloseEvent", - "Phantom@Roguelike@DialogSkip", - "Phantom@Roguelike@RecruitOther" - ] - }, - "Phantom@Roguelike@DropsFlag_mode1": { - "template": "Roguelike@DropsFlag.png", - "next": [ - "Phantom@Roguelike@GetDropLeave", - "Phantom@Roguelike@GetDrops#next", - "Phantom@Roguelike@GetDropCompleted", - "Phantom@Roguelike@Stages#next", - "Phantom@Roguelike@StageEncounterOptions#next", - "Phantom@Roguelike@StageEncounterSpecialClose", - "Phantom@Roguelike@EnterAfterRecruit", - "Phantom@Roguelike@StageTraderLeave", - "Phantom@Roguelike@CloseEvent", - "Phantom@Roguelike@DialogSkip", - "Phantom@Roguelike@RecruitOther" - ] - }, "Phantom@Roguelike@EnterAfterRecruit": {}, "Phantom@Roguelike@ExitThenAbandon": { "template": "Roguelike@ExitThenAbandon.png", @@ -7703,38 +7695,6 @@ "template": "Roguelike@DropsFlag.png", "baseTask": "Mizuki@Roguelike@DropsFlag_default" }, - "Mizuki@Roguelike@DropsFlag_default": { - "template": "Roguelike@DropsFlag.png", - "next": [ - "Mizuki@Roguelike@GetDrops#next", - "Mizuki@Roguelike@GetDropCompleted", - "Mizuki@Roguelike@GetDropLeave", - "Mizuki@Roguelike@Stages#next", - "Mizuki@Roguelike@StageEncounterOptions#next", - "Mizuki@Roguelike@StageEncounterSpecialClose", - "Mizuki@Roguelike@EnterAfterRecruit", - "Mizuki@Roguelike@StageTraderLeave", - "Mizuki@Roguelike@CloseEvent", - "Mizuki@Roguelike@DialogSkip", - "Mizuki@Roguelike@RecruitOther" - ] - }, - "Mizuki@Roguelike@DropsFlag_mode1": { - "template": "Roguelike@DropsFlag.png", - "next": [ - "Mizuki@Roguelike@GetDropLeave", - "Mizuki@Roguelike@GetDrops#next", - "Mizuki@Roguelike@GetDropCompleted", - "Mizuki@Roguelike@Stages#next", - "Mizuki@Roguelike@StageEncounterOptions#next", - "Mizuki@Roguelike@StageEncounterSpecialClose", - "Mizuki@Roguelike@EnterAfterRecruit", - "Mizuki@Roguelike@StageTraderLeave", - "Mizuki@Roguelike@CloseEvent", - "Mizuki@Roguelike@DialogSkip", - "Mizuki@Roguelike@RecruitOther" - ] - }, "Mizuki@Roguelike@EnterAfterRecruit": {}, "Mizuki@Roguelike@ExitThenAbandon": { "template": "Roguelike@ExitThenAbandon.png", @@ -8172,6 +8132,7 @@ "Sami@Roguelike@CheckCollapsalParadigms_bannerCheckConfig": { "Doc": "RoguelikeCollapsalParadigmTaskPlugin用参数", "algorithm": "OcrDetect", + "roi": [0, 0, 1280, 720], "sub": ["Sami@Roguelike@MissionCompletedFlag"], "text": ["坍缩范式加深"], "next": [ @@ -8389,38 +8350,6 @@ "template": "Roguelike@DropsFlag.png", "baseTask": "Sami@Roguelike@DropsFlag_default" }, - "Sami@Roguelike@DropsFlag_default": { - "template": "Roguelike@DropsFlag.png", - "next": [ - "Sami@Roguelike@GetDrops#next", - "Sami@Roguelike@GetDropCompleted", - "Sami@Roguelike@GetDropLeave", - "Sami@Roguelike@Stages#next", - "Sami@Roguelike@StageEncounterOptions#next", - "Sami@Roguelike@StageEncounterSpecialClose", - "Sami@Roguelike@EnterAfterRecruit", - "Sami@Roguelike@StageTraderLeave", - "Sami@Roguelike@CloseEvent", - "Sami@Roguelike@DialogSkip", - "Sami@Roguelike@RecruitOther" - ] - }, - "Sami@Roguelike@DropsFlag_mode1": { - "template": "Roguelike@DropsFlag.png", - "next": [ - "Sami@Roguelike@GetDropLeave", - "Sami@Roguelike@GetDrops#next", - "Sami@Roguelike@GetDropCompleted", - "Sami@Roguelike@Stages#next", - "Sami@Roguelike@StageEncounterOptions#next", - "Sami@Roguelike@StageEncounterSpecialClose", - "Sami@Roguelike@EnterAfterRecruit", - "Sami@Roguelike@StageTraderLeave", - "Sami@Roguelike@CloseEvent", - "Sami@Roguelike@DialogSkip", - "Sami@Roguelike@RecruitOther" - ] - }, "Sami@Roguelike@EnterAfterRecruit": { "next": ["Sami@Roguelike@NextLevel"] }, @@ -8733,6 +8662,7 @@ "next": ["Sami@Roguelike@StageBoonsEnter", "Sami@Roguelike@Stages#next"] }, "Sami@Roguelike@StageBoonsAI6": { + "baseTask": "Sami@Roguelike@Stage", "templThreshold": 0.95, "next": ["Sami@Roguelike@StageBoonsEnter", "Sami@Roguelike@Stages#next"] }, @@ -8755,7 +8685,7 @@ }, "Sami@Roguelike@StageBoskyPassageAI6": { "templThreshold": 0.9, - "baseTask": "Roguelike@Stage", + "baseTask": "Sami@Roguelike@Stage", "next": [ "Sami@Roguelike@StageBoskyPassageEnter", "Sami@Roguelike@Stages#next" @@ -8774,7 +8704,7 @@ }, "Sami@Roguelike@StageCombatDpsAI6": { "templThreshold": 0.95, - "baseTask": "Roguelike@Stage", + "baseTask": "Sami@Roguelike@Stage", "next": [ "Sami@Roguelike@StageCombatDpsEnter", "Sami@Roguelike@StageEmergencyDpsEnter", @@ -8804,7 +8734,7 @@ }, "Sami@Roguelike@StageEmergencyDpsAI6": { "templThreshold": 0.95, - "baseTask": "Roguelike@Stage", + "baseTask": "Sami@Roguelike@Stage", "next": [ "Sami@Roguelike@StageEmergencyDpsEnter", "Sami@Roguelike@StageCombatDpsEnter", @@ -8834,7 +8764,7 @@ }, "Sami@Roguelike@StageEncounterAI6": { "templThreshold": 0.96, - "baseTask": "Roguelike@Stage", + "baseTask": "Sami@Roguelike@Stage", "next": [ "Sami@Roguelike@StageEncounterEnter", "Sami@Roguelike@Stages#next" diff --git a/src/MaaCore/Config/TaskData.cpp b/src/MaaCore/Config/TaskData.cpp index 20169d3f2f..daf31ef7bb 100644 --- a/src/MaaCore/Config/TaskData.cpp +++ b/src/MaaCore/Config/TaskData.cpp @@ -42,7 +42,7 @@ asst::TaskDerivedConstPtr asst::TaskData::get_raw(std::string_view name) asst::TaskPtr asst::TaskData::get(std::string_view name) { - // 普通任务 或 已经生成过的高级任务 + // 生成过的任务 if (auto it = m_all_tasks_info.find(name); it != m_all_tasks_info.cend()) { return it->second; }