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 b3a1c50f4a..0000000000 Binary files a/resource/template/BIChapterToBI.png and /dev/null differ 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" } },