diff --git a/assets/interface.json b/assets/interface.json index 9e1c7d20..21711140 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -1,444 +1,461 @@ -{ - "controller": [ - { - "name": "ADB 默认方式", - "type": "Adb", - "screencap": 16580608 - } - ], - "resource": [ - { - "name": "官服", - "path": [ - "{PROJECT_DIR}/resource/base" - ] - }, - { - "name": "B 服", - "path": [ - "{PROJECT_DIR}/resource/base", - "{PROJECT_DIR}/resource/bilibili" - ] - } - ], - "task": [ - { - "name": "启动游戏", - "entry": "StartUp" - }, - { - "name": "收取荒原", - "entry": "Wilderness" - }, - { - "name": "每日心相（意志解析）", - "entry": "Psychube" - }, - { - "name": "常规作战", - "entry": "Combat", - "option": [ - "作战关卡", - "复现次数", - "刷完全部体力", - "吃全部临期糖" - ] - }, - { - "name": "活动：绿湖噩梦 17 艰难（活动已结束）", - "entry": "ANightmareAtGreenLake", - "option": [ - "复现次数", - "刷完全部体力", - "吃全部临期糖" - ], - "param": { - "EnterTheShow": { - "next": "ANightmareAtGreenLake" - }, - "TargetStageName": { - "text": "17" - }, - "StageDifficulty": { - "next": "ActivityStageDifficulty" - } - } - }, - { - "name": "活动：行至摩卢旁卡 16 艰难（活动已结束）", - "entry": "JourneytoMorPankh", - "option": [ - "复现次数", - "刷完全部体力", - "吃全部临期糖" - ], - "param": { - "EnterTheShow": { - "next": "JourneytoMorPankh" - }, - "TargetStageName": { - "text": "16" - }, - "StageDifficulty": { - "next": "ActivityStageDifficulty" - } - } - }, - { - "name": "活动：洞穴的囚徒 证明启示 05（活动已结束）", - "entry": "ThePrisonerintheCave", - "option": [ - "复现次数", - "刷完全部体力", - "吃全部临期糖" - ], - "param": { - "EnterTheShow": { - "next": "dummyThePrisonerintheCave" - }, - "TargetStageName": { - "text": "dummy证明启示V" - }, - "StageDifficulty": { - "next": "dummyStageDifficulty_None" - } - } - }, - { - "name": "活动：复兴乌卢鲁运动会 13 艰难（活动已结束）", - "entry": "RevivalTheUluruGames", - "option": [ - "复现次数", - "刷完全部体力", - "吃全部临期糖" - ], - "param": { - "EnterTheShow": { - "next": "RevivalTheUluruGames" - }, - "TargetStageName": { - "text": "13" - }, - "StageDifficulty": { - "next": "ActivityStageDifficulty" - } - } - }, - { - "name": "活动：朔日手记 19 艰难", - "entry": "NotesOnShuoRi", - "option": [ - "复现次数", - "刷完全部体力", - "吃全部临期糖" - ], - "param": { - "EnterTheShow": { - "next": "NotesOnShuoRi" - }, - "TargetStageName": { - "text": "19" - }, - "StageDifficulty": { - "next": "ActivityStageDifficulty" - } - } - }, - { - "name": "山麓的回音（肉鸽）", - "entry": "EchoesinInTheMountain" - }, - { - "name": "人工梦游", - "entry": "Limbo" - }, - { - "name": "领取奖励", - "entry": "Awards" - }, - { - "name": "关闭游戏", - "entry": "Close1999" - } - ], - "recognizer": {}, - "action": {}, - "option": { - "作战关卡": { - "cases": [ - { - "name": "6-14 厄险（祝圣秘银）", - "param": { - "EnterTheShow": { - "next": "MainChapter_6" - }, - "TargetStageName": { - "text": "14" - }, - "StageDifficulty": { - "next": "StageDifficulty_Hard" - } - } - }, - { - "name": "3-9 厄险（百灵百验鸟）", - "param": { - "EnterTheShow": { - "next": "MainChapter_3" - }, - "TargetStageName": { - "text": "09" - }, - "StageDifficulty": { - "next": "StageDifficulty_Hard" - } - } - }, - { - "name": "4-20 厄险（双头形骨架）", - "param": { - "EnterTheShow": { - "next": "MainChapter_4" - }, - "TargetStageName": { - "text": "20" - }, - "StageDifficulty": { - "next": "StageDifficulty_Hard" - } - } - }, - { - "name": "2-3 厄险（祝圣秘银）", - "param": { - "EnterTheShow": { - "next": "MainChapter_2" - }, - "TargetStageName": { - "text": "03" - }, - "StageDifficulty": { - "next": "StageDifficulty_Hard" - } - } - }, - { - "name": "3-13 厄险（盐封曼德拉）", - "param": { - "EnterTheShow": { - "next": "MainChapter_3" - }, - "TargetStageName": { - "text": "13" - }, - "StageDifficulty": { - "next": "StageDifficulty_Hard" - } - } - }, - { - "name": "4-10 厄险（啮咬盒）", - "param": { - "EnterTheShow": { - "next": "MainChapter_4" - }, - "TargetStageName": { - "text": "10" - }, - "StageDifficulty": { - "next": "StageDifficulty_Hard" - } - } - }, - { - "name": "3-11 厄险（金爪灵摆）", - "param": { - "EnterTheShow": { - "next": "MainChapter_3" - }, - "TargetStageName": { - "text": "11" - }, - "StageDifficulty": { - "next": "StageDifficulty_Hard" - } - } - }, - { - "name": "尘埃运动 06", - "param": { - "EnterTheShow": { - "next": "ResourceChapter_LP" - }, - "TargetStageName": { - "text": "06" - }, - "StageDifficulty": { - "next": "StageDifficulty_None" - } - } - }, - { - "name": "猪鼻美学 06", - "param": { - "EnterTheShow": { - "next": "ResourceChapter_MA" - }, - "TargetStageName": { - "text": "06" - }, - "StageDifficulty": { - "next": "StageDifficulty_None" - } - } - }, - { - "name": "丰收时令 04", - "param": { - "EnterTheShow": { - "next": "ResourceChapter_MA" - }, - "TargetStageName": { - "text": "04" - }, - "StageDifficulty": { - "next": "StageDifficulty_None" - } - } - }, - { - "name": "群山之声 06（洞悉 岩）", - "param": { - "EnterTheShow": { - "next": "PromotionChapter_ME" - }, - "TargetStageName": { - "text": "06" - }, - "StageDifficulty": { - "next": "StageDifficulty_None" - } - } - }, - { - "name": "星陨之所 06（洞悉 星）", - "param": { - "EnterTheShow": { - "next": "PromotionChapter_SL" - }, - "TargetStageName": { - "text": "06" - }, - "StageDifficulty": { - "next": "StageDifficulty_None" - } - } - }, - { - "name": "深林之形 06（洞悉 林）", - "param": { - "EnterTheShow": { - "next": "PromotionChapter_SS" - }, - "TargetStageName": { - "text": "06" - }, - "StageDifficulty": { - "next": "StageDifficulty_None" - } - } - }, - { - "name": "荒兽之野 06（洞悉 兽）", - "param": { - "EnterTheShow": { - "next": "PromotionChapter_BW" - }, - "TargetStageName": { - "text": "06" - }, - "StageDifficulty": { - "next": "StageDifficulty_None" - } - } - } - ] - }, - "复现次数": { - "cases": [ - { - "name": "x1", - "param": { - "SetReplaysTimes": { - "text": "1" - } - } - }, - { - "name": "x2", - "param": { - "SetReplaysTimes": { - "text": "2" - } - } - }, - { - "name": "x3", - "param": { - "SetReplaysTimes": { - "text": "3" - } - } - }, - { - "name": "x4", - "param": { - "SetReplaysTimes": { - "text": "4" - } - } - } - ] - }, - "刷完全部体力": { - "cases": [ - { - "name": "Yes", - "param": { - "AllIn": { - "enabled": true - } - } - }, - { - "name": "No", - "param": { - "AllIn": { - "enabled": false - } - } - } - ] - }, - "吃全部临期糖": { - "cases": [ - { - "name": "Yes", - "param": { - "EatCandyWithin24H": { - "enabled": true - } - } - }, - { - "name": "No", - "param": { - "EatCandyWithin24H": { - "enabled": false - } - } - } - ] - } - } +{ + "controller": [ + { + "name": "ADB 默认方式", + "type": "Adb", + "screencap": 16580608 + } + ], + "resource": [ + { + "name": "官服", + "path": [ + "{PROJECT_DIR}/resource/base" + ] + }, + { + "name": "B 服", + "path": [ + "{PROJECT_DIR}/resource/base", + "{PROJECT_DIR}/resource/bilibili" + ] + } + ], + "task": [ + { + "name": "启动游戏", + "entry": "StartUp" + }, + { + "name": "收取荒原", + "entry": "Wilderness" + }, + { + "name": "每日心相（意志解析）", + "entry": "Psychube" + }, + { + "name": "常规作战", + "entry": "Combat", + "option": [ + "作战关卡", + "复现次数", + "刷完全部体力", + "吃全部临期糖" + ] + }, + { + "name": "活动：绿湖噩梦 17 艰难（活动已结束）", + "entry": "ANightmareAtGreenLake", + "option": [ + "复现次数", + "刷完全部体力", + "吃全部临期糖" + ], + "param": { + "EnterTheShow": { + "next": "ANightmareAtGreenLake" + }, + "TargetStageName": { + "text": "17" + }, + "StageDifficulty": { + "next": "ActivityStageDifficulty" + } + } + }, + { + "name": "活动：行至摩卢旁卡 16 艰难（活动已结束）", + "entry": "JourneytoMorPankh", + "option": [ + "复现次数", + "刷完全部体力", + "吃全部临期糖" + ], + "param": { + "EnterTheShow": { + "next": "JourneytoMorPankh" + }, + "TargetStageName": { + "text": "16" + }, + "StageDifficulty": { + "next": "ActivityStageDifficulty" + } + } + }, + { + "name": "活动：洞穴的囚徒 证明启示 05（活动已结束）", + "entry": "ThePrisonerintheCave", + "option": [ + "复现次数", + "刷完全部体力", + "吃全部临期糖" + ], + "param": { + "EnterTheShow": { + "next": "dummyThePrisonerintheCave" + }, + "TargetStageName": { + "text": "dummy证明启示V" + }, + "StageDifficulty": { + "next": "dummyStageDifficulty_None" + } + } + }, + { + "name": "活动：复兴乌卢鲁运动会 13 艰难（活动已结束）", + "entry": "RevivalTheUluruGames", + "option": [ + "复现次数", + "刷完全部体力", + "吃全部临期糖" + ], + "param": { + "EnterTheShow": { + "next": "RevivalTheUluruGames" + }, + "TargetStageName": { + "text": "13" + }, + "StageDifficulty": { + "next": "ActivityStageDifficulty" + } + } + }, + { + "name": "活动：朔日手记 19 艰难 （活动已结束）", + "entry": "NotesOnShuoRi", + "option": [ + "复现次数", + "刷完全部体力", + "吃全部临期糖" + ], + "param": { + "EnterTheShow": { + "next": "NotesOnShuoRi" + }, + "TargetStageName": { + "text": "19" + }, + "StageDifficulty": { + "next": "ActivityStageDifficulty" + } + } + }, + { + "name": "山麓的回音（肉鸽）", + "entry": "EchoesinInTheMountain" + }, + { + "name": "活动：再见，来亚什基 16 艰难", + "entry": "GoodbyeRaya", + "option": [ + "复现次数", + "刷完全部体力", + "吃全部临期糖" + ], + "param": { + "EnterTheShow": { + "next": "GoodbyeRaya" + }, + "TargetStageName": { + "text": "16" + }, + "StageDifficulty": { + "next": "ActivityStageDifficulty" + } + } + }, + { + "name": "领取奖励", + "entry": "Awards" + }, + { + "name": "关闭游戏", + "entry": "Close1999" + } + ], + "recognizer": {}, + "action": {}, + "option": { + "作战关卡": { + "cases": [ + { + "name": "6-14 厄险（祝圣秘银）", + "param": { + "EnterTheShow": { + "next": "MainChapter_6" + }, + "TargetStageName": { + "text": "14" + }, + "StageDifficulty": { + "next": "StageDifficulty_Hard" + } + } + }, + { + "name": "3-9 厄险（百灵百验鸟）", + "param": { + "EnterTheShow": { + "next": "MainChapter_3" + }, + "TargetStageName": { + "text": "09" + }, + "StageDifficulty": { + "next": "StageDifficulty_Hard" + } + } + }, + { + "name": "4-20 厄险（双头形骨架）", + "param": { + "EnterTheShow": { + "next": "MainChapter_4" + }, + "TargetStageName": { + "text": "20" + }, + "StageDifficulty": { + "next": "StageDifficulty_Hard" + } + } + }, + { + "name": "2-3 厄险（祝圣秘银）", + "param": { + "EnterTheShow": { + "next": "MainChapter_2" + }, + "TargetStageName": { + "text": "03" + }, + "StageDifficulty": { + "next": "StageDifficulty_Hard" + } + } + }, + { + "name": "3-13 厄险（盐封曼德拉）", + "param": { + "EnterTheShow": { + "next": "MainChapter_3" + }, + "TargetStageName": { + "text": "13" + }, + "StageDifficulty": { + "next": "StageDifficulty_Hard" + } + } + }, + { + "name": "4-10 厄险（啮咬盒）", + "param": { + "EnterTheShow": { + "next": "MainChapter_4" + }, + "TargetStageName": { + "text": "10" + }, + "StageDifficulty": { + "next": "StageDifficulty_Hard" + } + } + }, + { + "name": "3-11 厄险（金爪灵摆）", + "param": { + "EnterTheShow": { + "next": "MainChapter_3" + }, + "TargetStageName": { + "text": "11" + }, + "StageDifficulty": { + "next": "StageDifficulty_Hard" + } + } + }, + { + "name": "尘埃运动 06", + "param": { + "EnterTheShow": { + "next": "ResourceChapter_LP" + }, + "TargetStageName": { + "text": "06" + }, + "StageDifficulty": { + "next": "StageDifficulty_None" + } + } + }, + { + "name": "猪鼻美学 06", + "param": { + "EnterTheShow": { + "next": "ResourceChapter_MA" + }, + "TargetStageName": { + "text": "06" + }, + "StageDifficulty": { + "next": "StageDifficulty_None" + } + } + }, + { + "name": "丰收时令 04", + "param": { + "EnterTheShow": { + "next": "ResourceChapter_MA" + }, + "TargetStageName": { + "text": "04" + }, + "StageDifficulty": { + "next": "StageDifficulty_None" + } + } + }, + { + "name": "群山之声 06（洞悉 岩）", + "param": { + "EnterTheShow": { + "next": "PromotionChapter_ME" + }, + "TargetStageName": { + "text": "06" + }, + "StageDifficulty": { + "next": "StageDifficulty_None" + } + } + }, + { + "name": "星陨之所 06（洞悉 星）", + "param": { + "EnterTheShow": { + "next": "PromotionChapter_SL" + }, + "TargetStageName": { + "text": "06" + }, + "StageDifficulty": { + "next": "StageDifficulty_None" + } + } + }, + { + "name": "深林之形 06（洞悉 林）", + "param": { + "EnterTheShow": { + "next": "PromotionChapter_SS" + }, + "TargetStageName": { + "text": "06" + }, + "StageDifficulty": { + "next": "StageDifficulty_None" + } + } + }, + { + "name": "荒兽之野 06（洞悉 兽）", + "param": { + "EnterTheShow": { + "next": "PromotionChapter_BW" + }, + "TargetStageName": { + "text": "06" + }, + "StageDifficulty": { + "next": "StageDifficulty_None" + } + } + } + ] + }, + "复现次数": { + "cases": [ + { + "name": "x1", + "param": { + "SetReplaysTimes": { + "text": "1" + } + } + }, + { + "name": "x2", + "param": { + "SetReplaysTimes": { + "text": "2" + } + } + }, + { + "name": "x3", + "param": { + "SetReplaysTimes": { + "text": "3" + } + } + }, + { + "name": "x4", + "param": { + "SetReplaysTimes": { + "text": "4" + } + } + } + ] + }, + "刷完全部体力": { + "cases": [ + { + "name": "Yes", + "param": { + "AllIn": { + "enabled": true + } + } + }, + { + "name": "No", + "param": { + "AllIn": { + "enabled": false + } + } + } + ] + }, + "吃全部临期糖": { + "cases": [ + { + "name": "Yes", + "param": { + "EatCandyWithin24H": { + "enabled": true + } + } + }, + { + "name": "No", + "param": { + "EatCandyWithin24H": { + "enabled": false + } + } + } + ] + } + }, + "version": "v1.1.0" } \ No newline at end of file diff --git a/assets/resource/base/image/Combat/Activity/GoodbyeRayaEnterTheShow.png b/assets/resource/base/image/Combat/Activity/GoodbyeRayaEnterTheShow.png new file mode 100644 index 00000000..33ffd7f2 Binary files /dev/null and b/assets/resource/base/image/Combat/Activity/GoodbyeRayaEnterTheShow.png differ diff --git a/assets/resource/base/image/Combat/Activity/GoodbyeRayaMainChapter.png b/assets/resource/base/image/Combat/Activity/GoodbyeRayaMainChapter.png new file mode 100644 index 00000000..9cef8258 Binary files /dev/null and b/assets/resource/base/image/Combat/Activity/GoodbyeRayaMainChapter.png differ diff --git a/assets/resource/base/pipeline/activity/GoodbyeRaya.json b/assets/resource/base/pipeline/activity/GoodbyeRaya.json new file mode 100644 index 00000000..1d9618eb --- /dev/null +++ b/assets/resource/base/pipeline/activity/GoodbyeRaya.json @@ -0,0 +1,35 @@ +{ + "GoodbyeRaya": { + "next": [ + "GoodbyeRayaEnterTheShow", + "Sub_StartUp" + ] + }, + "GoodbyeRayaEnterTheShow": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/GoodbyeRayaEnterTheShow.png", + "roi": [ + 940, + 144, + 244, + 146 + ], + "action": "Click", + "post_wait_freezes": 1, + "next": [ + "GoodbyeRayaMainChapter" + ] + }, + "GoodbyeRayaMainChapter": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/GoodbyeRayaMainChapter.png", + "roi": [ + 988, + 571, + 261, + 95 + ], + "action": "Click", + "next": "SwipeLeftAndFindStage" + } +} \ No newline at end of file