Merge pull request #30 from Htgs/fix/task_20250112

fix： 1.每日探索-星币 2.模拟军演 3.基建 4.周本-第一关（第5关我的号打不过） 5.领取奖励-邮箱
MaaXYZ · Jan 12, 2025 · a7c5afc · a7c5afc
2 parents 2eee16f + 62c333c
commit a7c5afc
Show file tree

Hide file tree

Showing 14 changed files with 855 additions and 705 deletions.
diff --git a/.gitignore b/.gitignore
@@ -447,4 +447,6 @@ install
 # Tools
 tools/ImageCropper/**/*.png
 
-config
+config
+
+lib
diff --git a/assets/interface.json b/assets/interface.json
@@ -64,7 +64,7 @@
             "entry": "WeekInstance",
             "pipeline_override": {
                 "首页_出击": {
-                    "next": "ActivityExploration"
+                    "next": "ActivityExploration_fifth_ep"
                 }
             },
             "option": [
@@ -282,38 +282,16 @@
                 {
                     "name": "第一关45微晶",
                     "pipeline_override": {
-                        "ActivityExploration_2": {
-                            "next": [
-                                "ActivityExploration_3",
-                                "ActivityExploration_SwipeUp",
-                                "ActivityExploration_2"
-                            ]
-                        },
-                        "ActivityExploration_CombatEnd3": {
-                            "next": [
-                                "子任务_获得物品",
-                                "ActivityExploration_3",
-                                "ActivityExploration_CombatEnd3"
-                            ]
+                        "首页_出击": {
+                            "next": "ActivityExploration_first_ep"
                         }
                     }
                 },
                 {
                     "name": "第五关120微晶",
                     "pipeline_override": {
-                        "ActivityExploration_2": {
-                            "next": [
-                                "ActivityExploration_第五关",
-                                "ActivityExploration_SwipeDown",
-                                "ActivityExploration_2"
-                            ]
-                        },
-                        "ActivityExploration_CombatEnd3": {
-                            "next": [
-                                "子任务_获得物品",
-                                "ActivityExploration_第五关",
-                                "ActivityExploration_CombatEnd3"
-                            ]
+                        "首页_出击": {
+                            "next": "ActivityExploration_fifth_ep"
                         }
                     }
                 }

diff --git a/assets/resource/base/image/StartUp/CloseOneYear.png b/assets/resource/base/image/StartUp/CloseOneYear.png
diff --git a/assets/resource/base/image/StartUp/NoMail.png b/assets/resource/base/image/StartUp/NoMail.png
diff --git a/assets/resource/base/pipeline/awards.json b/assets/resource/base/pipeline/awards.json
@@ -11,10 +11,10 @@
     "Mail": {
         "recognition": "ColorMatch",
         "roi": [
-            254,
-            14,
-            42,
-            27
+            1058,
+            27,
+            34,
+            35
         ],
         "method": 4,
         "lower": [
@@ -66,10 +66,10 @@
         "recognition": "TemplateMatch",
         "template": "StartUp/NoMail.png",
         "roi": [
-            259,
-            20,
-            24,
-            24
+            1060,
+            31,
+            30,
+            26
         ],
         "next": [
             "DailyTask",
@@ -80,10 +80,10 @@
         "recognition": "TemplateMatch",
         "template": "StartUp/DailyTask.png",
         "roi": [
-            1219,
-            394,
-            39,
-            35
+            686,
+            609,
+            62,
+            83
         ],
         "action": "Click",
         "next": [

diff --git a/assets/resource/base/pipeline/infrastructures.json b/assets/resource/base/pipeline/infrastructures.json
@@ -38,10 +38,10 @@
             "基地"
         ],
         "roi": [
-            1020,
-            619,
-            167,
-            93
+            606,
+            665,
+            42,
+            26
         ],
         "action": "Click",
         "post_delay": 3000,
@@ -1638,4 +1638,4 @@
             "Infr_行星指挥部_返回"
         ]
     }
-}
+}
diff --git a/assets/resource/base/pipeline/rehearsal.json b/assets/resource/base/pipeline/rehearsal.json
@@ -11,10 +11,10 @@
             "模拟军演"
         ],
         "roi": [
-            185,
-            282,
-            280,
-            174
+            256,
+            338,
+            113,
+            40
         ],
         "action": "Click",
         "next": [
@@ -25,21 +25,15 @@
     "模拟军演_二级入口": {
         "recognition": "OCR",
         "expected": [
-            "模拟军演"
+            "镜像竞技"
         ],
         "roi": [
-            483,
-            41,
-            358,
-            118
+            155,
+            405,
+            202,
+            56
         ],
         "action": "Click",
-        "target_offset": [
-            -10,
-            276,
-            20,
-            20
-        ],
         "next": [
             "模拟军演_刷新对手",
             "模拟军演_选择对手",

diff --git a/assets/resource/base/pipeline/startup.json b/assets/resource/base/pipeline/startup.json
@@ -8,6 +8,7 @@
             "子任务_点击取消",
             "子任务_点击确认",
             "子任务_关闭公告",
+            "关闭周年弹窗",
             "签到",
             "首页标志1",
             "开始游戏",
@@ -61,6 +62,7 @@
         "next": [
             "首页标志1",
             "子任务_关闭公告",
+            "关闭周年弹窗",
             "签到",
             "开始游戏"
         ]
@@ -131,5 +133,17 @@
         "is_sub": true,
         "action": "StartApp",
         "package": "com.megagame.crosscore/com.megagame.crosscore.extend.PhoneUtilActivity"
+    },
+    "关闭周年弹窗": {
+        "recognition": "TemplateMatch",
+        "template": "StartUp/CloseOneYear.png",
+        "roi": [
+            1143,
+            118,
+            36,
+            41
+        ],
+        "action": "Click",
+        "green_mask": true
     }
 }
diff --git a/assets/resource/base/pipeline/utils.json b/assets/resource/base/pipeline/utils.json
@@ -36,10 +36,10 @@
       "出击"
     ],
     "roi": [
-      1058,
-      159,
-      212,
-      123
+      1134,
+      603,
+      97,
+      51
     ],
     "action": "Click",
     "next_doc": "Set in code."
-Original file line number
+Diff line change
@@ Expand Up / @@ -447,4 +447,6 @@ install @@
     # Tools
     tools/ImageCropper/**/*.png
-    config
+    config
+    lib