diff --git a/resource/tasks.json b/resource/tasks.json index 11be016d7c..6a84ccfd2d 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -371,59 +371,12 @@ "algorithm": "justreturn", "action": "doNothing", "next": [ - "StageResourceToLS6", - "StageLSToStageLS6", + "StageResourceToLS", + "StageLSToLS", "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", - "next": [ - "StageResourceToLS5", - "StageLS", - "StageLS5" - ] - }, - "StageResourceToLS5": { + "StageResourceToLS": { "template": "StageResource.png", "roi": [ 640, @@ -440,12 +393,44 @@ "algorithm": "justReturn", "action": "swipeToTheLeft", "next": [ - "StageLS" + "StageLSToLS" ] }, - "StageLS": { + "StageLSToLS": { + "template": "StageLS.png", "action": "clickSelf", "cache": false, + "next": [ + "StageLS6" + ] + }, + "StageLS6": { + "action": "clickSelf", + "cache": false, + "roi": [ + 936, + 101, + 243, + 143 + ], + "next": [ + "UnableToAgentLS6", + "AgentLS6" + ] + }, + "AgentLS6": { + "algorithm": "justReturn", + "action": "DoNothing" + }, + "UnableToAgentLS6": { + "template": "UnableToAgent.png", + "action": "swipeToTheLeft", + "roi": [ + 994, + 535, + 286, + 143 + ], "next": [ "StageLS5" ] @@ -680,59 +665,12 @@ "algorithm": "justreturn", "action": "doNothing", "next": [ - "StageResourceToCE6", - "StageCE", + "StageResourceToCE", + "StageCEToCE", "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", - "next": [ - "StageResourceToCE5", - "StageCE", - "StageCE5" - ] - }, - "StageResourceToCE5": { + "StageResourceToCE": { "template": "StageResource.png", "roi": [ 640, @@ -749,12 +687,44 @@ "algorithm": "justReturn", "action": "swipeToTheLeft", "next": [ - "StageCE" + "StageCEToCE" ] }, - "StageCE": { + "StageCEToCE": { + "template": "StageCE.png", "action": "clickSelf", "cache": false, + "next": [ + "StageCE6" + ] + }, + "StageCE6": { + "action": "clickSelf", + "cache": false, + "roi": [ + 936, + 101, + 243, + 143 + ], + "next": [ + "UnableToAgentCE6", + "AgentCE6" + ] + }, + "AgentCE6": { + "algorithm": "justReturn", + "action": "DoNothing" + }, + "UnableToAgentCE6": { + "template": "UnableToAgent.png", + "action": "swipeToTheLeft", + "roi": [ + 994, + 535, + 286, + 143 + ], "next": [ "StageCE5" ] diff --git a/resource/template/UnableToAgent.png b/resource/template/UnableToAgent.png new file mode 100644 index 0000000000..c6c33591cd Binary files /dev/null and b/resource/template/UnableToAgent.png differ diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index 9bec0931f8..8c667245f9 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -70,11 +70,9 @@ namespace MeoAsstGui new CombData { Display = "当前关卡", Value = string.Empty }, 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/6", Value = "CE-6" }, + new CombData { Display = "经验5/6", Value = "LS-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" }, new CombData { Display = "1-7", Value = "1-7" } };