修bug

MAWHA · Sep 28, 2024 · 0e79de8 · 0e79de8
1 parent fd079aa
commit 0e79de8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 26 deletions.
diff --git a/assets/resource_picli/base/pipeline/11_(02)_snowscape.json b/assets/resource_picli/base/pipeline/11_(02)_snowscape.json
@@ -286,8 +286,8 @@
         ]
     },
     "without_two": {
-        "recognition": "TemplateMatch",
-        "template": "Research/111.png",
+        "recognition": "OCR",
+        "expected": "中途退出",
         "action": "Click",
         "target": [
             770,
@@ -297,7 +297,9 @@
         ],
         "post_wait_freezes": 2000,
         "next": [
-            "without_three"
+            "without_three",
+            "descending_four",
+            "upgrade_four"
         ]
     },
     "without_three": {

diff --git a/assets/resource_picli/base/pipeline/3_(7)combine.json b/assets/resource_picli/base/pipeline/3_(7)combine.json
@@ -50,34 +50,34 @@
             "combine-choose"
         ]
     },
-    "combine-choose":{
-        "next":[
+    "combine-choose": {
+        "next": [
             "combine-chair",
             "combine-dynasty",
             "combine-ship"
         ]
     },
-    "combine-chair":{
-        "recognition":"OCR",
-        "expected":"椅",
-        "action":"Click",
-        "next":[
+    "combine-chair": {
+        "recognition": "OCR",
+        "expected": "椅",
+        "action": "Click",
+        "next": [
             "combine-game"
         ]
     },
-    "combine-dynasty":{
-        "recognition":"OCR",
-        "expected":"朝代",
-        "action":"Click",
-        "next":[
+    "combine-dynasty": {
+        "recognition": "OCR",
+        "expected": "朝代",
+        "action": "Click",
+        "next": [
             "combine-game"
         ]
     },
-    "combine-ship":{
-        "recognition":"OCR",
-        "expected":"船",
-        "action":"Click",
-        "next":[
+    "combine-ship": {
+        "recognition": "OCR",
+        "expected": "船",
+        "action": "Click",
+        "next": [
             "combine-game"
         ]
     },
@@ -181,11 +181,11 @@
             "combine-challenge"
         ]
     },
-    "combine-return":{
-        "recognition":"TemplateMatch",
-        "template":"Company/return.png",
-        "action":"Click",
-        "next":[
+    "combine-return": {
+        "recognition": "TemplateMatch",
+        "template": "Company/return.png",
+        "action": "Click",
+        "next": [
             "combine-home"
         ]
     },

diff --git a/assets/resource_picli/base/pipeline/3_(8)blueprint.json b/assets/resource_picli/base/pipeline/3_(8)blueprint.json
@@ -43,7 +43,8 @@
             160
         ],
         "next": [
-            "blueprint-Receive"
+            "blueprint-Receive",
+            "combine-home"
         ]
     },
     "blueprint-Receive": {