From e505881586a67c8be764ff331be7b11c05343e82 Mon Sep 17 00:00:00 2001
From: zzyyyl <aysyxx53@hotmail.com>
Date: Wed, 26 Oct 2022 19:38:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=20virtual=20task=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20Loading=20=E7=9B=B8=E5=85=B3=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json | 145 ++++++++++----------------------------------
 1 file changed, 32 insertions(+), 113 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index 22b2ab9a43..7b08a599b9 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -2155,6 +2155,25 @@
             "Main"
         ]
     },
+    "Loading": {
+        "algorithm": "OcrDetect",
+        "action": "DoNothing",
+        "text": [
+            "正在提交",
+            "反馈至神经"
+        ],
+        "roi": [
+            700,
+            600,
+            300,
+            120
+        ],
+        "next": [
+            "Loading",
+            "#next",
+            ""
+        ]
+    },
     "Loading2": {
         "Doc": "开始唤醒最后阶段的黑色正三角加载画面",
         "roi": [
@@ -2165,18 +2184,8 @@
         ],
         "next": [
             "Loading2",
-            "Main",
-            "ReturnTo",
-            "CloseAnno",
-            "FromStageSN",
-            "TodaysSupplies",
-            "OfflineConfirm",
-            "GameStart",
-            "StartToWakeUp",
-            "StartUpConnectingFlag",
-            "StartLoginBServer",
-            "BServerPrivacyPolicy",
-            "FromStageSN"
+            "#next",
+            ""
         ]
     },
     "ReturnTo": {
@@ -2950,29 +2959,7 @@
             255
         ],
         "next": [
-            "RecruitBeginLoading",
-            "RecruitBegin"
-        ]
-    },
-    "Loading": {
-        "algorithm": "OcrDetect",
-        "action": "DoNothing",
-        "text": [
-            "正在提交",
-            "反馈至神经"
-        ],
-        "roi": [
-            700,
-            600,
-            300,
-            120
-        ]
-    },
-    "RecruitBeginLoading": {
-        "baseTask": "Loading",
-        "next": [
-            "RecruitBeginLoading",
-            "Recruit@Main",
+            "RecruitBegin@Loading",
             "RecruitBegin"
         ]
     },
@@ -2987,16 +2974,7 @@
             420
         ],
         "next": [
-            "RecruitFinishLoading",
-            "RecruitFinish",
-            "RecruitSkip",
-            "RecruitSkipWithoutButton"
-        ]
-    },
-    "RecruitFinishLoading": {
-        "baseTask": "Loading",
-        "next": [
-            "RecruitFinishLoading",
+            "RecruitFinish@Loading",
             "RecruitFinish",
             "RecruitSkip",
             "RecruitSkipWithoutButton"
@@ -3679,17 +3657,10 @@
         ],
         "next": [
             "CreditShop-Bought",
-            "CreditShop-BuyIt-Loading",
+            "CreditShop-BuyIt@Loading",
             "CreditShop-NoMoney"
         ]
     },
-    "CreditShop-BuyIt-Loading": {
-        "baseTask": "Loading",
-        "next": [
-            "CreditShop-Bought",
-            "CreditShop-BuyIt-Loading"
-        ]
-    },
     "CreditShop-Bought": {
         "templThreshold": 0.7,
         "action": "ClickSelf",
@@ -3815,14 +3786,7 @@
         "preDelay": 500,
         "rearDelay": 500,
         "next": [
-            "RecruitLoading",
-            "SleepThenStop"
-        ]
-    },
-    "RecruitLoading": {
-        "baseTask": "Loading",
-        "next": [
-            "RecruitLoading",
+            "RecruitRefreshConfirm@Loading",
             "SleepThenStop"
         ]
     },
@@ -3879,14 +3843,7 @@
             80
         ],
         "next": [
-            "RecruitConfirmLoading",
-            "RecruitFlag"
-        ]
-    },
-    "RecruitConfirmLoading": {
-        "baseTask": "Loading",
-        "next": [
-            "RecruitConfirmLoading",
+            "RecruitConfirm@Loading",
             "RecruitFlag"
         ]
     },
@@ -4087,7 +4044,7 @@
             165
         ],
         "next": [
-            "DroneConfirmLoading",
+            "DroneConfirm@Loading",
             "DeliverableOrder",
             "DroneAssist-Trade-Stop",
             "DroneAssistMfg"
@@ -4103,15 +4060,6 @@
             162
         ]
     },
-    "DroneConfirmLoading": {
-        "baseTask": "Loading",
-        "next": [
-            "DroneConfirmLoading",
-            "DeliverableOrder",
-            "DroneAssist-Trade-Stop",
-            "DroneAssistMfg"
-        ]
-    },
     "DeliverableOrder": {
         "action": "ClickSelf",
         "roi": [
@@ -4155,15 +4103,7 @@
         ],
         "rearDelay": 1000,
         "next": [
-            "ReplenishToMaxLoading",
-            "Stop"
-        ]
-    },
-    "ReplenishToMaxLoading": {
-        "baseTask": "Loading",
-        "rearDelay": 1000,
-        "next": [
-            "ReplenishToMaxLoading",
+            "ReplenishToMaxConfirm@Loading",
             "Stop"
         ]
     },
@@ -5452,14 +5392,6 @@
             "ClueGiveTo1stConfirm"
         ]
     },
-    "ClueGiveLoading": {
-        "baseTask": "Loading",
-        "next": [
-            "ClueGiveLoading",
-            "SelectClue",
-            "CloseSendClue"
-        ]
-    },
     "ClueGiveTo1st": {
         "template": "ClusCanBeSent.png",
         "action": "DoNothing",
@@ -5488,7 +5420,7 @@
             160
         ],
         "next": [
-            "ClueGiveLoading",
+            "ClueGiveTo1stConfirm@Loading",
             "SelectClue",
             "CloseSendClue"
         ]
@@ -5521,7 +5453,7 @@
             160
         ],
         "next": [
-            "ClueGiveLoading",
+            "ClueGiveTo2ndConfirm@Loading",
             "SelectClue",
             "CloseSendClue"
         ]
@@ -5554,7 +5486,7 @@
             160
         ],
         "next": [
-            "ClueGiveLoading",
+            "ClueGiveTo3rdConfirm@Loading",
             "SelectClue",
             "CloseSendClue"
         ]
@@ -5587,7 +5519,7 @@
             160
         ],
         "next": [
-            "ClueGiveLoading",
+            "ClueGiveTo4thConfirm@Loading",
             "SelectClue",
             "CloseSendClue"
         ]
@@ -8059,19 +7991,6 @@
             "Roguelike@StartAction@Loading2"
         ]
     },
-    "Roguelike@StartAction@Loading": {
-        "next": [
-            "Roguelike@StartAction@Loading",
-            "Roguelike@StartAction#next"
-        ]
-    },
-    "Roguelike@StartAction@Loading2": {
-        "template": "Loading2.png",
-        "next": [
-            "Roguelike@StartAction@Loading2",
-            "Roguelike@StartAction#next"
-        ]
-    },
     "Roguelike@StartExplore": {
         "Doc": "base_task",
         "template": "empty.png",