chore: 重构tasks并拆分导航

MaaXYZ · Oct 1, 2023 · a0782e0 · a0782e0
1 parent 2958013
commit a0782e0
Show file tree

Hide file tree

Showing 75 changed files with 1,504 additions and 1,290 deletions.
diff --git a/assets/resource/image/Armada/ArmadaPageFlag.png b/assets/resource/image/Armada/ArmadaPageFlag.png
diff --git a/...ge/Armada/ReceivedContributionRewards.png → ...age/Armada/ClaimedContributionRewards.png b/...ge/Armada/ReceivedContributionRewards.png → ...age/Armada/ClaimedContributionRewards.png
diff --git a/assets/resource/image/Armada/CommissionsPageFlag.png b/assets/resource/image/Armada/CommissionsPageFlag.png
diff --git a/...e/image/Armada/ArmadaPrizePoolReceive.png → .../image/Armada/CommissionsRewardsClaim.png b/...e/image/Armada/ArmadaPrizePoolReceive.png → .../image/Armada/CommissionsRewardsClaim.png
diff --git a/...ada/ArmadaPrizePoolViewLastAssignment.png → ...da/CommissionsRewardsLastDistribution.png b/...ada/ArmadaPrizePoolViewLastAssignment.png → ...da/CommissionsRewardsLastDistribution.png
diff --git a/assets/resource/image/Armada/CommissionsRewardsPageFlag.png b/assets/resource/image/Armada/CommissionsRewardsPageFlag.png
diff --git a/...wards/CombatMissionOneClickCollection.png → ...rce/image/Awards/BPMissionsQuickClaim.png b/...wards/CombatMissionOneClickCollection.png → ...rce/image/Awards/BPMissionsQuickClaim.png
diff --git a/...Awards/DailyPracticeRewardsNotReceive.png → ...urce/image/Awards/DailyBPRewardsClaim.png b/...Awards/DailyPracticeRewardsNotReceive.png → ...urce/image/Awards/DailyBPRewardsClaim.png
diff --git a/...e/image/Awards/DailyPracticeRewardsOk.png → ...ce/image/Awards/DailyBPRewardsClaimed.png b/...e/image/Awards/DailyPracticeRewardsOk.png → ...ce/image/Awards/DailyBPRewardsClaimed.png
diff --git a/...ge/Awards/DailyPracticeRewardsPreview.png → ...ce/image/Awards/DailyBPRewardsPreview.png b/...ge/Awards/DailyPracticeRewardsPreview.png → ...ce/image/Awards/DailyBPRewardsPreview.png
diff --git a/...e/image/Awards/NoDailyPracticeRewards.png → ...ource/image/Awards/NoneDailyBPRewards.png b/...e/image/Awards/NoDailyPracticeRewards.png → ...ource/image/Awards/NoneDailyBPRewards.png
diff --git a/...esource/image/Homeland/CloseCollectAP.png → ...ts/resource/image/Dorm/CloseCollectAP.png b/...esource/image/Homeland/CloseCollectAP.png → ...ts/resource/image/Dorm/CloseCollectAP.png
diff --git a/assets/resource/image/Homeland/CollectAP.png → assets/resource/image/Dorm/CollectAP.png b/assets/resource/image/Homeland/CollectAP.png → assets/resource/image/Dorm/CollectAP.png
diff --git a/...source/image/Homeland/CollectAPButton.png → ...s/resource/image/Dorm/CollectAPButton.png b/...source/image/Homeland/CollectAPButton.png → ...s/resource/image/Dorm/CollectAPButton.png
diff --git a/...s/resource/image/Homeland/CollectGold.png → assets/resource/image/Dorm/CollectGold.png b/...s/resource/image/Homeland/CollectGold.png → assets/resource/image/Dorm/CollectGold.png
diff --git a/...esource/image/Homeland/CollectGoldMax.png → ...ts/resource/image/Dorm/CollectGoldMax.png b/...esource/image/Homeland/CollectGoldMax.png → ...ts/resource/image/Dorm/CollectGoldMax.png
diff --git a/assets/resource/image/Homeland/Confirm.png → assets/resource/image/Dorm/Confirm.png b/assets/resource/image/Homeland/Confirm.png → assets/resource/image/Dorm/Confirm.png
diff --git a/assets/resource/image/Dorm/ErrandsPageFlag.png b/assets/resource/image/Dorm/ErrandsPageFlag.png
diff --git a/.../resource/image/Homeland/QuestRefresh.png → ...ts/resource/image/Dorm/ErrandsRefresh.png b/.../resource/image/Homeland/QuestRefresh.png → ...ts/resource/image/Dorm/ErrandsRefresh.png
diff --git a/...s/resource/image/Homeland/QuestUnfold.png → assets/resource/image/Dorm/ErrandsUnfold.png b/...s/resource/image/Homeland/QuestUnfold.png → assets/resource/image/Dorm/ErrandsUnfold.png
diff --git a/assets/resource/image/Homeland/NextQuest.png → assets/resource/image/Dorm/NextErrands.png b/assets/resource/image/Homeland/NextQuest.png → assets/resource/image/Dorm/NextErrands.png
diff --git a/...ource/image/Homeland/OneClickDispatch.png → assets/resource/image/Dorm/QuickDispatch.png b/...ource/image/Homeland/OneClickDispatch.png → assets/resource/image/Dorm/QuickDispatch.png
diff --git a/...ts/resource/image/Homeland/StartQuest.png → assets/resource/image/Dorm/StartErrands.png b/...ts/resource/image/Homeland/StartQuest.png → assets/resource/image/Dorm/StartErrands.png
diff --git a/...urce/image/StorySweep/StartStorySweep.png → .../resource/image/Dorm/StartExpeditions.png b/...urce/image/StorySweep/StartStorySweep.png → .../resource/image/Dorm/StartExpeditions.png
diff --git a/...image/StorySweep/SwitchToFragmentPage.png → ...ource/image/Dorm/SwitchToFragmentPage.png b/...image/StorySweep/SwitchToFragmentPage.png → ...ource/image/Dorm/SwitchToFragmentPage.png
diff --git a/...image/StorySweep/SwitchToMaterialPage.png → ...ource/image/Dorm/SwitchToMaterialPage.png b/...image/StorySweep/SwitchToMaterialPage.png → ...ource/image/Dorm/SwitchToMaterialPage.png
diff --git a/...e/image/MaterialEvent/BurdenReduction.png → assets/resource/image/MaterialEvent/LITE.png b/...e/image/MaterialEvent/BurdenReduction.png → assets/resource/image/MaterialEvent/LITE.png
diff --git a/assets/resource/image/MaterialEvent/MaterialEventFlag.png b/assets/resource/image/MaterialEvent/MaterialEventFlag.png
diff --git a/...MaterialEvent/OneClickBurdenReduction.png → ...esource/image/MaterialEvent/QuickLITE.png b/...MaterialEvent/OneClickBurdenReduction.png → ...esource/image/MaterialEvent/QuickLITE.png
diff --git a/.../image/Armada/EnterArmadaContribution.png → ...gation/Armada/EnterArmadaContribution.png b/.../image/Armada/EnterArmadaContribution.png → ...gation/Armada/EnterArmadaContribution.png
diff --git a/...mage/Armada/EnterCommissionedRecovery.png → ...avigation/Armada/EnterCommissionsPage.png b/...mage/Armada/EnterCommissionedRecovery.png → ...avigation/Armada/EnterCommissionsPage.png
diff --git a/...ce/image/MaterialEvent/AttackPageFlag.png → ...avigation/Attack/EnterAttackEventPage.png b/...ce/image/MaterialEvent/AttackPageFlag.png → ...avigation/Attack/EnterAttackEventPage.png
diff --git a/...mage/MaterialEvent/EnterMaterialEvent.png → ...tackEvent/EnterMaterialExpeditionPage.png b/...mage/MaterialEvent/EnterMaterialEvent.png → ...tackEvent/EnterMaterialExpeditionPage.png
diff --git a/assets/resource/image/Navigation/ChallengeEvent/EnterUniversalMiragePage.png b/assets/resource/image/Navigation/ChallengeEvent/EnterUniversalMiragePage.png
diff --git a/...image/Armada/EnterArmadaPrizePoolPage.png → ...mmissions/EnterCommissionsRewardsPage.png b/...image/Armada/EnterArmadaPrizePoolPage.png → ...mmissions/EnterCommissionsRewardsPage.png
diff --git a/...ts/resource/image/Homeland/EnterQuest.png → ...mage/Navigation/Dorm/EnterErrandsPage.png b/...ts/resource/image/Homeland/EnterQuest.png → ...mage/Navigation/Dorm/EnterErrandsPage.png
diff --git a/...urce/image/StorySweep/EnterStorySweep.png → .../Navigation/Dorm/EnterExpeditionsPage.png b/...urce/image/StorySweep/EnterStorySweep.png → .../Navigation/Dorm/EnterExpeditionsPage.png
diff --git a/...ource/image/MaterialEvent/EnterAttack.png → ...image/Navigation/Home/EnterAttackPage.png b/...ource/image/MaterialEvent/EnterAttack.png → ...image/Navigation/Home/EnterAttackPage.png
diff --git a/...s/resource/image/Shop/EnterSupplyPage.png → ...image/Navigation/Home/EnterSupplyPage.png b/...s/resource/image/Shop/EnterSupplyPage.png → ...image/Navigation/Home/EnterSupplyPage.png
diff --git a/...erialEvent/MaterialActivitiesPageFlag.png → ...rialExpedition/EnterMaterialEventPage.png b/...erialEvent/MaterialActivitiesPageFlag.png → ...rialExpedition/EnterMaterialEventPage.png
diff --git a/...ce/image/Awards/CombatMissionPageFlag.png → ...vigation/Missions/EnterBPMissionsPage.png b/...ce/image/Awards/CombatMissionPageFlag.png → ...vigation/Missions/EnterBPMissionsPage.png
diff --git a/...urce/image/Shop/EnterActivityShopPage.png → ...Navigation/Shop/EnterActivityShopPage.png b/...urce/image/Shop/EnterActivityShopPage.png → ...Navigation/Shop/EnterActivityShopPage.png
diff --git a/...ource/image/Shop/EnterMirageStorePage.png → .../Navigation/Shop/EnterMirageStorePage.png b/...ource/image/Shop/EnterMirageStorePage.png → .../Navigation/Shop/EnterMirageStorePage.png
diff --git a/assets/resource/image/Shop/EnterShopPage.png → ...image/Navigation/Supply/EnterShopPage.png b/assets/resource/image/Shop/EnterShopPage.png → ...image/Navigation/Supply/EnterShopPage.png
diff --git a/assets/resource/image/Navigation/UniversalMirage/EnterBladeGravePage.png b/assets/resource/image/Navigation/UniversalMirage/EnterBladeGravePage.png
diff --git a/assets/resource/image/Navigation/UniversalMirage/EnterGlacialFencesPage.png b/assets/resource/image/Navigation/UniversalMirage/EnterGlacialFencesPage.png
diff --git a/assets/resource/image/Navigation/UniversalMirage/EnterIlluminatedLandPage.png b/assets/resource/image/Navigation/UniversalMirage/EnterIlluminatedLandPage.png
diff --git a/assets/resource/image/Navigation/UniversalMirage/EnterRoaringPalacePage.png b/assets/resource/image/Navigation/UniversalMirage/EnterRoaringPalacePage.png
diff --git a/assets/resource/image/Shop/DailyShopPageFlag.png b/assets/resource/image/Shop/DailyShopPageFlag.png
diff --git a/assets/resource/pipeline/armada.json b/assets/resource/pipeline/armada.json
diff --git a/assets/resource/pipeline/armada/armada.json 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"
+        ]
+    }
+}
diff --git a/assets/resource/pipeline/armada/commissions.json 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"
+        ]
+    }
+}