From aa6e9c5aeea042e7bd007a4eec2ccdc6db8e5d14 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Tue, 17 Jan 2023 16:22:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E3=80=8C=E7=99=BB?= =?UTF-8?q?=E4=B8=B4=E6=84=8F=E3=80=8D=E6=B4=BB=E5=8A=A8=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 106 +++++++++++++++++++++++++++ resource/template/WBChapterToWB.png | Bin 0 -> 8834 bytes src/MaaWpfGui/Helper/StageManager.cs | 2 +- 3 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 resource/template/WBChapterToWB.png diff --git a/resource/tasks.json b/resource/tasks.json index 3e618a49cf..d740b79bb6 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -774,6 +774,112 @@ 120 ] }, + "WB-7": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "WB-Open", + "WBChapterToWB" + ], + "next": [ + "StageWB-7", + "WB-7@SwipeToStage" + ] + }, + "WB-8": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "WB-Open", + "WBChapterToWB" + ], + "next": [ + "StageWB-8", + "WB-8@SwipeToStage" + ] + }, + "WB-9": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "WB-Open", + "WBChapterToWB" + ], + "next": [ + "StageWB-9", + "WB-9@SwipeToStage" + ] + }, + "WB-Open": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "登临意", + "关卡已开放" + ], + "roi": [ + 0, + 500, + 500, + 150 + ] + }, + "WBChapterToWB": { + "action": "ClickSelf", + "roi": [ + 1071, + 589, + 209, + 131 + ], + "postDelay": 2000, + "next": [ + "WBChapterToWB", + "ChapterSwipeToTheRight" + ] + }, + "StageWB-7": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "WB-7" + ], + "cache": false, + "roi": [ + 0, + 283, + 1280, + 324 + ] + }, + "StageWB-8": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "WB-8" + ], + "cache": false, + "roi": [ + 0, + 283, + 1280, + 324 + ] + }, + "StageWB-9": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "WB-9" + ], + "cache": false, + "roi": [ + 0, + 283, + 1280, + 324 + ] + }, "IW-6": { "algorithm": "JustReturn", "action": "DoNothing", diff --git a/resource/template/WBChapterToWB.png b/resource/template/WBChapterToWB.png new file mode 100644 index 0000000000000000000000000000000000000000..aecb785b315f52c7a2debed3e78a30f6eda377aa GIT binary patch literal 8834 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 Eg3Ye{5&!@I literal 0 HcmV?d00001 diff --git a/src/MaaWpfGui/Helper/StageManager.cs b/src/MaaWpfGui/Helper/StageManager.cs index 52a23ec72e..5818544370 100644 --- a/src/MaaWpfGui/Helper/StageManager.cs +++ b/src/MaaWpfGui/Helper/StageManager.cs @@ -91,7 +91,7 @@ namespace MaaWpfGui bool isDebugVersion = Marshal.PtrToStringAnsi(AsstGetVersion()) == "DEBUG VERSION"; bool curParsed = !isDebugVersion ? SemVersion.TryParse(Marshal.PtrToStringAnsi(AsstGetVersion()), SemVersionStyles.AllowLowerV, out var curVersionObj) : - SemVersion.TryParse("4.10.0", SemVersionStyles.AllowLowerV, out curVersionObj); + SemVersion.TryParse("4.10.1", SemVersionStyles.AllowLowerV, out curVersionObj); bool minimumRequiredPared = SemVersion.TryParse(stageObj?["MinimumRequired"]?.ToString() ?? string.Empty, SemVersionStyles.AllowLowerV, out var minimumRequiredObj); if (curParsed && minimumRequiredPared)