From 731172469fbfdf2ef7a096b56cc14cc61bdd21af Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Sun, 1 Jan 2023 16:18:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20SideStory=E3=80=8C?= =?UTF-8?q?=E5=B0=86=E8=BF=9B=E9=85=92=E3=80=8D=E5=A4=8D=E5=88=BB=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=B3=E5=8D=A1=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 110 +++++++++++++++++++++++++++ src/MaaWpfGui/Helper/StageManager.cs | 16 ++-- 2 files changed, 118 insertions(+), 8 deletions(-) diff --git a/resource/tasks.json b/resource/tasks.json index 63a4f7c0a2..4462bcc17f 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -774,6 +774,116 @@ 120 ] }, + "IW-6": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "IW-Open", + "IWChapterToIW" + ], + "next": [ + "StageIW-6", + "IW-6@SwipeToStage" + ] + }, + "IW-7": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "IW-Open", + "IWChapterToIW" + ], + "next": [ + "StageIW-7", + "IW-7@SwipeToStage" + ] + }, + "IW-8": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "IW-Open", + "IWChapterToIW" + ], + "next": [ + "StageIW-8", + "IW-8@SwipeToStage" + ] + }, + "IW-Open": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "将进酒", + "关卡已开放" + ], + "roi": [ + 0, + 500, + 500, + 150 + ] + }, + "IWChapterToIW": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "三山奇闻" + ], + "roi": [ + 890, + 517, + 210, + 134 + ], + "postDelay": 2000, + "next": [ + "IWChapterToIW", + "ChapterSwipeToTheRight" + ] + }, + "StageIW-6": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "IW-6" + ], + "cache": false, + "roi": [ + 0, + 283, + 1280, + 324 + ] + }, + "StageIW-7": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "IW-7" + ], + "cache": false, + "roi": [ + 0, + 283, + 1280, + 324 + ] + }, + "StageIW-8": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "IW-8" + ], + "cache": false, + "roi": [ + 0, + 283, + 1280, + 324 + ] + }, "FC-5": { "algorithm": "JustReturn", "action": "DoNothing", diff --git a/src/MaaWpfGui/Helper/StageManager.cs b/src/MaaWpfGui/Helper/StageManager.cs index c6d6de42de..7bbbb35bbf 100644 --- a/src/MaaWpfGui/Helper/StageManager.cs +++ b/src/MaaWpfGui/Helper/StageManager.cs @@ -32,10 +32,10 @@ namespace MaaWpfGui { var sideStory = new StageActivityInfo() { - Tip = "SideStory「照我以火」活动", - StageName = "FC", - UtcStartTime = new DateTime(2022, 12, 15, 16, 0, 0).AddHours(-8), - UtcExpireTime = new DateTime(2022, 12, 29, 4, 0, 0).AddHours(-8), + Tip = "SideStory「将进酒」复刻活动", + StageName = "IW", + UtcStartTime = new DateTime(2023, 1, 1, 16, 0, 0).AddHours(-8), + UtcExpireTime = new DateTime(2023, 1, 11, 4, 0, 0).AddHours(-8), }; var resourceCollection = new StageActivityInfo() @@ -52,10 +52,10 @@ namespace MaaWpfGui // 「当前/上次」关卡导航 { string.Empty, new StageInfo { Display = Localization.GetString("DefaultStage"), Value = string.Empty } }, - // SideStory「照我以火」活动 - { "FC-7", new StageInfo { Display = "FC-7", Value = "FC-7", Activity = sideStory } }, - { "FC-6", new StageInfo { Display = "FC-6", Value = "FC-6", Activity = sideStory } }, - { "FC-5", new StageInfo { Display = "FC-5", Value = "FC-5", Activity = sideStory } }, + // SideStory「将进酒」复刻活动 + { "IW-8", new StageInfo { Display = "IW-8", Value = "IW-8", Activity = sideStory } }, + { "IW-7", new StageInfo { Display = "IW-7", Value = "IW-7", Activity = sideStory } }, + { "IW-6", new StageInfo { Display = "IW-6", Value = "IW-6", Activity = sideStory } }, // 主线关卡 { "1-7", new StageInfo { Display = "1-7", Value = "1-7" } },