fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,551 Commits 61 Branches 1,836 Tags
dev-v2
Commit Graph

372 Commits

Author SHA1 Message Date
Constrat
ba631144af fix: perhaps vue fix (#17296) 
* fix: perhaps fix?

* fix: typo

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* fix: forgor

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
 2026-07-08 13:19:24 +08:00
uye
e1b50141bc Revert "docs: fix <object> 标签" 
This reverts commit 756b7d9ba5.
 2026-07-08 13:18:59 +08:00
uye
756b7d9ba5 docs: fix <object> 标签 2026-07-08 13:12:54 +08:00
github-actions[bot]
bb4aaa936a chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28824604000
[skip changelog]
 2026-07-06 21:31:59 +00:00
uye
8a4ffff97b docs: 增加截图相关回调文档 2026-07-07 00:30:53 +08:00
momomochi987
857742dfdc docs: 帳號切換手冊與整合協議補上繁中服說明 
- manual/introduction/startup.md：example 區加入繁中服 Email 帳號範例
- protocol/integration.md：account_name 範例區加入繁中服說明
- ko-kr/manual/introduction/startup.md：移除『不支援全球服 (CN만 가능)』
  字樣，並對齊其他語系的條列範例格式
- zh-tw / zh-cn / en-us / ja-jp / ko-kr 五個語系同步更新
 2026-06-01 17:17:17 +08:00
uye
1a4512976b docs: 补全 指定天数内的理智药 相关文档 2026-05-28 06:50:20 +08:00
uye
b9cbfaa338 docs: skip_tags -> preserve_tags 2026-05-28 06:30:53 +08:00
uye
0289fa0381 feat: 公招保留指定词条 (#16586) 
* feat: 保留指定词条

* chore: wpf 不再传递 skip_robot

* rft: 提取共用方法

* perf: 传参

* rft: 统一使用 PreserveTags

* fix: NameOrTaskType

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2026-05-27 00:46:02 +08:00
萨拉托加
8d236d83c5 fix: RA-4已知问题 (#16821) 
## Summary by Sourcery

为 `Reclamation3.json` 更新 RA Reclamation3 任务配置。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update RA Reclamation3 task configuration for Reclamation3.json.

</details>
 2026-05-23 21:47:38 +08:00
萨拉托加
4f094c68c9 feat: RA-4 (#16749) 
* feat: RA-4

* fix: 修复一些问题

* fix: 继续优化改进

* fix: 继续优化改进

* feat: 添加 RA-4 入口与文档

* perf: 提取 baseTask

* chore: 调整描述

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2026-05-22 22:23:59 +08:00
uye
cb02b83f3d docs: 补充生息演算与小工具相关文档 2026-05-19 23:24:05 +08:00
wryx166
212e9aa605 docs: 设备文档添加 steps/details容器，修复bat代码块格式，处理文档中demo-wrapper的废弃警告 (#16712) 
* docs: 为设备文档添加步骤容器并修正代码块语言
  - 添加 `::: steps` 步骤容器
  - 将 Windows 批处理代码块修正为 `bat`,相应注释改为bat风格
  - i18n

  Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* docs: 处理文档中demo-wrapper的废弃警告
 2026-05-19 20:51:37 +08:00
H2O_MERO
266ae1cda6 chore: 更新基建排班文档中过时的链接 (#16700) 
把基建排班文档中的链接从master存档分支改到了v2分支

## Summary by Sourcery

文档：
- 更新基础调度模式文档（EN/JA/KO/ZH）中的示例 JSON 链接，使其引用 master-v2 分支中的资源。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Documentation:
- Update example JSON links in base scheduling schema docs (EN/JA/KO/ZH)
to reference the master-v2 branch resources.

</details>
 2026-05-18 20:35:40 +08:00
Rbqwow
5787270eed docs: 修正嵌套容器说明 
同时使用 LLM 同步文档 i18n
 2026-05-18 02:27:40 +08:00
travellerse
2239a47229 fix: 界园肉鸽投资模式也启用通宝插件 (#16551) 
fix: 界园肉鸽通宝拾取/交换不受 InvestWithMoreScore 限制
 2026-05-10 16:41:05 +08:00
uye
8815af5533 i18n: 修改手动输入关卡名的悬浮描述 2026-05-09 23:48:42 +08:00
uye
5445962a7b docs: 补全连接阶段的 ClientType 参数说明 2026-05-04 19:13:52 +08:00
srdr0p
1b1bc15aca feat: 支持腾讯应用宝 5.10.56.xx (#16292) 
* feat(connection): 新增腾讯应用宝模拟器支持

在 WinAdapter 和 config.json 中添加应用宝（Androws）模拟器入口。
本次仅支持 ADB Input 方式和官方渠道。

同步更新各语言连接文档（zh/en/ja/ko/tw）及 UI 本地化字符串。

* feat(controller): 为腾讯应用宝新增多渠道与 Minitouch 支持

应用宝的应用与 DisplayId 绑定，需在 connect() 前确定包名。
新增 InstanceOptionKey::ClientType (= 6)，经由
AsstSetInstanceOption -> Assistant::set_instance_option
-> Controller::set_client_type 传递渠道信息；
AdbController::connect 在建立连接时通过 ctrler()->get_client_type()
读取并写入 AdbConnectionContext，用于替换命令模板中的 [PackageName]。

引入 AdbConnectionContext 保存 ADB 连接信息供 Minitouch 使用，
并通过 eventId 标识所绑定的输入设备。
 2026-04-26 23:48:24 +08:00
Leo91314
8e4e4c16ee docs: add FAQ guidance for Windows Defender false positives (#16145) 2026-04-18 10:48:33 +08:00
Frog Chen
50000b988a feat: AVD截图增强的售后（文档、CI变更等） (#16031) 
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
 2026-04-17 22:38:56 +08:00
github-actions[bot]
1d54789dd5 chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24316471820
[skip changelog]
 2026-04-12 21:10:27 +00:00
Goat Boring(山羊博宁88)
f2dcefda54 docs: i18n for install.md (#16214) 
* docs: i18n for install.md

* docs: merge ABA2396 & sourcery-ai[bot] revises

Apply suggestion from @sourcery-ai[bot]

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>

* docs: 略作修改

* i18n: ko-kr

* docs: Apply changes

* i18n: JP

* i18n: zh-tw

* chore: 哭阿刪多了 補回來

* i18n: ko-kr edit

ref 4efd3ac67f

* i18n: EN fix

---------

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2026-04-12 12:37:02 +02:00
Constrat
fe36a0b734 docs: stderr redirection no longer needed for waydroid as it's enabled by default 2026-04-04 10:23:05 +02:00
Constrat
be86e30168 docs: ★ correction 2026-04-01 16:44:04 +02:00
uye
cedcf07fa2 chore: 手动输入关卡支持 OF-1 与 OF-F3 2026-03-28 17:32:43 +08:00
github-actions[bot]
ad04e831de chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/23317076846
[skip changelog]
 2026-03-19 21:11:35 +00:00
uye
42c0d75e89 build: 改为 SelfContained 发布模式 (#16019) 
<img width="3190" height="208" alt="07832262dcc66157005c08cc95a03fd1"
src="https://github.com/user-attachments/assets/84630506-c595-4999-ac7b-9c79f200bb16"
/>
<img width="1753" height="91" alt="b8ee23114f21ed1047697a77e713f1e5"
src="https://github.com/user-attachments/assets/6d781864-9c65-4774-85c7-8c22a1210285"
/>

完整包体积 +67 M
更新包第一次也会大差不多这么多，后面因为增量的原因不会影响

## Summary by Sourcery

记录迁移到自包含（self-contained）的 .NET 部署方式，并相应更新运行时和操作系统支持要求。

新功能：
- 通过自包含部署，将 .NET 运行时打包进 Windows GUI 构建中，从而不再需要单独安装 .NET。

增强改进：
- 在所有支持的语言中明确说明：安装时仅需要 Visual C++ 运行时，因为 .NET 现在已随程序一同提供。
- 更新 Linux/Wine 使用文档，以反映 Windows 构建已包含 .NET 运行时这一事实。
- 重新措辞操作系统支持说明，解释由于运行时和系统组件依赖，MAA 需要 Windows 10 或更高版本。

构建：
- 调整 WPF GUI 项目和依赖设置脚本以使用自包含发布模式，并停止安装外部的 .NET Desktop Runtime。

文档：
- 更新所有语言的常见问题（FAQ）、安装说明和新手指南，使其与新的自包含部署方式和运行时要求保持一致。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Document the switch to self-contained .NET deployment and update runtime
and OS support requirements accordingly.

New Features:
- Bundle the .NET runtime into the Windows GUI build via self-contained
deployment to remove the need for a separate .NET installation.

Enhancements:
- Clarify across all supported languages that only the Visual C++
runtime is required at install time, as .NET is now included.
- Update Linux/Wine usage docs to reflect that the Windows build already
contains the .NET runtime.
- Reword OS support notes to explain that MAA requires Windows 10 or
later due to its runtime and system component dependencies.

Build:
- Adjust the WPF GUI project and dependency setup script to use
self-contained publish mode and stop installing the external .NET
Desktop Runtime.

Documentation:
- Refresh FAQ, installation, and newbie guides in all languages to match
the new self-contained deployment and runtime requirements.

</details>
 2026-03-19 22:56:07 +08:00
AnnAngela
4fb6017103 docs: Modify git clone command to use --single-branch (#16000) 
Co-authored-by: AnnAngela <9762652+AnnAngela@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
 2026-03-15 23:51:46 +08:00
MistEO
5e5e63b2b6 docs: 怎么还有！ 2026-03-14 02:47:55 +08:00
MistEO
9c281e386a docs: missing rename dev-v2 2026-03-14 02:46:58 +08:00
MistEO
afa6711dfa chore: missing rename branch dev-v2 2026-03-14 02:32:45 +08:00
MistEO
a5495f8803 chore: update branch dev to dev-v2 2026-03-14 02:29:11 +08:00
Rbqwow
bbc2f48fe6 docs: 向文档站同步 readme 修改 
[skip changelog]
 2026-03-13 23:29:59 +08:00
Rbqwow
2f4cf12b7e docs: 添加 GitHub Trending 横幅 2026-03-13 23:26:12 +08:00
uye
0a210fbc1e docs: MuMu Screenshot i18n 2026-03-09 00:29:55 +08:00
Lucien Shaw
632d4ef1fe docs: 使文档站中侧边栏的功能介绍板块默认展开 (#15927) 
* feat(website): 增加调整侧边栏目录默认展开状态的markdown元信息配置项

* fix(website): 修复部分markdown元信息默认值不生效的问题

* docs(website): 使功能介绍板块默认展开

* refactor(website): 完善与侧边栏生成相关的部分逻辑
 2026-03-06 09:11:55 +08:00
Status102
b2d8591974 rft!: 自动战斗协议 干员技能默认值变更为 0 (不指定技能) (#15898) 
* rft!: 自动战斗协议 干员技能默认值变更为 0 (不指定技能)

* fix: 检查范围修复
 2026-03-02 23:16:40 +08:00
Constrat
190940dfb7 ci: updates to Resource Updater and clangd (#15758) 
* fix: update classifyType assignment in update_items_data function
(global and txwy are up to date)

* fix: add CMAKE_INSTALL_PREFIX to cacheVariables in CMakePresets.json

* test: cleanup infrast_data

* chore: move submodules behind cache

* fix: CMake configs update for clangd code navigation

* docs: add windows vscode docs

---------

Co-authored-by: soundofautumn <62000745+soundofautumn@users.noreply.github.com>
 2026-02-25 09:57:39 +01:00
github-actions[bot]
ed564d70be chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/22002953703
[skip changelog]
 2026-02-13 21:12:26 +00:00
Goat Boring(山羊博宁88)
e7d2564610 docs: 删除一些过时内容 (#15700) 
* docs: 删除一些过时内容

* docs: Apply suggestion from @sourcery-ai[bot]

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>

---------

Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
 2026-02-13 15:36:13 +08:00
uye
5598ff8ff2 docs: 更新 api 链接 2026-02-12 21:57:07 +08:00
airwish
e137ac81c9 chore: fix casing typo and related context (#15656) 
* chore: fix typo

* typo: "Request" spelling mistake

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
 2026-02-10 23:48:44 +08:00
soundofautumn
84f1bf490c build: Adopt CMake presets for CI and add clangd/VSCode integration (#15595) 
* feat: clangd support

* feat: 完善CMakePresets

* docs: 更新cmake命令

* fix: smoke test run

* docs: 更新vscode开发文档

* feat: 添加执行MaaWpf到cmake中

* feat: 支持全部的presets

* chore: 重新安排顺序

* chore: add some comment

* chore: add more comments

* feat: 简化res-update-game

* chore: 移除多余build

* chore: 统一x64和arm64

* chore: 修正重复忽略.vscode

* feat: vscode cmaketool乱码

* docs: 添加提示
 2026-02-06 23:05:41 +08:00
status102
932c9ca655 docs: 自动战斗作业文档干员技能值范围补上0 2026-02-06 14:57:02 +08:00
yali-hzy
c2716e4ac7 docs: 修正开发文档中的格式错误及笔误 (#15516) 
* fix: 修正开发指南中的格式

* docs: Apply suggestion from @sourcery-ai[bot]

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>

* fix: 修改 zh-tw 中 sln 为 slnx

---------

Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
 2026-01-30 20:43:59 +08:00
uye
6dc510d10a docs: en Coupon 2026-01-19 15:13:33 +08:00
github-actions[bot]
ecd4a33f8d chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/21118556393
[skip changelog]
 2026-01-18 21:04:18 +00:00
uye
75b6315a93 docs: 集成文档统一格式，同时显示 field-group 和示例代码 (#15409) 
* docs: 示例

* docs: ParadoxCopilot

* i18n: tw

* i18n: en

* docs: 荧光棒

* i18n: jp

* docs: 链接未生效

* i18n: kr

* i18n: 肉鸽辅助协议 tw

* i18n: 肉鸽辅助协议 en

* i18n: 肉鸽辅助协议 jp

* i18n: 肉鸽辅助协议 kr

* i18n: JP integrated-strategy-schema

* i18n: EN

* i18n: JP integration

* docs: 移除傀影难度相关描述

* docs: 票券奖励

* docs: 界园全称

* i18n: integrated-strategy-schema for zh-tw

* i18n: integration for zh-tw

---------

Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
 2026-01-18 21:47:33 +08:00
Status102
db1b3b0a8d rft: Wpf一键长草任务配置重构 (#15385) 
* rft: 已重构部分

* rft: 差stageList

* rft: 补上界园常乐

* rft: 备选关卡

* i18n: 添加关卡 & 备选

* fix: 任务添加出错时中断

* fix: 当前上次关卡转换错误

* fix: 当前上次关卡转换错误

* rft: 刷理智任务序列化

* perf: 糊点

* fix: 漏了一个

* rft: 迁移标记

* fix: 加上剿灭

* fix: index漏了

* fix: 重构后的基建计划

* chore: customTask弃用多任务

* perf: 周几选择框动画

* fix: 移除备选CheckBox

* perf: 刷理智-剿灭不上传企鹅

* rft: rename

* feat: 刷理智 周几 设置

* chore: sync

* revert: debug

* revert: 使用备选关卡

* feat: 下拉框

# Conflicts:
#	src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml

* rft: rename

* fix: config

* feat: stageList刷新, 差移除过期关卡

* perf: StageListSource 当日未开放

* fix: bingding

* perf: UI 上下布局

* Revert "perf: UI 上下布局"

This reverts commit df39cb2f09.

* feat: 增加默认隐藏的删除和拖动区域

* chore: 优化触发事件绑定

* perf: 优化全反选按钮布局

* feat: 添加任务列表的删除和重命名

* perf: idle 或 inited 为 false 时禁用删除和重命名

* chore: 确保 StagePlan 有一个元素

* fix: ComboBox无法滚动

* Revert "perf: idle 或 inited 为 false 时禁用删除和重命名"

This reverts commit e0b71b53b6.

* perf: 非 idle 期间禁止重命名或删除任务

* feat: 添加启用周计划勾选框

* perf: 不启用周计划时不重置

* perf: 优化滚动

* fix: 一键长草任务添加或跳过时提示修复

* i18n: TaskQueue 添加任务失败 / 跳过

* feat: config 保存

* perf: 删除任务Dialog增加任务类型文本

* rft: 任务可见rename

* rft: 删除任务 & 任务切换

* perf: 合并备选 & 非备选的关卡选择

* fix: index

* rft: 任务设置界面刷新

* fix: 任务设置界面

* fix: 移除最后一个任务后不会自动选中上一个

* fix: stageList刷新

* perf: 当StageList仅存在一个关卡时隐藏删除按钮

* fix: 刷理智-手动输入关卡代码自动补全

* i18n: 添加关卡

* fix: CreditFightOnceADay set

* fix: ExpectedCollapsalParadigms set

* perf: 移除无用注释 & 变量

* feat: 迁移前加个备份

* fix: 刷理智迁移时重复添加关卡

* fix: 移除信用任务中设置基建任务的UI

* fix: TaskId

* fix: 任务后状态重置

* fix: 基建任务检查

* Revert "fix: 移除信用任务中设置基建任务的UI"

This reverts commit 1f51b5fe00.

* fix: 收取信用任务的基建设置说明

* fix: TaskQueue & 基建房间 拖动容器限制

* fix: CanShowAutoReload

* fix: CustomTask适配

* fix: 任务设置改名删除Context绑定

* perf: 移除 StagePlanItem 的 Index

* rft: TaskId 迁移

* feat: TaskStatus 显示任务颜色

* perf: UI状态颜色 for Light

* perf: config迁移

* fix: base

* perf: 调整界面布局

* perf: 调整运行时任务的颜色，调整圆角

* fix: 拖动标签后无法修改配置

* fix: 部分元素在运行中时未被正确禁用

* fix: 是 move 不是 swap

* docs: 移除文档中关于 `剩余理智` & `备选关卡`中剿灭任务相关的特殊逻辑

* i18n: update introduction\combat for zh-tw

* i18n: KR

* i18n: update zh-tw.xaml

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
 2026-01-18 21:47:11 +08:00