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 0000000000..aecb785b31 Binary files /dev/null and b/resource/template/WBChapterToWB.png differ 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)