perf: ODR (#275)

主要对基本所有事件设定特殊的选项，修改了4种节点的优先级，造物选择时优先第二个，以及新增了诊所处的失声天平、造物典契流程，奇巧置换再说
MaaXYZ · Dec 12, 2024 · 5c35199 · 5c35199
1 parent fd916d7
commit 5c35199
Show file tree

Hide file tree

Showing 8 changed files with 598 additions and 73 deletions.
diff --git a/assets/resource/base/image/OutsideDeduction/SODStart_Media_MagicLamp.png b/assets/resource/base/image/OutsideDeduction/SODStart_Media_MagicLamp.png
diff --git a/...utsideDeduction/SODStart_MediaSelect1.png → ...DStart_Media_PomegranateHeartBleeding.png b/...utsideDeduction/SODStart_MediaSelect1.png → ...DStart_Media_PomegranateHeartBleeding.png
diff --git a/...utsideDeduction/SODStart_MediaSelect3.png → ...Deduction/SODStart_Media_RitualDagger.png b/...utsideDeduction/SODStart_MediaSelect3.png → ...Deduction/SODStart_Media_RitualDagger.png
diff --git a/assets/resource/base/image/OutsideDeductionRapid/OptionBorder.png b/assets/resource/base/image/OutsideDeductionRapid/OptionBorder.png
diff --git a/assets/resource/base/image/OutsideDeductionRapid/OptionBorder1.png b/assets/resource/base/image/OutsideDeductionRapid/OptionBorder1.png
diff --git a/assets/resource/base/image/OutsideDeductionRapid/WindowsCompleted.png b/assets/resource/base/image/OutsideDeductionRapid/WindowsCompleted.png
diff --git a/assets/resource/base/pipeline/activity/outside_deduction.json b/assets/resource/base/pipeline/activity/outside_deduction.json
@@ -332,6 +332,9 @@
             "SODStart_MediaSelect",
             "SOD_ArcanistAdd",
             "SODStart_Confirm"
+        ],
+        "interrupt": [
+            "SOD_SwipeLeft"
         ]
     },
     "SODStart_GoodsSelect": {
@@ -351,6 +354,9 @@
             "SOD_ItemSelect_1",
             "SODStart_MediaSelect",
             "SOD_ArcanistAdd"
+        ],
+        "interrupt": [
+            "SOD_SwipeLeft"
         ]
     },
     "Sub_SODStart_GoodsSelect": {
@@ -393,7 +399,7 @@
     },
     "SODStart_MediaSelect": {
         "recognition": "TemplateMatch",
-        "template": "OutsideDeduction/SODStart_MediaSelect3.png",
+        "template": "OutsideDeduction/SODStart_Media_RitualDagger.png",
         "roi": [
             0,
             81,
@@ -406,6 +412,34 @@
             "SODStart_MediaSelect"
         ]
     },
+    "SOD_SwipeLeft": {
+        "action": "Swipe",
+        "begin": [
+            1020,
+            630,
+            100,
+            55
+        ],
+        "end": [
+            450,
+            630,
+            100,
+            55
+        ],
+        "post_delay": 0,
+        "next": [
+            "SOD_Click"
+        ]
+    },
+    "SOD_Click": {
+        "action": "Click",
+        "target": [
+            500,
+            630,
+            100,
+            55
+        ]
+    },
     "SOD_ArcanistAdd": {
         "recognition": "TemplateMatch",
         "template": "OutsideDeduction/SOD_ArcanistAdd.png",
@@ -2481,7 +2515,8 @@
             642,
             20,
             20
-        ]
+        ],
+        "post_wait_freezes": 500
     },
     "SOD_Main": {
         "recognition": "TemplateMatch",