diff --git a/resource/tasks.json b/resource/tasks.json index 6fd4d285ca..99b8457738 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -6877,7 +6877,7 @@ "Roguelike@ClickToStartPoint": { "algorithm": "JustReturn", "action": "ClickRect", - "specificRect": [600, 600, 50, 10], + "specificRect": [600, 620, 50, 30], "postDelay_Doc": "这个延迟保证不会识别到 StartExplore 之后又弹出 每月委托/解锁收藏品 等。 #7033", "postDelay": 800, "next": [ @@ -9302,6 +9302,7 @@ "next": ["Sami@Roguelike@FoldartalGain", "Sami@Roguelike@LastRewardChoose", "Sami@Roguelike@SquadConfirm#next"] }, "Sami@Roguelike@FoldartalGainOcr": { + "doc": "深入调查调查装备也在这里", "algorithm": "OcrDetect", "roi": [584, 261, 315, 46], "text": [ @@ -9349,7 +9350,13 @@ "繁衍", "迁徙", "歇息", - "空无" + "空无", + "雷达", + "留声机", + "景观", + "LUD", + "踢脚", + "自走车" ], "ocrReplace": [ ["黜", "黜人"], @@ -9529,6 +9536,9 @@ }, "Sami@Roguelike@MissionFailedFlag": {}, "Sami@Roguelike@MissionFailedFlag2": {}, + "Sami@Roguelike@MissionFailedFlag3": { + "baseTask": "Sami@Roguelike@MissionFailedFlag" + }, "Sami@Roguelike@MonthlySquad": { "template": "Roguelike@MonthlySquad.png" }, @@ -9597,6 +9607,23 @@ ] }, "Sami@Roguelike@SquadDefault": {}, + "Sami@Roguelike@StartAction": { + "Doc": "多一个Flag3", + "template": "Roguelike@StartAction.png", + "next": [ + "Sami@Roguelike@NoneSelected", + "Sami@Roguelike@InBattleFlag", + "Sami@Roguelike@MissionCompletedFlag", + "Sami@Roguelike@MissionFailedFlag", + "Sami@Roguelike@MissionFailedFlag2", + "Sami@Roguelike@MissionFailedFlag3", + "Sami@Roguelike@GamePassSkip1", + "Sami@Roguelike@GamePassTheEndConfirm", + "Sami@Roguelike@GamePass", + "Sami@Roguelike@StartAction@LoadingText", + "Sami@Roguelike@StartAction@LoadingIcon" + ] + }, "Sami@Roguelike@StageBoons": { "templThreshold": 0.95, "next": ["Sami@Roguelike@StageBoonsEnter", "Sami@Roguelike@Stages#next"] diff --git a/resource/template/Sami@Roguelike@MissionFailedFlag3.png b/resource/template/Sami@Roguelike@MissionFailedFlag3.png new file mode 100644 index 0000000000..99dc5c51b3 Binary files /dev/null and b/resource/template/Sami@Roguelike@MissionFailedFlag3.png differ diff --git a/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp index 766771bc12..56207b6529 100644 --- a/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp @@ -121,7 +121,10 @@ bool asst::RoguelikeFoldartalGainTaskPlugin::gain_stage_award() } auto foldartal = analyzer.get_result().front().text; - gain_foldartal(std::move(foldartal)); + // 深入调查调查装备也使用同一个入口,先分类 + if (foldartal != "雷达" || "留声机" || "景观" || "LUD" || "踢脚" || "自走车") { + gain_foldartal(std::move(foldartal)); + } if (m_ocr_after_combat) { ctrler()->click(analyzer.get_result().front().rect); }