Merge pull request #3518 from MaaAssistantArknights/dev

Release v4.10.6-beta.2
2026-07-15 17:30:27 +08:00 · 2023-01-30 21:10:07 +08:00
parent 4934f61eb4 ef03ec0b8b
commit d08d82e6eb
6 changed files with 174 additions and 166 deletions
--- a/.github/workflows/release-mirrors.yml
+++ b/.github/workflows/release-mirrors.yml
@@ -1,5 +1,4 @@
 name: release-mirrors
-description: "Upload MaaAssistantArknights Release Assets to Mirrors"

 on:
  release:
@@ -9,7 +8,7 @@ on:
      limit:
        description: "Number of releases to fetch from MaaAssistantArknights, 2 at least"
        required: false
-        default: 31
+        default: 30
        type: number

 jobs:
@@ -24,7 +23,7 @@ jobs:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
          mkdir -pv upload-dir && cd upload-dir
-          gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 31 }} | tee ./release_maa.txt
+          gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 30 }} | tee ./release_maa.txt
          head -n 1 ./release_maa.txt | awk '{ print $1 }' > ./config

          echo "config:"
@@ -44,5 +43,5 @@ jobs:
          host: ${{ secrets.SSH_MIRROR_0_HOST }}
          username: ${{ secrets.SSH_MIRROR_0_USER }}
          key: ${{ secrets.SSH_MIRROR_0_KEY }}
