diff --git a/resource/tasks.json b/resource/tasks.json index c770a690dd..f9c2b1aef6 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -12,6 +12,53 @@ "OfflineConfirm" ] }, + "LS-6": { + "algorithm": "justreturn", + "action": "doNothing", + "next": [ + "StageResourceToLS6", + "StageLSToStageLS6", + "StageLS6" + ] + }, + "StageResourceToLS6": { + "template": "StageResource.png", + "roi": [ + 640, + 640, + 300, + 60 + ], + "action": "clickSelf", + "next": [ + "SwipeToStageLS6" + ] + }, + "SwipeToStageLS6": { + "algorithm": "justReturn", + "action": "swipeToTheLeft", + "next": [ + "StageLSToStageLS6" + ] + }, + "StageLSToStageLS6": { + "template": "StageLS.png", + "action": "clickSelf", + "cache": false, + "next": [ + "StageLS6" + ] + }, + "StageLS6": { + "action": "clickSelf", + "cache": false, + "roi": [ + 923, + 102, + 259, + 136 + ] + }, "LS-5": { "algorithm": "justreturn", "action": "doNothing", @@ -274,6 +321,53 @@ 220 ] }, + "CE-6": { + "algorithm": "justreturn", + "action": "doNothing", + "next": [ + "StageResourceToCE6", + "StageCE", + "StageCE6" + ] + }, + "StageResourceToCE6": { + "template": "StageResource.png", + "roi": [ + 640, + 640, + 300, + 60 + ], + "action": "clickSelf", + "next": [ + "SwipeToStageCE6" + ] + }, + "SwipeToStageCE6": { + "algorithm": "justReturn", + "action": "swipeToTheLeft", + "next": [ + "StageCEToCE6" + ] + }, + "StageCEToCE6": { + "template": "StageCE.png", + "action": "clickSelf", + "cache": false, + "next": [ + "StageCE6" + ] + }, + "StageCE6": { + "action": "clickSelf", + "cache": false, + "roi": [ + 936, + 101, + 243, + 143 + ] + }, "CE-5": { "algorithm": "justreturn", "action": "doNothing", diff --git a/resource/template/StageCE6.png b/resource/template/StageCE6.png new file mode 100644 index 0000000000..bfbfb20355 Binary files /dev/null and b/resource/template/StageCE6.png differ diff --git a/resource/template/StageLS6.png b/resource/template/StageLS6.png new file mode 100644 index 0000000000..b4d112f7dc Binary files /dev/null and b/resource/template/StageLS6.png differ diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index e4ce691f1f..1019161606 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -71,8 +71,10 @@ namespace MeoAsstGui new CombData { Display = "上次作战", Value = "LastBattle" }, new CombData { Display = "剿灭作战", Value = "Annihilation" }, new CombData { Display = "龙门币-5", Value = "CE-5" }, + new CombData { Display = "龙门币-6", Value = "CE-6" }, new CombData { Display = "红票-5", Value = "AP-5" }, new CombData { Display = "经验-5", Value = "LS-5" }, + new CombData { Display = "经验-6", Value = "LS-6" }, new CombData { Display = "技能-5", Value = "CA-5" } }; // “风雪过境” 活动关卡