fix:修复造物选择的时候，点到[词条]；修复仪式匕首吃造物；修复自动深眠bug (#129)

MaaXYZ · Jul 5, 2024 · c975f65 · c975f65
1 parent 4755244
commit c975f65
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 88 deletions.
diff --git a/assets/resource/base/pipeline/activity/StagePromotion.json b/assets/resource/base/pipeline/activity/StagePromotion.json
@@ -60,7 +60,7 @@
     },
     "StagePromotion_ReadyForAction": {
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "开始行动"
         ],
         "roi": [
@@ -81,7 +81,7 @@
     "StagePromotion_BalanceModel": {
         "is_sub": true,
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "制衡模式"
         ],
         "roi": [
@@ -101,7 +101,7 @@
     "StagePromotion_EatCandy": {
         "enabled": false,
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "活性",
             "恢复"
         ],
@@ -194,7 +194,7 @@
     },
     "StagePromotion_QuitEatCandyPage": {
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "活性",
             "恢复"
         ],
@@ -218,7 +218,7 @@
     },
     "StagePromotion_Skip": {
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "跳过"
         ],
         "roi": [
@@ -236,7 +236,7 @@
     },
     "StagePromotion_Confirm": {
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "确认"
         ],
         "roi": [
@@ -263,7 +263,7 @@
             64,
             64
         ],
-        "timeout":40000,
+        "timeout": 40000,
         "next": [
             "StagePromotion_Victory",
             "StagePromotion_CombatDefeat",
@@ -274,7 +274,7 @@
     },
     "StagePromotion_Victory": {
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "战斗",
             "胜利"
         ],
@@ -296,7 +296,7 @@
     },
     "StagePromotion_CombatDefeat": {
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "战斗",
             "失败"
         ],

diff --git a/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json b/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json
@@ -39,7 +39,7 @@
     },
     "ThePrisonerintheCaveTargetStageName": {
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "证明启示V"
         ],
         "roi": [
@@ -55,7 +55,7 @@
     },
     "ThePrisonerintheCaveReadyForAction": {
         "recognition": "OCR",
-        "text": [
+        "expected": [
             "开始行动"
         ],
         "roi": [