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
14,351 Commits 61 Branches 1,836 Tags
14ee103e1925aa0abfa6048e6181c3b3bf787aea
Commit Graph

933 Commits

Author SHA1 Message Date
晓丶梦丶仁
5aa8f17670 docs: 两次大写 Reapply 
[skip changelog]
 2025-02-25 22:27:38 +08:00
Rbqwow
c93302501e docs: 此AI非彼AI (#12005) 
docs: 这规矩你早就懂的
 2025-02-23 18:51:09 +08:00
status102
c8d60f65e0 docs: 作业协议补充难度字段 (#11980) 
* docs: 作业协议补充难度字段

* i18n: 外文文档
 2025-02-21 15:35:23 +08:00
晓丶梦丶仁
4186fb3080 docs: 更新文档 2025-02-19 14:26:19 +08:00
晓丶梦丶仁
bc7774de4d docs: 调整肉鸽文档 skill_usage 描述，尝试 json5 2025-02-17 21:27:17 +08:00
Hao Guan
6b52105797 feat(mac): 肉鸽参数配置新参数 (#11866) 2025-02-12 08:50:32 +08:00
Constrat
eaac213d4f docs: change gamedata repo 2 
[skip changelog]
 2025-02-08 15:21:11 +01:00
status102
14942259e5 fix: 肉鸽烧水分队兼容 
fix#11739
 2025-02-07 17:14:23 +08:00
HeJiYue with no hair
662150c821 docs: 补充自动战斗可能遇到的问题 (#11749) 
* docs:possible problems with supplemental automated combat

* docs: Update faq.md

* docs: 加点东西

* docs: i18n

这日语文档没得救了(悲

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
 2025-02-07 12:43:03 +08:00
Rbqwow
ffab8ec14d docs: 推荐分辨率720P或1080P (#11651) 
* docs: 推荐分辨率720P或1080P

* docs: 学姐太啰嗦辣

* docs: 二选一！
 2025-01-31 09:49:24 +08:00
wryx166
d6eed05b35 docs: 替换.NET8 桌面运行时下载链接为直链 (#11693) 
docs: Update faq.md
 2025-01-30 02:56:23 +08:00
Rbqwow
5f34d3e906 docs: 肉鸽推荐开局策略 (#11570) 
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Saratoga <151550168+Saratoga-Official@users.noreply.github.com>
 2025-01-28 23:36:09 +08:00
Constrat
888582339f feat: discord link for website docs (#11687) 
* feat: discord link for website docs

* i18n: zh-tw tweak

* i18n: jp tweak

* i18n: KR tweak

* i18n: zh-cn

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
 2025-01-28 13:56:48 +01:00
Rbqwow
1bc82628f6 docs: README 移除 MaaX，更换前端仓库地址 (#11636) 2025-01-24 10:15:20 +08:00
DavidWang19
023ed5563f feat: 优化肉鸽刷开局模式的流程和逻辑 (#11559) 
* feat: 新增刷开局模式下是否购物的选项

* chore: 修改傀影开局模板图文件名

* chore: 添加注释

* fix: 修复刷开局模式下不能进入商店的问题

* feat: 添加各肉鸽主题可刷开局 通用：热水壶 盾(血) 源石锭 希望  随机；水月：钥匙 骰子；萨卡兹：构想

* refactor: CheckComboBox 改为 key 在前

* feat: 界面添加开局奖励选择

* fix: ubuntu build

* feat: proxy 添加对应参数

* rft: 拆分烧水奖励领取

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 刷完后直接退出，精二时继续检查

* chore: Auto update by pre-commit hooks [skip changelog]

* perf: 优化肉鸽刷开局模式RoguelikeShoppingTaskPlugin verify

* perf: 简化肉鸽烧水期望传参

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: Wpf传值错误

* perf: 衔接旧流程

* chore: Auto update by pre-commit hooks [skip changelog]

* feat: 支持选择不同的烧水分队和目标分队

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 移除遗漏调用

* fix: 变量名一致化

* chore: 烧水期望奖励翻译预留

* fix: 移除无用的set_task_base

* i18n: 添加开局奖励翻译

* i18n: JP translate

* i18n: KR translate

* i18n: zh-tw translate

* i18n: EN tweak

* chore: 移除不再使用的task

* docs: 加点文档

* docs: 烧水使用分队

* perf: UI

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-01-22 12:57:25 +08:00
BxFS
65b87a5699 feat: 肉鸽月度小队/深入调查基础策略+自动切换 (#11566) 
* feat: 肉鸽月度小队奖励/访谈记录策略 #7058

* i18n: Translation for 809d0db

* fix: place Roguelike@DialogSkip under various Roguelike@Stages, and Roguelike@DialogSkip / Roguelike@DialogSkipConfirm reordering

* feat: tickboxes for AutoIterate on wpf

* style: typo

* feat: Iterate Monthly Squad

* fix: proper insertion point for monthly squad plugin, and task for collecting rewards

* feat: Iterate Deep Exploration

* feat: autoiterate for mizuki, sami and sarkaz

* fix: proper InitialDrop.png for three roguelikes and proper compeletion behaviour for iterate plugins

* fix: use different MonthlySquadRewardMiss.png for each roguelike

* feat: Iterate Monthly Squad Comms Option

* refactor: RoguelikeIterateDeepExplorationPlugin and RoguelikeIterateMonthlySquadPlugin, provision for per theme deep exploration adaptation, and basic adaptation to get it running

* fix: keep Sarkaz@Roguelike@DeepExplorationEnd from intruding other tasks with empty.png, and attempted fix of Phantom@Roguelike@CommsMiss

* fix: predelay 500ms for StartExplore

* fix: reduce retry_times for tasks that expect fail

* refactor: move DifficultySelectionTaskPlugin skip condition from verify to load_params

* style: remove RoguelikeDeepExplorationSpecialParameters::load_params and remove linebreakers for long ProcessTasks

* fix: post rebase fixes

* fix: ChooseMonthlySquad -> MonthlySquad, Template -> OcrDetect for resilience against changed backgrounds, and mac/arm64 compiler compliance

* fix: drop load_params from RoguelikeDeepExplorationSpecialParameters

* fix: added delay for MonthlySquadCommsBackTwice/Once, and some style fixes

* revert: cfc1951a already merged

* refactor: duplicate template removal and replacement with ocr

* refactor: more duplicate template removal

* fix: phantom monthly squad dialog timout, again

* fix: ocr -> template without words, and duct tape for Phantom@Roguelike@StrategyChange so it does not lock up in case stage name wasn't captured

* chore: remove words from noop

* fix: Roguelike@DeepExplorationDark.png -> Phantom@Roguelike@DeepExploration.png

* fix: MonthlySquadCompleted/DeepExplorationCompleted task to callback, and basic machine translation for it

* fix: masking for Roguelike@DeepExploration.png and Roguelike@MonthlySquad.png, removing Roguelike@NormalOperation.png as unused

* chore: slight tweak to maskrange templates

* chore: Auto update by pre-commit hooks [skip changelog]

* refactor: variable names and DeepExplorationNotUnlocked.png masking

* fix: drop the nonexistent Sarkaz@Roguelike@DeepExplorationEnd.png and use default instead

* fix: delay moved from startExplore

* refactor: readability and duplicate removal

* refactor: filename, readability, and task chain adjustment

* perf: RoguelikeMode校验

* fix: retry 1->3, style fix and typo fix

* fix: move set_retry_times to RoguelikeTask

* docs: RoguelikeIterateMonthlySquadPlugin and RoguelikeIterateDeepExplorationPlugin

* fix: make MonthlySquadCommsBackTwice stuck proof

* chore: pick DeepExplorationSpecialParameters out of branch

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2025-01-22 09:04:48 +08:00
Weiyou Wang
a7bdb0b115 doc: 补充 Roguelike 任务 investment_with_more_score 与 start_with_two_ideas 参数的文档 (#11546) 
* doc: 补充 Roguelike 任务 investment_with_more_score 参数的文档

* doc: 补充 Roguelike 任务 start_with_two_ideas 参数的文档
 2025-01-14 22:24:59 +08:00
晓丶梦丶仁
bda924566f docs: 为肉鸽参数 start_with_seed 添加文档 (#11531) 
docs: 为 start_with_seed 添加文档
 2025-01-12 20:20:00 +08:00
晓丶梦丶仁
ae2aaa1e6d feat: 点刺、后勤种子存钱 & ProcessTask 添加 Input 方法 (#11521) 
* feat: 为 ProcessTask 添加文本输入功能

* feat: 点刺、后勤种子存钱

* docs: 为 Input 方法添加文档

* perf: 添加循环刷钱cd检查

* perf: werror

* perf: 改变 Input 的 int 值

* perf: 减少 AsstProxy 传参，改用 c:Binding

* chore: 界面显示和获取分离

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-01-12 20:03:09 +08:00
Alisa
b268cb063d i18n: Translations update from MAA Weblate (#11524) 
i18n: Translated using Weblate (Japanese)

Currently translated at 98.8% (583 of 590 strings)

Translation: MAA Assistant Arknights/Glossary
Translate-URL: https://weblate.maa-org.net/projects/maa/glossary/ja/

Co-authored-by: SplendidNova <SplendidNova@users.noreply.weblate.maa-org.net>
 2025-01-11 23:35:34 +01:00
BxFS
2ec5b06e44 feat: 肉鸽满级自动停止选项 (#11466) 
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2025-01-10 15:27:39 +01:00
Windsland
76c4096761 docs: 肉鸽辅助协议文档翻译 (#11360) 2025-01-06 16:36:51 +01:00
Rbqwow
cc2968c2e9 docs: 更新文档 (#11430) 
* docs: 更新文档

对不起我忘记拆分 commit 了

优化 winget 安装运行库命令
添加 一键修复运行库.ps1
将 image 文件夹重命名为 images
添加账号切换执行时机说明

土下座

Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>

* docs: 跟上学姐的脚步

* fix: cli docs

---------

Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
 2024-12-29 21:34:30 +08:00
uye
0128c309a9 docs: 更新 README (#11398) 
* docs: 更新 README

* i18n: 更新外语 readme

* chore: Auto update by pre-commit hooks [skip changelog]

* chore: 还原误操作

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-12-26 15:19:40 +08:00
Loong
3053680369 chore: bump maa-cli to 0.5.2 (#11428) 2024-12-25 21:56:38 +00:00
Constrat
01e4b2470f feat: RA2 multi-crafting 2024-12-23 18:07:35 +01:00
Rbqwow
14c68fb69d docs: 任务流程协议 管理员权限FAQ 牛牛监控 (#11375) 
* docs: uye

~~我不到啊~~

* docs: 管理员权限 FAQ

* docs: 更新小工具→牛牛监控

* docs: 补充管理员权限FAQ

* docs: 补全UAC FAQ翻译

* docs: 多余的空格

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-12-20 19:47:10 +08:00
momomochi
bde76c94cb i18n: Translated using Weblate (Chinese (Traditional)) 
Currently translated at 98.1% (579 of 590 strings)

Translation: MAA Assistant Arknights/Glossary
Translate-URL: https://weblate.maa-org.net/projects/maa/glossary/zh_Hant/
 2024-12-20 08:24:42 +01:00
Constrat
92144559a9 Revert "refactor: yml -> yaml standardization" 
This reverts commit 0389430f17.
 2024-12-14 14:46:30 +01:00
Constrat
0389430f17 refactor: yml -> yaml standardization 2024-12-14 14:39:01 +01:00
晓丶梦丶仁
2b45705ffd docs: 新手上路增加非 Windows 指引；macOS 和 Android 实体设备添加说明 (#11227) 
* docs: 优化新手上路系统分类

* docs: en

* fix: 双系统说明

* docs: 将非 Windows 用户引向 device/readme, 并细化特殊提示的位置

* docs: 优化mac开发说明

* docs: 补充翻译

* docs: small fix

修改部分语句使能在一行内完整渲染
小写 adb 改成了大写 ADB
人工 pangu.js
对联

* fix: 回滚子模块

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
 2024-12-12 17:48:45 +08:00
Mike Qu
62da79859f docs: 增加Mac模拟器：蓝叠模拟器air版 (#11349) 
* docs: 增加Mac模拟器：蓝叠模拟器air版

* docs: 添加文档中“蓝叠模拟器air版”部分的翻译
 2024-12-12 15:49:59 +08:00
Alisa
2f61a4d31f i18n: Translations update from MAA Weblate (#11255) 
i18n: Translated using Weblate (Japanese)

Currently translated at 98.1% (579 of 590 strings)

Translation: MAA Assistant Arknights/Glossary
Translate-URL: https://weblate.maa-org.net/projects/maa/glossary/ja/

Co-authored-by: SplendidNova <SplendidNova@users.noreply.weblate.maa-org.net>
 2024-11-29 17:33:34 +08:00
AoXuan
fbb8193091 docs: 修改常见问题中的下载/安装问题的描述 (#11229) 2024-11-23 23:55:50 +08:00
hepari
300c2284e4 i18n: Translated using Weblate (Korean) 
Currently translated at 97.7% (577 of 590 strings)

Translation: MAA Assistant Arknights/Glossary
Translate-URL: https://weblate.maa-org.net/projects/maa/glossary/ko/
 2024-11-13 23:07:25 +01:00
Alisa
d847ecfeed i18n: Translations update from MAA Weblate (#11138) 
i18n: Translated using Weblate (Korean)

Currently translated at 96.9% (572 of 590 strings)

Translation: MAA Assistant Arknights/Glossary
Translate-URL: https://weblate.maa-org.net/projects/maa/glossary/ko/

Co-authored-by: hepari <rosmontisu@gmail.com>
 2024-11-12 11:42:15 +01:00
hepari
d30637c3fc docs: update ko-kr docs (#11136) 
* docs: Update copilot.md

* docs: Update reclamation-algorithm.md

* docs: typo copilot.md

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-11-12 15:30:23 +08:00
hepari
f349fa8421 docs: Fix typo in docs/ko-kr/manual/newbie.md (#11134) 2024-11-12 10:29:02 +08:00
Rbqwow
5bbd4923a8 docs: 补充连战次数文档 (#11028) 2024-11-03 10:56:05 +08:00
Rbqwow
902a70db23 docs: 运行库问题 (#10950) 
* docs: 先改改大纲

* docs: 加回来个锚点

* docs: 糊完了

* docs: 加粗下划线

* i18n: 运行库问题

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-10-31 23:13:26 +08:00
Rbqwow
cea619c62f docs: MuMu 网络桥接 (#10953) 
* docs: 追一下最新修改

* i18n: MuMu 网络桥接

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-10-31 22:02:44 +08:00
1lyvianis
9a0013026f docs: 移除赘字 (#10977) 2024-10-31 01:31:53 +08:00
uye
482f013697 feat: 支持肉鸽选难度 (#10918) 
* feat: 支持肉鸽选难度

* chore: Auto update by pre-commit hooks [skip changelog]

* refactor: 补充相关机制

* chore: Auto update by pre-commit hooks [skip changelog]

* feat: 瞎写一个wpf，切系统测试去

* feat: select roguelike difficulty using wpf gui

* fix: 简单修补凹开局密文板功能，等待未来重构

* chore: global adaptation

* refactor: 舍弃 next_difficulty 参数

* refactor: 增加对 RoguelikeMode::Collectible 模式下衍生参数有效性的判定

* rft: 移除run_for_collectible

* chore: Auto update by pre-commit hooks [skip changelog]

* style: format

* chore: 调整肉鸽等级列表初始化

* perf: 减少不必要判断

* fix: 傀影肉鸽修复潜在的干员招募逻辑错误，并添加难度参数校验

* Revert "fix: 傀影肉鸽修复潜在的干员招募逻辑错误，并添加难度参数校验"

This reverts commit 08b715a8eb.

* perf: 难度参数校验

* Revert "rft: 移除run_for_collectible"

This reverts commit cf170750c5.

# Conflicts:
#	src/MaaCore/Task/Interface/RoguelikeTask.cpp
#	src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp
#	src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalStartTaskPlugin.cpp

* fix: 水烧开是 !get_run_for_collectible()，之前我写错了

* doc: 补充 zh-cn 文档

* doc: 补充其他语言的文档（机翻）

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Weiyou Wang <44151844+Alan-Charred@users.noreply.github.com>
Co-authored-by: Weiyou Wang <Weiyou.Wang@anu.edu.au>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-10-29 09:08:22 +08:00
Alisa
5d45fc7ec2 i18n: Translations update from MAA Weblate (#10944) 
i18n: Translated using Weblate (Japanese)

Currently translated at 97.6% (576 of 590 strings)

Translation: MAA Assistant Arknights/Glossary
Translate-URL: https://weblate.maa-org.net/projects/maa/glossary/ja/

Co-authored-by: SplendidNova <SplendidNova@users.noreply.weblate.maa-org.net>
 2024-10-27 11:14:03 +00:00
Alisa
9f24927367 i18n: Translations update from MAA Weblate (#10930) 
i18n: Translated using Weblate (Japanese)

Currently translated at 97.4% (575 of 590 strings)

Translation: MAA Assistant Arknights/Glossary
Translate-URL: https://weblate.maa-org.net/projects/maa/glossary/ja/

Co-authored-by: SplendidNova <SplendidNova@users.noreply.weblate.maa-org.net>
 2024-10-26 19:59:02 +08:00
Loong
62dd266c63 chore: bump maa-cli to 0.5.1 (#10899) 2024-10-24 18:19:06 +08:00
uye
fcbf8838c7 chore: 调整雷电自动检测支持端口 2024-10-21 15:23:30 +08:00
Rbqwow
c85c66a126 docs: 更新文档（自动检测 雷电端口 截图增强） (#10753) 
* docs: 添加`自动检测`文档

* docs: 再改改新手上路

* docs: 主要是添加雷电连接地址

* docs: 雷电给文档了

* docs: 为什么要填写 7555！

* docs: 那就让我把 MuMu 6 亲手结束掉

* fix: typo

* docs: update link

* docs: update .net8 link

* docs: 删掉一些过时的版本说明

* docs: 我明明是来洗白这个安装器的

* chore: make markdownlint happy

* docs: 我或许一辈子都用不上 MuMu 的网络桥接了

* docs: 差劲的审美
 2024-10-21 00:51:18 +08:00
晓丶梦丶仁
a3b483ffe8 docs: 更新肉鸽文档 (#10807) 2024-10-21 00:41:11 +08:00
Rbqwow
4ffde96d99 docs: MuMu 截图增强适配后台保活&雷电截图增强文档 (#10783) 
* docs: 文档也适配 MuMu 后台保活了！

* docs: 玛丽没改！

* i18n: translate

* docs: update ld support version

* docs: 明确版本

* docs: update docs

* fix: typo

* i18n: kr tweak connection.md

* chore: 多行对齐问题

---------

Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-10-18 00:48:58 +08:00