-          source: "*.zip"
+          source: "MAA-*"
          target: ${{ format('{0}/{1}', '/data/html/MaaAssistantArknights/MaaAssistantArknights/releases/download', env.release_tag) }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v4.10.6-beta.2
+
+- 新增 mac ui 支持 `生息演算` @hguandl
+- 修复 `生息演算` 若干问题 @WLLEGit
+- 修复 自动战斗 带引号的召唤物名字识别问题 @cenfusheng
+- 修复 界面 全选会选上 `生息演算` 的问题 @MistEO
+- 修复 镜像上传错误 @GalvinGao
+
 ## v4.10.6-beta.1

 - 新增 `生息演算` 简单流程支持 @WLLEGit
@@ -12,98 +20,3 @@
 ### For overseas

 - Updated Korean translation @178619
-
-## v4.10.5
-
- 修复 保全派驻 任务流程错误 @MistEO
- 修复 请求更新失败时的崩溃问题 @ABA2396
- 修复 系统语言为繁中时，启动时崩溃的问题 @MistEO @dantmnf
- 添加 部分日志打印 @horror-proton
-
-## v4.10.4
-
- 新增 adb-lite 连接方式 @hguandl
- 新增 mac 版本 自动战斗抄作业功能 @hguandl
- 新增 界面 退出时自动保存上次位置 @moomiji @ABA2396
- 更新 自定义基建内置作业 @ABA2396 @martinwang2002 @MistEO
- 重构 界面 定时功能 @ABA2396
- 优化 界面 关卡名输入支持中文 @ABA2396
- 优化 界面 启动设置项 @Sed66666 @ABA2396
- 优化 `保全派驻` 内置作业 @HMZyueshen
- 优化 肉鸽 Pin Up 相关提示，优化分队选项 @ABA2396
- 优化 肉鸽 助战刷新次数 @WLLEGit
- 修复 界面 关卡名被重置的问题 @ABA2396
- 修复 OTA 包编码错误 @horror-proton
- 修复 mac 版本日志创建错误 @hguandl
- 修复了一些乱七八糟的小 bug 太多了以至于我懒得写（ @MistEO @horror-proton @ABA2396
- 更新 文档 @WWPXX233 @martinwang2002 @Rbqwow
-
-
-### For overseas
-
- 新增 繁中服 火蓝之心导航、掉落识别、仓库识别支持 @vonnoq
- 修复 繁中服 基建识别 @vonnoq
- Supported trial mode for the EN client @RiichiTsumo
- Supported some new feautres for the JP Client @liuyifan-eric
- Fixed the operator names and recruitment tags recognition error in the JP client @cat122802501 @liuyifan-eric
-
-### For develops
-
- Added `SingleStep` Task API @MistEO
-
-## v4.10.3
-
- 修复 `保全派驻` 无限重试、第四关前卡住、通关后卡住、战斗结束仍在执行的问题 @MistEO
- 修复 `保全派驻` 内置作业文件名乱码问题 @horror-proton
- 更新 繁中服 第十章导航功能 @vonnoq
-
-## v4.10.2
-
- 新增 `保全派驻` 内置通关作业 @HMZyueshen @AnnoyingFlowers
-  均同时兼容标准和应急模式，请选择 `resource/copilot/` 下对应文件，并参考说明使用
- 修复 `登临意` 活动关卡导航错误 @ABA2396
- 修复 `保全派驻` 应急模式卡住的问题 @MistEO
- 优化 `保全派驻` 调配干员按钮的优先级 @MistEO
- 优化 傀影肉鸽 部分地图策略 @WWPXX233
- 更新 蓝叠模拟器 相关文档 @wordlesswind
-
-## v4.10.1
-
- 更新 `登临意` 活动关卡资源 @MistEO
- 新增 `登临意` 活动关卡导航 @ABA2396
- 修复 `保全派驻` 抄作业一系列 bug @MistEO  
-  目前仍未支持自动编队，请手动编队完成后于“开始部署”界面开始任务。敬请期待后续优化~
- 优化 界面 关卡导航选项及提示 @ABA2396
- 修复 工作目录和临时目录同为中文时，加载资源报错的问题 @MistEO
- 更新 文档 排版 @BTreeNewBee
-
-## v4.10.0
-
- 新增支持 `引航者试炼` 抄作业功能，新增 `MoveCamera` 字段以移动镜头 @MistEO @horror-proton  
-  请参考 [战斗流程文档](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/docs/3.3-%E6%88%98%E6%96%97%E6%B5%81%E7%A8%8B%E5%8D%8F%E8%AE%AE.md) 使用
- 初步支持 `保全派驻` 抄作业功能，请参考 [保全派驻协议](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/docs/3.7-%E4%BF%9D%E5%85%A8%E6%B4%BE%E9%A9%BB%E5%8D%8F%E8%AE%AE.md) 使用 @MistEO  
-  目前 bug 非常多，仅供尝鲜。暂不支持自动编队，请手动编队完成后于“开始部署”界面开始任务。敬请期待后续优化~
- 新增 界面 新版本下载进度显示 @moomiji
- 新增 界面 活动剩余时间提示 @ABA2396
- 优化 资源加载 速度 @dantmnf @MistEO
- 重构 干员头像缓存机制 @MistEO
- 重构 界面 关卡导航列表从 web 获取 @MistEO @ABA2396
- 重写 掉落识别/仓库识别 数量检测算法 @horror-proton @MistEO
- 修复 自动战斗/肉鸽 不停点 CD 干员的问题 @MistEO
- 修复 自动战斗/肉鸽 偶现干员识别错误 @MistEO
- 修复 肉鸽 助战功能 翻页后不识别的问题 @WLLEGit
- 修复 界面 关卡选择为 null 时的崩溃问题 @ABA2396
- 优化 日志、配置文件、缓存文件 等目录结构 @MistEO
- 优化 界面 自定义基建日志打印 @MistEO
- 更新 自定义基建 内置作业界面 @ABA2396
- 更新 文档，更新 加群链接 @MistEO @ntgmc @DavidWang19
-
-### For overseas
-
- Updated game data @MistEO
- Added translations for drop settings @ABA2396
-
-### For develops
-
- Optimized the Rust interface @KevinT3Hu
- Updated Linux tutorial @horror-proton
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -2179,6 +2179,26 @@
            [
                "^令.+",
                "令"
+            ],
+            [
+                ".*弦惊.*",
+                "“弦惊”"
+            ],
+            [
+                ".*逍遥.*",
+                "“逍遥”"
+            ],
+            [
+                ".*清平.*",
+                "“清平”"
+            ],
+            [
+                ".*打字机.*",
+                "“打字机”"
+            ],
+            [
+                ".*耀阳.*",
+                "“耀阳”"
            ]
        ]
    },
