Merge:'chore/FlowGameVer0507'| 0507跟随游戏版本调整

assets/interface.json

@@ -525,8 +525,8 @@
                     "pipeline_override": {
                         "QuickHunt_FastBattleMAXTouchAdventureRoute": {
                             "target": [
-                                800,
-                                390
+                                810,
+                                330
                             ]
                         }
                     }
@@ -536,8 +536,8 @@
                     "pipeline_override": {
                         "QuickHunt_FastBattleMAXTouchHuntingGrounds": {
                             "target": [
-                                800,
-                                390
+                                810,
+                                330
                             ]
                         },
                         "QuickHunt_Hub": {
@@ -1696,7 +1696,7 @@
     },
     "interface_version": 2,
     "name": "MFABD2",
-    "title": "MFABD2 | 棕色尘埃2自动化助手(sunyink/MFABD2)v0.0.20 | 游戏版本：20260423 ( AKATSUKI )",
+    "title": "MFABD2 | 棕色尘埃2自动化助手(sunyink/MFABD2)v0.0.20 | 游戏版本：20260507 ( Strange Request )",
     "github": "https://github.com/sunyink/MFABD2",
     "mirrorchyan_rid": "MFABD2",
     "mirrorchyan_multiplatform": true,

assets/resource/base/pipeline/Battle.json

@@ -220,18 +220,18 @@
         "desc": "B-1.狩猎场次数选择，点击MAX",
         "recognition": "OCR",
         "roi": [
-            723,
-            350,
-            159,
-            90
+            754,
+            301,
+            116,
+            64
         ],
         "expected": [
             "MAX"
         ],
         "action": "Click",
         "target": [
-            470,
-            390
+            465,
+            330
         ],
         "next": [
             "QuickHunt_FastBattleStart"
@@ -576,8 +576,8 @@
         ],
         "action": "Click",
         "target": [
-            470,
-            390
+            465,
+            330
         ],
         "next": [
             "QuickHunt_FastBattleStart"
@@ -784,18 +784,18 @@
         "desc": "3.圣石洞穴次数选择，点击MAX",
         "recognition": "OCR",
         "roi": [
-            679,
-            316,
-            235,
-            135
+            754,
+            301,
+            116,
+            64
         ],
         "expected": [
             "MAX"
         ],
         "action": "Click",
         "target": [
-            800,
-            390
+            810,
+            330
         ],
         "next": [
             "QuickHunt_CrystalCave_End",
@@ -863,10 +863,10 @@
     "QuickHunt_NoFreeAP": {
         "recognition": "ColorMatch",
         "roi": [
-            649,
-            532,
-            133,
-            31
+            646,
+            539,
+            134,
+            32
         ],
         "lower": [
             241,
@@ -1110,10 +1110,10 @@
     "QuickHunt_TurnCharact_NoAP": {
         "recognition": "ColorMatch",
         "roi": [
-            649,
-            532,
-            133,
-            31
+            647,
+            539,
+            134,
+            32
         ],
         "lower": [
             241,

assets/resource/base/pipeline/Equip.json

@@ -770,25 +770,17 @@
         "focus": "EM.色核通过.稀有度UR"
     },
     "Equip_filter+9": {
-        "recognition": "FeatureMatch",
+        "recognition": "TemplateMatch",
         "roi": [
-            236,
-            161,
-            817,
-            284
+            944,
+            211,
+            50,
+            25
         ],
         "template": [
-            "+9.png",
-            "filterSR.png"
+            "+9.png"
         ],
-        "count": 12,
         "action": "Click",
-        "target": [
-            958,
-            186,
-            18,
-            9
-        ],
         "post_delay": 1500,
         "next": [
             "Equip_+9ColorCk",
@@ -799,10 +791,10 @@
     "Equip_+9ColorCk": {
         "recognition": "ColorMatch",
         "roi": [
-            935,
-            173,
-            67,
-            38
+            944,
+            211,
+            50,
+            25
         ],
         "lower": [
             102,
@@ -826,21 +818,15 @@
         "enabled": false,
         "recognition": "TemplateMatch",
         "roi": [
-            804,
-            248,
-            83,
-            76
+            807,
+            273,
+            84,
+            77
         ],
         "template": [
             "filterC17.png"
         ],
         "action": "Click",
-        "target": [
-            834,
-            277,
-            16,
-            9
-        ],
         "post_delay": 1500,
         "next": [
             "Equip_filter<C17Ck",
@@ -852,9 +838,9 @@
         "recognition": "ColorMatch",
         "roi": [
             821,
-            271,
+            301,
             53,
-            27
+            28
         ],
         "lower": [
             [
@@ -882,10 +868,10 @@
         "recognition": "DirectHit",
         "action": "Click",
         "target": [
-            710,
-            275,
-            20,
-            12
+            708,
+            309,
+            21,
+            13
         ],
         "post_delay": 1500,
         "next": [
@@ -897,10 +883,10 @@
     "Equip_filter<C10Ck": {
         "recognition": "ColorMatch",
         "roi": [
-            700,
-            267,
-            49,
-            31
+            694,
+            301,
+            50,
+            32
         ],
         "method": 40,
         "lower": [

assets/resource/base/pipeline/EventBattle.json

@@ -31,7 +31,7 @@
             1118,
             387
         ],
-        "post_delay": 2000,
+        "post_delay": 8000,
 
         "focus": "EM.从主页面进入活动"
     },

assets/resource/base/pipeline/GACHA_ADV.json

@@ -373,6 +373,14 @@
             "GachaADV_Special_ReservedRights",
             "GachaADV_Location1",
             "[JumpBack]GachaADV_SkipPV"
+        ],
+        "on_error": [
+            "GachaADV_Location2_Pre",
+            "GachaADV_Location3_Pre",
+            "GachaADV_Location4_Pre",
+            "GachaADV_Location5_Pre",
+            "Global_Null_Exception",
+            "Global_Null_Panic"
         ]
     },
     "GachaADV_Location1_Ck": {
@@ -503,6 +511,13 @@
             "GachaADV_Special_ReservedRights",
             "GachaADV_Location2",
             "[JumpBack]GachaADV_SkipPV"
+        ],
+        "on_error": [
+            "GachaADV_Location3_Pre",
+            "GachaADV_Location4_Pre",
+            "GachaADV_Location5_Pre",
+            "Global_Null_Exception",
+            "Global_Null_Panic"
         ]
     },
     "GachaADV_Location2_Ck": {
@@ -629,6 +644,12 @@
             "GachaADV_Special_ReservedRights",
             "GachaADV_Location3",
             "[JumpBack]GachaADV_SkipPV"
+        ],
+        "on_error": [
+            "GachaADV_Location4_Pre",
+            "GachaADV_Location5_Pre",
+            "Global_Null_Exception",
+            "Global_Null_Panic"
         ]
     },
     "GachaADV_Location3_Ck": {
@@ -752,6 +773,11 @@
             "GachaADV_Special_ReservedRights",
             "GachaADV_Location4",
             "[JumpBack]GachaADV_SkipPV"
+        ],
+        "on_error": [
+            "GachaADV_Location5_Pre",
+            "Global_Null_Exception",
+            "Global_Null_Panic"
         ]
     },
     "GachaADV_Location4_Ck": {
@@ -1283,6 +1309,7 @@
         "focus": "GA.卡池列表见底"
     },
     "GachaADV_SkipPV": {
+        "max_hit": 20,
         "recognition": "OCR",
         "roi": [
             953,

release/release_header.md

@@ -1,42 +1,40 @@
-<!--
-════════════════════════════════════════════════════════════════
-  Release 头部草稿 · 注入目标：GitHub Release Notes 顶部
-════════════════════════════════════════════════════════════════
-
-  【格式规范】
-  每段内容块前须标注目标版本标记，CI 脚本按顺序拼接所有匹配
-  当前版本类型的块，插入到 Release Notes 正文最顶部。
-
-  标记格式：
-    <!-- target: <版本类型> [, <版本类型>] -->
-    内容…
-
-  版本类型：
-    all    · 所有版本（stable / beta / alpha / ci）
-    stable · 正式版
-    beta   · 公测版
-    alpha  · 内测版
-    ci     · 开发版
-
-  【叠加示例】
-    <!-- target: all -->
-    这段所有版本的 Release Notes 都会显示
-
-    <!-- target: stable -->
-    这段只出现在正式版 Release Notes 里
-
-    → stable 收到：第 1 段 + 第 2 段
-    → beta   收到：第 1 段
-    → ci     收到：第 1 段
-
-  【使用方法】
-  1. 在本文件末尾（注释之后）按格式写好内容块
-  2. 将改动合并入主分支，下次对应版本 CI 自动读取并插入 Release Notes 头部
-  3. 发版后请清空内容块（保留本段注释），防止旧内容重复出现
-
-  ⚠️  若版本类型标识（stable/beta/alpha/ci）发生变更，
-      需同步修改 scripts/changelog_generator.py 中的 _get_tag_type()
-════════════════════════════════════════════════════════════════
--->
+# ════════════════════════════════════════════════════════════════
+#   Release 头部草稿 · 注入目标：GitHub Release Notes 顶部
+# ════════════════════════════════════════════════════════════════
+# 
+#   【格式规范】
+#   每段内容块前须标注目标版本标记，CI 脚本按顺序拼接所有匹配
+#   当前版本类型的块，插入到 Release Notes 正文最顶部。
+# 
+#   标记格式：
+#     <!-- target: <版本类型> [, <版本类型>] -->
+#     内容…
+# 
+#   版本类型：
+#     all    · 所有版本（stable / beta / alpha / ci）
+#     stable · 正式版
+#     beta   · 公测版
+#     alpha  · 内测版
+#     ci     · 开发版
+# 
+#   【叠加示例】
+#     target: all
+#     这段所有版本的 Release Notes 都会显示
+# 
+#     target: stable
+#     这段只出现在正式版 Release Notes 里
+# 
+#     → stable 收到：第 1 段 + 第 2 段
+#     → beta   收到：第 1 段
+#     → ci     收到：第 1 段
+# 
+#   【使用方法】
+#   1. 在本文件末尾（注释之后）按格式写好内容块
+#   2. 将改动合并入主分支，下次对应版本 CI 自动读取并插入 Release Notes 头部
+#   3. 发版后请清空内容块（保留本段注释），防止旧内容重复出现
+# 
+#   ⚠️  若版本类型标识（stable/beta/alpha/ci）发生变更，
+#       需同步修改 scripts/changelog_generator.py 中的 _get_tag_type()
+# ════════════════════════════════════════════════════════════════
 <!-- target: all -->
-159 Moons of Grace , And miles to go with you.
+> 159 Moons of Grace , And miles to go with you.