diff --git a/assets/interface.json b/assets/interface.json index 4dd78fd..cea39f2 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -92,7 +92,7 @@ }, { "name": "雨中悬想：迷思海（“寻思”每周扫荡）", - "entry": "RevereisInTheRain" + "entry": "ReveriesInTheRain" }, { "name": "关闭游戏", @@ -115,12 +115,7 @@ }, { "name": "局外演绎：黄昏的音序（勿挂资料片）", - "entry": "SeriesOfDusks", - "pipeline_override": { - "EnterTheShow": { - "next": "OutsideDeduction" - } - } + "entry": "SeriesOfDusks" } ], "recognizer": {}, diff --git a/assets/resource/base/image/OutsideDeduction/SOD_MENU.png b/assets/resource/base/image/OutsideDeduction/SOD_MENU.png new file mode 100644 index 0000000..ffba0bf Binary files /dev/null and b/assets/resource/base/image/OutsideDeduction/SOD_MENU.png differ diff --git a/assets/resource/base/image/RevereisInTheRain/DepthsOfMythEntry.png b/assets/resource/base/image/ReveriesInTheRain/DepthsOfMythEntry.png similarity index 100% rename from assets/resource/base/image/RevereisInTheRain/DepthsOfMythEntry.png rename to assets/resource/base/image/ReveriesInTheRain/DepthsOfMythEntry.png diff --git a/assets/resource/base/image/RevereisInTheRain/PlayTimesX1.png b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX1.png similarity index 100% rename from assets/resource/base/image/RevereisInTheRain/PlayTimesX1.png rename to assets/resource/base/image/ReveriesInTheRain/PlayTimesX1.png diff --git a/assets/resource/base/image/RevereisInTheRain/PlayTimesX2.png b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX2.png similarity index 100% rename from assets/resource/base/image/RevereisInTheRain/PlayTimesX2.png rename to assets/resource/base/image/ReveriesInTheRain/PlayTimesX2.png diff --git a/assets/resource/base/image/RevereisInTheRain/PlayTimesX3.png b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX3.png similarity index 100% rename from assets/resource/base/image/RevereisInTheRain/PlayTimesX3.png rename to assets/resource/base/image/ReveriesInTheRain/PlayTimesX3.png diff --git a/assets/resource/base/image/RevereisInTheRain/PlayTimesX4.png b/assets/resource/base/image/ReveriesInTheRain/PlayTimesX4.png similarity index 100% rename from assets/resource/base/image/RevereisInTheRain/PlayTimesX4.png rename to assets/resource/base/image/ReveriesInTheRain/PlayTimesX4.png diff --git a/assets/resource/base/image/RevereisInTheRain/RevereisInTheRainMainEntry.png b/assets/resource/base/image/ReveriesInTheRain/ReveriesInTheRainMainEntry.png similarity index 100% rename from assets/resource/base/image/RevereisInTheRain/RevereisInTheRainMainEntry.png rename to assets/resource/base/image/ReveriesInTheRain/ReveriesInTheRainMainEntry.png diff --git a/assets/resource/base/image/RevereisInTheRain/TranceButton.png b/assets/resource/base/image/ReveriesInTheRain/TranceButton.png similarity index 100% rename from assets/resource/base/image/RevereisInTheRain/TranceButton.png rename to assets/resource/base/image/ReveriesInTheRain/TranceButton.png diff --git a/assets/resource/base/image/RevereisInTheRain/TranceClose.png b/assets/resource/base/image/ReveriesInTheRain/TranceClose.png similarity index 100% rename from assets/resource/base/image/RevereisInTheRain/TranceClose.png rename to assets/resource/base/image/ReveriesInTheRain/TranceClose.png diff --git a/assets/resource/base/pipeline/activity/RevereisInTheRain.json b/assets/resource/base/pipeline/activity/ReveriesInTheRain.json similarity index 88% rename from assets/resource/base/pipeline/activity/RevereisInTheRain.json rename to assets/resource/base/pipeline/activity/ReveriesInTheRain.json index 78d221b..f5cd21c 100644 --- a/assets/resource/base/pipeline/activity/RevereisInTheRain.json +++ b/assets/resource/base/pipeline/activity/ReveriesInTheRain.json @@ -1,36 +1,21 @@ { - "RevereisInTheRain": { + "ReveriesInTheRain": { "doc": "常驻活动：雨中悬想", "next": [ - "RevereisInTheRainMainFlag", - "RevereisInTheRainHomeFlag" + "ReveriesInTheRainMainFlag" ], "interrupt": [ + "ReveriesInTheRainMainEntry", + "EnterTheShow", + "HomeButton", + "BackButton", "StartUp" ] }, - "RevereisInTheRainHomeFlag": { - "doc": "判断位于全局主页面", - "recognition": "TemplateMatch", - "template": "Combat/EnterTheShow.png", - "roi": [ - 926, - 221, - 229, - 153 - ], - "next": [ - "RevereisInTheRainMainFlag" - ], - "interrupt": [ - "RevereisInTheRainMainEntry", - "EnterTheShow" - ] - }, - "RevereisInTheRainMainEntry": { + "ReveriesInTheRainMainEntry": { "doc": "进入雨中悬想主页面", "recognition": "TemplateMatch", - "template": "RevereisInTheRain/RevereisInTheRainMainEntry.png", + "template": "ReveriesInTheRain/ReveriesInTheRainMainEntry.png", "roi": [ 1097, 564, @@ -40,7 +25,7 @@ "action": "Click", "post_wait_freezes": 300 }, - "RevereisInTheRainMainFlag": { + "ReveriesInTheRainMainFlag": { "doc": "判断位于雨中悬想主页面", "recognition": "OCR", "expected": "迷思原型", @@ -82,7 +67,7 @@ "DepthsOfMythEntry": { "doc": "进入迷思海", "recognition": "TemplateMatch", - "template": "RevereisInTheRain/DepthsOfMythEntry.png", + "template": "ReveriesInTheRain/DepthsOfMythEntry.png", "roi": [ 921, 484, @@ -107,7 +92,7 @@ "DepthsOfMythMainFlag": { "doc": "判断位于迷思海主页面", "recognition": "TemplateMatch", - "template": "RevereisInTheRain/TranceButton.png", + "template": "ReveriesInTheRain/TranceButton.png", "roi": [ 914, 0, @@ -125,7 +110,7 @@ "TranceButtonClick": { "doc": "点击“寻思”按钮", "recognition": "TemplateMatch", - "template": "RevereisInTheRain/TranceButton.png", + "template": "ReveriesInTheRain/TranceButton.png", "roi": [ 914, 0, @@ -332,7 +317,7 @@ "TrancePlayTimesX1": { "doc": "当前预消耗“寻思”X1", "recognition": "TemplateMatch", - "template": "RevereisInTheRain/PlayTimesX1.png", + "template": "ReveriesInTheRain/PlayTimesX1.png", "roi": [ 743, 418, @@ -346,7 +331,7 @@ "TrancePlayTimesX2": { "doc": "当前预消耗“寻思”X2", "recognition": "TemplateMatch", - "template": "RevereisInTheRain/PlayTimesX2.png", + "template": "ReveriesInTheRain/PlayTimesX2.png", "roi": [ 743, 418, @@ -360,7 +345,7 @@ "TrancePlayTimesX3": { "doc": "当前预消耗“寻思”X3", "recognition": "TemplateMatch", - "template": "RevereisInTheRain/PlayTimesX3.png", + "template": "ReveriesInTheRain/PlayTimesX3.png", "roi": [ 743, 418, @@ -374,7 +359,7 @@ "TrancePlayTimesX4": { "doc": "当前预消耗“寻思”X4", "recognition": "TemplateMatch", - "template": "RevereisInTheRain/PlayTimesX4.png", + "template": "ReveriesInTheRain/PlayTimesX4.png", "roi": [ 743, 418, @@ -407,7 +392,7 @@ "TranceClose": { "doc": "关闭迷思海“寻思”页面", "recognition": "TemplateMatch", - "template": "RevereisInTheRain/TranceClose.png", + "template": "ReveriesInTheRain/TranceClose.png", "roi": [ 1162, 0, diff --git a/assets/resource/base/pipeline/activity/outsidededuction.json b/assets/resource/base/pipeline/activity/outside_deduction.json similarity index 99% rename from assets/resource/base/pipeline/activity/outsidededuction.json rename to assets/resource/base/pipeline/activity/outside_deduction.json index 03b9dd1..5e707d6 100644 --- a/assets/resource/base/pipeline/activity/outsidededuction.json +++ b/assets/resource/base/pipeline/activity/outside_deduction.json @@ -1,12 +1,15 @@ { "SeriesOfDusks": { "next": [ - "EnterTheShow", - "SODStop", - "SODStart", + "SOD_MENU", + "SOD_Main" + ], + "interrupt": [ "OutsideDeduction", - "SOD_Main", - "Sub_StartUp" + "EnterTheShow", + "HomeButton", + "BackButton", + "StartUp" ] }, "OutsideDeduction": { @@ -19,10 +22,21 @@ 104 ], "action": "Click", + "post_wait_freezes": 300 + }, + "SOD_MENU": { + "recognition": "TemplateMatch", + "template": "OutsideDeduction/SOD_MENU.png", + "roi": [ + 196, + 169, + 355, + 161 + ], "next": [ "SODStop", "SODStart", - "OutsideDeduction" + "SOD_Main" ] }, "SODStop": { @@ -1723,6 +1737,7 @@ 64 ], "timeout": 40000, + "post_delay": 3000, "next": [ "SOD_CombatVictory", "Sub_SOD_Dialog_1", diff --git a/assets/resource/base/pipeline/limbo.json b/assets/resource/base/pipeline/limbo.json index 158fc78..2c58a43 100644 --- a/assets/resource/base/pipeline/limbo.json +++ b/assets/resource/base/pipeline/limbo.json @@ -2,26 +2,19 @@ "Limbo": { "doc": "深眠任务开始", "next": [ - "LimboEnterTheShow", - "ArtificialSleepwalking", - "LimboEntry", - "LimboStageRightest", - "Sub_StartUp" - ] - }, - "LimboEnterTheShow": { - "doc": "由主界面点击入场", - "recognition": "TemplateMatch", - "template": "Limbo/EnterTheShow.png", - "roi": [ - 926, - 221, - 229, - 153 + "LimboEnd", + "LimboStageRightest" ], - "action": "Click", - "next": [ - "ArtificialSleepwalking" + "interrupt": [ + "LimboEntry", + "ObtainedAwards", + "ArtificialSleepwalkingCloseAwards", + "ArtificialSleepwalkingAwards", + "EnterTheShow", + "ArtificialSleepwalking", + "HomeButton", + "BackButton", + "StartUp" ] }, "ArtificialSleepwalking": { @@ -35,13 +28,7 @@ 170 ], "action": "Click", - "post_wait_freezes": 300, - "next": [ - "ArtificialSleepwalkingAwards", - "LimboEntry", - "HomeFlag", - "Sub_StartUp" - ] + "post_wait_freezes": 300 }, "ArtificialSleepwalkingAwards": { "doc": "人工梦游主界面，点击全部领取", @@ -53,13 +40,7 @@ 214, 189 ], - "action": "Click", - "next": [ - "Sub_ObtainedAwards", - "ArtificialSleepwalkingAwards", - "ArtificialSleepwalkingCloseAwards", - "LimboEntry" - ] + "action": "Click" }, "ArtificialSleepwalkingCloseAwards": { "recognition": "TemplateMatch", @@ -70,13 +51,7 @@ 248, 142 ], - "action": "Click", - "next": [ - "ArtificialSleepwalkingCloseAwards", - "LimboEntry", - "HomeFlag", - "Sub_StartUp" - ] + "action": "Click" }, "LimboEntry": { "doc": "人工梦游主界面，点击挑战，进入深眠域", @@ -89,9 +64,7 @@ 162 ], "action": "Click", - "next": [ - "LimboStageRightest" - ] + "post_wait_freezes": 500 }, "LimboStageRightest": { "doc": "深眠域，点击最右侧的深眠片段", @@ -112,11 +85,10 @@ -120, 50 ], - "post_wait_freezes": 1, + "post_wait_freezes": 300, "next": [ - "LimboEnd", - "LimboStageRightest", - "LimboStageFlag" + "LimboStageFlag", + "LimboStageRightest" ] }, "LimboStageFlag": { @@ -150,6 +122,7 @@ "next": [ "LimboStageFlag_up", "LimboStageFlag_down", + "LimboStageFlag_failed", "LimboStageFlag" ] }, @@ -179,7 +152,7 @@ "LimboStageFlag_down": { "doc": "判断当前位于深眠片段下半部分", "recognition": "OCR", - "expected": "0/6", + "expected": "3/6", "roi": [ 1028, 101, @@ -187,7 +160,6 @@ 36 ], "only_rec": true, - "inverse": true, "target": [ 681, 707, @@ -201,6 +173,26 @@ "LimboStarsMainFlag" ] }, + "LimboStageFlag_failed": { + "doc": "判断当前位于深眠片段上半部分未满星，结束任务", + "todo_doc": "后续可在这里添加重打当前深眠片段的操作", + "recognition": "OCR", + "expected": "[1-2]/6", + "roi": [ + 1028, + 101, + 66, + 36 + ], + "only_rec": true, + "target": [ + 681, + 707, + 85, + 43 + ], + "action": "Click" + }, "LimboStageLightest_1": { "doc": "最靓的位置，要多点几次", "recognition": "NeuralNetworkDetect", @@ -450,6 +442,7 @@ "rate_limit": 5000 }, "LimboVictory_2": { + "doc": "深眠下半完成时，先判断是否有finish，有则继续下面的操作，否则直接结束任务", "recognition": "OCR", "expected": [ "战斗胜利" @@ -462,10 +455,26 @@ ], "action": "Click", "next": [ - "LimboFinish", + "LimboMain", "LimboVictory_2" ] }, + "LimboMain": { + "doc": "深眠片段主界面", + "recognition": "OCR", + "expected": "本层酬劳", + "roi": [ + 146, + 676, + 67, + 21 + ], + "only_rec": true, + "next": [ + "LimboFinish", + "Stop" + ] + }, "LimboFinish": { "doc": "当前深眠片段战斗完成", "recognition": "TemplateMatch", @@ -480,7 +489,17 @@ "action": "Click", "next": [ "LimboAwards", - "LimboFinish" + "LimboNoAwards" + ] + }, + "LimboNoAwards": { + "doc": "当前深眠片段战斗无未领取奖励", + "next": [ + "LimboEnd", + "LimboStageRightest" + ], + "interrupt": [ + "BackButton" ] }, "LimboAwards": { @@ -510,8 +529,10 @@ ], "action": "Click", "next": [ - "Sub_ObtainedAwards", "LimboObtainedAwards_2" + ], + "interrupt": [ + "ObtainedAwards" ] }, "LimboObtainedAwards_2": { @@ -531,11 +552,13 @@ 20 ], "next": [ - "Sub_ObtainedAwards", "LimboEnd", "LimboStageRightest", - "Sub_BackButton", "LimboObtainedAwards_2" + ], + "interrupt": [ + "ObtainedAwards", + "BackButton" ] }, "LimboEnd": { diff --git a/assets/resource/base/pipeline/startup.json b/assets/resource/base/pipeline/startup.json index 6f8ab19..e61743a 100644 --- a/assets/resource/base/pipeline/startup.json +++ b/assets/resource/base/pipeline/startup.json @@ -186,6 +186,20 @@ 64 ] }, + "BackButton": { + "recognition": "TemplateMatch", + "template": [ + "StartUp/BackButton.png", + "StartUp/BackButton_White.png" + ], + "roi": [ + 0, + 0, + 134, + 138 + ], + "action": "Click" + }, "Sub_BackButton": { "is_sub": true, "recognition": "TemplateMatch", @@ -201,6 +215,20 @@ ], "action": "Click" }, + "HomeButton": { + "recognition": "TemplateMatch", + "template": [ + "StartUp/HomeButton.png", + "StartUp/HomeButton_White.png" + ], + "roi": [ + 70, + 0, + 144, + 144 + ], + "action": "Click" + }, "Sub_HomeButton": { "is_sub": true, "recognition": "TemplateMatch",