@@ -9729,14 +9749,14 @@
        "action": "DoNothing"
    },

-    "Reclamation@Begin":{
+    "Reclamation@Begin": {
        "algorithm": "JustReturn",
-        "next":[
+        "next": [
            "Reclamation@GiveupAlgorithm",
            "Reclamation@StartAlgorithm"
        ]
    },
-    "Reclamation@StartAlgorithm":{
+    "Reclamation@StartAlgorithm": {
        "roi": [
            844,
            569,
@@ -9749,7 +9769,7 @@
            "Reclamation@StartAlgorithm"
        ]
    },
-    "Reclamation@ClickChooseInitUnits":{
+    "Reclamation@ClickChooseInitUnits": {
        "roi": [
            1055,
            0,
@@ -9762,11 +9782,11 @@
            "Reclamation@ClickChooseInitUnits"
        ]
    },
-    "Reclamation@InitSupplyAll":{
+    "Reclamation@InitSupplyAll": {
        "roi": [
-            862, 
-            572, 
-            418, 
+            862,
+            572,
+            418,
            148
        ],
        "action": "ClickSelf",
@@ -9775,12 +9795,18 @@
            "Reclamation@InitSupplyAll"
        ]
    },
-    "Reclamation@ConfirmStart":{
+    "Reclamation@ConfirmStart": {
+        "cache": false,
+        "algorithm": "OcrDetect",
+        "text": [
+            "演算",
+            "开始"
+        ],
        "roi": [
-            874,
-            503,
-            350,
-            212
+            790,
+            497,
+            465,
+            223
        ],
        "action": "ClickSelf",
        "next": [
@@ -9791,10 +9817,13 @@
            "Reclamation@ResetScope"
        ]
    },
-    "Reclamation@SkipAnnounce":{
+    "Reclamation@SkipAnnounce": {
        "algorithm": "OcrDetect",
        "roi": [
-            1109, 0, 171, 151
+            1109,
+            0,
+            171,
+            151
        ],
        "text": [
            "跳过"
@@ -9804,11 +9833,14 @@
            "Reclamation@ConfirmStart#next"
        ]
    },
-    "Reclamation@SkipDailyReport":{
+    "Reclamation@SkipDailyReport": {
        "algorithm": "OcrDetect",
        "cache": false,
        "roi": [
-            539,39,207,134
+            539,
+            39,
+            207,
+            134
        ],
        "text": [
            "今日",
@@ -9816,34 +9848,42 @@
        ],
        "action": "ClickRect",
        "specificRect": [
-            1190, 
-            651, 
-            52, 
+            1190,
+            651,
+            52,
            48
        ],
        "next": [
            "Reclamation@ConfirmStart#next"
        ]
    },
-    "Reclamation@ClickCenterBase":{
+    "Reclamation@ClickCenterBase": {
        "roi": [
-            557, 281, 162, 155
+            557,
+            281,
+            162,
+            155
        ],
        "action": "ClickSelf",
-        "postDelay": 1000,
+        "exceededNext": [
+            "Reclamation@ResetScope"
+        ],
        "next": [
+            "Reclamation@NextDay",
            "Reclamation@ClickAnyZoneOcr",
            "Reclamation@SkipAnnounce",
            "Reclamation@SkipDailyReport",
-            "Reclamation@ResetScope",
            "Reclamation@ClickCenterBase"
        ]
    },
-    "Reclamation@ClickAnyZoneOcr":{
+    "Reclamation@ClickAnyZoneOcr": {
        "algorithm": "OcrDetect",
        "cache": false,
        "roi": [
-            308, 73, 739, 567
+            308,
+            73,
+            739,
+            567
        ],
        "text": [
            "区",
@@ -9855,11 +9895,14 @@
            "Reclamation@ClickAnyZoneOcr"
        ]
    },
-    "Reclamation@StartActionEnter":{
+    "Reclamation@StartActionEnter": {
        "algorithm": "OcrDetect",
        "cache": false,
        "roi": [
-            995, 550, 285, 130
+            995,
+            550,
+            285,
+            130
        ],
        "text": [
            "开始行动",
@@ -9871,10 +9914,13 @@
            "Reclamation@StartActionEnter"
        ]
    },
-    "Reclamation@PrepareAction":{
+    "Reclamation@PrepareAction": {
        "algorithm": "OcrDetect",
        "roi": [
-            996,590,254,130
+            996,
+            590,
+            254,
+            130
        ],
        "text": [
            "行动准备"
@@ -9885,18 +9931,23 @@
            "Reclamation@PrepareAction"
        ]
    },
-    "Reclamation@StartActionConfirm":{
+    "Reclamation@StartActionConfirm": {
        "roi": [
-            962, 65, 311, 522
+            962,
+            65,
+            311,
+            522
        ],
        "action": "ClickSelf",
        "next": [
+            "Reclamation@ClickExitLevel",
            "Reclamation@StartActionPopupConfirm",
            "Reclamation@StartActionConfirm"
        ]
    },
-    "Reclamation@StartActionPopupConfirm":{
+    "Reclamation@StartActionPopupConfirm": {
        "template": "PopupConfirm.png",
+        "templThreshold": 0.7,
        "action": "ClickSelf",
        "roi": [
            630,
@@ -9909,13 +9960,19 @@
            "Reclamation@StartActionPopupConfirm"
        ]
    },
-    "Reclamation@ClickExitLevel":{
+    "Reclamation@ClickExitLevel": {
        "action": "ClickRect",
        "roi": [
-            100, 0, 164, 166
+            100,
+            0,
+            164,
+            166
        ],
        "specificRect": [
-            46, 28, 59, 61
+            46,
+            28,
+            59,
+            61
        ],
        "next": [
            "Reclamation@ExitLevelConfirm",
@@ -9923,9 +9980,12 @@
            "Reclamation@ClickExitLevel"
        ]
    },
-    "Reclamation@ExitLevelConfirm":{
+    "Reclamation@ExitLevelConfirm": {
        "roi": [
-            857, 337, 370, 177
+            857,
+            337,
+            370,
+            177
        ],
        "action": "ClickSelf",
        "next": [
@@ -9933,9 +9993,12 @@
            "Reclamation@ExitLevelConfirm"
        ]
    },
-    "Reclamation@ExitLevelWithEnermyConfirm":{
+    "Reclamation@ExitLevelWithEnermyConfirm": {
        "roi": [
-            855, 335, 372, 181
+            855,
+            335,
+            372,
+            181
        ],
        "action": "ClickSelf",
        "next": [
@@ -9943,11 +10006,14 @@
            "Reclamation@ExitLevelWithEnermyConfirm"
        ]
    },
-    "Reclamation@LevelComplete":{
+    "Reclamation@LevelComplete": {
        "algorithm": "OcrDetect",
        "cache": false,
        "roi": [
-            0, 197, 469, 224
+            0,
+            197,
+            469,
+            224
        ],
        "action": "ClickSelf",
        "text": [
@@ -9961,41 +10027,55 @@
            "Reclamation@LevelComplete"
        ]
    },
-    "Reclamation@ResetScope":{
+    "Reclamation@ResetScope": {
        "roi": [
-            0, 605, 141, 115
+            0,
+            605,
+            141,
+            115
        ],
        "action": "ClickSelf",
        "postDelay": 500,
        "next": [
+            "Reclamation@NextDay",
            "Reclamation@ClickCenterBase",
            "Reclamation@ResetScope"
        ]
    },
-    "Reclamation@NextDay":{
+    "Reclamation@NextDay": {
        "roi": [
-            1055, 0, 225, 177
+            1055,
+            0,
+            225,
+            177
        ],
        "action": "ClickSelf",
-        "postDelay": 1000,
+        "postDelay": 4000,
        "next": [
            "Reclamation@Emergency",
            "Reclamation@NextDay",
            "Reclamation@ConfirmStart#next"
        ]
    },
-    "Reclamation@Emergency":{
+    "Reclamation@Emergency": {
        "action": "DoNothing",
+        "templThreshold": 0.7,
        "roi": [
-            1055, 0, 225, 181
+            1055,
+            0,
+            225,
+            181
        ],
        "next": [
            "Reclamation@ExitAlgorithm"
        ]
    },
-    "Reclamation@ExitAlgorithm":{
+    "Reclamation@ExitAlgorithm": {
        "roi": [
-            0, 0, 160, 154
+            0,
+            0,
+            160,
+            154
        ],
        "action": "ClickSelf",
        "next": [
@@ -10003,9 +10083,12 @@
            "Reclamation@ExitAlgorithm"
        ]
    },
-    "Reclamation@GiveupAlgorithm":{
+    "Reclamation@GiveupAlgorithm": {
        "roi": [
-            684, 569, 273, 151
+            684,
+            569,
+            273,
+            151
        ],
        "action": "ClickSelf",
        "next": [
@@ -10013,8 +10096,9 @@
            "Reclamation@GiveupAlgorithm"
        ]
    },
-    "Reclamation@GiveupAlgorithmConfirm":{
+    "Reclamation@GiveupAlgorithmConfirm": {
        "template": "PopupConfirm.png",
+        "templThreshold": 0.7,
        "action": "ClickSelf",
        "roi": [
            630,
@@ -10027,9 +10111,12 @@
            "Reclamation@GiveupAlgorithmConfirm"
        ]
    },
-    "Reclamation@GiveupReportSkip":{
+    "Reclamation@GiveupReportSkip": {
        "roi": [
-            1074, 537, 183, 180
+            1074,
+            537,
+            183,
+            180
        ],
        "action": "ClickSelf",
        "next": [
@@ -10037,9 +10124,12 @@
            "Reclamation@GiveupSkipConfirm"
        ]
    },
-    "Reclamation@GiveupSkipConfirm":{
+    "Reclamation@GiveupSkipConfirm": {
        "roi": [
-            1082, 547, 198, 157
+            1082,
+            547,
+            198,
+            157
        ],
        "action": "ClickSelf",
        "next": [
@@ -10047,13 +10137,17 @@
            "Reclamation@GiveupSkipConfirm"
        ]
    },
-    "Reclamation@GainReword":{
+    "Reclamation@GainReword": {
        "roi": [
-            556, 559, 179, 161
+            556,
+            559,
+            179,
+            161
        ],
        "action": "ClickSelf",
        "next": [
-            "Reclamation@Begin"
-        ]   
+            "Reclamation@Begin#next",
+            "Reclamation@GainReword"
+        ]
    }
 }
--- a/src/MaaMacGui
+++ b/src/MaaMacGui
--- a/src/MaaWpfGui/Main/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
@@ -427,9 +427,11 @@ namespace MaaWpfGui
        {
            foreach (var item in TaskItemViewModels)
            {
-                if (item.OriginalName == "AutoRoguelike")
+                switch (item.OriginalName)
                {
-                    continue;
+                    case "AutoRoguelike":
+                    case "ReclamationAlgorithm":
+                        continue;
                }

                item.IsChecked = true;
@@ -655,7 +657,7 @@ namespace MaaWpfGui
                {
                    ret &= AppendRoguelike();
                }
-                else if(item.OriginalName == "ReclamationAlgorithm")
+                else if (item.OriginalName == "ReclamationAlgorithm")
                {
                    ret &= AppendReclamation();
                }
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -241,7 +241,7 @@
    <system:String x:Key="Mall">获取信用及购物</system:String>
    <system:String x:Key="Mission">领取日常奖励</system:String>
    <system:String x:Key="AutoRoguelike">自动肉鸽</system:String>
-    <system:String x:Key="ReclamationAlgorithm">自动生息演算</system:String>
+    <system:String x:Key="ReclamationAlgorithm">生息演算</system:String>

    <system:String x:Key="SelectAll">全选</system:String>
    <system:String x:Key="Inverse">反选</system:String>