diff --git a/assets/resource/image/Armada/ArmadaPageFlag.png b/assets/resource/image/Armada/ArmadaPageFlag.png new file mode 100644 index 0000000..a3f305d Binary files /dev/null and b/assets/resource/image/Armada/ArmadaPageFlag.png differ diff --git a/assets/resource/image/Armada/ReceivedContributionRewards.png b/assets/resource/image/Armada/ClaimedContributionRewards.png similarity index 100% rename from assets/resource/image/Armada/ReceivedContributionRewards.png rename to assets/resource/image/Armada/ClaimedContributionRewards.png diff --git a/assets/resource/image/Armada/CommissionsPageFlag.png b/assets/resource/image/Armada/CommissionsPageFlag.png new file mode 100644 index 0000000..4328cf3 Binary files /dev/null and b/assets/resource/image/Armada/CommissionsPageFlag.png differ diff --git a/assets/resource/image/Armada/ArmadaPrizePoolReceive.png b/assets/resource/image/Armada/CommissionsRewardsClaim.png similarity index 100% rename from assets/resource/image/Armada/ArmadaPrizePoolReceive.png rename to assets/resource/image/Armada/CommissionsRewardsClaim.png diff --git a/assets/resource/image/Armada/ArmadaPrizePoolViewLastAssignment.png b/assets/resource/image/Armada/CommissionsRewardsLastDistribution.png similarity index 100% rename from assets/resource/image/Armada/ArmadaPrizePoolViewLastAssignment.png rename to assets/resource/image/Armada/CommissionsRewardsLastDistribution.png diff --git a/assets/resource/image/Armada/CommissionsRewardsPageFlag.png b/assets/resource/image/Armada/CommissionsRewardsPageFlag.png new file mode 100644 index 0000000..3519272 Binary files /dev/null and b/assets/resource/image/Armada/CommissionsRewardsPageFlag.png differ diff --git a/assets/resource/image/Awards/CombatMissionOneClickCollection.png b/assets/resource/image/Awards/BPMissionsQuickClaim.png similarity index 100% rename from assets/resource/image/Awards/CombatMissionOneClickCollection.png rename to assets/resource/image/Awards/BPMissionsQuickClaim.png diff --git a/assets/resource/image/Awards/DailyPracticeRewardsNotReceive.png b/assets/resource/image/Awards/DailyBPRewardsClaim.png similarity index 100% rename from assets/resource/image/Awards/DailyPracticeRewardsNotReceive.png rename to assets/resource/image/Awards/DailyBPRewardsClaim.png diff --git a/assets/resource/image/Awards/DailyPracticeRewardsOk.png b/assets/resource/image/Awards/DailyBPRewardsClaimed.png similarity index 100% rename from assets/resource/image/Awards/DailyPracticeRewardsOk.png rename to assets/resource/image/Awards/DailyBPRewardsClaimed.png diff --git a/assets/resource/image/Awards/DailyPracticeRewardsPreview.png b/assets/resource/image/Awards/DailyBPRewardsPreview.png similarity index 100% rename from assets/resource/image/Awards/DailyPracticeRewardsPreview.png rename to assets/resource/image/Awards/DailyBPRewardsPreview.png diff --git a/assets/resource/image/Awards/NoDailyPracticeRewards.png b/assets/resource/image/Awards/NoneDailyBPRewards.png similarity index 100% rename from assets/resource/image/Awards/NoDailyPracticeRewards.png rename to assets/resource/image/Awards/NoneDailyBPRewards.png diff --git a/assets/resource/image/Homeland/CloseCollectAP.png b/assets/resource/image/Dorm/CloseCollectAP.png similarity index 100% rename from assets/resource/image/Homeland/CloseCollectAP.png rename to assets/resource/image/Dorm/CloseCollectAP.png diff --git a/assets/resource/image/Homeland/CollectAP.png b/assets/resource/image/Dorm/CollectAP.png similarity index 100% rename from assets/resource/image/Homeland/CollectAP.png rename to assets/resource/image/Dorm/CollectAP.png diff --git a/assets/resource/image/Homeland/CollectAPButton.png b/assets/resource/image/Dorm/CollectAPButton.png similarity index 100% rename from assets/resource/image/Homeland/CollectAPButton.png rename to assets/resource/image/Dorm/CollectAPButton.png diff --git a/assets/resource/image/Homeland/CollectGold.png b/assets/resource/image/Dorm/CollectGold.png similarity index 100% rename from assets/resource/image/Homeland/CollectGold.png rename to assets/resource/image/Dorm/CollectGold.png diff --git a/assets/resource/image/Homeland/CollectGoldMax.png b/assets/resource/image/Dorm/CollectGoldMax.png similarity index 100% rename from assets/resource/image/Homeland/CollectGoldMax.png rename to assets/resource/image/Dorm/CollectGoldMax.png diff --git a/assets/resource/image/Homeland/Confirm.png b/assets/resource/image/Dorm/Confirm.png similarity index 100% rename from assets/resource/image/Homeland/Confirm.png rename to assets/resource/image/Dorm/Confirm.png diff --git a/assets/resource/image/Dorm/ErrandsPageFlag.png b/assets/resource/image/Dorm/ErrandsPageFlag.png new file mode 100644 index 0000000..8616130 Binary files /dev/null and b/assets/resource/image/Dorm/ErrandsPageFlag.png differ diff --git a/assets/resource/image/Homeland/QuestRefresh.png b/assets/resource/image/Dorm/ErrandsRefresh.png similarity index 100% rename from assets/resource/image/Homeland/QuestRefresh.png rename to assets/resource/image/Dorm/ErrandsRefresh.png diff --git a/assets/resource/image/Homeland/QuestUnfold.png b/assets/resource/image/Dorm/ErrandsUnfold.png similarity index 100% rename from assets/resource/image/Homeland/QuestUnfold.png rename to assets/resource/image/Dorm/ErrandsUnfold.png diff --git a/assets/resource/image/Homeland/NextQuest.png b/assets/resource/image/Dorm/NextErrands.png similarity index 100% rename from assets/resource/image/Homeland/NextQuest.png rename to assets/resource/image/Dorm/NextErrands.png diff --git a/assets/resource/image/Homeland/OneClickDispatch.png b/assets/resource/image/Dorm/QuickDispatch.png similarity index 100% rename from assets/resource/image/Homeland/OneClickDispatch.png rename to assets/resource/image/Dorm/QuickDispatch.png diff --git a/assets/resource/image/Homeland/StartQuest.png b/assets/resource/image/Dorm/StartErrands.png similarity index 100% rename from assets/resource/image/Homeland/StartQuest.png rename to assets/resource/image/Dorm/StartErrands.png diff --git a/assets/resource/image/StorySweep/StartStorySweep.png b/assets/resource/image/Dorm/StartExpeditions.png similarity index 100% rename from assets/resource/image/StorySweep/StartStorySweep.png rename to assets/resource/image/Dorm/StartExpeditions.png diff --git a/assets/resource/image/StorySweep/SwitchToFragmentPage.png b/assets/resource/image/Dorm/SwitchToFragmentPage.png similarity index 100% rename from assets/resource/image/StorySweep/SwitchToFragmentPage.png rename to assets/resource/image/Dorm/SwitchToFragmentPage.png diff --git a/assets/resource/image/StorySweep/SwitchToMaterialPage.png b/assets/resource/image/Dorm/SwitchToMaterialPage.png similarity index 100% rename from assets/resource/image/StorySweep/SwitchToMaterialPage.png rename to assets/resource/image/Dorm/SwitchToMaterialPage.png diff --git a/assets/resource/image/MaterialEvent/BurdenReduction.png b/assets/resource/image/MaterialEvent/LITE.png similarity index 100% rename from assets/resource/image/MaterialEvent/BurdenReduction.png rename to assets/resource/image/MaterialEvent/LITE.png diff --git a/assets/resource/image/MaterialEvent/MaterialEventFlag.png b/assets/resource/image/MaterialEvent/MaterialEventFlag.png new file mode 100644 index 0000000..3125830 Binary files /dev/null and b/assets/resource/image/MaterialEvent/MaterialEventFlag.png differ diff --git a/assets/resource/image/MaterialEvent/OneClickBurdenReduction.png b/assets/resource/image/MaterialEvent/QuickLITE.png similarity index 100% rename from assets/resource/image/MaterialEvent/OneClickBurdenReduction.png rename to assets/resource/image/MaterialEvent/QuickLITE.png diff --git a/assets/resource/image/Armada/EnterArmadaContribution.png b/assets/resource/image/Navigation/Armada/EnterArmadaContribution.png similarity index 100% rename from assets/resource/image/Armada/EnterArmadaContribution.png rename to assets/resource/image/Navigation/Armada/EnterArmadaContribution.png diff --git a/assets/resource/image/Armada/EnterCommissionedRecovery.png b/assets/resource/image/Navigation/Armada/EnterCommissionsPage.png similarity index 100% rename from assets/resource/image/Armada/EnterCommissionedRecovery.png rename to assets/resource/image/Navigation/Armada/EnterCommissionsPage.png diff --git a/assets/resource/image/MaterialEvent/AttackPageFlag.png b/assets/resource/image/Navigation/Attack/EnterAttackEventPage.png similarity index 100% rename from assets/resource/image/MaterialEvent/AttackPageFlag.png rename to assets/resource/image/Navigation/Attack/EnterAttackEventPage.png diff --git a/assets/resource/image/MaterialEvent/EnterMaterialEvent.png b/assets/resource/image/Navigation/AttackEvent/EnterMaterialExpeditionPage.png similarity index 100% rename from assets/resource/image/MaterialEvent/EnterMaterialEvent.png rename to assets/resource/image/Navigation/AttackEvent/EnterMaterialExpeditionPage.png diff --git a/assets/resource/image/Navigation/ChallengeEvent/EnterUniversalMiragePage.png b/assets/resource/image/Navigation/ChallengeEvent/EnterUniversalMiragePage.png new file mode 100644 index 0000000..944defc Binary files /dev/null and b/assets/resource/image/Navigation/ChallengeEvent/EnterUniversalMiragePage.png differ diff --git a/assets/resource/image/Armada/EnterArmadaPrizePoolPage.png b/assets/resource/image/Navigation/Commissions/EnterCommissionsRewardsPage.png similarity index 100% rename from assets/resource/image/Armada/EnterArmadaPrizePoolPage.png rename to assets/resource/image/Navigation/Commissions/EnterCommissionsRewardsPage.png diff --git a/assets/resource/image/Homeland/EnterQuest.png b/assets/resource/image/Navigation/Dorm/EnterErrandsPage.png similarity index 100% rename from assets/resource/image/Homeland/EnterQuest.png rename to assets/resource/image/Navigation/Dorm/EnterErrandsPage.png diff --git a/assets/resource/image/StorySweep/EnterStorySweep.png b/assets/resource/image/Navigation/Dorm/EnterExpeditionsPage.png similarity index 100% rename from assets/resource/image/StorySweep/EnterStorySweep.png rename to assets/resource/image/Navigation/Dorm/EnterExpeditionsPage.png diff --git a/assets/resource/image/MaterialEvent/EnterAttack.png b/assets/resource/image/Navigation/Home/EnterAttackPage.png similarity index 100% rename from assets/resource/image/MaterialEvent/EnterAttack.png rename to assets/resource/image/Navigation/Home/EnterAttackPage.png diff --git a/assets/resource/image/Shop/EnterSupplyPage.png b/assets/resource/image/Navigation/Home/EnterSupplyPage.png similarity index 100% rename from assets/resource/image/Shop/EnterSupplyPage.png rename to assets/resource/image/Navigation/Home/EnterSupplyPage.png diff --git a/assets/resource/image/MaterialEvent/MaterialActivitiesPageFlag.png b/assets/resource/image/Navigation/MaterialExpedition/EnterMaterialEventPage.png similarity index 100% rename from assets/resource/image/MaterialEvent/MaterialActivitiesPageFlag.png rename to assets/resource/image/Navigation/MaterialExpedition/EnterMaterialEventPage.png diff --git a/assets/resource/image/Awards/CombatMissionPageFlag.png b/assets/resource/image/Navigation/Missions/EnterBPMissionsPage.png similarity index 100% rename from assets/resource/image/Awards/CombatMissionPageFlag.png rename to assets/resource/image/Navigation/Missions/EnterBPMissionsPage.png diff --git a/assets/resource/image/Shop/EnterActivityShopPage.png b/assets/resource/image/Navigation/Shop/EnterActivityShopPage.png similarity index 100% rename from assets/resource/image/Shop/EnterActivityShopPage.png rename to assets/resource/image/Navigation/Shop/EnterActivityShopPage.png diff --git a/assets/resource/image/Shop/EnterMirageStorePage.png b/assets/resource/image/Navigation/Shop/EnterMirageStorePage.png similarity index 100% rename from assets/resource/image/Shop/EnterMirageStorePage.png rename to assets/resource/image/Navigation/Shop/EnterMirageStorePage.png diff --git a/assets/resource/image/Shop/EnterShopPage.png b/assets/resource/image/Navigation/Supply/EnterShopPage.png similarity index 100% rename from assets/resource/image/Shop/EnterShopPage.png rename to assets/resource/image/Navigation/Supply/EnterShopPage.png diff --git a/assets/resource/image/Navigation/UniversalMirage/EnterBladeGravePage.png b/assets/resource/image/Navigation/UniversalMirage/EnterBladeGravePage.png new file mode 100644 index 0000000..ba64346 Binary files /dev/null and b/assets/resource/image/Navigation/UniversalMirage/EnterBladeGravePage.png differ diff --git a/assets/resource/image/Navigation/UniversalMirage/EnterGlacialFencesPage.png b/assets/resource/image/Navigation/UniversalMirage/EnterGlacialFencesPage.png new file mode 100644 index 0000000..b0b268f Binary files /dev/null and b/assets/resource/image/Navigation/UniversalMirage/EnterGlacialFencesPage.png differ diff --git a/assets/resource/image/Navigation/UniversalMirage/EnterIlluminatedLandPage.png b/assets/resource/image/Navigation/UniversalMirage/EnterIlluminatedLandPage.png new file mode 100644 index 0000000..9099c67 Binary files /dev/null and b/assets/resource/image/Navigation/UniversalMirage/EnterIlluminatedLandPage.png differ diff --git a/assets/resource/image/Navigation/UniversalMirage/EnterRoaringPalacePage.png b/assets/resource/image/Navigation/UniversalMirage/EnterRoaringPalacePage.png new file mode 100644 index 0000000..109e11d Binary files /dev/null and b/assets/resource/image/Navigation/UniversalMirage/EnterRoaringPalacePage.png differ diff --git a/assets/resource/image/Shop/DailyShopPageFlag.png b/assets/resource/image/Shop/DailyShopPageFlag.png new file mode 100644 index 0000000..9ec245a Binary files /dev/null and b/assets/resource/image/Shop/DailyShopPageFlag.png differ diff --git a/assets/resource/pipeline/armada.json b/assets/resource/pipeline/armada.json deleted file mode 100644 index 308b953..0000000 --- a/assets/resource/pipeline/armada.json +++ /dev/null @@ -1,607 +0,0 @@ -{ - "$schema": "../pipeline.schema.json", - "Armada": { - "next": [ - "EnterArmada", - "Sub_StartUp" - ] - }, - "EnterArmada": { - "recognition": "OCR", - "text": [ - "舰团" - ], - "roi": [ - 879, - 661, - 54, - 29 - ], - "action": "Click", - "next": [ - "EnterCommissionedRecovery", - "EnterArmada" - ] - }, - "EnterCommissionedRecovery": { - "recognition": "TemplateMatch", - "template": "Armada/EnterCommissionedRecovery.png", - "roi": [ - 390, - 583, - 215, - 137 - ], - "action": "Click", - "next": [ - "EnterCommissionedRecovery", - "ApplyForANewCommission", - "AcceptNewCommission", - "CommissionItem", - "CommissionItemBuyMax", - "CommissionItemBuy", - "CommissionSubmitButton", - "CommissionNoSubmitButton" - ] - }, - "ApplyForANewCommission": { - "recognition": "TemplateMatch", - "template": "Armada/ApplyForANewCommission.png", - "threshold": 0.9, - "roi": [ - 37, - 577, - 239, - 141 - ], - "action": "Click", - "next": [ - "ApplyForANewCommission", - "AcceptNewCommission", - "CommissionItem", - "CommissionItemBuyMax", - "CommissionItemBuy", - "CommissionSubmitButton" - ] - }, - "AcceptNewCommission": { - "recognition": "OCR", - "text": [ - "接受" - ], - "roi": [ - 1018, - 154, - 211, - 560 - ], - "action": "Click", - "next": [ - "AcceptNewCommission", - "CommissionItem", - "CommissionItemBuyMax", - "CommissionItemBuy", - "CommissionSubmitButton" - ] - }, - "CommissionItem": { - "recognition": "TemplateMatch", - "green_mask": true, - "template": "Armada/CommissionItem.png", - "roi": [ - 7, - 112, - 248, - 248 - ], - "action": "Click", - "post_wait_freezes": 200, - "next": [ - "CommissionItemBuyMax", - "CommissionItemBuy", - "CommissionSubmitButton", - "CommissionItem" - ] - }, - "CommissionItemBuyMax": { - "recognition": "TemplateMatch", - "template": "Armada/CommissionItemBuyMax.png", - "roi": [ - 565, - 500, - 158, - 133 - ], - "action": "Click", - "next": [ - "CommissionItemBuy", - "CommissionSubmitButton" - ] - }, - "CommissionItemBuy": { - "recognition": "TemplateMatch", - "template": "Armada/CommissionItemBuy.png", - "roi": [ - 872, - 494, - 167, - 145 - ], - "action": "Click", - "post_wait_freezes": 200, - "next": [ - "CommissionSubmitButton", - "SubmitCommission" - ] - }, - "CommissionSubmitButton": { - "recognition": "TemplateMatch", - "template": "Armada/CommissionSubmitButton.png", - "threshold": 0.95, - "roi": [ - 860, - 579, - 171, - 141 - ], - "action": "Click", - "next": [ - "CommissionSubmitButton", - "SubmitCommission" - ] - }, - "CommissionNoSubmitButton": { - "inverse": true, - "recognition": "TemplateMatch", - "template": "Armada/CommissionSubmitButton.png", - "roi": [ - 860, - 579, - 171, - 141 - ], - "next": [ - "EnterArmadaPrizePoolPage" - ] - }, - "CommossionLimit": { - "recognition": "OCR", - "text": [ - "回收委托次数已经耗尽" - ], - "roi": [ - 361, - 287, - 539, - 142 - ], - "action": "Click", - "post_wait_freezes": 200, - "next": [ - "EnterArmadaPrizePoolPage" - ] - }, - "SubmitCommission": { - "recognition": "TemplateMatch", - "template": "Armada/SubmitCommission.png", - "roi": [ - 696, - 492, - 230, - 141 - ], - "action": "Click", - "post_wait_freezes": 200, - "next": [ - "CommossionLimit", - "SubmitCommission", - "Sub_CloseDialogBox", - "CommissionItem", - "CommissionItemBuyMax", - "CommissionItemBuy", - "CommissionSubmitButton", - "CommissionNoSubmitButton" - ] - }, - "EnterArmadaPrizePoolPage": { - "recognition": "TemplateMatch", - "template": "Armada/EnterArmadaPrizePoolPage.png", - "roi": [ - 1095, - 161, - 185, - 137 - ], - "action": "Click", - "next": [ - "ArmadaPrizePoolReceive", - "Sub_CloseDialogBox", - "ArmadaPrizePoolViewLastAssignment", - "EnterArmadaPrizePoolPage" - ] - }, - "ArmadaPrizePoolReceive": { - "recognition": "TemplateMatch", - "template": "Armada/ArmadaPrizePoolReceive.png", - "roi": [ - 828, - 580, - 168, - 137 - ], - "action": "Click", - "post_wait_freezes": 200, - "next": [ - "Sub_CloseDialogBox", - "ArmadaPrizePoolViewLastAssignment" - ] - }, - "ArmadaPrizePoolViewLastAssignment": { - "recognition": "TemplateMatch", - "template": "Armada/ArmadaPrizePoolViewLastAssignment.png", - "roi": [ - 778, - 579, - 268, - 137 - ], - "next": [ - "BackToArmadaPage" - ] - }, - "BackToArmadaPage": { - "recognition": "TemplateMatch", - "template": "Utils/BackButton.png", - "roi": [ - 0, - 0, - 180, - 133 - ], - "action": "Click", - "post_wait_freezes": { - "time": 200, - "target": [ - 0, - 600, - 300, - 110 - ] - }, - "next": [ - "EnterArmadaContribution", - "BackToArmadaPage" - ] - }, - "EnterArmadaContribution":{ - "recognition": "TemplateMatch", - "template": "Armada/EnterArmadaContribution.png", - "roi": [ - 832, - 586, - 212, - 133 - ], - "action": "Click", - "post_wait_freezes": { - "time": 200, - "target": [ - 0, - 0, - 420, - 330 - ] - }, - "next": [ - "ReceiveContributionRewards_0", - "ReceiveContributionRewards_1200", - "ReceiveContributionRewards_2500", - "ReceiveContributionRewards_3700", - "ReceiveContributionRewards_5000", - "ReceivedContributionRewards_5000", - "ReceivedContributionRewards_3700", - "ReceivedContributionRewards_2500", - "ReceivedContributionRewards_1200", - "ReceivedContributionRewards_0" - ] - }, - "ReceiveContributionRewards_0": { - "recognition": "TemplateMatch", - "inverse": true, - "template": "Armada/ReceivedContributionRewards.png", - "green_mask": true, - "roi": [ - 26, - 644, - 96, - 67 - ], - "next": [ - "NotReachContributionProgress_0", - "ReachContributionProgress_0" - ] - }, - "ReceivedContributionRewards_0": { - "recognition": "TemplateMatch", - "template": "Armada/ReceivedContributionRewards.png", - "green_mask": true, - "roi": [ - 26, - 644, - 96, - 67 - ], - "next": [ - "ReceiveContributionRewards_1200", - "ReceivedContributionRewards_1200" - ] - }, - "NotReachContributionProgress_0": { - "recognition": "TemplateMatch", - "template": "Armada/NotReachContributionProgress.png", - "green_mask": true, - "roi": [ - 199, - 630, - 47, - 44 - ], - "next": [ - "Stop" - ] - }, - "ReachContributionProgress_0": { - "recognition": "TemplateMatch", - "template": "Armada/ReachContributionProgress.png", - "roi": [ - 199, - 630, - 47, - 44 - ], - "action": "Click", - "next": [ - "Sub_CloseDialogBox", - "Stop" - ] - }, - "ReceiveContributionRewards_1200": { - "recognition": "TemplateMatch", - "inverse": true, - "template": "Armada/ReceivedContributionRewards.png", - "green_mask": true, - "roi": [ - 19, - 523, - 109, - 85 - ], - "next": [ - "NotReachContributionProgress_1200", - "ReachContributionProgress_1200" - ] - }, - "ReceivedContributionRewards_1200": { - "recognition": "TemplateMatch", - "template": "Armada/ReceivedContributionRewards.png", - "green_mask": true, - "roi": [ - 19, - 523, - 109, - 85 - ], - "next": [ - "ReceiveContributionRewards_2500", - "ReceivedContributionRewards_2500" - ] - }, - "NotReachContributionProgress_1200": { - "recognition": "TemplateMatch", - "template": "Armada/NotReachContributionProgress.png", - "green_mask": true, - "roi": [ - 206, - 517, - 36, - 42 - ], - "next": [ - "Stop" - ] - }, - "ReachContributionProgress_1200": { - "recognition": "TemplateMatch", - "template": "Armada/ReachContributionProgress.png", - "roi": [ - 206, - 517, - 36, - 42 - ], - "action": "Click", - "next": [ - "Sub_CloseDialogBox", - "Stop" - ] - }, - "ReceiveContributionRewards_2500": { - "recognition": "TemplateMatch", - "inverse": true, - "template": "Armada/ReceivedContributionRewards.png", - "green_mask": true, - "roi": [ - 17, - 410, - 114, - 85 - ], - "next": [ - "NotReachContributionProgress_2500", - "ReachContributionProgress_2500" - ] - }, - "ReceivedContributionRewards_2500": { - "recognition": "TemplateMatch", - "template": "Armada/ReceivedContributionRewards.png", - "green_mask": true, - "roi": [ - 17, - 410, - 114, - 85 - ], - "next": [ - "ReceiveContributionRewards_3700", - "ReceivedContributionRewards_3700" - ] - }, - "NotReachContributionProgress_2500": { - "recognition": "TemplateMatch", - "template": "Armada/NotReachContributionProgress.png", - "green_mask": true, - "roi": [ - 206, - 409, - 34, - 37 - ], - "next": [ - "Stop" - ] - }, - "ReachContributionProgress_2500": { - "recognition": "TemplateMatch", - "template": "Armada/ReachContributionProgress.png", - "roi": [ - 206, - 409, - 34, - 37 - ], - "action": "Click", - "next": [ - "Sub_CloseDialogBox", - "Stop" - ] - }, - "ReceiveContributionRewards_3700": { - "recognition": "TemplateMatch", - "inverse": true, - "template": "Armada/ReceivedContributionRewards.png", - "green_mask": true, - "roi": [ - 18, - 294, - 111, - 88 - ], - "next": [ - "NotReachContributionProgress_3700", - "ReachContributionProgress_3700" - ] - }, - "ReceivedContributionRewards_3700": { - "recognition": "TemplateMatch", - "template": "Armada/ReceivedContributionRewards.png", - "green_mask": true, - "roi": [ - 18, - 294, - 111, - 88 - ], - "next": [ - "ReceiveContributionRewards_5000", - "ReceivedContributionRewards_5000" - ] - }, - "NotReachContributionProgress_3700": { - "recognition": "TemplateMatch", - "template": "Armada/NotReachContributionProgress.png", - "green_mask": true, - "roi": [ - 207, - 298, - 34, - 37 - ], - "next": [ - "Stop" - ] - }, - "ReachContributionProgress_3700": { - "recognition": "TemplateMatch", - "template": "Armada/ReachContributionProgress.png", - "roi": [ - 207, - 298, - 34, - 37 - ], - "action": "Click", - "next": [ - "Sub_CloseDialogBox", - "Stop" - ] - }, - "ReceiveContributionRewards_5000": { - "recognition": "TemplateMatch", - "inverse": true, - "template": "Armada/ReceivedContributionRewards.png", - "green_mask": true, - "roi": [ - 19, - 187, - 110, - 83 - ], - "next": [ - "NotReachContributionProgress_5000", - "ReachContributionProgress_5000" - ] - }, - "ReceivedContributionRewards_5000": { - "recognition": "TemplateMatch", - "template": "Armada/ReceivedContributionRewards.png", - "green_mask": true, - "roi": [ - 19, - 187, - 110, - 83 - ], - "next": [ - "Stop" - ] - }, - "NotReachContributionProgress_5000": { - "recognition": "TemplateMatch", - "template": "Armada/NotReachContributionProgress.png", - "green_mask": true, - "roi": [ - 207, - 187, - 35, - 36 - ], - "next": [ - "Stop" - ] - }, - "ReachContributionProgress_5000": { - "recognition": "TemplateMatch", - "template": "Armada/ReachContributionProgress.png", - "roi": [ - 207, - 187, - 35, - 36 - ], - "action": "Click", - "next": [ - "Sub_CloseDialogBox", - "Stop" - ] - } -} \ No newline at end of file diff --git a/assets/resource/pipeline/armada/armada.json b/assets/resource/pipeline/armada/armada.json new file mode 100644 index 0000000..c6f5272 --- /dev/null +++ b/assets/resource/pipeline/armada/armada.json @@ -0,0 +1,25 @@ +{ + "$schema": "../../pipeline.schema.json", + "Armada": { + "next": [ + "ArmadaPageFlag", + "Sub_EnterArmadaPage", + "Sub_StartUp" + ] + }, + "ArmadaPageFlag": { + "recognition": "TemplateMatch", + "template": "Armada/ArmadaPageFlag.png", + "roi": [ + 0, + 599, + 168, + 121 + ], + "next": [ + "Commissions", + "Contributions", + "Stop" + ] + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/armada/commissions.json b/assets/resource/pipeline/armada/commissions.json new file mode 100644 index 0000000..bd9aacc --- /dev/null +++ b/assets/resource/pipeline/armada/commissions.json @@ -0,0 +1,259 @@ +{ + "$schema": "../../pipeline.schema.json", + "Commissions": { + "next": [ + "CommissionsPageFlag", + "Sub_EnterCommissionsPage", + "Sub_EnterArmadaPage", + "Sub_BackButton" + ] + }, + "CommissionsPageFlag": { + "recognition": "TemplateMatch", + "template": "Armada/CommissionsPageFlag.png", + "roi": [ + 0, + 62, + 129, + 127 + ], + "next": [ + "ApplyForANewCommission", + "AcceptNewCommission", + "CommissionItem", + "CommissionItemBuyMax", + "CommissionItemBuy", + "CommissionSubmitButton", + "CommissionNoneSubmitButton" + ] + }, + "ApplyForANewCommission": { + "recognition": "TemplateMatch", + "template": "Armada/ApplyForANewCommission.png", + "threshold": 0.9, + "roi": [ + 37, + 577, + 239, + 141 + ], + "action": "Click", + "next": [ + "ApplyForANewCommission", + "AcceptNewCommission", + "CommissionItem", + "CommissionItemBuyMax", + "CommissionItemBuy", + "CommissionSubmitButton" + ] + }, + "AcceptNewCommission": { + "recognition": "OCR", + "text": [ + "接受" + ], + "roi": [ + 1018, + 154, + 211, + 560 + ], + "action": "Click", + "next": [ + "AcceptNewCommission", + "CommissionItem", + "CommissionItemBuyMax", + "CommissionItemBuy", + "CommissionSubmitButton" + ] + }, + "CommissionItem": { + "recognition": "TemplateMatch", + "green_mask": true, + "template": "Armada/CommissionItem.png", + "roi": [ + 7, + 112, + 248, + 248 + ], + "action": "Click", + "post_wait_freezes": 200, + "next": [ + "CommissionItemBuyMax", + "CommissionItemBuy", + "CommissionSubmitButton", + "CommissionItem" + ] + }, + "CommissionItemBuyMax": { + "recognition": "TemplateMatch", + "template": "Armada/CommissionItemBuyMax.png", + "roi": [ + 565, + 500, + 158, + 133 + ], + "action": "Click", + "next": [ + "CommissionItemBuy", + "CommissionSubmitButton" + ] + }, + "CommissionItemBuy": { + "recognition": "TemplateMatch", + "template": "Armada/CommissionItemBuy.png", + "roi": [ + 872, + 494, + 167, + 145 + ], + "action": "Click", + "post_wait_freezes": 200, + "next": [ + "CommissionSubmitButton", + "SubmitCommission" + ] + }, + "CommissionSubmitButton": { + "recognition": "TemplateMatch", + "template": "Armada/CommissionSubmitButton.png", + "threshold": 0.95, + "roi": [ + 860, + 579, + 171, + 141 + ], + "action": "Click", + "next": [ + "CommissionSubmitButton", + "SubmitCommission" + ] + }, + "CommissionNoneSubmitButton": { + "inverse": true, + "recognition": "TemplateMatch", + "template": "Armada/CommissionSubmitButton.png", + "roi": [ + 860, + 579, + 171, + 141 + ], + "next": [ + "CommissionsRewardsPageFlag", + "Sub_EnterCommissionsRewardsPage" + ] + }, + "CommossionLimit": { + "recognition": "OCR", + "text": [ + "回收委托次数已经耗尽" + ], + "roi": [ + 361, + 287, + 539, + 142 + ], + "action": "Click", + "post_wait_freezes": 200, + "next": [ + "CommissionsRewardsPageFlag", + "Sub_EnterCommissionsRewardsPage" + ] + }, + "SubmitCommission": { + "recognition": "TemplateMatch", + "template": "Armada/SubmitCommission.png", + "roi": [ + 696, + 492, + 230, + 141 + ], + "action": "Click", + "post_wait_freezes": 200, + "next": [ + "CommossionLimit", + "SubmitCommission", + "Sub_CloseDialogBox", + "CommissionItem", + "CommissionItemBuyMax", + "CommissionItemBuy", + "CommissionSubmitButton", + "CommissionNoneSubmitButton" + ] + }, + "CommissionsRewardsPageFlag": { + "recognition": "TemplateMatch", + "template": "Armada/CommissionsRewardsPageFlag.png", + "roi": [ + 0, + 60, + 131, + 131 + ], + "next": [ + "CommissionsRewardsClaim", + "Sub_CloseDialogBox", + "CommissionsRewardsLastDistribution" + ] + }, + "CommissionsRewardsClaim": { + "recognition": "TemplateMatch", + "template": "Armada/CommissionsRewardsClaim.png", + "roi": [ + 828, + 580, + 168, + 137 + ], + "action": "Click", + "post_wait_freezes": 200, + "next": [ + "Sub_CloseDialogBox", + "CommissionsRewardsLastDistribution" + ] + }, + "CommissionsRewardsLastDistribution": { + "recognition": "TemplateMatch", + "template": "Armada/CommissionsRewardsLastDistribution.png", + "roi": [ + 778, + 579, + 268, + 137 + ], + "next": [ + "BackToArmadaPage" + ] + }, + "BackToArmadaPage": { + "recognition": "TemplateMatch", + "template": "Utils/BackButton.png", + "roi": [ + 0, + 0, + 180, + 133 + ], + "action": "Click", + "post_wait_freezes": { + "time": 200, + "target": [ + 0, + 600, + 300, + 110 + ] + }, + "next": [ + "Contributions", + "Stop" + ] + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/armada/contributions.json b/assets/resource/pipeline/armada/contributions.json new file mode 100644 index 0000000..bb92e14 --- /dev/null +++ b/assets/resource/pipeline/armada/contributions.json @@ -0,0 +1,332 @@ +{ + "$schema": "../../pipeline.schema.json", + "Contributions": { + "next": [ + "ContributionsPageFlag", + "Sub_EnterContributionsPage", + "Sub_EnterArmadaPage", + "Sub_BackButton" + ] + }, + "ContributionsPageFlag": { + "recognition": "OCR", + "text": "舰团贡献进度", + "roi": [ + 36, + 59, + 248, + 132 + ], + "next": [ + "ClaimContributionRewards_0", + "ClaimContributionRewards_1200", + "ClaimContributionRewards_2500", + "ClaimContributionRewards_3700", + "ClaimContributionRewards_5000", + "ClaimedContributionRewards_5000", + "ClaimedContributionRewards_3700", + "ClaimedContributionRewards_2500", + "ClaimedContributionRewards_1200", + "ClaimedContributionRewards_0" + ] + }, + "ClaimContributionRewards_0": { + "recognition": "TemplateMatch", + "inverse": true, + "template": "Armada/ClaimedContributionRewards.png", + "green_mask": true, + "roi": [ + 26, + 644, + 96, + 67 + ], + "next": [ + "NotReachContributionProgress_0", + "ReachContributionProgress_0" + ] + }, + "ClaimedContributionRewards_0": { + "recognition": "TemplateMatch", + "template": "Armada/ClaimedContributionRewards.png", + "green_mask": true, + "roi": [ + 26, + 644, + 96, + 67 + ], + "next": [ + "ClaimContributionRewards_1200", + "ClaimedContributionRewards_1200" + ] + }, + "NotReachContributionProgress_0": { + "recognition": "TemplateMatch", + "template": "Armada/NotReachContributionProgress.png", + "green_mask": true, + "roi": [ + 199, + 630, + 47, + 44 + ], + "next": [ + "Stop" + ] + }, + "ReachContributionProgress_0": { + "recognition": "TemplateMatch", + "template": "Armada/ReachContributionProgress.png", + "roi": [ + 199, + 630, + 47, + 44 + ], + "action": "Click", + "next": [ + "Sub_CloseDialogBox", + "Stop" + ] + }, + "ClaimContributionRewards_1200": { + "recognition": "TemplateMatch", + "inverse": true, + "template": "Armada/ClaimedContributionRewards.png", + "green_mask": true, + "roi": [ + 19, + 523, + 109, + 85 + ], + "next": [ + "NotReachContributionProgress_1200", + "ReachContributionProgress_1200" + ] + }, + "ClaimedContributionRewards_1200": { + "recognition": "TemplateMatch", + "template": "Armada/ClaimedContributionRewards.png", + "green_mask": true, + "roi": [ + 19, + 523, + 109, + 85 + ], + "next": [ + "ClaimContributionRewards_2500", + "ClaimedContributionRewards_2500" + ] + }, + "NotReachContributionProgress_1200": { + "recognition": "TemplateMatch", + "template": "Armada/NotReachContributionProgress.png", + "green_mask": true, + "roi": [ + 206, + 517, + 36, + 42 + ], + "next": [ + "Stop" + ] + }, + "ReachContributionProgress_1200": { + "recognition": "TemplateMatch", + "template": "Armada/ReachContributionProgress.png", + "roi": [ + 206, + 517, + 36, + 42 + ], + "action": "Click", + "next": [ + "Sub_CloseDialogBox", + "Stop" + ] + }, + "ClaimContributionRewards_2500": { + "recognition": "TemplateMatch", + "inverse": true, + "template": "Armada/ClaimedContributionRewards.png", + "green_mask": true, + "roi": [ + 17, + 410, + 114, + 85 + ], + "next": [ + "NotReachContributionProgress_2500", + "ReachContributionProgress_2500" + ] + }, + "ClaimedContributionRewards_2500": { + "recognition": "TemplateMatch", + "template": "Armada/ClaimedContributionRewards.png", + "green_mask": true, + "roi": [ + 17, + 410, + 114, + 85 + ], + "next": [ + "ClaimContributionRewards_3700", + "ClaimedContributionRewards_3700" + ] + }, + "NotReachContributionProgress_2500": { + "recognition": "TemplateMatch", + "template": "Armada/NotReachContributionProgress.png", + "green_mask": true, + "roi": [ + 206, + 409, + 34, + 37 + ], + "next": [ + "Stop" + ] + }, + "ReachContributionProgress_2500": { + "recognition": "TemplateMatch", + "template": "Armada/ReachContributionProgress.png", + "roi": [ + 206, + 409, + 34, + 37 + ], + "action": "Click", + "next": [ + "Sub_CloseDialogBox", + "Stop" + ] + }, + "ClaimContributionRewards_3700": { + "recognition": "TemplateMatch", + "inverse": true, + "template": "Armada/ClaimedContributionRewards.png", + "green_mask": true, + "roi": [ + 18, + 294, + 111, + 88 + ], + "next": [ + "NotReachContributionProgress_3700", + "ReachContributionProgress_3700" + ] + }, + "ClaimedContributionRewards_3700": { + "recognition": "TemplateMatch", + "template": "Armada/ClaimedContributionRewards.png", + "green_mask": true, + "roi": [ + 18, + 294, + 111, + 88 + ], + "next": [ + "ClaimContributionRewards_5000", + "ClaimedContributionRewards_5000" + ] + }, + "NotReachContributionProgress_3700": { + "recognition": "TemplateMatch", + "template": "Armada/NotReachContributionProgress.png", + "green_mask": true, + "roi": [ + 207, + 298, + 34, + 37 + ], + "next": [ + "Stop" + ] + }, + "ReachContributionProgress_3700": { + "recognition": "TemplateMatch", + "template": "Armada/ReachContributionProgress.png", + "roi": [ + 207, + 298, + 34, + 37 + ], + "action": "Click", + "next": [ + "Sub_CloseDialogBox", + "Stop" + ] + }, + "ClaimContributionRewards_5000": { + "recognition": "TemplateMatch", + "inverse": true, + "template": "Armada/ClaimedContributionRewards.png", + "green_mask": true, + "roi": [ + 19, + 187, + 110, + 83 + ], + "next": [ + "NotReachContributionProgress_5000", + "ReachContributionProgress_5000" + ] + }, + "ClaimedContributionRewards_5000": { + "recognition": "TemplateMatch", + "template": "Armada/ClaimedContributionRewards.png", + "green_mask": true, + "roi": [ + 19, + 187, + 110, + 83 + ], + "next": [ + "Stop" + ] + }, + "NotReachContributionProgress_5000": { + "recognition": "TemplateMatch", + "template": "Armada/NotReachContributionProgress.png", + "green_mask": true, + "roi": [ + 207, + 187, + 35, + 36 + ], + "next": [ + "Stop" + ] + }, + "ReachContributionProgress_5000": { + "recognition": "TemplateMatch", + "template": "Armada/ReachContributionProgress.png", + "roi": [ + 207, + 187, + 35, + 36 + ], + "action": "Click", + "next": [ + "Sub_CloseDialogBox", + "Stop" + ] + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/awards.json b/assets/resource/pipeline/awards.json index 8f948b8..05f8749 100644 --- a/assets/resource/pipeline/awards.json +++ b/assets/resource/pipeline/awards.json @@ -2,56 +2,35 @@ "$schema": "../pipeline.schema.json", "Awards": { "next": [ - "EnterAwards", + "MissionsPageFlag", + "Sub_EnterMissionsPage", "Sub_StartUp" ] }, - "EnterAwards": { + "MissionsPageFlag": { "recognition": "OCR", - "text": [ - "任务" - ], + "text": "作战任务", "roi": [ - 92, - 115, - 54, - 34 + 0, + 60, + 210, + 575 ], - "target": [ - 30, - 108, - 40, - 32 - ], - "action": "Click", - "post_wait_freezes": 1, + "post_wait_freezes": 200, "next": [ - "Sub_CombatMissionPageFlag", - "CombatMissionOneClickCollection", - "NoDailyPracticeRewards", - "DailyPracticeRewards_100", - "DailyPracticeRewards_200", - "DailyPracticeRewards_300", - "DailyPracticeRewards_450", - "DailyPracticeRewards_600", - "EnterAwards" + "Sub_EnterBPMissionsPage", + "BPMissionsQuickClaim", + "NoneDailyBPRewards", + "DailyBPRewards_100", + "DailyBPRewards_200", + "DailyBPRewards_300", + "DailyBPRewards_450", + "DailyBPRewards_600" ] }, - "Sub_CombatMissionPageFlag": { - "is_sub": true, - "recognition": "TemplateMatch", - "template": "Awards/CombatMissionPageFlag.png", - "roi": [ - 35, - 64, - 213, - 143 - ], - "action": "Click" - }, - "CombatMissionOneClickCollection": { + "BPMissionsQuickClaim": { "recognition": "TemplateMatch", - "template": "Awards/CombatMissionOneClickCollection.png", + "template": "Awards/BPMissionsQuickClaim.png", "threshold": 0.85, "roi": [ 1055, @@ -62,18 +41,18 @@ "action": "Click", "next": [ "Sub_CloseDialogBox", - "CombatMissionOneClickCollection", - "NoDailyPracticeRewards", - "DailyPracticeRewards_100", - "DailyPracticeRewards_200", - "DailyPracticeRewards_300", - "DailyPracticeRewards_450", - "DailyPracticeRewards_600" + "BPMissionsQuickClaim", + "NoneDailyBPRewards", + "DailyBPRewards_100", + "DailyBPRewards_200", + "DailyBPRewards_300", + "DailyBPRewards_450", + "DailyBPRewards_600" ] }, - "DailyPracticeRewards_100": { + "DailyBPRewards_100": { "recognition": "TemplateMatch", - "template": "Awards/DailyPracticeRewardsOk.png", + "template": "Awards/DailyBPRewardsClaimed.png", "inverse": true, "roi": [ 485, @@ -89,16 +68,16 @@ 67 ], "next": [ - "DailyPracticeRewardsNotReceive_100", - "DailyPracticeRewardsPreview", + "DailyBPRewardsClaim_100", + "DailyBPRewardsPreview", "Sub_CloseDialogBox", "Sub_BackButton", "HomeFlag" ] }, - "DailyPracticeRewardsNotReceive_100": { + "DailyBPRewardsClaim_100": { "recognition": "TemplateMatch", - "template": "Awards/DailyPracticeRewardsNotReceive.png", + "template": "Awards/DailyBPRewardsClaim.png", "roi": [ 485, 637, @@ -106,16 +85,16 @@ 67 ], "next": [ - "DailyPracticeRewardsPreview", - "DailyPracticeRewards_100", + "DailyBPRewardsPreview", + "DailyBPRewards_100", "Sub_CloseDialogBox", "Sub_BackButton", "HomeFlag" ] }, - "DailyPracticeRewards_200": { + "DailyBPRewards_200": { "recognition": "TemplateMatch", - "template": "Awards/DailyPracticeRewardsOk.png", + "template": "Awards/DailyBPRewardsClaimed.png", "inverse": true, "roi": [ 660, @@ -131,16 +110,16 @@ 69 ], "next": [ - "DailyPracticeRewardsNotReceive_200", - "DailyPracticeRewardsPreview", + "DailyBPRewardsClaim_200", + "DailyBPRewardsPreview", "Sub_CloseDialogBox", "Sub_BackButton", "HomeFlag" ] }, - "DailyPracticeRewardsNotReceive_200": { + "DailyBPRewardsClaim_200": { "recognition": "TemplateMatch", - "template": "Awards/DailyPracticeRewardsNotReceive.png", + "template": "Awards/DailyBPRewardsClaim.png", "roi": [ 660, 636, @@ -148,16 +127,16 @@ 69 ], "next": [ - "DailyPracticeRewardsPreview", - "DailyPracticeRewards_200", + "DailyBPRewardsPreview", + "DailyBPRewards_200", "Sub_CloseDialogBox", "Sub_BackButton", "HomeFlag" ] }, - "DailyPracticeRewards_300": { + "DailyBPRewards_300": { "recognition": "TemplateMatch", - "template": "Awards/DailyPracticeRewardsOk.png", + "template": "Awards/DailyBPRewardsClaimed.png", "inverse": true, "roi": [ 837, @@ -173,16 +152,16 @@ 69 ], "next": [ - "DailyPracticeRewardsNotReceive_300", - "DailyPracticeRewardsPreview", + "DailyBPRewardsClaim_300", + "DailyBPRewardsPreview", "Sub_CloseDialogBox", "Sub_BackButton", "HomeFlag" ] }, - "DailyPracticeRewardsNotReceive_300": { + "DailyBPRewardsClaim_300": { "recognition": "TemplateMatch", - "template": "Awards/DailyPracticeRewardsNotReceive.png", + "template": "Awards/DailyBPRewardsClaim.png", "roi": [ 837, 637, @@ -190,16 +169,16 @@ 69 ], "next": [ - "DailyPracticeRewardsPreview", - "DailyPracticeRewards_300", + "DailyBPRewardsPreview", + "DailyBPRewards_300", "Sub_CloseDialogBox", "Sub_BackButton", "HomeFlag" ] }, - "DailyPracticeRewards_450": { + "DailyBPRewards_450": { "recognition": "TemplateMatch", - "template": "Awards/DailyPracticeRewardsOk.png", + "template": "Awards/DailyBPRewardsClaimed.png", "inverse": true, "roi": [ 1013, @@ -215,16 +194,16 @@ 67 ], "next": [ - "DailyPracticeRewardsNotReceive_450", - "DailyPracticeRewardsPreview", + "DailyBPRewardsClaim_450", + "DailyBPRewardsPreview", "Sub_CloseDialogBox", "Sub_BackButton", "HomeFlag" ] }, - "DailyPracticeRewardsNotReceive_450": { + "DailyBPRewardsClaim_450": { "recognition": "TemplateMatch", - "template": "Awards/DailyPracticeRewardsNotReceive.png", + "template": "Awards/DailyBPRewardsClaim.png", "roi": [ 1013, 636, @@ -232,16 +211,16 @@ 67 ], "next": [ - "DailyPracticeRewardsPreview", - "DailyPracticeRewards_450", + "DailyBPRewardsPreview", + "DailyBPRewards_450", "Sub_CloseDialogBox", "Sub_BackButton", "HomeFlag" ] }, - "DailyPracticeRewards_600": { + "DailyBPRewards_600": { "recognition": "TemplateMatch", - "template": "Awards/DailyPracticeRewardsOk.png", + "template": "Awards/DailyBPRewardsClaimed.png", "inverse": true, "roi": [ 1187, @@ -257,16 +236,16 @@ 66 ], "next": [ - "DailyPracticeRewardsNotReceive_600", - "DailyPracticeRewardsPreview", + "DailyBPRewardsClaim_600", + "DailyBPRewardsPreview", "Sub_CloseDialogBox", "Sub_BackButton", "HomeFlag" ] }, - "DailyPracticeRewardsNotReceive_600": { + "DailyBPRewardsClaim_600": { "recognition": "TemplateMatch", - "template": "Awards/DailyPracticeRewardsNotReceive.png", + "template": "Awards/DailyBPRewardsClaim.png", "roi": [ 1187, 636, @@ -274,16 +253,16 @@ 66 ], "next": [ - "DailyPracticeRewardsPreview", - "DailyPracticeRewards_600", + "DailyBPRewardsPreview", + "DailyBPRewards_600", "Sub_CloseDialogBox", "Sub_BackButton", "HomeFlag" ] }, - "DailyPracticeRewardsPreview": { + "DailyBPRewardsPreview": { "recognition": "TemplateMatch", - "template": "Awards/DailyPracticeRewardsPreview.png", + "template": "Awards/DailyBPRewardsPreview.png", "roi": [ 442, 94, @@ -296,9 +275,9 @@ "HomeFlag" ] }, - "NoDailyPracticeRewards": { + "NoneDailyBPRewards": { "recognition": "TemplateMatch", - "template": "Awards/NoDailyPracticeRewards.png", + "template": "Awards/NoneDailyBPRewards.png", "roi": [ 439, 597, diff --git a/assets/resource/pipeline/dorm/dorm.json b/assets/resource/pipeline/dorm/dorm.json new file mode 100644 index 0000000..071427b --- /dev/null +++ b/assets/resource/pipeline/dorm/dorm.json @@ -0,0 +1,115 @@ +{ + "$schema": "../../pipeline.schema.json", + "Dorm": { + "next": [ + "DormPageFlag", + "Sub_EnterDormPage", + "Sub_StartUp" + ] + }, + "DormPageFlag": { + "recognition": "OCR", + "text": "家园小队", + "roi": [ + 28, + 589, + 208, + 131 + ], + "next": [ + "CollectGold", + "CollectAP", + "Errands", + "Expeditions", + "Stop" + ] + }, + "CollectGold": { + "recognition": "TemplateMatch", + "template": [ + "Dorm/CollectGold.png", + "Dorm/CollectGoldMax.png" + ], + "roi": [ + 286, + 69, + 141, + 146 + ], + "action": "Click", + "next": [ + "CollectGold", + "CollectAP", + "Errands", + "Expeditions", + "Stop" + ] + }, + "CollectAP": { + "recognition": "TemplateMatch", + "template": "Dorm/CollectAP.png", + "roi": [ + 124, + 68, + 146, + 155 + ], + "action": "Click", + "next": [ + "CollectAP", + "CollectAPButton" + ] + }, + "CollectAPButton": { + "recognition": "TemplateMatch", + "template": "Dorm/CollectAPButton.png", + "roi": [ + 650, + 496, + 215, + 130 + ], + "action": "Click", + "next": [ + "APMax", + "CollectAPButton", + "Errands", + "Expeditions", + "Stop" + ] + }, + "APMax": { + "recognition": "OCR", + "text": [ + "已经达到", + "体力", + "上限" + ], + "roi": [ + 461, + 289, + 359, + 138 + ], + "next": [ + "CloseCollectAP" + ] + }, + "CloseCollectAP": { + "recognition": "TemplateMatch", + "template": "Dorm/CloseCollectAP.png", + "roi": [ + 1017, + 58, + 137, + 138 + ], + "action": "Click", + "next": [ + "CloseCollectAP", + "Errands", + "Expeditions", + "Stop" + ] + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/dorm/errands.json b/assets/resource/pipeline/dorm/errands.json new file mode 100644 index 0000000..65003b7 --- /dev/null +++ b/assets/resource/pipeline/dorm/errands.json @@ -0,0 +1,245 @@ +{ + "$schema": "../../pipeline.schema.json", + "Errands": { + "next": [ + "ErrandsPageFlag", + "Sub_EnterErrandsPage", + "Sub_EnterDormPage", + "Sub_BackButton" + ] + }, + "ErrandsPageFlag": { + "recognition": "TemplateMatch", + "template": "Dorm/ErrandsPageFlag.png", + "roi": [ + 0, + 17, + 278, + 250 + ], + "next": [ + "ErrandsConfirm", + "ErrandsUnfold", + "ErrandsCompleted", + "ErrandsNeed", + "ErrandsNoNeed" + ] + }, + "ErrandsUnfold": { + "recognition": "TemplateMatch", + "template": "Dorm/ErrandsUnfold.png", + "roi": [ + 1185, + 293, + 95, + 135 + ], + "action": "Click", + "next": [ + "ErrandsUnfold", + "ErrandsConfirm", + "ErrandsCompleted", + "ErrandsNeed", + "ErrandsNoNeed" + ] + }, + "ErrandsCompleted": { + "recognition": "OCR", + "text": [ + "完成" + ], + "roi": [ + 834, + 0, + 446, + 720 + ], + "action": "Click", + "next": [ + "ErrandsConfirm", + "ErrandsCompleted", + "ErrandsNeed", + "ErrandsNoNeed" + ] + }, + "ErrandsConfirm": { + "recognition": "TemplateMatch", + "template": "Dorm/Confirm.png", + "roi": [ + 560, + 478, + 159, + 133 + ], + "action": "Click", + "next": [ + "ErrandsConfirm", + "ErrandsCompleted", + "ErrandsNeed", + "ErrandsNoNeed" + ] + }, + "ErrandsNeed": { + "recognition": "OCR", + "text": [ + "需要" + ], + "roi": [ + 1134, + 0, + 55, + 720 + ], + "action": "Click", + "next": [ + "ErrandsQuickDispatch" + ] + }, + "ErrandsNoNeed": { + "inverse": true, + "recognition": "OCR", + "text": [ + "需要" + ], + "roi": [ + 1134, + 0, + 55, + 720 + ], + "next": [ + "Expeditions", + "Stop" + ] + }, + "ErrandsQuickDispatch": { + "recognition": "TemplateMatch", + "template": "Dorm/QuickDispatch.png", + "roi": [ + 763, + 606, + 219, + 114 + ], + "action": "Click", + "next": [ + "NoEligibleRoles", + "StartErrands", + "NotEnoughRiceBalls" + ] + }, + "NoEligibleRoles": { + "recognition": "OCR", + "text": [ + "没有找到", + "合适的", + "推荐女武神" + ], + "roi": [ + 395, + 284, + 489, + 145 + ], + "action": "Click", + "next": [ + "ErrandsRefresh" + ] + }, + "ErrandsRefresh": { + "recognition": "TemplateMatch", + "template": "Dorm/ErrandsRefresh.png", + "roi": [ + 1117, + 0, + 163, + 132 + ], + "action": "Click", + "next": [ + "NotEnoughRefreshes", + "ErrandsQuickDispatch" + ] + }, + "NotEnoughRefreshes": { + "recognition": "OCR", + "text": [ + "今日剩余", + "刷新次数不足" + ], + "roi": [ + 427, + 286, + 425, + 143 + ], + "action": "Click", + "next": [ + "NextErrands", + "EndErrands" + ] + }, + "NextErrands": { + "recognition": "TemplateMatch", + "template": "Dorm/NextErrands.png", + "roi": [ + 1157, + 293, + 123, + 134 + ], + "action": "Click", + "next": [ + "ErrandsQuickDispatch" + ] + }, + "EndErrands": { + "recognition": "TemplateMatch", + "template": "Dorm/NextErrands.png", + "roi": [ + 1157, + 293, + 123, + 134 + ], + "inverse": true, + "next": [ + "Expeditions", + "Stop" + ] + }, + "StartErrands": { + "recognition": "TemplateMatch", + "template": "Dorm/StartErrands.png", + "roi": [ + 1028, + 610, + 220, + 110 + ], + "action": "Click", + "next": [ + "NotEnoughRiceBalls", + "ErrandsNeed", + "ErrandsNoNeed" + ] + }, + "NotEnoughRiceBalls": { + "recognition": "OCR", + "text": [ + "饭团不足", + "无法排遣", + "请稍后尝试" + ], + "roi": [ + 362, + 287, + 558, + 141 + ], + "next": [ + "Expeditions", + "Stop" + ] + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/story_sweep.json b/assets/resource/pipeline/dorm/expeditions.json similarity index 67% rename from assets/resource/pipeline/story_sweep.json rename to assets/resource/pipeline/dorm/expeditions.json index 14d0ab4..f58774e 100644 --- a/assets/resource/pipeline/story_sweep.json +++ b/assets/resource/pipeline/dorm/expeditions.json @@ -1,49 +1,22 @@ { - "$schema": "../pipeline.schema.json", - "StorySweep": { + "$schema": "../../pipeline.schema.json", + "Expeditions": { "next": [ - "StorySweepEnterHomeland", - "EnterStorySweep", + "ExpeditionsPageFlag", + "Sub_EnterExpeditionsPage", + "Sub_EnterDormPage", "Sub_BackButton" ] }, - "StorySweepEnterHomeland": { + "ExpeditionsPageFlag": { "recognition": "OCR", - "text": [ - "家园" - ], + "text": "今日远征可用体力", "roi": [ - 1005, - 610, - 155, - 110 - ], - "action": "Click", - "post_wait_freezes": { - "time": 200, - "target": [ - 0, - 400, - 380, - 320 - ] - }, - "next": [ - "StorySweepEnterHomeland", - "EnterStorySweep", - "Sub_StartUp" - ] - }, - "EnterStorySweep": { - "recognition": "TemplateMatch", - "template": "StorySweep/EnterStorySweep.png", - "roi": [ - 743, - 596, - 161, - 124 + 33, + 62, + 286, + 128 ], - "action": "Click", "next": [ "FragmentConfirm", "FragmentCompleted", @@ -54,7 +27,7 @@ "is_sub": true, "enabled": false, "recognition": "TemplateMatch", - "template": "StorySweep/SwitchToFragmentPage.png", + "template": "Dorm/SwitchToFragmentPage.png", "roi": [ 1038, 36, @@ -67,7 +40,7 @@ "is_sub": true, "enabled": false, "recognition": "TemplateMatch", - "template": "StorySweep/SwitchToMaterialPage.png", + "template": "Dorm/SwitchToMaterialPage.png", "roi": [ 1038, 117, @@ -97,7 +70,7 @@ }, "FragmentConfirm": { "recognition": "TemplateMatch", - "template": "Homeland/Confirm.png", + "template": "Dorm/Confirm.png", "roi": [ 560, 478, @@ -113,7 +86,7 @@ }, "SwitchToMaterialPage": { "recognition": "TemplateMatch", - "template": "StorySweep/SwitchToMaterialPage.png", + "template": "Dorm/SwitchToMaterialPage.png", "roi": [ 1038, 117, @@ -160,13 +133,13 @@ "inverse": true, "next": [ "Sub_SwitchToFragmentPage", - "SelectFirstStorySweep", - "NoIdleStorySweep" + "SelectFirstExpeditions", + "NoIdleExpeditions" ] }, "MaterialConfirm": { "recognition": "TemplateMatch", - "template": "Homeland/Confirm.png", + "template": "Dorm/Confirm.png", "roi": [ 560, 478, @@ -180,7 +153,7 @@ "MaterialNoCompleted" ] }, - "SelectFirstStorySweep": { + "SelectFirstExpeditions": { "recognition": "OCR", "text": [ "开始远征" @@ -193,13 +166,14 @@ ], "action": "Click", "next": [ - "StorySweepOneClickDispatch", - "StartStorySweep", - "NoIdleStorySweep", - "SelectFirstStorySweep" + "ExpeditionsQuickDispatch", + "StartExpeditions", + "NoIdleExpeditions", + "SelectFirstExpeditions" ] }, - "NoIdleStorySweep": { + "NoIdleExpeditions": { + "inverse": true, "recognition": "OCR", "text": [ "开始远征" @@ -210,7 +184,6 @@ 203, 573 ], - "inverse": true, "action": "Swipe", "begin": [ 400, @@ -235,15 +208,15 @@ ] }, "next": [ - "SelectFirstStorySweep", - "StorySweepOneClickDispatch", - "StartStorySweep", - "NoIdleStorySweep" + "SelectFirstExpeditions", + "ExpeditionsQuickDispatch", + "StartExpeditions", + "NoIdleExpeditions" ] }, - "StorySweepOneClickDispatch": { + "ExpeditionsQuickDispatch": { "recognition": "TemplateMatch", - "template": "Homeland/OneClickDispatch.png", + "template": "Dorm/QuickDispatch.png", "roi": [ 680, 583, @@ -252,13 +225,13 @@ ], "action": "Click", "next": [ - "StartStorySweep", - "StorySweepConsumptionLimit" + "StartExpeditions", + "ExpeditionsConsumptionLimit" ] }, - "StartStorySweep": { + "StartExpeditions": { "recognition": "TemplateMatch", - "template": "StorySweep/StartStorySweep.png", + "template": "Dorm/StartExpeditions.png", "roi": [ 996, 584, @@ -276,16 +249,16 @@ ] }, "next": [ - "SelectFirstStorySweep", - "StorySweepNotEnoughNumberOfLevels", - "StorySweepNotEnoughAP", - "StorySweepConsumptionLimit", - "StorySweepOneClickDispatch", - "StartStorySweep", - "NoIdleStorySweep" + "SelectFirstExpeditions", + "ExpeditionsNotEnoughNumberOfLevels", + "ExpeditionsNotEnoughAP", + "ExpeditionsConsumptionLimit", + "ExpeditionsQuickDispatch", + "StartExpeditions", + "NoIdleExpeditions" ] }, - "StorySweepConsumptionLimit": { + "ExpeditionsConsumptionLimit": { "recognition": "OCR", "text": [ "已达到", @@ -299,7 +272,7 @@ 138 ] }, - "StorySweepNotEnoughAP": { + "ExpeditionsNotEnoughAP": { "recognition": "OCR", "text": [ "所需体力不足" @@ -313,14 +286,14 @@ "action": "Click", "post_wait_freezes": 200, "next": [ - "StorySweepNotEnoughAPToGetStoredAP", - "StorySweepConsumptionLimit", + "ExpeditionsNotEnoughAPToGetStoredAP", + "ExpeditionsConsumptionLimit", "Stop" ] }, - "StorySweepNotEnoughAPToGetStoredAP": { + "ExpeditionsNotEnoughAPToGetStoredAP": { "recognition": "TemplateMatch", - "template": "Homeland/CollectAPButton.png", + "template": "Dorm/CollectAPButton.png", "roi": [ 647, 492, @@ -329,14 +302,14 @@ ], "action": "Click", "next": [ - "StartStorySweep", - "SelectFirstStorySweep", - "StorySweepConsumptionLimit", - "StorySweepOneClickDispatch", - "NoIdleStorySweep" + "StartExpeditions", + "SelectFirstExpeditions", + "ExpeditionsConsumptionLimit", + "ExpeditionsQuickDispatch", + "NoIdleExpeditions" ] }, - "StorySweepNotEnoughNumberOfLevels": { + "ExpeditionsNotEnoughNumberOfLevels": { "recognition": "OCR", "text": [ "所需关卡次数不足" diff --git a/assets/resource/pipeline/homeland.json b/assets/resource/pipeline/homeland.json deleted file mode 100644 index 74667b6..0000000 --- a/assets/resource/pipeline/homeland.json +++ /dev/null @@ -1,363 +0,0 @@ -{ - "$schema": "../pipeline.schema.json", - "Homeland": { - "next": [ - "Sub_HomeButton", - "Sub_BackButton", - "Sub_ObtainedAwards", - "Sub_CollectDailyLoginReward", - "Sub_CloseAnnouncement", - "EnterHomeland", - "CollectGold", - "CollectAP", - "EnterQuest", - "Sub_StartUp" - ] - }, - "EnterHomeland": { - "recognition": "OCR", - "text": [ - "家园" - ], - "roi": [ - 1005, - 610, - 155, - 110 - ], - "action": "Click", - "post_wait_freezes": { - "time": 200, - "target": [ - 0, - 400, - 380, - 320 - ] - }, - "next": [ - "EnterHomeland", - "CollectGold", - "CollectAP", - "EnterQuest", - "Sub_StartUp" - ] - }, - "CollectGold": { - "recognition": "TemplateMatch", - "template": [ - "Homeland/CollectGold.png", - "Homeland/CollectGoldMax.png" - ], - "roi": [ - 286, - 69, - 141, - 146 - ], - "action": "Click", - "next": [ - "CollectGold", - "CollectAP", - "EnterQuest" - ] - }, - "CollectAP": { - "recognition": "TemplateMatch", - "template": "Homeland/CollectAP.png", - "roi": [ - 124, - 68, - 146, - 155 - ], - "action": "Click", - "next": [ - "CollectAP", - "CollectAPButton", - "EnterQuest" - ] - }, - "CollectAPButton": { - "recognition": "TemplateMatch", - "template": "Homeland/CollectAPButton.png", - "roi": [ - 650, - 496, - 215, - 130 - ], - "action": "Click", - "next": [ - "APMax", - "CollectAPButton", - "EnterQuest" - ] - }, - "APMax": { - "recognition": "OCR", - "text": [ - "已经达到", - "体力", - "上限" - ], - "roi": [ - 461, - 289, - 359, - 138 - ], - "next": [ - "CloseCollectAP", - "EnterQuest" - ] - }, - "CloseCollectAP": { - "recognition": "TemplateMatch", - "template": "Homeland/CloseCollectAP.png", - "roi": [ - 1017, - 58, - 137, - 138 - ], - "action": "Click", - "next": [ - "CloseCollectAP", - "EnterQuest" - ] - }, - "EnterQuest": { - "recognition": "TemplateMatch", - "template": "Homeland/EnterQuest.png", - "roi": [ - 905, - 595, - 160, - 125 - ], - "action": "Click", - "next": [ - "EnterQuest", - "QuestConfirm", - "QuestUnfold", - "QuestCompleted", - "QuestNeed", - "QuestNoNeed" - ] - }, - "QuestUnfold": { - "recognition": "TemplateMatch", - "template": "Homeland/QuestUnfold.png", - "roi": [ - 1185, - 293, - 95, - 135 - ], - "action": "Click", - "next": [ - "QuestUnfold", - "QuestConfirm", - "QuestCompleted", - "QuestNeed", - "QuestNoNeed" - ] - }, - "QuestCompleted": { - "recognition": "OCR", - "text": [ - "完成" - ], - "roi": [ - 834, - 0, - 446, - 720 - ], - "action": "Click", - "next": [ - "QuestConfirm", - "QuestCompleted", - "QuestNeed", - "QuestNoNeed" - ] - }, - "QuestConfirm": { - "recognition": "TemplateMatch", - "template": "Homeland/Confirm.png", - "roi": [ - 560, - 478, - 159, - 133 - ], - "action": "Click", - "next": [ - "QuestConfirm", - "QuestCompleted", - "QuestNeed", - "QuestNoNeed" - ] - }, - "QuestNeed": { - "recognition": "OCR", - "text": [ - "需要" - ], - "roi": [ - 1134, - 0, - 55, - 720 - ], - "action": "Click", - "next": [ - "OneClickDispatch" - ] - }, - "QuestNoNeed": { - "recognition": "OCR", - "text": [ - "需要" - ], - "roi": [ - 1134, - 0, - 55, - 720 - ], - "inverse": true, - "next": [ - "StorySweep" - ] - }, - "OneClickDispatch": { - "recognition": "TemplateMatch", - "template": "Homeland/OneClickDispatch.png", - "roi": [ - 763, - 606, - 219, - 114 - ], - "action": "Click", - "next": [ - "NoEligibleRoles", - "StartQuest", - "NotEnoughRiceBalls" - ] - }, - "NoEligibleRoles": { - "recognition": "OCR", - "text": [ - "没有找到", - "合适的", - "推荐女武神" - ], - "roi": [ - 395, - 284, - 489, - 145 - ], - "action": "Click", - "next": [ - "QuestRefresh" - ] - }, - "QuestRefresh": { - "recognition": "TemplateMatch", - "template": "Homeland/QuestRefresh.png", - "roi": [ - 1117, - 0, - 163, - 132 - ], - "action": "Click", - "next": [ - "NotEnoughRefreshes", - "OneClickDispatch" - ] - }, - "NotEnoughRefreshes": { - "recognition": "OCR", - "text": [ - "今日剩余", - "刷新次数不足" - ], - "roi": [ - 427, - 286, - 425, - 143 - ], - "action": "Click", - "next": [ - "NextQuest", - "EndQuest" - ] - }, - "NextQuest": { - "recognition": "TemplateMatch", - "template": "Homeland/NextQuest.png", - "roi": [ - 1157, - 293, - 123, - 134 - ], - "action": "Click", - "next": [ - "OneClickDispatch" - ] - }, - "EndQuest": { - "recognition": "TemplateMatch", - "template": "Homeland/NextQuest.png", - "roi": [ - 1157, - 293, - 123, - 134 - ], - "inverse": true, - "next": [ - "StorySweep" - ] - }, - "StartQuest": { - "recognition": "TemplateMatch", - "template": "Homeland/StartQuest.png", - "roi": [ - 1028, - 610, - 220, - 110 - ], - "action": "Click", - "next": [ - "NotEnoughRiceBalls", - "QuestNeed", - "QuestNoNeed" - ] - }, - "NotEnoughRiceBalls": { - "recognition": "OCR", - "text": [ - "饭团不足", - "无法排遣", - "请稍后尝试" - ], - "roi": [ - 362, - 287, - 558, - 141 - ], - "next": [ - "StorySweep" - ] - } -} \ No newline at end of file diff --git a/assets/resource/pipeline/material_event.json b/assets/resource/pipeline/material_event.json index 4a79cd0..3b25af3 100644 --- a/assets/resource/pipeline/material_event.json +++ b/assets/resource/pipeline/material_event.json @@ -2,94 +2,32 @@ "$schema": "../pipeline.schema.json", "MaterialEvent": { "next": [ - "EnterAttack", + "MaterialEventFlag", + "Sub_CancelDownloadAudioFiles", + "Sub_EnterMaterialExpeditionPage", + "Sub_EnterAttackEventPage", + "Sub_EnterAttackPage", "Sub_StartUp" ] }, - "EnterAttack": { + "MaterialEventFlag": { "recognition": "TemplateMatch", - "template": "MaterialEvent/EnterAttack.png", + "template": "MaterialEvent/MaterialEventFlag.png", "roi": [ - 1025, - 77, - 167, - 163 + 525, + 40, + 229, + 141 ], - "action": "Click", - "post_wait_freezes": { - "time": 200, - "target": [ - 0, - 0, - 340, - 80 - ] - }, "next": [ - "TipsForDownloadAudioResources", - "EnterMaterialEvent", - "Sub_AttackPageFlag" + "QuickLITE", + "Sub_EnterMaterialEventPage", + "NoneQuickLITE" ] }, - "TipsForDownloadAudioResources": { - "recognition": "OCR", - "text": [ - "即将下载相关音频资源" - ], - "roi": [ - 298, - 232, - 669, - 143 - ], - "next": [ - "Sub_CancelButton", - "EnterAttack" - ] - }, - "Sub_AttackPageFlag": { - "is_sub": true, - "recognition": "TemplateMatch", - "template": "MaterialEvent/AttackPageFlag.png", - "roi": [ - 0, - 122, - 135, - 166 - ], - "action": "Click" - }, - "EnterMaterialEvent": { - "recognition": "TemplateMatch", - "template": "MaterialEvent/EnterMaterialEvent.png", - "roi": [ - 903, - 356, - 366, - 307 - ], - "action": "Click", - "next": [ - "OneClickBurdenReduction", - "Sub_MaterialActivitiesPageFlag", - "NoOneClickBurdenReduction" - ] - }, - "Sub_MaterialActivitiesPageFlag": { - "is_sub": true, - "recognition": "TemplateMatch", - "template": "MaterialEvent/MaterialActivitiesPageFlag.png", - "roi": [ - 0, - 162, - 137, - 216 - ], - "action": "Click" - }, - "OneClickBurdenReduction": { + "QuickLITE": { "recognition": "TemplateMatch", - "template": "MaterialEvent/OneClickBurdenReduction.png", + "template": "MaterialEvent/QuickLITE.png", "roi": [ 1037, 598, @@ -99,14 +37,14 @@ "action": "Click", "post_wait_freezes": 200, "next": [ - "BurdenReduction", - "MaterialEventNoLevelsToReduceReduction", - "OneClickBurdenReduction" + "LITE", + "MaterialEventNoneLevelsToLITE", + "QuickLITE" ] }, - "NoOneClickBurdenReduction": { + "NoneQuickLITE": { "recognition": "TemplateMatch", - "template": "MaterialEvent/OneClickBurdenReduction.png", + "template": "MaterialEvent/QuickLITE.png", "roi": [ 1037, 598, @@ -119,9 +57,9 @@ "HomeFlag" ] }, - "BurdenReduction": { + "LITE": { "recognition": "TemplateMatch", - "template": "MaterialEvent/BurdenReduction.png", + "template": "MaterialEvent/LITE.png", "roi": [ 558, 462, @@ -130,7 +68,7 @@ ], "action": "Click", "next": [ - "BurdenReduction", + "LITE", "MaterialEventNotEnoughAP", "Sub_CloseDialogBox", "Sub_HomeButton", @@ -168,13 +106,13 @@ ], "action": "Click", "next": [ - "BurdenReduction", + "QuickLITE", "Sub_CloseDialogBox", "Sub_HomeButton", "HomeFlag" ] }, - "MaterialEventNoLevelsToReduceReduction": { + "MaterialEventNoneLevelsToLITE": { "recognition": "OCR", "text": "没有可减负的关卡", "roi": [ diff --git a/assets/resource/pipeline/navigation/armada_navigation.json b/assets/resource/pipeline/navigation/armada_navigation.json new file mode 100644 index 0000000..9a5a707 --- /dev/null +++ b/assets/resource/pipeline/navigation/armada_navigation.json @@ -0,0 +1,36 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterCommissionsPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Armada/EnterCommissionsPage.png", + "roi": [ + 390, + 583, + 215, + 137 + ], + "action": "Click" + }, + "Sub_EnterContributionsPage":{ + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Armada/EnterArmadaContribution.png", + "roi": [ + 832, + 586, + 212, + 133 + ], + "action": "Click", + "post_wait_freezes": { + "time": 200, + "target": [ + 0, + 0, + 420, + 330 + ] + } + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/navigation/attack_event_navigation.json b/assets/resource/pipeline/navigation/attack_event_navigation.json new file mode 100644 index 0000000..c77dd31 --- /dev/null +++ b/assets/resource/pipeline/navigation/attack_event_navigation.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterMaterialExpeditionPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/AttackEvent/EnterMaterialExpeditionPage.png", + "roi": [ + 903, + 356, + 366, + 307 + ], + "action": "Click" + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/navigation/attack_navigation.json b/assets/resource/pipeline/navigation/attack_navigation.json new file mode 100644 index 0000000..00e5045 --- /dev/null +++ b/assets/resource/pipeline/navigation/attack_navigation.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterAttackEventPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Attack/EnterAttackEventPage.png", + "roi": [ + 0, + 122, + 135, + 166 + ], + "action": "Click" + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/navigation/challenge_event_navigation.json b/assets/resource/pipeline/navigation/challenge_event_navigation.json new file mode 100644 index 0000000..e5d54e2 --- /dev/null +++ b/assets/resource/pipeline/navigation/challenge_event_navigation.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterUniversalMiragePage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/ChallengeEvent/EnterUniversalMiragePage.png", + "roi": [ + 646, + 72, + 264, + 144 + ], + "action": "Click" + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/navigation/commissions_navigation.json b/assets/resource/pipeline/navigation/commissions_navigation.json new file mode 100644 index 0000000..4c2c289 --- /dev/null +++ b/assets/resource/pipeline/navigation/commissions_navigation.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterCommissionsRewardsPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Commissions/EnterCommissionsRewardsPage.png", + "roi": [ + 1095, + 161, + 185, + 137 + ], + "action": "Click" + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/navigation/dorm_navigation.json b/assets/resource/pipeline/navigation/dorm_navigation.json new file mode 100644 index 0000000..3b3bf2c --- /dev/null +++ b/assets/resource/pipeline/navigation/dorm_navigation.json @@ -0,0 +1,27 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterErrandsPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Dorm/EnterErrandsPage.png", + "roi": [ + 905, + 595, + 160, + 125 + ], + "action": "Click" + }, + "Sub_EnterExpeditionsPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Dorm/EnterExpeditionsPage.png", + "roi": [ + 743, + 596, + 161, + 124 + ], + "action": "Click" + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/navigation/home_navigation.json b/assets/resource/pipeline/navigation/home_navigation.json new file mode 100644 index 0000000..00d0d82 --- /dev/null +++ b/assets/resource/pipeline/navigation/home_navigation.json @@ -0,0 +1,94 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterAttackPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Home/EnterAttackPage.png", + "roi": [ + 1025, + 77, + 167, + 163 + ], + "action": "Click", + "post_wait_freezes": { + "time": 200, + "target": [ + 0, + 0, + 340, + 80 + ] + } + }, + "Sub_EnterSupplyPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Home/EnterSupplyPage.png", + "roi": [ + 1012, + 389, + 184, + 140 + ], + "action": "Click" + }, + "Sub_EnterArmadaPage": { + "is_sub": true, + "recognition": "OCR", + "text": [ + "舰团" + ], + "roi": [ + 879, + 661, + 54, + 29 + ], + "action": "Click" + }, + "Sub_EnterDormPage": { + "is_sub": true, + "recognition": "OCR", + "text": [ + "家园" + ], + "roi": [ + 1005, + 610, + 155, + 110 + ], + "action": "Click", + "post_wait_freezes": { + "time": 200, + "target": [ + 0, + 400, + 380, + 320 + ] + } + }, + "Sub_EnterMissionsPage": { + "is_sub": true, + "recognition": "OCR", + "text": [ + "任务" + ], + "roi": [ + 92, + 115, + 54, + 34 + ], + "target": [ + 30, + 108, + 40, + 32 + ], + "action": "Click", + "post_wait_freezes": 1 + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/navigation/material_expedition_navigation.json b/assets/resource/pipeline/navigation/material_expedition_navigation.json new file mode 100644 index 0000000..fa51ee8 --- /dev/null +++ b/assets/resource/pipeline/navigation/material_expedition_navigation.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterMaterialEventPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/MaterialExpedition/EnterMaterialEventPage.png", + "roi": [ + 0, + 162, + 137, + 216 + ], + "action": "Click" + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/navigation/missions_navigation.json b/assets/resource/pipeline/navigation/missions_navigation.json new file mode 100644 index 0000000..b9f121b --- /dev/null +++ b/assets/resource/pipeline/navigation/missions_navigation.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterBPMissionsPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Missions/EnterBPMissionsPage.png", + "roi": [ + 35, + 64, + 213, + 143 + ], + "action": "Click" + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/navigation/shop_navigation.json b/assets/resource/pipeline/navigation/shop_navigation.json new file mode 100644 index 0000000..468228c --- /dev/null +++ b/assets/resource/pipeline/navigation/shop_navigation.json @@ -0,0 +1,27 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterActivityShopPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Shop/EnterActivityShopPage.png", + "roi": [ + 61, + 509, + 203, + 133 + ], + "action": "Click" + }, + "Sub_EnterMirageStorePage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Shop/EnterMirageStorePage.png", + "roi": [ + 62, + 440, + 201, + 130 + ], + "action": "Click" + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/navigation/supply_navigation.json b/assets/resource/pipeline/navigation/supply_navigation.json new file mode 100644 index 0000000..654e2c3 --- /dev/null +++ b/assets/resource/pipeline/navigation/supply_navigation.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterShopPage": { + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/Supply/EnterShopPage.png", + "roi": [ + 157, + 484, + 213, + 135 + ], + "action": "Click" + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/navigation/universal_mirage_navigation.json b/assets/resource/pipeline/navigation/universal_mirage_navigation.json new file mode 100644 index 0000000..98c012c --- /dev/null +++ b/assets/resource/pipeline/navigation/universal_mirage_navigation.json @@ -0,0 +1,55 @@ +{ + "$schema": "../../pipeline.schema.json", + "Sub_EnterGlacialFencesPage": { + "enabled": false, + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/UniversalMirage/EnterGlacialFencesPage.png", + "roi": [ + 76, + 428, + 235, + 140 + ], + "action": "Click" + }, + "Sub_EnterIlluminatedLandPage": { + "enabled": false, + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/UniversalMirage/EnterIlluminatedLandPage.png", + "roi": [ + 371, + 428, + 240, + 140 + ], + "action": "Click" + }, + "Sub_EnterRoaringPalacePage": { + "enabled": false, + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/UniversalMirage/EnterRoaringPalacePage.png", + "roi": [ + 668, + 428, + 241, + 140 + ], + "action": "Click" + }, + "Sub_EnterBladeGravePage": { + "enabled": false, + "is_sub": true, + "recognition": "TemplateMatch", + "template": "Navigation/UniversalMirage/EnterBladeGravePage.png", + "roi": [ + 966, + 427, + 242, + 142 + ], + "action": "Click" + } +} \ No newline at end of file diff --git a/assets/resource/pipeline/shop.json b/assets/resource/pipeline/shop.json index 35945be..a833ffb 100644 --- a/assets/resource/pipeline/shop.json +++ b/assets/resource/pipeline/shop.json @@ -2,39 +2,25 @@ "$schema": "../pipeline.schema.json", "Shop": { "next": [ - "EnterSupplyPage", + "DailyShopPageFlag", + "Sub_EnterShopPage", + "Sub_EnterSupplyPage", "Sub_StartUp" ] }, - "EnterSupplyPage": { + "DailyShopPageFlag": { "recognition": "TemplateMatch", - "template": "Shop/EnterSupplyPage.png", + "template": "Shop/DailyShopPageFlag.png", "roi": [ - 1012, - 389, - 184, - 140 - ], - "action": "Click", - "next": [ - "EnterShopPage" - ] - }, - "EnterShopPage": { - "recognition": "TemplateMatch", - "template": "Shop/EnterShopPage.png", - "roi": [ - 157, - 484, - 213, - 135 + 63, + 53, + 201, + 138 ], - "action": "Click", "next": [ "LogisticsTerminalBuyCharacterFragmentByGold", "MirageStoreBuyTimeSwirlPassesBy1Asterite", - "Sub_CloseDialogBox", - "EnterShopPage" + "Sub_CloseDialogBox" ] }, "LogisticsTerminalBuyCharacterFragmentByGold": { @@ -159,39 +145,10 @@ "MirageStoreBuyTimeSwirlPassesBy1Asterite": { "recognition": "TemplateMatch", "template": "Shop/LogisticsTerminalPage.png", - "next": [ - "EnterActivityShopPage", - "EnterMirageStorePage" - ] - }, - "EnterActivityShopPage": { - "recognition": "TemplateMatch", - "template": "Shop/EnterActivityShopPage.png", - "roi": [ - 61, - 509, - 203, - 133 - ], - "action": "Click", - "next": [ - "EnterMirageStorePage", - "EnterActivityShopPage" - ] - }, - "EnterMirageStorePage": { - "recognition": "TemplateMatch", - "template": "Shop/EnterMirageStorePage.png", - "roi": [ - 62, - 440, - 201, - 130 - ], - "action": "Click", "next": [ "MirageStore1AsteriteFlag", - "EnterMirageStorePage", + "Sub_EnterMirageStorePage", + "Sub_EnterActivityShopPage", "Stop" ] }, diff --git a/assets/resource/pipeline/utils.json b/assets/resource/pipeline/utils.json index eface8d..517143a 100644 --- a/assets/resource/pipeline/utils.json +++ b/assets/resource/pipeline/utils.json @@ -66,5 +66,22 @@ ], "action": "Click" }, + "Sub_CancelDownloadAudioFiles": { + "is_sub": true, + "recognition": "OCR", + "text": [ + "即将下载相关音频资源" + ], + "roi": [ + 298, + 232, + 669, + 143 + ], + "next": [ + "Sub_CancelButton", + "Stop" + ] + }, "Stop": {} } \ No newline at end of file diff --git a/source/cli/main.cpp b/source/cli/main.cpp index 0d584a0..3503799 100644 --- a/source/cli/main.cpp +++ b/source/cli/main.cpp @@ -225,7 +225,7 @@ MaaSize get_device_index(const MaaSize& device_size) return index; } -json::value homeland_param() +json::value dorm_param() { json::value param; auto& diff = param["diff_task"]; @@ -319,7 +319,7 @@ bool proc_argv(int argc, char** argv, bool& debug, std::string& adb, std::string << "Please select tasks: " << std::endl << std::endl - << " 1. Homeland\n" + << " 1. Dorm\n" " 2. MaterialEvent\n" " 3. Armada\n" " 4. Shop\n" @@ -343,8 +343,8 @@ bool proc_argv(int argc, char** argv, bool& debug, std::string& adb, std::string switch (id) { case 1: - task_obj.type = "Homeland"; - task_obj.param = homeland_param(); + task_obj.type = "Dorm"; + task_obj.param = dorm_param(); break; case 2: task_obj.type = "MaterialEvent"; diff --git a/source/cli/main.h b/source/cli/main.h index f83381b..1d1a2cd 100644 --- a/source/cli/main.h +++ b/source/cli/main.h @@ -32,7 +32,7 @@ void print_version(); MaaSize scanning_devices(); -json::value homeland_param(); +json::value dorm_param(); json::value end_to_do_param();