Release v5.0.0-beta.1 (MaaAssistantArknights#7951)

.github/workflows/ci.yml

@@ -108,13 +108,18 @@ jobs:
           show-progress: false
 
       - name: Cache .nuke/temp, ~/.nuget/packages
+        id: cache-nuget
         uses: actions/cache@v3
         with:
           path: |
             .nuke/temp
             ~/.nuget/packages
           key: ${{ runner.os }}-${{ matrix.msbuild_target }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
 
+      - name: Restore dependencies
+        if: steps.cache-nuget.outputs.cache-hit != 'true'
+        run: dotnet restore
+
       - name: Bootstrap MaaDeps
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -142,7 +147,7 @@ jobs:
               $match = "0.0.1"
           }
           [xml]$csproj = Get-Content -Path $csprojPath
-          $node = $csproj.Project.PropertyGroup | where {$_.AssemblyName -ne $null}
+          $node = $csproj.Project.PropertyGroup | where {$_.ApplicationVersion -ne $null}
           $node.InformationalVersion = $tag
           $node.Version = $match
           $node.FileVersion = $match

.github/workflows/release-nightly-ota.yml

@@ -45,7 +45,6 @@ jobs:
           #ref: ${{ inputs.ref }}
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
-          show-progress: false
 
       - name: Checkout ref
         run: |
@@ -91,12 +90,17 @@ jobs:
           echo "main_tag_name=$main_tag_name" >> $env:GITHUB_OUTPUT
 
       - name: Cache .nuke/temp, ~/.nuget/packages
+        id: cache-nuget
         uses: actions/cache@v3
         with:
           path: |
             .nuke/temp
             ~/.nuget/packages
           key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
+
+      - name: Restore dependencies
+        if: steps.cache-nuget.outputs.cache-hit != 'true'
+        run: dotnet restore
 
       - name: Bootstrap MaaDeps
         run: |

.github/workflows/smoke-testing.yml

@@ -33,16 +33,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           show-progress: false
-
-      - name: Setup NuGet
-        uses: NuGet/setup-nuget@v1.2.0
-
-      - name: Restore NuGet packages
-        run: |
-          nuget restore MAA.sln
-          if ($LASTEXITCODE) { nuget restore MAA.sln }
-          if ($LASTEXITCODE) { nuget restore MAA.sln }
-
+
+      - name: Restore dependencies
+        run: dotnet restore
+
       - name: Bootstrap MaaDeps
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,51 +1,52 @@
-## v4.28.8
+## v5.0.0-beta.1
 
 ### 新增 | New
 
-- 萨米肉鸽新板子 @ABA2396
-- 更新繁中服生息演算最後一天的日期 (#7903) @momomochi987
-- 初步适配萨米肉鸽dlc关卡等 (#7924) @Lancarus
+- dotnet8.0 (#7554) @hxdnshx @SherkeyXD @LiamSho @ABA2396 @moomiji
+- 增加肉鸽刷开局模式下只凹精二选项 (#7705)  @s-yh-china
 
 ### 改进 | Improved
 
-- 修改 前行的林地 默认选择 @ABA2396
-- 优化萨米肉鸽部分关卡逻辑 (#7925) @Lancarus
-- 捕获启动模拟器时产生的权限不足异常 (#7908) @Chiichen
+- 优化萨米锏精二优先度 (#7939) @Lancarus
+- 优化萨米肉鸽部分关卡逻辑 (#7936) @Lancarus
+- update skill_ready_cls model (#7733) @MistEO
+- 优化萨米肉鸽部分关卡逻辑 (#7935) @Lancarus
+- 优化肉鸽作战逻辑，使不能空放的干员技能不影响后续部署指令的执行 (#7934) @Lancarus
+- 优化刷理智-已开始战斗x次时临期理智药使用输出以增加可读性 (#7846) @status102
+- 优化截图耗时额外提示文本触发条件，改为由平均耗时触发 (#7868) @status102
+- 优化部分插件判断 @status102
+- 减少重复截图 (#7945) @zzyyyl
+- 优化连续战斗次数列表展开图片 @status102
 
 ### 修复 | Fix
 
-- 勾选启动后直接最小化时无法使用右键强制显示 @ABA2396
-- 使用启动旧版.cmd启动后下次更新报错 @ABA2396
-- 下调检测阈值以尝试修复刷理智卡在次数选择 fix #7919 @status102
 - 修复部分情况下肉鸽结算点击错误 @status102
 - 修复肉鸽-刷钱模式下仍然会在商店进行招募、购物的错误 (#7863) @status102
-- 清剩余理智时卡在选择次数 @ABA2396
-- 修复README的一处链接错误 (#7905) @Chiichen
-- 修复肉鸽刷源石锭模式卡住的问题 (#7882) @zzyyyl
-- EN服 无法自动吃大理智药 @ABA2396
-- 提供打不开MAA_win7.exe的处理方法 @ABA2396
-- 修复部分情况下，关卡掉落识别关卡名出错 @status102
-- 博朗台模式识别理智回复时间大于6分钟则返回失败 @ABA2396
-- reduced Mizuki@Roguelike@MissionFailedFlag threshold for iOS fix #7864 temporary fix as #7872 exists @Constrat
-- fix SyncRes build error @dantmnf
-- ClickedCorrectStage more ocrReplace regex @Constrat
+- 配置修改后无法保存 @ABA2396
+- 修复刷理智结束时理智输出错误 @status102
+- 干员识别报错 @ABA2396
+- 开机自启功能异常 @ABA2396
+- 修复基建排班的 JSON schema (#7788) @wangl-cc
+- 自动战斗群组中多名干员在编组中时不会选择 @ABA2396
+- EN Challenge mode battle list @Constrat
+- Template diagram missing from EN/JP @Constrat @Manicsteiner @zzyyyl @HX3N
 
 ### 其他 | Other
 
-- subprocess handle leak @dantmnf
-- 版本兼容 @ABA2396
-- 修复SSS_自走机械搏斗场_浊蒂重岳塞雷娅泥岩_速冷脚本没有文件名后缀的错误 (#7879) @junyihan233
-- 移除 StageEncounterClickToLeave 任务 (#7887) @zzyyyl
-- 兼容旧版本语言特性 @ABA2396
-- ui 和 core 版本不一致时开始任务添加 waring 提示 @ABA2396
-- 修改公招多选tag选项描述 @broken-paint
-- net8后不进行MAA_win7.exe备份 @ABA2396
-- 修改readme中最大分辨率为2k @status102
-- YoStarKR ocrReplace regex fix @HX3N
-- YoStarKR LE stage navigation @HX3N
-- YoStarKR template image replacement @HX3N
-- YosrarEN Lingering Echoes stage navigation @Constrat
-- YoStarJP 塵影に交わる残響 復刻 navigation (#7888) @Manicsteiner
-- YoStarJP roguelike nextlevel ocr (#7859) @Manicsteiner @Constrat
-- changed template YostarEN I.S. enter @zzyyyl @Constrat
-- update instruction for waydroid @horror-proton
+- 谁把我fody删了 @Cryolitia
+- 未在字典中的连接配置在使用自动检测时报错 @ABA2396
+- optimize template in 5e4002b058bc928a5e4b7c1dbd43f164682bbaf7 @zzyyyl
+- 修复并无损压缩模板图片 (#7831) @zzyyyl
+- 解决冲突 @ABA2396
+- 删除没有用到的 task @zzyyyl
+- 肉鸽设置追加部分注释 @status102
+- 一键长草期间锁定自动肉鸽设置以符合执行逻辑 @status102
+- 调整剩余理智关卡的说明 @status102
+- gitignore FodyWeavers.xsd @ABA2396
+- added ps1 for cloning ResourceUpdater repo for local developing @Constrat
+- YoStarKR ocrReplace regex fix (#7901) @HX3N
+- YoStarKR ocrReplace text replacement (#7897) @HX3N
+- YoStarKR LE stage navigation (#7896) @HX3N
+- YoStarKR template image replacement (#7895) @HX3N
+- YoStarKR LE Stage navigation (#7894) @HX3N
+- YoStarKR ocr text replacement (#7845) @HX3N

MAA.sln

@@ -10,6 +10,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaaWpfGui", "src\MaaWpfGui\
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaaCore", "src\MaaCore\MaaCore.vcxproj", "{362D1E30-F5AE-4279-9985-65C27B3BA300}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaaThriftController", "src\MaaThriftController\MaaThriftController.vcxproj", "{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{11F02235-5785-408B-9651-8A4B41FF36F4}"

MAA.sln.DotSettings

@@ -40,6 +40,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=autofill/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bilibili/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bluestacks/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bsconsole/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=desp/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=dnplayer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Ehem/@EntryIndexedValue">True</s:Boolean>
@@ -51,16 +52,19 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=foldartal/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=furni/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gacha/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gavial/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Grandet/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Hotkey/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hwnd/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Infrast/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Inited/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ldconsole/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Lolicon/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=lpwndpl/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ls_005B_0022sub/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=luestacks/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=maatouch/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=memuc/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Minitouch/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mizuki/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Nemu/@EntryIndexedValue">True</s:Boolean>

docs/maa-infra.schema.json

@@ -42,7 +42,9 @@
                 "period": {
                     "type": "array",
                     "description": "Period list.",
-                    "$ref": "#/definitions/planPeriod"
+                    "items": {
+                        "$ref": "#/definitions/planPeriod"
+                    }
                 },
                 "duration": {
                     "type": "number",
@@ -83,7 +85,7 @@
             "type": "object",
             "description": "Fiammetta configuration.",
             "properties": {
-                "enabled": {
+                "enable": {
                     "type": "boolean",
                     "description": "Enable Fiammetta."
                 },
@@ -106,7 +108,7 @@
                 }
             },
             "required": [
-                "enabled",
+                "enable",
                 "target",
                 "order"
             ]
@@ -115,7 +117,7 @@
             "type": "object",
             "description": "Drones configuration.",
             "properties": {
-                "enabled": {
+                "enable": {
                     "type": "boolean",
                     "description": "Enable drones."
                 },

docs/协议文档/集成文档.md

@@ -214,7 +214,7 @@ AsstTaskId ASSTAPI AsstAppendTask(AsstHandle handle, const char* type, const cha
                             // 1 - 刷源石锭，第一层投资完就退出
                             // 2 - 【即将弃用】两者兼顾，投资过后再退出，没有投资就继续往后打
                             // 3 - 开发中...
-                            // 4 - 烧热水，到达第三层后直接退出
+                            // 4 - 刷开局，到达第三层后直接退出
     "starts_count": int,    // 开始探索 次数，可选，默认 INT_MAX。达到后自动停止任务
     "investment_enabled": bool, // 是否投资源石锭，默认开
     "investments_count": int,
@@ -224,6 +224,8 @@ AsstTaskId ASSTAPI AsstAppendTask(AsstHandle handle, const char* type, const cha
     "squad": string,        // 开局分队，可选，例如 "突击战术分队" 等，默认 "指挥分队"
     "roles": string,        // 开局职业组，可选，例如 "先手必胜" 等，默认 "取长补短"
     "core_char": string,    // 开局干员名，可选，仅支持单个干员中！文！名！。默认识别练度自动选择
+    "start_with_elite_two": bool  // 是否在刷开局模式下凹开局干员精二直升，可选，默认 false
+    "only_start_with_elite_two": bool  // 是否只凹开局干员精二直升且不进行作战，可选，默认 false，start_with_elite_two为true时有效
     "use_support": bool,  // 开局干员是否为助战干员，可选，默认 false
     "use_nonfriend_support": bool,  // 是否可以是非好友助战干员，可选，默认 false，use_support为true时有效
     "refresh_trader_with_dice": bool  // 是否用骰子刷新商店购买特殊商品，目前支持水月肉鸽的指路鳞，可选，默认 false

qodana.yaml

@@ -22,8 +22,14 @@ exclude:
       - vsts/QodanaScan
       - src/MaaWpfGui/Views
       - src/MaaCore
+      - src/MaaWpfGui/MaaWpfGui.csproj
+      - src/MaaWpfGui/app.manifest
+      - src/MaaWpfGui/.editorconfig
+  - name: ArrangeTrailingCommaInMultilineLists
+  - name: ArrangeTrailingCommaInSinglelineLists
   - name: CppUnreachableCode
   - name: CppUnusedIncludeDirective
+  - name: InvalidXmlDocComment
+  - name: RedundantArgumentDefaultValue
   - name: Xaml.RedundantNamespaceAlias
-  - name: ArrangeTrailingCommaInMultilineLists
-  - name: ArrangeTrailingCommaInSinglelineLists
+  - name: Xaml.UnexpectedTextToken