From 8541c54158ced31f5d83eec44f96293c505f03c7 Mon Sep 17 00:00:00 2001 From: ABA2396 <2396806385@qq.com> Date: Sat, 7 May 2022 11:14:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat.=E5=90=88=E5=B9=B6LS-5=20LS-6;CE-5=20C?= =?UTF-8?q?E-6=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 178 ++++++++++++---------------- resource/template/UnableToAgent.png | Bin 0 -> 7848 bytes 2 files changed, 74 insertions(+), 104 deletions(-) create mode 100644 resource/template/UnableToAgent.png diff --git a/resource/tasks.json b/resource/tasks.json index d172764b80..55508ced7d 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -363,59 +363,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, @@ -432,12 +385,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" ] @@ -672,59 +657,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, @@ -741,12 +679,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 0000000000000000000000000000000000000000..c6c33591cdf4ea1224c8b6c438a783b58ca84727 GIT binary patch literal 7848 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 BLc;(6 literal 0 HcmV?d00001 From 55eaef8e10fc1b542fe3869bff4566637e791a33 Mon Sep 17 00:00:00 2001 From: ABA2396 <2396806385@qq.com> Date: Sat, 7 May 2022 11:47:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat.=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=90=8E=E7=9A=84ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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" } };