fix: 修复 ResourceReviewer 检查出来的错误，并格式化

MaaXYZ · Sep 20, 2023 · 1f5de44 · 1f5de44
1 parent 6d33ca8
commit 1f5de44
Show file tree

Hide file tree

Showing 13 changed files with 161 additions and 91 deletions.
diff --git a/assets/Resource/Base/pipeline/Bounty.json b/assets/Resource/Base/pipeline/Bounty.json
@@ -45,6 +45,7 @@
         ]
     },
     "Sub_Check_OverpassTicket": {
+        "skip_review": 4,
         "is_sub": true,
         "inverse": true,
         "times_limit": 5,
@@ -86,6 +87,7 @@
         "post_delay": 1500
     },
     "Sub_Check_DesertRailroadTicket": {
+        "skip_review": 4,
         "is_sub": true,
         "inverse": true,
         "times_limit": 5,
@@ -124,6 +126,7 @@
         "post_delay": 1500
     },
     "Sub_Check_ClassroomTicket": {
+        "skip_review": 4,
         "is_sub": true,
         "inverse": true,
         "times_limit": 5,

diff --git a/assets/Resource/Base/pipeline/Buttons.json b/assets/Resource/Base/pipeline/Buttons.json
@@ -1,5 +1,6 @@
 {
     "Sub_Click_HomeButton": {
+        "skip_review": 6,
         "is_sub": true,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/Home.png",
@@ -8,6 +9,7 @@
         "post_delay": 1500
     },
     "Sub_Click_BackButton": {
+        "skip_review": 6,
         "is_sub": true,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/Back.png",
@@ -16,13 +18,15 @@
         "post_delay": 1500
     },
     "Click_BackButton": {
+        "skip_review": 6,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/Back.png",
         "roi": [ 0, 0, 143, 140 ],
         "action": "Click",
         "post_delay": 1500
     },
     "Sub_Click_CloseButton": {
+        "skip_review": 6,
         "is_sub": true,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/Close.png",
@@ -36,6 +40,7 @@
         "post_delay": 1500
     },
     "Sub_Click_PassButton": {
+        "skip_review": 6,
         "is_sub": true,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/Pass.png",
@@ -44,6 +49,7 @@
         "post_delay": 1500
     },
     "Sub_Click_CloseFullscreenButton": {
+        "skip_review": 6,
         "is_sub": true,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/CloseFullscreen.png",
@@ -68,6 +74,7 @@
         ]
     },
     "Click_PlusButtons": {
+        "skip_review": 6,
         "doc": "times_limit setted in code",
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/Plus.png",
@@ -88,6 +95,7 @@
         ]
     },
     "Stop_Sweep_OnZeroTimes": {
+        "skip_review": 4,
         "recognition": "OCR",
         "text": "0",
         "roi": [ 881, 279, 113, 43 ]
@@ -145,6 +153,7 @@
         ]
     },
     "Click_EnterButton_OnTheRightSideOfThreeStarsFlag1": {
+        "skip_review": 6,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/ThreeStarsFlag.png",
         "threshold": 0.9,
@@ -153,6 +162,7 @@
         "action": "Click"
     },
     "Click_EnterButton_OnTheRightSideOfThreeStarsFlag2": {
+        "skip_review": 6,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/ThreeStarsFlag.png",
         "threshold": 0.9,
@@ -161,6 +171,7 @@
         "action": "Click"
     },
     "Click_EnterButton_OnTheRightSideOfThreeStarsFlag3": {
+        "skip_review": 6,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/ThreeStarsFlag.png",
         "threshold": 0.9,
@@ -169,6 +180,7 @@
         "action": "Click"
     },
     "Click_EnterButton_OnTheRightSideOfThreeStarsFlag4": {
+        "skip_review": 6,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/ThreeStarsFlag.png",
         "threshold": 0.9,
@@ -177,6 +189,7 @@
         "action": "Click"
     },
     "Click_EnterButton_OnTheRightSideOfThreeStarsFlag5": {
+        "skip_review": 6,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/ThreeStarsFlag.png",
         "threshold": 0.9,
@@ -185,6 +198,7 @@
         "action": "Click"
     },
     "Click_EnterButton_OnTheRightSideOfThreeStarsFlag6": {
+        "skip_review": 6,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Buttons/ThreeStarsFlag.png",
         "threshold": 0.9,

diff --git a/assets/Resource/Base/pipeline/Cafe.json b/assets/Resource/Base/pipeline/Cafe.json
@@ -29,6 +29,7 @@
         "post_delay": 2500
     },
     "End_Cafe": {
+        "skip_review": 6,
         "inverse": true,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Cafe/StudentAffection.png",
@@ -44,6 +45,7 @@
         ]
     },
     "Sub_Click_StudentAffection": {
+        "skip_review": 6,
         "is_sub": true,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Cafe/StudentAffection.png",

diff --git a/assets/Resource/Base/pipeline/Campaign.json b/assets/Resource/Base/pipeline/Campaign.json
@@ -14,6 +14,7 @@
         "roi": [ 0, 0, 450, 60 ]
     },
     "Click_Campaign": {
+        "skip_review": 6,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Campaign/Campaign.png",
         "roi": [ 1087, 478, 193, 147 ],

diff --git a/assets/Resource/Base/pipeline/Crafting.json b/assets/Resource/Base/pipeline/Crafting.json
@@ -1,86 +1,93 @@
 {
     "Crafting": {
+        "TODO": "需要判断颜色 + 遍历所有可选项，还有撤销 skip_review",
         "next": [
             "Sub_Wait_NowLoading_Partial",
             "Sub_Goto_MaterialSynthesis_Partial",
-            "Sub_Click_Receive_Partial",
-            "Sub_Start_MaterialSynthesis_Partial",
-            "Start_MaterialFusion_Partial",
+            "Sub_Click_Receive",
+            "Sub_Start_MaterialSynthesis",
+            "Start_MaterialFusion",
             "Stop"
         ]
     },
-    "Sub_Goto_Crafting_Partial": {
+    "Sub_Goto_Crafting": {
+        "skip_review": 4,
         "is_sub": true,
         "inverse": true,
         "recognition": "OCR",
         "text": "Crafting",
         "roi": [ 0, 0, 450, 60 ],
         "next": [
-            "Click_CraftingButton_Partial",
+            "Click_CraftingButton",
             "Sub_Wait_NowLoading_Partial",
             "Sub_Goto_Home"
         ]
     },
-    "Click_CraftingButton_Partial": {
+    "Click_CraftingButton": {
+        "skip_review": 4,
         "recognition": "OCR",
         "text": "Crafting",
         "roi": [ 594, 628, 170, 92 ],
         "action": "Click",
         "post_delay": 1500
     },
-    "Sub_Click_Receive_Partial": {
+    "Sub_Click_Receive": {
+        "skip_review": 4,
         "is_sub": true,
         "recognition": "OCR",
         "text": "Receive",
-        "roi": [671, 216, 565, 413],
+        "roi": [ 671, 216, 565, 413 ],
         "action": "Click",
         "next": [
             "Click_TouchButton_Partial"
         ],
         "timeout": 5000
     },
-    "Sub_Start_MaterialSynthesis_Partial": {
+    "Sub_Start_MaterialSynthesis": {
+        "skip_review": 4,
         "is_sub": true,
         "recognition": "OCR",
         "text": "StartCrafting",
-        "roi": [671, 216, 565, 413],
+        "roi": [ 671, 216, 565, 413 ],
         "action": "Click",
         "post_delay": 1500,
         "next": [
             "Sub_Click_KeystoneButton"
         ],
         "timeout": 5000
     },
-    "Start_MaterialFusion_Partial": {
+    "Start_MaterialFusion": {
         "enabled": false,
         "next": [
             "Sub_Wait_NowLoading_Partial",
             "Sub_Goto_MaterialSynthesis_Partial",
-            "Sub_Click_Receive_Partial",
+            "Sub_Click_Receive",
             "TODO"
         ]
     },
     "Sub_Goto_MaterialSynthesis_Partial": {
+        "skip_review": 6,
         "is_sub": true,
         "inverse": true,
         "recognition": "TemplateMatch",
         "template": "Arona.png",
         "next": [
             "Click_MaterialSynthesis_Partial",
-            "Sub_Notice",
+            "Sub_Notice_Partial",
             "Sub_Wait_NowLoading_Partial",
-            "Sub_Goto_Crafting_Partial"
+            "Sub_Goto_Crafting"
         ]
     },
     "Sub_Goto_MaterialFusion_Partial": {
+        "skip_review": 6,
         "is_sub": true,
         "inverse": true,
         "recognition": "TemplateMatch",
         "template": "Arona.png",
         "next": [
             "Click_MaterialFusion_Partial",
             "Sub_Wait_NowLoading_Partial",
-            "Sub_Goto_Crafting_Partial"
+            "Sub_Goto_Crafting"
         ]
     },
     "Click_MaterialSynthesis_Partial": {
@@ -95,5 +102,7 @@
         "roi": [ 0, 185, 285, 165 ],
         "action": "Click"
     },
-    "Sub_Click_KeystoneButton":{}
+    "Sub_Click_KeystoneButton": {
+        "is_sub": true
+    }
 }
diff --git a/assets/Resource/Base/pipeline/Mailbox.json b/assets/Resource/Base/pipeline/Mailbox.json
@@ -1,6 +1,7 @@
 {
     "Mailbox": {
         "next": [
+            "Sub_Wait_NowLoading_Partial",
             "Sub_Goto_Mailbox_Partial",
             "NoMoreMailFlag_Partial",
             "Click_ClaimAllButton_Mailbox_Partial"
@@ -13,18 +14,13 @@
         "text": "Mailbox",
         "roi": [ 0, 0, 450, 60 ],
         "next": [
-            "MailboxFlag_Partial",
-            "Sub_Wait_NowLoading_Partial",
             "Click_MailboxButton",
+            "Sub_Wait_NowLoading_Partial",
             "Sub_Goto_Home"
         ]
     },
-    "MailboxFlag_Partial": {
-        "recognition": "OCR",
-        "text": "Mailbox",
-        "roi": [ 0, 0, 450, 60 ]
-    },
     "Click_MailboxButton": {
+        "skip_review": 6,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Mailbox/Mailbox.png",
         "roi": [ 1077, 0, 131, 126 ],

diff --git a/assets/Resource/Base/pipeline/ProcessingNotice.json b/assets/Resource/Base/pipeline/ProcessingNotice.json
@@ -1,11 +1,11 @@
 {
-    "Sub_Notice":{
+    "Sub_Notice_Partial": {
         "is_sub": true,
         "recognition": "OCR",
         "text": "Notice",
         "roi": [ 360, 135, 560, 440 ],
         "next": [
-            "Notice_Quit?_Partial",
+            "Sub_Notice_Quit_Partial",
             "Notice_Unknown"
         ]
     },
@@ -22,12 +22,12 @@
         "action": "Click"
     },
     "Notice_Unknown": {
-        "notify": true,
+        "TODO": "回调通知",
         "next": [
             "StopTask"
         ]
     },
-    "Notice_Quit?_Partial": {
+    "Sub_Notice_Quit_Partial": {
         "is_sub": true,
         "recognition": "OCR",
         "text": "Quit?",

diff --git a/assets/Resource/Base/pipeline/Scrimmage.json b/assets/Resource/Base/pipeline/Scrimmage.json
@@ -45,6 +45,7 @@
         ]
     },
     "Sub_Check_TrinityTicket": {
+        "skip_review": 4,
         "is_sub": true,
         "inverse": true,
         "times_limit": 5,
@@ -84,6 +85,7 @@
         "post_delay": 1500
     },
     "Sub_Check_GehennaTicket": {
+        "skip_review": 4,
         "is_sub": true,
         "inverse": true,
         "times_limit": 5,
@@ -122,6 +124,7 @@
         "post_delay": 1500
     },
     "Sub_Check_MillenniumTicket": {
+        "skip_review": 4,
         "is_sub": true,
         "inverse": true,
         "times_limit": 5,

diff --git a/assets/Resource/Base/pipeline/Shop.json b/assets/Resource/Base/pipeline/Shop.json
@@ -1,3 +1,3 @@
 {
-    
-}
+
+}
diff --git a/assets/Resource/Base/pipeline/StartUp.json b/assets/Resource/Base/pipeline/StartUp.json
@@ -2,6 +2,7 @@
     "StartUp": {
         "next": [
             "HomeFlag",
+            "Sub_Wait_NowLoading_Partial",
             "Sub_Goto_Home"
         ]
     },
@@ -11,14 +12,15 @@
             "HomeFlag",
             "Sub_Wait_NowLoading_Partial",
             "Sub_Click_HomeButton",
-            "Sub_Notice",
+            "Sub_Notice_Partial",
             "Sub_Click_BackButton",
             "Sub_Click_CloseButton",
             "Sub_Click_CloseFullscreenButton",
             "Sub_StartApp"
         ]
     },
     "HomeFlag": {
+        "skip_review": 6,
         "recognition": "TemplateMatch",
         "template": "../../Base/image/Campaign/Campaign.png",
         "roi": [ 1086, 479, 194, 146 ]