Status102
5c86b4b875
docs: integration zh可读性增强 ( #14756 )
...
docs: integration zh可读性增强 (#14754 )
* docs: integration zh可读性增强
* docs: 再加一点
* docs: all in
* chore: Auto update by pre-commit hooks [skip changelog]
* docs: 去掉点多余的换行
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-11-14 22:22:48 +08:00
Weiyou Wang
80c8f03b24
docs: 自动战斗文档添加 copilot_list, is_raid, is_paradox, loop_times 注释
2025-11-12 15:12:46 +08:00
Weiyou Wang
24bb443e08
docs: 补充 CopilotTask 的文档 ( #14319 )
2025-10-08 19:28:21 +11:00
Lucien Shaw
e461208bf9
chore: 完善容器配置及依赖安装 ( #14208 )
...
格式化工具部分:
1. pre-commit 引入 python 的格式化工具,包括 black(代码格式化)和 isort(对“包导入顺序”的规范)
2. 允许 prettier 对文档站的 markdown 文件格式化
3. 不允许 prettier 对 markdown 文件中的代码块的代码本身进行格式化
4. 升级了 pre-commit 的各个 hook 的版本
5. 优化了 pre-commit 的日志文本显示
容器总览部分:
1. 由原来的单一轻量环境转为区分空环境、轻量环境和全量环境
2. 空环境是裸 Linux 镜像(Ubuntu),为默认环境
3. 轻量环境适合开发文档站前端
4. 全量环境适合开发 MaaCore
5. 目前,全量环境完整包含了轻量环境,轻量环境完整包含了空环境
6. 在仓库 README.md 中更新了三个环境的描述,并将链接分别设置为对应环境的创建链接
**注意:没有修改文档站中的对应文件**
7. 在各个语言的开发指南的最后,移除了 Codespace 部分的“安装额外依赖”相关描述,且将链接设置为全量环境的创建链接
**注意:没有添加“开发文档站”的指南和对应 codespace 的使用方式**
容器的轻量环境和全量环境共有部分:
1. 安装 black 和 isort 包
2. 调整 VS Code 设置,取消先前(对 markdown 文件单独指定 markdownlint 扩展作为格式化工具)的错误设置,现在 markdown 文件仍然使用默认的 prettier 扩展作为格式化工具
3. 引入 markdown-all-in-one 扩展作为语法提示工具
4. 将 node_modules 和 3rdparty 排除在 VS Code 的文本的搜索路径之外
容器的全量环境部分:
1. 为 tools 下的所有 python 脚本安装依赖
2. 使用 tools/maadeps-download.py 下载 maadeps,且将必要二进制文件软链接到 /usr/local/bin/
3. 使用 apt 安装 cmake 和 clangd-20,将后者通过 update-alternatives 设置为系统 clangd 的默认版本
4. 使用 cmake tools 扩展,并按照 Linux 编译方法进行配置
5. 使用 clang-format 作为 c/cpp 的格式化工具,clang-format 程序主体来自 maadeps(已经软链接到 /usr/local/bin/)
6. 使用 clangd 作为 c/cpp 的语法提示工具
7. 将 MaaDeps、install 和 build 排除在 VS Code 的文本搜索路径之外
其它手动调整:
1. 更新文档站的 package.json,指定 pnpm 包管理器的版本
2. 手动保证 markdown 文件中的列表前后有空行(注意到 MarkdownLint 官方规则不一定能精准定位所有“列表前后空行”的问题,详见:https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md032---lists-should-be-surrounded-by-blank-lines )
3. 修改了部分 markdown 文件中的 json 代码块的语法问题
**注意:相同的问题并未全部发现,仅修改了两处**
4. 在 tools 目录中,一处 python 脚本的包名误用(本地包名和某个 pip 包重名),这里修改了相应代码
5. 在 tools 目录中,一处 python 脚本使用了弃用的包 cchardet 的问题,这里更换了推荐使用的功能相近的包并修改了相应代码
自动化脚本提交的修改:
1. 自动格式化了大量 tools 中的 python 脚本
2. 自动格式化了大量 docs 中的 markdown 文件
Commits:
* chore: pre-commit引入black和isort规范py文件
* chore: Auto update by pre-commit hooks [skip changelog]
* chore: devcontainer添加isort扩展,排序python导入
* chore: pre-commit任务命名及更名
* style: isort fix
* chore: Auto update by pre-commit hooks [skip changelog]
* chore: 更新pre-commit的hook版本
* fix: 模块名与第三方库重名,大忌
* chore: 容器构建时额外安装isort
* docs: md -> markdown
* chore: 容器安装python包和maadeps
* fix: 修复过时python包
* chore: 指定pnpm版本
* chore: container支持选择轻量环境
* chore: 去掉rust
* chore: add plain env
* chore: 使用clangd语言服务器
* chore: 无需单独设置markdown的格式化工具
* chore: 更新安装的clangd版本
* docs: 简易文档适配
* docs: 在仓库README中重新编排codespaces相关指引
* chore: Auto update by pre-commit hooks [skip changelog]
* style: 调整缩进
* chore: 格式化工具不用特意排除被gitignore忽略的文件
* chore: sh文件在gitattributes中单列一类
* chore: 格式化docs下的markdown文件
* chore: 暂时不修改md文件中的代码块
* style: 人为明确markdown中的部分列表相关格式
* docs: 补上部分markdown的json代码块中缺失的逗号
* chore: Auto update by pre-commit hooks [skip changelog]
* chore: Auto update by pre-commit hooks [skip changelog]
* fix: 补上tools的服务器排序相关代码中缺失的逗号
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
* chore: 使用maadeps的clangd
* build: 更新maadeps工具链版本
* style: prettier fix
* revert: 还原maadeps版本
* revert: 取消使用maadeps的clangd依赖,改用系统apt安装
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-09-30 19:39:48 +08:00
pre-commit-ci[bot]
5d47ede186
chore: Auto update by pre-commit hooks [skip changelog]
2025-09-23 13:52:02 +08:00
SherkeyXD
5db20fe2c4
docs: 集成文档视觉更新
2025-09-23 02:41:13 +08:00
Weiyou Wang
8d5459d7d2
refactor: 维护信用作战相关功能及其文档 ( #14013 )
...
* refactor: 维护信用作战相关功能及其文档
* docs: i18n
* docs: 格式美化
* fix: 我错了我错了
* fix: 怎么顺序也有关系啊
* docs: 编队 -> 编队栏围的编号; 分队->编队
* docs: hyphen -> en dash
* fix: 修复旧参数警告
2025-09-10 22:56:33 +08:00
uye
0e865982c6
fix: 基建使用队列轮换时如果未勾选对应设施则不进入
...
fix #14019
2025-09-07 16:53:55 +08:00
Lemon-miaow
2aa63c77e6
feat: 新增是否进行线索交流选项 ( #13368 )
...
* feat: 新增是否进行线索交流选项
* chore: Auto update by pre-commit hooks [skip changelog]
* docs: 文档添加参数
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-02 20:32:33 +08:00
status102
c21d15dde6
fix: 移除MaaCore的StartUp任务的client_type空值支持 ( #13318 )
...
* fix: 移除MaaCore的StartUp任务的client_type空值支持
* i18n: KR
---------
Co-authored-by: HX3N <scarlet7518@gmail.com >
2025-07-21 11:03:35 +08:00
uye
3273f7ec7a
docs: 更新肉鸽文档
2025-07-18 17:03:54 +08:00
status102
558746add6
docs: 连战次数auto 文档
2025-05-06 18:11:32 +08:00
Lemon-miaow
ef99f63311
feat: 适配基建队列轮换与干员休整 ( #11252 )
...
* feat: 创建使用游戏内基建配置换班功能 (WPF)
* feat: 基于上游更新适配游戏内基建配置换班功能 (WPF)
* feat: 适配队列轮换与干员休整(Core)
* chore: Auto update by pre-commit hooks [skip changelog]
* feat: 优化基建选项UI
* chore: Auto update by pre-commit hooks [skip changelog]
* perf: enum
* feat: 新增mode值合并infrast_rotation
* docs: 新增一键轮换字段
* rft: 同步 tasks.json 未拆分部分的修改
* perf: 合并界面
* rft: test
* fix: enum binding
搞不懂calcBinding了
* docs: update mode descriptions
* perf: 移除CustomInfrastEnabled
* perf: 简化参数设置
* chore: 添加提示
---------
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 >
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com >
2025-04-29 19:12:27 +08:00
status102
8a85df4a36
perf: 基建信息板收取信用增加开关 ( #12050 )
...
* perf: 基建信息板收取开关
* feat(core): 基建任务会客室领取留言板信用
* i18n: wpf
* fix: 补回遗漏传参,简化调用
* 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>
2025-03-12 09:04:28 +08:00
Hao Guan
6b52105797
feat(mac): 肉鸽参数配置新参数 ( #11866 )
2025-02-12 08:50:32 +08:00
status102
14942259e5
fix: 肉鸽烧水分队兼容
...
fix#11739
2025-02-07 17:14:23 +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
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
Constrat
01e4b2470f
feat: RA2 multi-crafting
2024-12-23 18:07:35 +01: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
Weiyou Wang
79b024ecfb
fix: 修复生息演算任务中的若干问题 ( #10464 )
...
* fix: 修复生息演算无存档刷点模式下队伍中有 1-6 名干员时卡住的 bug
* fix: 添加 <等待直到识别到左下角驻扎地图标> 的任务以增加容错率
* fix: 之前做的 <确认地图视图已重置到原始位置> 的机制没起效
* fix: 防止因加载时间太长而卡住
* fix: 缩小 tool 识别 roi
* fix: 调整下滑动距离和参数
* fix: 在点击 <开始行动> 前确认已点击区域节点
* feat: 从主界面导航到生息演算
* chore: Auto update by pre-commit hooks [skip changelog]
* fix: 补上CloseAnnos#next
* chore: Auto update by pre-commit hooks [skip changelog]
* fix: 增加 <众人会聚之地> 节点点击判定
* doc: 对文档中生息演算任务名和 theme 参数的描述进行纠正
* fix: 加个 preDelay 防止卡住
* fix: 导航没加 theme 无法从 todo list 进入
* chore: 为导航相关 task 国际服 placeholder
* chore: global adaptation for EN
* chore: Auto update by pre-commit hooks [skip changelog]
* chore: global adaptation for JP
* chore: Auto update by pre-commit hooks [skip changelog]
* chore: fill in missing tasks requiring global adaptation
* fix: 为每个 "Tales@RA@StartToday" 派生 task 添加回滚
* chore: global adaptation for KR
* chore: update template for JP
* 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-09-08 19:56:13 +10:00
uye
f4362b44f9
docs: 添加缺失的生息演算参数 ( #10446 )
2024-09-03 20:56:04 +08:00
Rbqwow
d120a04206
refactor: StopGame ( #9658 )
...
* perf: StopGame
* style: rename Intent to packageName
* chore: 不准不选择区服
* fix: 移除其他配置中的抽象 stop 匹配
* style: 统一驼峰
* style: 按照执行顺序重新排序
* feat: 添加回调和文档
* fix: 修复参数传入
* docs: 更新文档
* fix: merge
* chore: 把WSA的配置也改了
* chore: update submodule
---------
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com >
Co-authored-by: Loong <wangl.cc@outlook.com >
2024-08-11 01:50:30 +08:00
Loong
62ffdc73cb
ci: use lychee to check dead links ( #9675 )
...
* ci: use lychee to check dead links
* ci: comment on PR when dead links are found
* docs: fix broken links
2024-07-17 15:26:17 +01:00
Weiyou Wang
c6a9378dbf
docs: 增加关于肉鸽任务刷探索范式功能的说明
2024-07-08 04:29:45 +10:00
uye
57fbe81be1
refactor: website docs **translation needed** ( #9287 )
...
Co-authored-by: wlwxj <d1ve_wh4le@outlook.com >
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com >
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com >
Co-authored-by: HX3N <scarlet7518@gmail.com >
Co-authored-by: Wallsman <63186641+wallsman@users.noreply.github.com >
Co-authored-by: Loong <wangl.cc@outlook.com >
Co-authored-by: 神代綺凛 <i@loli.best >
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com >
2024-07-08 01:57:20 +08:00