From 873b5ff67b595dee4cbf55c88951fc654e56f64a Mon Sep 17 00:00:00 2001
From: Tohkahb <95140985+Tohkahb@users.noreply.github.com>
Date: Fri, 19 Jul 2024 15:33:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=B1=E7=9C=A0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=98=9F=E4=BC=8D=E9=97=AE=E9=A2=98=20(#147)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

现在与队伍名字无关，默认使用第一队和第二队
---
 assets/interface.json                         |   4 +-
 .../base/image/Limbo/LimboTeamList_Off.png    | Bin 0 -> 484 bytes
 .../base/image/Limbo/LimboTeamList_Open.png   | Bin 0 -> 488 bytes
 assets/resource/base/pipeline/limbo.json      |  74 +++++++++---------
 4 files changed, 39 insertions(+), 39 deletions(-)
 create mode 100644 assets/resource/base/image/Limbo/LimboTeamList_Off.png
 create mode 100644 assets/resource/base/image/Limbo/LimboTeamList_Open.png

diff --git a/assets/interface.json b/assets/interface.json
index 7e7c1eb..8e62824 100644
--- a/assets/interface.json
+++ b/assets/interface.json
@@ -34,7 +34,7 @@
             "entry": "Psychube"
         },
         {
-            "name": "自动深眠（配置一二队后再运行，队列名称默认）",
+            "name": "自动深眠（配置一二队后再运行）",
             "entry": "Limbo"
         },
         {
@@ -790,4 +790,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/assets/resource/base/image/Limbo/LimboTeamList_Off.png b/assets/resource/base/image/Limbo/LimboTeamList_Off.png
new file mode 100644
index 0000000000000000000000000000000000000000..700b2653d158aec4c121cf89e6e8a0e5d8cbb6c4
GIT binary patch
literal 484
zcmV<A0UQ2_P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$o=HSOR5(v#)X>ndXJBA(V4xCU)X>nVXJlk-pptnE17o0}zAgg;!#{@e7q1fZ
z2tgNeb8|7|W~YD+nmlz5!`H9h@ES_cKx<1=hRE<h1|}v3h9%3^GaNf{ntTH}I5-$u
z8p;@WczD2ueEIT)p}why;p;ctuEgm=CMG6^h_FBgI~#Kp7acf!oMF}KjST<({ln@~
zoCZoth%powWWZeq(+zTE?}V8Q&tJSG-aufwWQdInW3aL^#;WPWsk00V7Of=SKwTY8
zhRn2B1|}vJteXD)`@=A0`a*_l*KcCTV|W=95k&=Q4019ucw_UygC`6Vrp#ja@#6=I
zIt&9%P4pQO<HB*e4yGIA%K3{{Gn_ti9=CxU9PA7=75NMzA|eEH1W3WFH*Xl)J0~%G
z|Bi4aiVFk$JQ+OP9EmavrfBcJ!wjp}ZHDWC8z?R=%21e}${@feK$3wUK73%9FnJEc
zi<hs!`rrnJhXpb?+F6oh7)<e@!zUS*tz3&R(8SoFAvGzQEW==$X3Sp5aN*+B0V)qk
aaXJ7S42>ERTjZnw0000<MNUMnLSTZM62}_=

literal 0
HcmV?d00001

diff --git a/assets/resource/base/image/Limbo/LimboTeamList_Open.png b/assets/resource/base/image/Limbo/LimboTeamList_Open.png
new file mode 100644
index 0000000000000000000000000000000000000000..31bdd69f8f2c45643c8c0fc4bba64ea86cc4a709
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000;O000yS1^@s6m$m(a00001b5ch_0Itp)
z=>Px$qDe$SR7gu>)Ya9s|NHl^0|Si!qn4IdJtHGy1C7jQpq~X%5y1>LR;Cnr<iO$M
z469aeL@@*I19o<HhV1l21{D<rvMjlG?*YT4Y4aF<{rZL70+6VZqC7)hb|M2C8wW|2
z{QC8WVaoKm40rC{$Iyoo2P`Zs3`q$Q3<i2SBw29f$_<8D^A<Dw`STaQ1t3{T32}z<
zl3WHhHWs2R0lB_s!c>MQPo85{k2MwfdAl=sxH}SM!H!+~88&U%iBm0B3xtFO8H)1K
z8H9uc@LKZb%?E}FQ)V)}d-t9+3qYztJ^=XyAK18gJHyW12l1-GnbBBTSr|%-a~Nc#
zB(NIr?AZ&3mW~MogAs2|*3wXANK1*wh;UHE&YriJ;p(-Ulv%*e#>SAD7RR8brh;P7
zjT?6uX3SZHk*ToRMzAcBk&$GmD$7UF+tEFl;nCx#1YHkOK+pn^qR<du21h$<uz~vz
z9%Wd)b~90i6K#Q*m<U5&Rtf_H69dDf$#WQ9y?#So3qYp%`?xdwXJEjasmO{0qMeFE
eAyIKai6sCYOpTJ4jiIIh0000<MNUMnLSTX<DbR%g

literal 0
HcmV?d00001

diff --git a/assets/resource/base/pipeline/limbo.json b/assets/resource/base/pipeline/limbo.json
index e76acc2..89f4115 100644
--- 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": []
     }
-}
\ No newline at end of file
+}