fix: 修复 ResourceReviewer 检查出来的错误

MaaXYZ · Dec 22, 2023 · b92b82f · b92b82f
1 parent 3ffddcd
commit b92b82f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 28 deletions.
diff --git a/assets/Resource/Base/pipeline/StartUp.json b/assets/Resource/Base/pipeline/StartUp.json
@@ -17,7 +17,7 @@
             "Sub_Click_BackButton",
             "Sub_Click_CloseButton",
             "Sub_Click_CloseFullscreenButton",
-            "Sub_SignInFlag_Partial",
+            "Sub_Click_SignIn_Partial",
             "Sub_StartApp"
         ]
     },
@@ -63,7 +63,8 @@
             "StopTaskOnException"
         ]
     },
-    "Sub_SignInFlag_Partial": {
+    "Sub_Click_SignIn_Partial": {
+        "is_sub": true,
         "recognition": "OCR",
         "text": "SignIn",
         "action": "Click",

diff --git a/assets/Resource/EN/pipeline/OCRPartialTasks.json b/assets/Resource/EN/pipeline/OCRPartialTasks.json
@@ -341,13 +341,6 @@
             "R.*Select"
         ]
     },
-    "Start_Commissions_Partial": {
-        "text": [
-            "Request Select",
-            "RequestSelect",
-            "R.*Select"
-        ]
-    },
     "Sub_Goto_BaseDefense_Partial": {
         "text": [
             "Base Defense",
@@ -432,7 +425,7 @@
             "Tasks"
         ]
     },
-    "Sub_SignInFlag_Partial": {
+    "Sub_Click_SignIn_Partial": {
         "text": [
             "^Day ?\\d+$"
         ]

diff --git a/assets/Resource/SC/pipeline/OCRPartialTasks.json b/assets/Resource/SC/pipeline/OCRPartialTasks.json
@@ -302,14 +302,6 @@
             "R.*Select"
         ]
     },
-    "Start_Commissions_Partial": {
-        "model": "../../../Base/model/ocr/",
-        "text": [
-            "Request Select",
-            "RequestSelect",
-            "R.*Select"
-        ]
-    },
     "Sub_Goto_BaseDefense_Partial": {
         "text": [
             "据点防御",
@@ -391,7 +383,7 @@
             "工作任务"
         ]
     },
-    "Sub_SignInFlag_Partial": {
+    "Sub_Click_SignIn_Partial": {
         "text": [
             "^第.*天$"
         ]

diff --git a/assets/Resource/SC/pipeline/Scrimmage.json b/assets/Resource/SC/pipeline/Scrimmage.json
@@ -13,6 +13,7 @@
         "enabled": false
     },
     "Sub_Goto_Scrimmage_Partial": {
+        "skip_review": 4,
         "roi": [ 630, 125, 650, 70 ]
     },
     "Sub_Check_TrinityTicket": {
@@ -77,12 +78,15 @@
         ]
     },
     "Click_Trinity_Partial": {
+        "skip_review": 4,
         "roi": [ 680, 210, 600, 136 ]
     },
     "Click_Gehenna_Partial": {
+        "skip_review": 4,
         "roi": [ 680, 346, 600, 136 ]
     },
     "Click_Millennium_Partial": {
+        "skip_review": 4,
         "roi": [ 680, 482, 600, 136 ]
     }
 }
diff --git a/assets/Resource/TC/pipeline/OCRPartialTasks.json b/assets/Resource/TC/pipeline/OCRPartialTasks.json
@@ -347,14 +347,6 @@
             "R.*Select"
         ]
     },
-    "Start_Commissions_Partial": {
-        "model": "../../../Base/model/ocr/",
-        "text": [
-            "Request Select",
-            "RequestSelect",
-            "R.*Select"
-        ]
-    },
     "Sub_Goto_BaseDefense_Partial": {
         "text": [
             "據點防禦",
@@ -446,7 +438,7 @@
             "每天"
         ]
     },
-    "Sub_SignInFlag_Partial": {
+    "Sub_Click_SignIn_Partial": {
         "text": [
             "^第.*天$"
         ]