From dded02a3799ce1fb1d009d62c9a4e12e88f715a7 Mon Sep 17 00:00:00 2001 From: Constrat Date: Sun, 2 Jun 2024 17:02:56 +0000 Subject: [PATCH] chore: Auto Update Game Resources - 2024-06-02 [skip changelog] --- .../global/YoStarEN/resource/version.json | 2 +- .../global/YoStarJP/resource/version.json | 2 +- .../global/YoStarKR/resource/version.json | 2 +- resource/global/txwy/resource/version.json | 2 +- resource/tasks.json | 510 +++++++++--------- resource/version.json | 2 +- 6 files changed, 263 insertions(+), 257 deletions(-) diff --git a/resource/global/YoStarEN/resource/version.json b/resource/global/YoStarEN/resource/version.json index 1f74857976..065f05cd23 100644 --- a/resource/global/YoStarEN/resource/version.json +++ b/resource/global/YoStarEN/resource/version.json @@ -7,5 +7,5 @@ "pool": "By My Will", "time": 1714496400 }, - "last_updated": "2024-06-02 11:23:37.867" + "last_updated": "2024-06-02 17:02:53.739" } diff --git a/resource/global/YoStarJP/resource/version.json b/resource/global/YoStarJP/resource/version.json index 524a9248e4..2ab91012eb 100644 --- a/resource/global/YoStarJP/resource/version.json +++ b/resource/global/YoStarJP/resource/version.json @@ -7,5 +7,5 @@ "pool": "宿願", "time": 1714460400 }, - "last_updated": "2024-06-02 11:23:37.867" + "last_updated": "2024-06-02 17:02:53.739" } diff --git a/resource/global/YoStarKR/resource/version.json b/resource/global/YoStarKR/resource/version.json index ecaf16d410..002f095040 100644 --- a/resource/global/YoStarKR/resource/version.json +++ b/resource/global/YoStarKR/resource/version.json @@ -7,5 +7,5 @@ "pool": "염원", "time": 1714460400 }, - "last_updated": "2024-06-02 11:23:37.867" + "last_updated": "2024-06-02 17:02:53.739" } diff --git a/resource/global/txwy/resource/version.json b/resource/global/txwy/resource/version.json index 9199889eb7..8c3b55f7fb 100644 --- a/resource/global/txwy/resource/version.json +++ b/resource/global/txwy/resource/version.json @@ -7,5 +7,5 @@ "pool": "不協和音程", "time": 1715671800 }, - "last_updated": "2024-06-02 11:23:37.867" + "last_updated": "2024-06-02 17:02:53.739" } diff --git a/resource/tasks.json b/resource/tasks.json index 8e82d7a718..f8fd7d7807 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -16844,6 +16844,256 @@ "#back" ] }, + "Reclamation2Ex": { + "algorithm": "JustReturn", + "action": "DoNothing", + "sub": [ + "Reclamation2ExAssemblyStation", + "Reclamation2ExManufacture", + "Reclamation2ExAssemblyStationBack", + "Reclamation2SkipDays*3", + "Reclamation2ExReadArchive", + "Reclamation2SkipDaysBeginNewDay" + ], + "Doc": "现在是纯tasks实现的，先一直跑着", + "next": [ + "#self" + ] + }, + "Reclamation2ExAdd": { + "action": "ClickSelf", + "roi": [ + 814, + 445, + 166, + 160 + ] + }, + "Reclamation2ExAddProduct": { + "algorithm": "JustReturn", + "sub": [ + "Reclamation2ExAdd*99" + ] + }, + "Reclamation2ExAssemblyStation": { + "Doc": "进入组装台", + "action": "ClickSelf", + "roi": [ + 564, + 596, + 155, + 124 + ], + "next": [ + "Reclamation2ExAssemblyStationOcr", + "#self" + ] + }, + "Reclamation2ExAssemblyStationBack": { + "baseTask": "Reclamation2ExAssemblyStationOcr", + "action": "ClickSelf" + }, + "Reclamation2ExAssemblyStationOcr": { + "Doc": "确认进入组装台", + "algorithm": "OcrDetect", + "roi": [ + 56, + 0, + 185, + 134 + ], + "text": [ + "组装台" + ] + }, + "Reclamation2ExBegin": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "继", + "续", + "演", + "算" + ], + "roi": [ + 844, + 569, + 436, + 151 + ] + }, + "Reclamation2ExClickProduct": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "荧光棒" + ], + "cache": false + }, + "Reclamation2ExManufacture": { + "algorithm": "JustReturn", + "sub": [ + "Reclamation2ExSwipeAndClickProduct", + "Reclamation2ExAddProduct" + ], + "next": [ + "Reclamation2ExManufactureConfirmAmount", + "Reclamation2ExManufactureConfirm" + ] + }, + "Reclamation2ExManufactureConfirm": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "开始组装" + ], + "roi": [ + 981, + 461, + 198, + 128 + ], + "next": [ + "Reclamation2ExManufactureConfirmClickToContinue" + ] + }, + "Reclamation2ExManufactureConfirmAmount": { + "algorithm": "OcrDetect", + "Doc": "如果刚好用完的话可能会卡住，这个之后再处理了", + "text": [ + "99" + ], + "roi": [ + 720, + 442, + 175, + 166 + ], + "sub": [ + "Reclamation2ExManufactureConfirm" + ], + "next": [ + "Reclamation2ExManufacture" + ] + }, + "Reclamation2ExManufactureConfirmClickToContinue": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "点击", + "空白", + "继续" + ], + "roi": [ + 507, + 398, + 268, + 139 + ], + "preDelay": 1000 + }, + "Reclamation2ExReadArchive": { + "Doc": "读取存档", + "template": "Reclamation2DeleteArchive.png", + "baseTask": "Reclamation2DeleteArchive", + "next": [ + "Reclamation2ExReadArchiveEnter", + "#self" + ] + }, + "Reclamation2ExReadArchiveConfirm": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "确认" + ], + "roi": [ + 820, + 406, + 308, + 146 + ] + }, + "Reclamation2ExReadArchiveEnter": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "读取" + ], + "roi": [ + 1030, + 548, + 170, + 124 + ], + "sub": [ + "Reclamation2ExReadArchiveConfirm*2", + "Reclamation2ExReadArchiveSelectDay", + "Reclamation2ExReadArchiveSelectDayConfirm" + ] + }, + "Reclamation2ExReadArchiveSelectDay": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "生息", + "日" + ], + "roi": [ + 406, + 368, + 166, + 128 + ] + }, + "Reclamation2ExReadArchiveSelectDayConfirm": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "点击", + "确认" + ], + "roi": [ + 528, + 480, + 225, + 142 + ] + }, + "Reclamation2ExSwipeAndClickProduct": { + "algorithm": "JustReturn", + "Doc": "寻找需要制作的物品，暂定荧光棒，后续可以增加参数指定", + "next": [ + "Reclamation2ExClickProduct", + "Reclamation2ExSwipeToProduct" + ] + }, + "Reclamation2ExSwipeToProduct": { + "Doc": "竖直滑动", + "algorithm": "JustReturn", + "action": "Swipe", + "specificRect": [ + 752, + 620, + 0, + 0 + ], + "rectMove": [ + 752, + 80, + 0, + 0 + ], + "specialParams": [ + 150, + 1, + 1, + 1 + ], + "next": [ + "Reclamation2ExSwipeAndClickProduct#next" + ] + }, "Reclamation2Fight": { "algorithm": "OcrDetect", "action": "ClickSelf", @@ -16930,7 +17180,10 @@ 152, 182 ], - "maskRange": [ 1, 255 ], + "maskRange": [ + 1, + 255 + ], "templThreshold": 0.7, "preDelay": 2000, "next": [ @@ -16945,7 +17198,10 @@ 229, 184 ], - "maskRange": [ 1, 255 ], + "maskRange": [ + 1, + 255 + ], "templThreshold": 0.7, "preDelay": 2000, "next": [ @@ -17039,256 +17295,6 @@ 144 ] }, - "Reclamation2Ex": { - "algorithm": "JustReturn", - "action": "DoNothing", - "sub": [ - "Reclamation2ExAssemblyStation", - "Reclamation2ExManufacture", - "Reclamation2ExAssemblyStationBack", - "Reclamation2SkipDays*3", - "Reclamation2ExReadArchive", - "Reclamation2SkipDaysBeginNewDay" - ], - "Doc": "现在是纯tasks实现的，先一直跑着", - "next": [ - "#self" - ] - }, - "Reclamation2ExBegin": { - "algorithm": "OcrDetect", - "action": "ClickSelf", - "text": [ - "继", - "续", - "演", - "算" - ], - "roi": [ - 844, - 569, - 436, - 151 - ] - }, - "Reclamation2ExAssemblyStation": { - "Doc": "进入组装台", - "action": "ClickSelf", - "roi": [ - 564, - 596, - 155, - 124 - ], - "next": [ - "Reclamation2ExAssemblyStationOcr", - "#self" - ] - }, - "Reclamation2ExAssemblyStationOcr": { - "Doc": "确认进入组装台", - "algorithm": "OcrDetect", - "roi": [ - 56, - 0, - 185, - 134 - ], - "text": [ - "组装台" - ] - }, - "Reclamation2ExManufacture": { - "algorithm": "JustReturn", - "sub": [ - "Reclamation2ExSwipeAndClickProduct", - "Reclamation2ExAddProduct" - ], - "next": [ - "Reclamation2ExManufactureConfirmAmount", - "Reclamation2ExManufactureConfirm" - ] - }, - "Reclamation2ExSwipeAndClickProduct": { - "algorithm": "JustReturn", - "Doc": "寻找需要制作的物品，暂定荧光棒，后续可以增加参数指定", - "next": [ - "Reclamation2ExClickProduct", - "Reclamation2ExSwipeToProduct" - ] - }, - "Reclamation2ExSwipeToProduct": { - "Doc": "竖直滑动", - "algorithm": "JustReturn", - "action": "Swipe", - "specificRect": [ - 752, - 620, - 0, - 0 - ], - "rectMove": [ - 752, - 80, - 0, - 0 - ], - "specialParams": [ - 150, - 1, - 1, - 1 - ], - "next": [ - "Reclamation2ExSwipeAndClickProduct#next" - ] - }, - "Reclamation2ExClickProduct": { - "algorithm": "OcrDetect", - "action": "ClickSelf", - "text": [ - "荧光棒" - ], - "cache": false - }, - "Reclamation2ExAddProduct": { - "algorithm": "JustReturn", - "sub": [ - "Reclamation2ExAdd*99" - ] - }, - "Reclamation2ExAdd": { - "action": "ClickSelf", - "roi": [ - 814, - 445, - 166, - 160 - ] - }, - "Reclamation2ExManufactureConfirmAmount": { - "algorithm": "OcrDetect", - "Doc": "如果刚好用完的话可能会卡住，这个之后再处理了", - "text": [ - "99" - ], - "roi": [ - 720, - 442, - 175, - 166 - ], - "sub": [ - "Reclamation2ExManufactureConfirm" - ], - "next": [ - "Reclamation2ExManufacture" - ] - }, - "Reclamation2ExManufactureConfirm": { - "algorithm": "OcrDetect", - "action": "ClickSelf", - "text": [ - "开始组装" - ], - "roi": [ - 981, - 461, - 198, - 128 - ], - "next": [ - "Reclamation2ExManufactureConfirmClickToContinue" - ] - }, - "Reclamation2ExManufactureConfirmClickToContinue": { - "algorithm": "OcrDetect", - "action": "ClickSelf", - "text": [ - "点击", - "空白", - "继续" - ], - "roi": [ - 507, - 398, - 268, - 139 - ], - "preDelay": 1000 - }, - "Reclamation2ExAssemblyStationBack": { - "baseTask": "Reclamation2ExAssemblyStationOcr", - "action": "ClickSelf" - }, - "Reclamation2ExReadArchive": { - "Doc": "读取存档", - "template": "Reclamation2DeleteArchive.png", - "baseTask": "Reclamation2DeleteArchive", - "next": [ - "Reclamation2ExReadArchiveEnter", - "#self" - ] - }, - "Reclamation2ExReadArchiveEnter": { - "algorithm": "OcrDetect", - "action": "ClickSelf", - "text": [ - "读取" - ], - "roi": [ - 1030, - 548, - 170, - 124 - ], - "sub": [ - "Reclamation2ExReadArchiveConfirm*2", - "Reclamation2ExReadArchiveSelectDay", - "Reclamation2ExReadArchiveSelectDayConfirm" - ] - }, - "Reclamation2ExReadArchiveConfirm": { - "algorithm": "OcrDetect", - "action": "ClickSelf", - "text": [ - "确认" - ], - "roi": [ - 820, - 406, - 308, - 146 - ] - }, - "Reclamation2ExReadArchiveSelectDay": { - "algorithm": "OcrDetect", - "action": "ClickSelf", - "text": [ - "生息", - "日" - ], - "roi": [ - 406, - 368, - 166, - 128 - ] - }, - "Reclamation2ExReadArchiveSelectDayConfirm": { - "algorithm": "OcrDetect", - "action": "ClickSelf", - "text": [ - "点击", - "确认" - ], - "roi": [ - 528, - 480, - 225, - 142 - ] - }, "Reclamation@AtCmdCenterFlag": { "algorithm": "OcrDetect", "roi": [ diff --git a/resource/version.json b/resource/version.json index cd3af359bf..6fd022f34e 100644 --- a/resource/version.json +++ b/resource/version.json @@ -7,5 +7,5 @@ "pool": "何以为我", "time": 1714536000 }, - "last_updated": "2024-06-02 11:23:37.867" + "last_updated": "2024-06-02 17:02:53.739" }