From 5e723533232f0df7674ec4ed78e353ca074aab3a Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Wed, 14 Dec 2022 14:59:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 213 +++++++++++++-------------- resource/template/BIChapterToBI.png | Bin 16003 -> 0 bytes src/MaaWpfGui/Helper/StageManager.cs | 12 +- 3 files changed, 111 insertions(+), 114 deletions(-) delete mode 100644 resource/template/BIChapterToBI.png diff --git a/resource/tasks.json b/resource/tasks.json index adc27723fa..f531ead57d 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -774,6 +774,111 @@ 120 ] }, + "WE-8": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "WE-Open", + "WEChapterToWE" + ], + "next": [ + "StageWE-8", + "WE-8@SwipeToStage" + ] + }, + "WE-9": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "WE-Open", + "WEChapterToWE" + ], + "next": [ + "StageWE-9", + "WE-9@SwipeToStage" + ] + }, + "WE-10": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "WE-Open", + "WEChapterToWE" + ], + "next": [ + "StageWE-10", + "WE-10@SwipeToStage" + ] + }, + "WE-Open": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "照我以火" + ], + "roi": [ + 0, + 500, + 500, + 150 + ] + }, + "WEChapterToWE": { + "action": "ClickSelf", + "roi": [ + 1000, + 250, + 280, + 150 + ], + "postDelay": 2000, + "next": [ + "WEChapterToWE", + "ChapterSwipeToTheRight" + ] + }, + "StageWE-8": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "WE-8" + ], + "cache": false, + "roi": [ + 0, + 145, + 1280, + 332 + ] + }, + "StageWE-9": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "WE-9" + ], + "cache": false, + "roi": [ + 0, + 145, + 1280, + 332 + ] + }, + "StageWE-10": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "WE-10" + ], + "cache": false, + "roi": [ + 0, + 145, + 1280, + 332 + ] + }, "IS-10": { "algorithm": "JustReturn", "action": "DoNothing", @@ -1582,114 +1687,6 @@ 200 ] }, - "BI-6": { - "algorithm": "JustReturn", - "action": "DoNothing", - "sub": [ - "BI-Open", - "BIChapterToBI" - ], - "next": [ - "StageBI-6", - "BI-6@SwipeToStage" - ] - }, - "BI-7": { - "algorithm": "JustReturn", - "action": "DoNothing", - "sub": [ - "BI-Open", - "BIChapterToBI" - ], - "next": [ - "StageBI-7", - "BI-7@SwipeToStage" - ] - }, - "BI-8": { - "algorithm": "JustReturn", - "action": "DoNothing", - "sub": [ - "BI-Open", - "BIChapterToBI" - ], - "next": [ - "StageBI-8", - "BI-8@SwipeToStage" - ] - }, - "BI-Open": { - "action": "ClickSelf", - "algorithm": "OcrDetect", - "text": [ - "风雪过境" - ], - "roi": [ - 0, - 500, - 500, - 150 - ] - }, - "BIChapterToBI": { - "action": "ClickSelf", - "roi": [ - 1000, - 250, - 280, - 150 - ], - "postDelay": 2000, - "next": [ - "BIChapterToBI", - "ChapterSwipeToTheRight" - ] - }, - "StageBI-6": { - "action": "ClickSelf", - "algorithm": "OcrDetect", - "text": [ - "B1-6", - "BI-6" - ], - "cache": false, - "roi": [ - 0, - 145, - 1280, - 332 - ] - }, - "StageBI-7": { - "action": "ClickSelf", - "algorithm": "OcrDetect", - "text": [ - "B1-7", - "BI-7" - ], - "cache": false, - "roi": [ - 0, - 145, - 1280, - 332 - ] - }, - "StageBI-8": { - "action": "ClickSelf", - "algorithm": "OcrDetect", - "text": [ - "B1-8", - "BI-8" - ], - "cache": false, - "roi": [ - 0, - 145, - 1280, - 332 - ] - }, "ResourceStages": { "algorithm": "JustReturn", "sub": [ diff --git a/resource/template/BIChapterToBI.png b/resource/template/BIChapterToBI.png deleted file mode 100644 index b3a1c50f4a8ea823f51f6cb7e6d569be6c04d59f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16003 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 X&Kmqjw_}WWT#f{kRgtNYG7J7c3qG1q diff --git a/src/MaaWpfGui/Helper/StageManager.cs b/src/MaaWpfGui/Helper/StageManager.cs index 93131bd7c7..6323fcd12c 100644 --- a/src/MaaWpfGui/Helper/StageManager.cs +++ b/src/MaaWpfGui/Helper/StageManager.cs @@ -32,9 +32,9 @@ namespace MaaWpfGui { var sideStory = new StageActivityInfo() { - Tip = "SideStory「风雪过境」复刻活动", - UtcStartTime = new DateTime(2022, 12, 1, 16, 0, 0).AddHours(-8), - UtcExpireTime = new DateTime(2022, 12, 15, 4, 0, 0).AddHours(-8), + Tip = "SideStory「照我以火」活动", + UtcStartTime = new DateTime(2022, 12, 15, 16, 0, 0).AddHours(-8), + UtcExpireTime = new DateTime(2022, 1, 5, 4, 0, 0).AddHours(-8), }; var resourceCollection = new StageActivityInfo() @@ -52,9 +52,9 @@ namespace MaaWpfGui { string.Empty, new StageInfo { Display = Localization.GetString("DefaultStage"), Value = string.Empty } }, // SideStory「风雪过境」复刻活动 - { "BI-8", new StageInfo { Display = "BI-8", Value = "BI-8", Activity = sideStory } }, - { "BI-7", new StageInfo { Display = "BI-7", Value = "BI-7", Activity = sideStory } }, - { "BI-6", new StageInfo { Display = "BI-6", Value = "BI-6", Activity = sideStory } }, + { "WE-10", new StageInfo { Display = "WE-10", Value = "WE-10", Activity = sideStory } }, + { "WE-9", new StageInfo { Display = "WE-9", Value = "WE-9", Activity = sideStory } }, + { "WE-8", new StageInfo { Display = "WE-8", Value = "WE-8", Activity = sideStory } }, // 主线关卡 { "1-7", new StageInfo { Display = "1-7", Value = "1-7" } },