Merge pull request #26 from LBEILC/dev

feat: 获取物品添加延迟，删除夏活任务，模拟军演添加刷新阈值
MaaXYZ · Oct 15, 2024 · 14e129f · 14e129f
2 parents cd121da + 9a239a3
commit 14e129f
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 17 deletions.
diff --git a/assets/interface.json b/assets/interface.json
@@ -36,13 +36,12 @@
                 "作战关卡"
             ]
         },
-        {
-            "name": "夏日活动",
-            "entry": "夏活"
-        },
         {
             "name": "模拟军演",
             "entry": "模拟军演",
+            "option": [
+                "刷新战力阈值"
+            ],
             "pipeline_override": {
                 "首页_出击": {
                     "next": "模拟军演_入口"
@@ -319,6 +318,42 @@
                     }
                 }
             ]
+        },
+        "刷新战力阈值": {
+            "cases": [
+                {
+                    "name": "5000",
+                    "pipeline_override": {
+                        "模拟军演_刷新对手": {
+                            "expected": "^([5-9]\\d{3}|[1-9]\\d{4})$"
+                        }
+                    }
+                },
+                {
+                    "name": "10000",
+                    "pipeline_override": {
+                        "模拟军演_刷新对手": {
+                            "expected": "^[1-9]\\d{4}$"
+                        }
+                    }
+                },
+                {
+                    "name": "20000",
+                    "pipeline_override": {
+                        "模拟军演_刷新对手": {
+                            "expected": "^([2-9]\\d{4})$"
+                        }
+                    }
+                },
+                {
+                    "name": "30000",
+                    "pipeline_override": {
+                        "模拟军演_刷新对手": {
+                            "expected": "^([3-9]\\d{4})$"
+                        }
+                    }
+                }
+            ]
         }
     }
-}
+}
diff --git a/assets/resource/base/pipeline/rehearsal.json b/assets/resource/base/pipeline/rehearsal.json
@@ -48,17 +48,11 @@
     },
     "模拟军演_刷新对手": {
         "recognition": "OCR",
-        "expected": [
-            "1",
-            "2",
-            "3",
-            "4",
-            "5"
-        ],
+        "expected": "^[1-9]\\d{4}$",
         "roi": [
-            341,
+            330,
             315,
-            23,
+            92,
             29
         ],
         "action": "Click",
@@ -201,4 +195,4 @@
         ],
         "action": "Click"
     }
-}
+}
diff --git a/assets/resource/base/pipeline/utils.json b/assets/resource/base/pipeline/utils.json
@@ -101,7 +101,8 @@
       405,
       117
     ],
-    "action": "Click"
+    "action": "Click",
+    "post_delay": 1000
   },
   "子任务_点击返回": {
     "is_sub": true,
@@ -142,4 +143,4 @@
     ],
     "action": "Click"
   }
-}
+}