fix: 修复 Commissions 偶尔识别失败的问题

MaaXYZ · Sep 19, 2023 · 60368ba · 60368ba
1 parent da770a7
commit 60368ba
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 31 deletions.
diff --git a/assets/Resource/Base/pipeline/Commissions.json b/assets/Resource/Base/pipeline/Commissions.json
@@ -1,26 +1,61 @@
 {
     "Commissions": {
         "next": [
-            "Start_Commissions_Partial",
-            "Sub_Goto_Commissions"
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_Commissions_Partial",
+            "Start_Commissions_Partial"
+        ]
+    },
+    "BaseDefense": {
+        "next": [
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_BaseDefense_Partial",
+            "Start_SweepMission_OnCommissions"
         ]
     },
-    "Sub_Goto_Commissions": {
+    "ItemRetrieval": {
+        "next": [
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_ItemRetrieval_Partial",
+            "Start_SweepMission_OnCommissions"
+        ]
+    },
+    "Sub_Goto_Commissions_Partial": {
         "is_sub": true,
+        "inverse": true,
+        "recognition": "OCR",
+        "text": "RequestSelect",
+        "roi": [ 630, 125, 650, 70 ],
         "next": [
-            "RequestSelectFlag_Partial",
+            "Click_CommissionsButton_Partial",
             "CommissionsFlag_Partial",
             "Sub_Wait_NowLoading_Partial",
-            "Click_CommissionsButton_Partial",
             "Sub_Goto_Campaign"
         ]
     },
-    "Click_CommissionsButton_Partial": {
+    "Sub_Goto_BaseDefense_Partial": {
+        "is_sub": true,
+        "inverse": true,
         "recognition": "OCR",
-        "text": "Commissions",
-        "roi": [ 652, 475, 160, 70 ],
-        "action": "Click",
-        "post_delay": 1500
+        "text": "BaseDefense",
+        "roi": [ 90, 130, 530, 60 ],
+        "next": [
+            "Click_BaseDefense_Partial",
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_Commissions_Partial"
+        ]
+    },
+    "Sub_Goto_ItemRetrieval_Partial": {
+        "is_sub": true,
+        "inverse": true,
+        "recognition": "OCR",
+        "text": "ItemRetrieval",
+        "roi": [ 90, 130, 530, 60 ],
+        "next": [
+            "Click_ItemRetrieval_Partial",
+            "Sub_Wait_NowLoading_Partial",
+            "Sub_Goto_Commissions_Partial"
+        ]
     },
     "CommissionsFlag_Partial": {
         "recognition": "OCR",
@@ -30,33 +65,34 @@
             "Click_BackButton"
         ]
     },
-    "RequestSelectFlag_Partial": {
-        "recognition": "OCR",
-        "text": "RequestSelect",
-        "roi": [ 630, 125, 650, 70 ]
-    },
-    "Start_Commissions_Partial": {
-        "doc": "next setted in code",
+    "Click_CommissionsButton_Partial": {
         "recognition": "OCR",
-        "text": "RequestSelect",
-        "roi": [ 630, 125, 650, 70 ]
+        "text": "Commissions",
+        "roi": [ 652, 475, 160, 70 ],
+        "action": "Click",
+        "post_delay": 1500
     },
     "Click_BaseDefense_Partial": {
         "recognition": "OCR",
         "text": "BaseDefense",
-        "roi": [ 780, 210, 500, 240 ],
+        "roi": [ 685, 210, 560, 120 ],
         "action": "Click",
-        "next": [
-            "Start_SweepMission_Partial",
-            "Sub_Click_EnterButton_OnClearedMission_Partial",
-            "StopOnException"
-        ]
+        "post_delay": 1500
     },
     "Click_ItemRetrieval_Partial": {
         "recognition": "OCR",
         "text": "ItemRetrieval",
-        "roi": [ 780, 210, 500, 240 ],
+        "roi": [ 685, 330, 560, 120 ],
         "action": "Click",
+        "post_delay": 1500
+    },
+    "Start_Commissions_Partial": {
+        "doc": "next setted in code",
+        "recognition": "OCR",
+        "text": "RequestSelect",
+        "roi": [ 630, 125, 650, 70 ]
+    },
+    "Start_SweepMission_OnCommissions": {
         "next": [
             "Start_SweepMission_Partial",
             "Sub_Click_EnterButton_OnClearedMission_Partial",

diff --git a/assets/Resource/EN/pipeline/OCRPartialTasks.json b/assets/Resource/EN/pipeline/OCRPartialTasks.json
@@ -300,7 +300,7 @@
             "Commissions"
         ]
     },
-    "RequestSelectFlag_Partial": {
+    "Sub_Goto_Commissions_Partial": {
         "text": [
             "Request Select",
             "RequestSelect"
@@ -312,16 +312,32 @@
             "RequestSelect"
         ]
     },
+    "Sub_Goto_BaseDefense_Partial": {
+        "text": [
+            "Base Defense",
+            "BaseDefense",
+            "Base"
+        ]
+    },
     "Click_BaseDefense_Partial": {
         "text": [
             "Base Defense",
-            "BaseDefense"
+            "BaseDefense",
+            "Base"
+        ]
+    },
+    "Sub_Goto_ItemRetrieval_Partial": {
+        "text": [
+            "Item Retrieval",
+            "ItemRetrieval",
+            "Item"
         ]
     },
     "Click_ItemRetrieval_Partial": {
         "text": [
             "Item Retrieval",
-            "ItemRetrieval"
+            "ItemRetrieval",
+            "Item"
         ]
     },
     "Sub_Goto_Bounty_Partial": {

diff --git a/src/MBA.Core/Data/Config.cs b/src/MBA.Core/Data/Config.cs
@@ -115,8 +115,8 @@ public DiffTaskDailyConfig(DailyConfig dailyConfig)
             ["Start_Commissions_Partial"] = new JsonObject
             {
                 ["next"] = _config.CommissionsId == "E"
-                         ? "Click_BaseDefense_Partial"
-                         : "Click_ItemRetrieval_Partial"
+                         ? "BaseDefense"
+                         : "ItemRetrieval"
             },
             ["Click_PlusButtons"] = new JsonObject
             {

diff --git a/src/MBA.Core/Enums/CommissionsRequest.cs b/src/MBA.Core/Enums/CommissionsRequest.cs
@@ -0,0 +1,10 @@
+namespace MBA.Core.Enums;
+
+public enum CommissionsRequest
+{
+    Invalid = 0,
+
+    BaseDefense = 1,
+    ItemRetrieval = 2
+    // TODO: Config Breaking Change Step1 in v0.2.0 
+}