From fa3cbd4cd2a171d0641d910515e5e8f2279eead7 Mon Sep 17 00:00:00 2001 From: dongwlin Date: Wed, 11 Dec 2024 09:50:59 +0800 Subject: [PATCH] refactor: update pipleline for maa framework v1.8.9 --- assets/resource/pipeline/armada/armada.json | 1 - .../resource/pipeline/armada/commissions.json | 5 ++--- .../pipeline/armada/contributions.json | 3 +-- assets/resource/pipeline/awards.json | 3 +-- assets/resource/pipeline/close_bh3.json | 1 - assets/resource/pipeline/combat/combat.json | 1 - .../pipeline/combat/universal_mirage.json | 18 +++++++--------- .../universal_mirage_combat_generic.json | 1 - assets/resource/pipeline/dorm/dorm.json | 5 ++--- assets/resource/pipeline/dorm/errands.json | 13 ++++++------ .../resource/pipeline/dorm/expeditions.json | 21 +++++++++---------- assets/resource/pipeline/material_event.json | 5 ++--- .../navigation/armada_navigation.json | 3 +-- .../navigation/attack_event_navigation.json | 1 - .../navigation/attack_navigation.json | 1 - .../challenge_event_navigation.json | 1 - .../navigation/commissions_navigation.json | 1 - .../pipeline/navigation/dorm_navigation.json | 1 - .../pipeline/navigation/home_navigation.json | 11 +++++----- .../material_expedition_navigation.json | 1 - .../navigation/missions_navigation.json | 1 - .../pipeline/navigation/shop_navigation.json | 1 - .../navigation/supply_navigation.json | 1 - .../universal_mirage_navigation.json | 1 - assets/resource/pipeline/shop.json | 5 ++--- assets/resource/pipeline/startup.json | 15 +++++++------ assets/resource/pipeline/utils.json | 8 +++---- 27 files changed, 50 insertions(+), 79 deletions(-) diff --git a/assets/resource/pipeline/armada/armada.json b/assets/resource/pipeline/armada/armada.json index 07caea3..df60b93 100644 --- a/assets/resource/pipeline/armada/armada.json +++ b/assets/resource/pipeline/armada/armada.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Armada": { "next": [ "ArmadaPageFlag", diff --git a/assets/resource/pipeline/armada/commissions.json b/assets/resource/pipeline/armada/commissions.json index ec46291..9d54d7c 100644 --- a/assets/resource/pipeline/armada/commissions.json +++ b/assets/resource/pipeline/armada/commissions.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Commissions": { "next": [ "CommissionsPageFlag", @@ -49,7 +48,7 @@ }, "AcceptNewCommission": { "recognition": "OCR", - "text": [ + "expected": [ "接受" ], "roi": [ @@ -150,7 +149,7 @@ }, "CommossionLimit": { "recognition": "OCR", - "text": [ + "expected": [ "回收委托次数已经耗尽" ], "roi": [ diff --git a/assets/resource/pipeline/armada/contributions.json b/assets/resource/pipeline/armada/contributions.json index c0785db..9dce326 100644 --- a/assets/resource/pipeline/armada/contributions.json +++ b/assets/resource/pipeline/armada/contributions.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Contributions": { "next": [ "ContributionsPageFlag", @@ -27,7 +26,7 @@ "ClaimedContributionRewards_3700", "ClaimedContributionRewards_2500", "ClaimedContributionRewards_1200", - "ClaimedContributionRewards_0" + "ClaimedContributionRewards_0" ] }, "ClaimContributionRewards_0": { diff --git a/assets/resource/pipeline/awards.json b/assets/resource/pipeline/awards.json index 293b7c3..ac4d51d 100644 --- a/assets/resource/pipeline/awards.json +++ b/assets/resource/pipeline/awards.json @@ -1,5 +1,4 @@ { - "$schema": "../pipeline.schema.json", "Awards": { "next": [ "MissionsPageFlag", @@ -11,7 +10,7 @@ }, "MissionsPageFlag": { "recognition": "OCR", - "text": "作战任务", + "expected": "作战任务", "roi": [ 0, 60, diff --git a/assets/resource/pipeline/close_bh3.json b/assets/resource/pipeline/close_bh3.json index 936d7b0..17caddc 100644 --- a/assets/resource/pipeline/close_bh3.json +++ b/assets/resource/pipeline/close_bh3.json @@ -1,5 +1,4 @@ { - "$schema": "../pipeline.schema.json", "CloseBH3": { "action": "StopApp" } diff --git a/assets/resource/pipeline/combat/combat.json b/assets/resource/pipeline/combat/combat.json index 8cd4f6c..8277894 100644 --- a/assets/resource/pipeline/combat/combat.json +++ b/assets/resource/pipeline/combat/combat.json @@ -1,4 +1,3 @@ { - "$schema": "../../pipeline.schema.json", "Combating": {} } \ No newline at end of file diff --git a/assets/resource/pipeline/combat/universal_mirage.json b/assets/resource/pipeline/combat/universal_mirage.json index 0f680cf..c6494a7 100644 --- a/assets/resource/pipeline/combat/universal_mirage.json +++ b/assets/resource/pipeline/combat/universal_mirage.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "UniversalMirage": { "next": [ "UniversalMiragePageFlag", @@ -76,7 +75,6 @@ 100, 80, 50 - ], "end": [ 400, @@ -105,7 +103,7 @@ }, "SelectUniversalMirageStageF2": { "recognition": "OCR", - "text": "2", + "expected": "2", "roi": [ 200, 80, @@ -120,7 +118,7 @@ }, "SelectUniversalMirageStageF5": { "recognition": "OCR", - "text": "5", + "expected": "5", "roi": [ 200, 80, @@ -135,7 +133,7 @@ }, "UniversalMirageStageF2Flag": { "recognition": "OCR", - "text": "第2层", + "expected": "第2层", "roi": [ 765, 18, @@ -152,7 +150,7 @@ }, "UniversalMirageStageF5Flag": { "recognition": "OCR", - "text": "第5层", + "expected": "第5层", "roi": [ 765, 18, @@ -219,7 +217,7 @@ }, "UniversalMirageNoneInviteOfMirage": { "recognition": "OCR", - "text": "虚境挑战书不足", + "expected": "虚境挑战书不足", "roi": [ 362, 287, @@ -241,7 +239,7 @@ }, "UniversalMirageCombatFinish": { "recognition": "OCR", - "text": "战斗耗时", + "expected": "战斗耗时", "roi": [ 738, 360, @@ -276,7 +274,7 @@ }, "UniversalMirageNoneTimeSwirlPasses": { "recognition": "OCR", - "text": "您的时序通行证数量不足", + "expected": "您的时序通行证数量不足", "roi": [ 234, 286, @@ -289,7 +287,7 @@ }, "UniversalMirageQuit": { "recognition": "OCR", - "text": "退出", + "expected": "退出", "roi": [ 360, 551, diff --git a/assets/resource/pipeline/combat/universal_mirage_combat_generic.json b/assets/resource/pipeline/combat/universal_mirage_combat_generic.json index eda8341..8d4895b 100644 --- a/assets/resource/pipeline/combat/universal_mirage_combat_generic.json +++ b/assets/resource/pipeline/combat/universal_mirage_combat_generic.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "UniversalMirageCombatGeneric": { "recognition": "TemplateMatch", "template": "Combat/UniversalMirage/UniversalMirageStageStart.png", diff --git a/assets/resource/pipeline/dorm/dorm.json b/assets/resource/pipeline/dorm/dorm.json index 498daf1..1e7d874 100644 --- a/assets/resource/pipeline/dorm/dorm.json +++ b/assets/resource/pipeline/dorm/dorm.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Dorm": { "next": [ "Sub_ConfirmDormUpdate", @@ -12,7 +11,7 @@ }, "DormPageFlag": { "recognition": "OCR", - "text": "家园小队", + "expected": "家园小队", "roi": [ 28, 589, @@ -84,7 +83,7 @@ }, "APMax": { "recognition": "OCR", - "text": "已经达到体力上限", + "expected": "已经达到体力上限", "roi": [ 461, 289, diff --git a/assets/resource/pipeline/dorm/errands.json b/assets/resource/pipeline/dorm/errands.json index 65003b7..cf107cd 100644 --- a/assets/resource/pipeline/dorm/errands.json +++ b/assets/resource/pipeline/dorm/errands.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Errands": { "next": [ "ErrandsPageFlag", @@ -45,7 +44,7 @@ }, "ErrandsCompleted": { "recognition": "OCR", - "text": [ + "expected": [ "完成" ], "roi": [ @@ -81,7 +80,7 @@ }, "ErrandsNeed": { "recognition": "OCR", - "text": [ + "expected": [ "需要" ], "roi": [ @@ -98,7 +97,7 @@ "ErrandsNoNeed": { "inverse": true, "recognition": "OCR", - "text": [ + "expected": [ "需要" ], "roi": [ @@ -130,7 +129,7 @@ }, "NoEligibleRoles": { "recognition": "OCR", - "text": [ + "expected": [ "没有找到", "合适的", "推荐女武神" @@ -163,7 +162,7 @@ }, "NotEnoughRefreshes": { "recognition": "OCR", - "text": [ + "expected": [ "今日剩余", "刷新次数不足" ], @@ -226,7 +225,7 @@ }, "NotEnoughRiceBalls": { "recognition": "OCR", - "text": [ + "expected": [ "饭团不足", "无法排遣", "请稍后尝试" diff --git a/assets/resource/pipeline/dorm/expeditions.json b/assets/resource/pipeline/dorm/expeditions.json index 14607b7..b92d51b 100644 --- a/assets/resource/pipeline/dorm/expeditions.json +++ b/assets/resource/pipeline/dorm/expeditions.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Expeditions": { "next": [ "ExpeditionsPageFlag", @@ -10,7 +9,7 @@ }, "ExpeditionsPageFlag": { "recognition": "OCR", - "text": "今日远征可用体力", + "expected": "今日远征可用体力", "roi": [ 33, 62, @@ -51,7 +50,7 @@ }, "FragmentCompleted": { "recognition": "OCR", - "text": [ + "expected": [ "完成远征" ], "roi": [ @@ -102,7 +101,7 @@ }, "MaterialCompleted": { "recognition": "OCR", - "text": [ + "expected": [ "完成远征" ], "roi": [ @@ -121,7 +120,7 @@ }, "MaterialNoCompleted": { "recognition": "OCR", - "text": [ + "expected": [ "完成远征" ], "roi": [ @@ -155,7 +154,7 @@ }, "SelectFirstExpeditions": { "recognition": "OCR", - "text": [ + "expected": [ "开始远征" ], "roi": [ @@ -175,7 +174,7 @@ "NoIdleExpeditions": { "inverse": true, "recognition": "OCR", - "text": [ + "expected": [ "开始远征" ], "roi": [ @@ -261,7 +260,7 @@ }, "NotMeetingExplorationRequirements": { "recognition": "OCR", - "text": "不满足探险要求", + "expected": "不满足探险要求", "roi": [ 388, 287, @@ -275,7 +274,7 @@ }, "ExpeditionsConsumptionLimit": { "recognition": "OCR", - "text": [ + "expected": [ "已达到", "今日远征作战", "消耗体力上限" @@ -289,7 +288,7 @@ }, "ExpeditionsNotEnoughAP": { "recognition": "OCR", - "text": [ + "expected": [ "所需体力不足" ], "roi": [ @@ -326,7 +325,7 @@ }, "ExpeditionsNotEnoughNumberOfLevels": { "recognition": "OCR", - "text": [ + "expected": [ "所需关卡次数不足" ], "roi": [ diff --git a/assets/resource/pipeline/material_event.json b/assets/resource/pipeline/material_event.json index ab907bc..21289b1 100644 --- a/assets/resource/pipeline/material_event.json +++ b/assets/resource/pipeline/material_event.json @@ -1,5 +1,4 @@ { - "$schema": "../pipeline.schema.json", "MaterialEvent": { "next": [ "MaterialEventFlag", @@ -79,7 +78,7 @@ }, "MaterialEventNotEnoughAP": { "recognition": "OCR", - "text": [ + "expected": [ "没有足够体力" ], "roi": [ @@ -116,7 +115,7 @@ }, "MaterialEventNoneLevelsToLITE": { "recognition": "OCR", - "text": "没有可减负的关卡", + "expected": "没有可减负的关卡", "roi": [ 457, 283, diff --git a/assets/resource/pipeline/navigation/armada_navigation.json b/assets/resource/pipeline/navigation/armada_navigation.json index 9a5a707..512e2a9 100644 --- a/assets/resource/pipeline/navigation/armada_navigation.json +++ b/assets/resource/pipeline/navigation/armada_navigation.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterCommissionsPage": { "is_sub": true, "recognition": "TemplateMatch", @@ -12,7 +11,7 @@ ], "action": "Click" }, - "Sub_EnterContributionsPage":{ + "Sub_EnterContributionsPage": { "is_sub": true, "recognition": "TemplateMatch", "template": "Navigation/Armada/EnterArmadaContribution.png", diff --git a/assets/resource/pipeline/navigation/attack_event_navigation.json b/assets/resource/pipeline/navigation/attack_event_navigation.json index 45bdaf4..d905b74 100644 --- a/assets/resource/pipeline/navigation/attack_event_navigation.json +++ b/assets/resource/pipeline/navigation/attack_event_navigation.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterMaterialExpeditionPage": { "is_sub": true, "recognition": "TemplateMatch", diff --git a/assets/resource/pipeline/navigation/attack_navigation.json b/assets/resource/pipeline/navigation/attack_navigation.json index cd5462c..37aa65e 100644 --- a/assets/resource/pipeline/navigation/attack_navigation.json +++ b/assets/resource/pipeline/navigation/attack_navigation.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterAttackEventPage": { "is_sub": true, "recognition": "TemplateMatch", diff --git a/assets/resource/pipeline/navigation/challenge_event_navigation.json b/assets/resource/pipeline/navigation/challenge_event_navigation.json index c1cb0ff..9d34bee 100644 --- a/assets/resource/pipeline/navigation/challenge_event_navigation.json +++ b/assets/resource/pipeline/navigation/challenge_event_navigation.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterUniversalMiragePage": { "is_sub": true, "recognition": "TemplateMatch", diff --git a/assets/resource/pipeline/navigation/commissions_navigation.json b/assets/resource/pipeline/navigation/commissions_navigation.json index 4c2c289..a4fc668 100644 --- a/assets/resource/pipeline/navigation/commissions_navigation.json +++ b/assets/resource/pipeline/navigation/commissions_navigation.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterCommissionsRewardsPage": { "is_sub": true, "recognition": "TemplateMatch", diff --git a/assets/resource/pipeline/navigation/dorm_navigation.json b/assets/resource/pipeline/navigation/dorm_navigation.json index 3b3bf2c..48bd661 100644 --- a/assets/resource/pipeline/navigation/dorm_navigation.json +++ b/assets/resource/pipeline/navigation/dorm_navigation.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterErrandsPage": { "is_sub": true, "recognition": "TemplateMatch", diff --git a/assets/resource/pipeline/navigation/home_navigation.json b/assets/resource/pipeline/navigation/home_navigation.json index 8a782b5..e7adc79 100644 --- a/assets/resource/pipeline/navigation/home_navigation.json +++ b/assets/resource/pipeline/navigation/home_navigation.json @@ -1,9 +1,8 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterAttackPage": { "is_sub": true, "recognition": "OCR", - "text": "出击", + "expected": "出击", "roi": [ 1082, 282, @@ -16,7 +15,7 @@ "Sub_EnterSupplyPage": { "is_sub": true, "recognition": "OCR", - "text": "补给", + "expected": "补给", "roi": [ 1085, 510, @@ -29,7 +28,7 @@ "Sub_EnterArmadaPage": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "舰团" ], "roi": [ @@ -44,7 +43,7 @@ "Sub_EnterDormPage": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "家园" ], "roi": [ @@ -59,7 +58,7 @@ "Sub_EnterMissionsPage": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "任务" ], "roi": [ diff --git a/assets/resource/pipeline/navigation/material_expedition_navigation.json b/assets/resource/pipeline/navigation/material_expedition_navigation.json index fa51ee8..dd390d4 100644 --- a/assets/resource/pipeline/navigation/material_expedition_navigation.json +++ b/assets/resource/pipeline/navigation/material_expedition_navigation.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterMaterialEventPage": { "is_sub": true, "recognition": "TemplateMatch", diff --git a/assets/resource/pipeline/navigation/missions_navigation.json b/assets/resource/pipeline/navigation/missions_navigation.json index b9f121b..0f12ec8 100644 --- a/assets/resource/pipeline/navigation/missions_navigation.json +++ b/assets/resource/pipeline/navigation/missions_navigation.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterBPMissionsPage": { "is_sub": true, "recognition": "TemplateMatch", diff --git a/assets/resource/pipeline/navigation/shop_navigation.json b/assets/resource/pipeline/navigation/shop_navigation.json index 468228c..4d55699 100644 --- a/assets/resource/pipeline/navigation/shop_navigation.json +++ b/assets/resource/pipeline/navigation/shop_navigation.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterActivityShopPage": { "is_sub": true, "recognition": "TemplateMatch", diff --git a/assets/resource/pipeline/navigation/supply_navigation.json b/assets/resource/pipeline/navigation/supply_navigation.json index 1e3dc44..a3150f3 100644 --- a/assets/resource/pipeline/navigation/supply_navigation.json +++ b/assets/resource/pipeline/navigation/supply_navigation.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterShopPage": { "is_sub": true, "recognition": "TemplateMatch", diff --git a/assets/resource/pipeline/navigation/universal_mirage_navigation.json b/assets/resource/pipeline/navigation/universal_mirage_navigation.json index 98c012c..9ac2f1a 100644 --- a/assets/resource/pipeline/navigation/universal_mirage_navigation.json +++ b/assets/resource/pipeline/navigation/universal_mirage_navigation.json @@ -1,5 +1,4 @@ { - "$schema": "../../pipeline.schema.json", "Sub_EnterGlacialFencesPage": { "enabled": false, "is_sub": true, diff --git a/assets/resource/pipeline/shop.json b/assets/resource/pipeline/shop.json index 20419bc..2e3567e 100644 --- a/assets/resource/pipeline/shop.json +++ b/assets/resource/pipeline/shop.json @@ -1,5 +1,4 @@ { - "$schema": "../pipeline.schema.json", "Shop": { "next": [ "DailyShopPageFlag", @@ -117,7 +116,7 @@ }, "LogisticsTerminalBuyCharacterFragmentByGoldSuccess": { "recognition": "OCR", - "text": "您已购买成功", + "expected": "您已购买成功", "roi": [ 490, 288, @@ -187,7 +186,7 @@ }, "MirageStoreBuyTimeSwirlPassesBy1AsteriteSuccess": { "recognition": "OCR", - "text": "您已购买成功", + "expected": "您已购买成功", "roi": [ 490, 288, diff --git a/assets/resource/pipeline/startup.json b/assets/resource/pipeline/startup.json index daf8f29..e9321c8 100644 --- a/assets/resource/pipeline/startup.json +++ b/assets/resource/pipeline/startup.json @@ -1,5 +1,4 @@ { - "$schema": "../pipeline.schema.json", "Sub_StartUp": { "is_sub": true, "next": [ @@ -199,7 +198,7 @@ 325, 138 ], - "text": [ + "expected": [ "点击任意处", "进入游戏" ] @@ -276,7 +275,7 @@ 137 ], "action": "Click", - "next":[ + "next": [ "Downloading", "Checking", "Downloaded", @@ -286,7 +285,7 @@ }, "Downloading": { "recognition": "OCR", - "text": [ + "expected": [ "下载中" ], "roi": [ @@ -312,7 +311,7 @@ }, "Checking": { "recognition": "OCR", - "text": [ + "expected": [ "校验中" ], "roi": [ @@ -337,7 +336,7 @@ }, "Downloaded": { "recognition": "OCR", - "text": [ + "expected": [ "下载完成" ], "roi": [ @@ -406,7 +405,7 @@ "Sub_CloseActivityAnnouncement": { "is_sub": true, "recognition": "OCR", - "text": "点击空白区域关闭", + "expected": "点击空白区域关闭", "roi": [ 514, 603, @@ -490,7 +489,7 @@ }, "Sub_MonthlyCardCumulativeReward": { "recognition": "OCR", - "text": "点击右侧水晶领取奖励", + "expected": "点击右侧水晶领取奖励", "roi": [ 561, 600, diff --git a/assets/resource/pipeline/utils.json b/assets/resource/pipeline/utils.json index 8179546..406edfa 100644 --- a/assets/resource/pipeline/utils.json +++ b/assets/resource/pipeline/utils.json @@ -1,12 +1,11 @@ { - "$schema": "../pipeline.schema.json", "Sub_BackButton": { "is_sub": true, "recognition": "TemplateMatch", "template": [ "Utils/BackButton.png", "Utils/BackButton_1.png" - ], + ], "roi": [ [ 0, @@ -26,7 +25,7 @@ "Sub_BackText": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "返回" ], "roi": [ @@ -84,11 +83,10 @@ ], "action": "Click" }, - "Sub_CancelDownload": { "is_sub": true, "recognition": "OCR", - "text": [ + "expected": [ "即将下载" ], "roi": [