diff --git a/resource/tasks.json b/resource/tasks.json index 78c5582a00..dd3c354397 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -482,6 +482,7 @@ "action": "DoNothing", "sub": [ "StageResource", + "SwipeToTheLeft", "StageCE", "StageCE6" ] @@ -491,6 +492,7 @@ "action": "DoNothing", "sub": [ "StageResource", + "SwipeToTheLeft", "StageLS", "StageLS6" ] @@ -500,6 +502,7 @@ "action": "DoNothing", "sub": [ "StageResource", + "SwipeToTheLeft", "StageCA", "StageCA5" ] @@ -509,10 +512,95 @@ "action": "DoNothing", "sub": [ "StageResource", + "SwipeToTheLeft", "StageAP", "StageAP5" ] }, + "PR-A-1": { + "algorithm": "JustReturn", + "doc": "医疗/重装", + "action": "DoNothing", + "sub": [ + "StageResource", + "SwipeToTheRight", + "StagePR-A", + "StagePR-A-1" + ] + }, + "PR-A-2": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "StageResource", + "SwipeToTheRight", + "StagePR-A", + "StagePR-A-2" + ] + }, + "PR-B-1": { + "algorithm": "JustReturn", + "doc": "术士/狙击", + "action": "DoNothing", + "sub": [ + "StageResource", + "SwipeToTheRight", + "StagePR-B", + "StagePR-B-1" + ] + }, + "PR-B-2": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "StageResource", + "SwipeToTheRight", + "StagePR-B", + "StagePR-B-2" + ] + }, + "PR-C-1": { + "algorithm": "JustReturn", + "doc": "先锋/辅助", + "action": "DoNothing", + "sub": [ + "StageResource", + "SwipeToTheRight", + "StagePR-C", + "StagePR-C-1" + ] + }, + "PR-C-2": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "StageResource", + "SwipeToTheRight", + "StagePR-C", + "StagePR-C-2" + ] + }, + "PR-D-1": { + "algorithm": "JustReturn", + "doc": "近卫/特种", + "action": "DoNothing", + "sub": [ + "StageResource", + "SwipeToTheRight", + "StagePR-D", + "StagePR-D-1" + ] + }, + "PR-D-2": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "StageResource", + "SwipeToTheRight", + "StagePR-D", + "StagePR-D-2" + ] + }, "StageResource": { "action": "ClickSelf", "doc": "进入资源关卡", @@ -521,10 +609,6 @@ 562, 544, 158 - ], - "next": [ - "StageResource", - "SwipeToTheLeft" ] }, "StageCE": { @@ -543,6 +627,22 @@ "action": "ClickSelf", "cache": false }, + "StagePR-A": { + "action": "ClickSelf", + "cache": false + }, + "StagePR-B": { + "action": "ClickSelf", + "cache": false + }, + "StagePR-C": { + "action": "ClickSelf", + "cache": false + }, + "StagePR-D": { + "action": "ClickSelf", + "cache": false + }, "AbleToAgent": { "algorithm": "JustReturn", "action": "DoNothing" @@ -628,6 +728,110 @@ 220 ] }, + "StagePR-A-1": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "PR-A-1" + ], + "roi": [ + 27, + 260, + 742, + 400 + ] + }, + "StagePR-A-2": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "PR-A-2" + ], + "roi": [ + 472, + 0, + 793, + 502 + ] + }, + "StagePR-B-1": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "PR-B-1" + ], + "roi": [ + 27, + 260, + 742, + 400 + ] + }, + "StagePR-B-2": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "PR-B-2" + ], + "roi": [ + 472, + 0, + 793, + 502 + ] + }, + "StagePR-C-1": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "PR-C-1" + ], + "roi": [ + 27, + 260, + 742, + 400 + ] + }, + "StagePR-C-2": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "PR-D-2" + ], + "roi": [ + 472, + 0, + 793, + 502 + ] + }, + "StagePR-D-1": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "PR-A-1" + ], + "roi": [ + 27, + 260, + 742, + 400 + ] + }, + "StagePR-D-2": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "PR-A-2" + ], + "roi": [ + 472, + 0, + 793, + 502 + ] + }, "CharsNameOcrReplace": { "algorithm": "OcrDetect", "text": [], diff --git a/resource/template/StagePR-A.png b/resource/template/StagePR-A.png new file mode 100644 index 0000000000..c1253b6694 Binary files /dev/null and b/resource/template/StagePR-A.png differ diff --git a/resource/template/StagePR-B.png b/resource/template/StagePR-B.png new file mode 100644 index 0000000000..7525925fd0 Binary files /dev/null and b/resource/template/StagePR-B.png differ diff --git a/resource/template/StagePR-C.png b/resource/template/StagePR-C.png new file mode 100644 index 0000000000..c1253b6694 Binary files /dev/null and b/resource/template/StagePR-C.png differ diff --git a/resource/template/StagePR-D.png b/resource/template/StagePR-D.png new file mode 100644 index 0000000000..7525925fd0 Binary files /dev/null and b/resource/template/StagePR-D.png differ diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index e26495423f..2ef4abbc9c 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -170,6 +170,15 @@ namespace MeoAsstGui new CombData { Display = "红票-5", Value = "AP-5" }, new CombData { Display = "技能-5", Value = "CA-5" }, + new CombData { Display = "奶/盾芯片", Value = "PR-A-1" }, + new CombData { Display = "奶/盾芯片组", Value = "PR-A-2" }, + new CombData { Display = "术/狙芯片", Value = "PR-B-1" }, + new CombData { Display = "术/狙芯片组", Value = "PR-B-2" }, + //new CombData { Display = "先/辅芯片", Value = "PR-C-1" }, + //new CombData { Display = "先/辅芯片组", Value = "PR-C-2" }, + //new CombData { Display = "近/特芯片", Value = "PR-D-1" }, + //new CombData { Display = "近/特芯片组", Value = "PR-D-2" }, + // SideStory「尘影余音」活动 // new CombData { Display = "LE-7", Value = "LE-7" }, // new CombData { Display = "LE-6", Value = "LE-6" },