fix: 深眠选择队伍问题 (#147)

现在与队伍名字无关，默认使用第一队和第二队
MaaXYZ · Jul 19, 2024 · 873b5ff · 873b5ff
1 parent 66a17cf
commit 873b5ff
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 39 deletions.
diff --git a/assets/interface.json b/assets/interface.json
@@ -34,7 +34,7 @@
             "entry": "Psychube"
         },
         {
-            "name": "自动深眠（配置一二队后再运行，队列名称默认）",
+            "name": "自动深眠（配置一二队后再运行）",
             "entry": "Limbo"
         },
         {
@@ -790,4 +790,4 @@
             ]
         }
     }
-}
+}
diff --git a/assets/resource/base/image/Limbo/LimboTeamList_Off.png b/assets/resource/base/image/Limbo/LimboTeamList_Off.png
diff --git a/assets/resource/base/image/Limbo/LimboTeamList_Open.png b/assets/resource/base/image/Limbo/LimboTeamList_Open.png
diff --git a/assets/resource/base/pipeline/limbo.json b/assets/resource/base/pipeline/limbo.json
@@ -166,13 +166,14 @@
         ]
     },
     "LimboTeamSelection_1": {
-        "recognition": "OCR",
-        "expected": "成员队列",
+        "recognition": "TemplateMatch",
+        "template": "Limbo/LimboTeamList_Off.png",
+        "threshold": 0.9,
         "roi": [
-            786,
+            940,
             631,
-            156,
-            43
+            48,
+            48
         ],
         "action": "Click",
         "next": [
@@ -182,22 +183,21 @@
     },
     "LimboTeamSelection_11": {
         "recognition": "TemplateMatch",
-        "template": [
-            "Limbo/LimboTeamSelection_11.png",
-            "Limbo/LimboTeamSelection_12.png"
-        ],
-        "order_by": "Score",
-        "threshold": [
-            0.9,
-            0.9
-        ],
+        "template": "Limbo/LimboTeamList_Open.png",
+        "threshold": 0.9,
         "roi": [
-            722,
-            342,
-            272,
-            219
+            940,
+            631,
+            48,
+            48
         ],
         "action": "Click",
+        "target": [
+            840,
+            406,
+            48,
+            30
+        ],
         "next": [
             "LimboAction_1",
             "LimboTeamSelection_11"
@@ -276,13 +276,14 @@
         ]
     },
     "LimboTeamSelection_2": {
-        "recognition": "OCR",
-        "expected": "成员队列",
+        "recognition": "TemplateMatch",
+        "template": "Limbo/LimboTeamList_Off.png",
+        "threshold": 0.9,
         "roi": [
-            786,
+            940,
             631,
-            156,
-            43
+            48,
+            48
         ],
         "action": "Click",
         "next": [
@@ -292,22 +293,21 @@
     },
     "LimboTeamSelection_22": {
         "recognition": "TemplateMatch",
-        "template": [
-            "Limbo/LimboTeamSelection_21.png",
-            "Limbo/LimboTeamSelection_22.png"
-        ],
-        "order_by": "Score",
-        "threshold": [
-            0.9,
-            0.9
-        ],
+        "template": "Limbo/LimboTeamList_Open.png",
+        "threshold": 0.9,
         "roi": [
-            722,
-            342,
-            272,
-            219
+            940,
+            631,
+            48,
+            48
         ],
         "action": "Click",
+        "target": [
+            837,
+            463,
+            48,
+            35
+        ],
         "next": [
             "LimboAction_2",
             "LimboTeamSelection_22"
@@ -429,4 +429,4 @@
         ],
         "next": []
     }
-}
+}