修复"演训"bug

MAWHA · Aug 2, 2024 · 87c1a17 · 87c1a17
1 parent ed08593
commit 87c1a17
Show file tree

Hide file tree

Showing 7 changed files with 605 additions and 487 deletions.
diff --git a/assets/resource/base/pipeline/10receivemail.json b/assets/resource/base/pipeline/10receivemail.json
@@ -1,22 +1,22 @@
 {
-    "Mail":{
-        "next":[
+    "Mail": {
+        "next": [
             "EnterMail"
         ]
     },
-    "EnterMail":{
-        "recognition":"TemplateMatch",
-        "template":"Mainpage/mail.png",
-        "action":"Click",
-        "next":[
+    "EnterMail": {
+        "recognition": "TemplateMatch",
+        "template": "Mainpage/mail.png",
+        "action": "Click",
+        "next": [
             "ReceiveMail"
         ]
     },
-    "ReceiveMail":{
-        "recognition":"OCR",
-        "expected":"全部",
-        "action":"Click",
-        "next":[
+    "ReceiveMail": {
+        "recognition": "OCR",
+        "expected": "全部",
+        "action": "Click",
+        "next": [
             "Quit"
         ]
     }

diff --git a/assets/resource/base/pipeline/3_dispath_company.json b/assets/resource/base/pipeline/3_dispath_company.json
@@ -20,6 +20,7 @@
     },
     "dispath_company_collect": {
         "next": [
+            "entry_dispath_one",
             "dispatch_social_one",
             "dispatch_social_tow",
             "dispatch_social_three",

diff --git a/assets/resource/base/pipeline/4_dailybonus.json b/assets/resource/base/pipeline/4_dailybonus.json
@@ -1,63 +1,66 @@
 {
-    "business_kiosk":{
-        "next":[
+    "business_kiosk": {
+        "next": [
             "shangting",
             "libao",
             "richang",
             "donggu",
             "Quit"
         ]
     },
-    "shangting":{
-        "recognition":"OCR",
-        "expected":"商亭",
-        "action":"Click",
-        "next":[
+    "shangting": {
+        "recognition": "OCR",
+        "expected": "商亭",
+        "action": "Click",
+        "next": [
             "libao"
         ]
     },
-    "libao":{
-        "recognition":"OCR",
-        "expected":"礼包",
-        "action":"Click",
-        "next":[
+    "libao": {
+        "recognition": "OCR",
+        "expected": "礼包",
+        "action": "Click",
+        "next": [
             "richang"
         ]
     },
-    "richang":{
-        "recognition":"OCR",
-        "expected":"日常",
-        "action":"Click",
-        "next":[
+    "richang": {
+        "recognition": "OCR",
+        "expected": "日常",
+        "action": "Click",
+        "next": [
             "donggu"
         ]
     },
-    "donggu":{
-        "recognition":"OCR",
-        "expected":"每日",
-        "action":"Click",
-        "target":[
-            365, 665, 0, 0
+    "donggu": {
+        "recognition": "OCR",
+        "expected": "每日",
+        "action": "Click",
+        "target": [
+            365,
+            665,
+            0,
+            0
         ],
-        "next":[
+        "next": [
             "goumai"
         ]
     },
-    "goumai":{
-        "recognition":"OCR",
-        "expected":"购买",
-        "action":"Click",
-        "post_delay":2000,
-        "next":[
+    "goumai": {
+        "recognition": "OCR",
+        "expected": "购买",
+        "action": "Click",
+        "post_delay": 2000,
+        "next": [
             "obtain1"
         ]
     },
-    "obtain1":{
-        "recognition":"OCR",
-        "expected":"获得物资",
-        "action":"Click",
-        "pre_wait_freezes":1000,
-        "next":[
+    "obtain1": {
+        "recognition": "OCR",
+        "expected": "获得物资",
+        "action": "Click",
+        "pre_wait_freezes": 1000,
+        "next": [
             "Quit"
         ]
     }

diff --git a/assets/resource/base/pipeline/5_Barter.json b/assets/resource/base/pipeline/5_Barter.json
@@ -1,6 +1,6 @@
 {
-    "Barter_random":{
-        "next":[
+    "Barter_random": {
+        "next": [
             "Barter",
             "random_one",
             "random_tow",
@@ -9,112 +9,130 @@
             "Quit"
         ]
     },
-    "Barter":{
-        "recognition":"OCR",
-        "expected":"易物所",
-        "action":"Click",
-        "post_delay":2000,
-        "next":[
+    "Barter": {
+        "recognition": "OCR",
+        "expected": "易物所",
+        "action": "Click",
+        "post_delay": 2000,
+        "next": [
             "random_one",
             "random_tow",
             "random_three",
             "random_four",
             "Quit"
         ]
     },
-    "random_one":{
-        "recognition":"TemplateMatch",
-        "template":"Shop/01.png",
-        "roi":[
-            295, 328, 53, 40
+    "random_one": {
+        "recognition": "TemplateMatch",
+        "template": "Shop/01.png",
+        "roi": [
+            295,
+            328,
+            53,
+            40
         ],
-        "action":"Click",
-        "post_delay":1000,
-        "next":[
+        "action": "Click",
+        "post_delay": 1000,
+        "next": [
             "max",
             "Quit"
         ]
     },
-    "random_tow":{
-        "recognition":"TemplateMatch",
-        "template":"Shop/01.png",
-        "roi":[
-            523, 328, 51, 42
+    "random_tow": {
+        "recognition": "TemplateMatch",
+        "template": "Shop/01.png",
+        "roi": [
+            523,
+            328,
+            51,
+            42
         ],
-        "action":"Click",
-        "post_delay":1000,
-        "next":[
+        "action": "Click",
+        "post_delay": 1000,
+        "next": [
             "max",
             "Quit"
         ]
     },
-    "random_three":{
-        "recognition":"TemplateMatch",
-        "template":"Shop/01.png",
-        "roi":[
-            756, 328, 46, 42
+    "random_three": {
+        "recognition": "TemplateMatch",
+        "template": "Shop/01.png",
+        "roi": [
+            756,
+            328,
+            46,
+            42
         ],
-        "action":"Click",
-        "post_delay":1000,
-        "next":[
+        "action": "Click",
+        "post_delay": 1000,
+        "next": [
             "max",
             "Quit"
         ]
     },
-    "random_four":{
-        "recognition":"TemplateMatch",
-        "template":"Shop/01.png",
-        "roi":[
-            981, 328, 62, 41
+    "random_four": {
+        "recognition": "TemplateMatch",
+        "template": "Shop/01.png",
+        "roi": [
+            981,
+            328,
+            62,
+            41
         ],
-        "action":"Click",
-        "post_delay":1000,
-        "next":[
+        "action": "Click",
+        "post_delay": 1000,
+        "next": [
             "max",
             "Quit"
         ]
     },
-    "max":{
-        "recognition":"OCR",
-        "expected":"最大",
-        "action":"Click",
-        "next":[
+    "max": {
+        "recognition": "OCR",
+        "expected": "最大",
+        "action": "Click",
+        "next": [
             "purchase",
             "Quit"
         ]
     },
-    "purchase":{
-        "recognition":"TemplateMatch",
-        "template":"Shop/02.png",
-        "roi":[
-            570, 447, 54, 51
+    "purchase": {
+        "recognition": "TemplateMatch",
+        "template": "Shop/02.png",
+        "roi": [
+            570,
+            447,
+            54,
+            51
         ],
-        "action":"Click",
-        "post_delay":2000,
-        "next":[
+        "action": "Click",
+        "post_delay": 2000,
+        "next": [
             "no_money",
             "obtain",
             "Quit"
         ]
     },
-    "no_money":{
-        "recognition":"OCR",
-        "expected":"没有足够",
-        "action":"Click",
-        "post_delay":1000,
-        "target":[
-            720, 120, 0, 0
+    "no_money": {
+        "recognition": "OCR",
+        "expected": "没有足够",
+        "action": "Click",
+        "post_delay": 1000,
+        "target": [
+            720,
+            120,
+            0,
+            0
         ],
-        "next":[
+        "next": [
             "Quit"
         ]
     },
-    "obtain":{
-        "recognition":"OCR",
-        "expected":"获得物资",
-        "action":"Click",
-        "pre_wait_freezes":2000,
-        "next":[
+    "obtain": {
+        "recognition": "OCR",
+        "expected": "获得物资",
+        "action": "Click",
+        "pre_wait_freezes": 2000,
+        "next": [
             "random_one",
             "random_tow",
             "random_three",