From 38287fa9c88d866d3fa65b1bcd5aeacd6fa1d06c Mon Sep 17 00:00:00 2001
From: relax <112117216+liusuan233@users.noreply.github.com>
Date: Sat, 13 Jul 2024 18:11:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E6=97=A0=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E4=BF=A1=E6=8B=9B=E5=8B=9F=E9=A1=B5=E9=9D=A2=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/pipeline/2_collect_operators.json    | 319 +++++++++---------
 1 file changed, 165 insertions(+), 154 deletions(-)

diff --git a/assets/resource/base/pipeline/2_collect_operators.json b/assets/resource/base/pipeline/2_collect_operators.json
index 4077564..b0066d1 100644
--- a/assets/resource/base/pipeline/2_collect_operators.json
+++ b/assets/resource/base/pipeline/2_collect_operators.json
@@ -1,154 +1,165 @@
-{
-    "Collect_operators": {
-        "next": [
-            "Collecting",
-            "Sub_ReceiveOperators"
-        ]
-    },
-    "Collecting":{
-        "recognition":"OCR",
-        "expected":"器者征集",
-        "action":"Click",
-        "next":[
-            "Sub_ReceiveOperators",
-            "ReceiveCollect"
-        ]
-    },
-    "Sub_ReceiveOperators":{
-        "recognition":"TemplateMatch",
-        "template":"Collect/02.png",
-        "action":"Click",
-        "next":[
-            "ReceiveCollect"
-        ]
-    },
-    "ReceiveCollect":{
-        "recognition":"OCR",
-        "expected":"全部",
-        "action":"Click",
-        "next":[
-            "changan",
-            "quit2"
-        ]
-    },
-    "changan":{
-        "recognition":"OCR",
-        "expected":"长按",
-        "action":"Swipe",
-        "begin":[
-            645, 635, 0, 0
-        ],
-        "end":[
-            645, 635, 0, 0
-        ],
-        "duration":3000,
-        "post_delay":3000,
-        "next":[
-            "Skip"
-        ]
-    },
-    "Skip":{
-        "recognition":"TemplateMatch",
-        "template":"Collect/05.png",
-        "action":"Click",
-        "post_delay":3000,
-        "next":[
-            "outcome"
-        ]
-    },
-    "outcome":{
-        "recognition":"OCR",
-        "expected":"征集结果",
-        "action":"Click",
-        "target":[
-            645, 625, 0, 0
-        ],
-        "next":[
-            "get"
-        ]
-    },
-    "get":{
-        "recognition":"OCR",
-        "expected":"获得物资",
-        "action":"Click",
-        "next":[
-            "Collecting2",
-            "back"
-        ]
-    },
-    "quit2":{
-        "recognition":"OCR",
-        "expected":"当前没有已经完成的征集队列",
-        "next":[
-            "back"
-        ]
-    },
-    "back":{
-        "action":"Click",
-        "target":[
-            330, 360, 0, 0
-        ],
-        "next":[
-            "Collecting2"
-        ]
-    },
-    "Collecting2":{
-        "recognition":"OCR",
-        "expected":"开始征集",
-        "action":"Click",
-        "next":[
-            "jia"
-        ]
-    },
-    "jia":{
-        "recognition":"TemplateMatch",
-        "template":"Collect/03.png",
-        "action":"Click",
-        "target":[
-            770, 350, 0, 0
-        ],
-        "next":[
-            "jia2"
-        ]
-    },
-    "jia2":{
-        "action":"Click",
-        "target":[
-            770, 350, 0, 0
-        ],
-        "next":[
-            "jia3"
-        ]
-    },
-    "jia3":{
-        "action":"Click",
-        "target":[
-            770, 350, 0, 0
-        ],
-        "next":[
-            "jia4"
-        ]
-    },
-    "jia4":{
-        "action":"Click",
-        "target":[
-            770, 350, 0, 0
-        ],
-        "next":[
-            "gou"
-        ]
-    },
-    "gou":{
-        "recognition":"TemplateMatch",
-        "template":"Collect/04.png",
-        "action":"Click",
-        "next":[
-            "Quit"
-        ]
-    },
-    "Quit":{
-        "recognition":"TemplateMatch",
-        "template":"Collect/06.png",
-        "action":"Click"
-    }
-}
+{
+    "Collect_operators": {
+        "next": [
+            "Collecting",
+            "Sub_ReceiveOperators"
+        ]
+    },
+    "Collecting":{
+        "recognition":"OCR",
+        "expected":"器者征集",
+        "action":"Click",
+        "next":[
+            "Sub_ReceiveOperators",
+            "ReceiveCollect"
+        ]
+    },
+    "Sub_ReceiveOperators":{
+        "recognition":"TemplateMatch",
+        "template":"Collect/02.png",
+        "action":"Click",
+        "next":[
+            "ReceiveCollect"
+        ]
+    },
+    "ReceiveCollect":{
+        "recognition":"OCR",
+        "expected":"全部",
+        "action":"Click",
+        "next":[
+            "changan",
+            "quit2"
+        ]
+    },
+    "changan":{
+        "recognition":"OCR",
+        "expected":"长按",
+        "action":"Swipe",
+        "begin":[
+            645, 635, 0, 0
+        ],
+        "end":[
+            645, 635, 0, 0
+        ],
+        "duration":3000,
+        "post_delay":3000,
+        "next":[
+            "Skip"
+        ]
+    },
+    "Skip":{
+        "recognition":"TemplateMatch",
+        "template":"Collect/05.png",
+        "action":"Click",
+        "post_delay":3000,
+        "next":[
+            "outcome"
+        ]
+    },
+    "outcome":{
+        "recognition":"OCR",
+        "expected":"征集结果",
+        "action":"Click",
+        "target":[
+            645, 625, 0, 0
+        ],
+        "next":[
+            "get"
+        ]
+    },
+    "get":{
+        "recognition":"OCR",
+        "expected":"获得物资",
+        "action":"Click",
+        "next":[
+            "Collecting2",
+            "back"
+        ]
+    },
+    "quit2":{
+        "recognition":"OCR",
+        "expected":"当前没有已经完成的征集队列",
+        "next":[
+            "back"
+        ]
+    },
+    "back":{
+        "action":"Click",
+        "target":[
+            330, 360, 0, 0
+        ],
+        "next":[
+            "Collecting2"
+        ]
+    },
+    "Collecting2":{
+        "recognition":"OCR",
+        "expected":"开始征集",
+        "action":"Click",
+        "next":[
+            "jia",
+            "no_solicitation"
+        ]
+    },
+    "no_solicitation":{
+        "recognition":"OCR",
+        "expected":"缺少道具",
+        "action":"Click",
+        "next":[
+            "Quit"
+        ]
+    },
+
+
+    "jia":{
+        "recognition":"TemplateMatch",
+        "template":"Collect/03.png",
+        "action":"Click",
+        "target":[
+            770, 350, 0, 0
+        ],
+        "next":[
+            "jia2"
+        ]
+    },
+    "jia2":{
+        "action":"Click",
+        "target":[
+            770, 350, 0, 0
+        ],
+        "next":[
+            "jia3"
+        ]
+    },
+    "jia3":{
+        "action":"Click",
+        "target":[
+            770, 350, 0, 0
+        ],
+        "next":[
+            "jia4"
+        ]
+    },
+    "jia4":{
+        "action":"Click",
+        "target":[
+            770, 350, 0, 0
+        ],
+        "next":[
+            "gou"
+        ]
+    },
+    "gou":{
+        "recognition":"TemplateMatch",
+        "template":"Collect/04.png",
+        "action":"Click",
+        "next":[
+            "Quit"
+        ]
+    },
+    "Quit":{
+        "recognition":"TemplateMatch",
+        "template":"Collect/06.png",
+        "action":"Click"
+    }
+}