diff --git a/resource/tasks/Stages/AD.json b/resource/tasks/Stages/AD.json
index 68f9c22e5c..aa50c3d0a0 100644
--- a/resource/tasks/Stages/AD.json
+++ b/resource/tasks/Stages/AD.json
@@ -1,36 +1,24 @@
{
"AD-8": {
"algorithm": "JustReturn",
- "sub": ["AD-OpenOpt"],
+ "sub": ["AD-8@AD-OpenOpt"],
"next": ["AD-8@SideStoryStage", "AD-8@SwipeToStage"]
},
- "AD-8@SideStoryStage": {
- "text": ["AD-8"]
- },
"AD-7": {
"algorithm": "JustReturn",
- "sub": ["AD-OpenOpt"],
+ "sub": ["AD-7@AD-OpenOpt"],
"next": ["AD-7@SideStoryStage", "AD-7@SwipeToStage"]
},
- "AD-7@SideStoryStage": {
- "text": ["AD-7"]
- },
"AD-6": {
"algorithm": "JustReturn",
- "sub": ["AD-OpenOpt"],
+ "sub": ["AD-6@AD-OpenOpt"],
"next": ["AD-6@SideStoryStage", "AD-6@SwipeToStage"]
},
- "AD-6@SideStoryStage": {
- "text": ["AD-6"]
- },
"AD-3": {
"algorithm": "JustReturn",
- "sub": ["AD-OpenOpt"],
+ "sub": ["AD-3@AD-OpenOpt"],
"next": ["AD-3@SideStoryStage", "AD-3@SwipeToStage"]
},
- "AD-3@SideStoryStage": {
- "text": ["AD-3"]
- },
"AD-OpenOpt": {
"algorithm": "JustReturn",
"next": ["AD-OpenOcr", "AD-Open"]
@@ -38,7 +26,7 @@
"AD-Open": {
"baseTask": "SS-Open",
"template": ["StageSideStory.png", "StageActivity.png"],
- "next": ["ADChapterToAD"]
+ "next": ["ADChapterToAD"]
},
"AD-OpenOcr": {
"baseTask": "SS-OpenOcr",
@@ -50,7 +38,20 @@
"action": "ClickSelf",
"text": ["演出开始"],
"preDelay": 4000,
+ "postDelay": 2000,
"roi": [1053, 402, 200, 127],
- "next": ["#self", "ChapterSwipeToTheRight"]
+ "next": ["#self", "SideStoryStage", "ChapterSwipeToTheRight"]
+ },
+ "AD-8@SideStoryStage": {
+ "text": ["AD-8"]
+ },
+ "AD-7@SideStoryStage": {
+ "text": ["AD-7"]
+ },
+ "AD-6@SideStoryStage": {
+ "text": ["AD-6"]
+ },
+ "AD-3@SideStoryStage": {
+ "text": ["AD-3"]
}
}
diff --git a/resource/tasks/tasks.json b/resource/tasks/tasks.json
index e27c644671..de722e1fb8 100644
--- a/resource/tasks/tasks.json
+++ b/resource/tasks/tasks.json
@@ -346,8 +346,8 @@
"next": ["ClickStageName", "FullStageNavigation"]
},
"FullStageNavigation": {
- "Doc": "右滑五次,然后检测关卡并左滑",
- "Doc2": "在一次关卡导航中,仅swipe五次,其余情况进exceededNext",
+ "Doc": "右滑 10 次,然后检测关卡并左滑",
+ "Doc2": "在一次关卡导航中,仅swipe 10次,其余情况进exceededNext",
"baseTask": "ChapterSwipeToTheRight",
"specificRect_Doc": "防止在关卡名展开的情况下无法滑动,调整滑动区域",
"specificRect": [600, 100, 20, 20],
@@ -4525,7 +4525,7 @@
"exceededNext": ["Copilot@ChapterSwipeToTheRightAndPlot"]
},
"Copilot@ChapterSwipeToTheRightAndPlot": {
- "doc": "划五次到最右,然后扫有无初见剧情",
+ "doc": "划 10 次到最右,然后扫有无初见剧情",
"baseTask": "ChapterSwipeToTheRight",
"exceededNext": ["Copilot@ClickPlotStage"]
},
diff --git a/src/MaaCore/MaaCore.vcxproj b/src/MaaCore/MaaCore.vcxproj
index 35a6b96cb1..d1fecdff8d 100644
--- a/src/MaaCore/MaaCore.vcxproj
+++ b/src/MaaCore/MaaCore.vcxproj
@@ -174,6 +174,7 @@
+
diff --git a/src/MaaCore/MaaCore.vcxproj.filters b/src/MaaCore/MaaCore.vcxproj.filters
index cd1a0cccde..442c50dd5c 100644
--- a/src/MaaCore/MaaCore.vcxproj.filters
+++ b/src/MaaCore/MaaCore.vcxproj.filters
@@ -703,6 +703,9 @@
Resource\tasks\base\Stages
+
+ Resource\tasks\base\Stages
+