fix: 适配游戏新UI

MaaXYZ · Nov 9, 2023 · 7073fd0 · 7073fd0
1 parent f71c023
commit 7073fd0
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 59 deletions.
diff --git a/assets/resource/image/Navigation/Attack/EnterAttackEventPage.png b/assets/resource/image/Navigation/Attack/EnterAttackEventPage.png
diff --git a/assets/resource/image/Navigation/Attack/EnterChallengeEventPage.png b/assets/resource/image/Navigation/Attack/EnterChallengeEventPage.png
diff --git a/assets/resource/image/Navigation/AttackEvent/EnterMaterialExpeditionPage.png b/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
diff --git a/assets/resource/image/Navigation/Home/EnterAttackPage.png b/assets/resource/image/Navigation/Home/EnterAttackPage.png
diff --git a/assets/resource/image/Navigation/Home/EnterSupplyPage.png b/assets/resource/image/Navigation/Home/EnterSupplyPage.png
diff --git a/assets/resource/image/StartUp/HomeFlag.png b/assets/resource/image/StartUp/HomeFlag.png
diff --git a/assets/resource/image/Utils/BackButton_1.png b/assets/resource/image/Utils/BackButton_1.png
diff --git a/assets/resource/image/Utils/HomeButton_1.png b/assets/resource/image/Utils/HomeButton_1.png
diff --git a/assets/resource/pipeline/navigation/attack_event_navigation.json b/assets/resource/pipeline/navigation/attack_event_navigation.json
@@ -5,11 +5,12 @@
         "recognition": "TemplateMatch",
         "template": "Navigation/AttackEvent/EnterMaterialExpeditionPage.png",
         "roi": [
-            903,
-            356,
-            366,
-            307
+            452,
+            574,
+            196,
+            130
         ],
-        "action": "Click"
+        "action": "Click",
+        "post_delay": 1500
     }
 }
diff --git a/assets/resource/pipeline/navigation/attack_navigation.json b/assets/resource/pipeline/navigation/attack_navigation.json
@@ -5,23 +5,25 @@
         "recognition": "TemplateMatch",
         "template": "Navigation/Attack/EnterAttackEventPage.png",
         "roi": [
-            0,
-            122,
-            135,
-            166
+            472,
+            33,
+            159,
+            135
         ],
-        "action": "Click"
+        "action": "Click",
+        "post_delay": 1500
     },
     "Sub_EnterChallengeEventPage": {
         "is_sub": true,
         "recognition": "TemplateMatch",
         "template": "Navigation/Attack/EnterChallengeEventPage.png",
         "roi": [
-            0,
-            309,
-            137,
-            170
+            647,
+            34,
+            162,
+            134
         ],
-        "action": "Click"
+        "action": "Click",
+        "post_delay": 1500
     }
 }
diff --git a/assets/resource/pipeline/navigation/challenge_event_navigation.json b/assets/resource/pipeline/navigation/challenge_event_navigation.json
@@ -5,10 +5,10 @@
         "recognition": "TemplateMatch",
         "template": "Navigation/ChallengeEvent/EnterUniversalMiragePage.png",
         "roi": [
-            646,
-            72,
-            264,
-            144
+            511,
+            541,
+            195,
+            132
         ],
         "action": "Click"
     }

diff --git a/assets/resource/pipeline/navigation/home_navigation.json b/assets/resource/pipeline/navigation/home_navigation.json
@@ -2,26 +2,26 @@
     "$schema": "../../pipeline.schema.json",
     "Sub_EnterAttackPage": {
         "is_sub": true,
-        "recognition": "TemplateMatch",
-        "template": "Navigation/Home/EnterAttackPage.png",
+        "recognition": "OCR",
+        "text": "出击",
         "roi": [
-            1025,
-            77,
-            167,
-            163
+            1082,
+            282,
+            192,
+            150
         ],
         "action": "Click",
         "post_delay": 1500
     },
     "Sub_EnterSupplyPage": {
         "is_sub": true,
-        "recognition": "TemplateMatch",
-        "template": "Navigation/Home/EnterSupplyPage.png",
+        "recognition": "OCR",
+        "text": "补给",
         "roi": [
-            1012,
-            389,
-            184,
-            140
+            1085,
+            510,
+            147,
+            126
         ],
         "action": "Click",
         "post_delay": 1500
@@ -33,10 +33,10 @@
             "舰团"
         ],
         "roi": [
-            879,
-            661,
-            54,
-            29
+            868,
+            611,
+            141,
+            109
         ],
         "action": "Click",
         "post_delay": 1500
@@ -48,9 +48,9 @@
             "家园"
         ],
         "roi": [
-            1005,
+            1071,
             610,
-            155,
+            141,
             110
         ],
         "action": "Click",
@@ -63,16 +63,16 @@
             "任务"
         ],
         "roi": [
-            92,
-            115,
-            54,
-            34
+            99,
+            89,
+            39,
+            23
         ],
         "target": [
-            30,
-            108,
-            40,
-            32
+            36,
+            83,
+            45,
+            36
         ],
         "action": "Click",
         "post_delay": 1500

diff --git a/assets/resource/pipeline/startup.json b/assets/resource/pipeline/startup.json
@@ -209,10 +209,10 @@
         "template": "StartUp/HomeFlag.png",
         "threshold": 0.8,
         "roi": [
-            1129,
-            584,
-            141,
-            136
+            1175,
+            599,
+            105,
+            121
         ]
     },
     "Sub_CollectDailyLoginReward": {

diff --git a/assets/resource/pipeline/utils.json b/assets/resource/pipeline/utils.json
@@ -3,14 +3,24 @@
     "Sub_BackButton": {
         "is_sub": true,
         "recognition": "TemplateMatch",
+        "green_mask": true,
         "template": [
-            "Utils/BackButton.png"
+            "Utils/BackButton.png",
+            "Utils/BackButton_1.png"
         ], 
         "roi": [
-            0,
-            0,
-            180,
-            133
+            [
+                0,
+                0,
+                180,
+                133
+            ],
+            [
+                60,
+                0,
+                124,
+                132
+            ]
         ],
         "action": "Click"
     },
@@ -31,14 +41,24 @@
     "Sub_HomeButton": {
         "is_sub": true,
         "recognition": "TemplateMatch",
+        "green_mask": true,
         "template": [
-            "Utils/HomeButton.png"
+            "Utils/HomeButton.png",
+            "Utils/HomeButton_1.png"
         ],
         "roi": [
-            126,
-            0,
-            212,
-            134
+            [
+                126,
+                0,
+                212,
+                134
+            ],
+            [
+                136,
+                0,
+                133,
+                132
+            ]
         ],
         "action": "Click"
     },