fix: 修复繁中各种卡住问题

MaaXYZ · Oct 10, 2023 · 5701ba9 · 5701ba9
1 parent 67fb796
commit 5701ba9
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 19 deletions.
diff --git a/assets/Resource/Base/pipeline/Bounty.json b/assets/Resource/Base/pipeline/Bounty.json
@@ -66,7 +66,7 @@
         "skip_review": 4,
         "model": "../../../Base/model/ocr/",
         "recognition": "OCR",
-        "text": [ "0/6", "0/" ],
+        "text": [ "0/6", "0/", "0.?6" ],
         "roi": [ 35, 80, 240, 40 ],
         "next": "StopTask"
     },
@@ -88,7 +88,7 @@
         "text": "Overpass",
         "roi": [
             [ 645, 140, 610, 475 ],
-            [ 1044, 214, 186, 57 ]
+            [ 1090, 165, 134, 38 ]
         ],
         "action": "Click",
         "post_delay": 1500
@@ -111,7 +111,7 @@
         "text": "DesertRailroad",
         "roi": [
             [ 645, 140, 610, 475 ],
-            [ 1047, 337, 182, 52 ]
+            [ 1032, 273, 192, 37 ]
         ],
         "action": "Click",
         "post_delay": 1500
@@ -134,7 +134,7 @@
         "text": "Classroom",
         "roi": [
             [ 645, 140, 610, 475 ],
-            [ 1132, 460, 98, 52 ]
+            [ 1153, 379, 70, 37 ]
         ],
         "action": "Click",
         "post_delay": 1500

diff --git a/assets/Resource/Base/pipeline/Commissions.json b/assets/Resource/Base/pipeline/Commissions.json
@@ -71,14 +71,20 @@
     "Click_BaseDefense_Partial": {
         "recognition": "OCR",
         "text": "BaseDefense",
-        "roi": [ 645, 140, 610, 475 ],
+        "roi": [
+            [ 645, 140, 610, 475 ],
+            [ 1090, 165, 135, 38 ]
+        ],
         "action": "Click",
         "post_delay": 1500
     },
     "Click_ItemRetrieval_Partial": {
         "recognition": "OCR",
         "text": "ItemRetrieval",
-        "roi": [ 645, 140, 610, 475 ],
+        "roi": [
+            [ 645, 140, 610, 475 ],
+            [ 1031, 273, 193, 37 ]
+        ],
         "action": "Click",
         "post_delay": 1500
     },

diff --git a/assets/Resource/Base/pipeline/Scrimmage.json b/assets/Resource/Base/pipeline/Scrimmage.json
@@ -62,7 +62,7 @@
         "skip_review": 4,
         "model": "../../../Base/model/ocr/",
         "recognition": "OCR",
-        "text": [ "0/6", "0/" ],
+        "text": [ "0/6", "0/", "0.?6" ],
         "roi": [ 35, 80, 240, 40 ],
         "next": "StopTask"
     },
@@ -82,7 +82,11 @@
     "Click_Trinity_Partial": {
         "recognition": "OCR",
         "text": "Trinity",
-        "roi": [ 645, 140, 610, 475 ],
+        "roi": [
+            [ 645, 140, 610, 475 ],
+            [ 1102, 108, 168, 140 ],
+            [ 1151, 166, 71, 36 ]
+        ],
         "action": "Click",
         "post_delay": 1500
     },
@@ -102,7 +106,10 @@
     "Click_Gehenna_Partial": {
         "recognition": "OCR",
         "text": "Gehenna",
-        "roi": [ 645, 140, 610, 475 ],
+        "roi": [
+            [ 645, 140, 610, 475 ],
+            [ 1122, 272, 102, 37 ]
+        ],
         "action": "Click",
         "post_delay": 1500
     },
@@ -111,7 +118,10 @@
         "inverse": true,
         "recognition": "OCR",
         "text": "Millennium",
-        "roi": [ 90, 130, 530, 85 ],
+        "roi": [
+            [ 90, 130, 530, 85 ],
+            [ 1155, 380, 67, 36 ]
+        ],
         "next": [
             "Check_ScrimmageTicket",
             "Click_Millennium_Partial",

diff --git a/assets/Resource/Base/pipeline/TacticalChallenge.json b/assets/Resource/Base/pipeline/TacticalChallenge.json
@@ -56,10 +56,7 @@
         "skip_review": 4,
         "model": "../../../Base/model/ocr/",
         "recognition": "OCR",
-        "text": [
-            "0/5",
-            "[oO0ｏＯ０][1１/／5５]"
-        ],
+        "text": [ "0/5", "^0.?5$", "[oO0ｏＯ０][1１/／5５]" ],
         "roi": [ 147, 447, 148, 101 ],
         "next": [
             "Sub_End_TacticalChallenge_Partial"

diff --git a/assets/Resource/TC/pipeline/OCRPartialTasks.json b/assets/Resource/TC/pipeline/OCRPartialTasks.json
@@ -7,6 +7,8 @@
         ]
     },
     "CampaignFlag_Partial": {
+        "doc": "任務（日常）任務（業務區）特殊任務需分開識別",
+        "roi": [ 713, 160, 159, 84 ],
         "text": [
             "任務"
         ]
@@ -328,15 +330,13 @@
     "Click_CommissionsButton_Partial": {
         "text": [
             "特殊任務",
-            "特殊",
-            "任務"
+            "特殊"
         ]
     },
     "CommissionsFlag_Partial": {
         "text": [
             "特殊任務",
-            "特殊",
-            "任務"
+            "特殊"
         ]
     },
     "Sub_Goto_Commissions_Partial": {
@@ -440,8 +440,10 @@
         ]
     },
     "Sub_Goto_Tasks_Partial": {
+        "doc": "任務（日常）任務（業務區）特殊任務需分開識別",
+        "roi": [ 651, 80, 144, 60 ],
         "text": [
-            "任務"
+            "每天"
         ]
     },
     "Sub_SignInFlag_Partial": {