diff --git a/assets/interface.json b/assets/interface.json index f2bc519..91bfadf 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -981,66 +981,10 @@ } }, { - "name": "活动:东区黎明 19 艰难", - "pipeline_override": { - "ActivityEnterTheShow": { - "template": "Combat/Activity/LondonDawningEnterTheShow.png" - }, - "TargetStageName": { - "expected": "19" - }, - "StageDifficulty": { - "next": "ActivityStageDifficulty" - } - } - }, - { - "name": "活动:绿湖噩梦 17 艰难(已结束)", - "pipeline_override": { - "ActivityEntry": { - "next": "ANightmareAtGreenLake" - }, - "TargetStageName": { - "expected": "17" - }, - "StageDifficulty": { - "next": "ActivityStageDifficulty" - } - } - }, - { - "name": "活动:行至摩卢旁卡 16 艰难(已结束)", - "pipeline_override": { - "ActivityEntry": { - "next": "JourneytoMorPankh" - }, - "TargetStageName": { - "expected": "16" - }, - "StageDifficulty": { - "next": "ActivityStageDifficulty" - } - } - }, - { - "name": "活动:洞穴的囚徒 证明启示 05(已结束)", - "pipeline_override": { - "ActivityEntry": { - "next": "dummyThePrisonerintheCave" - }, - "TargetStageName": { - "expected": "dummy证明启示V" - }, - "StageDifficulty": { - "next": "dummyStageDifficulty_None" - } - } - }, - { - "name": "活动:复兴乌卢鲁运动会 13 艰难(已结束)", + "name": "活动:复兴乌卢鲁运动会 13 艰难(复刻)", "pipeline_override": { "ActivityEntry": { - "next": "RevivalTheUluruGames" + "next": "RevivalTheUluruGames_Reproduction" }, "TargetStageName": { "expected": "13" @@ -1107,13 +1051,13 @@ } }, { - "name": "活动:复兴乌卢鲁运动会 13 艰难(复刻)", + "name": "活动:东区黎明 19 艰难(已结束)", "pipeline_override": { - "ActivityEntry": { - "next": "RevivalTheUluruGames_Reproduction" + "ActivityEnterTheShow": { + "template": "Combat/Activity/LondonDawningEnterTheShow.png" }, "TargetStageName": { - "expected": "13" + "expected": "19" }, "StageDifficulty": { "next": "ActivityStageDifficulty" diff --git a/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeEnterTheShow.png b/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeEnterTheShow.png deleted file mode 100644 index 0810a26..0000000 Binary files a/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeEnterTheShow.png and /dev/null differ diff --git a/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeMainChapter.png b/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeMainChapter.png deleted file mode 100644 index c1faebc..0000000 Binary files a/assets/resource/base/image/Combat/Activity/ANightmareAtGreenLakeMainChapter.png and /dev/null differ diff --git a/assets/resource/base/image/Combat/Activity/JourneytoMorPankhEnterTheShow.png b/assets/resource/base/image/Combat/Activity/JourneytoMorPankhEnterTheShow.png deleted file mode 100644 index 0be82fc..0000000 Binary files a/assets/resource/base/image/Combat/Activity/JourneytoMorPankhEnterTheShow.png and /dev/null differ diff --git a/assets/resource/base/image/Combat/Activity/JourneytoMorPankhMainChapter.png b/assets/resource/base/image/Combat/Activity/JourneytoMorPankhMainChapter.png deleted file mode 100644 index 757a208..0000000 Binary files a/assets/resource/base/image/Combat/Activity/JourneytoMorPankhMainChapter.png and /dev/null differ diff --git a/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesEnterTheShow.png b/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesEnterTheShow.png deleted file mode 100644 index 95e59c0..0000000 Binary files a/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesEnterTheShow.png and /dev/null differ diff --git a/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesMainChapter.png b/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesMainChapter.png deleted file mode 100644 index 1190bb1..0000000 Binary files a/assets/resource/base/image/Combat/Activity/RevivalTheUluruGamesMainChapter.png and /dev/null differ diff --git a/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveEnterTheShow.png b/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveEnterTheShow.png deleted file mode 100644 index b998271..0000000 Binary files a/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveEnterTheShow.png and /dev/null differ diff --git a/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveTheProofs.png b/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveTheProofs.png deleted file mode 100644 index 4023052..0000000 Binary files a/assets/resource/base/image/Combat/Activity/ThePrisonerintheCaveTheProofs.png and /dev/null differ diff --git a/assets/resource/base/pipeline/activity/ANightmareAtGreenLake.json b/assets/resource/base/pipeline/activity/ANightmareAtGreenLake.json deleted file mode 100644 index bf49687..0000000 --- a/assets/resource/base/pipeline/activity/ANightmareAtGreenLake.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "ANightmareAtGreenLake": { - "next": [ - "ANightmareAtGreenLakeEnterTheShow" - ], - "interrupt": [ - "ReturnMain" - ] - }, - "ANightmareAtGreenLakeEnterTheShow": { - "recognition": "TemplateMatch", - "template": "Combat/Activity/ANightmareAtGreenLakeEnterTheShow.png", - "roi": [ - 940, - 144, - 244, - 146 - ], - "action": "Click", - "post_wait_freezes": 1, - "next": [ - "ANightmareAtGreenLakeMainChapter" - ] - }, - "ANightmareAtGreenLakeMainChapter": { - "recognition": "TemplateMatch", - "template": "Combat/Activity/ANightmareAtGreenLakeMainChapter.png", - "roi": [ - 892, - 400, - 146, - 177 - ], - "action": "Click", - "next": "SwipeLeftAndFindStage" - } -} \ No newline at end of file diff --git a/assets/resource/base/pipeline/activity/JourneytoMorPankh.json b/assets/resource/base/pipeline/activity/JourneytoMorPankh.json deleted file mode 100644 index e4d05eb..0000000 --- a/assets/resource/base/pipeline/activity/JourneytoMorPankh.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "JourneytoMorPankh": { - "next": [ - "JourneytoMorPankhEnterTheShow" - ], - "interrupt": [ - "ReturnMain" - ] - }, - "JourneytoMorPankhEnterTheShow": { - "recognition": "TemplateMatch", - "template": "Combat/Activity/JourneytoMorPankhEnterTheShow.png", - "roi": [ - 910, - 148, - 290, - 142 - ], - "action": "Click", - "post_wait_freezes": 1, - "next": [ - "JourneytoMorPankhEnterTheShow", - "JourneytoMorPankhMainChapter" - ] - }, - "JourneytoMorPankhMainChapter": { - "recognition": "TemplateMatch", - "template": "Combat/Activity/JourneytoMorPankhMainChapter.png", - "roi": [ - 918, - 475, - 278, - 152 - ], - "action": "Click", - "next": [ - "JourneytoMorPankhMainChapter", - "SwipeLeftAndFindStage" - ] - } -} \ No newline at end of file diff --git a/assets/resource/base/pipeline/activity/RevivalTheUluruGames.json b/assets/resource/base/pipeline/activity/RevivalTheUluruGames.json index b1b9792..6e47cf4 100644 --- a/assets/resource/base/pipeline/activity/RevivalTheUluruGames.json +++ b/assets/resource/base/pipeline/activity/RevivalTheUluruGames.json @@ -1,39 +1,4 @@ { - "RevivalTheUluruGames": { - "next": [ - "RevivalTheUluruGamesEnterTheShow" - ], - "interrupt": [ - "ReturnMain" - ] - }, - "RevivalTheUluruGamesEnterTheShow": { - "recognition": "TemplateMatch", - "template": "Combat/Activity/RevivalTheUluruGamesEnterTheShow.png", - "roi": [ - 940, - 144, - 244, - 146 - ], - "action": "Click", - "post_wait_freezes": 1, - "next": [ - "RevivalTheUluruGamesMainChapter" - ] - }, - "RevivalTheUluruGamesMainChapter": { - "recognition": "TemplateMatch", - "template": "Combat/Activity/RevivalTheUluruGamesMainChapter.png", - "roi": [ - 1024, - 445, - 206, - 154 - ], - "action": "Click", - "next": "SwipeLeftAndFindStage" - }, "RevivalTheUluruGames_Reproduction": { "next": [ "RevivalTheUluruGames_ReproductionEnterTheShow" diff --git a/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json b/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json deleted file mode 100644 index 7696dd2..0000000 --- a/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "ThePrisonerintheCave": { - "next": [ - "ThePrisonerintheCaveEnterTheShow" - ], - "interrupt": [ - "ReturnMain" - ] - }, - "ThePrisonerintheCaveEnterTheShow": { - "recognition": "TemplateMatch", - "template": "Combat/Activity/ThePrisonerintheCaveEnterTheShow.png", - "roi": [ - 880, - 130, - 287, - 168 - ], - "action": "Click", - "post_wait_freezes": 1, - "next": [ - "ThePrisonerintheCaveEnterTheShow", - "ThePrisonerintheCaveTheProofs" - ] - }, - "ThePrisonerintheCaveTheProofs": { - "recognition": "TemplateMatch", - "template": "Combat/Activity/ThePrisonerintheCaveTheProofs.png", - "roi": [ - 997, - 296, - 201, - 136 - ], - "action": "Click", - "post_wait_freezes": 1, - "next": [ - "ThePrisonerintheCaveTheProofs", - "ThePrisonerintheCaveTargetStageName" - ] - }, - "ThePrisonerintheCaveTargetStageName": { - "recognition": "OCR", - "expected": [ - "证明启示V" - ], - "roi": [ - 1014, - 331, - 227, - 144 - ], - "action": "Click", - "next": [ - "ThePrisonerintheCaveReadyForAction" - ] - }, - "ThePrisonerintheCaveReadyForAction": { - "recognition": "OCR", - "expected": [ - "开始行动" - ], - "roi": [ - 762, - 404, - 213, - 149 - ], - "action": "Click", - "next": [ - "SwitchToReplay", - "AllIn", - "OpenReplaysTimes" - ] - } -} \ No newline at end of file