Merge pull request #2044 from MaaAssistantArknights/dev

Release v4.6.0-alpha.6

CHANGELOG.md

@@ -5,8 +5,11 @@
 - 优化 自定义基建 内置 243 作业 @筱竹聽雨
 - 降低 肉鸽 桃金娘 招募优先级 @MistEO
 - 修复 水月肉鸽 绝大部分已知卡死问题 @MistEO
+- 修复 水月肉鸽 骑士事件卡死问题 @MistEO
+- 修复 水月肉鸽 获取战利品时卡死问题 @MistEO
 - 修复 水月肉鸽 干员朝向问题 @MistEO
 - 修复 基建 清空按钮不生效导致的换班失败问题 @MistEO
+- 修复 繁中服 自动公招错误 @horror-proton
 - 修复 截图逻辑错误 @zzyyyl
 - 修复 编译错误 @horror-proton
 - 整理 项目目录结构 @MistEO

resource/addition/Roguelike2/resource/tasks.json

@@ -313,7 +313,8 @@
             "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike1ClickToDrops"
         ]
     },
     "Roguelike2GetDropBox": {
@@ -367,6 +368,7 @@
     },
     "Roguelike2CloseCollectionContinue": {
         "action": "ClickSelf",
+        "templThreshold": 0.85,
         "cache": false,
         "roi": [
             549,
@@ -393,12 +395,14 @@
             "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike1DropsFlag"
         ]
     },
     "Roguelike2CloseCollectionClose": {
         "action": "ClickSelf",
         "cache": false,
+        "templThreshold": 0.85,
         "roi": [
             572,
             434,
@@ -424,7 +428,8 @@
             "Roguelike2CommissionedMissionCompleted",
             "Roguelike2DiceConfirm",
             "Roguelike2CloseCollectionContinue",
-            "Roguelike2CloseCollectionClose"
+            "Roguelike2CloseCollectionClose",
+            "Roguelike1DropsFlag"
         ]
     },
     "Roguelike2CommissionedMissionCompleted": {

resource/global/txwy/resource/tasks.json

@@ -139,8 +139,7 @@
         "action": "ClickSelf",
         "rearDelay": 500,
         "text": [
-            "開始招.*",
-            "開始招募"
+            "開始招"
         ],
         "roi": [
             0,
@@ -155,7 +154,7 @@
         "rearDelay": 500,
         "cache": false,
         "text": [
-            "立即招.*"
+            "立即招"
         ],
         "roi": [
             0,