Compare commits

...

5910 Commits

Author SHA1 Message Date
zzyyyl
03f719645a feat: 改进包含 #self 的减法运算
self_name + #self ^ self_name = #none
2025-09-24 00:07:45 +08:00
Rbqwow
e0860ed779 docs: 补充vsc插件繁中文档
refer to a872081615
2025-09-23 14:32:12 +00:00
Rbqwow
1324165cfe docs: 修复文档站readme盾换行 2025-09-23 13:58:15 +00:00
Lucien Shaw
96aa7ada11 docs: 调整文档站的标题和尾注文本显示 (#14213)
* chore: 更新plume主题版本

* chore: 更新文档站尾注配置

* i18n: 调整多语言的默认网站标题

* docs: 调整首页的网页标题

* docs: 文档站首页MAA标题加阴影
2025-09-23 21:36:58 +08:00
Rbqwow
ca3160bd72 docs: 更新网页开发相关文档 (#14167)
* docs: vuepress-theme-hope --> vuepress-theme-plume

* docs: website --> docs

* chore: 添加 preview 图片

* feat: 添加回图片相关插件

* perf: logo 超级压缩

* perf: preview 也超级压缩

* docs: 找 GPT-5 Thinking 翻译了一下日语的本地部署

* chore: 预览图还是得走一下网页镜像

* i18n: JP

* docs: 修复损坏的超链接

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

* chore: 这东西是怎么混进来的

---------

Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-09-23 17:49:19 +08:00
Manicsteiner
c3bac8b504 chore: YostarJP sami roguelike 720p (#14210) 2025-09-23 10:53:52 +02:00
zzyyyl
642c62498c docs: 完善任务流程协议文档 (#13232)
* docs: 完善任务流程协议文档

* docs: English version of task-schema.md

* docs: markdown-lint
2025-09-23 14:21:37 +08:00
zzyyyl
56cf52808d docs: markdown pre-commit 2025-09-23 14:16:39 +08:00
pre-commit-ci[bot]
5d47ede186 chore: Auto update by pre-commit hooks [skip changelog] 2025-09-23 13:52:02 +08:00
萨拉托加
a48fe44663 chore: 水月萨米肉鸽不期而遇避战
fix #14207
2025-09-23 13:32:47 +08:00
nekosu
a872081615 docs: add extension's evaluating feature 2025-09-23 11:43:42 +08:00
Constrat
485ef8fcbf fix: prettier 2025-09-23 00:28:47 +02:00
Manicsteiner
c450e596f7 chore: YostarJP Mizuki StageEncounter (#14206) 2025-09-22 23:27:18 +02:00
SherkeyXD
f9c16319a8 docs: 回调消息协议文档视觉更新 2025-09-23 03:01:56 +08:00
SherkeyXD
5db20fe2c4 docs: 集成文档视觉更新 2025-09-23 02:41:13 +08:00
SherkeyXD
e12c7f948d docs: 文档启用b站视频播放功能 2025-09-23 02:03:57 +08:00
SherkeyXD
cb546b4370 docs: 文档添加字段容器功能 2025-09-23 02:01:29 +08:00
SherkeyXD
c193b26b62 docs: 文档添加功能 2025-09-23 01:56:38 +08:00
SherkeyXD
91c8a22d1c docs: 更新文档编写指南 2025-09-23 01:56:38 +08:00
SherkeyXD
b8205b5593 docs: add telegram icon 2025-09-23 01:56:38 +08:00
MistEO
68248df197 docs: 标题MAA统一采用缩写 2025-09-23 01:41:48 +08:00
MistEO
db98bb370e chore: 再次调整文档站标题( 2025-09-23 01:35:56 +08:00
MistEO
bf2375a44f chore: 调整文档站标题 2025-09-23 01:32:20 +08:00
Rbqwow
d12fb7d565 refactor: devcontainer.json (#14169)
* chore: cleanup devcontainer.json

* chore: 配置devcontainer环境

* build: 更新conda配置

* chore: 更新pnpm包的安装允许列表

---------

Co-authored-by: Lucien Shaw <myxlc55@outlook.com>
2025-09-23 00:53:41 +08:00
Lucien Shaw
9838dec4fd fix: 文档首页语言选择按钮的宽度定义方式 (#14199) 2025-09-22 22:11:54 +08:00
uye
793d03d47b feat: 设置指引添加更新设置 2025-09-22 20:31:35 +08:00
uye
56d796c92e feat: 统一显示效果 2025-09-22 19:36:00 +08:00
uye
aae995aef5 feat: 设置指引添加性能设置 2025-09-22 19:36:00 +08:00
萨拉托加
9159e5d979 fix: 傀影肉鸽无法识别四结局 (#14193)
* fix: 傀影肉鸽无法识别四结局

既然MAA能打就加个模板比较好?

* 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>
2025-09-22 16:27:54 +08:00
萨拉托加
705c5a4c68 fix: GamePassSkip2识别到错误的跳过
看录屏发现的,GamePassSkip1之后可能会出现一个一闪而过的GamePassSkip2被maa识别到,好抽象
2025-09-22 16:14:37 +08:00
Rbqwow
a563b14f47 refactor: 重写完成后动作仅一次的ui字符串 (#14196) 2025-09-22 14:44:49 +08:00
uye
400fd6bf53 chore: 贸易站没其他好用的人再用锏 2025-09-21 19:07:33 +08:00
萨拉托加
2915338cac fix: 萨米肉鸽不期而遇避战
fix #14192
2025-09-21 16:53:48 +08:00
uye
09dc393c98 docs: Update CHANGELOG with recent changes and fixes 2025-09-21 14:06:55 +08:00
uye
0650cdb64e Release v5.25.0 (#14184) 2025-09-21 13:54:51 +08:00
github-actions[bot]
385c521eb4 docs: Auto Update Changelogs of v5.25.0 (#14185)
* docs: Auto Generate Changelog of Release v5.25.0

* docs: 更新 v5.25.0 版本变更日志,增加自动战斗和基建换班功能的优化说明

* docs: 更新 v5.25.0 版本变更日志,增加对自动战斗和基建换班功能的详细说明

* docs: 修复 CHANGELOG.md 中的格式问题

* docs: 修复 CHANGELOG.md 中的拼写错误

* docs: Update dependencies and change CDN provider

Updated project dependencies and switched to a new CDN provider for improved access speed.

* docs: 更新依赖库并更换官网和 API 节点的 CDN 提供商,优化访问速度

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-09-21 13:54:32 +08:00
萨拉托加
a37a74a4e2 fix: 现买现印选项
fix #14188
2025-09-21 12:22:02 +08:00
MistEO
1d2d49920a chore: 整理文档站 social 链接 2025-09-21 11:40:23 +08:00
MistEO
da82e14efc chore: 删除文档站不知道有啥用的文件? 2025-09-21 11:36:01 +08:00
MistEO
ad9103ea12 docs: 修改文档站导航栏跳转 2025-09-21 11:35:47 +08:00
nekosu
26296b3b82 docs: Maa Pipeline Support 扩展文档 (#14110)
* doc: cache

* doc: vsc ext doc skeleton

* fix: svg ref

* doc: optimize

* docs: 在任务流程协议文档中添加扩展使用提示

* docs: add en translation

* docs: 补充跳转超链接

---------

Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
2025-09-21 04:31:14 +08:00
Constrat
72ba949f1c chore: remove comment on script 2025-09-20 21:22:47 +02:00
Constrat
1102771ea1 ci(tools): add stale cache cleanup script 2025-09-20 20:48:51 +02:00
Constrat
9d9f95ea4a i18n: fix english for main page 2025-09-20 20:48:36 +02:00
MistEO
0e33a53068 feat: add docs icon 2025-09-21 01:05:26 +08:00
uye
081c0b7597 chore: 调整 锏 基建技能效率 2025-09-20 19:46:52 +08:00
uye
e3de09ddcc Release v5.25.0-beta.5 (#14180)
准备发正式版了,这个之后先别进 pr
2025-09-20 14:19:34 +08:00
github-actions[bot]
81e22e5bf9 docs: Auto Update Changelogs of v5.25.0-beta.5 (#14181)
* docs: Auto Generate Changelog of Release v5.25.0-beta.5

* docs: Update CHANGELOG with recent fixes and enhancements

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-09-20 14:17:20 +08:00
uye
424687c3e1 fix: 成就列表解锁时间显示颜色错误 2025-09-20 14:08:34 +08:00
uye
94e6fabb76 fix: GO 导航 2025-09-20 14:02:41 +08:00
uye
8d346ed392 fix: 勾选启动后直接运行时无法自动切换基建排班表
fix #14173
2025-09-20 13:51:16 +08:00
soundofautumn
fd3204e965 chore: fix build warning (#14176)
0>RunningState.cs(49,46): Warning CS8622 : “void RunningState.TimeoutReminderTimer_Elapsed(object sender, ElapsedEventArgs e)”的参数“sender”类型中引用类型的为 Null 性与目标委托“ElapsedEventHandler”不匹配(可能是由于为 Null 性特性)。
0>RunningState.cs(41,17): Warning CS8618 : 在退出构造函数时,不可为 null 的 事件 "TimeoutOccurred" 必须包含非 null 值。请考虑添加 "required" 修饰符或将该 事件 声明为可为 null。
0>RunningState.cs(80,46): Warning CS8625 : 无法将 null 字面量转换为非 null 的引用类型。
0>RunningState.cs(80,52): Warning CS8625 : 无法将 null 字面量转换为非 null 的引用类型。
0>RunningState.cs(38,37): Warning CS8618 : 在退出构造函数时,不可为 null 的 字段 "_instance" 必须包含非 null 值。请考虑添加 "required" 修饰符或将该 字段 声明为可为 null。
2025-09-20 13:43:07 +08:00
uye
7109310145 fix: 网络连接错误的情况下读取了本地缓存也提示了获取热更成功 2025-09-20 13:38:48 +08:00
soundofautumn
a424520a1d chore: rename RecognizerViewModel -> ToolboxViewModel (#14177)
* chore: rename RecognizerView -> ToolboxView

* chore: 重新排序顺序使得和ui顺序一致
2025-09-20 13:37:53 +08:00
github-actions[bot]
b98ae1be2d chore: Auto Update Game Resources - 2025-09-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17875323432

[skip changelog]
2025-09-20 04:31:07 +00:00
萨拉托加
5eaf466128 fix: 萨米肉鸽未通关结局时探寻前路卡住 2025-09-19 17:21:41 +08:00
github-actions[bot]
8dc7893459 chore: Auto Update Game Resources - 2025-09-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17853878149

[skip changelog]
2025-09-19 09:09:19 +00:00
MistEO
e891471750 ci: remove website aws config 2025-09-19 15:23:24 +08:00
Lucien Shaw
9014a20c25 fix: 文档站首页在窄屏下的响应式设计 (#14166) 2025-09-19 15:14:16 +08:00
Lucien Shaw
4280d9356a fix: 暂时修复无法读取过去的评论的问题 (#14163) 2025-09-19 14:41:33 +08:00
Manicsteiner
b8e739bcad chore: YostarJP ocr fix (#14134)
* chore: YostarJP ocr fix

* chore: item30165, ja-jp xaml, 随到随取

* i18n: RA task mode
2025-09-19 11:36:02 +08:00
Constrat
f9c76d4995 fix: Eye For an Eye encounter IS2 EN 2025-09-19 00:42:52 +02:00
Lucien Shaw
28ca820784 docs: 完善文档站的代码检查和涉及的文本替换 (#14156)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-09-18 23:53:59 +08:00
Lucien Shaw
d8dbec69ca docs: 完善自动肉鸽和其它文档中的部分内容 (#13924)
* docs: 在中文文档的连接设置中添加一处关于隐藏目录的提示

* docs: 在中文的自动肉鸽文档中完善关于蓝图测绘分队的提示

* i18n: EN is.md

* i18n: connetion for all

* docs: ko-kr is

* docs: kr fix typo

* docs: 完善了英文的自动肉鸽文档中的部分措辞

修改部分开局推荐提示的措辞和语法,使其和表格中的其它提示一致
使用罗马数字专用符号`Ⅱ`代替两个拉丁字母`II`

* docs: 更新繁体中文自动肉鸽文档中的开局推荐

* docs: 更正三种语言自动肉鸽文档中的傀影肉鸽开局推荐难度

更正简中、英文、韩文的自动肉鸽文档中傀影肉鸽开局推荐难度(繁中文档不适用;日文文档没有这一部分)

* docs: 只是改个语序

* i18n: JP

* docs: 调整简中和日语的自动肉鸽文档的表格缩进

* docs: 在繁中的自动肉鸽文档中添加最后更新日期

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
2025-09-18 23:26:23 +08:00
SherkeyXD
ada9b0849b docs(rft): 切换文档主题至 vuepress-theme-plume (#13821)
Co-authored-by: Lucien Shaw <myxlc55@outlook.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2025-09-18 18:26:14 +08:00
uye
99e64b3ea8 chore: 调整会客室中更容易获得线索板上尚未拥有的线索的技能优先级 2025-09-18 18:01:26 +08:00
uye
e7be333557 chore: 基建把 u酱 ban 了 2025-09-18 15:38:03 +08:00
github-actions[bot]
8da2271af1 chore: Auto Templates Optimization
Triggered by 7b58ddee5b

[skip changelog]
2025-09-18 07:01:41 +00:00
uye
7b58ddee5b fix: 为什么 mujikca 的图黑的不够纯粹 2025-09-18 14:51:36 +08:00
萨拉托加
fcfa9c033c fix: 肉鸽在结算界面卡死 (#14145)
* fix: 肉鸽通关后有概率无法跳过剧情导致卡死或出错

有概率无法跳过卡在Roguelike@ClickToStartPoint里

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

* fix: 肉鸽还是卡结算界面,改一下ClickToStartPoint位置

* fix: 导航肉鸽时有概率识别到回弹动画状态的入口

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-09-18 14:41:41 +08:00
Loong
1992af7159 feat: cli 支持新版战斗列表以及悖论模拟 (#14154)
chore: bump maa-cli to 0.5.9
2025-09-18 14:38:54 +08:00
Constrat
a6b5101e0c ci: update cache scripts 2025-09-18 02:20:27 +02:00
github-actions[bot]
e03a96774d chore: Auto Update Game Resources - 2025-09-17
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17809390023

[skip changelog]
2025-09-17 20:08:55 +00:00
status102
261ddc49d9 fix(core): CopilotTask参数可选项存在性检查 2025-09-18 00:43:17 +08:00
Lucien Shaw
bb735b6ee7 feat: 为官网首页添加多语言支持 (#13943)
* build: 引入react i18n组件

* i18n: 加载多语言支持模块

* i18n: 添加语言切换按钮

* i18n: 添加网页下载按钮多语言支持

* build: 更新typescript依赖

* fix: 修复callback导致语言切换不生效的问题

* i18n: 完成首页所有元素的多语言支持

* chore: 删除冗余代码

* i18n: 优化了语言切换按钮的交互逻辑并添加多语言占位符

* chore: 规范了部分代码的格式并删除冗余代码

* i18n: ko-kr

* chore: kr 미러 to mirror

* fix: 修复检测和切换语言的问题

* chore: 调整了尾注用户协议部分的显示方式

* refactor: 更改首页尾注的显示方式

* style: 统一Trans元素为self-close样式

* i18n: zh-tw

* fix: 修复换行和块之间的空格问题并补上缺失的翻译

* feat: 更改首页语言也会同步更改文档按钮对应的链接

* refactor: 将弃用的MutableRefObject替换为RefObject

* feat: 语言切换按钮的选项使用对应的语言渲染

* feat: 统一管理所有语言信息并开放读取语言接口

* fix: 去除按钮在鼠标悬停时出现的下划线

* style: 统一不使用行尾分号

* build: 更新部分依赖

* fix: 修正不成对的Trans块对应的本地化文本

* feat: 移动设备横屏浏览时出现垂直滚动条

移动设备横屏时,可能仍能出现下载按钮,全部展开时可能过高,此时出现垂直滚动条,方便用户浏览所有内容

* i18n: JP

* fix: 强制隐藏下载链接容器的水平滚动条

* fix: 将下载链接容器设置为占满宽度

* i18n: JP edits

* fix: 修复滚动条引起的上端裁切问题

* feat: action按钮组根据实际宽度调整布局

不再依靠md:xxx的固定阈值区分小屏和中屏及以上,而是根据不同语言的按钮宽度动态计算是否溢出,从而决定排布方式

* feat: 使用上下文管理布局

使用layoutStateContext来管理布局相关状态,主要是宽度溢出检测

* fix: Copilot 说我们是小驼峰

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

* perf: Copilot 说我们不再需要下划线和它的偏移
我还是第一次知道这里下划线这么难看

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

* feat: 把别的按钮样式抄到语言切换按钮上

* style: 复活 Prettier

这 Prettier 什么鬼情况
我没有要求你把所有文件都格式化,我不是恶魔,后面忘了,总之我可能得狠狠恢复你了。真的。
所以这缩进怎么又 2 又 4 的

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

* refactor: 更改副标题和尾注的元素class以优化动画和显示

* style: 将typescript代码文件的缩进统一为2

* fix: 改正测速进行中的i18n key

* refactor: 删除link类的下划线css定义

* build: 更新prettier依赖和相关配置

* style: prettier美化

* chore: 尝试规避github ci找不到插件的错误

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

* refactor: 使用.prettierrc.js管理官网相关文件的美化配置

* refactor: 暂时取消自动import排序美化

* fix: 下载按钮动画问题

* feat: 响应式设计测量宽度时,临时隐藏相关元素

* style: prettier

* refactor: 下载按钮组居中对齐

* feat: 让系统架构提示动画从上到下

* refactor: 优化第二行按钮动画

* refactor: 优化协议部分文本动画

* i18n: 为一句过长的日语添加换行符

* fix: 修复进度条样式

* refactor: 不将i18n作为触发器

* chore: 首页图片资源文件路径变更

* chore: 添加多语言图片占位

* i18n: 首页图片支持多语言切换

* chore: 更新日文的首页截图

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

* fix: 在首页的文档链接后补全斜杠

* chore: 更新prettier的EOL设置

* style: prettier美化

* chore: pre-commit复活

* refactor: 统一languageFilename变量名

* refactor: 移除加载截图模块的dead code

* i18n: 为mirrorchyan的跳转链接添加多语言支持

mirrorchyan提供简中和英语,因此其他语言需要fallback到二者之一。
- 繁体中文跳转到简体中文
- 日语和韩语跳转到英文

* fix: dead code删除不彻底

* i18n: 去除除了简中以外的”海外源“字样

* i18n: 规范化简中和繁中的locale文本

* i18n:调整英文文本的语法和表达

* i18n: 规范化日文文本

* chore: prettier

* i18n: KR screenshot

* i18n: txwy screenshot

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

* i18n: zh-tw tweak

* refactor: mirror酱相关的两处key更名

* docs: 优化中文和英文的部分语句表达方式

Linux 下载那句我怎么看怎么觉得怪
我想改成 `下载完成(Linux 版本仅包含动态库与资源文件)` `Download completed (Linux version includes dynamic libraries and resource files only)`
但感觉改完也很怪

感觉不如把这俩直接换成 CLI 的下载

* i18n: fix version info loading error message and pluralize downloads for zh-cn

* chore: update en-us screens dark and light

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

* fix: focus

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

* refactor: 去除多余类型标记

Co-authored-by: Copilot <175728472+Copilot@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: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-09-17 21:19:07 +08:00
uye
c54b45c09f fix: SettingsViewModel Idle 2025-09-17 17:54:19 +08:00
萨拉托加
eb061dcc59 fix: 异格推王的基建加成错误 2025-09-17 16:32:14 +08:00
uye
bc7dc763fe feat: RunningState 统一状态变更事件 (#14141)
* feat: RunningState 统一状态变更事件

* feat: 统一 Inited 与 Stopping

* perf: 优化小工具中的stop
2025-09-17 14:06:51 +08:00
github-actions[bot]
3bfc2662e3 chore: Auto Update Game Resources - 2025-09-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17773963424

[skip changelog]
2025-09-16 17:29:14 +00:00
status102
f4c21be051 chore: file header 2025-09-17 00:57:06 +08:00
status102
2936006087 rft: 特征匹配过程函数拆入analyze() 2025-09-17 00:53:23 +08:00
github-actions[bot]
efa364043d chore: Auto Update Game Resources - 2025-09-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17772582080

[skip changelog]
2025-09-16 16:33:32 +00:00
Weiyou Wang
7b6dada3ea feat: 生息盐酸任务添加对错误模式 (有/无存档) 的提示 (#14131)
* feat: 生息盐酸任务添加对错误模式 (有/无存档) 的提示

* fix: callback 里任务名没有前缀
2025-09-17 00:26:28 +08:00
Weiyou Wang
be3b1a2057 fix: 调低 MacOS PlayCover 下对 InfrastControl 识别的阈值 (#14139) 2025-09-17 00:21:20 +08:00
status102
67ceb02116 fix: CurrentConfig未刷新 2025-09-17 00:07:32 +08:00
status102
aa7a2731e0 fix: CurrentConfig悬空 2025-09-17 00:07:32 +08:00
uye
df8f3786f0 fix: 拥有全干员的情况下重启后进入干员识别界面不会自动选中选项卡 2025-09-16 23:48:49 +08:00
uye
20b167119a fix: 修复 DataGrid 虚拟化下 Tab 导航异常 2025-09-16 23:44:27 +08:00
Constrat
b1f02a2eb5 fix(ci): download to v5 with necessary fix (#14122)
fix: specify path for download v5
2025-09-16 16:41:19 +02:00
HY
f9e424cd3b chore: 繁中服「相見歡」活動導航 (#14137)
* chore: 繁中服「相見歡」活動導航

* chore: 再改 再改
2025-09-16 16:37:22 +02:00
萨拉托加
5eecbe21c1 fix: 萨卡兹肉鸽未通关结局时原初异途卡住
fix #14133
2025-09-16 18:38:49 +08:00
MistEO
32a3523bc4 feat: use coreml OCR for apple (#14108) 2025-09-16 18:20:10 +08:00
github-actions[bot]
7dd2dbdcbe chore: Auto Update Game Resources - 2025-09-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17759820697

[skip changelog]
2025-09-16 08:33:34 +00:00
github-actions[bot]
27f9df768d chore: Auto Update Game Resources - 2025-09-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17758555824

[skip changelog]
2025-09-16 07:44:48 +00:00
萨拉托加
2350a05fc4 fix: 肉鸽深入探索无法退出结算界面 (#14123) 2025-09-15 23:03:04 +08:00
soundofautumn
3ea9912802 chore: fix build warning (#14120) 2025-09-15 23:00:34 +08:00
uye
a9e31c75d0 Release v5.25.0-beta.4 (#14126) 2025-09-15 22:49:41 +08:00
uye
4e46a392a3 docs: Update CHANGELOG for v5.25.0-beta.4
Updated changelog for version 5.25.0-beta.4 with new features and fixes.
2025-09-15 22:48:52 +08:00
pre-commit-ci[bot]
2f09f9e591 chore: Auto update by pre-commit hooks [skip changelog] 2025-09-15 14:43:19 +00:00
uye
55f675fb8d fix: minitouch 触控 wait ms 2025-09-15 22:38:35 +08:00
uye
36fc9a8e0a fix: 复核自定义干员时等待游戏动画 2025-09-15 22:11:05 +08:00
Constrat
cfd463a7fd fix: wrong default on type number 2025-09-15 14:09:40 +02:00
uye
2884f2d0ae fix: 自动战斗无法读取下拉列表中的作业 2025-09-15 19:52:42 +08:00
MistEO
0af752b083 Release v5.25.0-beta.3 (#14115) 2025-09-15 16:50:34 +08:00
MistEO
212cb506d6 docs: changelog version 2025-09-15 16:50:13 +08:00
MistEO
6ed32b3344 docs: changelog 2025-09-15 16:49:32 +08:00
MistEO
4a2901c473 ci: fix minitouch scale 2025-09-15 16:43:58 +08:00
MistEO
18bec2504d ci: add create issue 2025-09-15 15:28:04 +08:00
MistEO
7c4002351e ci: use download-artifact v4 2025-09-15 15:28:04 +08:00
MistEO
4e0b5ace24 Release v5.25.0-beta.2 (#14111) 2025-09-15 15:00:10 +08:00
github-actions[bot]
acfb173cc3 docs: Auto Update Changelogs of v5.25.0-beta.2 (#14112)
* docs: Auto Generate Changelog of Release v5.25.0-beta.2

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2025-09-15 14:58:02 +08:00
MistEO
feb7b6109f ci: fix win zip 2025-09-15 14:02:35 +08:00
MistEO
552d7784a2 ci: add zip for win ci and create issue if failed release 2025-09-15 13:37:59 +08:00
status102
b1d10a87dc perf: 加个try先 2025-09-15 13:19:19 +08:00
Constrat
30bb86bade ci(fix): try to color only [err] log as red 2025-09-15 01:36:04 +02:00
MistEO
80511c660f ci: split cmake file (#14109) 2025-09-15 04:18:40 +08:00
mistereo@hotmail.com
45ca28ed74 chore: remove SyncRes 2025-09-15 03:07:17 +08:00
MistEO
a208c1f03b ci: set hash version 2025-09-15 02:31:32 +08:00
Status102
5b33bc3f00 feat: 自动战斗多作业支持保存干员组内编入的干员 (#14095)
* chore: 加个存储先

* feat: 与旧编队比较

* feat: 快速编队

* fix: 计数

* fix: 缓存了旧的组名

* perf: 快速退出

* fix: 跳过编队后修改编队状态

* fix: 完事

* fix: err

* fix: 顺手一起修了
2025-09-15 01:27:51 +08:00
MistEO
6202eedeb3 refactor: use std::format instead of sprintf (#14107)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-09-15 01:07:05 +08:00
Constrat
a70502521d ci:. standardize cache key for nuget cache 2025-09-14 18:55:13 +02:00
Constrat
66a5095ede ci: standardize hash for windows maadeps 2025-09-14 18:52:20 +02:00
Constrat
5b750ca194 fix: smoke-testing script 2025-09-14 18:48:47 +02:00
uye
b18e4e6ff6 Release v5.25.0-beta.1 (#14100) 2025-09-15 00:41:06 +08:00
MistEO
31761d7e5d ci: refactor res_updater cmake (#14106)
* ci: refactor res_updater cmake

* ci: remove ResourceUpdater from main cmake

* ci: typos

* build: remove boost

* ci: fix deps and cmake config

* ci: add zsh script

* chore: fix res_updater

* chore: use -Wno-error for res_updater

* fix: perms for version.zsh

* fix: gitignore

* fix: script

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-09-14 18:33:40 +02:00
github-actions[bot]
c881362cb1 docs: Auto Update Changelogs of v5.25.0-beta.1 (#14101)
* docs: Auto Generate Changelog of Release v5.25.0-beta.1

* docs: Update CHANGELOG with recent changes and fixes

* docs: Update button click behavior in battle list settings

* docs: Update CHANGELOG with recent changes and fixes

* docs: changelog

* docs: Update CHANGELOG with recent changes and fixes

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>
2025-09-15 00:32:40 +08:00
uye
00e5c1eb9f chore: 自定义基建配置时间仍在有效期内时不检查其他时间段 2025-09-15 00:26:33 +08:00
Constrat
7e3ab62aae fix: typo 2025-09-14 17:56:32 +02:00
Constrat
b0713bb9df Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2025-09-14 17:55:19 +02:00
Constrat
42343f8978 fix: type number for nightly ota 2025-09-14 17:55:12 +02:00
MistEO
e9383a7783 build: do not auto gen version for local build 2025-09-14 23:28:08 +08:00
status102
e0ee76115b feat: CustomTask增加任务存在检测 2025-09-14 21:45:43 +08:00
Constrat
d6bf677bb1 ci: add caching for macos maadeps 2025-09-14 14:32:51 +02:00
MistEO
746816c6c7 ci: try macos for smoke_test (#14104)
* ci: try macos for smoke_test

* ci: Remove concurrency from smoke-testing workflow

* ci: use ninjga build for macos testing

* ci: add trigger

* ci: fix macos parallel

* ci: update bash

* fix: zsh script

* fix: perms

* fix: zsh script regular array

* ci: add resource link for cache hit

* test: enable dev for testing

* test: revert test

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-09-14 14:22:15 +02:00
nekosu
4d74abfd8f feat: custom clang (#14102)
* feat: custom clang

* fix: version typo

* fix: version typo
2025-09-14 12:35:40 +02:00
萨拉托加
5853354357 chore: 界园萨卡兹肉鸽招募休谟斯优先级 2025-09-14 17:54:08 +08:00
Status102
022ab93c1c ci: 为smoke-testing使用cache时增加resource链接 (#14096)
Co-authored-by: MistEO <mistereo@hotmail.com>
2025-09-14 17:30:30 +08:00
github-actions[bot]
cd8d22d23e chore: Auto Update Game Resources - 2025-09-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17708701640

[skip changelog]
2025-09-14 08:30:48 +00:00
pre-commit-ci[bot]
da1170ecc9 chore: Auto update by pre-commit hooks [skip changelog] 2025-09-14 08:25:54 +00:00
uye
df46d6bcb0 chore: 更新基建技能效率 2025-09-14 16:20:15 +08:00
Litwak913
bf27a7fc86 fix: 修复 cmake copy_and_add_rpath_library 的失败逻辑 (#14097) 2025-09-14 06:39:06 +08:00
Constrat
482f21620e chore: remove -DINSTALL_RESOURCES 2025-09-13 18:01:40 +02:00
uye
1472d80c12 fix: 刷开局奖励只选票券时行为异常
fix #14079
2025-09-13 21:12:09 +08:00
Constrat
5bfc5fce9f fix: smoke testing upload logs 2025-09-13 15:05:52 +02:00
Constrat
dcd2d52a5a fix: move smoke testing working dir 2025-09-13 14:55:15 +02:00
uye
2c87975e52 feat: core 崩溃后下次启动时 ui 输出提示 (#14022)
* feat: core 崩溃后下次启动时 ui 输出提示

* style: space

* chore: ubuntu warning

* i18n: zh-tw

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
2025-09-13 20:28:56 +08:00
status102
e3245a4163 feat(wpf): allow single copilot task execution
有人炸就派uuu @ABA2396
2025-09-13 20:02:58 +08:00
status102
43ea1f94df perf(wpf): wpf自动战斗列表中作业设置按钮左键单击还原为解析指定作业,新增行为修改至右键,解析作业并关闭列表 2025-09-13 19:57:37 +08:00
status102
1077b08c19 fix: 自动编队缺少干员输出的额外换行 2025-09-13 19:53:18 +08:00
status102
d02393f174 fix(core): Copilot多任务编队时编队设置残留 2025-09-13 19:35:52 +08:00
uye
bc59477b24 fix: 自定义基建换班的班次不会随时间切换
fix #14092
2025-09-13 16:03:53 +08:00
uye
e4cb99c0c0 fix: "统一 WpfGui 工作目录"后,配置为外服无法运行 MAA
fix #14090
2025-09-13 15:42:39 +08:00
Status102
e65219efc5 fix: 移除 debug_demo (原Sample) 的对应 resource 额外查找逻辑 (#14081)
* rft: resource链接生成移动至cmake

* fix: smoke

* fix: smoke

* fix: smoke

* chore: 干脆移除掉好了

* chore: remove blank line

* fix: 移除多余链接创建

* perf: use DINSTALL_RESOURCE

* build: 整理cmake util函数

* chore: wpf link resource由cmake进行

* Revert "chore: wpf link resource由cmake进行"

This reverts commit 0e973734e7.

---------

Co-authored-by: MistEO <mistereo@hotmail.com>
2025-09-13 12:24:22 +08:00
uye
8bffeaa368 chore: 调整 y 存图时间间隔 2025-09-13 12:01:17 +08:00
uye
b017e90b6b feat: 给自定义任务添加 ScreenshotTaskPlugin 插件 2025-09-13 11:16:03 +08:00
MistEO
36da60ed9d fix: 统一 WpfGui 工作目录 (#14072)
* fix: 统一WpfGui工作目录

* chore: 漏了的cache目录

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

* fix: 多了一层相对目录

* feat: wpf 创建软连接

* feat: 添加 PathsHelper,提取通用地址

* feat: 提取通用目录

* fix: Combine

* fix: 重构依赖后 MaaWpfGui 的 resource 路径丢失 (#14077)

fix: mklink

* chore: 删除弹窗

* chore: 自定义基建使用绝对路径

* perf: 简化命名

* fix: 遗漏的issue rp

* fix: 基建

* perf: config.new

* feat: 去除本地作业前缀

* chore: 怎么改名了

* rft: rename

添加一个Dir后缀, 直接using static

* fix: remove不再使用的../../../resrouce

* perf: 短点

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>
2025-09-12 21:25:33 +08:00
uye
a71eb71eff fix: 逻辑写错了!
[skip changelog]
2025-09-12 19:04:21 +08:00
uye
283329f8ea chore: 调整定时器触发逻辑
fix #14083
2025-09-12 18:51:17 +08:00
Constrat
01eed2a376 ci: reduce building scope for resource updater + rm llvm.sh (#14084)
* test: pre target / component

* test: temp disable cache

* fix: add libcxx

* ci: remove llvm.sh after execution

* test: reconfigure cache
2025-09-12 12:46:26 +02:00
uye
a13212ea6e chore: 调整未检测到模拟器的输出 2025-09-12 17:21:23 +08:00
status102
cb31aa0dbd feat(wpf): 战斗列表点击作业时自动关闭列表, 原逻辑迁移至鼠标右键 2025-09-12 13:30:50 +08:00
nekosu
61265768e5 fix: add component for install libcxx only 2025-09-12 11:54:09 +08:00
Status102
85975d642c fix: 重构依赖后 MaaWpfGui 的 resource 路径丢失 (#14077)
fix: mklink
2025-09-12 00:55:40 +08:00
status102
8d5806b9e1 chore: gitignore
lnk for sln or other
2025-09-12 00:44:13 +08:00
Constrat
5b32c3a985 chore: where and how did this come from? 2025-09-11 18:22:00 +02:00
github-actions[bot]
4dc488229d chore: Auto Update Game Resources - 2025-09-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17650477221

[skip changelog]
2025-09-11 16:18:07 +00:00
Constrat
f021c66fa5 feat: convert ResourceUpdater to ubuntu-latest (#14076)
* feat: convert workflow to ubuntu-latest

* fix: missing toolchain

* fix: remove component specification

* fix: apparently I didn't push the deps changes

* fix: apparently I didn't push the cache changes

* fix: build everything

* chore: delete llvm

* fix: version.sh missing indentation

* fix: missing bash
2025-09-11 17:53:56 +02:00
github-actions[bot]
1bc06de043 chore: Auto Update Game Resources - 2025-09-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17644090943

[skip changelog]
2025-09-11 12:14:14 +00:00
Constrat
e278577435 chore: tweak workflow + remove .sln (#14074)
---------

Co-authored-by: nekosu <liao.hy@outlook.com>
2025-09-11 14:11:45 +02:00
Constrat
9911d82dce style: fix prettier 2025-09-11 13:49:32 +02:00
github-actions[bot]
ebcb4c561b chore: Auto Update Game Resources - 2025-09-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17642666189

[skip changelog]
2025-09-11 11:11:33 +00:00
Constrat
29c2f8f44e ci: temporarily revert changes to ResourceUpdater to allow caching exe 2025-09-11 13:09:07 +02:00
uye
d239cbad5c feat: 添加基建计划 ToolTip 提示 2025-09-11 16:40:05 +08:00
uye
5a25cf70a9 chore: 按时间切换基建配置不在任务运行中或任务开始前切换
fix #14060
2025-09-11 15:41:12 +08:00
uye
7144821351 style: 格式化 2025-09-11 15:28:51 +08:00
uye
68ff234848 chore: 调整刷新助战日志 2025-09-11 15:15:55 +08:00
uye
98e16bd915 chore: 调整界面颜色 2025-09-11 15:12:50 +08:00
uye
108979ef5f fix: 停止中或者空闲状态不允许点击停止按钮 2025-09-11 14:55:46 +08:00
萨拉托加
e42b1dde8f chore: 肉鸽丰川祥子招募策略 (#14035)
* chore: 肉鸽丰川祥子招募策略

* chore: 调整近卫招募策略
2025-09-11 14:45:03 +08:00
uye
ee8ceba005 fix: 鲍勃杂货店拥有四叶草化石且无抗干扰值时卡住
fix #14052
2025-09-11 14:44:20 +08:00
uye
1792dae76e perf: 优化更新设置中的徽标显示和逻辑 2025-09-11 14:19:00 +08:00
nekosu
7ac3851c71 ci: fix resource updater ignoring problem 2025-09-11 14:17:35 +08:00
github-actions[bot]
23acf4735a chore: Auto Update Game Resources - 2025-09-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17634608287

[skip changelog]
2025-09-11 05:09:14 +00:00
nekosu
1aaf852a80 ci: update resource updater pipeline
#14045
2025-09-11 12:50:20 +08:00
HY
c093cdeac8 chore: 繁中服「大荒」介面主題 (#14064)
* chore: 繁中服「大荒」介面主題

* 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-09-11 12:35:44 +08:00
nekosu
cc36807ec9 feat: support build resource updater
#14045
2025-09-11 12:09:33 +08:00
Constrat
ebbc9620d9 chore: remove ninja from ci.yml 2025-09-10 19:08:17 +02:00
Constrat
36e744dabf chore: restore older cache utilization for ci.yml (#14068)
* test: test cache speed

* chore: restore older cache utilization

* chore: rft
2025-09-10 19:05:58 +02:00
Constrat
5aa8f43d42 fix: prevent caching in non-dev branches 2025-09-10 17:54:09 +02:00
Constrat
54593075c3 ci: unify bootstrap step for ci.yml 2025-09-10 17:08:46 +02:00
Constrat
a3ad69e189 ci(perf): reimplement caching for smoke testing (linux version) 2025-09-10 17:07:00 +02:00
uye
71b2ce80a5 feat: 添加信息获取失败时的提示 2025-09-10 22:57:19 +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
Constrat
f74296a01a perf: remove resource from smoke testing
use the default location, do not duplicate
2025-09-10 16:54:21 +02:00
Constrat
139e79655d ci: split web and workflow codeql (#14067) 2025-09-10 16:25:55 +02:00
Constrat
694d78be1c ci(perf): update smoke testing to ubuntu runner (#14066)
* ci: update smoke testing to ubuntu runner

* fix: missing perms
2025-09-10 16:15:59 +02:00
nekosu
08562dc4e9 chore: update interface.json 2025-09-10 21:01:59 +08:00
Constrat
1acbcd493c perf: add --parallel to cmake workflows 2025-09-10 13:45:25 +02:00
Constrat
69fdf39f09 fix: stuck on max trust EN 2025-09-10 13:35:41 +02:00
nekosu
c94d2d55d7 fix: pthread linking problem
# 14045
2025-09-10 19:29:12 +08:00
MistEO
09bf0268ac ci: fix remove .h files 2025-09-10 15:24:42 +08:00
MistEO
a92f5eb354 ci: fix core version 2025-09-10 14:36:26 +08:00
nekosu
54031c5858 doc: update linux tutorial (en) 2025-09-10 11:55:22 +08:00
Constrat
51529ad257 i18n: EN 2025-09-09 15:35:09 +02:00
github-actions[bot]
14120ecc2b chore: Auto Update Game Resources - 2025-09-09
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17582157721

[skip changelog]
2025-09-09 12:13:01 +00:00
github-actions[bot]
01a36cf0be chore: Auto Templates Optimization
Triggered by c0da8956f8

[skip changelog]
2025-09-09 11:52:56 +00:00
uye
c0da8956f8 fix: 无法收取太鼓达人联动主题会客室信息板信用
fix #14007
2025-09-09 19:44:50 +08:00
uye
9ac783219d fix: cdk 过期时间超过 2038 年会爆炸(但 10000 年还是会爆炸 2025-09-09 18:59:37 +08:00
uye
950522fda0 feat: CDK 倒计时显示 2025-09-09 17:53:46 +08:00
MistEO
5a7030ad50 fix: nightly package zip 2025-09-09 17:08:21 +08:00
MistEO
907324370a ci: fix nightly build (#14050) 2025-09-09 17:05:22 +08:00
MistEO
03f6657244 fix: global resource path 2025-09-09 16:37:59 +08:00
uye
de60b0d05a feat: 成就设置中的图标颜色可以随着主题色动态更新 2025-09-09 16:14:39 +08:00
uye
37958ab9e5 feat: 添加 CDK 到期时间显示 2025-09-09 16:14:39 +08:00
uye
dab18e1964 feat: 添加 ResourceReferenceHelper,允许绑定 前后景色 key 2025-09-09 16:14:39 +08:00
MistEO
f4b7e39b01 ci: 删除codeql中的build 2025-09-09 13:47:40 +08:00
nekosu
91a0e51142 fix: linux cross compiling (#14048)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-09-09 13:22:53 +08:00
uye
2bbc7d6546 fix: maa 变成前文明产物了 2025-09-09 09:40:10 +08:00
MistEO
8e7a9e8691 ci: fix nightly, remove zip -d 2025-09-09 02:22:50 +08:00
MistEO
8082c9913b ci: fix nightly release 2025-09-09 01:52:54 +08:00
SherkeyXD
f00e580884 style: 添加换行
fuck pre commit
2025-09-09 01:50:31 +08:00
SherkeyXD
7c1b897caa chore: 更新 markdownlint 规则 2025-09-09 00:52:44 +08:00
dependabot[bot]
d799e8e800 ci: bump the github-actions group across 1 directory with 7 updates (#14041)
* ci: bump the github-actions group across 1 directory with 7 updates

Bumps the github-actions group with 7 updates in the /.github/workflows directory:

| Package | From | To |
| --- | --- | --- |
| [actions/checkout](https://github.com/actions/checkout) | `4` | `5` |
| [actions/download-artifact](https://github.com/actions/download-artifact) | `4` | `5` |
| [softprops/action-gh-release](https://github.com/softprops/action-gh-release) | `2.3.2` | `2.3.3` |
| [actions/github-script](https://github.com/actions/github-script) | `7` | `8` |
| [actions/setup-python](https://github.com/actions/setup-python) | `5` | `6` |
| [actions/stale](https://github.com/actions/stale) | `9` | `10` |
| [actions/setup-node](https://github.com/actions/setup-node) | `4` | `5` |



Updates `actions/checkout` from 4 to 5
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

Updates `actions/download-artifact` from 4 to 5
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4...v5)

Updates `softprops/action-gh-release` from 2.3.2 to 2.3.3
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v2.3.2...v2.3.3)

Updates `actions/github-script` from 7 to 8
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7...v8)

Updates `actions/setup-python` from 5 to 6
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5...v6)

Updates `actions/stale` from 9 to 10
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v9...v10)

Updates `actions/setup-node` from 4 to 5
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/download-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: softprops/action-gh-release
  dependency-version: 2.3.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: actions/github-script
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/setup-python
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/stale
  dependency-version: '10'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/setup-node
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>

* ci: fix schema

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-09-08 18:51:43 +02:00
SherkeyXD
b22cfad361 docs: 修复序号问题 2025-09-09 00:48:57 +08:00
MistEO
f67a31224c docs: typo 2025-09-09 00:42:59 +08:00
MistEO
c0a5a9bd46 docs: 更新文档cmake配置 2025-09-09 00:33:15 +08:00
MistEO
74bf88523f docs: 微调文档 2025-09-09 00:31:10 +08:00
MistEO
3372c7c82a chore: 删除一些遗留文件 2025-09-09 00:24:04 +08:00
MistEO
069e159f33 chore: 再糊点注释 2025-09-09 00:22:02 +08:00
MistEO
b6552c19a6 chore: 糊点注释 2025-09-09 00:20:40 +08:00
MistEO
d4a79ba9db fix: 糊一下 debug_demo 资源路径读取 2025-09-09 00:19:53 +08:00
MistEO
523b496daa fix: 修复 wpf gui 一些 resource path 读取
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/14044
2025-09-09 00:12:15 +08:00
github-actions[bot]
c9337f90f0 chore: Auto Update Game Resources - 2025-09-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17556983279

[skip changelog]
2025-09-08 16:07:51 +00:00
Loong
512bd90433 docs: reapply eebe0a9 (#14036) 2025-09-08 23:48:33 +08:00
MistEO
8f906d159e ci: 再次修复 nightly build 2025-09-08 22:50:57 +08:00
MistEO
6410c3c5a5 ci: 修复 nightly build 2025-09-08 22:49:24 +08:00
MistEO
bb922d8833 ci: 调整test相关宏 2025-09-08 22:46:04 +08:00
MistEO
f65e370620 docs: remove weblate 2025-09-08 22:12:29 +08:00
MistEO
546d4b860a fix: remove opencv highgui again 2025-09-08 21:57:09 +08:00
MistEO
0f29aa369e fix: remove opencv highgui 2025-09-08 21:51:22 +08:00
MistEO
f5d6b6cd8f build: fix ASST_DEBUG macro 2025-09-08 21:44:09 +08:00
MistEO
7b29be6faf chore: remove MaaDeps 2025-09-08 21:33:31 +08:00
MistEO
87e6484cb2 fix: build error of ASST_DEBUG 2025-09-08 21:32:11 +08:00
MistEO
51ab24945b refactor: 依赖大更新 (#13908)
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>
2025-09-08 21:17:47 +08:00
萨拉托加
918a41ac3a fix: 入暂亭特殊选项 2025-09-08 19:02:21 +08:00
Constrat
29b889372a fix: Sami floor detection 3
Thanks again @lin4289 on discord
2025-09-08 12:59:28 +02:00
萨拉托加
77891805d0 fix: 特里蒙旅行社特派团多选项
fix #14026
2025-09-08 18:44:55 +08:00
晓丶梦丶仁
e9206f4244 fix: IS5 同心 2025-09-08 15:54:18 +08:00
Loong
7807577312 chore: bump maa-cli to 0.5.8 (#14032) 2025-09-08 15:30:02 +08:00
晓丶梦丶仁
c4c6297370 fix: EN Roguelike@ChooseOperConfirm (#14033) 2025-09-08 15:21:43 +08:00
uye
8a5c3029c4 fix: 选择技能时可能会点出描述文字
fix #14030
2025-09-08 00:43:25 +08:00
github-actions[bot]
92631c999c chore: Auto Update Game Resources - 2025-09-07
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17530208991

[skip changelog]
2025-09-07 15:07:03 +00:00
Constrat
e48049f198 fix: Sami floor detection 2
Thanks again @lin4289 on discord
2025-09-07 16:47:36 +02:00
Weiyou Wang
407b140bca refactor: BrightPointAnalyzer -> PixelAnalyzer (#13915)
* feat: different filters for BrightPointAnalyzer

* refactor: rename BrightPointAnalyzer to PixelAnalyzer

* fix: 草忘了重命名文件了
2025-09-07 20:07:33 +08:00
uye
0e865982c6 fix: 基建使用队列轮换时如果未勾选对应设施则不进入
fix #14019
2025-09-07 16:53:55 +08:00
uye
1d62c972b7 fix: 重构后无法使用刷开局刷仅精二 2025-09-07 16:32:21 +08:00
github-actions[bot]
890fce3567 chore: Auto Templates Optimization
Triggered by cc0b229cdf

[skip changelog]
2025-09-07 07:22:48 +00:00
uye
cc0b229cdf fix: 部分背景下 mujica 主题无法进入对应功能
fix #14016
2025-09-07 15:22:21 +08:00
uye
bcd0ed5711 fix: 萨米肉鸽刷源石锭可能卡在预见的密文板
fix #14015
2025-09-07 14:54:41 +08:00
uye
29a34766e7 chore: 管理员权限启动额外判断是否开启 UAC 2025-09-07 13:48:59 +08:00
github-actions[bot]
ada54eef32 chore: Auto Update Game Resources - 2025-09-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17520467055

[skip changelog]
2025-09-06 22:44:21 +00:00
Constrat
dc0e63f83e fix: Sami floor detection
Thanks @lin4289 on discord
2025-09-07 00:27:58 +02:00
Weiyou Wang
ffbb3ed798 fix: 允许生息演算任务反复点击存档位置直到画面改变 (#14005) 2025-09-06 13:58:30 +08:00
不留
8e9a408997 refactor: mujika -> mujica (#14000)
rft: mujika -> mujica
2025-09-05 23:07:46 +08:00
萨拉托加
3bf9a67d56 fix: 肉鸽助战无法刷新 2025-09-05 22:40:54 +08:00
uye
c3a35b6df5 perf: 优化干员识别动画显示效果 2025-09-05 20:28:17 +08:00
uye
241b5c0047 Release v5.24.2 (#13989) 2025-09-05 16:27:50 +08:00
Hao Guan
4895a37278 chore(mac): 无人机&关卡提示 2025-09-05 15:59:55 +08:00
uye
d7ed013825 docs: Update CHANGELOG for version 5.24.2
Updated version number to v5.24.2 and added special notices regarding stage naming conventions. Included new features, improvements, fixes, and other changes.
2025-09-05 15:22:49 +08:00
uye
981f71f024 chore: 关卡小提示改用 Value 2025-09-05 15:17:23 +08:00
uye
7e6216d573 perf: 优化关卡验证逻辑,避免导入错误类型关卡时直接崩溃 2025-09-05 14:28:16 +08:00
uye
b81e49636d fix: 肉鸽因模拟器卡顿偶现无法退出商店
fix #13982
2025-09-05 11:00:52 +08:00
status102
f17c4bfd37 fix: 信用任务无法刷OF-1 2025-09-05 10:58:20 +08:00
github-actions[bot]
cfe40ad57b chore: Auto Update Game Resources - 2025-09-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17471326033

[skip changelog]
2025-09-04 17:06:50 +00:00
Windsland52
343e7831da fix: 给 MiniGame@ALL@GreenGrass@DuelChannel@End 加点延迟 (#13968) 2025-09-05 00:18:43 +08:00
uye
a50f7a0c90 chore: 调整日志输出格式 2025-09-05 00:00:25 +08:00
github-actions[bot]
58acb92740 chore: Auto Update Game Resources - 2025-09-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17467691092

[skip changelog]
2025-09-04 14:46:04 +00:00
不留
b26d656d94 feat: 适配 命运(AveMujica) 主题 (#13970) 2025-09-04 21:56:34 +08:00
萨拉托加
7fed3d1e36 fix: 八幡海铃识别错误 2025-09-04 21:39:46 +08:00
uye
550386bb63 chore: 悖论模拟选技能改用固定位置,避免透明背景影响 2025-09-04 20:20:50 +08:00
uye
09638b2c4e fix: 选技能可能会点到技能范围 2025-09-04 17:20:51 +08:00
SherkeyXD
06265f99c5 feat: SideStory「无忧梦呓」导航 (#13969) 2025-09-04 17:14:33 +08:00
github-actions[bot]
12ef622ff3 chore: Auto Update Game Resources - 2025-09-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17457528502

[skip changelog]
2025-09-04 08:09:34 +00:00
github-actions[bot]
4219064117 chore: Auto Update Game Resources - 2025-09-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17456122106

[skip changelog]
2025-09-04 07:07:29 +00:00
github-actions[bot]
83343de32b chore: Auto Update Game Resources - 2025-09-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17453588679

[skip changelog]
2025-09-04 04:45:42 +00:00
github-actions[bot]
6e3230b508 chore: Auto Update Game Resources - 2025-09-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17453012021

[skip changelog]
2025-09-04 04:08:47 +00:00
github-actions[bot]
bec3394521 chore: Auto Templates Optimization
Triggered by 9749c858f7

[skip changelog]
2025-09-04 02:34:18 +00:00
github-actions[bot]
9749c858f7 chore: Auto Update Game Resources - 2025-09-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17451555281

[skip changelog]
2025-09-04 02:33:49 +00:00
github-actions[bot]
4d14212f15 chore: Auto Update Game Resources - 2025-09-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17444811350

[skip changelog]
2025-09-03 20:08:07 +00:00
uye
a8d6068e87 feat: 勾选 「下次公告更新前不再显示」 勾选框时不需要滚到底才能关闭公告 2025-09-04 01:29:53 +08:00
uye
f4d89ea93c Release v5.24.1 (#13964) 2025-09-04 00:59:17 +08:00
uye
08c32c6f15 docs: Release notes for version 5.24.1 2025-09-04 00:55:45 +08:00
不留
3293ce5beb feat: 适配 悬想(界园肉鸽) 主题 (#13948)
* feat: 适配界园肉鸽主题

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

* fix: DepotEnter.png

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

* fix: DepotEnter.png

* 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-09-04 00:47:03 +08:00
uye
390cfc38a0 feat: 悖论通关后自动取消勾选,遇到战斗失败的关卡时停止 (#13963)
* feat: 悖论通关后自动取消勾选

* fix: CopilotTask 一个个加
2025-09-04 00:44:40 +08:00
github-actions[bot]
b23e63e352 chore: Auto Update Game Resources - 2025-09-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17433572057

[skip changelog]
2025-09-03 12:34:27 +00:00
HY
7deaf65c06 fix: 繁中服薩米肉鴿第五層名稱 (#13961)
* fix: 繁中服薩米肉鴿第五層名稱

* chore: 再改一點....再改一點
2025-09-03 14:15:57 +02:00
uye
25b1c73659 refactor: 将 「掉线时自动重连」 从 「运行设置」 移到 「刷理智设置」 中 2025-09-03 20:15:30 +08:00
uye
6a58723398 refactor: 将 「自动肉鸽在战斗结束前延迟停止动作」 从 「运行设置」 移到 「肉鸽设置」 中 2025-09-03 20:07:19 +08:00
Lucien Shaw
94ecbe2cb5 docs: 修正文档中的部分错误 (#13923)
* docs: 替换英文连接设置文档中的一条外部文档链接

将文档中的一条外部文档链接替换为对应的英文文档链接

* docs: 更正中文常见问题文档中的一处别字

将“登陆”改为“登录”,与繁体中文和英文版本保持一致

* docs: 更新三种语言文档中有关WSA的提示信息

更正简体中文、繁体中文和英文语言文档中有关WSA的提示信息

* docs: ko-kr

* docs: 替换日文连接设置文档中的一条外部文档链接

将文档中的BlueStacks相关外部文档链接替换为对应的日文文档链接

* docs: 更新所有语言的连接设置文档中有关WSA的提示部分

所有语言使用统一名称`Windows Subsystem for Android™ (WSA)`
更新了日语文档中的停止支持提示内容

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
2025-09-03 09:35:18 +08:00
HY
8b6c5e3011 chore: 繁中服「視相」主題介面 (#13947)
* chore: 繁中服「視相」主題介面

* 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-09-03 00:26:52 +08:00
不留
041c03d9be ci: 优化 optimize-templates 在 fork 仓库下的流程 (#13949)
Update optimize-templates.yml
2025-09-03 00:26:13 +08:00
github-actions[bot]
a1fe1ad099 chore: Auto Update Game Resources - 2025-09-02
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17405569167

[skip changelog]
2025-09-02 13:47:34 +00:00
HY
47f3a33167 chore: 繁中服「銀心湖列車」復刻活動導航 (#13945) 2025-09-02 15:34:39 +02:00
Constrat
5ff283cd18 fix: EN not picking up Trade Orders 2025-09-02 13:35:20 +02:00
github-actions[bot]
c8dee82a3b chore: Auto Update Game Resources - 2025-09-02
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17397385457

[skip changelog]
2025-09-02 08:10:53 +00:00
github-actions[bot]
5245bd6fbc chore: Auto Templates Optimization
Triggered by bfb5deca88

[skip changelog]
2025-09-01 22:51:45 +00:00
Constrat
bfb5deca88 fix: IS5 EN StageRefresh not working, updated template 2025-09-02 00:51:20 +02:00
status102
2bfd2257b4 fix: 自动编队后续追加自定干员失败 2025-09-02 00:57:11 +08:00
uye
7b36d43e5e fix: 错误的关卡名可能导致验证崩溃 2025-09-01 17:36:24 +08:00
uye
3943189550 fix: 公告重复点击时不会前置窗口 2025-09-01 13:45:48 +08:00
uye
f7eeffba9b chore: 调整公告日志记录 2025-09-01 12:56:29 +08:00
uye
27830218bc chore: 提取 isBuildOutputFolder 2025-08-31 23:35:40 +08:00
github-actions[bot]
79e32af4eb chore: Auto Templates Optimization
Triggered by 9d8dbe80cc

[skip changelog]
2025-08-31 15:08:30 +00:00
Constrat
9d8dbe80cc fix: IS2 and IS3 not starting for EN 2025-08-31 17:08:09 +02:00
Manicsteiner
0056a50a8e chore: JP ocr fix (#13938) 2025-08-31 16:58:46 +02:00
uye
0b22410351 chore: 编译目录下不检查 dll 2025-08-31 22:46:53 +08:00
uye
9d0df414c9 fix: 战斗列表无法进入 1/2 星干员悖论 2025-08-31 13:42:40 +08:00
uye
2cac439e5f fix: 悖论模拟战斗列表页尾干员错位 2025-08-31 13:42:40 +08:00
Status102
4a9e8f5d1e refactor(wpf): 长草任务运行状态 (#13928)
* rft(wpf): 长草任务运行状态

移除战斗任务及基建任务独立运行状态, link to #12315

* perf: remove debug log

* perf: remove debug log
2025-08-31 11:13:54 +08:00
Constrat
556d1bda73 i18n: EN 2025-08-30 17:44:48 +02:00
uye
b7681becd3 chore: 简化 Split 2025-08-30 23:21:51 +08:00
uye
7b169cb441 perf: 日志记录增加 ClassName 输出,debug 模式下属性切换新增反引号显示 2025-08-30 23:17:51 +08:00
Constrat
aca317e67e fix: update Infrast templates for EN 2025-08-30 17:03:01 +02:00
Manicsteiner
f9e0ef32bc i18n: JP 2025-08-30 23:00:33 +08:00
status102
46216817c4 chore: 漏了( 2025-08-30 22:32:05 +08:00
uye
1cc3268f70 perf: 优化 Copilot 列表验证逻辑,提高性能 2025-08-30 22:29:35 +08:00
status102
f45d051b79 rft: OperatorType -> OperatorRole 2025-08-30 22:22:39 +08:00
status102
b72a3569bf fix: wpf空作业列表点开始 2025-08-30 22:14:27 +08:00
uye
e1f766e23f Release v5.24.0 (#13916) 2025-08-30 17:07:33 +08:00
github-actions[bot]
2add7f1173 docs: Auto Update Changelogs of v5.24.0 (#13917)
* docs: Auto Generate Changelog of Release v5.24.0

* docs: Update CHANGELOG with recent changes and fixes

* docs: Update CHANGELOG for v5.24.0 enhancements

更新了 v5.24.0 的功能进化,包括一键悖论模拟、支持新内容和其他优化。

* feat: 更新 CHANGELOG.md

* feat: Update CHANGELOG.md

* feat: Update CHANGELOG.md

* feat: Update CHANGELOG.md

* feat: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
2025-08-30 17:07:10 +08:00
AnnAngela
198f81812a chore: Update localization strings for Mini Game section 2025-08-30 16:06:28 +08:00
Lucien Shaw
fc711c9dbd ci: 更正了生成changelog工作流中debug信息的一处错误 (#13926)
ci: 更正了生成changelog工作流中debug信息的一处笔误

将Target RP更正为Target PR
2025-08-30 11:50:43 +08:00
uye
fb52a07353 style: 空格
[skip changelog]
2025-08-30 10:55:28 +08:00
soundofautumn
ca44b82acd chore: 整合枚举类 OperProfession 和 Role (#13914)
* chore: 整合枚举类OperProfession和Role

* fix: 加载数据时报错
2025-08-30 10:53:57 +08:00
pre-commit-ci[bot]
53b22fe6b9 chore: Auto update by pre-commit hooks [skip changelog] 2025-08-30 02:50:20 +00:00
uye
062f7480d7 feat: 悖论模拟战斗列表通过职业找人 2025-08-30 10:47:55 +08:00
pre-commit-ci[bot]
f97f6a2cb3 chore: Auto update by pre-commit hooks [skip changelog] 2025-08-30 01:54:35 +00:00
uye
12de1806f1 feat: 悖论模拟战斗列表支持跳过未拥有的干员 2025-08-30 09:52:12 +08:00
uye
1a374a3129 fix: mac
[skip changelog]
2025-08-30 09:31:32 +08:00
uye
7593ef29a9 fix: 悖论模拟单文件无法使用 2025-08-30 01:36:15 +08:00
uye
ae0da25d36 feat: mac 支持蜜果城 2025-08-30 01:19:20 +08:00
Constrat
3a197c4445 fix: CrownSlayer -> Crownslayer for EN 2025-08-29 16:58:40 +02:00
github-actions[bot]
51a073221b chore: Auto Templates Optimization
Triggered by a267cc5f66

[skip changelog]
2025-08-29 14:31:06 +00:00
Constrat
a267cc5f66 fix: RoguelikeDialogSkip for EN 2025-08-29 16:30:43 +02:00
github-actions[bot]
a6e61f7a6b chore: Auto Update Game Resources - 2025-08-29
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17323442926

[skip changelog]
2025-08-29 12:12:24 +00:00
uye
642c8eefe6 feat: 远程通知添加 [MAA] 前缀
fix #13912
2025-08-29 19:39:28 +08:00
uye
a54433ad8c feat: 战斗列表悖论模拟关卡名转为干员名 2025-08-29 18:54:13 +08:00
uye
af68bf918b fix: 关卡名下划线被解释成 CheckBox 访问键 2025-08-29 18:50:11 +08:00
uye
ad2945a815 feat: 调整战斗列表提示描述 2025-08-29 11:09:14 +08:00
Constrat
64e0c4ac3c fix: BattleQuickFormationExpandRole text ocr 2025-08-29 02:22:27 +02:00
Constrat
3d88182c44 fix: OfficeMini template for EN 2025-08-29 01:50:18 +02:00
Constrat
3a12869b7e fix: OfficeMini template for EN 2025-08-29 01:49:52 +02:00
github-actions[bot]
433e8d910f chore: Auto Update Game Resources - 2025-08-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17310328154

[skip changelog]
2025-08-28 23:27:12 +00:00
Constrat
b789183f6d chore: YostarEN updated main stage navigation (#13906)
* chore: remove unused roguelike@integratedstrategies

* chore: remove unused StageTheme and Resource

* chore: PLACEHOLDER for clickchapter

* chore: minus placeholder + ocr fixes

* chore: continue

* chore: final placeholder

* fix: custom ROI for default and movements
2025-08-29 01:19:43 +02:00
github-actions[bot]
887574aa6e chore: Auto Templates Optimization
Triggered by 5676a2df3b

[skip changelog]
2025-08-28 22:55:34 +00:00
Constrat
5676a2df3b fix: ROI and text for EA YostarEN 2025-08-29 00:55:13 +02:00
Constrat
36536d9a13 fix: YostarEN text render template changes 2025-08-29 00:55:03 +02:00
uye
63fd4ca0d8 perf: 覆盖 ThirdlyTextBrush,优化深色模式下的显示效果 2025-08-29 00:49:49 +08:00
Constrat
b1a2999c15 i18n: Give new line for English downloading from 2025-08-28 18:41:00 +02:00
uye
6770ec19c8 feat: 加个启动提醒 2025-08-28 23:56:11 +08:00
Manicsteiner
2086377f48 chore: YostarJP remove old navigation (#13905) 2025-08-28 23:32:22 +08:00
uye
d282b5b999 Release v5.24.0-beta.1 (#13866) 2025-08-28 23:00:43 +08:00
github-actions[bot]
fac1f265d7 docs: Auto Update Changelogs of v5.24.0-beta.1 (#13901)
* docs: Auto Generate Changelog of Release v5.24.0-beta.1

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>
2025-08-28 23:00:00 +08:00
HX3N
5376157f69 chore: YostarKR new main stage navigation and ocr fix (#13903)
* chore: remove task and add ocr

* chore: ocr fix

* chore: Store@Purchase
2025-08-28 16:29:01 +02:00
Manicsteiner
7e3a133066 chore: YostarJP new main stage navigation and ocr fix (#13902) 2025-08-28 14:12:22 +02:00
github-actions[bot]
05e3933115 chore: Auto Update Game Resources - 2025-08-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17294386616

[skip changelog]
2025-08-28 11:26:45 +00:00
status102
8ee7f31887 rft(wpf): 悖论模拟使用多任务流程 2025-08-28 18:40:21 +08:00
status102
44dd7c5501 perf: 任务baseTask 2025-08-28 18:25:28 +08:00
status102
aa21512ab9 rft: remove ParadoxMode var 2025-08-28 18:10:57 +08:00
status102
714e37ded2 rft(core): 移除MaaCore不再支持的自动战斗作业代码解析 2025-08-28 18:07:36 +08:00
status102
f5aee4f3fb docs: 注释
[skip changelog]
2025-08-28 18:04:18 +08:00
status102
c10df90fbf fix: var type 2025-08-28 18:01:46 +08:00
uye
79e311185a style: 什么奇怪的换行 2025-08-28 17:59:14 +08:00
uye
016783c86c chore: 删掉 core 的联网功能 2025-08-28 17:56:51 +08:00
uye
770130e774 chore: dll 检测排除带 maa 的 dll 2025-08-28 17:52:13 +08:00
Rbqwow
363aa99b83 feat: 在启动时检测额外的DLL文件 (#13850)
* feat: 在启动时检测额外的DLL文件

* chore: 改一下弹窗样式

* chore: 修改检测逻辑与翻译

* chore: 显示一下不属于 maa 的 dll

* feat: 启动弹窗都加个图标

* chore: 就要大写就要大写

* chore: MessageBoxHelper

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-08-28 17:37:25 +08:00
pre-commit-ci[bot]
2710664a79 chore: Auto update by pre-commit hooks [skip changelog] 2025-08-28 09:36:32 +00:00
uye
388b3627cb chore: core 删除 cpr 2025-08-28 17:35:23 +08:00
github-actions[bot]
3359fa618e chore: Auto Templates Optimization
Triggered by 1691f828ff

[skip changelog]
2025-08-28 09:33:13 +00:00
Status102
0c3c3df8f2 feat: 支持一键悖论模拟 (#13893)
* feat: 支持一键悖论模拟 (#13885)

* feat: 支持一键悖论模拟

* chore: OperParadoxBegin EN

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

* feat: 支持一键悖论模拟

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

* feat: 支持一键悖论模拟

* fix: 更新悖论模拟按钮位置

* feat: 悖论模拟UI资源添加

* fix: 删除xml中被误添加的文件

* feat: 根据关卡类型显示选项

* i18n: 标签翻译

* feat: 修改小提示

* i18n: EN

* chore: zh-tw

* i18n: KR

* i18n: KR 2

Long text breaks the UI :(

* i18n: SSS -> SSS

* feat: 多行 TabControl

* chore: 调整布局

* i18n: JP

* perf: 优化返回流程

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

* chore: 删掉 core 的联网功能

---------

Co-authored-by: 翔宇 战 <1361227324@qq.com>
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: _Burnside <33724737+Burnside999@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>

* fix: 新战斗导航下的悖论模拟

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: 翔宇 战 <1361227324@qq.com>
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: _Burnside <33724737+Burnside999@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
2025-08-28 17:32:32 +08:00
uye
1691f828ff feat: 争锋频道:蜜果城 2025-08-28 17:32:14 +08:00
github-actions[bot]
1fed8feed0 chore: Auto Update Game Resources - 2025-08-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17291732401

[skip changelog]
2025-08-28 09:29:35 +00:00
github-actions[bot]
351ce45a52 chore: Auto Update Game Resources - 2025-08-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17291207437

[skip changelog]
2025-08-28 09:09:22 +00:00
HX3N
c56e81e8be fix: YostarKR EA navigation 2025-08-28 18:07:56 +09:00
uye
c3bcb3105c fix: 勾八导航乱写 2025-08-28 17:06:06 +08:00
github-actions[bot]
0bf9379d35 chore: Auto Update Game Resources - 2025-08-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17284296625

[skip changelog]
2025-08-28 02:49:02 +00:00
dantmnf
a3dba0b54a style: 狗屎自动分词💩 (#13897)
Co-authored-by: dantmnf <dantmnf@users.noreply.github.com>
2025-08-28 01:00:56 +08:00
Manicsteiner
a5dcfd9100 chore: YostarJP EA navigation 2025-08-27 09:39:14 +08:00
Constrat
5f1159b2d6 chore: YostarEN EA navigation 2025-08-27 00:08:01 +02:00
HX3N
9c6df33d77 chore: YostarKR EA navigation (#13888) 2025-08-27 01:00:11 +08:00
soundofautumn
2b7894886f i18n: 自动战斗模组错误本地化 & 移除多余的行末空格 (#13800)
* i18n: 自动战斗模组错误本地化

* i18n: EN

* i18n: 忘记给en-us加了

* i18n: KR tweak translation

* chore: 统一换行符

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
2025-08-26 23:52:45 +08:00
status102
7ce19904c0 fix(wpf): 自动战斗界面Idle setter限制 2025-08-26 23:25:57 +08:00
status102
5b2b2b7fe8 fix: 自动战斗-战斗列表使用错误的作业战斗 2025-08-26 23:25:34 +08:00
github-actions[bot]
385c26b065 chore: Auto Update Game Resources - 2025-08-26
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17232989951

[skip changelog]
2025-08-26 08:49:37 +00:00
github-actions[bot]
9d60945af9 chore: Auto Update Game Resources - 2025-08-26
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17232079660

[skip changelog]
2025-08-26 08:11:58 +00:00
uye
8f1dbb64c3 fix: filters 2025-08-26 15:09:46 +08:00
uye
1ca9c3823b chore: 调整小游戏内容顺序 2025-08-26 11:05:20 +08:00
uye
27b0ddaf2f chore: 修改 RA 和肉鸽的进入终端等待时间
fix #13858
2025-08-26 10:43:57 +08:00
uye
ec4a86fab2 fix: 信用购物有时候点不掉危机合约支援界面 2025-08-26 09:28:05 +08:00
萨拉托加
86fbd1061b chore: 调整萨卡兹,界园的古米精二优先度 2025-08-25 17:58:44 +08:00
github-actions[bot]
8aada79ef5 chore: Auto Update Game Resources - 2025-08-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17193202533

[skip changelog]
2025-08-24 20:07:42 +00:00
Status102
b150c0d97b rft: 重构自动战斗战斗列表 (#13852)
* rft(core): 重构多作业自动战斗

* rft(wpf): wpf支持新任务参数

* perf: 移除不必要move

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

* fix: 任务计数

* fix: 战斗完成提示

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-24 22:51:08 +08:00
uye
3b5ef33daa chore: 修改备份文件写入时间 2025-08-24 22:33:15 +08:00
uye
e9f9e5a6b3 chore: 关机/休眠/睡眠 统一调用 PowerManagement 2025-08-24 20:12:35 +08:00
uye
c7cc4fe836 chore: 调整 GetModuleFileName 判断 2025-08-24 20:11:59 +08:00
uye
d6822fed31 chore: 更新 CsWin32 2025-08-24 20:11:07 +08:00
uye
c6e5fd43cb chore: luid 2025-08-24 19:05:01 +08:00
uye
a8164506d9 chore: 移除未使用的 container 2025-08-24 18:28:24 +08:00
uye
83ef927474 fix: ServerChan 未使用通用 httpService 2025-08-24 17:23:03 +08:00
uye
798db61999 refactor: ToastNotification 重构 2025-08-24 17:08:58 +08:00
uye
ade3e7963a style: GpuOption format 2025-08-24 14:52:59 +08:00
uye
9f899dd96e style: 统一 UI 绑定的方法 注释 2025-08-24 12:28:07 +08:00
uye
39f45e623a chore: A single-line comment within C# code is not preceded by a blank line. 2025-08-24 12:25:44 +08:00
uye
39ba4e91f5 chore: A C# partial element is missing a documentation header. 2025-08-24 12:21:47 +08:00
uye
25878b5380 chore: An item within a C# enumeration is missing an Xml documentation header. 2025-08-24 12:16:12 +08:00
uye
b62dea6a19 chore: A C# method, constructor, delegate or indexer element is missing documentation for one or more of its parameters. 2025-08-24 11:54:28 +08:00
uye
6cf7272aff chore: The XML header documentation for a C# element is missing a tag. 2025-08-24 11:53:28 +08:00
uye
2c5568d4f8 chore: Copyright 2025 2025-08-24 11:27:12 +08:00
uye
46beb3308e chore: mumu 使用 7555 端口时禁用 Index 检测,添加日志警告 2025-08-24 10:49:06 +08:00
uye
7514438144 fix: 错误清除 _tasksStatus 的时机 2025-08-24 00:28:24 +08:00
status102
39de085354 chore: file header 2025-08-23 15:45:26 +08:00
status102
ad4e32a92b feat(core): 自动战斗关卡结束后增加识别使用黑色返回按钮的检测 2025-08-23 12:27:32 +08:00
github-actions[bot]
114900e815 chore: Auto Update Game Resources - 2025-08-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17164905456

[skip changelog]
2025-08-22 20:08:26 +00:00
status102
6db11fa846 rft: 自动编队助战的确实干员读取 2025-08-22 22:32:44 +08:00
uye
c14225f54f chore: 加点肉鸽事件 fallback 前延迟,可能减轻点网络波动影响
fix #13848
fix #13784
2025-08-22 19:32:48 +08:00
uye
62b7b0c645 fix: 肉鸽入口等待 ocr 识别错误 2025-08-22 19:32:47 +08:00
status102
ee3a95f092 fix: 界园肉鸽商店钱包余额ocr roi 2025-08-22 17:27:17 +08:00
status102
eb370ae792 rft: 自动战斗不再使用need_navigate字段作为导航启用开关, 而是直接使用navigate_name字段 2025-08-22 16:17:48 +08:00
status102
4077100aa8 fix(wpf): 自动战斗-战斗列表突袭提示显示在运行期显示效果 2025-08-22 15:10:59 +08:00
status102
d2ada336e5 perf: 向战斗队列中添加SSS作业时追加错误输出 2025-08-22 13:37:27 +08:00
status102
b58a0c7bde fix: 不再点击停止任务时移除存储的TaskId 2025-08-22 13:37:26 +08:00
HY
ee37851d16 fix: 繁中服薩米肉鴿第四層名稱 (#13846) 2025-08-22 08:39:17 +08:00
status102
71ec401cde fix: 肉鸽投资存款不变重试20次退出 2025-08-21 23:51:42 +08:00
uye
f8c79833a1 feat: 更新源为海外源时隐藏 Mirror酱 CDK 输入框 2025-08-21 23:25:40 +08:00
uye
710515f581 fix: required version 显示错误 2025-08-21 23:09:00 +08:00
uye
36c8ee9942 fix: 会客室换班失败(如选人过程中弹出线索交流完成)时重开任务
fix #13449
2025-08-21 17:37:57 +08:00
Constrat
5c4a9338e1 ci: split codeql (#13812)
* perf: codeql core

* perf: standardize caching for codeqlcore

* fix: correct cache keys

* perf: add codeql-js for website and workflows

* fix: typo

* fix: use bash instead of pwsh in ubuntu
2025-08-20 23:14:16 +02:00
status102
f9d5b2b417 fix: 肉鸽开局招募在无开局干员时, 无法识别两招募的左侧位 2025-08-20 22:37:12 +08:00
萨拉托加
8b9fe3fecc fix: 千古鸭帝进战斗 2025-08-20 21:28:24 +08:00
uye
dc02a754d1 fix: 日服的萨卡兹第五层怎么全 jb 改成 exit 了
fix #13829
2025-08-20 20:21:13 +08:00
Status102
b9bd50d1c5 refactor: 自动战斗干员编队状态; 修复编队中干员属性未达标时反复报错; 缺少干员输出时, 干员组内干员打平输出 (#13795)
* chore: 状态定义

* rft: 重构干员编队的状态

* feat: 编入上次干员

* rft: wpf输出

* fix: ubuntu
2025-08-20 19:59:08 +08:00
Weiyou Wang
f29d9784f7 fix: 修正生息演算中 "丰饶灌木林" 的 OCR 识别 (#13825) 2025-08-20 17:43:14 +08:00
uye
c7c9f2d3c5 chore: 调整技能截图判断 2025-08-20 17:24:09 +08:00
Hao Guan
8e53d6a036 fix(mac): 资源更新文件处理 2025-08-20 17:19:26 +08:00
github-actions[bot]
43d86b717a chore: Auto Update Game Resources - 2025-08-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17091976053

[skip changelog]
2025-08-20 07:45:38 +00:00
uye
8aa65c6146 fix: 萨卡兹肉鸽因动画延时偶发无法领取去伪存真合成物品
fix #13822
2025-08-20 15:33:48 +08:00
github-actions[bot]
0dee92ab2c chore: Auto Update Game Resources - 2025-08-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17087999432

[skip changelog]
2025-08-20 03:50:54 +00:00
uye
cd078e924d fix: 萨米投资进二层会卡在预见密文板 2025-08-20 11:45:21 +08:00
Constrat
234b75dec2 perf: limit codeql run only to source code (#13802) 2025-08-19 16:18:17 +02:00
uye
3009055cb0 Release v5.23.2 (#13794) 2025-08-19 22:17:26 +08:00
uye
d1175ee34b docs: Update CHANGELOG.md 2025-08-19 22:16:13 +08:00
萨拉托加
433a009835 chore: 修改保全作业站位和工具人数量 (#13797)
* chore: 修改保全作业站位和工具人数量

* 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-08-19 21:39:22 +08:00
HX3N
84f3a7cc5d chore: KR use Official UiTheme template
[skip changelog]
2025-08-19 22:35:53 +09:00
github-actions[bot]
f6c9960300 chore: Auto Update Game Resources - 2025-08-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17071232507

[skip changelog]
2025-08-19 13:34:02 +00:00
Constrat
09ff523de7 fix: use Official template for Global (#13801)
* fix: use Official template for EN

* chore: delete infrastoverview.png

* chore: KR delete template

* chore: JP delete template

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
2025-08-19 21:28:50 +08:00
HY
e0b230a259 chore: 調整繁中服水月、薩卡茲肉鴿相關內容 (#13806)
* chore: 補上水月跟薩卡茲肉鴿 mode1 task

* chore: 調整 GUI 上的薩卡茲分隊名稱
2025-08-19 21:27:34 +08:00
uye
8628130cd3 fix: tw 服缺少薩米 mode 1 对应层名翻译
fix #13803
2025-08-19 20:38:59 +08:00
travellerse
0644592e42 perf: 自动编队干员组显示模组需求 (#13796)
* perf: 自动编队干员组显示模组需求

* chore: 简化判断逻辑

* chore: 统一格式

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-08-19 19:51:44 +08:00
github-actions[bot]
331ec96ac8 chore: Auto Update Game Resources - 2025-08-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17064104659

[skip changelog]
2025-08-19 08:33:19 +00:00
soundofautumn
3be18fd67d i18n: 自动战斗日志本地化 (#13777)
* feat: 保全派驻工具人信息本地化

* chore: 拆分干员职业类型枚举

* feat: 战斗日志本地化

* chore: 修改切换倍数描述

* feat: 剩余自动战斗本地化

* chore: 简化字典映射

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-08-19 15:32:35 +08:00
travellerse
c963ab5a41 fix: 支持新建关闭状态的节点,并修正日志输出 (#13766)
* fix: 修复日志输出参数格式

* fix: 修正界园树洞的节点网格大小

* fix: 支持新建关闭状态的节点
2025-08-19 15:06:50 +08:00
github-actions[bot]
29fca06687 chore: Auto Templates Optimization
Triggered by ef1fd744d1

[skip changelog]
2025-08-19 06:46:41 +00:00
uye
ef1fd744d1 fix: 烛火数量过少时无法匹配退出
fix #13788
2025-08-19 14:45:25 +08:00
uye
099359bb5d fix: Y 模组模板匹配阈值要求过高
fix #13791
2025-08-19 14:40:34 +08:00
uye
e2a869e547 chore: 删除多余 next
[skip changelog]
2025-08-19 13:47:02 +08:00
uye
ac527b3617 fix: 退出商店时如果没有识别到下一层的文字会卡在遇见密文板
fix #13787
2025-08-19 13:45:40 +08:00
travellerse
2ded386178 fix: 因模组约束取消干员时删除编队信息 (#13780) 2025-08-19 00:03:04 +08:00
萨拉托加
d609d6a667 chore: 修改并添加保全派驻作业 (#13783)
* chore: 修改并添加保全派驻作业

* 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-08-18 23:42:49 +08:00
Constrat
9a7ac0c1fe fix: EN Phantom increase ROI for StrategyChange 2025-08-18 16:22:19 +02:00
uye
01b84292d9 chore: 自动战斗中的 使用编队 改为勾选框 2025-08-18 20:28:51 +08:00
uye
3fe5caadd0 feat: 肉鸽难度括号里显示一下对应难度 2025-08-18 20:05:35 +08:00
Manicsteiner
c5a7fe10fa chore: missing tasks for JP IS 2025-08-18 19:33:10 +08:00
HX3N
33b7fc4166 chore: fix typo default to exit
[skip changelog]
2025-08-18 19:09:14 +09:00
HX3N
f4b5672f0c chore: missing tasks for KR IS
follow 55168098db
2025-08-18 19:05:37 +09:00
github-actions[bot]
781e29c1e2 chore: Auto Update Game Resources - 2025-08-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17037068240

[skip changelog]
2025-08-18 09:48:10 +00:00
Constrat
55168098db chore: missing tasks for EN IS 2025-08-18 11:43:54 +02:00
status102
6f46e94754 perf: copilot useFormation ui 2025-08-18 16:38:41 +08:00
萨拉托加
eb0396cc88 fix: 萨米无法离开深埋迷境 2025-08-18 08:58:39 +08:00
Constrat
7bcf0897a5 fix: EN Sami big typo. 2025-08-18 01:15:26 +02:00
uye
b63ef6dc66 fix: 因动画或卡顿导致无法退出商店 2025-08-17 23:43:48 +08:00
uye
65c7158d1c Release v5.23.1 (#13760) 2025-08-17 20:16:30 +08:00
uye
62619170da docs: Update CHANGELOG.md 2025-08-17 20:15:43 +08:00
uye
730e7258bc style: 格式化
[skip changelog]
2025-08-17 20:13:37 +08:00
uye
586220d9d8 fix: 商店没钱了不会停止投资 2025-08-17 20:12:24 +08:00
uye
ba44ec6a40 Release v5.23.0 (#13754) 2025-08-17 19:46:38 +08:00
github-actions[bot]
db2e1ccf4e docs: Auto Update Changelogs of v5.23.0 (#13755)
* docs: Auto Generate Changelog of Release v5.23.0

* docs: Update CHANGELOG.md

* docs: Update CHANGELOG.md

* feat: Update CHANGELOG.md

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
2025-08-17 19:39:09 +08:00
萨拉托加
a8d293999e chore: 更新新保全 (#13756)
* chore: 更新新保全

* 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>
2025-08-17 17:34:58 +08:00
uye
3ae526ff72 fix: 萨米肉鸽刷坍缩范式闪退
fix #13750
2025-08-17 15:06:51 +08:00
vcfch843875
e99e44ee91 docs: 修正“刷理智”文档表述错误 (#13745)
* docs: 修正表述错误

floor函数是向下取整函数,所以原表述有误。

* docs: 修正表述错误

floor函数是向下取整函数,所以原表述有误。

* docs: 表現の誤りを修正

floor 関数は切り捨て関数なので、元の表現は誤りです。
2025-08-17 13:44:54 +08:00
github-actions[bot]
ea55e0463b chore: Auto Update Game Resources - 2025-08-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17011048822

[skip changelog]
2025-08-16 17:28:40 +00:00
travellerse
b6a953cb1d fix: 修复界园树洞无可用节点时任务失败 (#13741)
* fix: 修复界园树洞无可用节点时任务自动结束

* style: 移除无用的空行
2025-08-17 01:18:39 +08:00
Constrat
38aa0618d0 Revert "fix: add slight delay before `InfrastEnteredFlag' in case of stutters in base rendering"
This reverts commit 90570fbad3.
2025-08-16 14:42:40 +02:00
uye
14963a21c4 Release v5.23.0-beta.2 (#13735) 2025-08-16 19:56:48 +08:00
github-actions[bot]
943cf646bf docs: Auto Update Changelogs of v5.23.0-beta.2 (#13737)
* docs: Auto Generate Changelog of Release v5.23.0-beta.2

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-08-16 19:48:00 +08:00
github-actions[bot]
693caf6781 chore: Auto Update Game Resources - 2025-08-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/17008012425

[skip changelog]
2025-08-16 11:44:13 +00:00
travellerse
aed3f29598 feat: 适配界园树洞节点 (#13552)
* feat: 适配界园树洞节点 拾遗 传说

* fix: 修复卡在传说`应“蕴”而生`投钱

* fix: 将"_defaultBoskyPassage"改为"_boskyPassageDefault"  避免被识别为"_default"

* fix: 修复拾遗获得通宝卡住

* fix: 修复树洞内遇到集印概率卡住

* feat: 初步适配`易与`

* fix: 尝试替换一个更清晰的`易与`模板图

* feat: 添加`祸乱`识别,暂时不进入策略

* feat: 添加`故肆` `筹谋`占位

* feat: 添加`常乐`占位及相关事件选项

* feat: 添加`杂疑`和`筹谋`相关事件

* feat: 添加`杂疑`识别

* fix: 替换 `易与` `常乐` 模板图

* feat: 添加 `故肆` `筹谋` `常乐` `杂疑` 到策略

* fix: 将存在遮挡的 `故肆` `筹谋` `常乐` 识别阈值暂时调到0.65

* feat: 适配传说版`传讯`

* fix: 修复 掷地有声 概率识别错误

* fix: 替换 `故肆` 模板图

* fix: 修复传说版 `同心` 选择导致崩溃

* feat: 初步构建界园树洞地图

* fix: 优化 BoskyPassage 配置加载和节点处理逻辑

* fix: 删除passed属性,优化节点获取和日志输出

* fix: 修复因内存错误导致启动自动肉鸽时闪退

* feat: 支持按类型过滤获取节点

* fix: 移除重置函数中的中心节点创建逻辑

* fix: 优化树洞地图参数传递

* fix: 添加缺失的Grey模板图

* fix: 补上遗漏的NodeAnalyze

* fix: 清理没有使用到的树洞节点Task

* fix: 删除界园树洞多余的地图参数和adjacent函数

* fix: 重构pixel_to_grid_coords为成员函数

* fix: 删除多余的RoguelikeBoskyRoutingTaskPlugin.h引用
2025-08-16 19:43:13 +08:00
HX3N
22a806d699 i18n: KR tweak copilot option translation 2025-08-16 20:06:42 +09:00
Status102
baef3b8868 perf: 不同更新渠道加个描述 (#13734)
* perf: 不同更新渠道加个描述

* i18n: cn

* i18n: zh-tw

* i18n: EN

* i18n: typo

* i18n: JP

* i18n: KR

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
2025-08-16 18:45:05 +08:00
uye
a7197084c5 feat: 设置排序 (#13699)
* feat: 新增设置排序

* chore: 布局计算延迟到 Loaded 之后

* chore: 提取 SettingItemViewModel,简化代码

* chore: 排序改为全局配置

* chore: 移除没用上的属性

* feat: 运行时允许调整设置顺序
2025-08-16 16:11:31 +08:00
status102
d50f86a9c7 fix: 移除未使用 2025-08-16 14:59:29 +08:00
uye
2d6eff9cb3 chore: catch 一下企鹅物流的上报错误请求,避免影响重试逻辑
fix #13730
2025-08-16 14:50:40 +08:00
uye
d9bd770a4a feat: 调整自动战斗页面布局
[skip changelog]
2025-08-16 12:47:54 +08:00
uye
9a3bdf18d9 feat: 调整自动战斗页面布局 2025-08-16 12:09:32 +08:00
status102
be6d7d7c88 perf(wpf): 自动战斗使用编队选择框UI 2025-08-16 11:35:33 +08:00
status102
1b789ec3c3 fix: 肉鸽投资在单次投资达到999时可能无法退出 2025-08-16 11:16:53 +08:00
husy8
7b6046b682 fix: 修复掉落上报消息类型没有在 Python 层定义导致外部脚本报错的问题 (#13723) 2025-08-16 10:02:35 +08:00
uye
6877941188 fix: debug version 拿不到活动关卡 2025-08-15 22:43:32 +08:00
status102
364f9886f7 fix: 干员识别输出遗漏干员持有情况、潜能
改回旧的, 感觉是写的时候写错了
2025-08-15 22:28:35 +08:00
uye
692c301dc0 style: 长判断换行 2025-08-15 17:28:29 +08:00
status102
b154022100 fix: 剿灭失败不报错 2025-08-15 17:23:00 +08:00
uye
89e71dce76 fix: 傀影卡在无法进行初始招募的深入探索欲月度小队
fix #13692
2025-08-15 15:31:00 +08:00
vcfch843875
beb561a94f docs: 文档日语化翻译 (#13713)
* docs: 翻译“开始唤醒”部分为日语

将“开始唤醒”的部分全文翻译成了日语。
Translated the entire "Wakeup" section into Japanese.
「ウェイクアップ」の部分を全て日本語に翻訳しました。

* docs: 翻译“公开招募”部分为日语

将“公开招募”部分全文翻译成了日语。
The entire "Public Recruitment" section has been translated into Japanese.
「公開募集」部分の全文を日本語に翻訳しました。

* docs: 将“刷理智”部分全文翻译成日语

将“刷理智”部分全文翻译成了日语。
Translated the entire combat section into Japanese.
「作戦」部分の全文を日本語に翻訳しました。

* docs: 翻译文档标题为日语

将中文文档的标题“基建换班”改成日语的「基地仕事」。
Change the title of the Chinese document "基建换班" to the Japanese 「基地仕事」.
中国語のタイトル「基建换班」を日本語の「基地仕事」に変更する。

* docs: 优化文档的日语表达

优化了此文档的日语表达。
Improved the Japanese expressions in this document.
このドキュメントの日本語表現を最適化しました。

* docs: 翻译文档“获取信用及购物”部分

将“获取信用点及购物”部分全文翻译成了日语。
Translated the entire "Get Credits & Shopping" section into Japanese.
「FP獲得と交換」セクションの全文を日本語に翻訳しました。

* docs: 优化文档的日语表达

优化了此文档的日语表达。
Improved the Japanese expressions in this document.
このドキュメントの日本語表現を最適化しました。

* docs: fix 一个锚点错误

./tools.md#公招识别
→  ./tools.md#公開求人認識

* docs: fix 笔误

修正笔误。

* docs: fix 笔误

修正笔误。
2025-08-15 15:13:55 +08:00
uye
59b4ace20b feat: 使用编队宽度自适应 2025-08-15 14:59:36 +08:00
status102
95d27786dd perf(wpf): 一键长草任务列表翻转按钮下拉框样式优化 2025-08-15 14:57:03 +08:00
MistEO
3bef81c23e Revert "ci: bump the github-actions group in /.github/workflows with 2 updates" (#13707) 2025-08-15 10:11:34 +08:00
uye
80fd44728b Release v5.23.0-beta.1 (#13682) 2025-08-15 00:36:52 +08:00
github-actions[bot]
63cfa6e17d docs: Auto Update Changelogs of v5.23.0-beta.1 (#13698)
* docs: Auto Generate Changelog of Release v5.23.0-beta.1

* docs: changelog

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[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-08-15 00:30:53 +08:00
SherkeyXD
02d646e9aa feat: 烧水模式启用快速退出 (#13690)
* feat: 烧水模式启用快速退出

* feat: 难度选择 + 导航插件支持

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

* feat: 屎屎就试试

* fix: 可能修好了

* fix: 加点注释

* feat: 添加界园刷开局入口

* fix: 判断条件错误

* fix: 糊

* feat: 指挥烧水放弃招募

---------

Co-authored-by: Weiyou Wang <44151844+Alan-Charred@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-08-15 00:02:11 +08:00
status102
e0c72a81d4 refactor: 迁移UpdateStageList 2025-08-14 23:37:42 +08:00
status102
25d2497a47 rft: _stageManager迁移 2025-08-14 23:37:41 +08:00
pre-commit-ci[bot]
892d46e640 chore: Auto update by pre-commit hooks [skip changelog] 2025-08-14 15:12:59 +00:00
status102
e55c22d45a perf: 合并regex 2025-08-14 23:10:30 +08:00
uye
3c82f6894e feat: 支持 梦乡 主题 (#13693)
* feat: 支持 梦乡 主题

* 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-08-14 22:50:27 +08:00
github-actions[bot]
b80f2c45df chore: Auto Update Game Resources - 2025-08-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16968559153

[skip changelog]
2025-08-14 14:47:59 +00:00
Tsukiyowu
6e6ca1ef7d fix: 修复萨卡兹肉鸽部分字段无法正确识别的问题 (#13691)
* 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-08-14 22:37:37 +08:00
uye
3148354640 fix: 无法区分界园 3/5 层 boss 2025-08-14 19:57:12 +08:00
github-actions[bot]
15502a1d6d chore: Auto Update Game Resources - 2025-08-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16960910691

[skip changelog]
2025-08-14 09:10:03 +00:00
status102
ab312ec9fe refactor: binThreshold, useRaw直接写入task 2025-08-14 15:49:48 +08:00
uye
2b13f21908 feat: 优化标题栏显示效果 2025-08-14 14:21:55 +08:00
uye
8ef3e48492 feat: 版本后面也跟个日期 2025-08-14 10:29:16 +08:00
github-actions[bot]
df1c6b4fa7 chore: Auto Update Game Resources - 2025-08-13
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16941861653

[skip changelog]
2025-08-13 15:29:07 +00:00
uye
37600ac2d9 perf: 仓库识别改用二值化后的非char模型识别 (#13667)
* perf: 仓库识别改用二值化后的非char模型识别

* feat: unify large number display format to k/M/B

* chore: 通过开关控制万以下数量是否格式化
2025-08-13 23:20:00 +08:00
uye
140b041164 fix: 因招募动画卡预见密文板 (#13680)
* 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-08-13 23:19:22 +08:00
HY
17f5d9e2b1 chore: 繁中服「出蒼白海」導航入口文字調整 (#13681) 2025-08-13 21:57:58 +08:00
status102
646424347e fix: 修修ocr bin threshold 被task info 错误覆盖 2025-08-13 16:05:01 +08:00
uye
427f2996e0 fix: 获得排异反应的干员无法选择技能
fix #13618
2025-08-13 15:59:27 +08:00
uye
83f28cb49b chore: 调整 LDExtras 文件位置 2025-08-13 15:35:25 +08:00
Rbqwow
902a3e9ebe docs: mumu (#13658)
* docs: mumu删了两个数字 我改了二十个文件

* docs: 更新连接设置文档
2025-08-13 15:27:48 +08:00
uye
ca916c9455 chore: 自动战斗存图阈值改为0.75 2025-08-13 14:15:53 +08:00
uye
16968ee2ef fix: schema error 2025-08-13 14:15:53 +08:00
Status102
89f6330e48 fix: 移除使用empty.png当JustReturn屎 (#13652) 2025-08-13 11:23:36 +08:00
Rbqwow
597830850b docs: 文档站小修复 (#13659)
* fix: 去掉按tab可以选中的在页面左上角的`跳至主要内容`

* build: update turbo to 2.5.5

* fix: 干掉语言列表里面的根目录
2025-08-13 05:09:48 +08:00
uye
e1e57b99c0 feat: 幸运掉落用家具零件代替显示 2025-08-12 23:36:09 +08:00
uye
e7aed3250b feat: ADB 连接失败时尝试启动模拟器 勾选框在连接设置与启动设置中同时显示 2025-08-12 22:34:24 +08:00
uye
60eea0e176 style: format 2025-08-12 22:23:15 +08:00
uye
e1cc30b9db feat: 支持 mumu 5555 端口使用控制台退出与截图增强 2025-08-12 21:53:24 +08:00
status102
24e519bbe6 refactor(wpf): 刷理智任务指定材料不再使用双属性保存,仅保存物品id 2025-08-12 16:23:32 +08:00
status102
066c735967 fix: 保存截图加回来
[skip changelog]
2025-08-12 14:42:12 +08:00
status102
1e935aeda9 fix: 识别错误等待+200ms 2025-08-12 14:40:18 +08:00
status102
755a3b97ee fix: 肉鸽投资可能由于存款被长期遮挡导致提前退出 2025-08-12 14:33:48 +08:00
uye
0032b6834a feat: 反转网络桥接提示框的按钮位置,避免误勾选 2025-08-12 13:03:05 +08:00
status102
1f0cf7393c ci: 未提交多个issue时,当前issue也会错误添加rapid-submission标签 2025-08-12 11:59:25 +08:00
status102
fb63fdac56 fix: 未启用备选关卡也会输出剿灭提醒 2025-08-12 11:59:25 +08:00
uye
6c5870b146 chore: 密文板加一个进入后检查 2025-08-12 10:45:05 +08:00
dependabot[bot]
e01e4d2f90 ci: bump the github-actions group in /.github/workflows with 2 updates (#13648)
Bumps the github-actions group in /.github/workflows with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/checkout` from 4 to 5
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

Updates `actions/download-artifact` from 4 to 5
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/download-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-12 09:32:59 +08:00
HY
b6e3df45c8 chore: 繁中服基建 + 保全派駐 7 相關更新 (#13643)
* chore: 繁中服基建更新

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

* chore: sss7 txwy

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

* chore: 移除彩六主題通用截圖

* chore: 再...再補個圖

* 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-08-12 09:29:42 +08:00
Constrat
90570fbad3 fix: add slight delay before `InfrastEnteredFlag' in case of stutters in base rendering 2025-08-12 01:10:33 +02:00
Constrat
b26f6be364 fix: EN Phantom IS font change nextlevel fix 2025-08-11 18:13:22 +02:00
HY
23469665ea chore: 繁中服「出蒼白海」活動導航 (#13644) 2025-08-11 23:34:35 +08:00
uye
1874d187d6 fix: 合成密文板未进入合成页面导致卡死 2025-08-11 23:10:21 +08:00
HX3N
f1b3dadc54 chore: YostarKR CharsNameOcrReplace ocr edit 2025-08-11 23:35:49 +09:00
Constrat
d5f7c00cdd fix: start plugin task not enough delay (#13623) 2025-08-11 16:11:01 +02:00
SherkeyXD
9126d92774 chore: 添加null检测 2025-08-11 20:33:41 +08:00
SherkeyXD
5dd8ee8f55 chore: rename MinimumFeatureLevel to minimumFeatureLevel 2025-08-11 20:33:23 +08:00
SherkeyXD
4ed4e53f46 style: add line 2025-08-11 20:32:10 +08:00
SherkeyXD
e6f29ecac6 chore: 修复fody一直报warning 2025-08-11 19:51:08 +08:00
SherkeyXD
6983c9cab9 style: move annotation 2025-08-11 19:51:08 +08:00
SherkeyXD
ed4c7b3a2b chore: add copyright header 2025-08-11 19:51:07 +08:00
SherkeyXD
c00fa86d0b chore: add nullable flags 2025-08-11 19:51:07 +08:00
Status102
baff5b46a7 ci: 关issue+提示,反复提issue+tag (#13638) 2025-08-11 18:30:37 +08:00
Status102
be96b6a160 refactor: 合并ocrBinThreshold (#13635) 2025-08-11 12:12:41 +02:00
SherkeyXD
640bdfa72b chore: gitignore添加MaaBuilder相关内容 2025-08-11 17:54:41 +08:00
SherkeyXD
3b4917e9e1 chore: 更新nuke版本 2025-08-11 17:53:59 +08:00
SherkeyXD
3596eb284f chore: 更新nuke构建参数信息 2025-08-11 17:38:09 +08:00
SherkeyXD
3ca1d0a16c chore: 更新MaaBuilder中使用的过时方法 2025-08-11 17:38:03 +08:00
SherkeyXD
aeb9ebda3c chore: add missing png suffix to templates 2025-08-11 17:24:10 +08:00
status102
fb99df8a9f ci: CN issue检查单判断逻辑更新, 不再关闭issue 2025-08-11 17:12:05 +08:00
github-actions[bot]
09784802d4 chore: Auto Update Game Resources - 2025-08-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16873713908

[skip changelog]
2025-08-11 07:32:44 +00:00
uye
96011a2294 fix: 商店因为动画卡在源石锭不足
fix #13632
2025-08-11 15:14:37 +08:00
status102
f83f3c83fa fix: 理智药背景干扰使用数量识别
fix #13622
2025-08-11 14:40:33 +08:00
uye
b18d57923b fix: 第一层没出商店时会在第三层才退出
fix #13615
2025-08-11 14:28:49 +08:00
uye
43a38ff1d8 chore: TestLinkAndGetImage 不允许同时运行 2025-08-11 14:28:49 +08:00
github-actions[bot]
a6bad9b029 chore: Auto Update Game Resources - 2025-08-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16872296487

[skip changelog]
2025-08-11 06:12:50 +00:00
status102
a13a011580 ci: fix
[skip changelog]
2025-08-11 13:28:04 +08:00
status102
d46066a26d ci: fix
[skip changelog]
2025-08-11 13:21:53 +08:00
Status102
8b133ef43f chore: 模板轮换 (#13625) 2025-08-11 13:19:13 +08:00
github-actions[bot]
5e9ba974b4 chore: Auto Update Game Resources - 2025-08-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16871478867

[skip changelog]
2025-08-11 05:14:53 +00:00
status102
beb6711b82 refactor(wpf): 基建设施排序初始化 2025-08-11 11:19:19 +08:00
status102
172f33d093 refactor: wpf任务名字段统一 2025-08-11 10:27:51 +08:00
status102
b9f57a4c44 fix(wpf): 肉鸽任务高级设置界面xaml错误修复 2025-08-11 10:15:26 +08:00
status102
6f025d1480 fix(wpf): 肉鸽种子选择框visibility判断更新 2025-08-11 10:14:53 +08:00
status102
6e8ed67dc5 chore(wpf): 基建设施种类 2025-08-11 10:14:18 +08:00
status102
f68d8878e9 chore: CustomTask存储 2025-08-11 10:08:50 +08:00
uye
170d02f082 fix: 每次截图测试前断开模拟器连接以获取最新的最快截图耗时 2025-08-10 23:49:00 +08:00
Status102
612c66b010 perf: 代理倍率、肉鸽难度 使用 不切换 代替 当前不使用 以符合实际逻辑 (#13612)
* perf: 代理倍率、肉鸽难度 使用 `不切换` 代替 `当前`、`不使用` 以符合实际逻辑

* i18n: kr

* chore: use key

* i18n: EN

* i18n: JP

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
2025-08-10 23:19:43 +08:00
uye
6f8e8e8ea4 fix: 锻冶旧迹 导航识别错误 2025-08-10 20:37:48 +08:00
uye
8c33554a2e feat: 自动编队支持指定使用编队 2025-08-10 16:56:09 +08:00
uye
99175acc30 feat: 调整自动战斗页面布局 2025-08-10 16:56:09 +08:00
uye
8137754462 feat: 调整编队界面翻译 2025-08-10 16:56:08 +08:00
status102
fd91375007 perf: wpf肉鸽难度初始化优化 2025-08-10 16:02:56 +08:00
status102
63a8fe5be4 fix: 追加自定干员职业与最后编入干员职业相同时, 误展开子职业列表
fix #13603
2025-08-10 15:45:47 +08:00
status102
6c3ec3130e chore: 浅调一下初始化顺序 2025-08-10 15:43:26 +08:00
status102
287d7e6597 fix: 肉鸽烧水选择当前难度时禁用 0难烧水切换 2025-08-10 10:51:21 +08:00
uye
5321cd9f42 Release v5.22.3 (#13605) 2025-08-09 23:06:44 +08:00
uye
8e0519f549 docs: Update CHANGELOG.md 2025-08-09 23:06:17 +08:00
uye
d82f230069 rft: 增加企鹅物流 .cn 备用域名,迁移上报逻辑到 UI 层 (#13602)
* chore: 企鹅物流上报添加 .cn 域名

* rft: 将企鹅物流的上报交给 ui 处理

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

* chore: 上报移除 cpr version

* docs: 添加对应文档

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

* chore: 获取新 id

* chore: 提取链接

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-09 22:48:38 +08:00
Hao Guan
cafd6d82f1 fix(mac): Mirror酱增量更新 2025-08-09 20:06:30 +08:00
status102
1aad8f7bc4 fix: 肉鸽烧水无法调整难度 2025-08-09 14:13:23 +08:00
uye
5a75870169 fix: 免费单抽剩余不足一小时无法使用
fix #13589
2025-08-09 13:34:30 +08:00
uye
f98ff9cc5e Release v5.22.2 (#13573) 2025-08-08 21:10:55 +08:00
uye
e3add87dc6 docs: Update CHANGELOG.md 2025-08-08 20:57:43 +08:00
uye
50f4f1612c chore: 调整chore: 调整 指点迷津 与 思维边界 的颜色范围
[skip changelog]
2025-08-08 19:36:55 +08:00
uye
3c959a32b8 chore: 调整 指点迷津 与 思维边界 的颜色范围 2025-08-08 18:15:09 +08:00
github-actions[bot]
e1ebfb255d chore: Auto Templates Optimization
Triggered by 48cb4ad49d

[skip changelog]
2025-08-08 09:54:45 +00:00
uye
48cb4ad49d chore: 调整节点识别范围 2025-08-08 17:54:09 +08:00
uye
ddb840d21f chore: stages 识别失败时放弃当前探索 2025-08-08 17:54:08 +08:00
uye
09840fc138 chore: 沉睡石像-战斗 2025-08-08 17:54:08 +08:00
status102
51d56151e6 perf: 肉鸽难度在首次进入后,仅在通关后才再次尝试调整 2025-08-08 15:46:21 +08:00
Status102
119e5c9ce5 feat: StartUp识别开始唤醒时最开始的完整性检测 (#13576)
* feat: StartUp识别开始唤醒时最开始的完整性检测

* chore: kr

* feat: YostarEN

* chore: zh-tw

* chore: YostarJP

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
2025-08-08 15:39:14 +08:00
Constrat
490329fad8 i18n: fix EN task schema 2025-08-07 22:56:32 +02:00
github-actions[bot]
852c35c068 chore: Auto Update Game Resources - 2025-08-07
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16811845762

[skip changelog]
2025-08-07 17:48:38 +00:00
uye
eff86fb645 fix: 招募助战的确认多试几次 2025-08-08 01:45:46 +08:00
uye
670d855651 fix: 最后一个节点开到招募藏品
fix #13570
2025-08-08 01:25:48 +08:00
uye
0bf28fc7d7 chore: 扩大 ChooseDifficulty base 范围 2025-08-07 23:12:07 +08:00
uye
2053f14d55 fix: 选难度闪退
[skip changelog]
2025-08-07 23:12:06 +08:00
Constrat
40fd94d40d chore: update comment
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-07 17:06:21 +02:00
uye
a6a4c2c934 chore: ChooseDifficulty 还是留着吧
[skip changelog]
2025-08-07 22:44:56 +08:00
pre-commit-ci[bot]
48189efb4b chore: Auto update by pre-commit hooks [skip changelog] 2025-08-07 14:37:30 +00:00
uye
f52658609a feat: 首次使用肉鸽选难度 2025-08-07 22:34:41 +08:00
status102
0b9d0fbcdd fix: 漏了 2025-08-07 22:03:10 +08:00
status102
2d9624bbc6 fix: using 2025-08-07 22:01:25 +08:00
萨拉托加
f8c728fed9 fix: 诡谲断章有概率识别错误 2025-08-07 19:41:46 +08:00
status102
8db6c3c679 refactor: wpf拆分Enum 2025-08-07 19:40:06 +08:00
uye
c97bed87f6 fix: 抗干扰值识别错误时卡树洞
#13572
2025-08-07 19:39:37 +08:00
github-actions[bot]
913bef8329 chore: Auto Update Game Resources - 2025-08-07
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16802748917

[skip changelog]
2025-08-07 11:08:34 +00:00
Manicsteiner
e0bd8cf89b chore: YostarJP ocr fix (#13571) 2025-08-07 12:50:44 +02:00
status102
8868eeea98 perf: UseStoneDisplay绑定优化 2025-08-07 17:30:31 +08:00
github-actions[bot]
cf0849aed3 chore: Auto Update Game Resources - 2025-08-07
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16798075509

[skip changelog]
2025-08-07 07:32:24 +00:00
status102
89051521c9 style: format
[skip changelog]
2025-08-07 13:54:58 +08:00
status102
ff9f4b7207 perf: Use default config key 2025-08-07 13:54:58 +08:00
status102
a0b63cc67c chore: nullable update 2025-08-07 13:54:57 +08:00
status102
d3cbb31399 fix: 统一使用NotChooseLevel1 2025-08-07 13:54:57 +08:00
HX3N
7212f160ee chore: fix typo
[skip changelog]
2025-08-07 13:57:07 +09:00
HX3N
8e26f6e94a i18n: KR minigame tweak 2025-08-07 13:54:56 +09:00
HX3N
d66158482a chore: YostarKR tweak Roguelike@StartExploreCD text
Remove text to avoid misrecognition
2025-08-07 13:04:49 +09:00
status102
112e5d2ef9 styel: format
[skip changelog]
2025-08-07 11:47:41 +08:00
status102
b60f8ffd00 refactor: wpf刷理智UI变量rename 2025-08-07 11:46:03 +08:00
status102
dd51f70f6e refactor: wpf刷理智UI默认值类型 2025-08-07 11:38:26 +08:00
status102
2ee9743915 refactor: wpf移除不必要的null移除转换 2025-08-07 11:33:07 +08:00
status102
ebc149a755 refactor: 移除肉鸽非开局时的EnterAfterRecruit,完成开始探索状态分离 2025-08-07 10:42:25 +08:00
status102
bda4900ffc refactor: 肉鸽月度小队模式和深入探索开局招募流程状态与局内分离 2025-08-07 10:42:25 +08:00
Constrat
456a7aa8d4 i18n: EN AT minigame tweak 2025-08-07 01:48:32 +02:00
uye
05275bbc0a fix: 肉鸽招募完干员点击右上角时点到了动画结束后的开始探索
fix #13547
2025-08-07 02:05:38 +08:00
HX3N
56a45cec9e fix: YostarKR update ocrReplace and ocr_config (#13562) 2025-08-07 00:37:00 +09:00
bodayw
2495e01e1b feat: 更新 243 极限效率一天四换排班表(20250806 修订) (#13561) 2025-08-06 13:58:17 +02:00
github-actions[bot]
5bbe6c7427 chore: Auto Update Game Resources - 2025-08-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16775639024

[skip changelog]
2025-08-06 11:29:41 +00:00
uye
36eda14549 fix: 关闭骰子页面时点进藏品页
fix #13557
2025-08-06 19:25:17 +08:00
_Burnside
63187cfe83 fix: 干员识别时因特殊排序时的遮挡而导致识别异常 (#13538)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
2025-08-06 19:12:07 +08:00
uye
577e23d961 chore: 调整 schema (#13554)
* chore: 调整 schema

* chore: required

* chore: 同步 en 版本

* chore: 移除 template 默认值

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

* chore: $schema require draft-07

* style: 格式化

* style: 格式化

* chore: 统一格式

* chore: 根据 schema 修改 tasks

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-06 18:37:08 +08:00
github-actions[bot]
01fd697276 chore: Auto Templates Optimization
Triggered by df880a55fa

[skip changelog]
2025-08-06 10:27:56 +00:00
Constrat
df880a55fa fix: EN Phantom IS updated Drop templates 2025-08-06 12:26:27 +02:00
HX3N
3f271f9bb6 docs: KR update and overhaul entire documentation (#13550)
* docs: manual

* docs: protocol

* docs: develop

* chore: fix typo

* chore: fix more typo

* docs: readme

readme image

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

* fix: corrected file name

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-06 18:33:38 +09:00
MistEO
69478a939c feat: u16 OCR replace (#13533)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-06 13:29:23 +08:00
cibimo
ed81d609f6 fix: 使 python 脚本支持从 github 获取文件长度并更新 (#13457) 2025-08-06 09:36:04 +08:00
Constrat
1176822d0e i18n: EN main readme 2025-08-06 01:36:20 +02:00
Constrat
abae2b77a2 i18n: EN overhaul entire documentation!
Thank you Claude
2025-08-05 19:40:51 +02:00
Constrat
6be474c67f fix: typo
[skip changelog]
2025-08-05 19:37:03 +02:00
Constrat
95c1138a74 docs: cache defaults to true in task-schema.md 2025-08-05 19:35:57 +02:00
Constrat
bff0c82b1e Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2025-08-05 18:49:11 +02:00
Constrat
0826607897 i18n: EN manual updates/fixes 2025-08-05 18:03:22 +02:00
Constrat
d7e42b0600 i18n: EN device updates/fixes 2025-08-05 18:03:14 +02:00
github-actions[bot]
52cc4971ff chore: Auto Templates Optimization
Triggered by 35fb0e0f4e

[skip changelog]
2025-08-05 15:42:02 +00:00
Constrat
35fb0e0f4e fix: EN IS5 missing template GetDrop4 2025-08-05 17:41:21 +02:00
Constrat
eebe0a9328 i18n: EN manual\cli updates/fixes 2025-08-05 17:13:22 +02:00
Constrat
b708dd9f98 i18n: EN develop updates/fixes 2025-08-05 17:11:27 +02:00
Constrat
ffa0699f89 i18n: ci tutorial for EN 2025-08-05 16:31:23 +02:00
uye
d0d691043e perf: 优化成就列表滚动条
fix #13543
2025-08-05 22:21:36 +08:00
Constrat
801bb5eb4e i18n: EN I.S. manual update 2025-08-05 15:46:09 +02:00
uye
e792af6d45 feat: 调整翻译 2025-08-05 21:42:23 +08:00
uye
8f47e000b7 Release v5.22.1 (#13539) 2025-08-05 21:00:40 +08:00
uye
812f918311 docs: Update CHANGELOG.md
[skip changelog]
2025-08-05 20:30:21 +08:00
status102
a285c3b518 rft: 调整部分UI绑定namespace 2025-08-05 18:21:49 +08:00
Bvicii
7f625e780d feat: 更新技能识别模型,采用更全面的数据集和使用focal loss训练 (#13498)
refactor:用新的数据集和loss function训练技能识别模型
2025-08-05 17:57:24 +08:00
uye
8d3e0e2231 fix: 傀影卡历史馈赠
fix #13511
2025-08-05 17:56:22 +08:00
uye
110eeb98c1 feat: Unhandled exception (#13535)
* feat: Unhandled exception

* 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-08-05 17:24:16 +08:00
uye
6e821d02d4 fix: 部分策略无法离开诡谲断章
fix #13526
2025-08-05 17:22:36 +08:00
status102
e5f8e3cdfc fix: wpf肉鸽投资N个源石锭NumericUpDown绑定失效 2025-08-05 16:51:22 +08:00
status102
558a03d6ce refactor: rename FreeRecruit -> FreeGacha 2025-08-05 16:45:38 +08:00
uye
a2593c6d61 fix: 购买商品时因动画导致点击无效
fix #13531
2025-08-05 12:03:06 +08:00
uye
05b6a6ca07 fix: 不开线索交流可能导致技能效率判断崩溃
fix #13493
fix #13508
2025-08-05 11:25:27 +08:00
HY
3f64adc6bc chore: 繁中服「詞祭」介面主題截圖 (#13521)
* chore: 繁中服「詞祭」介面主題截圖

* 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-08-05 00:45:27 +08:00
github-actions[bot]
b2c06dd192 chore: Auto Update Game Resources - 2025-08-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16728794274

[skip changelog]
2025-08-04 16:33:29 +00:00
HY
ee6877c111 chore: 再度調整繁中服「崔林特爾梅之金·復刻」活動導航 (#13519) 2025-08-05 00:22:31 +08:00
Manicsteiner
44ef5b5ab2 fix: RoutingRefreshNode roi expand (#13515) 2025-08-04 23:55:25 +08:00
github-actions[bot]
d20212dea0 chore: Auto Templates Optimization
Triggered by 788d9293a6

[skip changelog]
2025-08-04 13:13:12 +00:00
萨拉托加
788d9293a6 fix: 去伪存真卡在灵光乍现
fix: #13510
2025-08-04 21:12:25 +08:00
SherkeyXD
1874174a70 chore: 更新CropRoi的依赖 2025-08-04 20:42:22 +08:00
Constrat
e2a6b6644b fix: update YostarEN IS3 templates
fix #13502
2025-08-04 13:41:38 +02:00
_Burnside
e8bb1a97e3 docs: fix typo (#13503) 2025-08-04 17:55:00 +08:00
Manicsteiner
e2519114b6 chore: YostarJP ocr fix (#13500) 2025-08-04 17:24:27 +08:00
github-actions[bot]
0148492916 chore: Auto Update Game Resources - 2025-08-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16717675999

[skip changelog]
2025-08-04 08:11:31 +00:00
uye
7845dab791 fix: 概率卡在出洞后的投钱 2025-08-04 15:36:52 +08:00
github-actions[bot]
0f83706c3f chore: Auto Update Game Resources - 2025-08-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16716562587

[skip changelog]
2025-08-04 07:15:49 +00:00
status102
d05aae5b1c perf: wpf Win10+Toast通知使用系统内置通知声而不是独立播放 2025-08-04 15:12:42 +08:00
github-actions[bot]
a1025fa2c7 chore: Auto Templates Optimization
Triggered by 40163dacf4

[skip changelog]
2025-08-04 07:11:13 +00:00
uye
40163dacf4 fix: 界园卡通关结算页面 2025-08-04 15:10:43 +08:00
HX3N
f20da513b7 fix: YostarKR corrected ocrReplace in IS5 StrategyChange_mode1 2025-08-04 14:08:22 +09:00
uye
041d4f9525 perf: 手动点击查看公告时获取公告更新前先显示本地公告 2025-08-04 13:03:21 +08:00
uye
6ab772238c fix: 生息演算组装数量识别失败时取消组装 2025-08-04 10:36:37 +08:00
uye
792abcd180 fix: 其他肉鸽可能点到月度小队 2025-08-04 00:29:33 +08:00
uye
ffa8b4b2d4 feat: 不忽略肉鸽的报错 2025-08-04 00:18:57 +08:00
uye
bcd709265e perf: 优化 ComboBox 搜索 2025-08-03 23:54:40 +08:00
Hao Guan
62cbeba7fc fix: clang编译警告 (#13482) 2025-08-03 22:09:49 +08:00
Hao Guan
c6e491eada feat(mac): 新增小游戏 2025-08-03 20:47:37 +08:00
uye
3ac005d75a fix: 模拟器卸载/更新注册表残留可能导致截图增强弹窗死循环 2025-08-03 20:14:43 +08:00
uye
a979b7f33e i18n: 任务出错内容翻译 2025-08-03 15:57:50 +08:00
uye
678f076f60 fix: 仓库识别概率无法识别部分物品 2025-08-03 15:15:03 +08:00
uye
8bf856505b Release v5.22.0 (#13463) 2025-08-03 14:24:13 +08:00
uye
b7933ef7f2 fix: 多余符号 2025-08-03 14:22:43 +08:00
github-actions[bot]
41432ca341 docs: Auto Update Changelogs of v5.22.0 (#13455)
* docs: Auto Generate Changelog of Release v5.22.0

* docs: cahngelog

* feat: changelog

* fix: Update CHANGELOG.md

* fix: Update CHANGELOG.md

* fix: Update CHANGELOG.md

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-08-03 14:18:49 +08:00
HY
5bf78a9cba i18n: zh-tw tweak translations (#13467)
i18n: zh-tw tweak
2025-08-03 13:32:01 +08:00
萨拉托加
51619da8dd fix: 催债鬼夜叉二次选择 2025-08-03 12:52:37 +08:00
AimOwO
1d6b585c07 fix: 装置“斩”识别 (#13459)
* fix: 装置“斩”识别

* fix: 装置“斩”识别 

防止误识别为“斩”业星熊

* fix: 装置“斩”识别

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-08-03 12:47:00 +08:00
HX3N
226a45b8ff fix: YostarKR removes spaces in StrategyChange_mode and NextLevel 2025-08-03 05:57:25 +09:00
github-actions[bot]
6dba614726 chore: Auto Templates Optimization
Triggered by 3ebc095d37

[skip changelog]
2025-08-02 19:03:11 +00:00
pre-commit-ci[bot]
3ebc095d37 chore: Auto update by pre-commit hooks [skip changelog] 2025-08-02 19:02:46 +00:00
Manicsteiner
3514651f75 i18n: JP edits (#13460) 2025-08-03 02:55:23 +08:00
uye
94d71b1db4 feat: 相谈室 小游戏 (#13461)
* feat: 相谈室小游戏

* feat: ui 添加小游戏入口

* 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-08-03 02:54:00 +08:00
uye
61b968c58f debug: hsv 影响原图 2025-08-03 02:09:22 +08:00
uye
e045adc4dc fix: 卡遇见板子 2025-08-02 23:12:08 +08:00
SherkeyXD
53b1032e24 feat: SideStory「墟」关卡导航 2025-08-02 21:46:39 +08:00
uye
b19c836e35 Release v5.22.0-beta.2 (#13454) 2025-08-02 20:34:27 +08:00
uye
107f67c3a7 docs: Update CHANGELOG.md 2025-08-02 20:33:48 +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
uye
d339731987 docs: Update CHANGELOG.md 2025-08-02 20:31:40 +08:00
uye
b611b35248 fix: 无法使用连战 2025-08-02 20:24:31 +08:00
uye
aaefd75ef3 fix: 其他肉鸽的屎山爆炸了 2025-08-02 17:42:55 +08:00
uye
7aae2318f8 fix: 野鬃识别
现在应该没有其他野开头的干员吧
2025-08-02 17:17:01 +08:00
uye
906cb5624f fix: 野鬃识别 2025-08-02 17:11:46 +08:00
HY
36d44d7897 chore: 更新繁中服「崔林特爾梅之金」活動導航 (#13450)
* chore: 更新繁中服「崔林特爾梅之金」活動導航

* chore: update ZT.json

* 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-08-02 16:53:06 +08:00
github-actions[bot]
8cceb5ccd7 chore: Auto Update Game Resources - 2025-08-02
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16691605689

[skip changelog]
2025-08-02 08:09:30 +00:00
uye
1ba86d879c Release v5.22.0-beta.1 (#13428) 2025-08-02 12:19:57 +08:00
github-actions[bot]
cf930ef66a docs: Auto Update Changelogs of v5.22.0-beta.1 (#13451)
docs: Auto Generate Changelog of Release v5.22.0-beta.1

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-08-02 12:18:37 +08:00
Rbqwow
b1138f5b68 docs: 文~档~大~更~新,开始失败喽—— (#13410)
* fix: prettier 一定要能格式化文档✍️✍️✍️

* docs: 更新肉鸽用户文档

Co-authored-by: 萨拉托加 <151550168+Saratoga-Official@users.noreply.github.com>

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

* fix: 移除由 heroFullScreen: true 引入的 vp-hero-slide-down-button

主题组件叫 `@theme-hope/components/home/HeroSlideDownButton`
别管怎么移除的 看不到就行了)

* fix: 修复官网查看全部下载按钮动画

refer to 462bf51dce

* docs: 补充萨卡兹肉鸽点刺刷钱策略

* docs: 更新肉鸽新手教程描述

* fix: HomeActionsRelease.tsx typo

* docs: 更新难度选择按钮描述

* docs: Update integrated-strategy.md

* docs: Update integrated-strategy.md

* docs: 更新 integrated-strategy.md

---------

Co-authored-by: 萨拉托加 <151550168+Saratoga-Official@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: DavidWang19 <dwang0340@gmail.com>
2025-08-02 12:15:12 +08:00
github-actions[bot]
da7f9ffbc6 chore: Auto Update Game Resources - 2025-08-02
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16689662848

[skip changelog]
2025-08-02 04:02:33 +00:00
github-actions[bot]
5ec8bbf5a0 chore: Auto Templates Optimization
Triggered by 8ffbf4e053

[skip changelog]
2025-08-02 03:01:56 +00:00
github-actions[bot]
8ffbf4e053 chore: Auto Update Game Resources - 2025-08-02
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16689151708

[skip changelog]
2025-08-02 03:01:27 +00:00
萨拉托加
f82257d2cb fix: 祠堂口事件识别失败 2025-08-02 10:54:14 +08:00
萨拉托加
695f6425c5 fix: 调整飞来横祸EW站位 2025-08-02 10:21:41 +08:00
萨拉托加
57f76ccb20 fix: 调整往事暗哑离域检查EW站位 2025-08-02 10:13:32 +08:00
uye
f100a7ba81 fix: 拾取关卡掉落后找不到节点时放弃 2025-08-02 09:44:33 +08:00
uye
fbf683480b chore: 调整安全屋颜色范围 2025-08-02 09:34:35 +08:00
uye
d79bf3724b fix: 祠堂口事件识别失败 2025-08-02 09:18:08 +08:00
Constrat
cd2d1c448c chore: update YostarEN OR navigation 2025-08-01 19:01:09 +02:00
HX3N
819014983c fix: YostarKR 海神的信者 ocr edit
yostar updated translation
2025-08-02 01:38:30 +09:00
uye
579e34bd50 fix: 夕娥忆 关卡名识别错误 2025-08-01 23:51:23 +08:00
uye
77ed38127e fix: 重复报关卡难度 2025-08-01 23:51:23 +08:00
uye
65311bbd6c fix: 禳解事件识别错误 2025-08-01 23:51:23 +08:00
uye
da16cc95ad chore: 调整颜色阈值 2025-08-01 23:51:23 +08:00
uye
22842034ae chore: 添加白色部分识别 2025-08-01 23:51:23 +08:00
uye
ffa6724397 debug: 调整边框粗细 2025-08-01 23:51:23 +08:00
pre-commit-ci[bot]
7b66511566 chore: Auto update by pre-commit hooks [skip changelog] 2025-08-01 23:51:23 +08:00
Weiyou Wang
2ca5c83542 fix: JieGarden roguelike stage templates 2025-08-01 23:51:23 +08:00
萨拉托加
26703b0014 feat: 界园肉鸽补充战斗逻辑 (#13433)
* feat: 补充界园三层战斗逻辑

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

* feat: 添加斩业星熊,遥招募分数

* feat: 补充界园四层战斗逻辑

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

* feat: 补充界园五层战斗逻辑

* feat: 补充界园剩余战斗逻辑

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-01 23:50:48 +08:00
uye
4b6222b118 docs: useRaw 仅当 withoutDet 为 true 时生效 2025-08-01 23:27:58 +08:00
uye
7b765d8fdc docs: 更新文档与 maa_tasks_schema 2025-08-01 21:24:37 +08:00
pre-commit-ci[bot]
ec974f8648 chore: Auto update by pre-commit hooks [skip changelog] 2025-08-01 13:05:14 +00:00
uye
c79856b81e perf: 优化界园层名识别 2025-08-01 21:02:51 +08:00
uye
22eb038a9e feat: PipelineAnalyzer 支持使用灰度图匹配文字 2025-08-01 21:02:19 +08:00
Weiyou Wang
7b40c11df4 fix: 修复层名识别问题 -- "云瓦亭" -> "云(瓦)?亭" 2025-08-01 21:54:11 +10:00
uye
64ac7f5d64 debug: 低于阈值 0.2 的 hsv 也保存一下 2025-08-01 16:57:04 +08:00
uye
aa8f02aa3e fix: 拥有时光之末战斗失败后无法跳过动画 2025-08-01 16:54:13 +08:00
github-actions[bot]
e27566deb5 chore: Auto Update Game Resources - 2025-08-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16670365761

[skip changelog]
2025-08-01 08:33:17 +00:00
uye
53a4e125ca chore: 调整返回主界面点击位置 2025-08-01 15:42:30 +08:00
uye
fbece132b0 fix: 战斗失败没进结算识别 2025-08-01 15:42:09 +08:00
uye
dd1328f2c1 fix: 汝吾门 识别 2025-08-01 14:49:45 +08:00
HX3N
7b841fca84 fix: YostarKR 黍 ocr edit
garbage text after 黍 when skin is applied
2025-08-01 06:33:11 +09:00
HX3N
dd3233ff34 i18n: KR dehardcode string names and tweak translations
follow 167ac2d2d5
2025-08-01 05:20:58 +09:00
github-actions[bot]
d2c159590d chore: Auto Templates Optimization
Triggered by c85849651f

[skip changelog]
2025-07-31 18:05:00 +00:00
uye
c85849651f chore: 更新截图 2025-08-01 02:04:20 +08:00
uye
dba8f4f3c4 chore: 怎么jb有个0.6的阈值 2025-08-01 01:23:47 +08:00
uye
ee64c2051b chore: 不期而遇失败时尝试放弃 2025-08-01 01:21:07 +08:00
uye
0ed14899f9 chore: 在事件中卡死时尝试放弃 2025-08-01 01:13:52 +08:00
uye
5452ed2a96 perf: 优化多层事件逻辑 2025-08-01 00:29:05 +08:00
Constrat
718026c513 i18n: dehardcode string names
follows b0a53cd5b0
2025-07-31 18:28:05 +02:00
萨拉托加
c2dab28d51 fix: 鲍老板连锁去掉引号 2025-08-01 00:17:02 +08:00
Constrat
1bd11a988c fix: remove leading digits in IS encounters for YostarEN
事件名识别错误(傀影)肉鸽
Fixes #13425
2025-07-31 18:00:36 +02:00
Constrat
e3d708f4a9 fix: i18n english key 2025-07-31 17:30:21 +02:00
uye
9b8c1b4e1e chore: 删除 999 2025-07-31 23:26:19 +08:00
uye
97b3f9af38 chore: 彻底卡住时记录截图后尝试放弃 2025-07-31 23:26:18 +08:00
铃语
a04760272b perf: 优化水月肉鸽招募&傀影战斗 (#13344)
* perf: 优化傀影肉鸽招募&战斗

* perf: 优化水月肉鸽招募

* 恢复鸿雪抓取并降低分数,降低假日威龙陈和蕾缪安分数

* 恢复鸿雪抓取并降低分数,降低假日威龙陈和肥鸭分数

* perf: 恢复黑并降低分数

---------

Co-authored-by: 萨拉托加 <151550168+Saratoga-Official@users.noreply.github.com>
2025-07-31 23:05:35 +08:00
github-actions[bot]
64c349b75f chore: Auto Templates Optimization
Triggered by 7e8cc2d137

[skip changelog]
2025-07-31 15:02:09 +00:00
uye
7e8cc2d137 feat: 增加 hp 识别标志 2025-07-31 23:01:35 +08:00
uye
084bc5a6cd chore: 地镇事件选择 2025-07-31 22:49:59 +08:00
uye
fa90157c36 docs: Update CHANGELOG.md 2025-07-31 19:34:18 +08:00
github-actions[bot]
948ad064e3 chore: Auto Templates Optimization
Triggered by fd71f70d22

[skip changelog]
2025-07-31 11:32:58 +00:00
pre-commit-ci[bot]
fd71f70d22 chore: Auto update by pre-commit hooks [skip changelog] 2025-07-31 11:32:35 +00:00
status102
38bf8af185 feat: wpf支持作业版本限制 2025-07-31 19:29:17 +08:00
github-actions[bot]
6c07625302 chore: Auto Update Game Resources - 2025-07-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16647720698

[skip changelog]
2025-07-31 11:28:48 +00:00
萨拉托加
2526f1465f feat: 界园肉鸽补充事件选择逻辑 (#13400)
* feat: 界园肉鸽补充事件选择逻辑

补充遗漏的安全角 狭路相逢 命运所指
鲍老板连锁改成跑路
去掉重复的岔路事件

* feat: 修改催债事件逻辑

* fix: 峥嵘战功识别

* feat: 同心事件逻辑

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

* feat: wiki上可查的事件逻辑

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

* fix: 偏安三选项的情况

* fix: 烛堂孤钓不同选项的情况

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-07-31 19:27:45 +08:00
travellerse
299990833f fix: 对掉落信息进行排序 与ToolTip保持一致 (#13404)
* fix: 对掉落信息进行排序 与ToolTip保持一致

* fix: 在 wpf 里对掉落信息进行排序
2025-07-31 19:27:29 +08:00
uye
a60d6732f0 perf: 肉鸽节点识别 (#13427)
* perf: 节点统一 hsv

* perf: 普通战斗 hsv

* fix: 部分节点得分过低

* chore: 肉鸽节点不使用 colorWithClose

* chore: 调整安全屋模板

* perf: 优化绿色系识别
2025-07-31 19:21:20 +08:00
uye
b0a53cd5b0 chore: 调整翻译 2025-07-31 18:55:16 +08:00
uye
2fb58192a9 chore: 删除多余注释 2025-07-31 18:52:29 +08:00
uye
2fa1b2158c feat: 添加一键轮换说明 2025-07-31 18:51:08 +08:00
uye
4705cd7078 feat: 统一 TooltipBlock 位置 2025-07-31 18:34:53 +08:00
uye
643f2070c4 feat: 烧水分队不存在时自动替换为当前分队 2025-07-31 15:38:17 +08:00
uye
8b6da9b8bf style: 格式化 2025-07-31 15:37:38 +08:00
uye
d9788dba84 feat: 刷开局模式禁用源石锭达到上限时停止
fix #13420
2025-07-31 15:37:15 +08:00
uye
167ac2d2d5 perf: 优化成就排序与描述 2025-07-31 15:04:24 +08:00
Constrat
a2e8d82562 chore(tools): update ignore templates 2025-07-31 00:48:44 +02:00
uye
3538ab525c fix: ComboBox 的光标颜色不会随主题色变化 2025-07-30 17:45:16 +08:00
uye
810008d84b feat: 调整界面显示效果 2025-07-30 17:16:21 +08:00
uye
59aae8a055 chore: 强制替换 adb 改为使用本地 adb 2025-07-30 16:02:26 +08:00
uye
386264b689 feat: 完整显示注入 maa 的 dll 的路径 2025-07-30 15:51:51 +08:00
uye
fa0f3317f2 feat: 填写错误安装路径时重新弹窗提示 2025-07-30 14:52:56 +08:00
status102
e8798391d4 fix: wpf自动战斗干员模组选择默认值错误 2025-07-30 14:02:33 +08:00
uye
fbdba4a2c6 fix: 修复任务过程中修改剩余理智后导致关卡无法连续执行的问题
fix #13411
2025-07-30 13:27:42 +08:00
uye
4e10ff5a38 fix: 掌灯与引烛 事件识别 2025-07-30 13:20:33 +08:00
uye
85fe148d92 feat: 肉鸽使用助战新增需先填写开局干员的提示 2025-07-30 11:33:45 +08:00
uye
8ee8fc9e6b chore: 删除无用函数 2025-07-30 11:33:45 +08:00
Constrat
65941ee574 fix: typo for BattleStage Sarkaz EN 2025-07-29 18:01:56 +02:00
status102
8ca03b5dd7 fix: 肉鸽通关难度成就解锁判定错误 2025-07-29 22:23:43 +08:00
Constrat
00c9b053b1 docs: update IS for EN 2025-07-29 11:38:43 +02:00
萨拉托加
613da05a40 fix: 狭路相逢善恶同道识别 (#13383) 2025-07-29 11:38:39 +08:00
Weiyou Wang
3cb5318aa4 fix: 修复放弃招募任务链;避战识别不到得偿所愿 (#13395)
* fix: 修复放弃招募任务链

* fix: 怎么还有大小写问题啊

* fix: 划不到点刺

* fix: 肉鸽地图识别加入对界园得偿所愿节点的支持

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-07-29 11:35:18 +08:00
Constrat
acf81e46e5 fix: clang style 2025-07-28 21:57:56 +02:00
uye
e6efc49ddc fix: 无法选中 坚不可摧随心所欲 分队 2025-07-29 01:33:29 +08:00
uye
0078564a06 fix: 死循环 2025-07-29 01:02:59 +08:00
uye
b5c7bde5ac perf: 优化界面显示效果 2025-07-29 00:51:36 +08:00
uye
b8b3f57790 Release v5.21.2 (#13384) 2025-07-28 23:35:24 +08:00
uye
ee73e7609c docs: Update CHANGELOG.md 2025-07-28 23:34:05 +08:00
uye
5ce0a7ea4e docs: 更新文档 2025-07-28 21:50:28 +08:00
uye
a07d3cc7fc chore: 调整等级判断范围 2025-07-28 20:41:05 +08:00
status102
10f2268b1e chore: 加点注释 2025-07-28 20:01:17 +08:00
status102
0c96e22845 perf: 肉鸽满级检查CheckLevelMax增加isAscii=true 2025-07-28 20:01:16 +08:00
uye
17ca363515 feat: mumu 截图增强弹窗增加新版路径提示 2025-07-28 19:40:31 +08:00
uye
76816c4f8e chore: 调整 versionType
[skip changelog]
2025-07-28 18:35:52 +08:00
uye
db114a17b1 fix: 检测更新失败!!!!! 2025-07-28 18:29:02 +08:00
Hao Guan
1b14ff8d9a fix(mac): 修复默认客户端选项 2025-07-28 17:52:19 +08:00
uye
b84ba22c8f chore: 调整透明度笔刷 2025-07-28 17:29:00 +08:00
uye
8ca3df6d5c chore: 连接地址删除按钮居右 2025-07-28 17:28:46 +08:00
uye
bf6be133c5 fix: 字符串写错了 2025-07-28 16:25:49 +08:00
Weiyou Wang
8fcf9e13f7 fix: use HSVCount on JieGarden@Roguelike@StageEmergencyDps (#13380)
* fix: use HSVCount on JieGarden@Roguelike@StageEmergencyDps

* fix: hue 范围应该是0-179?

* fix: use recommended hsv range

* refactor: MaskRangeTool

* fix: 再用一个更好的色彩范围

* fix: 我听学姐的,把白色剔出激活范围

* fix: 只需要这一个就够了
2025-07-28 16:14:08 +08:00
github-actions[bot]
3caa2f8d7c chore: Auto Update Game Resources - 2025-07-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16563759329

[skip changelog]
2025-07-28 08:12:03 +00:00
uye
7937bbcb21 fix: 截图时间过长可能卡在进入下一层后 2025-07-28 15:49:34 +08:00
uye
aeb8ad36a7 chore: 访问 api 时如果本地不存在对应文件则不使用 etag 2025-07-28 14:57:35 +08:00
uye
604879eac1 chore: 日志压缩包打包 cache 文件夹 2025-07-28 14:47:36 +08:00
status102
7419ed762f ci: 文件未上传完成/成功正则追加 2025-07-28 11:29:50 +08:00
status102
c0cc7d119f perf: 自动编队干员属性要求未满足的提示输出等级上调至Error / Warning 2025-07-28 11:01:54 +08:00
萨拉托加
4d615dafd4 fix: 老戏骨非EW开局站位
fix #13376
2025-07-28 10:32:45 +08:00
uye
12fd336f8a feat: 修改文件被占用的解决方案 2025-07-28 01:55:32 +08:00
uye
983a511329 chore: 截图测试漏提示了 2025-07-28 00:15:29 +08:00
uye
3b5ebf8f24 Release v5.21.1 (#13371) 2025-07-27 23:28:37 +08:00
uye
f41174fd43 docs: Update CHANGELOG.md 2025-07-27 23:27:45 +08:00
uye
587c980621 docs: Update CHANGELOG.md 2025-07-27 23:21:46 +08:00
status102
78812d47f2 fix: 移除肉鸽开局选择分队后不应出现的地图检测 2025-07-27 23:16:11 +08:00
uye
b8c4f73da2 fix: 不知道为啥有人会开开局,修修看 2025-07-27 23:03:33 +08:00
uye
48412e2c92 chore: macos uuid 2025-07-27 22:45:41 +08:00
uye
4a68fac639 fix: 奇妙的模拟器卡启动 2025-07-27 22:11:55 +08:00
uye
4739feb8ff feat: 支持 mumu emulator-xxxx 格式地址关闭模拟器 2025-07-27 22:11:55 +08:00
uye
2eed3b87d4 Release v5.21.0 (#13359) 2025-07-27 16:28:39 +08:00
github-actions[bot]
e1caa6ebe8 docs: Auto Update Changelogs of v5.21.0 (#13363)
* docs: Auto Generate Changelog of Release v5.21.0

* docs: changelog

* docs: changelog

* docs: Update CHANGELOG.md

* docs: changelog

* docs: Update CHANGELOG.md

* docs: 米奇妙妙翻译

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[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>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
2025-07-27 16:27:28 +08:00
uye
7ca1ed1d4e chore: 全用动态资源 2025-07-27 16:13:08 +08:00
uye
658e141dd5 perf: 公招识别显示使用动态资源 2025-07-27 15:49:41 +08:00
pre-commit-ci[bot]
62bd414ed7 chore: Auto update by pre-commit hooks [skip changelog] 2025-07-27 06:57:32 +00:00
uye
bbe771dc1b fix: 开局招募 2025-07-27 14:54:58 +08:00
uye
68094ee2d9 fix: 商店刷新 2025-07-27 14:49:58 +08:00
uye
2884cdb808 fix: 切换语言时选择材料更新 2025-07-27 12:14:48 +08:00
uye
6c405305b9 feat: 优化主界面显示效果 2025-07-27 11:53:11 +08:00
uye
99befd7582 docs: 更新文档 2025-07-27 11:43:08 +08:00
status102
45eb731d30 perf: 更新日志界面Background前置 2025-07-27 11:39:14 +08:00
status102
37057885b9 perf: 简化长期剿灭任务名 2025-07-27 11:17:27 +08:00
status102
cc21ce7b9b fix: 移除未使用的AnnihilationWarning 2025-07-27 10:58:30 +08:00
status102
2472363b05 fix: 加回来删掉的提示 2025-07-27 10:58:30 +08:00
uye
3169d5826f chore: 关闭自定义剿灭时默认当期剿灭 2025-07-27 10:57:01 +08:00
uye
e14dcc4f48 feat: 添加自定义剿灭关卡勾选框 2025-07-27 10:55:09 +08:00
status102
467b32a324 perf: wpf剿灭关卡选择 2025-07-27 10:45:52 +08:00
status102
f6b019bbff chore: import 2025-07-27 10:18:29 +08:00
status102
b3310992db fix: 肉鸽开局招募状态
漏提交了
2025-07-27 10:14:09 +08:00
github-actions[bot]
5a0c35d4e7 chore: Auto Templates Optimization
Triggered by 950952e16c

[skip changelog]
2025-07-27 01:26:10 +00:00
status102
950952e16c fix: 界园肉鸽结算 2025-07-27 09:25:39 +08:00
uye
53f4cd9ead fix: 事件名错误 2025-07-27 09:19:33 +08:00
Drest
7c2e440b4e feat: 适配长期剿灭 (#13241)
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
2025-07-27 01:28:28 +01:00
pre-commit-ci[bot]
f799924d9b chore: Auto update by pre-commit hooks [skip changelog] 2025-07-26 18:28:44 +00:00
uye
72acbd0ecf fix: 卡招募 卡电弧 2025-07-27 02:26:26 +08:00
uye
dd26bd55ea fix: 投钱 2025-07-27 01:52:09 +08:00
github-actions[bot]
bb5d155b08 chore: Auto Update Game Resources - 2025-07-26
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16542026013

[skip changelog]
2025-07-26 17:06:25 +00:00
pre-commit-ci[bot]
a7dbfad774 chore: Auto update by pre-commit hooks [skip changelog] 2025-07-27 01:01:39 +08:00
uye
fbc16dc868 chore: 替换 JieGarden StageEncounterOptionUnknown模板图 2025-07-27 01:01:39 +08:00
uye
a93cbdcab6 fix: StageEncounterOptionUnknown 点到源石锭 2025-07-27 01:01:39 +08:00
Weiyou Wang
fe5d34c360 fix: 换用strategyChange 2025-07-27 01:01:39 +08:00
uye
ee7ca9cd22 feat: 进出洞 2025-07-27 01:01:39 +08:00
uye
1380ae172f fix: 饕餮廊事件识别错误 2025-07-27 01:01:39 +08:00
Weiyou Wang
671d72c5bc fix: 我就不明白了,为什么之前主题没有暴露出来问题? 2025-07-27 01:01:39 +08:00
Weiyou Wang
23b06335d7 fix: 我的问题 2025-07-27 01:01:39 +08:00
Weiyou Wang
7981c87b0c fix: 尝试修复卡进场 2025-07-27 01:01:39 +08:00
uye
77a7dbf6c0 chore: 护鸭金刚 选项 2025-07-27 01:01:39 +08:00
uye
676716494d Revert "feat: 界园屏蔽进二层"
This reverts commit 73ebf6f532a3634fd210d1b5b859255b36d6e35d.
2025-07-27 01:01:39 +08:00
uye
36ceaa34e8 chore: 多余的 ocrReplace 2025-07-27 01:01:39 +08:00
uye
7b1e14214a feat: ocr 任务暴露灰度阈值接口 2025-07-27 01:01:39 +08:00
uye
5a480f80e1 fix: 血量识别 2025-07-27 01:01:39 +08:00
Weiyou Wang
0ddf11c357 fix: 尝试修复 investment_with_more_score 2025-07-27 01:01:39 +08:00
uye
d39e342b3b feat: 添加选项 fallback 2025-07-27 01:01:39 +08:00
uye
14479cbee8 fix: 怎么多了个票卷生命值位置都变了 2025-07-27 01:01:39 +08:00
uye
7b00ccc9d3 feat: ui 添加刷等级入口 2025-07-27 01:01:39 +08:00
uye
549f5d19b5 fix: 无法点击树洞 2025-07-27 01:01:39 +08:00
uye
6d45acf7fb fix: 事件选择 2025-07-27 01:01:39 +08:00
uye
2b9dd49634 ci: 怎么报错了
[skip changelog]
2025-07-27 01:01:39 +08:00
uye
38cfee1437 feat: 界园屏蔽进二层 2025-07-27 01:01:39 +08:00
uye
86c00934d8 perf: 优化肉鸽难度选择逻辑 2025-07-27 01:01:39 +08:00
uye
0c1edc9626 feat: 增加快速刷钱时路线全是战斗的回调 2025-07-27 01:01:39 +08:00
uye
f49687fc1c fix: 卡退出战斗 2025-07-27 01:01:39 +08:00
uye
711ce7179d fix: 卡招募(? 2025-07-27 01:01:39 +08:00
uye
f161d855a4 chore: 防止没进 StrategyChange 的情况 2025-07-27 01:01:39 +08:00
uye
cd73d929fd fix: 截图保存报错 2025-07-27 01:01:39 +08:00
pre-commit-ci[bot]
c18dfa0335 chore: Auto update by pre-commit hooks [skip changelog] 2025-07-27 01:01:39 +08:00
Weiyou Wang
2fbf3cc669 fix: 修修补补 2025-07-27 01:01:39 +08:00
Weiyou Wang
b4c8a6e1fb feat: 先复制一下之前的导航代码,能跑就行;以后再重构 2025-07-27 01:01:39 +08:00
Weiyou Wang
0f5ff16afe feat: 补充相关任务链 2025-07-27 01:01:39 +08:00
Weiyou Wang
8f215d1f5f feat: fast investment for JieGarden 2025-07-27 01:01:39 +08:00
Weiyou Wang
6cf152a151 feat: update map 2025-07-27 01:01:39 +08:00
Weiyou Wang
c0846a26cc fix: 修复换层后 StrategyChange 功能 2025-07-27 01:01:39 +08:00
Weiyou Wang
9b61fd611e fix: 修复换层识别 roi 2025-07-27 01:01:39 +08:00
Weiyou Wang
1c10a7b1ff feat: node templates 2025-07-27 01:01:39 +08:00
Weiyou Wang
0a7d51dcfb feat: skip recruitment 2025-07-27 01:01:39 +08:00
Weiyou Wang
fd91aebd42 feat: add new routing strategy -- FastInvestment_JieGarden 2025-07-27 01:01:39 +08:00
Weiyou Wang
37e1477948 refactor: polish code 2025-07-27 01:01:39 +08:00
status102
f443ce6580 perf: 肉鸽指定干员开局招募进入干员选择页状态监测追加首次进入的指导的监测 2025-07-27 00:08:36 +08:00
uye
4a9f39137c fix: 无法连接主站时无法通过备站更新
fix #13355
2025-07-26 23:57:29 +08:00
github-actions[bot]
903d7140f1 chore: Auto Update Game Resources - 2025-07-26
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16535361549

[skip changelog]
2025-07-26 02:59:25 +00:00
status102
f3448ff13c refactor: 肉鸽局内外招募流程拆分 (#13342)
* rft: 界园主题初始实现

* perf: 优化core_char, 移除反复擦写

* perf: 简化任务链, 移除RecruitMain的StartExplore前缀

* rft: 其余肉鸽适配

* fix: 修改不稳定生效的任务计数联动

* fix: 开局干员招募未点进
2025-07-26 10:29:40 +08:00
status102
86aced1930 feat: 界园肉鸽开始探索CD任务ocr追加 2025-07-25 23:35:49 +08:00
status102
9e9005099c fix: 肉鸽招募任务计数未能正确归0
助战招募可能不流经

fix #13320

Roguelike@RecruitWithoutButton
2025-07-25 23:35:30 +08:00
uye
55f03641aa fix: uuid 与 version 返回错误格式时崩溃
fix #13351
2025-07-25 21:20:29 +08:00
Sakurapainting
ed5a5327f9 feat: 禁用弹出成就气泡 (#13345)
* feat: 新增禁用自动弹出成就气泡勾选框设置

* feat: 适配jp, kr, trad-cn 语言(#13315)

* fix: suggested changes

* feat: 新增“成就气泡弹出后一段时间消失”设置勾选框

* feat: 适配本地化语言en jp kr trad-cn

* i18n: EN

* fix: rebase

* feat: 禁用弹出气泡时不等待解锁延迟

* feat: 调整键名、布局

---------

Co-authored-by: Constrat <56174894+Constrat@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-07-25 17:59:44 +08:00
uye
2eb5f55f9f feat: 添加开机自启与系统通知相关注册表提示 2025-07-25 15:39:41 +08:00
uye
546e02f713 feat: 调整更新提示 2025-07-25 15:12:11 +08:00
uye
0a60709ea1 style: format 2025-07-25 14:29:19 +08:00
uye
523d2d0de3 chore: 仓库识别全局缓存,去除开方运算 2025-07-25 10:23:18 +08:00
uye
8732cbc131 feat: 扩大公告高度,更容易滑到底(了吗?)
[skip changelog]
2025-07-25 00:50:15 +08:00
uye
6e59f0cc83 feat: 扩大公告宽度,更容易滑到底(了吗?) 2025-07-25 00:46:36 +08:00
黄京
d90ed6d198 fix: YostarJP rogue OCR tweak for Mushikazu no Taki (#13346) 2025-07-24 23:01:30 +08:00
uye
2c997233f4 feat: 公招识别结果根据当前潜能排序 2025-07-24 22:12:58 +08:00
uye
86203e1292 fix: 公招识别按钮超出界面范围 2025-07-24 19:59:19 +08:00
uye
845ca36f5b refactor: 重构仓库识别逻辑,大幅提高识别速度 2025-07-24 18:26:26 +08:00
status102
663a5beeae chore: style
[skip changelog]
2025-07-24 16:21:15 +08:00
status102
e926beb206 fix: SA1136, SA1133 file header 2025-07-24 16:21:15 +08:00
status102
edda79aa6d perf: PerformanceUseGpu 读取替换 2025-07-24 16:21:14 +08:00
status102
e712053603 chore: SA1122 Use string.Empty for empty strings 2025-07-24 16:21:14 +08:00
uye
98e0bb6d1d fix: 分支条件判断错误 2025-07-24 16:14:59 +08:00
Sakurapainting
ff553f7c36 feat: 成就通知自动关闭选项
代替右键清空

link to #13343, #13323, #13345
2025-07-24 11:27:10 +08:00
SherkeyXD
91d6cdb099 ci: add ghtoken for codeql delete cache 2025-07-24 09:33:08 +08:00
uye
9a20625f07 fix: 仓库识别 x万 识别
糊屎
2025-07-24 02:39:13 +08:00
uye
8d19836739 feat: 调整界面描述 2025-07-23 19:37:31 +08:00
uye
05fddebb9c fix: 嵌套翻译 2025-07-23 19:07:42 +08:00
uye
30f582e908 feat: 公招结果支持彩色显示
fix #12458
2025-07-23 18:42:27 +08:00
uye
3d026d1b59 fix: 公开招募前三个槽均未招募时不会查看第四个槽
fix #12766
2025-07-23 16:34:14 +08:00
status102
0b4db32b53 i18n: wpf干员统一使用指定字符串资源 (#13333)
* i18n: wpf`干员`统一使用指定字符串资源

* i18n: EN

* i18n: JP

* i18n: KR

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
2025-07-23 09:23:46 +08:00
github-actions[bot]
4e65ce5635 chore: Auto Templates Optimization
Triggered by 5586c00385

[skip changelog]
2025-07-22 18:52:44 +00:00
uye
5586c00385 fix: 勾选框状态错误显示 2025-07-23 01:14:57 +08:00
HY
937e3777f4 chore: 更新繁中服部分幹員 ocr + 補充截圖 (#13338)
* chore: 更新繁中服部分幹員 ocr + 補充截圖

* 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-07-22 23:15:36 +08:00
HY
21a06e9011 chore: 繁中服「追跡日落以西」活動導航 (#13336) 2025-07-22 23:14:46 +08:00
Constrat
7f905d4e61 ci: delete stale cache for codeql (#13335) 2025-07-22 14:16:07 +02:00
github-actions[bot]
e85813902d chore: Auto Update Game Resources - 2025-07-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16439905362

[skip changelog]
2025-07-22 09:11:34 +00:00
status102
bc15d09557 chore: vs code jsonc 2025-07-22 16:51:45 +08:00
status102
4703656bf8 fix: 移除 investment_enter_second_floor 支持 2025-07-22 16:19:55 +08:00
status102
0508d56c78 perf: wpf不再允许通过Gui直接启用允许使用不推荐的GPU选项 2025-07-22 16:16:58 +08:00
uye
885ddc7b39 feat: 标题栏显示版本改为 ui 版本 2025-07-22 14:04:53 +08:00
MistEO
5c5867c2c0 chore: make GUI UserAgent simple 2025-07-22 10:16:10 +08:00
uye
6747c35e8b style: 格式化
[skip changelog]
2025-07-21 23:02:13 +08:00
uye
dbdb98a514 chore: warning CS8625: Cannot convert null literal to non-nullable reference type.
[skip changelog]
2025-07-21 22:58:30 +08:00
uye
af9507e373 chore: warning CS8602: Dereference of a possibly null reference.
[skip changelog]
2025-07-21 22:58:07 +08:00
uye
a36060125e chore: warning CS8601: Possible null reference assignment.
[skip changelog]
2025-07-21 22:56:46 +08:00
uye
1081d3e6e8 chore: warning CS8604: Possible null reference argument for parameter 'name' in 'bool TaskQueueViewModel.IsStageOpen(string name)'.
[skip changelog]
2025-07-21 22:53:50 +08:00
uye
03842af13d chore: warning CS8618: Non-nullable field '_connectedAddress' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the field as nullable.
[skip changelog]
2025-07-21 22:51:30 +08:00
uye
4f518b6e52 chore: warning CS8604: Possible null reference argument for parameter 'name' in 'bool TaskQueueViewModel.IsStageOpen(string name)'.
[skip changelog]
2025-07-21 22:50:51 +08:00
uye
e7a273e9c8 perf: 优化客户端切换逻辑,官服B服切换无需重载 2025-07-21 22:41:53 +08:00
uye
e4bee97168 feat: 调整 gpu 提示 2025-07-21 20:30:10 +08:00
travellerse
782371d2ca perf: 添加自动编队选项 忽略干员属性要求 (#13250)
* perf: 添加自动编队选项 支持模组不满足时选择默认模组

* refactor: 修改“模组不满足时选择默认模组”为“跳过未满足的干员属性要求”

* rft: 忽略干员属性要求

* i18n: KR

* i18n: EN

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-07-21 20:16:07 +08:00
Manicsteiner
96b1c05ca0 fix(ci): fix AppImage build toolkit (#13324) 2025-07-21 13:49:21 +02:00
status102
46bb00b8e9 perf: range::copy替换 2025-07-21 19:07:04 +08:00
uye
6f38008240 feat: 置顶按钮鼠标悬浮背景色 2025-07-21 16:18:59 +08:00
github-actions[bot]
51fe97b5ac chore: Auto Templates Optimization
Triggered by 3be1dda845

[skip changelog]
2025-07-21 07:27:17 +00:00
uye
3be1dda845 fix: 萨卡兹肉鸽结算页识别错误 2025-07-21 15:26:51 +08:00
HX3N
b703b95048 fix: YostarKR InfrastReward ocrReplace
prevent max trust and trust gain mixing
2025-07-21 14:27:45 +09:00
uye
2fea17d261 refactor: 替换表合并使用 insert,保证顺序并提升可读性 2025-07-21 12:47:19 +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
status102
2f48781396 fix: 使用理智药时恢复理智Ocr包含意外字符
fix #13316

180 o成 1.80 了
2025-07-21 10:55:27 +08:00
uye
4f775a04fd chore: 添加 gpu 日志 2025-07-21 01:14:08 +08:00
uye
699273b08a chore: 添加 Tencent EdgeOne 备用 CDN 2025-07-21 00:18:38 +08:00
status102
460253d5d3 fix: wpf TaskApi加载cache时缓存文件不存在 2025-07-21 00:15:05 +08:00
uye
9ee0aabf7b feat: 查看公告按钮添加检查时禁用 2025-07-20 22:45:47 +08:00
uye
f5301595cc feat: 调整模拟器分辨率不支持的描述 2025-07-20 22:24:09 +08:00
uye
86accdee86 feat: 移除肉鸽默认分队与默认职业组 2025-07-20 20:46:10 +08:00
Constrat
9a5b5fdc8d fix: missing OR-5 in main repository 2025-07-20 13:38:50 +02:00
status102
60630a8435 chore: 肉鸽加点注释 2025-07-20 10:25:11 +08:00
status102
ce088d8ee4 perf: MirrocCdk复制按钮接缝美化 2025-07-20 10:06:37 +08:00
status102
065bd3dde0 chore: 简中繁中截图耗时过长提示增加截图增强提醒 (#13309)
* chore: 简中繁中截图耗时过长提示增加截图增强提醒

* i18n: try

* i18n: JP translate

* i18n: EN

* i18n: missing EN translations

* i18n: KR

---------

Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
2025-07-20 09:33:13 +08:00
uye
410c81c36c perf: 优化资源损坏弹窗描述,提供解决方案 2025-07-19 23:06:13 +08:00
Constrat
1bd416dcce docs: EN issue simplification 2025-07-19 12:30:12 +02:00
status102
517886234e chore: CN issue模板简化及Bot优化 (#13297)
* ci: 未阅读须知issue将添加low-quality-report并不再锁定

* chore: 简化CN issue模板
2025-07-19 15:54:31 +08:00
uye
7208f1b352 fix: 水月肉鸽卡商店刷新 2025-07-19 13:24:35 +08:00
uye
ab85561833 perf: 雷电注册表优先使用原版路径 2025-07-19 12:54:24 +08:00
uye
1c6ec1b47e chore: 添加请求耗时记录 2025-07-19 12:29:02 +08:00
uye
257d1c02b0 feat: cdk 边框圆角 2025-07-19 10:50:54 +08:00
uye
036be03459 feat: 新增是否启动客户端勾选框 2025-07-19 10:48:53 +08:00
status102
4974ab6535 refactor: 长草任务序列化重构已完成部分合并 (#13275)
* refactor: 长草任务序列化重构已完成部分打样

* perf: 计时

* perf: is int
2025-07-19 10:08:00 +08:00
uye
c3f1068edf fix: 更新日志与公告滚动条过于贴近窗口边缘
fix #13295
2025-07-19 09:52:48 +08:00
MistEO
6a4ade5093 Release v5.20.0 (#13290) 2025-07-19 00:26:34 +08:00
github-actions[bot]
0ef1501a53 docs: Auto Update Changelogs of v5.20.0 (#13291)
* docs: Auto Generate Changelog of Release v5.20.0

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* feat: changelog

* feat: 更新 CHANGELOG.md

* fix: 更新 CHANGELOG.md

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-07-19 00:26:21 +08:00
uye
ae744d05c8 feat: PreSelectThemeSwipeToTheRight 添加 reduceOtherTimes 2025-07-19 00:15:51 +08:00
github-actions[bot]
be8eaa57c7 chore: Auto Update Game Resources - 2025-07-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16375174287

[skip changelog]
2025-07-18 16:10:33 +00:00
uye
1f7d83e5c4 feat: PreSelectThemeSwipeToLeft #self 2025-07-19 00:08:06 +08:00
uye
7b7875fa24 feat: PreSelectThemeSwipeToLeft 2025-07-19 00:05:50 +08:00
Lemon-miaow
00fa73551c fix: 肉鸽导航 (#13293) 2025-07-18 23:51:21 +08:00
uye
144ab609c5 feat: 临时屏蔽界园中除投资外的策略选项 2025-07-18 23:20:31 +08:00
MistEO
55f6620e0f chore: 整理一下刚糊的ua 2025-07-18 23:11:49 +08:00
MistEO
f6de7f4298 feat: Wpf UserAgent with UiVersion 2025-07-18 23:03:09 +08:00
status102
6a706c6f8a fix: 烧水仅精二在萨米主题被短路启动 2025-07-18 19:59:22 +08:00
status102
4ffc987f07 fix: 切换肉鸽主题时, 烧水奖励选择丢失 2025-07-18 19:21:12 +08:00
Constrat
7abc4086b0 fix. YostarEN OR navigation fix 2025-07-18 12:23:32 +02:00
Constrat
fb241c5cb9 chore: yostaren prepare leizi for alter 2025-07-18 11:59:43 +02:00
uye
28d9cf2a52 Release v5.20.0-beta.3 (#13274) 2025-07-18 17:35:28 +08:00
uye
b4479a2e4f feat: 添加 idle 状态切换记录 2025-07-18 17:32:54 +08:00
uye
02e5c3c9b7 fix: RunningState 无法记录日志 2025-07-18 17:32:54 +08:00
github-actions[bot]
ce9e0cfd04 chore: Auto Update Game Resources - 2025-07-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16367222337

[skip changelog]
2025-07-18 09:32:17 +00:00
MistEO
b42d7d7d17 docs: Update CHANGELOG.md 2025-07-18 17:21:52 +08:00
uye
3273f7ec7a docs: 更新肉鸽文档 2025-07-18 17:03:54 +08:00
github-actions[bot]
991474debd docs: Auto Update Changelogs of v5.20.0-beta.3 (#13283)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2025-07-18 16:55:05 +08:00
github-actions[bot]
cde48162ea chore: Auto Update Game Resources - 2025-07-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16366041667

[skip changelog]
2025-07-18 08:33:00 +00:00
uye
a63e637b55 fix: 手动改时间或睡眠跨日后关卡列表与提示未更新 2025-07-18 16:21:23 +08:00
uye
95d2eb374d chore: 界园肉鸽没有二希望开(?)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-07-18 16:09:33 +08:00
Manicsteiner
d1cedf57ad chore: YostarJP ocr edits (#13276) 2025-07-18 15:38:23 +08:00
Loong
e0641d165d chore: bump maa-cli to 0.5.7 (#13278) 2025-07-18 15:32:26 +08:00
status102
2d88e43139 perf: 优化加载顺序, 简化StageManager变量 (#13277) 2025-07-18 13:53:07 +08:00
uye
265aca3724 fix: v5.20.0-beta.2.d037 重启后概率闪退 2025-07-18 12:21:13 +08:00
status102
864f824d7b refactor: 肉鸽烧水参数rename
漏了漏了.jpg
2025-07-18 10:49:16 +08:00
status102
ea247333d0 refactor: 肉鸽开局奖励选择 2025-07-18 10:22:41 +08:00
status102
6f29ca0d8f perf: 肉鸽任务参数初始化简化 2025-07-18 10:22:41 +08:00
status102
83dd7b5914 fix: 刷理智代理倍率移除1000适配 2025-07-18 10:22:19 +08:00
Constrat
3a763fb12b fix: YostarEN OR navigation 2025-07-17 19:48:32 +02:00
github-actions[bot]
d0eedc7faf chore: Auto Update Game Resources - 2025-07-17
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16351416825

[skip changelog]
2025-07-17 17:08:30 +00:00
status102
b01cfaf9c4 refactor: TaskSettingVisibilityInfo.Current -> Instance 2025-07-17 23:41:10 +08:00
uye
f4864c7e5e style: format
[skip changelog]
2025-07-17 22:01:42 +08:00
Constrat
05387bf915 fix: YostarEN Eye for an Eye Sarkaz Encounter 2025-07-17 15:56:40 +02:00
HX3N
b3a3d88b1d fix: YostarKR 以血还血 ocr tweak
prevent mixing 以血还血 and 魂灵见闻:以血还血
2025-07-17 22:43:48 +09:00
SherkeyXD
fec780e3d8 fix: 尝试修复点击过头导致选到月度小队 2025-07-17 20:35:03 +08:00
SherkeyXD
ab92d12108 chore: 不期而遇子事件可读性优化 2025-07-17 20:24:06 +08:00
Constrat
8cfe4fd626 fix: yostaren sarkaz encouter ocr tweaks 2025-07-17 14:05:54 +02:00
uye
fb188b51a2 feat: 肉鸽支持多级事件选择 2025-07-17 20:00:27 +08:00
HX3N
0ec9573bef chore: YostarKR OR ocr edits 2025-07-17 18:20:50 +09:00
uye
404d11aad4 perf: 先筛选未进驻再清空队列
fix #13263
2025-07-17 16:57:16 +08:00
uye
4c4b24e573 fix: 缺 dll 和 resource 的时候没弹喜报 2025-07-17 16:11:34 +08:00
uye
f8077d6084 chore: 优化日志输出 2025-07-17 16:11:33 +08:00
github-actions[bot]
9b9dc35580 chore: Auto Update Game Resources - 2025-07-17
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16338983667

[skip changelog]
2025-07-17 07:31:00 +00:00
uye
927def4ed3 fix: 勾选「反转主任务右键单击效果」时,半选主任务在重启后无法还原选中状态 2025-07-17 12:45:47 +08:00
uye
0d5d03d580 fix: 最小化会在桌角留下一个小窗口 2025-07-17 12:20:24 +08:00
萨拉托加
f0219dc7a6 perf: 调整干员罗比菈塔在肉鸽使用的技能 2025-07-17 12:13:48 +08:00
uye
a538ed2291 fix: 勾选启动后直接最小化后无法拖动窗口 2025-07-17 12:09:30 +08:00
DavidWang19
54cf5ae7d6 perf: 界园肉鸽中停止招募锡人 2025-07-17 04:12:44 +01:00
DavidWang19
2b7f5f5e60 fix: 更新关卡ocr替换 2025-07-17 03:32:29 +01:00
萨拉托加
913aad2d6b feat: 界园肉鸽部分关卡自动战斗逻辑 (#13219) 2025-07-17 03:19:41 +01:00
Lemon-miaow
7078f1b8a1 fix: 肉鸽导航无法选择傀影肉鸽 (#13255) 2025-07-17 03:13:23 +01:00
github-actions[bot]
f2b34b29a3 chore: Auto Templates Optimization
Triggered by 29d66dc202

[skip changelog]
2025-07-17 01:58:10 +00:00
DavidWang19
29d66dc202 fix: 修复在得偿所愿或其他位置选择投钱后卡住的问题 2025-07-17 02:47:27 +01:00
DavidWang19
c901ba43c8 fix: 修复检测不到next的问题 2025-07-17 01:51:23 +01:00
github-actions[bot]
0273f1a940 chore: Auto Templates Optimization
Triggered by c52d6d66ce

[skip changelog]
2025-07-17 00:31:48 +00:00
DavidWang19
c52d6d66ce perf: 优化界园不期而遇默认逻辑 2025-07-17 01:31:17 +01:00
DavidWang19
e35512bd9d perf: 优化指点迷津节点task的复用 2025-07-17 01:25:29 +01:00
status102
64bcc201ee chore: 长草任务当前选中index 2025-07-17 08:10:27 +08:00
status102
319e384239 feat: 新Config任务参数读写, 界面刷新, 任务添改base 2025-07-17 08:10:26 +08:00
status102
1a41b53a49 feat: 新的添加任务 2025-07-17 08:10:26 +08:00
status102
08997048e0 chore: 重构部分预载 2025-07-17 08:10:26 +08:00
status102
210fb23e57 fix: typo 2025-07-17 08:10:05 +08:00
DavidWang19
4e2afb23e2 fix: 调整指点迷津节点阈值 2025-07-17 00:26:59 +01:00
Hao Guan
9e9fa712ef feat(mac): 添加界园入口 2025-07-17 03:41:20 +08:00
github-actions[bot]
6819e05642 chore: Auto Update Game Resources - 2025-07-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16328097180

[skip changelog]
2025-07-16 19:07:51 +00:00
MistEO
9559659d15 Release v5.20.0-beta.2 (#13251)
本次发版只进界园肉鸽问题修复,保证刷钱可用
新功能下次再进
2025-07-17 01:24:35 +08:00
DavidWang19
a8704bb862 docs: 更新changelog 2025-07-16 18:21:56 +01:00
DavidWang19
e00b601f12 fix: 去掉界园没有的刷2希望开局 2025-07-16 18:18:37 +01:00
github-actions[bot]
c0516089db docs: Auto Update Changelogs of v5.20.0-beta.2 (#13253)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
2025-07-17 00:23:49 +08:00
SherkeyXD
8a751e4a2e feat: 刷开局wpf仅显示当前主题可用选项 2025-07-17 00:02:31 +08:00
SherkeyXD
6821899c84 chore: 刷开局保证传给core的只有本主题可用内容 2025-07-17 00:02:31 +08:00
pre-commit-ci[bot]
dd08f96419 chore: Auto update by pre-commit hooks [skip changelog] 2025-07-17 00:02:31 +08:00
SherkeyXD
53a7deff9a feat: 界园肉鸽烧水支持票券 2025-07-17 00:02:31 +08:00
Rbqwow
74bb69b69d docs: 修复 readme logo
谁偷偷升依赖了?!
2025-07-16 23:02:29 +08:00
SherkeyXD
f5a747527e fix: 修复wpf主题检测错误 2025-07-16 22:53:49 +08:00
SherkeyXD
5aa369cdad chore: 刷开局精二仅为水月和萨米显示 2025-07-16 22:36:38 +08:00
SherkeyXD
5bc90917a6 chore: 移除未被使用的wpf文本 2025-07-16 22:21:24 +08:00
DavidWang19
232367afca chore: 删除界园多余的模板图和task 2025-07-16 14:59:16 +01:00
DavidWang19
87dd61b269 fix: 修复界园主题选择问题 2025-07-16 14:47:37 +01:00
Constrat
81e9bfa848 i18n: EN IS5 squads 2025-07-16 15:43:59 +02:00
uye
627ffed461 fix: 卡得偿所愿 2025-07-16 21:39:18 +08:00
github-actions[bot]
6721a575e7 chore: Auto Templates Optimization
Triggered by 13c7d43920

[skip changelog]
2025-07-16 13:16:27 +00:00
DavidWang19
13c7d43920 fix: 更新退出事件模板图 2025-07-16 14:14:32 +01:00
DavidWang19
dbd9f16627 docs: 还漏了两个 2025-07-16 13:55:46 +01:00
status102
7037991d56 chore: style
[skip changelog]
2025-07-16 20:11:37 +08:00
SherkeyXD
45465d8ad2 docs: 还漏了一个 2025-07-16 20:07:31 +08:00
SherkeyXD
aa07356b07 docs: 还有一只.png 2025-07-16 20:05:14 +08:00
SherkeyXD
e0b2b580b7 docs: 有猪.jpg 2025-07-16 19:52:13 +08:00
MistEO
35b060bb7a Release v5.20.0-beta.1 (#13217) 2025-07-16 19:49:03 +08:00
status102
d267bbc213 docs: changelog 2025-07-16 19:47:09 +08:00
SherkeyXD
bb7a03e1e9 docs: update changelog 2025-07-16 19:40:54 +08:00
github-actions[bot]
46c6392b82 docs: Auto Update Changelogs of v5.20.0-beta.1 (#13244)
* docs: Auto Generate Changelog of Release v5.20.0-beta.1

* Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2025-07-16 19:25:33 +08:00
HYY
3e374232f2 feat: 适配部分已知的不期而遇 (#13233)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
2025-07-16 19:21:31 +08:00
status102
59b6a4050a fix: 刷理智界面设计器error 2025-07-16 18:20:19 +08:00
萨拉托加
116b953085 feat: 界园肉鸽二层作战逻辑 2025-07-16 17:30:36 +08:00
status102
3c85e0b745 refactor: 启动时成就打包 (#13221) 2025-07-16 17:27:43 +08:00
status102
008b194cee perf: 干员因模组不可选中时, 加个输出 (#13230)
* perf: 干员因模组不可选中时, 加个输出

临时措施,总感觉还要改

* 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-07-16 17:08:29 +08:00
uye
4e1d5982b1 chore: 调整肉鸽日志颜色 2025-07-16 16:18:36 +08:00
uye
d222a6df83 chore: 调整投资描述 2025-07-16 15:48:02 +08:00
SherkeyXD
7f3cac14bc rft: 移动所有主题的模板图 2025-07-16 15:34:35 +08:00
SherkeyXD
ef600c09c9 rft: 移动遗漏的肉鸽模板图 2025-07-16 15:34:35 +08:00
github-actions[bot]
688d036b34 chore: Auto Templates Optimization
Triggered by aa948748e9

[skip changelog]
2025-07-16 07:31:13 +00:00
uye
aa948748e9 fix: 新版肉鸽商店刷新 2025-07-16 15:30:20 +08:00
status102
40981a8063 refactor(wpf): 基建任务枚举引用路径统一, 修复设计器error 2025-07-16 15:18:32 +08:00
MistEO
f3c491c01b ci(fix): gh pages deploy condition 2025-07-16 15:13:45 +08:00
status102
b5753af639 fix: 移除ClientType未选择, 统一变更为官服 (#13220)
* fix: 移除ClientType未选择, 统一变更为官服

* chore: ver
2025-07-16 15:10:43 +08:00
SherkeyXD
4d780df455 chore(deps): bump dependencies (#13121) 2025-07-16 14:58:35 +08:00
HX3N
c71fd90868 i18n: KR JieGarden translation 2025-07-16 14:54:51 +09:00
github-actions[bot]
0db63172c6 chore: Auto Update Game Resources - 2025-07-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16309292348

[skip changelog]
2025-07-16 03:01:13 +00:00
DavidWang19
295782cfb8 feat: 初步适配界园肉鸽并初步实现存钱 (#13183)
* feat: 初步适配界园肉鸽并初步实现存钱

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: 不留 <weinibuliu@outlook.com>
Co-authored-by: HYY <95246895+HYY1116@users.noreply.github.com>
Co-authored-by: 萨拉托加 <151550168+Saratoga-Official@users.noreply.github.com>
2025-07-16 03:20:33 +01:00
Huaxi Pan
ccc1dd65cc perf: 改进水月肉鸽干员部署逻辑 (#12671)
* feat: 更新水月肉鸽中维什戴尔的使用逻辑

* feat: 基本更新了维什戴尔在水月肉鸽中的使用逻辑

* fix: 修复recruitment 中蕾缪安划分错误

* feat: 优化了大君遗脉中开局漏怪的问题

* feat: 优化了精酿杀手关卡中开局漏怪的问题

* feat: 优化了瞻前顾后关卡中地面干员的位置

* feat: 优化了机械之灾中常态阻挡数不足的问题

* feat: 优化在铳与秩序关卡中维什戴尔容易被炮手炸死的问题

* feat: 删除了在"好梦在何方.json"中的对于蕾缪安的冗余逻辑, 将维什戴尔的放置时机后置避免开局漏怪

* perf: 修改高台C招募优先级

* feat: 后置"共生"中维什戴尔的放置时机, 避免开局漏怪

* feat: 补充了维什戴尔在"病症"中的使用逻辑

* feat: 优化了"机械之灾"中特殊情况下无常态阻挡的问题

* feat: 优化了"互助"关卡中部署在某些位置会导致MAA无法开启技能的问题

* feat: 前置在"瞻前顾后"中维什戴尔的部署时机, 避免盾前堆怪

* feat: 补充维什戴尔在"地下天途中的使用逻辑"

* feat: 补充维什戴尔在"回溯"中的使用逻辑

* fix: 修复了维什戴尔在"巢穴"中部署位置错误的问题

* feat: 优化了"海窟沙暴"中开局容易漏怪的问题

* feat: 删去海窟沙暴中的冗余语句, 再解决一下开局漏怪的问题

* feat: 优化了"分离与统一"中干员部署在某些位置导致无法开启技能的问题

* feat: 更新"大群所向"中的部署逻辑, 调整伊内丝的使用方式

* feat: 优化"大群所向"中输出时间不足的问题

---------

Co-authored-by: 萨拉托加 <151550168+Saratoga-Official@users.noreply.github.com>
2025-07-16 09:56:07 +08:00
MistEO
a541da064a ci: deploy website to GitHub Pages (#13207) 2025-07-15 17:39:03 +08:00
github-actions[bot]
a2de7ac376 chore: Auto Templates Optimization
Triggered by 8cff328e92

[skip changelog]
2025-07-15 09:34:47 +00:00
github-actions[bot]
8cff328e92 chore: Auto Update Game Resources - 2025-07-15
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16289549499

[skip changelog]
2025-07-15 09:34:17 +00:00
uye
7c2072ee1f style: 格式化
[skip changelog]
2025-07-15 17:14:42 +08:00
uye
8052b16ca1 fix: ComboBox 剪贴板异常 2025-07-15 16:56:48 +08:00
uye
10765dfddb chore: 调整肉鸽日志颜色 2025-07-15 11:56:31 +08:00
uye
13fc438a62 fix: 公告及更新日志背景颜色异常 2025-07-15 10:55:12 +08:00
github-actions[bot]
0b7f8186ed chore: Auto Update Game Resources - 2025-07-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16276743684

[skip changelog]
2025-07-14 20:08:40 +00:00
uye
e57df86a00 Release v5.19.0-beta.1 (#13204) 2025-07-15 01:45:34 +08:00
uye
878100ef1b docs: 更新 CHANGELOG.md 2025-07-15 01:37:13 +08:00
uye
64d92dc3b3 Release v5.18.0-beta.1 (#13200) 2025-07-15 01:07:48 +08:00
github-actions[bot]
ec5c0afa29 docs: Auto Update Changelogs of v5.18.0-beta.1 (#13201)
docs: Auto Generate Changelog of Release v5.18.0-beta.1

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-07-15 01:03:24 +08:00
Lemon-miaow
2b0109127f feat: 优化会客室线索处理逻辑 (#13160)
* feat: 优化会客室线索处理逻辑

* 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-07-15 00:57:05 +08:00
uye
462bf51dce feat: 官网添加非当前电脑构架提示 2025-07-14 22:20:58 +08:00
uye
bf0943066a chore: 抽离 ToolTip 创建方法,统一 ToolTip 格式 2025-07-14 18:41:24 +08:00
uye
0153486afb chore: 日志栏使用 TooltipBlock 2025-07-14 17:51:57 +08:00
uye
c8e8b3949e chore: TooltipBlock 支持显示 svg 2025-07-14 16:54:20 +08:00
uye
6eda663bcf fix: TooltipBlock 无法使用 binding 2025-07-14 16:32:49 +08:00
HX3N
ef0864c084 chore: YostarKR SS@Store@CheckUnlimited.png 2025-07-14 10:50:51 +09:00
Constrat
12b8f46bd8 fix: optimize templates run
[skip changelog]
2025-07-13 16:14:08 +02:00
Constrat
ab0c9eb5bd chore: manual resource updater 2025-07-13 16:09:08 +02:00
status102
d2ff015c1c fix: 肉鸽, 生息演算 calcBinding枚举修复 2025-07-13 21:53:55 +08:00
Constrat
5bb12ce6e8 ci: manual optimize templates 2025-07-13 12:59:55 +02:00
Constrat
5135028df4 chore: YostarEN SS@Store@CheckUnlimited.png 2025-07-13 12:59:17 +02:00
Manicsteiner
1728a2bd8f chore: YostarJP SS_Store_CheckUnlimited (#13192)
* chore: YostarJP SS_Store_CheckUnlimited

* 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-07-13 18:59:06 +08:00
Constrat
263f6edd05 fix: style in json
[skip changelog]
2025-07-13 12:48:40 +02:00
eneen
c4fd6449fc perf: 添加萨卡兹肉鸽 机动队 溃乱魔典 盲盒广场 关卡策略 (#12636) 2025-07-13 17:46:42 +08:00
uye
5fa5b97399 fix: 商店功能错误购买商品
fix #13191
2025-07-13 17:40:23 +08:00
uye
b6896898ec chore: 移除导航 filters 2025-07-13 16:53:44 +08:00
uye
6bde9b97af fix: 小工具-公招识别 手动触发时不会改变显示状态 2025-07-13 15:19:58 +08:00
uye
ecf0d4e732 chore: 添加缺失的翻译与文档更新 2025-07-13 15:03:18 +08:00
uye
b1fc706a6a chore: 统一颜色 2025-07-13 14:21:35 +08:00
uye
24718ec243 chore: 使用自定义悬浮窗样式 2025-07-13 14:21:22 +08:00
nekosu
c876874cf5 feat: 支持MaaPipelineSupport插件 (#13189) 2025-07-13 14:11:07 +08:00
status102
a3cdc98031 fix: 移除Roguelike@GetDrop2中重复的Roguelike@DropsFlag任务 (#13180)
link to 2ed2376763
2025-07-13 12:37:27 +08:00
uye
cc995da6af chore: 使用 svg 代替 >,避免字体影响 2025-07-13 10:57:18 +08:00
uye
a41d4f7885 chore: 添加设计时预览 2025-07-13 00:07:52 +08:00
uye
a6e90ac65e feat: 添加悬浮窗标识符 2025-07-13 00:00:16 +08:00
uye
59e31663c4 feat: 添加任务及基建设施日志翻译 2025-07-12 22:44:25 +08:00
uye
bf759da599 chore: 日志栏 InitialShowDelay 改为 200,避免误触 2025-07-12 21:55:23 +08:00
uye
49753de8b8 feat: 新增公招星级悬浮提示 2025-07-12 21:51:06 +08:00
uye
763e5605cf feat: 新增通过 string 直接构造 Tooltip 方法 2025-07-12 21:50:32 +08:00
uye
7555119b03 feat: cdk 添加复制按钮 2025-07-12 19:49:04 +08:00
uye
8b5a60d79e chore: 使用 UsedImplicitly 2025-07-12 19:49:03 +08:00
Constrat
bb329afea0 style: clang
[skip changelog]
2025-07-12 13:38:47 +02:00
uye
62984d1026 feat: 新增资源仓库超链接 2025-07-12 19:06:35 +08:00
uye
034ecff647 feat: 为截图测试日志添加 Tooltip 展示所有截图方式耗时 2025-07-12 18:56:08 +08:00
HX3N
58b8e167ca chore: YostarKR BattleQuickFormationModulePage 2025-07-12 19:47:02 +09:00
Constrat
653fed53bb chore: YostarEN BattleQuickFormationModulePage 2025-07-12 12:40:44 +02:00
Manicsteiner
8e05cdaecb chore: YostarJP tasks edits (#13187) 2025-07-12 18:32:22 +08:00
uye
1e8d8ce91a chore: 优化掉落显示 2025-07-12 17:37:28 +08:00
status102
3f310ecede fix: 肉鸽界面设计器error (#13185) 2025-07-12 13:38:09 +08:00
status102
f14bf295c7 fix: typo & const ref 2025-07-12 12:39:57 +08:00
status102
7a8586a6d7 chore: style 2025-07-12 12:36:20 +08:00
status102
8acf9ececb refactor: 生息演算任务参数枚举 2025-07-12 10:09:08 +08:00
uye
4ea3900941 fix: 修复 ExpiringStatus 无法用于日志输出的问题 2025-07-12 00:54:54 +08:00
uye
ca81ddc4d9 chore: tooltip 顶部居中 2025-07-12 00:31:30 +08:00
status102
5a55b4d4dc fix: 理智药使用量ocr错误
fix #13132
2025-07-12 00:10:31 +08:00
travellerse
4e3c75b17b feat: 支持编队添加干员时选择模组 (#12811)
* feat: 支持编队添加干员时选择模组

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

* feat: 更新模组编号和本地化字符串以支持新模组

* fix: 统一使用激活时的模组字符图像,将识别阈值下降至0.8以识别未激活时的模组字符

* perf: 省略不必要的参数

* perf: 修改模组默认值为`-1: 不修改`

* fix: 修复不使用模组时的点击区域, 使用模板图替换

* fix: roi

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

* perf: 优化部分文本

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

* fix: 选择模组失败时反选干员

* fix: 选择模组失败时继续检查同组其他干员

* perf: 过个Rgb

Co-authored-by: status102<102887808+status102@users.noreply.github.com>

* chore: 不过灰度

* fix: 添加模板图片以匹配y模组字母的两种形式

---------

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-07-11 23:56:37 +08:00
uye
0478306149 feat: 日志栏新增 ToolTip 提示 2025-07-11 23:31:05 +08:00
uye
3b40e07088 chore: 调整成就描述 2025-07-11 23:30:01 +08:00
uye
e38e8cf01a perf: 优化物品图显示缓存 2025-07-11 23:05:06 +08:00
uye
b0462076ea fix: 修复模板匹配遇到 inf 与 nan 时返回 0 的错误结果 2025-07-11 23:05:06 +08:00
github-actions[bot]
53e5c9b53d chore: Auto Update Game Resources - 2025-07-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16217034977

[skip changelog]
2025-07-11 09:46:55 +00:00
Constrat
f19d4631b0 chore: YostarEN OR Navigation 2025-07-11 11:43:20 +02:00
HX3N
96f8d25e47 chore: YostarKR OR navigation (#13179) 2025-07-11 11:43:03 +02:00
github-actions[bot]
e3f01f83da chore: Auto Update Game Resources - 2025-07-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16215141064

[skip changelog]
2025-07-11 08:10:18 +00:00
status102
ff18028781 chore: style 2025-07-11 15:44:19 +08:00
github-actions[bot]
9c0c4e6da0 chore: Auto Templates Optimization
Triggered by cfc7bfd02e

[skip changelog]
2025-07-11 07:42:34 +00:00
uye
cfc7bfd02e fix: 无法匹配活动商店部分商品 2025-07-11 15:42:05 +08:00
uye
ce96cef6ec fix: 外服训练室技能名可能被部分替换成干员名 2025-07-11 11:13:29 +08:00
status102
c3c69c7e1f rft: 肉鸽模式参数枚举 2025-07-11 10:33:16 +08:00
status102
7dd977f525 chore: file header 2025-07-11 10:20:09 +08:00
status102
7fb2d0686e fix: import 2025-07-11 10:17:06 +08:00
status102
8c8be278ea chore: 新Config长草任务存储已完成部分预载 2025-07-11 09:20:16 +08:00
status102
f4b71bd0be refactor: 新Config结构修改
部分迁移自 #12315
2025-07-11 09:09:51 +08:00
Lemon-miaow
d8515b15a2 fix: 更新肉鸽商店刷新按钮模板 (#13172)
* 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-07-10 15:52:26 +01:00
uye
049f244a95 feat: 新增返回 bgr byte[] 数据接口,大幅降低 peep 性能占用 2025-07-10 21:35:43 +08:00
status102
0dc6af17a3 perf: 肉鸽参数显示简化, 开局干员空时不显示使用助战 2025-07-10 17:42:01 +08:00
uye
078ce0860d chore: 调整提示 2025-07-10 00:52:45 +08:00
晓丶梦丶仁
184bdd3dd1 fix: 一叶扁舟 choices
fix #13165
2025-07-10 00:28:23 +08:00
晓丶梦丶仁
5e165319e5 fix: JP 似是而非 OCR 2025-07-10 00:05:44 +08:00
SherkeyXD
47357b2baa chore: no overflow 2025-07-09 20:33:46 +08:00
晓丶梦丶仁
f5301faafb fix: 魂灵见闻:善恶同道 OCR
fix #13166
2025-07-09 18:55:18 +08:00
Constrat
f1d05cd70e fix: EN training room OCR 2025-07-09 11:47:20 +02:00
uye
edca2ea538 chore: 勾选手动填写实例号后查询一次实例 2025-07-09 17:35:37 +08:00
uye
6778ad4f6e fix: 获取雷电 pid 失败 2025-07-09 17:29:25 +08:00
uye
eb096e257c ci: ubuntu build 2025-07-09 16:49:56 +08:00
uye
6df743041f feat: 新增雷电专版注册表自动检测,新增雷电端口自动检测 2025-07-09 16:26:49 +08:00
uye
38cf01b66e chore: 避免使用 async void 2025-07-09 15:25:15 +08:00
uye
4cb6744e01 chore: 省略默认参数 2025-07-09 12:52:42 +08:00
uye
9ee3520634 chore: 优化窗口显示
fix #13161
2025-07-09 12:49:39 +08:00
uye
b16942cb2e chore: 调整成就描述 2025-07-09 09:20:52 +08:00
Constrat
72d1956643 fix: EN not enough space for SSS selection 2025-07-08 21:31:26 +02:00
uye
8293bcf978 chore: 调整 ocrReplace
[skip changelog]
2025-07-08 22:39:14 +08:00
uye
c6e1e039bb feat: fetch 请求增加 If-Modified-Since 2025-07-08 21:54:43 +08:00
uye
bc998e4902 chore: 调整 ocrReplace
[skip changelog]
2025-07-08 21:25:03 +08:00
github-actions[bot]
9bbde2199f chore: Auto Update Game Resources - 2025-07-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16142758372

[skip changelog]
2025-07-08 12:08:10 +00:00
Constrat
9c991631f0 fix: EN InfrastTrainingOperatorAndSkill adaptation 2025-07-08 13:53:36 +02:00
uye
52f534cf43 chore: 调整 ocrReplace
[skip changelog]
2025-07-08 18:02:10 +08:00
uye
270cfc19bc chore: 调整 ocrReplace 2025-07-08 17:55:03 +08:00
uye
9bed2f4bcc perf: 训练室继续专精使用特征匹配识别技能 2025-07-08 17:39:59 +08:00
uye
e3736bb4e4 chore: 添加 FeatureMatch schema 2025-07-08 17:39:59 +08:00
github-actions[bot]
4a8ace53cc chore: Auto Update Game Resources - 2025-07-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16138144763

[skip changelog]
2025-07-08 08:33:18 +00:00
github-actions[bot]
d0374037fa chore: Auto Update Game Resources - 2025-07-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16133813290

[skip changelog]
2025-07-08 04:16:27 +00:00
github-actions[bot]
4850da4acb chore: Auto Templates Optimization
Triggered by ba161b98eb

[skip changelog]
2025-07-08 03:00:12 +00:00
github-actions[bot]
ba161b98eb chore: Auto Update Game Resources - 2025-07-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16132825324

[skip changelog]
2025-07-08 02:59:47 +00:00
uye
d1ff5c2400 fix: 训练室技能名识别 2025-07-08 00:45:29 +08:00
uye
442d7d5b70 chore: 米奇妙妙 ocr 2025-07-08 00:41:01 +08:00
uye
29f93616ff chore: 调整描述 2025-07-07 19:41:33 +08:00
Loong
aa7b5aeb77 chore: bump maa-cli to 0.5.6 (#13150) 2025-07-07 11:41:08 +08:00
uye
ec4f3f98f5 chore: 添加日志记录 2025-07-07 09:44:34 +08:00
uye
38ca800031 chore: 设置剪切板前先清空 2025-07-06 22:45:52 +08:00
uye
650a48b8a5 fix: 高版本检测到低版本更新时错误提示无更新包 2025-07-06 12:46:03 +08:00
uye
b16231698b chore: response.Log 添加 etag 日志 2025-07-06 00:20:37 +08:00
uye
13bef6c4b6 fix: 无法继续专精 2025-07-05 21:05:16 +08:00
uye
f6b0ca7754 perf: 优化热更逻辑 2025-07-05 12:48:07 +08:00
uye
f4489f4afb chore: 添加模拟器路径与附加命令的提示 2025-07-05 10:30:30 +08:00
uye
209da3da03 Release v5.18.3 (#13130) 2025-07-05 09:50:47 +08:00
uye
773a26fb1b docs: Update CHANGELOG.md 2025-07-05 09:50:17 +08:00
uye
bf2d6dcb5f fix: 公招刷新 2025-07-05 09:47:13 +08:00
uye
b5adf5b949 Release v5.18.2 (#13107) 2025-07-04 23:47:31 +08:00
uye
cd4b28cc59 chore: 漏了个 _mainTaskTypes 2025-07-04 23:36:42 +08:00
github-actions[bot]
ff2fc2e888 docs: Auto Update Changelogs of v5.18.2 (#13113)
* docs: Auto Generate Changelog of Release v5.18.2

* Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-07-04 23:35:04 +08:00
uye
f7f9d709b5 fix: 当首选关卡为剿灭时,后续备选关卡和剩余理智出现问题时不会报错 2025-07-04 23:31:24 +08:00
uye
a63bd7ffbf chore: 调整单击托盘图标动作,符合常规软件行为 2025-07-04 22:17:27 +08:00
uye
401cd76c2d fix: 修复因重定向导致 ETag 缓存与原始地址不符的问题 2025-07-04 19:18:52 +08:00
uye
4cef1b1a24 fix: 未勾选自动确认 3 星且有对应倾向 3 星 tag 时不会刷新 2025-07-04 18:30:23 +08:00
github-actions[bot]
7775e3889d chore: Auto Update Game Resources - 2025-07-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16057199753

[skip changelog]
2025-07-03 17:46:49 +00:00
Constrat
1f132c7adc fix: YostarEN & YostarJP HS rerun navigation 2025-07-03 19:30:27 +02:00
vonnoq
af9eab239d fix: 繁中服無法識別荒蕪拉普蘭德 (#13125) 2025-07-03 19:15:13 +02:00
github-actions[bot]
43a5802652 chore: Auto Update Game Resources - 2025-07-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16056500208

[skip changelog]
2025-07-03 17:07:37 +00:00
uye
23743558ad fix: 存在更新时问题反馈提示显示不全
fix fafd1970be (commitcomment-161341748)
2025-07-03 23:29:55 +08:00
github-actions[bot]
cd6bd95445 chore: Auto Update Game Resources - 2025-07-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16053207061

[skip changelog]
2025-07-03 14:30:33 +00:00
HX3N
5ecec67bf2 fix: YostarKR HS rerun navigation (#13124)
* fix: YostarKR HS rerun navigation

* chore: add stages
2025-07-03 16:15:56 +02:00
SherkeyXD
e8bcf55546 chore: remove TaskTransitionVisualizer 2025-07-03 19:17:25 +08:00
uye
83bc2649a0 chore: 调整命名空间 2025-07-03 19:17:01 +08:00
github-actions[bot]
6102d7bf43 chore: Auto Update Game Resources - 2025-07-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/16043883983

[skip changelog]
2025-07-03 07:08:58 +00:00
uye
c1b9a158a0 fix: typo
[skip changelog]
2025-07-03 12:18:13 +08:00
uye
a79980daf2 fix: 规避 WPF 剪贴板卡顿,修复剪切不清除文本的问题。支持 (Rich)TextBox 复制/剪切/粘贴 和 DataGrid 复制 2025-07-03 12:03:02 +08:00
晓丶梦丶仁
b7d8577023 fix: Mumu5.0 MumuExtra
mumu5.0 正式版似乎在根目录中留了一个 shell\sdk\xxxx.dll,部分用户反应这个 dll 无法连接模拟器,删除后可用;于是检测路径时优先检测 Mumu5.0 的路径,若不存在再向下兼容
2025-07-03 00:22:21 +08:00
uye
874db89c8a fix: 不知道为啥有时候肉鸽难度识别最后会多个0,ui打个补丁 2025-07-02 21:59:13 +08:00
SherkeyXD
f41356f683 fix: no unsigned subtraction 2025-07-02 19:33:17 +08:00
SherkeyXD
c285d53404 chore: use SecureZeroMemory for safety 2025-07-02 19:24:09 +08:00
鬼影233
b82081769f fix: 调整 YoStarEN 大荒城公招、抽卡的截图以修复识别失败的问题 (#13117)
* fix: 调整 YoStarEN 大荒城公招、抽卡的截图以修复识别失败的问题
2025-07-02 13:05:37 +02:00
github-actions[bot]
89969d2101 chore: Auto Templates Optimization
Triggered by 73f53e1f9c

[skip changelog]
2025-07-01 15:07:20 +00:00
pre-commit-ci[bot]
73f53e1f9c chore: Auto update by pre-commit hooks [skip changelog] 2025-07-01 15:06:19 +00:00
HY
5aff0583f7 chore: 更新繁中服線索與部分截圖 (#13094)
* chore: 更新線索圖片

* chore: 更新其他圖片

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

* chore: 用更高的 DPI 再用一次截圖

* 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-07-01 17:03:09 +02:00
github-actions[bot]
a4efe0aa3c chore: Auto Update Game Resources - 2025-07-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15997555493

[skip changelog]
2025-07-01 11:06:59 +00:00
github-actions[bot]
313e46153f chore: Auto Update Game Resources - 2025-07-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15992790429

[skip changelog]
2025-07-01 07:30:41 +00:00
github-actions[bot]
e76e21d986 chore: Auto Update Game Resources - 2025-06-30
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15981481318

[skip changelog]
2025-06-30 19:06:28 +00:00
github-actions[bot]
0d19298f4b chore: Auto Update Game Resources - 2025-06-30
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15976645788

[skip changelog]
2025-06-30 15:08:04 +00:00
晓丶梦丶仁
4bc67b33f5 feat: wpfgui 添加第三备选关卡 (stage4) (#13106) 2025-06-30 22:41:02 +08:00
晓丶梦丶仁
5ee2b96938 fix: KR SS@Store@Purchase OCR
[skip changelog]
2025-06-30 19:26:22 +08:00
晓丶梦丶仁
f6ee7f6ab4 fix: KR SS@Store@Purchase OCR 2025-06-30 19:25:16 +08:00
晓丶梦丶仁
4f3300fa17 fix: JP SS@Store@Purchase OCR 2025-06-30 19:15:55 +08:00
zhangweijian97
db9a402bd8 docs: 更新Linux开发环境配置教程 加入 Mac 开发建议 2025-06-30 14:02:59 +08:00
dantmnf
6ce5c5ca7d feat: warn about known problematic injected dlls 2025-06-30 11:50:31 +08:00
github-actions[bot]
8805d1a3f1 chore: Auto Update Game Resources - 2025-06-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15947736529

[skip changelog]
2025-06-28 20:07:41 +00:00
Constrat
d2bc88896c fix: wrong dossoles for global
[skip changelog]
2025-06-28 00:27:17 +02:00
Constrat
3e56b73283 chore: SSS#7 Dossoles global 2025-06-28 00:25:22 +02:00
HY
dc2754bf39 chore: 繁中服_周年月卡領取 &「揭幕者們」活動導航 (#13092)
* chore: 周年月卡領取

* chore: 「揭幕者們」活動導航
2025-06-27 23:13:52 +08:00
github-actions[bot]
9f9f0270a8 chore: Auto Update Game Resources - 2025-06-27
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15919471111

[skip changelog]
2025-06-27 06:11:07 +00:00
github-actions[bot]
a0dbca0816 chore: Auto Update Game Resources - 2025-06-27
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15918939109

[skip changelog]
2025-06-27 05:31:12 +00:00
status102
323d991308 fix: Toast遮挡右侧界面
fix #13088
2025-06-27 10:57:36 +08:00
Sherkey Asher
94f58586b7 ci: add codeql for security check 2025-06-27 09:26:25 +08:00
SherkeyXD
9c05d6e18b feat: 优化 CropRoi 使用体验 2025-06-26 17:38:39 +08:00
uye
fdeae7b28f chore: 资源日期使用本地时间显示 2025-06-25 22:57:37 +08:00
uye
399eb27360 chore: 删除错误提示
[skip changelog][skip ci]
2025-06-25 20:16:04 +08:00
status102
39a8e0c766 chore: 引航者试炼#5 TN-1 ~ TN-4地图view[1] & 干员部署修复 2025-06-25 20:05:41 +08:00
status102
e098c55223 ci: 禁止更新时重判 2025-06-25 20:03:31 +08:00
uye
bf80696a80 chore: 调整关卡选择中的剿灭显示 2025-06-25 19:55:32 +08:00
status102
bc560cf9af perf: SSReopen使用XX-OpenOpt代替SideStoryReopen导航 (#13078) 2025-06-25 19:16:09 +08:00
status102
e73635339d Revert "chore: 引航者试炼#5 TN-1 ~ TN-3地图views[1]修复"
This reverts commit ae38ad904b.
2025-06-25 12:02:46 +08:00
uye
d341d95372 chore: 显示错误 2025-06-25 00:43:04 +08:00
uye
e1ff78240e feat: 新增资源更新进度显示 2025-06-24 23:46:09 +08:00
status102
ae38ad904b chore: 引航者试炼#5 TN-1 ~ TN-3地图views[1]修复 2025-06-24 23:23:37 +08:00
status102
3f07bfc52d chore: meojson update to v4.4.1 & remove json5 (#13079) 2025-06-24 19:59:32 +08:00
status102
a1c11bdb32 chore: remove json5 2025-06-24 19:34:20 +08:00
status102
4a4b3fae3b chore: meojson update to v4.4.1 2025-06-24 19:33:30 +08:00
Constrat
5e435f2cd7 fix: txwy failed dataload 2025-06-24 13:11:43 +02:00
github-actions[bot]
eac28232a9 chore: Auto Update Game Resources - 2025-06-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15846236823

[skip changelog]
2025-06-24 09:10:39 +00:00
status102
6af04f4232 perf: 减少运行中Task修改 2025-06-24 16:55:43 +08:00
status102
96c007274d fix: 肉鸽结算Ocr 非数字替换 2025-06-24 16:55:42 +08:00
uye
fd4bdb6f4a fix: 写的什么jb导航 2025-06-24 16:29:43 +08:00
Constrat
be18f7304b style: fix clang 2025-06-23 23:45:21 +02:00
status102
eebcf78aaf fix: 肉鸽结算Ocr bin threshold 2025-06-23 23:03:53 +08:00
status102
1328545320 rft: 肉鸽callback中Int类型限定 2025-06-23 23:01:37 +08:00
Constrat
303c7bca17 feat: YostarEN Dahuang City theme 2025-06-23 14:54:10 +02:00
萨拉托加
56875aec85 feat: 肉鸽更新干员招募逻辑 (#13071)
* feat: 肉鸽更新干员招募逻辑

* feat: 肉鸽更新干员招募逻辑

* feat: 肉鸽更新干员招募逻辑
2025-06-23 19:02:43 +08:00
Lemon-miaow
1e3afd8c12 i18n: 用户文档基建换班添加队列轮换说明 (#13064)
* i18n: 用户文档基建换班添加队列轮换说明

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

* i18n: 同步客户端文本

* i18n: JP texts edit

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
2025-06-23 16:57:32 +08:00
uye
c1fcf95a49 fix: 难度识别出非数字时崩溃
#13069
2025-06-23 14:57:57 +08:00
Hao Guan
02964cd38e fix(mac): Mirror酱更新检测 2025-06-23 11:50:25 +08:00
Hao Guan
ff3a06cf71 feat(mac): 显示剩余理智 2025-06-23 11:49:48 +08:00
HY
17c98f18e4 chore: 繁中服「荒原安保派駐」定向導能元件 (#13057)
* chore: 繁中服「荒原安保派駐」定向導能元件

* chore: 搬移保全作業
2025-06-22 16:30:42 +02:00
status102
0f25adfd83 Release v5.18.1 (#13048) 2025-06-22 18:56:46 +08:00
Lemon-miaow
5dcfd8ce2a docs: 用户文档基建换班添加队列轮换说明 (#13058) 2025-06-22 16:34:37 +08:00
github-actions[bot]
cd3b0d9e08 docs: Auto Update Changelogs of v5.18.1 (#13050)
* docs: Auto Generate Changelog of Release v5.18.1

* docs: ahcneglog

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-06-22 16:14:48 +08:00
Manicsteiner
e0724ed92c chore: YostarJP infrast training room and IS4 squad (#13053) 2025-06-21 17:54:22 +02:00
status102
cf7c8e66bb fix: YoStarEN StageDrops-TimesRec roi 2025-06-21 23:29:06 +08:00
Constrat
cafb520b29 fix: YostarEN Sarkaz DLC2 2025-06-21 12:42:38 +02:00
github-actions[bot]
2e21799cc8 chore: Auto Templates Optimization
Triggered by 911f910990

[skip changelog]
2025-06-21 10:22:05 +00:00
MistEO
911f910990 chore: 更换 Mirrorc logo 2025-06-21 18:20:56 +08:00
uye
0b91daba21 perf: 自动替换连接地址中的中文冒号与空格 2025-06-21 12:32:19 +08:00
uye
eed13a6869 fix: 全选删除作业代码时底部连接不换回作业站链接
fix #13036
2025-06-21 10:30:06 +08:00
status102
b5798a8096 fix: 中断时刷理智, 基建任务参数无法修改 2025-06-21 10:15:44 +08:00
status102
b30f2eadc1 chore: 理智药加个输出 2025-06-21 10:15:44 +08:00
status102
14a3455ee8 fix: StageQueue战斗次数统计 2025-06-21 10:15:24 +08:00
HX3N
3e06cece23 chore: YostarKR IS4 dlc2 (#13047)
* chore: YostarKR IS4 dlc2 ocr

* i18n: is4 dlc squad

* chore: RoguelikeCustom-HijackSquad

* chore: 消失
2025-06-21 09:44:12 +08:00
HX3N
264a27e82b fix: skip blank stages in KR replacement on ResoureUpdater (#13045)
* fix: skip blank stages in KR replacement on ResoureUpdater

* docs: simple commenting

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-06-20 21:53:56 +02:00
Constrat
32a627d980 fix: YostarEN ocr for new IS 2025-06-20 21:40:13 +02:00
github-actions[bot]
17c93f91d4 chore: Auto Update Game Resources - 2025-06-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15784413397

[skip changelog]
2025-06-20 17:29:51 +00:00
Manicsteiner
70e6261a98 chore: YostarJP Dahuang city theme and ocr edits (#13044) 2025-06-20 17:46:18 +02:00
HX3N
bd8a2ee886 chore: YostarKR DahuangCity theme (#13043) 2025-06-20 17:46:05 +02:00
SherkeyXD
5af96ea1ce fix: 防止卡在傀影肉鸽剧作家手稿界面 2025-06-20 23:40:04 +08:00
github-actions[bot]
09432c2247 chore: Auto Update Game Resources - 2025-06-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15781231814

[skip changelog]
2025-06-20 14:30:31 +00:00
uye
d85c049ee3 fix: YoStarKR tasks ocrReplace 2025-06-20 22:07:26 +08:00
github-actions[bot]
40ae3a2866 chore: Auto Update Game Resources - 2025-06-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15773971592

[skip changelog]
2025-06-20 07:45:31 +00:00
Sherkey Asher
12fa8eba2c fix: 保证SSReopen不多刷 (#13029)
* fix: 保证SSReopen不多刷

* fix: 移除无用

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-06-20 15:08:28 +08:00
status102
8476d5bebe fix: StageQueue关闭理智药界面后delay 2025-06-20 15:00:32 +08:00
uye
4f9dcbbd42 chore: 调整 ssreopen 识别 2025-06-19 20:48:20 +08:00
uye
2db6c4a459 fix: 更新后第一次启动读取 SemVersion 失败
fix #13021
2025-06-19 20:40:53 +08:00
github-actions[bot]
7c3ac7066e chore: Auto Update Game Resources - 2025-06-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15756353451

[skip changelog]
2025-06-19 11:07:40 +00:00
github-actions[bot]
3355bf13b3 chore: Auto Update Game Resources - 2025-06-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15753670086

[skip changelog]
2025-06-19 08:49:36 +00:00
uye
f2fabb392e Release v5.18.0 (#13007) 2025-06-19 16:11:42 +08:00
status102
e209727448 fix: 成就view遮挡设置按钮 2025-06-19 16:08:06 +08:00
uye
27762ce24d docs: Update CHANGELOG.md 2025-06-19 16:06:43 +08:00
uye
335bf74e89 docs: Update CHANGELOG.md 2025-06-19 16:03:43 +08:00
uye
fece54bfb4 chore: 调整 margin 2025-06-19 15:52:11 +08:00
github-actions[bot]
7994bc2384 docs: Auto Update Changelogs of v5.18.0 (#13008)
* docs: Auto Generate Changelog of Release v5.18.0

* docs: chagnelog

* docs: ahcenglog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-06-19 15:01:10 +08:00
status102
a10e3be350 perf: 自动战斗作业点赞按钮禁用前置 2025-06-19 13:30:44 +08:00
github-actions[bot]
7af5574bf9 chore: Auto Update Game Resources - 2025-06-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15742563268

[skip changelog]
2025-06-18 20:09:25 +00:00
status102
9cf913dc3a perf: 不许成就遮挡设置 (#13012)
* perf: 不许成就遮挡设置

* perf: 套个scroll
2025-06-18 16:36:23 +08:00
dantmnf
14360ed869 fix: improper ifstream usage in adblite
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/12199#issuecomment-2974975943
2025-06-18 16:32:54 +08:00
github-actions[bot]
02156ebb0c chore: Auto Update Game Resources - 2025-06-17
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15701766376

[skip changelog]
2025-06-17 08:11:33 +00:00
status102
a16e399ae1 perf: 公告内容变动检查 2025-06-17 15:49:47 +08:00
status102
7a658d4712 fix: Log宏不检查log rotate 2025-06-17 15:48:43 +08:00
uye
0b6c1ef843 chore: 窗口允许最大化 2025-06-17 10:10:24 +08:00
Lucien Shaw
54ed65fb9d i18n: 补全本地化文本中一处设置的完整引导路径 (#12997)
* i18n: 补全中文文本中一处设置的完整引导路径

补全RetryOnDisconnectedEmulatorPathEmptyError对应文本中,模拟器路径设置的完整引导路径

* i18n: 补全英文文本中一处设置的完整引导路径

补全RetryOnDisconnectedEmulatorPathEmptyError对应文本中,模拟器路径设置的完整引导路径

* i18n: 补全繁体中文文本中一处设置的完整引导路径

补全RetryOnDisconnectedEmulatorPathEmptyError对应文本中,模拟器路径设置的完整引导路径

* i18n: 补全日文文本中一处设置的完整引导路径

补全RetryOnDisconnectedEmulatorPathEmptyError对应文本中,模拟器路径设置的完整引导路径

* i18n: 补全韩文文本中一处设置的完整引导路径

补全RetryOnDisconnectedEmulatorPathEmptyError对应文本中,模拟器路径设置的完整引导路径
2025-06-17 09:42:11 +08:00
Sherkey Asher
3289bbabb8 feat: 傀影肉鸽添加难度选择 (#12897)
* feat: 傀影肉鸽添加难度选择

* feat: 肉鸽难度选择不再显示不支持的选项
2025-06-17 09:28:34 +08:00
dependabot[bot]
219ec7278a ci: bump softprops/action-gh-release from 2.2.2 to 2.3.2 in /.github/workflows in the github-actions group (#13004) 2025-06-16 16:07:28 +00:00
Constrat
2b7b020b51 ci: fix my username? 2025-06-16 17:48:51 +02:00
晓丶梦丶仁
28a768a8f5 fix: IS1 投资策略 2025-06-16 16:14:18 +08:00
status102
66d2614d82 refactor(wpf): asst任务状态 (#12985)
* rft(wpf): asst任务状态监控

* rft: 迁移刷理智, 基建任务状态
2025-06-16 11:07:43 +08:00
status102
2b5857a955 i18n: 更正 指定材料 的提示 (#12977)
* i18n: 更正 指定材料 的提示

* i18n: KR tweak translation

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
2025-06-16 11:07:29 +08:00
uye
4de3bf3fef feat: 翻译引用
fix #12996
2025-06-15 18:54:11 +08:00
uye
852a7da8eb feat: 更新繁中翻译 2025-06-15 18:04:50 +08:00
uye
7bc25bc952 chore: Load 时替换翻译引用 2025-06-15 18:01:45 +08:00
uye
268ee6ba0f feat: LocalizationHelper 支持 GetFormattedString 2025-06-15 15:49:53 +08:00
uye
117cbb4561 fix: Miss.Christine 识别错误 2025-06-15 13:16:16 +08:00
uye
7b550516cc fix: 恢复进度失败
fix #12992
2025-06-15 13:16:16 +08:00
Lucien Shaw
eec8880bd5 fix: 基建高级设置中部分元素未正确隐藏 (#12988)
当基建模式设置为“队列轮换”时,高级设置中的“不将已进驻的干员放入宿舍”项旁的提示图标未正确隐藏
2025-06-15 13:05:24 +08:00
uye
69ae0eaa1b fix: 不计算理智回复成就 2025-06-14 23:12:44 +08:00
status102
4c4b2e8510 refactor: 迁移理智, 战斗次数, 代理倍率, 关卡理智缓存 (#12986)
rft: 迁移理智, 战斗次数, 代理倍率, 关卡理智缓存
2025-06-14 16:26:21 +08:00
Lucien Shaw
649ca6452e i18n: 更正英文本地化文本中的两处错误 (#12987)
* i18n: 更正英文本地化文本中训练室提示文本的标点问题

在逗号后添加了缺失的空格;
将逗号连接的两个独立分句改为分号。
原句:"...Training Room,this will..." 改为 "...Training Room; this will..."

* i18n: 更正英文本地化文本中有关特别标记干员的语法问题

「Favourite」 operators maybe cannot be recognized中,maybe cannot be ... 并非常见语法,改为may not be.
2025-06-14 12:22:25 +08:00
status102
fe13df4806 fix: 仅主刷理智任务激活指定次数未消耗殆尽警告 2025-06-14 11:31:08 +08:00
status102
46f7ee6e33 perf: OF-1德克萨斯使用2技能
fix #12971
2025-06-14 09:45:09 +08:00
Constrat
948f38b2ac perf: remove duplicate templates from JP 2025-06-13 18:42:12 +02:00
晓丶梦丶仁
ac9a339d47 ci: issue-checkbox-checker 跳过已经折叠的 issue 2025-06-14 00:24:35 +08:00
晓丶梦丶仁
371f4e814a ci: issue-checkbox-checker.yml 2025-06-14 00:18:34 +08:00
晓丶梦丶仁
e8e9d7a38a fix: KR EP navigation 2025-06-13 23:55:40 +08:00
uye
907947a02e chore: 读取mumu新版注册表路径 2025-06-13 22:19:00 +08:00
Constrat
b40a18f591 feat: YostarEN gaming theme + JP optimization 2025-06-13 15:46:03 +02:00
Constrat
007b04eaf0 chore(tools): update ignore templates 2025-06-13 15:44:00 +02:00
status102
09a4931ba1 chore: 刷理智任务手动填写关卡名增加空关卡名对应关卡提示 2025-06-13 21:27:43 +08:00
uye
0da24487c9 feat: mumu 5.0 路径自动检测 2025-06-13 21:04:49 +08:00
Constrat
7ff2bbdbbf style: fix clang 2025-06-13 14:20:26 +02:00
status102
13ef0ca3fe perf: 自动编队跳过空干员职业组 2025-06-13 15:54:56 +08:00
status102
801afef4e5 fix: 自动战斗干员编队时, 若连续错误Ocr贴边干员名为_会导致跳过该职业 2025-06-13 15:54:47 +08:00
github-actions[bot]
124df0612c chore: Auto Update Game Resources - 2025-06-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15616777606

[skip changelog]
2025-06-12 17:07:38 +00:00
Manicsteiner
f2eb22be4c chore: YostarJP Gaming theme (#12970) 2025-06-13 00:48:00 +08:00
HX3N
256feb33c7 chore: YostarKR Poly Vision Museum Theme
EnterInfrastGaming, OperBoxEnterGaming and  TaskGaming work well even without adding templates
2025-06-13 00:58:40 +09:00
status102
5b39e69317 perf: 减少预期外的error日志 2025-06-12 20:21:49 +08:00
github-actions[bot]
87ed43301c chore: Auto Update Game Resources - 2025-06-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15606390837

[skip changelog]
2025-06-12 09:09:08 +00:00
HY
3c628e95dd fix: 繁中服 肉鴿助戰可能招募失敗 (#12966) 2025-06-12 10:57:32 +02:00
github-actions[bot]
21a40cc685 chore: Auto Update Game Resources - 2025-06-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15603966383

[skip changelog]
2025-06-12 07:08:36 +00:00
uye
cbe1c991cc fix: 成就 id 错误 2025-06-12 02:57:15 +08:00
github-actions[bot]
f68d1dd308 chore: Auto Templates Optimization
Triggered by bbe22ea5a2

[skip changelog]
2025-06-11 14:46:27 +00:00
HX3N
bbe22ea5a2 chore: YostarKR ocr fix and update Infrast templates
Changed the Training template because the mastery symbol prevented recognition when training finished.
ocr fix for EP update.
2025-06-11 23:28:10 +09:00
dependabot[bot]
8d29464ed3 ci: bump actions/github-script from 6 to 7 in /.github/workflows in the github-actions group (#12946)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-06-11 21:29:35 +08:00
HX3N
c97c525d74 fix: UseReaminingSanityStageTip (#12959) 2025-06-11 08:21:24 +08:00
uye
c6536af73d fix: 午夜 0 点没算 0 点 2025-06-11 01:03:44 +08:00
uye
a903486c71 fix: 使用 Mirror 源的时候也显示了强制使用 Github 的TooltipBlock 2025-06-11 01:02:45 +08:00
uye
725a178708 Release v5.18.0-beta.1 (#12956)
sb gh 炸了()
2025-06-11 00:34:11 +08:00
uye
12cbc7d47b ci: Update ci.yml 2025-06-11 00:31:31 +08:00
uye
620c63c6b0 Release v5.18.0-beta.1 (#12954) 2025-06-11 00:11:29 +08:00
github-actions[bot]
bcd61de277 docs: Auto Update Changelogs of v5.18.0-beta.1 (#12955)
* docs: Auto Generate Changelog of Release v5.18.0-beta.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-06-11 00:07:08 +08:00
uye
53cb5cc3e8 chore: 多余文件描述 2025-06-10 23:59:07 +08:00
soundofautmn
839835fcba chore: 统一更新copyright 2025-06-10 23:56:27 +08:00
soundofautmn
466cd719d7 chore: 统一copyright 2025-06-10 23:56:23 +08:00
soundofautmn
ee9a44b957 chore: 修正注释warning
warning SA1512: Single-line comments should not be followed by blank line
2025-06-10 23:56:21 +08:00
uye
1b2df5ff5d feat: 成就系统 (#12823)
* feat: 成就系统

* chore: 调整时间

* feat: 追溯同类成就

* chore: 调整弹窗显示

* feat: 增加解锁条件

* feat: 使用静态类替代硬编码 id

* feat: 刷理智类成就实现

* chore: 抽离 CheckProgressUnlock

* chore: 加个保底

* feat: 手动停止

* chore: 修改描述

* feat: 成就列表(待翻译)

* i18n: english

* chore: 调整排序

* chore: 使用 DynamicResource 替代硬编码颜色,取消选中高亮

* feat: 可露希尔代理程序正常运转中(1000次刷理智)

* feat: 第一次启动软件

* feat: 使用理智药

* chore: 右键图标的停止也改成ManualStop

* feat: Growl 延迟到窗口显示时弹出

* chore: 默认 WindowState 为 null

* perf: 弹窗居中,虚拟化StackPanel

* chore: 定时执行

* chore: 解锁时间显示改为本地时间

* chore: 已完成的成就不显示进度条

* chore: 统一格式

* feat: 临期理智药

* chore: 你进行了一次能将大道磨灭的代理任务

* debug: 忘了删

* feat: 使用 MirrorChyan 更新 / 输入错误 cdk

* chore: 调整设置顺序

* chore: 截图测试显示在应用中心

* chore: 调整 AchievementListWindow 绑定

* chore: summary

* fix: 卡启动

* feat: 恢复进度后保存文件

* feat(#12823): 新增成就 (#12840)

* feat: 真正的抽卡

* feat: 窥屏

* feat: 喜报

* feat: 不速之客

* feat: 自定义达人

* feat: 火星人

* feat: 严重错讠

* feat: 这也能点?

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>

* chore: 火星人

* feat: 勋章颜色

* feat: 成就图标

* feat: 问题反馈

* feat: 成就等级

* feat: 急急国王

* feat: 自动战斗

* i18n: 打个框先

* i18n: KR translation

* feat: 公招

* i18n: 翻译

* chore: 隐藏吉吉国王

* feat: 借助战

* chore: 测试版

* feat: 作弊

* chore: 优化显示效果

* chore: 忽略返回值

* feat: 或许我应该换一份作业?

* feat: 平均截图速度

* feat: 验证成就合法性,新增 CustomData 字段

* chore: 调整延迟时间过长为隐藏成就

* feat: 今日宜抽卡

* feat: 分组

* feat: 彩色!

* chore: 忘加[JsonIgnore]了

* feat: 彩色!

* chore: 这玩意啥时候混进来了

* feat: 网络折磨人

* chore: 调整描述

* chore: httpService unused

* chore: debug 模式点一次触发

* feat: 新增成就 new 提示,仅本次关闭前生效

* chore: 隐藏未解锁的隐藏成就

* feat: 挂机

* feat: 一天启动 3 次任务

* chore: lock 时重置进度

* feat: 肉鸽相关成就

* chore: 调整放弃次数

* feat: 作业点赞

* feat: 立刻停止任务

* fix: RoguelikeRetreat

* chore: 不存非法成就

* feat: 代理指挥出现错误

* fix: 次数填错了

* feat: 新增 CustomData 类辅助函数,添加时长类成就

* chore: 调整 rare 逻辑

* chore: 注释

* chore: 调整成就分类

* chore: 调整描述

* i18n: 打个框

* fix: wpf binding error

* feat: 肉鸽通关难度

* perf: 解锁和锁定全成就时禁止保存

* chore: 调整成就显示

* chore: 调整 LinearGradientBrush

* feat: 新增肉鸽 n4

* i18n: fully Claude Sonnet 4 EN translation

* i18n: 繁中翻译

* i18n: KR translation

* i18n: JP translation

* feat: JsonDataHelper 支持自定义文件夹

* feat: 自定义备份路径

* chore: 哦这该死的 xaml designer

* fix: 避免设计时生成不必要的data文件夹

* feat: 触发牛牛时按钮位置移动

* Revert "fix: 避免设计时生成不必要的data文件夹"

This reverts commit 2ac878dbbd.

* fix: 不许save, 给你抽出来

* Reapply "fix: 避免设计时生成不必要的data文件夹"

This reverts commit 76985896cb.

* chore: 调整显示顺序

* feat: 添加搜索

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Lemon-miaow <61692393+Lemon-miaow@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
2025-06-10 23:40:25 +08:00
status102
3db8613a43 chore: wpf各种提示 (#12930)
* chore: 给喜欢指定参数不看说明的加个提示

* chore: 给代理倍率加个?

* fix: 减重繁中

* chore: KR tweak translation

* i18n: EN dot symbol

* feat: 带提示控件使用 TooltipBlock

* chore: 调整无序列表显示

* chore: 调整显示效果

* perf: 简化自定干员提示

* fix: TooltipText 内容错误

* chore: 调整 TooltipBlock 默认 Margin

* chore: 重置 TextBox InitialShowDelay 默认行为

* chore: 修改描述

* chore: 修改自动战斗描述

* perf: 优化控件布局

* feat: 新增强制Github下载描述

* chore: 调整绑定

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-06-10 23:33:35 +08:00
status102
499564694c perf: 刷理智增加未耗尽战斗次数提示输出 2025-06-10 22:04:47 +08:00
HY
88eb57d63d fix: 繁中服 傀影肉鴿 卡在通關劇情 (#12952)
* 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-06-10 19:56:06 +08:00
HY
4aeeac2e65 chore: update txwy for update infrast training room (#12953) 2025-06-10 19:52:59 +08:00
uye
ce2031704f perf: 移除解决方案名
Signed-off-by: status102 <102887808+status102@users.noreply.github.com>
2025-06-10 15:02:38 +08:00
uye
f2558002f0 perf: 移除解决方案名
Signed-off-by: status102 <102887808+status102@users.noreply.github.com>
2025-06-10 15:01:06 +08:00
status102
99958533ef fix: rect width & height = 0 2025-06-10 14:54:22 +08:00
status102
b6e6080f36 fix: StageDrops-Item warning 2025-06-10 14:52:52 +08:00
status102
96df05800c fix: 未进入战斗期间检测技能使用 2025-06-10 09:10:29 +08:00
HX3N
625db77e00 chore: update KR for update infrast training room
ref 673b1b082f
2025-06-10 09:46:59 +09:00
github-actions[bot]
96d9cad344 chore: Auto Templates Optimization
Triggered by 12f165e08d

[skip changelog]
2025-06-10 00:28:00 +00:00
HX3N
12f165e08d fix: YostarKR changed EnterInfrastSami due to low recognition score 2025-06-10 09:27:02 +09:00
Constrat
d96143eab2 style: fix clang 2025-06-09 23:17:48 +02:00
Constrat
673b1b082f chore: update EN for update infrast training room 2025-06-09 21:42:29 +02:00
status102
3a15195178 fix: 还原外服的StageDrops-TimesRec 2025-06-09 22:57:23 +08:00
uye
59c632f628 fix: 代理次数 2025-06-09 22:53:51 +08:00
ABA2396
1d54b13f6d Merge tag 'v5.17.2' into dev
v5.17.2
2025-06-09 11:02:25 +00:00
uye
2e9408efa9 Release v5.17.2 (#12943) 2025-06-09 19:01:50 +08:00
status102
02ec0426f0 Release v5.17.2 (#12941)
fix: non ota package remove old resource
2025-06-09 17:47:54 +08:00
status102
5bc4a68a71 fix: non ota package remove old resource 2025-06-09 17:31:13 +08:00
Hao Guan
3682278967 fix(mac): 编译兼容Swift 6.0 2025-06-09 17:07:19 +08:00
Hao Guan
ff40ff6e91 fix(mac): 资源更新改进 2025-06-09 16:48:14 +08:00
uye
f329411768 docs: 高分辨率滑动修复文档 2025-06-09 16:15:13 +08:00
uye
7988229cba fix: 高分辨率下无法进入特定关卡(虽然修了但还是不建议用 2k 4k 2025-06-09 15:44:42 +08:00
uye
67eb0aa7ca style: 多余的空格
[skip changelog][skip ci]
2025-06-09 14:25:17 +08:00
uye
cd25bb9fa9 perf: 优化导航逻辑
link to #10691
2025-06-09 14:23:11 +08:00
status102
503029581a rft: 基建技能专精状态分析 2025-06-09 09:21:50 +08:00
Constrat
5b3d638048 fix: EPChapterToEP for EN 2025-06-08 19:26:07 +02:00
Constrat
edf4905733 perf: remove unneccesary InfrastTrainingTime from EN 2025-06-08 17:37:34 +02:00
Constrat
09de23dd26 style: clang format 2025-06-08 17:07:07 +02:00
status102
b96bcc2e2b perf: 合并Tooltip 2025-06-08 21:53:53 +08:00
status102
14d740afe3 fix: 使用传入的httpService代替全局引用 2025-06-08 21:50:28 +08:00
status102
7ac4fc6ccc feat: wpf TooltipBlock文本为空时, 不显示Tooltip文本框 2025-06-08 21:42:54 +08:00
status102
af3e4b144f fix: 刷理智掉落识别-代理倍率roi 2025-06-08 15:33:07 +08:00
uye
5aed8be27e chore: 调整依赖库安装脚本输出 2025-06-08 14:16:25 +08:00
status102
27516baf54 fix: 基建训练室技能专精剩余时间Ocr错误 2025-06-08 14:04:58 +08:00
status102
2609f159ab fix: 基建专精干员名及技能Ocr使用原图以提高ocr成功率 2025-06-08 13:59:43 +08:00
status102
d06535bf92 perf: 肉鸽战斗使用费用、击杀数缓存, 优化性能占用 2025-06-08 09:45:02 +08:00
github-actions[bot]
bb930cd341 chore: Auto Templates Optimization
Triggered by c27a03623b

[skip changelog]
2025-06-07 20:38:13 +00:00
Constrat
c27a03623b perf: use text ocr instead of template for battlequick 2025-06-07 22:37:45 +02:00
uye
33f850b0f7 chore: 怎么真有人看到 [Y] 确认 是用鼠标去点而不是输入 Y 回车 2025-06-08 00:06:29 +08:00
uye
8a2a93c543 fix: Roguelike@RecruitWithoutButton 2025-06-07 22:48:41 +08:00
uye
235f83acfb fix: 在招募干员的过程中闪退导致死循环 2025-06-07 22:46:09 +08:00
uye
ab36ae88d6 docs: 调整描述 2025-06-07 21:20:28 +08:00
status102
56c95f6891 fix: 刷理智战斗后掉落识别代理倍率次数中文关键词使用原图, 以避免阈值过滤造成的边缘细节丢失
fix #12910
2025-06-07 17:26:53 +08:00
uye
21435c8850 fix: microseconds -> milliseconds 2025-06-07 16:28:03 +08:00
uye
93a5392028 docs: 调整镜像下载失败描述 2025-06-07 16:13:39 +08:00
status102
7464b5fce3 perf: wpf属性监听简化 (#12725)
* perf: 绑定合并

* perf: 循环依赖检查

* perf: 循环依赖检查
2025-06-07 10:43:17 +08:00
github-actions[bot]
521ec62b4d chore: Auto Templates Optimization
Triggered by 4fa9639802

[skip changelog]
2025-06-06 20:36:33 +00:00
HX3N
4fa9639802 fix: YostarKR add ReceptionMessageBoard and update templates
Reception is not recognized by the existing templates. Probably Office and Training as well.
2025-06-07 05:35:25 +09:00
uye
eef39ba079 Release v5.17.1 (#12902)
@HX3N for ref
- #12901 
- #12895

---- 
- [x] JP new base
- [x] EN new base
- [x] KR new base
- [x] SSS#7 json
- [x] SSS#7 JP
- [x] SSS#7 EN
- [x] SSS#7 KR
2025-06-07 00:34:57 +08:00
uye
dcf816118f docs: Update CHANGELOG.md 2025-06-07 00:20:36 +08:00
github-actions[bot]
1056ad043c docs: Auto Update Changelogs of v5.17.1 (#12920)
* docs: Auto Generate Changelog of Release v5.17.1

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-06-07 00:07:35 +08:00
Manicsteiner
3864b54b0f fix: YostarJP Infrast mini (#12919) 2025-06-06 23:39:10 +08:00
Lemon-miaow
dd21ff29db chore: feature-request增加陷阱选项 改进en-bug-report标题 (#12917)
* chore: cn-feature-request

* chore: en-feature-request

* chore: 呃呃怎么写description里了

* ci: issue-checkbox-checker

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-06-06 23:11:12 +08:00
ksharperd
daaf9dc02e docs: update connection doc to reflect latest change. (#12689)
* docs: update connection doc to reflect latest change.

* doc: address pr feedback.
2025-06-06 19:14:07 +08:00
HX3N
89d16721df fix: YostarKR infrast mini (#12915) 2025-06-06 18:37:55 +09:00
github-actions[bot]
90b752fb81 chore: Auto Templates Optimization
Triggered by 8d6b16b200

[skip changelog]
2025-06-06 09:00:56 +00:00
Constrat
8d6b16b200 fix: revert ROI from e71e817577 2025-06-06 11:00:20 +02:00
Constrat
fd0dafcbd2 fix: update mini templates after base update (#12912)
* fix: update mini templates after base update

* 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-06-06 16:19:12 +08:00
HX3N
8141c9f197 chore: YostarKR SSS#7 and Infrast update (#12913)
* chore: YostarKR SSS#7 Buffchoose

* chore: YostartKR Infrast ui update
2025-06-06 16:18:20 +08:00
github-actions[bot]
58450ea856 chore: Auto Update Game Resources - 2025-06-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15484600517

[skip changelog]
2025-06-06 06:50:34 +00:00
uye
4a22870377 feat: 远程控制协议增加“轮询间隔”参数
fix #12904
2025-06-06 13:44:58 +08:00
status102
75f4c8d01e perf: 自动战斗编队固定优先编入所有干员, 且按照作业顺序 2025-06-06 13:24:55 +08:00
status102
5a235f92d0 revert 532acde4c3 2025-06-06 13:13:45 +08:00
status102
dfa722d6a9 Revert "fix: 漏了.jpg"
This reverts commit 532acde4c3.

Revert "fix: wpf更新完不重启"

This reverts commit 12c70a0fda.
2025-06-06 13:09:03 +08:00
status102
532acde4c3 fix: 漏了.jpg
[skip changelog]
2025-06-06 13:02:20 +08:00
uye
b4cdd15901 fix: 更新后不重启 2025-06-06 12:59:58 +08:00
status102
12c70a0fda fix: wpf更新完不重启 2025-06-06 12:55:57 +08:00
Constrat
916ad56431 fix: remove unneccesary EnterInfrastSiege for EN
(use default CN)
2025-06-06 03:23:24 +02:00
Constrat
bea6f015a4 feat: Global SSS#7 + EN buffchoose 2025-06-05 22:07:12 +02:00
github-actions[bot]
f616d89f5c chore: Auto Templates Optimization
Triggered by 63502600aa

[skip changelog]
2025-06-05 19:08:22 +00:00
Constrat
63502600aa feat: EN base no beta (#12901) 2025-06-05 20:17:06 +02:00
Manicsteiner
b56ed10424 chore: YostarJP Infrast edits (#12895) 2025-06-05 19:05:21 +02:00
AnnAngela
6b0ba2afed doc: Update CHANGELOG.md 2025-06-05 23:29:49 +08:00
AnnAngela
bd779697b7 doc: 这合的也太快了 2025-06-05 23:28:25 +08:00
uye
094f76f5e5 Release v5.17.0 (#12878) 2025-06-05 23:20:22 +08:00
github-actions[bot]
e7601b1fb7 docs: Auto Update Changelogs of v5.17.0 (#12893)
* docs: Auto Generate Changelog of Release v5.17.0

* docs: Update CHANGELOG.md

* docs: changelog

* docs: changelog

* docs: changelog

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
2025-06-05 23:18:12 +08:00
uye
9b2c051758 chore: 调整 tasks 移动逻辑 2025-06-05 21:59:36 +08:00
status102
59ec169a9d fix: WebStages加载临时补救 2025-06-05 21:36:28 +08:00
status102
59dd27f209 fix: 补回遗漏的WebStages移动的path 2025-06-05 21:10:39 +08:00
status102
505823afbb fix: 补回遗漏的WebStages移动 2025-06-05 20:29:49 +08:00
uye
6f98f3600d feat: 日志压缩包打包 cache/resource 2025-06-05 20:17:38 +08:00
github-actions[bot]
950532604e chore: Auto Update Game Resources - 2025-06-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15466687154

[skip changelog]
2025-06-05 12:13:09 +00:00
status102
2d20c4e465 chore: 红丝绒 地图 2025-06-05 20:11:04 +08:00
status102
2e63cbfb56 chore: blank 2025-06-05 20:09:51 +08:00
status102
a78d875434 perf: 使用系统回收站替代强制删除 2025-06-05 20:02:08 +08:00
pre-commit-ci[bot]
3acbf33046 chore: Auto update by pre-commit hooks [skip changelog] 2025-06-05 11:35:15 +00:00
SherkeyXD
cd560f1ae1 feat: SideStory「红丝绒」 2025-06-05 19:32:56 +08:00
github-actions[bot]
baf25450ed chore: Auto Update Game Resources - 2025-06-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15465822477

[skip changelog]
2025-06-05 11:27:49 +00:00
status102
6965c7190a chore: MirrorChyan更新支持判断完整包 2025-06-05 19:08:33 +08:00
uye
ff3d416664 fix: 基建又双叒叕改了 2025-06-05 17:50:52 +08:00
status102
2bb47a5c55 chore: MirrorChyan更新支持判断完整包 2025-06-05 17:40:50 +08:00
status102
943f2bdea3 perf: 允许无OTA包更新 2025-06-05 17:40:10 +08:00
uye
b91bc9dfe8 chore: MirrorChyan更新支持判断完整包 2025-06-05 17:28:41 +08:00
status102
8f096c4aa6 fix: 自动更新无ota包时, 残留旧版本文件 2025-06-05 17:15:32 +08:00
uye
8e5709fa90 debug: IsDebugVersion 2025-06-05 17:11:22 +08:00
uye
6e68b488d0 feat: 跨10版本的情况下不提供自动更新 2025-06-05 17:05:51 +08:00
github-actions[bot]
34a1e8266b chore: Auto Update Game Resources - 2025-06-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15462342471

[skip changelog]
2025-06-05 08:32:47 +00:00
status102
b814961559 fix: Toast死锁 2025-06-05 16:02:07 +08:00
github-actions[bot]
87642f513d docs: Auto Update Changelogs of v5.17.0-beta.2 (#12886)
* docs: Auto Generate Changelog of Release v5.17.0-beta.2

* docs: changelog

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[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-06-05 14:09:21 +08:00
uye
586c87233f style: 格式化 2025-06-05 14:03:54 +08:00
pre-commit-ci[bot]
1d7832c152 chore: Auto update by pre-commit hooks [skip changelog] 2025-06-05 05:02:19 +00:00
uye
78a81f34c3 feat: 清理 map 中的 png 类型截图 2025-06-05 13:00:06 +08:00
github-actions[bot]
0a8f78858f chore: Auto Update Game Resources - 2025-06-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15458489390

[skip changelog]
2025-06-05 04:32:51 +00:00
github-actions[bot]
2c3d0fd8ec chore: Auto Templates Optimization
Triggered by 79174381b3

[skip changelog]
2025-06-05 03:05:33 +00:00
github-actions[bot]
79174381b3 chore: Auto Update Game Resources - 2025-06-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15457330597

[skip changelog]
2025-06-05 02:57:20 +00:00
晓丶梦丶仁
bb8a890194 ci: 折叠 checkboxes 改为正则匹配 2025-06-05 01:57:33 +08:00
晓丶梦丶仁
c609433c8f docs: issue-checkbox-checker 文档 2025-06-05 01:12:50 +08:00
晓丶梦丶仁
b1c9102a8f ci: 优化未读检查、增加 checkboxes 折叠 2025-06-05 01:06:42 +08:00
晓丶梦丶仁
ee66844d9c fix: RA2 Swipe Save 2025-06-05 00:10:33 +08:00
status102
eca2e41c99 feat: 自动战斗费用击杀数缓存, 减少性能消耗 (#12879)
测试条件:待部署1,无技能检测,单个部署等击杀数,不开GPU加速

一场`1-7`的score情况:
- 击杀数未变化
  - 1.0 (1128: 30.87%)
  - 0.99 (2519: 68.94%)
  - 0.98 (5: 0.14%)
  - 0.97 (2: 0.055%)
  - 0.95~0.96 未出现
- 击杀变化
  - 0.94 (1)
  - 0.93 (2)
  - 0.92 (1)
  - 0.86 (1)
  - ...
[asst.log](https://github.com/user-attachments/files/20582872/asst.log)

有缓存:CPU 15~17%

![image](https://github.com/user-attachments/assets/0aa62313-4418-4837-ba0d-c3768aeab04a)


无缓存:CPU 48~52%

![image](https://github.com/user-attachments/assets/b71b838d-089d-4aa0-9e78-23c7d65c52cf)
2025-06-04 22:05:30 +08:00
status102
70fc130f4a refactor: 干员识别存储 (#12881) 2025-06-04 22:04:38 +08:00
status102
68d7f4ab41 fix: 外服使用 AUTO模式 代理倍率等待战斗结束时间过长 2025-06-04 19:05:22 +08:00
status102
45765a3932 perf: 旧config移除简化 2025-06-04 18:37:28 +08:00
status102
4de88035be chore: 提高可读性 2025-06-04 18:37:28 +08:00
status102
e1fea2032a chore: mumu内测路径注释 2025-06-04 18:37:23 +08:00
晓丶梦丶仁
a0ef939648 fix: RA2 swipe save 2025-06-04 16:30:31 +08:00
uye
9ea2c8c8e5 fix: 放弃与驮兽同行,等谁想加识别了再改回来) 2025-06-04 15:15:39 +08:00
status102
4285132852 perf: 击杀数识别RegionOcr使用原图优化 2025-06-04 09:58:50 +08:00
status102
9c79a8d09c feat: 自动战斗费用击杀数缓存, 减少性能消耗 2025-06-04 09:56:49 +08:00
晓丶梦丶仁
fcf026104c chore: MuMuExtras 5.0+ (#12876) 2025-06-04 00:09:15 +08:00
Lemon-miaow
7baad81b84 chore: 移除因勾选"我未仔细阅读"的自动回复 增加文档描述 (#12875)
* chore: 移除自动回复

* docs: 添加issue-not-reading-checker的描述
2025-06-03 22:10:31 +08:00
status102
f72b834d12 fix: 绿票商店跳过赤金及家具灵茧
fix #12872
2025-06-03 20:23:17 +08:00
status102
2c8efbbcb9 fix: 修复feature match sence内无特征点时的死循环问题
c8516a7264
2025-06-03 20:23:17 +08:00
status102
d20b539f06 chore: 特征匹配调试绘制 2025-06-03 20:23:16 +08:00
uye
66d7659e9a fix: 界面窗口标题滚动失效
fix #12854
2025-06-03 20:11:15 +08:00
MistEO
8995b04a22 chore: add mirrorchyan url source (#12869)
* chore: add mirrorchyan url source

* perf: wpf link

* Apply suggestions from code review

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

* fix: link

* fix: 吐司通知转义

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-06-03 19:52:36 +08:00
HY
4d74da147a fix: 繁中服 薩卡茲肉鴿 月度小隊無法開始探索 (#12871)
* 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-06-03 12:29:35 +02:00
HY
4a6f357b73 chore: 繁中服「泰拉飯」活動導航 +「滋味」主題 (#12870)
* chore: 繁中服「泰拉飯」活動導航

* chore: 「滋味」主題截圖

* 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-06-03 12:29:11 +02:00
晓丶梦丶仁
e2a9ed7bb0 fix: EN IS4 Squad Name 2025-06-03 18:25:07 +08:00
status102
ecd1153238 chore: warning 2025-06-03 17:56:03 +08:00
status102
2f5d5774be refactor: 持有费用缓存判定拆分 2025-06-03 17:56:03 +08:00
github-actions[bot]
8752da1c06 chore: Auto Update Game Resources - 2025-06-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15412469181

[skip changelog]
2025-06-03 08:33:07 +00:00
status102
a6de3f83ba perf: 特征匹配ASST_DEBUG增加匹配点位绘制 2025-06-03 14:07:21 +08:00
Lemon-miaow
4f2e9c6409 chore: 增加“我未仔细阅读”陷阱选项 (#12864)
* chore: 增加“我未仔细阅读”陷阱选项

* chore: 改进文本

* chore: typo

* chore: 拆分选项

* chore: 改进文本

* chore: ci

* chore: 改进文本

* ci: lock_reason

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-06-03 12:18:20 +08:00
status102
09bbf1a2ed refactor: LogDebug, LogTrace, LogInfo, LogWarn, LogError补上scope输出 (#12855) 2025-06-02 21:23:53 +08:00
github-actions[bot]
25ecadf0d5 chore: Auto Update Game Resources - 2025-06-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15376777571

[skip changelog]
2025-06-01 15:44:50 +00:00
Constrat
ca2dfda207 chore: YostarEN EP navigation 2025-06-01 17:33:24 +02:00
status102
6e3f402dec style: Logger可读性优化 2025-06-01 22:50:33 +08:00
status102
7944608267 perf: Log.debug是否写入判断优化 2025-06-01 21:59:36 +08:00
HX3N
1663df1263 chore: YostarKR EP navigation (#12852) 2025-06-01 20:16:21 +08:00
github-actions[bot]
3fbc8655de chore: Auto Update Game Resources - 2025-06-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15374283831

[skip changelog]
2025-06-01 11:06:31 +00:00
Manicsteiner
81bc7a3a39 chore: YostarJP EP navigation and i18n changes (#12849) 2025-06-01 11:36:07 +02:00
uye
1d530522b0 chore: using ToastNotification 2025-06-01 16:16:02 +08:00
status102
a33535e073 fix: 7e9806e697 2025-06-01 14:43:57 +08:00
MistEO
7e9806e697 fix: findHomography should have at least 4 points, 优化性能
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-06-01 14:38:28 +08:00
status102
b814c76135 feat: FeatureMatcher muplti results
link to MaaXYZ/MaaFramework#645

Co-authored-by: MistEO <mistereo@hotmail.com>
2025-06-01 14:32:37 +08:00
status102
4b9098769e Revert "feat: 不允许通过吐司通知启动应用"
This reverts commit ad54d797d1.
2025-06-01 14:04:57 +08:00
status102
f8725f5cd2 perf: 阻止WinRT下Toast主体点击时的启动行为 2025-06-01 14:04:14 +08:00
uye
ad54d797d1 feat: 不允许通过吐司通知启动应用 2025-06-01 13:51:16 +08:00
uye
8fe23adba0 fix: WMI 无效类报错
fix #12844
2025-06-01 11:27:38 +08:00
status102
21fa83b749 docs: 连战次数 -> 代理倍率; 指定次数 描述优化 (#12835)
* docs: `指定次数` & `代理倍率` 描述优化

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

* docs: format

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-06-01 08:52:14 +08:00
status102
5458ae642a perf: 刷理智任务每次开始行动时的文本优化 2025-05-31 23:56:38 +08:00
status102
df7cdf6608 perf: 自动战斗使用战斗列表执行单作业时, 增加一条警告; 追加部分提示的i18n (#12832) 2025-05-31 23:04:46 +08:00
晓丶梦丶仁
d25ac0990f feat: RA store (#12833)
* feat: RA store

* feat: 生息演算商店接入刷点数

* fix: 停止方式
2025-05-31 18:13:14 +08:00
status102
498736ec22 fix: Telegram外部通知请求日志uri调整
fix#11983

咋uri给明文token, 怪哎
2025-05-30 19:42:07 +08:00
status102
d42944e3b5 refactor(wpf): HttpService日志中uri统一使用UriPartial限制 2025-05-30 19:42:07 +08:00
HY
1ab6f93358 fix: 繁中服薩卡茲肉鴿 ocr (#12829) 2025-05-30 12:26:32 +02:00
status102
3f3262a82b i18n: wpf CN 修改描述连战次数 -> 代理倍率 (#12827)
i18n: wpf 修改描述`连战次数` -> `代理倍率`
2025-05-30 17:22:34 +08:00
status102
75464abd73 chore: 生成时清理template, tasks, global缓存 2025-05-30 15:15:51 +08:00
status102
a017fe9a9f fix: wpf任务状态并发修改 2025-05-30 10:59:46 +08:00
status102
3cfc853d10 fix: 非部署动作时, 动作前等待结束后不必要的部署区更新可能触发暂停识别, 导致动作滞后 2025-05-29 22:15:23 +08:00
status102
b516bbf7fd perf: 肉鸽投资达限时, 增加输出提示 (#12818) 2025-05-29 22:04:46 +08:00
uye
2b7ea316d1 feat: 新增 JsonDataHelper,抽离 gui.json 中巨大的 data 类型数据到 data 文件夹中 (#12795) 2025-05-29 21:40:27 +08:00
status102
a59219ea66 refactor: 迁移肉鸽任务部分回调 2025-05-29 10:36:29 +08:00
status102
4fec94f580 chore: else if替换独立if
[skip changelog]
2025-05-29 10:26:10 +08:00
status102
d50c4a4f82 feat: template重复检查 2025-05-28 23:41:51 +08:00
uye
ca65482ca8 Release v5.17.0-beta.1 (#12812)
This reverts commit 38b0742a4a.
2025-05-28 23:41:02 +08:00
uye
4bac9f6c71 Revert "chore: 还原 RA/Fire.json"
This reverts commit 38b0742a4a.
2025-05-28 23:39:07 +08:00
uye
332f890b11 Release v5.17.0-beta.1 (#12785) 2025-05-28 22:43:31 +08:00
uye
38a7f78dd7 docs: Update CHANGELOG.md 2025-05-28 22:43:10 +08:00
uye
38b0742a4a chore: 还原 RA/Fire.json 2025-05-28 22:35:50 +08:00
github-actions[bot]
03a966d66d docs: Auto Update Changelogs of v5.17.0-beta.1 (#12809)
* docs: Auto Generate Changelog of Release v5.17.0-beta.1

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-05-28 19:27:15 +08:00
HY
e1d81e40cb feat: 繁中服 薩卡茲肉鴿 (#12800)
* feat: 更新薩卡茲肉鴿的相關內容

* chore: 補充截圖

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

* fix: 小修一點目前有遇到的 OCR 錯誤

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

* chore: 繼續補充截圖 + 調整未開放分隊的名稱

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

* chore: 最後一張圖片了

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

* fix: 再修一點 ocr 問題

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-05-27 17:50:18 +02:00
github-actions[bot]
ef1da986b5 chore: Auto Update Game Resources - 2025-05-27
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15275374794

[skip changelog]
2025-05-27 12:34:37 +00:00
AnnAngela
8b144fe4de fix: 我面前站不下这许多人
```
     %~fI        - 将 %I 扩展到一个完全合格的路径名
     %~dI        - 仅将 %I 扩展到一个驱动器号
     %~pI        - 仅将 %I 扩展到一个路径
     %~nI        - 仅将 %I 扩展到一个文件名
     %~xI        - 仅将 %I 扩展到一个文件扩展名
```
2025-05-27 17:03:57 +08:00
晓丶梦丶仁
db18965bff fix: KR 驮兽旅行家 OCR 2025-05-27 15:08:38 +08:00
status102
59ba947489 Merge tag 'v5.16.10' into dev
v5.16.10
2025-05-26 10:50:30 +00:00
status102
d0abdde209 Release v5.16.10 (#12793) 2025-05-26 18:49:55 +08:00
status102
81c27e1a0a docs: changelog 2025-05-26 18:49:39 +08:00
status102
d7d438e067 fix: BattleQuickFormationOCR in EN 2025-05-26 17:13:13 +08:00
Manicsteiner
bc9afbd20c chore: YostarJP FormationOCR params (#12783) 2025-05-26 17:13:13 +08:00
status102
b9032ccf2e perf: Sync OperBoxNameOCR roi to EN 2025-05-26 17:13:12 +08:00
status102
5bab8053b2 fix: OperBox Roi for EN 2025-05-26 17:13:12 +08:00
status102
b1e064a5db Revert "fix: OperBox Roi for EN"
This reverts commit 4abecee9c7.
2025-05-26 17:13:12 +08:00
Constrat
8eb09c9992 fix: clang
[skip changelog]
2025-05-26 17:13:11 +08:00
status102
1f583c3cbe fix: OperBox Roi for EN 2025-05-26 17:13:11 +08:00
status102
99ea5dc070 fix: 自动编队添加自定义干员时, 点击位置错误 2025-05-26 17:13:11 +08:00
status102
07d2decb11 fix: OperBox ROI 更正
fix #12770
2025-05-26 17:13:10 +08:00
status102
e23c362cf3 refactor: 干员名识别封装 2025-05-26 17:13:10 +08:00
Constrat
4c9a19b81a i18n: EN tweak 2025-05-26 17:13:10 +08:00
github-actions[bot]
17fe445d50 chore: Auto Update Game Resources - 2025-05-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15192605330

[skip changelog]
2025-05-26 17:13:09 +08:00
uye
87bbd07ecf feat: 更新识别工具逻辑与显示效果 (#12791)
* feat: 仓库识别持久化储存

* feat: 干员识别数据支持启动时显示

* fix: 小工具初始化

* perf: 干员识别使用 VirtualizingWrapPanel,加快加载速度

* perf: 掉落识别使用 VirtualizingWrapPanel,加快加载速度

* feat: 逐项滚动
2025-05-26 16:48:24 +08:00
uye
1803f77325 chore: 重启函数添加 CallerMemberName,UntilIdleAsync 添加消抖 2025-05-26 14:38:38 +08:00
Manicsteiner
4b6c7319bd chore: YostarJP roguelike ocr edit (#12789) 2025-05-25 16:55:25 +02:00
HX3N
1c49ccaf23 fix: global templates are not loaded (#12787) 2025-05-25 15:49:31 +08:00
Loong
15d921e21d chore: bump maa-cli to 0.5.5 (#12664) 2025-05-25 10:13:25 +08:00
Sherkey Asher
515f8b2c5f feat: 模板图允许从子文件夹加载 (#12717)
* rft: 重构模板图位置

* rft: remove all Fire@Reclamation files

* 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-05-24 23:00:18 +08:00
status102
295a6f8753 chore(WpfGui): 防止缓存的任务文件被意外覆盖 2025-05-24 15:46:54 +08:00
status102
3799d6cfd0 fix: BattleQuickFormationOCR in EN 2025-05-24 10:43:22 +08:00
Manicsteiner
13e69e09e9 chore: YostarJP FormationOCR params (#12783) 2025-05-23 20:47:19 +02:00
uye
c58f525155 chore: 调整技能识别保存截图的阈值 2025-05-23 21:52:36 +08:00
uye
f96e41da1d feat: 截图测试可以在自动检测的情况下使用 2025-05-23 20:11:50 +08:00
status102
6a697a7142 perf: Sync OperBoxNameOCR roi to EN 2025-05-23 18:18:11 +08:00
status102
023499b2ba fix: OperBox Roi for EN 2025-05-23 18:18:11 +08:00
status102
c921eafe48 Revert "fix: OperBox Roi for EN"
This reverts commit 4abecee9c7.
2025-05-23 18:18:10 +08:00
Constrat
3c547ebc7a fix: clang
[skip changelog]
2025-05-23 10:32:13 +02:00
status102
4abecee9c7 fix: OperBox Roi for EN 2025-05-23 16:15:08 +08:00
status102
c9d4a1bbac fix: 自动编队添加自定义干员时, 点击位置错误 2025-05-23 15:26:24 +08:00
status102
efe817d45a fix: OperBox ROI 更正
fix #12770
2025-05-23 15:26:15 +08:00
status102
1679cea5c5 refactor: 干员名识别封装 2025-05-23 15:17:55 +08:00
status102
75012b2252 feat: 自动战斗费用识别缓存, 减少性能消耗 (#12765)
* feat: 自动战斗费用识别缓存

* refactor: 返回值格式

* chore: 改个名字

* chore: rename

* fix: 改名改着改着改错了

* fix: var init

* perf: 简化返回值

* fix: template

* fix: platform
2025-05-23 09:02:00 +08:00
Constrat
bc6059b33c i18n: EN tweak 2025-05-22 21:01:27 +02:00
github-actions[bot]
a7f78b5650 chore: Auto Update Game Resources - 2025-05-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15192605330

[skip changelog]
2025-05-22 17:07:02 +00:00
status102
1d7efcd07b rft: TooltipBlock封装 (#12773)
* rft: TooltipBlock封装

* fix: TooltipText 绑定失败

* rft: 自动战斗提示替换

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-05-22 17:53:22 +08:00
status102
ec6c219673 Release v5.16.9 (#12771) 2025-05-22 17:23:24 +08:00
github-actions[bot]
7a86355a96 chore: Auto Update Game Resources - 2025-05-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15182548981

[skip changelog]
2025-05-22 09:08:30 +00:00
github-actions[bot]
ac4a1c6b4b chore: Auto Update Game Resources - 2025-05-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15181422645

[skip changelog]
2025-05-22 08:10:08 +00:00
github-actions[bot]
025c7fa72b chore: Auto Update Game Resources - 2025-05-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15180975779

[skip changelog]
2025-05-22 07:44:49 +00:00
github-actions[bot]
937ce54362 docs: Auto Update Changelogs of v5.16.9 (#12772)
docs: Auto Generate Changelog of Release v5.16.9

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-05-22 14:23:10 +08:00
status102
7a86697006 perf: 账号切换查找账号最大滑动次数增加到20 2025-05-22 11:01:18 +08:00
status102
4bf790ab3e fix: 理智药使用计数超过实际用量 2025-05-22 11:00:36 +08:00
Lemon-miaow
63fc00a077 feat: 为Copilot添加土司通知 (#12764)
feat: Copilot土司通知
2025-05-22 09:40:52 +08:00
Constrat
549e244605 ci:: remove stale update_resources logic from version script 2025-05-21 22:52:17 +02:00
github-actions[bot]
99d5cf63f8 chore: Auto Update Game Resources - 2025-05-21
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15171563568

[skip changelog]
2025-05-21 20:08:23 +00:00
status102
604ab8f603 docs: 特征匹配detector遗漏 2025-05-21 11:44:47 +08:00
uye
6840318470 Release v5.16.8 (#12756) 2025-05-21 11:32:27 +08:00
uye
b6a9c5e671 docs: Update CHANGELOG.md 2025-05-21 11:31:38 +08:00
uye
27f471fa07 feat: 别再把 maa 放在 Program Files 里了 2025-05-21 11:28:10 +08:00
github-actions[bot]
f3686ebbd3 docs: Auto Update Changelogs of v5.16.8 (#12757)
* docs: Auto Generate Changelog of Release v5.16.8

* docs: cahgnelgo

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-05-21 11:22:52 +08:00
status102
aa0eaea4dd fix: 自动编队干员Ocr左侧内缩过度 2025-05-21 11:08:49 +08:00
status102
566ff62cb0 fix: RegionOcr阈值过滤膨胀后超出原roi 2025-05-21 11:06:37 +08:00
status102
739110255b fix: 自动编队roi溢出闪退 2025-05-21 09:57:47 +08:00
status102
f6c6fca5ca chore: 修复roi超限
@Lemon-miaow
2025-05-21 09:42:32 +08:00
uye
cb9eae7bed chore: 更新 version.json
[skip changelog]
2025-05-21 01:31:15 +08:00
uye
913c4b1f8a chore: 更新 version.json
[skip changelog]
2025-05-21 01:29:52 +08:00
uye
4fe35cbb81 Release v5.16.7 (#12753) 2025-05-21 01:11:44 +08:00
github-actions[bot]
b9eea18342 docs: Auto Update Changelogs of v5.16.7 (#12754)
* docs: Auto Generate Changelog of Release v5.16.7

* docs: ahcneglog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-05-21 01:10:33 +08:00
uye
0552f8690b chore: 同一格式 2025-05-21 01:10:07 +08:00
pre-commit-ci[bot]
f06657867a chore: Auto update by pre-commit hooks [skip changelog] 2025-05-20 16:48:00 +00:00
status102
0ab8bf1b7a fix: 使用理智药后状态未能更新 2025-05-21 00:44:32 +08:00
status102
b259f13202 fix: 使用理智药超限后减少后无法确认使用理智药 2025-05-21 00:30:01 +08:00
status102
4d554f413e fix: 使用理智药后状态未能更新 2025-05-21 00:30:00 +08:00
uye
01d187a943 chore: 自动战斗循环 BattleStartPre retry 3次 2025-05-21 00:24:09 +08:00
SherkeyXD
e898eee450 chore: task schema update 2025-05-21 00:03:05 +08:00
status102
aeed5b4fa0 chore: 调整战斗列表说明 2025-05-20 20:17:51 +08:00
status102
162908dfdf perf: wpf版本不一致仅允许DebugVersion 2025-05-20 20:17:34 +08:00
uye
ee97a4528f perf: 地图截图改用 jpeg 2025-05-20 20:06:05 +08:00
uye
0228156cde perf: 地图截图使用 360p 保存坐标点,节省储存空间 2025-05-20 19:37:54 +08:00
uye
04a95fb27b chore: 怎么又忘了把 isDebug 还原
[skip changelog]
2025-05-20 18:44:44 +08:00
uye
b5d372ab52 chore: 调整界面提示 2025-05-20 18:44:01 +08:00
uye
32986f40c8 chore: 选择 Mirror酱 更新渠道更新软件版本但未填写 cdk 时 Fallback 至海外源 2025-05-20 17:30:38 +08:00
uye
e4aa0b7a11 perf: 优化 Placeholder 提示 2025-05-20 16:55:19 +08:00
uye
c7cd335a2e chore: 移除 debug
[skip changelog]
2025-05-20 16:24:57 +08:00
uye
81a98638b0 perf: 优化检查更新逻辑 2025-05-20 16:24:15 +08:00
Hao Guan
c92502aed1 fix(mac): 修复Mirror酱资源更新问题 2025-05-20 15:30:25 +08:00
status102
49d4dc78b1 perf: 自动战斗编队优化干员识别, 修复roi未包含完整干员名 (#12740)
* perf: 自动战斗编队优化干员识别

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

* perf: task

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-05-20 14:31:35 +08:00
晓丶梦丶仁
9d85c3c3b4 Release v5.16.6 (#12745) 2025-05-20 13:23:57 +08:00
github-actions[bot]
d96c26471b docs: Auto Update Changelogs of v5.16.6 (#12746)
* docs: Auto Generate Changelog of Release v5.16.6

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-05-20 10:12:06 +08:00
uye
bdc3630b7a feat: 显示资源关卡全开放剩余时间 2025-05-19 01:01:14 +08:00
status102
f76db36364 fix: mac platform 2025-05-18 23:36:54 +08:00
status102
7f4a95280c fix: 自动战斗编队时重复选中同一干员 2025-05-18 20:57:34 +08:00
status102
711041f190 perf: 自动战斗编队时增加干员组名输出 2025-05-18 19:56:25 +08:00
status102
21086dcf68 fix: 部分情况下刷理智连战使用AUTO模式时, 吃理智药溢出理智 2025-05-18 19:56:03 +08:00
uye
2c3b6ac50a feat: 更新解决方案 2025-05-18 19:54:40 +08:00
晓丶梦丶仁
743c51a4b5 fix: 开始行动 点击过快 2025-05-18 18:58:14 +08:00
github-actions[bot]
61ce039b12 chore: Auto Update Game Resources - 2025-05-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15095131924

[skip changelog]
2025-05-18 10:45:40 +00:00
晓丶梦丶仁
f6788e6029 fix: 开始行动 ocr replace 2025-05-18 18:42:09 +08:00
uye
a7ed964cb0 fix: 延迟停止按钮叠加显示 2025-05-18 17:40:28 +08:00
Constrat
a91fc84942 fix: formatting ci prettier and clang
[skip changelog]
2025-05-18 11:21:02 +02:00
萨拉托加
66ef1f0836 fix: ocr fix (#12736)
* fix: ocr fix

* fix: 还原
2025-05-18 15:24:21 +08:00
uye
f0a3bbf16a chore: 修改 not in deploy plan 提示 2025-05-18 15:05:39 +08:00
uye
529fedd95e chore: point_states 改用 unordered_map 2025-05-18 14:06:20 +08:00
uye
434932d39a fix: ci format 2025-05-18 13:35:33 +08:00
uye
6601c6621c chore: 调整截图保存逻辑 2025-05-18 12:23:26 +08:00
筱竹聽雨
7a65be5fa5 chore: 尚蜀夜市招募黑名单添加新约能天使 (#12734)
chore:优化黑名单

将新约能天使加入黑名单
2025-05-18 08:37:21 +08:00
github-actions[bot]
0ca0de9663 chore: Auto Update Game Resources - 2025-05-17
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15085694756

[skip changelog]
2025-05-17 13:31:06 +00:00
status102
c69ce8ca7a perf: 黄票绿票商店使用特征匹配 2025-05-17 21:21:40 +08:00
status102
9bccb24654 chore: 黄绿票商店任务整理 2025-05-17 21:11:25 +08:00
status102
0d4ffca813 fix: 指定战斗次数后剩余次数小于连战次数时,可能修改到非指定连战次数 2025-05-17 20:03:22 +08:00
晓丶梦丶仁
b13e4d022b Revert "perf: 黄票绿票商店使用特征匹配 (#12718)"
This reverts commit 57888f783e.
2025-05-17 18:54:29 +08:00
晓丶梦丶仁
110847e005 fix: IS4 竣工仪式 2025-05-17 15:13:46 +08:00
Manicsteiner
772424e920 chore: YostarJP ocr fix (#12729) 2025-05-17 11:34:49 +08:00
status102
57888f783e perf: 黄票绿票商店使用特征匹配 (#12718)
* perf: 黄票绿票商店使用特征匹配

* fix: task
2025-05-16 23:52:45 +08:00
Constrat
f4ee5356d1 fix: SSSBuffChoose for YostarEN 2025-05-16 11:42:54 +02:00
Loong
035fdaa6ca chore: find OpenCV features2d and xfeatures2d components (#12714) 2025-05-16 10:17:45 +01:00
status102
2d4c556bc6 perf: 简化基建任务自定义配置路径Readonly 2025-05-16 16:13:46 +08:00
status102
58a3157bb3 fix: FeatureMatch任务无法读取roi 2025-05-16 13:37:40 +08:00
status102
848ebeb747 feat: ProcessTask支持特征匹配 (#12701)
* feat: ProcessTask支持特征匹配

* chore: test

* fix: test

* docs: task文档
2025-05-16 13:13:48 +08:00
uye
989ba7ee52 chore: 矢量突破开始行动 2025-05-16 01:45:09 +08:00
vonnoq
53e3ec8273 fix: 繁中服悖論模擬 (#12711)
* fix: 繁中服悖論模擬

繁中服悖論模擬UI更新

* fix: 繁中服悖論模擬

繁中服悖論模擬UI更新
2025-05-16 00:39:26 +08:00
MistEO
dbc1f1f6da chore: ota.maa.plus -> api.maa.plus 2025-05-15 23:19:13 +08:00
github-actions[bot]
0d57e73bb4 chore: Auto Update Game Resources - 2025-05-15
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15043371741

[skip changelog]
2025-05-15 11:07:01 +00:00
github-actions[bot]
cf4553fa0a chore: Auto Templates Optimization
Triggered by 0af71a9f32

[skip changelog]
2025-05-15 10:08:39 +00:00
Constrat
0af71a9f32 fix: remove cachie from optimize templates
what's the issue?
2025-05-15 12:07:08 +02:00
pre-commit-ci[bot]
6ab3b6cc56 chore: Auto update by pre-commit hooks [skip changelog] 2025-05-15 18:04:31 +08:00
Constrat
ec1de48e42 fix: update-resources.yml removal from res-update-game 2025-05-15 12:01:30 +02:00
github-actions[bot]
87e43d91f0 chore: Auto Update Game Resources - 2025-05-15
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15041077348

[skip changelog]
2025-05-15 09:09:57 +00:00
uye
6104d0602b refactor: 重构干员识别
fix #12703
2025-05-15 14:17:53 +08:00
github-actions[bot]
f04b9a6409 chore: Auto Update Game Resources - 2025-05-15
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15037893648

[skip changelog]
2025-05-15 06:10:32 +00:00
github-actions[bot]
4fbb831c44 chore: Auto Update Game Resources - 2025-05-15
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15037365361

[skip changelog]
2025-05-15 05:30:34 +00:00
uye
9301ea44b1 chore: 调整 prts 颜色 2025-05-15 00:24:05 +08:00
uye
7e7beabb35 chore: 添加几个专精 ocrReplace 2025-05-14 23:39:13 +08:00
uye
eb5803fef7 Release v5.16.5 (#12688) 2025-05-14 23:22:28 +08:00
github-actions[bot]
24f2cb5cbf docs: Auto Update Changelogs of v5.16.5 (#12698)
* docs: Auto Generate Changelog of Release v5.16.5

* docs: changelog

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-05-14 23:21:53 +08:00
uye
fb8f3b78ad fix: 凹开局干员直升精二选项显示时机错误 2025-05-14 22:25:27 +08:00
status102
abcaf2ee06 perf: 肉鸽不期而遇退出检测加个重试 2025-05-14 20:37:46 +08:00
萨拉托加
03188824f7 Revert "feat: 在肉鸽招募中增加m3作为群奶 (#12353)"
This reverts commit 76a007501a.
2025-05-14 16:54:48 +08:00
status102
340e2798a0 docs: 任务流color_scales注释优化 2025-05-14 16:18:02 +08:00
status102
f9d468f557 perf: 指定类型 2025-05-14 16:15:09 +08:00
status102
e71eb3985d fix: 连战次数乘号匹配失败 2025-05-14 15:55:33 +08:00
uye
5adb76e377 feat: 调整连战输出 2025-05-14 15:06:18 +08:00
Hao Guan
be0ff90b8a feat(mac): 新增基建配置 2025-05-14 13:57:25 +08:00
晓丶梦丶仁
cd723f2210 perf: store loading 2025-05-14 11:29:21 +08:00
晓丶梦丶仁
93ab1cc811 fix: yellow ticket items 2025-05-14 10:25:51 +08:00
uye
92421d464c chore: 简化代码 2025-05-14 10:18:02 +08:00
Loong
260ab6e839 ci: don't check github link (#12667)
* ci: don't check github link

* ci: remove cache

* chore: readd cache

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-05-13 16:39:44 +02:00
status102
7e3e43e81a fix: ocrTask text 2025-05-13 21:43:07 +08:00
status102
3b3056a65f chore: 提示补全 2025-05-13 19:56:45 +08:00
status102
5aa1d74b96 chore: NumberReplace 2025-05-13 19:56:44 +08:00
status102
b9f196c3a1 feat: 特征匹配 (#10966)
* feat: 特征匹配

* chore: 测试内容

* refactor: 根据最新版本重新迁移, 移除多模板

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

* chore: 测试移除

* fix: platform

* chore: docs

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-05-13 18:24:16 +08:00
MistEO
c7a8191e03 chore: 再次调整官网细节 2025-05-13 14:27:32 +08:00
MistEO
3a87307bda chore: 调整官网标题 2025-05-13 14:21:05 +08:00
晓丶梦丶仁
f0ff035546 Revert "fix: github change string to int (#12574)"
This reverts commit 539e2b48b2.
2025-05-13 13:23:05 +08:00
晓丶梦丶仁
81504417c7 fix: Store@UnderfundedOCR 2025-05-13 11:37:09 +08:00
晓丶梦丶仁
771c3e53b7 i18n: 绿票、黄票、活动商店 (#12674)
* i18n: en

* i18n: temp

* i18n: jp

* chore: YostarJP buy items

* fix: template task

* fix: en

* i18n: kr

* i18n: tw

---------

Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
2025-05-13 11:35:54 +08:00
晓丶梦丶仁
5cc7861d5c fix: store underfunded ocr full match 2025-05-13 00:46:51 +08:00
status102
61f25c94e5 fix: 再铲一屎 2025-05-13 00:03:02 +08:00
github-actions[bot]
8da46bf991 chore: Auto Update Game Resources - 2025-05-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14973978510

[skip changelog]
2025-05-12 13:49:04 +00:00
晓丶梦丶仁
26f421418e feat: 绿票、黄票、活动商店 (#12586)
* feat: 绿票、黄票商店

* i18n: EN fix

* feat: 活动商店

* perf: baseTask

* perf: 非代币关联性模板

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

* perf: baseTask

* chore: sub

* chore: 修改截图

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

* fix: 第一页买完之后无法进行活动商店购买

* fix: 买完皮肤、干员之后的 swipe

* chore: 修改描述

* perf: 购买商品确认next优化

* perf: 模板图复用

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

* perf: 合并部分task

* fix: 代币不足

* fix: 代币不足 ocr

---------

Co-authored-by: Constrat <56174894+Constrat@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: uye <99072975+ABA2396@users.noreply.github.com>
2025-05-12 21:45:19 +08:00
uye
82dbe28b5e fix: cache 移动逻辑 2025-05-12 19:42:53 +08:00
status102
cc7c740921 fix: 这回应该铲完了
[skip changelog]
2025-05-12 19:09:00 +08:00
status102
4396c71802 fix: ubuntu unused 2025-05-12 18:59:23 +08:00
status102
351529d4cf fix: 铲屎包了个try
[skip changelog]
2025-05-12 18:49:24 +08:00
status102
eeeca5aa0f fix: 铲屎 2025-05-12 18:44:47 +08:00
uye
37c712637c fix: 修复了屎遇上手动覆盖文件的大聪明爆炸的问题 2025-05-12 18:40:51 +08:00
status102
3c995514a6 chore: mark 2025-05-12 17:37:09 +08:00
uye
5038576b75 chore: 调整 UI 与 Core 版本不一致的解决方案提示 2025-05-12 17:17:15 +08:00
uye
43952444bb chore: 点击任意职业回正列表 2025-05-12 15:49:14 +08:00
uye
1848caf82a refactor: 基建先进行技能识别并返回列表首位,再清空选择
fix #12659
2025-05-12 13:36:01 +08:00
status102
baff16c024 fix: 修复MaaCore asst.log文件句柄泄露 (#12639)
* fix: 尝试修复日志文件句柄泄露

* fix: platform

* fix: platform

* fix: platform

* fix: platform

* fix: cr-lf

* chore: useless
2025-05-11 19:34:01 +08:00
uye
894d540649 Release v5.16.4 (#12655) 2025-05-11 18:11:37 +08:00
uye
aef60f179c docs: Update CHANGELOG.md 2025-05-11 18:10:47 +08:00
status102
25903aba2d fix: 修复外服基建干员选择列表无法重置 (#12652)
fix #12649
2025-05-11 18:06:32 +08:00
status102
42f57797d7 style: format
[skip changelog]
2025-05-11 13:21:18 +08:00
MistEO
30ade6e2a6 ci: add mirrorchyan link to changelog 2025-05-11 01:53:53 +08:00
uye
017147f3f6 Release v5.16.3 (#12619) 2025-05-11 00:46:57 +08:00
github-actions[bot]
4c5afa12c7 docs: Auto Update Changelogs of v5.16.3 (#12640)
* docs: Auto Generate Changelog of Release v5.16.3

* docs: changelog

* docs: changelog

* docs: changelog

* docs: Update CHANGELOG.md

* docs: remove unnecessary bot

* docs: changelog

* docs: changelog

* docs: cahgenlog

* docs: Update CHANGELOG.md

* docs: 翻译

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[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>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-05-11 00:44:27 +08:00
Rbqwow
2fa5c743cc docs: 用户协议 (#11666)
* docs: 初版用户协议

* docs: 贴合AGPL-3.0修改协议(1/2)

* docs: 贴合AGPL-3.0修改协议(2/3)

* docs: 贴合AGPL-3.0修改协议(3/3)

* docs: 用户协议添加tldr

* docs: review (2/3)

Co-authored-by: AnnAngela <naganjue@vip.qq.com>

* docs: 学姐:把森空岛拆出来

* docs: tldr增加免责说明

* docs: 改个词

* docs: 赦免Mirror酱

* docs: 来点加粗

* docs: 强调一下官方账号

* docs: 成年

* docs: 企鹅物流不一定匿名

* docs: 玛

a3d81c6029

* docs: 添加超链接引用

* docs: review

玛

* docs: Update terms-of-service.md

* docs: review

玛玛

* docs: 玛说要有镜,于是丽便有了光

* docs: 写多了 但我的 git rebase -i 坏掉了 只能再推个commit

* docs: 修改文档

* docs: 客户端反作弊

* docs: no deepseek anymore

---------

Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: No-Deepseek <do-not-use-deepseek-to-suck-my-ass@rbqwow.icu>
2025-05-10 23:33:43 +08:00
uye
1702372f0f chore: 统一引号 2025-05-10 23:17:51 +08:00
status102
3dc32c1368 Revert "fix: 指定连战次数允许降低"
This reverts commit d6415c301b.
2025-05-10 23:13:16 +08:00
status102
d6415c301b fix: 指定连战次数允许降低 2025-05-10 23:11:02 +08:00
eneen
9bd75e6692 perf: 添加萨卡兹肉鸽劳作的清晨关卡策略 (#12626)
* perf: 添加萨卡兹肉鸽劳作的清晨关卡策略

* fix: typo

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

* perf: ew摆放

* perf: replacement_home

* perf: 调整部署位置

* perf: 遗漏

* perf: 修改站位

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: 萨拉托加 <151550168+Saratoga-Official@users.noreply.github.com>
2025-05-10 22:39:36 +08:00
神楽坂アイリス
9dc8c05a73 feat: 添加 自定义 webhook 功能 (#12602)
* feat: 添加自定义Webhook通知功能

* chore: 删除无用文件

* chore: 调整格式,修改日志输出

* chore: 调整翻译位置

* chore: 使用 EnsureSuccessStatusCode 判断状态

* chore: 动态调整输入框高度

* fix: 修改 CustomWebhookBody 时报错

* feat: body 转义

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-05-10 20:05:52 +08:00
萨拉托加
00d1f93472 feat: 肉鸽适配新干员 (#12599)
* feat: 肉鸽适配新干员

* feat: 肉鸽适配新干员

* feat: 肉鸽适配新干员

* feat: 肉鸽适配新干员

* feat: 肉鸽适配新干员

* feat: 肉鸽适配新干员

* feat: 肉鸽适配新干员

* feat: 肉鸽适配新干员

* fix: 卫士不语功站位
2025-05-10 20:00:56 +08:00
uye
639c6d711b perf: 基建使用切换职业栏返回列表最左侧 (#12594)
肉鸽用不了,没有对应职业的话是灰的,除非全部匹配一遍,反正不长,还是慢慢划吧

fix #11782
2025-05-10 19:58:38 +08:00
uye
bd6176b25f fix: 开始战斗前闪退无限循环识别,关卡名检查放宽至一分钟 (#12580) 2025-05-10 19:58:07 +08:00
晓丶梦丶仁
e60a065ba4 fix: 肉鸽招募 练度不够干员的 priority 可能为正 2025-05-10 17:08:47 +08:00
uye
41c9643b38 feat: 调整提示颜色 2025-05-10 14:31:43 +08:00
status102
1e9d9ba5a0 perf: 连战减少不必要的次数调整 2025-05-10 14:00:04 +08:00
status102
678f0bd60e docs: 连战次数文档更新
`AUTO模式`相关说明
2025-05-10 13:52:06 +08:00
status102
9bffc02d7f chore: static 2025-05-10 12:33:47 +08:00
status102
9c020dd5f9 perf: 战斗次数识别错误处理 2025-05-10 12:33:30 +08:00
BxFS
e159598dc8 chore: 日志压缩包压缩等级提升 (#12622)
chore: support payload compression level optimal -> smallest
2025-05-09 19:40:03 +08:00
uye
022b39c25a chore: 修改连接失败提示描述 2025-05-09 16:22:57 +08:00
pre-commit-ci[bot]
e94e3888bb chore: Auto update by pre-commit hooks [skip changelog] 2025-05-09 07:45:41 +00:00
晓丶梦丶仁
ed2c55e81c fix: 切换账号失败 2025-05-09 15:43:22 +08:00
pre-commit-ci[bot]
b861c544a6 chore: Auto update by pre-commit hooks [skip changelog] 2025-05-09 06:01:16 +00:00
uye
c72d99a030 fix: 模拟器路径选择功能弹窗异常
fix #12612
2025-05-09 13:52:05 +08:00
status102
4a836290b9 perf: 关卡理智识别流程通用化 2025-05-09 10:45:41 +08:00
status102
34a5bfdd3d fix: 战斗次数识别错误缓解 2025-05-09 10:08:21 +08:00
github-actions[bot]
1a072e302e chore: Auto Update Game Resources - 2025-05-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14914121819

[skip changelog]
2025-05-08 19:06:31 +00:00
HX3N
e2e496122a chore: YostarKR BattleStartPre add ocrReplace pattern 2025-05-08 19:22:37 +09:00
uye
6ac61f2274 fix: 截图增强显示错误 2025-05-08 18:01:32 +08:00
Manicsteiner
a68ee788e1 chore: YostarJP ocr edits (#12607) 2025-05-08 17:42:55 +08:00
E022-23093
7022a6d298 feat: 更新 333 搓玉一天三换排班表 (#12604)
* feat: 更新 333 搓玉一天三换排班表

* fix:改了id

改了id
2025-05-08 17:38:58 +08:00
uye
5cda61f8a6 style: typo
[skip changelog]
2025-05-08 17:29:06 +08:00
uye
b37afbaec1 fix: 无法进入活动 2025-05-08 17:28:39 +08:00
uye
be075ab749 style: 统一引号格式 2025-05-08 17:27:20 +08:00
github-actions[bot]
6461d6a7e2 chore: Auto Update Game Resources - 2025-05-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14902851289

[skip changelog]
2025-05-08 09:08:14 +00:00
status102
68130ede6d refactor: HttpService调整, Post函数追加 (#12605)
* refactor: WpfGui拆解GetAsync, 暴露Exception, 增加PostAsync

* perf: 优化自动战斗获取作业时网络问题的输出
2025-05-08 16:44:27 +08:00
status102
2f7d4a6c91 perf: 优化自动战斗获取作业时网络问题的输出 2025-05-08 16:12:40 +08:00
status102
8a6982a144 refactor: WpfGui拆解GetAsync, 暴露Exception, 增加PostAsync 2025-05-08 15:50:16 +08:00
github-actions[bot]
5a2e2f2d6a chore: Auto Update Game Resources - 2025-05-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14901360586

[skip changelog]
2025-05-08 07:45:07 +00:00
uye
754b4135cc style: 统一引号格式 2025-05-08 15:05:07 +08:00
status102
966ded3836 fix: 关闭连战列表点击 2025-05-08 10:07:01 +08:00
status102
b9e69dde73 perf: 减少一次不必要的连战次数变更 2025-05-08 10:02:46 +08:00
status102
f184093732 fix: 关闭连战列表 2025-05-08 09:52:25 +08:00
uye
ef844da918 fix: 刷理智结束后卡在“理智药选择”界面
fix #12601
2025-05-08 09:40:20 +08:00
uye
a3ac79d999 chore: 好像提示了也没人看 2025-05-08 00:05:25 +08:00
status102
29b25079b8 feat(breaking change): 指定次数联动连战, 修复连战导致指定次数失效 (#12592)
* feat: 指定次数联动连战

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

* perf: 适配指定次数

* fix: 移除不再使用的插件

* perf: 优化回调, 解耦

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

* chore: 剩余理智使用 auto 连战

* fix: 最后一轮

* perf: 移除多余的理智识别

* chore(tools): ignore template

* perf: reduceTimes

* fix: 无药可用时, 升级恢复理智后不选择最高

* perf: 移除不再使用的task

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-05-07 23:43:02 +08:00
status102
7059375a2f chore: sort [skip changelog] 2025-05-07 19:10:28 +08:00
bodayw
062397669f feat: 更新 243 极限效率一天四换排班表(20250507 修订) (#12598)
让见行者和信仰搅拌机到会客室上班 / Let Enforcer and Sankta Miksaparato work in the reception room

顺便补上了之前忘记备份到 old 子目录下的旧排班表(取 custom_infrast 目录内自 commit 3f858de 之后所有 feat 类改动的前一个版本,fix/chore 就不要了)

PS. 这次是我自己做的调整,公孙长乐的排班表并没有变化(他的视频不排会客室),不过还是把视频链接也更新了一下,另外考虑到用到了最新实装的干员,所以本 commit 也还是标记为 feat 吧
2025-05-07 19:09:03 +08:00
status102
c7d1718d97 chore: 加点常用的进来 2025-05-07 18:19:09 +08:00
status102
9d875538bf fix: 移除肉鸽难度hard code (#12587)
Revert "fix: mac下选择难度 999 导致卡死 (#12235)"

This reverts commit 0dbd5ee80b.
2025-05-07 14:06:25 +08:00
Hao Guan
6a05dfa694 feat(mac): AUTO连续作战
feat(mac): 优化下载作业UI
2025-05-07 13:14:53 +08:00
uye
109d20d3fd chore: 调整超时提醒输出 2025-05-07 13:09:27 +08:00
status102
e579d2c683 rft: 理智识别 2025-05-06 23:55:37 +08:00
status102
c3a7ae0c22 perf: 移除过旧的任务参数
涉及:
自动战斗: is_raid, is_adverse, add_user_additional
肉鸽任务: investment_enter_second_floor, investment_with_more_score
2025-05-06 18:21:55 +08:00
status102
558746add6 docs: 连战次数auto 文档 2025-05-06 18:11:32 +08:00
status102
d51895af57 fix: 连战次数修复, 减少hard code 2025-05-06 18:11:31 +08:00
Constrat
512ffa55bb ci: revert all markdown checker changes
nothing worked anyway

[skip changelog]
2025-05-06 11:21:38 +02:00
Constrat
56f2b35ea7 ci: try with action token:
[skip changelog]
2025-05-06 11:20:27 +02:00
Constrat
3086cee0cc ci: duplicate env keyword github_token
[skip changelog]
2025-05-06 11:12:12 +02:00
Constrat
66577b193c ci: reimplement contents: read
[skip changelog]
2025-05-06 11:08:18 +02:00
Constrat
35f28a7c29 ci: change to force --github-token
[skip changelog]
2025-05-06 11:07:22 +02:00
Constrat
245279711d ci: lychee dead links
[skip changelog]
2025-05-06 11:04:19 +02:00
Yoake
979f6699cc Reapply "feat:实现自适应调整连战次数 (#12555)"
This reverts commit 7359653317.

移除不相关的文件修改

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-05-06 16:57:04 +08:00
status102
7359653317 Revert "feat:实现自适应调整连战次数 (#12555)"
This reverts commit 254db83bf6.

Revert "chore: 新增 AUTO 选项"

This reverts commit 722302bc28.

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

This reverts commit 22f88ef718.

Revert "chore: 连战新增 -1 表示禁用切换"

This reverts commit 4debf210bd.
2025-05-06 16:55:26 +08:00
uye
f311f8525e docs: 补上之前漏改的 tasks 路径修改 2025-05-06 16:03:22 +08:00
uye
4debf210bd chore: 连战新增 -1 表示禁用切换 2025-05-06 14:27:06 +08:00
uye
1eeae5326f chore: 优化提示 2025-05-06 11:05:21 +08:00
Lucien Shaw
ce3624cfbb docs: 更正保全派驻协议文档中的拼写错误 (#12578) 2025-05-06 10:51:19 +08:00
Lucien Shaw
632447e8d3 docs: 更正主文档和中文文档中的两处错别字 (#12577)
* docs: 更正中文文档中的一处拼写错误

将docs/zh-cn/readme.md中的“高姿”改为“高资”

* docs: 更正主文档中的一处拼写错误

在README.md中,将一处“高姿”修改为“高资”
2025-05-06 09:22:51 +08:00
uye
a5917adc1c Release v5.16.2 (#12568) 2025-05-06 01:38:43 +08:00
Constrat
c86ea9fa12 docs: changelog EN tweak 2025-05-05 19:26:32 +02:00
Constrat
539e2b48b2 fix: github change string to int (#12574) 2025-05-05 19:18:29 +02:00
uye
58c2c6eccd docs: update changelog 2025-05-06 00:17:23 +08:00
uye
8eb49dc463 Revert "feat: 更新 CHANGELOG.md"
This reverts commit a47b1d427b.
2025-05-06 00:12:57 +08:00
uye
cd44b22b8c Revert "feat: 更新 CHANGELOG.md"
This reverts commit e89e3d3f35.
2025-05-06 00:12:51 +08:00
uye
1f7b675d04 fix: 无法进入中枢 2025-05-06 00:03:35 +08:00
AnnAngela
e89e3d3f35 feat: 更新 CHANGELOG.md 2025-05-05 22:31:53 +08:00
AnnAngela
a47b1d427b feat: 更新 CHANGELOG.md 2025-05-05 22:24:48 +08:00
uye
774cc6d6fe docs: Update CHANGELOG.md 2025-05-05 22:23:50 +08:00
uye
c740e71900 docs: Update CHANGELOG.md 2025-05-05 22:18:21 +08:00
uye
a73eb5d52d docs: Update CHANGELOG.md 2025-05-05 22:01:38 +08:00
uye
7dfae900f1 chore: 简化定时器判断 2025-05-05 21:20:09 +08:00
Constrat
edb5e0f7fc docs: english changelog fixes
[skip changelog]
2025-05-05 14:56:58 +02:00
AnnAngela
e9f0353d01 ci: 使用 GITHUB_TOKEN 2025-05-05 20:33:52 +08:00
AnnAngela
bc734f288b ci: 使用缓存避免429 2025-05-05 20:24:49 +08:00
AnnAngela
89f4d927a4 feat: Update CHANGELOG.md [skip changelog] 2025-05-05 19:56:27 +08:00
AnnAngela
54c434c547 feat: Update CHANGELOG.md [skip changelog] 2025-05-05 19:55:36 +08:00
AnnAngela
bb0d148fae feat: Update CHANGELOG.md [skip changelog] 2025-05-05 19:55:20 +08:00
AnnAngela
cd42686824 feat: Update CHANGELOG.md [skip changelog] 2025-05-05 19:54:20 +08:00
github-actions[bot]
7c9b12113f docs: Auto Update Changelogs of v5.16.2 (#12571)
* docs: Auto Generate Changelog of Release v5.16.2

* feat: Update CHANGELOG.md

* i18n: EN Changelog

* feat: 更新 CHANGELOG.md

* feat: 更新 CHANGELOG.md

* i18n: EN Changelog sanity update

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-05-05 19:24:51 +08:00
pre-commit-ci[bot]
22f88ef718 chore: Auto update by pre-commit hooks [skip changelog] 2025-05-05 09:05:58 +00:00
uye
722302bc28 chore: 新增 AUTO 选项 2025-05-05 17:03:35 +08:00
Constrat
188e55450a i18n: english clarification for operbox) 2025-05-05 10:22:34 +02:00
Constrat
df2edc4bd4 chore(tools): update ignore templates
[skip changelog]
2025-05-05 10:12:03 +02:00
uye
c9672599a0 perf: 优化干员识别 (#12562)
* perf: 优化干员识别

* fix: typo
2025-05-05 16:02:34 +08:00
uye
6c80f26542 chore: 修改错误提示 2025-05-05 15:54:22 +08:00
KirinBaka
7cd6873085 fix: correct variable name typo in cur_score (#12552)
Fixed typo in variable name 'cur_score' (misspelled 'cur_socre')
2025-05-05 15:45:58 +08:00
Yoake
254db83bf6 feat:实现自适应调整连战次数 (#12555)
* feat:实现自适应调整连战次数

* fix: redundant operation

* fix: 掉落物回报、理智回报失效

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

* fix: typo

* feat: 添加无理智药时的识别

* chore: 删除无用 include

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

* chore: 异常时返回 -1

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-05-05 15:07:38 +08:00
HX3N
6b6bed6c4d chore: YostarKR Infrast and texts (#12561)
* chore: InfrastCloseQuickFormationExpandRole

* i18n: tweak some translation and add mini game tip
2025-05-04 16:17:21 +02:00
github-actions[bot]
c11543f5a4 chore: Auto Templates Optimization
Triggered by 31cc95fb7f

[skip changelog]
2025-05-04 11:49:52 +00:00
uye
31cc95fb7f fix: 无法进入中枢 2025-05-04 19:49:28 +08:00
github-actions[bot]
457ffe67de chore: Auto Templates Optimization
Triggered by d53509ff06

[skip changelog]
2025-05-04 08:55:09 +00:00
Constrat
d53509ff06 chore: add templates for #12556 and i18n for minigame 2025-05-04 10:45:36 +02:00
Manicsteiner
6d8a4c7a5b chore: YostarJP infrast and texts (#12559) 2025-05-04 10:41:09 +02:00
uye
e2c19995c2 fix: 基建选人前收起职业栏 (#12556)
* fix: 基建选人前收起职业栏

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

* 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-05-04 14:14:54 +08:00
Constrat
3f10c972cd chore: update ignore templates 2025-05-03 20:57:25 +02:00
Constrat
d3730cc0da chore: remove typos from ignore templates
[skip changelog]
2025-05-03 20:55:24 +02:00
uye
b5b357938e docs: Update CHANGELOG.md 2025-05-04 01:05:11 +08:00
uye
805b76f113 Release v5.16.1 (#12547) 2025-05-04 01:01:37 +08:00
github-actions[bot]
4c5ae67063 docs: Auto Update Changelogs of v5.16.1 (#12550)
* docs: Auto Generate Changelog of Release v5.16.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-05-04 01:01:07 +08:00
uye
8a97330be3 fix: 修正描述 2025-05-04 00:59:13 +08:00
Lemon-miaow
623e542f45 fix: 修复GetImageFromROI小工具以适配多文件tasks结构 2025-05-04 00:16:54 +08:00
APeng215
7350401ddd fix: 修复开发者帮助文档内的 Typo (#12549)
* 修复开发者帮助文档内的 Typo(简体中文)

* 修复开发者帮助文档内的 Typo(繁体中文)
2025-05-03 23:49:20 +08:00
Constrat
c4db21dd2b chore(tools): ignore list templates for global 2025-05-03 17:22:38 +02:00
status102
d713ca59e3 chore: 调整简中繁中一键轮换说明 2025-05-03 22:02:32 +08:00
status102
b3203ad848 perf: VC++执行安装脚本暴露错误 2025-05-03 21:52:18 +08:00
github-actions[bot]
89a42be269 chore: Auto Templates Optimization
Triggered by 218e9ec31a

[skip changelog]
2025-05-03 05:48:49 +00:00
uye
218e9ec31a fix: 无法切换连战次数 2025-05-03 13:48:31 +08:00
github-actions[bot]
ba26b64b22 chore: Auto Update Game Resources - 2025-05-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14808017611

[skip changelog]
2025-05-03 05:45:04 +00:00
uye
33b54e81b0 fix 不能正确选择干员CONFESS-47
fix #12543
2025-05-03 13:41:45 +08:00
uye
cb64ca4b13 fix: 修复一键轮换模式未勾选设施导致功能异常问题
fix #12542
2025-05-03 13:38:23 +08:00
uye
e6549f0bf6 chore: 添加渐变附加属性 2025-05-03 12:54:14 +08:00
uye
5466678785 chore: 移除干员识别测试说明 2025-05-03 11:56:36 +08:00
uye
8f279dc1b4 chore: 移除 depot 测试提示 2025-05-03 11:53:43 +08:00
uye
60c83e78e1 chore: depot 图片只在 debug 模式下保存 2025-05-03 11:52:19 +08:00
github-actions[bot]
e63de8df32 chore: Auto Templates Optimization
Triggered by 053e11c9ba

[skip changelog]
2025-05-02 16:29:11 +00:00
uye
053e11c9ba fix: 未展开职业分组时编队错误
fix #12529
2025-05-03 00:28:47 +08:00
Constrat
fbf48ebefd feat(resourceupdater): double int and string map lookup for infrast_data 2025-05-02 10:33:09 +02:00
uye
7ef4343f16 chore: 优化赠送单抽逻辑 2025-05-02 09:41:38 +08:00
uye
3e75ec507f chore: All mirrors are not available 时日志栏显示更新失败 2025-05-02 00:58:49 +08:00
uye
94a0a4d916 fix: 更新未切换基建模式会导致变回常规模式 2025-05-01 22:43:22 +08:00
github-actions[bot]
ca605edffd docs: Auto Update Changelogs of v5.16.0 (#12503)
* docs: Auto Generate Changelog of Release v5.16.0

* docs: Update CHANGELOG.md

* feat: Update CHANGELOG.md

* feat: Update CHANGELOG.md

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>

* feat: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-05-01 21:52:27 +08:00
uye
7177e48d5c Release v5.16.0 (#12501) 2025-05-01 21:51:08 +08:00
Constrat
14c809a9ac fix: map classifyType bypass for global (until gamedata change as well) 2025-05-01 15:43:07 +02:00
uye
ad4f4a93c0 chore: classifyType 映射 2025-05-01 21:18:00 +08:00
Constrat
5add3a5d8a fix(resourceupdater): change roomType to int for infraststructure gamedata 2025-05-01 14:49:25 +02:00
Constrat
f3f8264b53 chore: arknights tile pos resources + battle data 2025-05-01 14:17:04 +02:00
github-actions[bot]
3e30750da7 chore: Auto Templates Optimization
Triggered by 715c2c13b5

[skip changelog]
2025-05-01 11:19:42 +00:00
uye
715c2c13b5 fix: 神秘的鹰小姐修改了他的干员职业图标亮度 2025-05-01 19:19:15 +08:00
Constrat
8d02395657 chore: MT stages for Official 2025-05-01 13:14:36 +02:00
Hao Guan
824d3bfebe feat(mac): 争锋频道:青草城 2025-05-01 19:07:46 +08:00
Constrat
88a0b97224 chore: manually update version.json 2025-05-01 12:23:53 +02:00
github-actions[bot]
d6f73bc753 chore: Auto Templates Optimization
Triggered by d1c09cc01a

[skip changelog]
2025-05-01 10:20:08 +00:00
Constrat
d1c09cc01a chore: Manual update resources 2025-05-01 12:19:43 +02:00
uye
d65cde7574 fix: 适配新基建 (#12500)
* fix: 适配新基建

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

* 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-05-01 18:08:34 +08:00
uye
afaeb011cf chore: 不启用外部通知时隐藏可选项 2025-05-01 18:05:08 +08:00
SherkeyXD
fa42a0880e fix: 修正送抽任务 2025-05-01 16:35:10 +08:00
SherkeyXD
2a32052ab0 feat: 特殊月卡扩大识别范围 2025-05-01 16:30:22 +08:00
SherkeyXD
1dba23a93e feat: 幸运墙适配六周年 2025-05-01 16:24:14 +08:00
SherkeyXD
9592b1fd40 feat: SideStory「众生行记」导航 2025-05-01 16:22:23 +08:00
uye
6deea622bd chore: 优化训练室和加工站进站逻辑 2025-05-01 15:13:43 +08:00
BxFS
503d653330 fix: CheckLevelMax too fast without delay (#12498) 2025-05-01 08:35:44 +02:00
uye
fe5744f328 fix: 构建日期显示错误 2025-05-01 14:00:47 +08:00
github-actions[bot]
abcc3ba100 chore: Auto Update Game Resources - 2025-04-30
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14763354859

[skip changelog]
2025-04-30 20:06:50 +00:00
uye
0b058bb0d9 fix: 下载源选择 MirrorChyan 时如果关闭自动下载,手动点击软件更新无提示 2025-05-01 01:16:03 +08:00
Plumess
c62d2ac4f8 feat: 更新技能识别模型,采用更全面的数据集训练 (#12490)
使用更全面的数据集对模型进行了重训练,包括了有计划的主线、SideStory、肉鸽等场景。
2025-04-30 23:12:24 +08:00
uye
9a81315b7f docs: 移除过期描述 2025-04-30 15:55:43 +08:00
BxFS
42f9b80be3 fix: EN RoutingRefreshNodeConfirm roi too small (#12491) 2025-04-30 13:45:14 +08:00
uye
57cde24e99 Release v5.16.0-beta.1 (#12488) 2025-04-29 22:27:55 +08:00
github-actions[bot]
f775b2a551 docs: Auto Update Changelogs of v5.16.0-beta.1 (#12489)
docs: Auto Generate Changelog of Release v5.16.0-beta.1

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-04-29 22:26:31 +08:00
uye
756f352c02 fix(BREAKING CHANGE): RecruitSupportOperator 拼写错误 2025-04-29 19:49:54 +08:00
uye
f574b14ed4 fix: vc++ 检测移动至文件检测后 2025-04-29 19:49:54 +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
github-actions[bot]
62b72b0faa chore: Auto Templates Optimization
Triggered by c988b7463d

[skip changelog]
2025-04-29 08:35:43 +00:00
BxFS
c988b7463d fix: EN RoutingRefreshNode dimension too large (#12484) 2025-04-29 10:28:54 +02:00
HX3N
ee281863ff fix: KR RoutingRefreshNode dimension too large (#12487)
* fix: KR RoutingRefreshNode dimension too large

* chore: height changed to 16px

* chore: changed template to improve recognition score
2025-04-29 10:28:49 +02:00
Constrat
08f78a3151 chore: ignore templates for global 2025-04-29 10:21:15 +02:00
Plumess
af34bb6a6f feat: 优化技能识别模型 (#11984)
* chore: 更新技能识别测试例 test_skill_ready()

1. 由于更新了技能识别为三分类模型,新增”可取消“类别,增加相关类别的测试;
2. 扩充了输出信息,便于Debug;

* feat: 调整技能识别推理函数,支持新的三分类模型

1. 新的三分类模型基于MobileNetv4训练并导出onnx,详情参考MaaAI仓库中的技能识别训练代码;
2. 新增”可取消“分类,标签为c,但暂不启用区分,与”未就绪“同样归于not ready;
3. 新增了部分前处理操作,以匹配模型的输入;

* perf: 使用 MobileNetv4 Small 重新训练了技能识别模型,改为三分类

新增”可取消“状态,即技能可能处于”可取消“,”未就绪“,”已就绪“三种状态;
新的三分类模型基于MobileNetv4 Conv Small 训练并导出,详情参考MaaAI仓库中的技能识别训练代码;

* feat: 调整技能识别自动截图,支持三分类

新增在debug模式下对”可取消“新类别的截图保存功能;

* chore: 存储截图时打印分数

* chore: 使用 ranges

* perf: 使用新训练集,基于官方mobilenetv4_conv_small的权重进行微调

16000张左右的训练集,在3000张测试集中准确率99.7%

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-29 14:30:24 +08:00
Daydreamer114
0e5ed3be50 perf: 修改小游戏描述 2025-04-29 11:48:00 +08:00
Constrat
6f3bc269d6 i18n: EN tweak
[skip ci] [skip changelog]
2025-04-28 15:24:37 +02:00
Constrat
68d7ac593b i18n: EN tweak
[skip ci] [skip changelog]
2025-04-28 14:39:58 +02:00
萨拉托加
ab664d74fb Release v5.15.6 (#12478) 2025-04-28 20:10:51 +08:00
github-actions[bot]
aba41f09c0 docs: Auto Update Changelogs of v5.15.6 (#12479)
* docs: Auto Generate Changelog of Release v5.15.6

* feat: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
2025-04-28 19:10:22 +08:00
github-actions[bot]
2dc6745fdb chore: Auto Update Game Resources - 2025-04-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14705082471

[skip changelog]
2025-04-28 09:59:59 +00:00
晓丶梦丶仁
5820fb202d feat: 争锋频道:青草城 (#12470)
* feat: 争锋频道:青草城

* fix: end

* fix: 鸭宝不在

* perf: 公开 wpfgui 的自定义任务

* Revert "perf: 公开 wpfgui 的自定义任务"

This reverts commit 536864caa2.

* feat: 加一个丑爆了的界面

* chore: 修改描述

* chore: 修改描述

* chore: 统一按钮大小

* chore: 添加停止功能

* chore: 添加停止按钮

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-28 17:34:06 +08:00
uye
cba20d7835 fix: 连战次数无法保存 2025-04-28 17:19:52 +08:00
status102
81f8ad902d fix: 漏了一个 2025-04-28 15:33:45 +08:00
status102
426d76ee50 rft: Wpf长草任务添加部分解耦 2025-04-28 14:49:44 +08:00
status102
dd82fa0075 chore: meoJson update to v4.3.4 (#12460)
* chore: meoJson update to v4.3.2

* chore: meoJson update to v4.3.4
2025-04-28 14:31:12 +08:00
github-actions[bot]
91b53a4b73 chore: Auto Update Game Resources - 2025-04-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14699190648

[skip changelog]
2025-04-28 02:54:50 +00:00
status102
12fc5bbde3 perf: move
[skip changelog]
2025-04-27 23:42:47 +08:00
status102
6cfab2c1f0 perf: Task加载检查前重复任务 2025-04-27 23:36:55 +08:00
Constrat
730b9b2ad9 fix: move operator Flint in front of item Flint (点火石) for EN 2025-04-27 16:10:22 +02:00
Constrat
ddbf647524 feat: Sarkaz IS EN squads DLC 1 2025-04-27 15:37:26 +02:00
status102
6e9ef3c66e chore: ConfigurationHelper.GetValue增加enum, DeleteValue额外返回旧值 2025-04-27 19:43:58 +08:00
Constrat
1ad6f70b55 fix: Fang Alter EN OCR 2025-04-27 10:21:34 +02:00
Constrat
9e990c337a fix: Alter operators for EN 2025-04-27 10:15:03 +02:00
uye
8733055e83 Release v5.15.5 (#12466) 2025-04-27 03:23:17 +08:00
github-actions[bot]
e8885dc095 docs: Auto Update Changelogs of v5.15.5 (#12467)
* docs: Auto Generate Changelog of Release v5.15.5

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-27 03:21:19 +08:00
uye
0d140c1b46 fix: 无法热更 2025-04-27 03:17:01 +08:00
uye
1f29f9dc16 fix: MaaCore.vcxproj 2025-04-27 01:37:33 +08:00
uye
505ba76fea fix: DEBUG 加载错误 2025-04-27 01:37:33 +08:00
SherkeyXD
e76e95c0a4 rft: rename base stage 2025-04-27 00:11:50 +08:00
github-actions[bot]
aff4ef43fa chore: Auto Update Game Resources - 2025-04-26
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14682880925

[skip changelog]
2025-04-26 16:05:59 +00:00
SherkeyXD
e4aa506cb4 fix: BB task fix 2025-04-26 23:57:41 +08:00
Sherkey Asher
7c5fe215ac Release v5.15.4 (#12463) 2025-04-26 23:36:49 +08:00
github-actions[bot]
ced3843c4b docs: Auto Update Changelogs of v5.15.4 (#12464)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Sherkey Asher <57581480+SherkeyXD@users.noreply.github.com>
2025-04-26 23:26:26 +08:00
github-actions[bot]
5f30226d99 chore: Auto Update Game Resources - 2025-04-26
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14681959054

[skip changelog]
2025-04-26 14:05:34 +00:00
github-actions[bot]
2e30ef6169 chore: Auto Templates Optimization
Triggered by 3b0093c13c

[skip changelog]
2025-04-26 13:54:30 +00:00
SherkeyXD
3b0093c13c feat: 六周年月卡 2025-04-26 21:53:34 +08:00
HX3N
3416a47b26 fix: YostarKR OrundumActivitiesConfirm add ocrReplace 2025-04-26 17:53:19 +09:00
status102
d646af45ca chore: meojson调试增强 2025-04-26 15:27:27 +08:00
Constrat
c69fd51bc9 docs: add ADB connection tip for bluestacks and ldplayer 2025-04-25 18:12:05 +02:00
Constrat
4fb83a9bca fix: missing roguelike sami writer to json for resource updater 2025-04-25 17:26:27 +02:00
BxFS
abf69a9c63 fix: 定时执行tooltip修正 (#12453)
fix: TimerSettings CheckBox ToolTip CheckBoxesNotSaved->CheckBoxesNotSavedAsNull
2025-04-25 22:43:42 +08:00
HX3N
436643db9c chore: YostarKR IS5 squads and ocr update (#12455) 2025-04-25 16:42:38 +02:00
Constrat
1311a40126 style: resource updater 2025-04-25 16:40:17 +02:00
github-actions[bot]
dc49df6c0d chore: Auto Update Game Resources - 2025-04-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14666981411

[skip changelog]
2025-04-25 14:32:16 +00:00
Constrat
209902466a Revert "chore: Auto Update Game Resources - 2025-04-25"
This reverts commit 317a0d5224.
2025-04-25 16:29:23 +02:00
Constrat
6f0426b285 chore: use sami json for gain and user ocr in resource updater 2025-04-25 16:29:09 +02:00
github-actions[bot]
317a0d5224 chore: Auto Update Game Resources - 2025-04-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14666833323

[skip changelog]
2025-04-25 14:25:29 +00:00
Constrat
193525cacb chore: YostarKR ocr fix
------

Co-Authored-by: HX3N <scarlet7518@gmail.com>
2025-04-25 16:20:56 +02:00
Constrat
e32b526e81 fix: main.cpp post refactor merge 2025-04-25 16:13:48 +02:00
Constrat
96751335d3 chore: add big tasks refactoring to blame ignore 2025-04-25 15:42:19 +02:00
Constrat
2e6df0af8e chore: remove duplicate tasks from main json of KR and JP 2025-04-25 15:38:58 +02:00
Constrat
43d13f5aaf chore: remove debug task from IS EN
[skip ci]
2025-04-25 15:12:46 +02:00
Constrat
6c405da322 chore: YostarJP IS5 squads update
---------

Co-authored-by: Manicsteiner <63437036+Manicsteiner@users.noreply.github.com>
2025-04-25 15:00:38 +02:00
Constrat
dce6e317c8 rft: tasks (#12448)
* rft: tasks

* chore: remove older tasks.json

* rft: move some stages

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

* rft: rename

---------

Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-04-25 18:31:37 +08:00
status102
fdc76bc5b5 feat: VC++可用性检查 (#12445)
* feat: VC++可用性检查

* i18n: too low

terrain
2025-04-25 15:59:51 +08:00
uye
2f8840feac chore: to utc time 2025-04-25 15:36:07 +08:00
HX3N
f98a595620 i18n: KR translation tweak
[skip changelog]
2025-04-25 13:24:55 +09:00
Constrat
2a7729074a chore: remove dupes from resource updater I.S. stages 2025-04-24 20:31:33 +02:00
github-actions[bot]
40e607c98f chore: Auto Update Game Resources - 2025-04-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14648860019

[skip changelog]
2025-04-24 18:25:57 +00:00
Constrat
351395f5b9 fix: txwy resource updater recruitment 2025-04-24 20:22:55 +02:00
Constrat
3e38b59f0c chore: add more text for OrundumActivities EN 2025-04-24 19:26:15 +02:00
uye
079932e34c Release v5.15.3 (#12420) 2025-04-25 00:09:06 +08:00
uye
9666b4a42b docs: Update CHANGELOG.md 2025-04-25 00:07:51 +08:00
Manicsteiner
8779c867bf chore: YostarJP ocr fix (#12447) 2025-04-25 00:03:38 +08:00
uye
d10c90bc79 feat: 使用 mumu 网络桥接时通过填写的实例号关闭模拟器 2025-04-24 23:24:29 +08:00
萨拉托加
ac83069b99 chore: issue模板添加使用生成日志压缩包按钮提示 (#12386)
* chore: issue模板添加使用生成日志压缩包按钮提示

* chore: Update cn-ld-report.yaml

* chore: Update cn-mumu-report.yaml

* chore: Update en-bug-report.yaml
2025-04-24 22:31:32 +08:00
status102
8077d73a9b docs: changelog 2025-04-24 18:02:15 +08:00
Rbqwow
e5357e7dd7 feat: 优化官网动画效果 (#12432)
优化友链列表出现消失动画
为底部许可证文本添加动画
修复点击查看全部后按钮乱跳
整理注释
2025-04-24 17:31:59 +08:00
github-actions[bot]
f87be175e1 docs: Auto Update Changelogs of v5.15.3 (#12441)
* docs: Auto Generate Changelog of Release v5.15.3

* feat: changelog

* docs: Update CHANGELOG.md

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-24 17:26:32 +08:00
HY
316dd9a005 chore: 繁中服「太陽甩在身後」活動導航 (#12444)
* chore: 繁中服「太陽甩在身後」活動導航

* chore: 補充許願牆的 text
2025-04-24 17:11:46 +08:00
github-actions[bot]
6f07b16388 chore: Auto Update Game Resources - 2025-04-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14636183461

[skip changelog]
2025-04-24 07:43:55 +00:00
github-actions[bot]
b59b42345a chore: Auto Update Game Resources - 2025-04-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14635512901

[skip changelog]
2025-04-24 07:06:30 +00:00
uye
f80ec0b232 style: 丢失的空格
[skip changelog]
2025-04-24 14:38:23 +08:00
uye
0cab88a1fb feat: 添加任务超时提示 (#12430)
* test: 添加 block 任务

* feat: 添加任务超时提醒

* feat: 外部通知添加超时提醒

* chore: 提示时间改为四舍五入

* chore: 外部通知额外输入最后五条日志

* chore: 调整日志输出日期
2025-04-24 09:54:40 +08:00
Hao Guan
f5b8fe18e1 fix(mac): 仅公招识别配置(#12161)
feat(mac): 商店列表界面改进
2025-04-23 14:03:50 +08:00
uye
8fb76030b2 chore: 优化运行库下载脚本 2025-04-22 19:59:45 +08:00
github-actions[bot]
0234f2d274 chore: Auto Update Game Resources - 2025-04-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14593234281

[skip changelog]
2025-04-22 11:05:38 +00:00
github-actions[bot]
018955d010 chore: Auto Update Game Resources - 2025-04-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14591436939

[skip changelog]
2025-04-22 09:29:17 +00:00
Constrat
ed361efcd3 chore: YostarEN PV preload 2025-04-22 11:21:17 +02:00
uye
08665869ea chore: 员工守则 2025-04-22 17:18:46 +08:00
HX3N
2b0ad53830 chore: YostarKR PV preload (#12431) 2025-04-22 11:17:38 +02:00
Manicsteiner
f5010a3681 chore: YostarJP PV preload (#12429) 2025-04-22 14:32:07 +08:00
status102
072592c49a perf: 任务列表查副本
fix #12426
2025-04-22 11:19:08 +08:00
uye
45e55c0eaf chore: 拆分任务完成后通知 2025-04-22 10:15:17 +08:00
萨拉托加
d32ed24879 chore: 添加保全派驻作业 (#12423)
* chore: Rename

* chore: 添加保全派驻作业

* 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-04-21 22:42:49 +08:00
github-actions[bot]
8c83b5e2d2 chore: Auto Templates Optimization
Triggered by 8a33102408

[skip changelog]
2025-04-21 14:01:50 +00:00
uye
8a33102408 chore: 新增 15 章导航 2025-04-21 22:01:24 +08:00
MistEO
432a51a238 fix: 修正官网域名 2025-04-21 18:44:42 +08:00
MistEO
39dce2a0e1 docs: 移除 MaaX 相关说明 2025-04-21 18:12:05 +08:00
github-actions[bot]
c58e0a0e92 chore: Auto Update Game Resources - 2025-04-21
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14570494553

[skip changelog]
2025-04-21 08:47:29 +00:00
MistEO
5e30ffc714 ci: Delete trigger that are no longer needed 2025-04-21 13:57:57 +08:00
github-actions[bot]
68a5ef3f85 chore: Auto Update Game Resources - 2025-04-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14563291382

[skip changelog]
2025-04-20 21:04:59 +00:00
github-actions[bot]
d1bb221096 chore: Auto Update Game Resources - 2025-04-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14562878694

[skip changelog]
2025-04-20 20:05:36 +00:00
SherkeyXD
0743e1773b style: 优化部分文件排版 2025-04-20 21:27:47 +08:00
uye
fafd1970be chore: 修改存在更新时的问题反馈界面描述 2025-04-20 20:50:49 +08:00
Constrat
446ec8b8f6 style: precommit clang? 2025-04-20 11:26:52 +02:00
status102
07e561fae8 perf: wpf反馈压缩包分离日志和配置 2025-04-20 16:46:22 +08:00
status102
d42a8ba42e chore: MaaCore日志文件占用缓解, 取消大小限制 2025-04-20 16:46:15 +08:00
uye
86a861f1c1 fix: fix debug
[skip changelog]
2025-04-20 16:33:08 +08:00
uye
73801e5eae chore: 提取 helper 方法 2025-04-20 16:31:29 +08:00
uye
085444f25f chore: 修改版本更新提示逻辑 2025-04-20 15:48:04 +08:00
uye
81f6540170 chore: 添加模拟器路径为空的提示 2025-04-20 15:28:44 +08:00
Constrat
66d49a7e81 ci: bump oxi, clang, prettier, markdownlint (#12388)
* ci: bump oxi, clang, prettier, markdownlint

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

* chore: 移除不再使用clang-format的JSON文件

* chore: clang-format disable

* chore: clang版本更新

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

* chore: ver注释

* docs: Modify the clang-format version restriction in the documentation to match the current changes

@zzyyyl

---------

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-04-20 09:42:41 +08:00
MistEO
9982545c99 chore: 调整友链弹窗最大高度 2025-04-20 03:03:06 +08:00
github-actions[bot]
eaf3b93c8e chore: Auto Templates Optimization
Triggered by e29d506cf2

[skip changelog]
2025-04-19 17:47:45 +00:00
MistEO
e29d506cf2 perf: image size 2025-04-20 01:47:10 +08:00
github-actions[bot]
e4e9c8264c chore: Auto Templates Optimization
Triggered by 7204d0f62a

[skip changelog]
2025-04-19 16:34:48 +00:00
MistEO
7204d0f62a feat: 整理官网友链列表,添加Mirror酱友链 2025-04-20 00:33:48 +08:00
Rbqwow
60308846f3 feat: 官网友链改为按钮 (#12400)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-04-20 00:11:34 +08:00
status102
e8717c0936 perf: enumerable 2025-04-19 23:58:14 +08:00
status102
786518917c fix: 刷理智参数更新崩溃 2025-04-19 23:56:58 +08:00
MistEO
91195d3c02 chore: 官网使用Mirror酱新链接 2025-04-19 23:19:30 +08:00
Aliothmoon
09608430a9 fix: 移除官网的PerformanceMonitor (#12411)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
2025-04-19 23:15:22 +08:00
Aliothmoon
f09e4de87e fix: 下载状态文本适配浅色模式 (#12410)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-04-19 23:15:11 +08:00
uye
d306941c4f fix: 从其他界面进入仓库识别任务时可能卡在主界面 2025-04-19 21:09:44 +08:00
Rbqwow
288fa379d3 fix: 修复某些情况下官网本地开发服务器拒绝连接的问题 (#12401)
https://github.com/vercel/turborepo/issues/7279

[skip changelog]
2025-04-19 20:37:29 +08:00
github-actions[bot]
66c9e3c65c chore: Auto Templates Optimization
Triggered by f2586ec7fe

[skip changelog]
2025-04-19 10:28:45 +00:00
uye
f2586ec7fe fix: SelectClue 任务 roi 与模板图片不匹配
fix #12404
2025-04-19 18:24:29 +08:00
Constrat
63a30d96f6 fix: discord logo on website 2025-04-19 11:40:16 +02:00
HX3N
99db411ea6 chore: KR remove ocrReplace in RoguelikeChooseSupportBtnOcr
RoguelikeChooseSupportBtnOcr does not use ocrReplace
2025-04-19 17:57:53 +09:00
HX3N
b330cb465b fix: KR Recruit Support Unit regex 2025-04-19 15:53:25 +09:00
MistEO
3c76830ad5 feat: 调整官网首页按钮 2025-04-19 13:45:43 +08:00
uye
2b87578d53 chore: lastUpdateTime -> stageAndTasksUpdateTime (#12393) 2025-04-19 13:26:05 +08:00
MistEO
a4420961ce feat: web cache (#12403) 2025-04-19 13:08:56 +08:00
uye
4d76fabd77 feat: LoadResourceAndCheckRet 额外读取对应文件名_custom.json (#12382)
* feat: LoadResourceAndCheckRet 额外读取对应文件名_custom.json

* chore: 添加日志,问题反馈打包带上custom文件
2025-04-19 12:16:05 +08:00
Aliothmoon
457023106c feat: 调整按钮阴影 (#12398)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-04-19 00:14:23 +08:00
MistEO
e1b000631a feat: 更小杯的友情链接 2025-04-19 00:13:58 +08:00
MistEO
04531f33c7 chore: 官网友情链接更小一点 2025-04-18 23:42:20 +08:00
MistEO
d3d8e1a5cf feat: 超小杯友情链接 2025-04-18 23:37:41 +08:00
MistEO
deb5fa3044 feat: 官网按钮调整 2025-04-18 23:37:41 +08:00
status102
18a4a3fc31 docs: 自动战斗-自动编队 特别关注标记影响提示 中英文提示调整 2025-04-18 22:31:38 +08:00
Aliothmoon
3f5a7322e5 feat: 官网亮色模式 (#12396)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-04-18 21:29:15 +08:00
status102
fc4437183d docs: 自动战斗-自动编队 特别关注标记影响提示 中文提示特化修改 2025-04-18 19:13:53 +08:00
uye
1d8068daf0 fix: 在关闭系统通知后无法收到通知信息 2025-04-18 15:15:44 +08:00
uye
b0d14b4820 feat: MaaApiService 添加 etag 支持 2025-04-18 11:01:59 +08:00
uye
26caabb8d0 chore: 添加资源更新提示 2025-04-18 10:29:05 +08:00
uye
9443c835fa chore: 添加更新提示 2025-04-18 00:01:24 +08:00
Constrat
b981160487 chore: glt blame ignore for 9ed30c5658
[skip changelog]
2025-04-17 09:33:43 +02:00
Constrat
9ed30c5658 style: clang mass formatting 2025-04-17 09:32:58 +02:00
uye
cc7891c11d chore: 调整 include 顺序
[skip changelog]
2025-04-17 15:26:51 +08:00
uye
21f9864140 fix: 二次点击部署栏取消选中时,点击 y 坐标较小的 rect 2025-04-17 15:25:56 +08:00
status102
de2c50ec7e Revert "perf: 自动战斗待部署识别减少一次预识别"
This reverts commit 0839de2c94.
2025-04-17 12:40:47 +08:00
github-actions[bot]
c447ee3568 chore: Auto Templates Optimization
Triggered by 5727be3b3a

[skip changelog]
2025-04-17 03:25:30 +00:00
status102
5727be3b3a fix: 主线菜单导致刷理智无法吃药
fix #12364
2025-04-17 11:24:21 +08:00
status102
debcf92010 chore: 自动战斗待部署区识别未知干员已知问题标记
待部署区相同干员 (如 超重绝缘水泥) 会在关闭第一个时候, 可能错误展开第二个, 导致识别第二个时提前关闭第二个, 无法识别名字
2025-04-17 11:03:18 +08:00
status102
0839de2c94 perf: 自动战斗待部署识别减少一次预识别 2025-04-17 10:58:44 +08:00
status102
c9374383c1 rft: rename 2025-04-17 10:54:18 +08:00
status102
1c321bb313 rft: rename 2025-04-17 10:16:48 +08:00
status102
4d975a1633 fix: 自动战斗 保全水泥替换 2025-04-17 10:14:05 +08:00
uye
6137cc701b Release v5.15.2 (#12376) 2025-04-17 01:34:21 +08:00
github-actions[bot]
e15b95c084 docs: Auto Update Changelogs of v5.15.2 (#12380)
* docs: Auto Generate Changelog of Release v5.15.2

* docs: changelog

* chore: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[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-17 01:32:30 +08:00
uye
660bb141aa chore: 地图修完了
[skip changelog]
2025-04-17 01:11:09 +08:00
uye
d3981265bb fix: 新保全第六关地图错误 (#12381)
* chore: delete wrong file

* chore: Auto Update Game Resources - 2025-04-16

https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14497921439

[skip changelog]

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-04-17 00:41:43 +08:00
萨拉托加
d801be3fc1 chore: 新增 阿卡胡拉丛林 保全派驻作业 (#12375)
* chore: 新增 阿卡胡拉丛林 保全派驻作业

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

* chore: 更新黑名单

* 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-04-16 23:45:19 +08:00
uye
8abff51da2 chore: 修改保全文件描述
[skip changelog]
2025-04-16 23:31:21 +08:00
Sherkey Asher
28ad1f2816 docs: 优化文档 (#12361)
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
2025-04-16 22:22:29 +08:00
DL_君逸寒
6bbc15040a feat: 新增 尚蜀夜市 保全派驻作业 (#12374)
* feat: 新增 尚蜀夜市 保全派驻作业

feat: 新增 尚蜀夜市 保全派驻作业

* 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-04-16 22:22:05 +08:00
Constrat
86cbff2cab fix: EN SSS buffs regex 2025-04-16 15:26:28 +02:00
Weiyou Wang
c3dc7d3711 fix: 先取消暂停再取消选择 (#12369)
* fix: 先取消暂停再取消选择

* fix: 换个思路

* fix: 重新识别头像位置

* fix: 删除多余的判断

* fix: 保险起见加回来点东西

* fix: 第二遍点击后更新 name_image
2025-04-16 20:51:55 +08:00
status102
4e3b10ded7 perf: 基建干员选择滑动优化 2025-04-16 17:18:44 +08:00
BxFS
1a8e1bc989 feat: Background stretch modes (#12365)
* feat: Background stretch modes

* i18n: all language translations with ja-jp and ko-kr AI translated

* i18n: make thy name thy name

* chore: 优化显示效果

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-16 15:44:56 +08:00
晓丶梦丶仁
814d9a651f perf: old SSS copilot
[skip changelog]
2025-04-16 15:42:36 +08:00
DL_君逸寒
5c9a01be2a feat: 新增 尚蜀夜市、多索雷斯在建地块、荒地群兽音乐厅 保全派驻作业 (#12370)
* feat: 新增 尚蜀夜市 保全派驻作业

feat: 新增 尚蜀夜市 保全派驻作业

* feat: 新增 多索雷斯在建地块 保全派驻作业

feat: 新增 多索雷斯在建地块 保全派驻作业

* feat: 新增 荒地群兽音乐厅 保全派驻作业

feat: 新增 荒地群兽音乐厅 保全派驻作业

* feat: 新增 荒地群兽音乐厅 保全派驻作业

feat: 新增 荒地群兽音乐厅 保全派驻作业

* 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-04-16 15:36:23 +08:00
uye
13fa90a214 perf: 加快无基建技能干员选择速度,加快选择列表回正速度 (#12363)
* perf: 加快无基建技能干员选择速度,加快选择列表回正速度

* 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-04-16 15:34:07 +08:00
MistEO
ae9a1f1cf0 fix: tile resource (#12372)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-04-16 15:23:21 +08:00
uye
21bc191a96 fix: 导能元件界面更改 2025-04-16 14:48:55 +08:00
HX3N
aa754996f0 i18n: KR translation tweaks (#12366)
* i18n: KR translation tweaks

* chore: fix typo
2025-04-16 00:46:11 +08:00
ChingCdesu
631466cfff feat: 更新Mirror酱下载为按钮,保持动画一致 2025-04-15 23:51:37 +08:00
status102
3d64624ad4 chore: 自动战斗加点输出 2025-04-15 16:21:02 +08:00
Cerulime
76a007501a feat: 在肉鸽招募中增加m3作为群奶 (#12353)
* feat: 在肉鸽招募中增加m3作为群奶

* fix: 凯尔希和Mon3tr不同时招募(MAA无法区分召唤物)
2025-04-15 14:58:07 +08:00
hepari
cfad7fc743 docs: add glossary missing operator name (#12360) 2025-04-15 15:51:28 +09:00
github-actions[bot]
e99dcb3e10 chore: Auto Update Game Resources - 2025-04-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14444762975

[skip changelog]
2025-04-14 11:43:55 +00:00
github-actions[bot]
0b16a4fb26 chore: Auto Templates Optimization
Triggered by 8586c21312

[skip changelog]
2025-04-14 11:12:05 +00:00
uye
8586c21312 chore: 优化 OF-1 截图
fix #12351
2025-04-14 19:11:45 +08:00
github-actions[bot]
80aa7c3bee chore: Auto Update Game Resources - 2025-04-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14441778932

[skip changelog]
2025-04-14 09:06:48 +00:00
uye
3cb0a8ac08 chore: 删除多余逻辑
[skip changelog]
2025-04-14 13:48:56 +08:00
status102
40a614df0d fix: 刷理智掉落物指定参数异常检查 2025-04-14 13:42:48 +08:00
uye
30276f9c2d fix: 无法关闭线索窗口 2025-04-14 13:14:14 +08:00
uye
6c62cc373b chore: 优化界面显示 2025-04-14 12:32:57 +08:00
status102
31bf864f78 chore: blank line
[skip changelog]
2025-04-14 08:32:18 +08:00
status102
6196676eb3 fix: 移除battleHelper中的BestMatcher复用 (#12136)
* fix: 移除battleHelper中的BestMatcher复用

* fix: type

* fix: require
2025-04-14 08:29:35 +08:00
uye
856e2a140f Release v5.15.1 (#12348) 2025-04-14 00:56:42 +08:00
github-actions[bot]
d32f0c202f docs: Auto Update Changelogs of v5.15.1 (#12350)
* docs: Auto Generate Changelog of Release v5.15.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-14 00:56:24 +08:00
uye
cf496728a3 chore: 修改描述 2025-04-13 23:46:17 +08:00
uye
2f9c187916 chore: 新增更新源 tooltip 2025-04-13 23:38:09 +08:00
github-actions[bot]
a265d0c06b chore: Auto Templates Optimization
Triggered by 4a5c808e21

[skip changelog]
2025-04-13 11:40:50 +00:00
pre-commit-ci[bot]
4a5c808e21 chore: Auto update by pre-commit hooks [skip changelog] 2025-04-13 11:40:34 +00:00
uye
fab8731f50 chore: 优化自定义任务显示 2025-04-13 19:38:02 +08:00
uye
9eda7095e7 feat: CustomTasks 支持逗号、分号切割任务列表 (#12342)
* feat: CustomTasks 支持逗号、分号切割任务列表

* chore: Remove trailing comma

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>

* chore: 修改描述

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-04-13 19:26:32 +08:00
uye
ee29f65a8e fix: Connection lost 提前返回 false 2025-04-13 19:20:36 +08:00
github-actions[bot]
d2298e0105 chore: Auto Templates Optimization
Triggered by f0b318fed3

[skip changelog]
2025-04-13 11:15:23 +00:00
uye
f0b318fed3 chore: 优化线索选择逻辑 2025-04-13 19:14:58 +08:00
uye
68641758ab fix: 无法选中线索
fix #12346
2025-04-13 18:28:31 +08:00
uye
4302611bf7 chore: 支持实体机检测 2025-04-13 15:39:38 +08:00
uye
9310f2e204 chore: miss brackets 2025-04-13 14:26:24 +08:00
uye
3685dae146 fix: 雷电模拟器重新连接时误认为断开连接
fix #12345
2025-04-13 14:21:46 +08:00
github-actions[bot]
7ed3da2bee chore: Auto Templates Optimization
Triggered by edfb4ce73a

[skip changelog]
2025-04-13 05:35:09 +00:00
github-actions[bot]
edfb4ce73a chore: Auto Update Game Resources - 2025-04-13
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14426517162

[skip changelog]
2025-04-13 05:34:37 +00:00
status102
f679256612 feat: 配置增加全局键移除 & bool自动转换 2025-04-13 11:19:26 +08:00
uye
383c38831a chore: FightSeries use the same ROI for all clients 2025-04-12 23:43:50 +08:00
status102
c3dc844b9a fix: 自动战斗网络请求返回失败时,错误提示异常 2025-04-12 23:40:54 +08:00
status102
a7f909cad0 perf: wpf自动战斗增加启动失败时的log 2025-04-12 23:40:54 +08:00
bodayw
2df97627fe feat: 更新 243/153 极限效率一天四换排班表(20250412 修订) (#12337)
* feat: 更新 243 极限效率一天四换排班表(20250412 修订)

根据[公孙长乐 2025-04-12 新视频](https://www.bilibili.com/video/BV14XdXYCEqh/?t=127)制作。

Replacing Kal'tsit with Mon3tr...

* feat: 更新 153 极限效率一天四换排班表(20250412 修订)

Replacing Kal'tsit with Mon3tr
Use Thorns the Lodestar for the 2nd rotation in the Gold Factory
2025-04-12 23:07:02 +08:00
Manicsteiner
5d5492b018 fix: FightSeries for global (#12332) 2025-04-12 23:05:55 +08:00
Szzrain
741eaafee1 feat: 支持新 UI 的 OF-1 导航 (#12335)
* feat: 支持新 UI 的 OF-1 导航

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

* fix: breaking for global server etc. (Hopefully)

* fix: reset roi for non-CN server

* chore: as reviewed

* chore: fix as review

* fix: adjust roi of ClickChapterNewOverview

* fix: fix roi

* chore: adjust swipe time

* chore: 简化任务逻辑,修改任务模板,同步适配 OF-F3

* chore: 模板图不带文字

* 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>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-12 23:03:26 +08:00
status102
f0d7840b51 perf: 移除无效调用 2025-04-12 22:35:48 +08:00
status102
3d62daed59 fix: 非自定义关卡名情况下,未能移除不显示的关卡
fix #12331
2025-04-12 22:35:47 +08:00
status102
d85b69632f Revert "chore: 给剩余理智加个兜底"
This reverts commit 6db893a23d.
2025-04-12 22:35:41 +08:00
uye
c64c80b7fc fix: 点击开始行动三秒未进入备战界面导致二次点击
fix #12324
2025-04-12 20:36:35 +08:00
status102
875a8dbe65 ci: issue-checker顺带加一下新的反馈包名 2025-04-12 19:47:00 +08:00
status102
c3bf90dd44 ci: issue-checker 日志上传失败提示 2025-04-12 19:43:26 +08:00
uye
6db893a23d chore: 给剩余理智加个兜底 2025-04-12 17:43:13 +08:00
Constrat
db03ab5976 fix: trade post rewards post base update
fix #12333
2025-04-12 09:02:03 +02:00
Constrat
55721e9e35 feat: Guide enable ADB (#12329)
* feat: add xaml gui

* i18n: add resources

* i18n: KR

* i18n: zh-tw

* i18n: zh-cn

* chore: 既然繁体那边用中文了那这里也用中文好了

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
2025-04-12 11:03:20 +08:00
Constrat
3d7b7d5e58 chore: manual stages resources 2025-04-11 18:07:43 +02:00
Constrat
8971893e81 docs: fix punctuation for en-us 2025-04-11 17:35:39 +02:00
status102
af68ac46cf chore: file header & warning 2025-04-11 15:22:23 +08:00
HX3N
951ed330a8 chore: YostarKR InfrastReward ocr replace operator to trust
Replaced due to overlap between operator trust and operator morale
2025-04-11 12:34:35 +09:00
dependabot[bot]
3babe9d76e ci: bump apple-actions/download-provisioning-profiles from 3 to 4 in /.github/workflows in the github-actions group (#12225)
ci: bump apple-actions/download-provisioning-profiles

Bumps the github-actions group in /.github/workflows with 1 update: [apple-actions/download-provisioning-profiles](https://github.com/apple-actions/download-provisioning-profiles).


Updates `apple-actions/download-provisioning-profiles` from 3 to 4
- [Release notes](https://github.com/apple-actions/download-provisioning-profiles/releases)
- [Commits](https://github.com/apple-actions/download-provisioning-profiles/compare/v3...v4)

---
updated-dependencies:
- dependency-name: apple-actions/download-provisioning-profiles
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-04-11 05:35:14 +08:00
HX3N
adf6f1f80c fix: YostarKR InfrastReward ocr fix (#12317) 2025-04-10 22:34:53 +02:00
uye
ebaf3f9307 chore: 使用 MirrorChyan 进行软件更新时未处理 errorCode 显示 2025-04-11 01:57:02 +08:00
uye
60f0d56ddf chore: 顺序检查 2025-04-10 23:39:25 +08:00
uye
f94ddabeef chore: 弹窗加个文件名 2025-04-10 18:29:19 +08:00
pre-commit-ci[bot]
74f85680e8 chore: Auto update by pre-commit hooks [skip changelog] 2025-04-10 16:51:35 +08:00
status102
60f6b910cd feat: 自动战斗15章突袭难度适配 2025-04-10 16:51:35 +08:00
status102
e9bf062b55 chore: 自动战斗 战斗列表 关卡导航名允许覆盖 2025-04-10 16:51:35 +08:00
status102
4142896c82 perf: 背景图默认值修改为相对路径 2025-04-10 15:34:32 +08:00
status102
70398dda8b fix: Wpf一键长草任务栏设置按钮绑定报错 2025-04-10 15:34:31 +08:00
ChingCdesu
63bedace6e feat: mirror酱链接按照操作系统自动生成 2025-04-09 23:37:37 +08:00
Constrat
bc677b69ca fix: new Support GUI for EN
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/12285#issuecomment-2788133440
2025-04-09 16:24:59 +02:00
Rbqwow
3bb0833704 build: 更新文档主题库 (#11627)
* build: 更新网站依赖

* build:更新vphope版本

* build: 怎么忘记加这个了

* fix: 修复构建错误

* chore: fix Vite CJS Node API deprecated warning

* chore: log

* perf: turbo 添加文档 cache

* perf: 注释掉新版不读取的切换语言公告内容

但公告这个属性得留着 不留着就没有切换语言的弹窗了

* fix: 修复字体问题

* build: update package version

* docs: remove root locale

* docs: add author

* ci: update node version

* build: turbo一直叫我更新,于是我更新了

* docs: update package

* docs: 再见吧牛牛今晚我就要远航

* docs: fix root locale problem

* docs: remove unused command

* feat: 牛兮归来!

* build: update turbo

* chore: 语言提醒怎么又没了 加回来

---------

Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
2025-04-09 21:09:31 +08:00
uye
29dad9ac7f fix: 修复手动关闭模拟器导致的连接状态不一致问题
fix #12309
2025-04-09 19:10:57 +08:00
uye
ea29cc2c20 fix: 连战次数 2025-04-09 17:50:59 +08:00
Weiyou Wang
934f752820 fix: update deployment (#11959)
* fix: update deployment

* fix: 把 check_in_battle 加回来

* fix: misc

* fix: 逻辑取反了

* fix: typo

* refactor: 去掉不需要的 init 参数与重复的 check_in_battle 检查

* refactor: 注释

* fix: misc

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-09 17:46:01 +08:00
status102
bd28098db9 feat: 日志包一并打包gui配置文件 (#12310)
* feat: 日志包一并打包gui配置文件 (#12310)

* perf: 复制调整

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

---------

Co-authored-by: BxFS <15606086+BxFS@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-04-09 17:30:56 +08:00
status102
a1ff2a522d fix: Wpf刷理智连战次数UI为空 2025-04-09 17:29:28 +08:00
status102
7a329c8647 fix: task name
[skip changelog]
2025-04-09 17:12:46 +08:00
uye
f74a04155f perf: 热更新资源改为异步加载避免启动阻塞 2025-04-09 16:58:52 +08:00
status102
e95f5f5ad7 fix: 刷理智碎石时网络卡顿造成重复点击
fix #12290
2025-04-09 16:51:28 +08:00
status102
8ffc1a253d Revert "fix: 吃药/碎石 时网络波动延迟导致二次确认时点到取消代理"
This reverts commit 4c4b56c1a8.
2025-04-09 16:38:50 +08:00
status102
b22805843b fix: task type 2025-04-09 16:27:54 +08:00
status102
0045bbcd8b fix: 修复刷理智错误识别突袭关3星结算 2025-04-09 16:27:41 +08:00
uye
90ed19b192 fix: typo
[skip changelog]
2025-04-09 16:25:11 +08:00
uye
402ececdde fix: 主线关卡未选择默认进度时无法导航 2025-04-09 16:21:04 +08:00
uye
4c4b56c1a8 fix: 吃药/碎石 时网络波动延迟导致二次确认时点到取消代理 2025-04-09 15:57:58 +08:00
uye
7277b7e8ec chore: 调整热更提示 2025-04-09 13:49:58 +08:00
uye
7f1466eeb0 fix: 15 章战斗列表 2025-04-09 13:43:13 +08:00
status102
fb8ba366ca rft: Wpf刷理智任务、基建任务序列化 (#12281) 2025-04-09 13:13:42 +08:00
uye
fd5b5cab4e Release v5.15.0 (#12285)
Release beta for overseas infrastructure changes.
- [x] JP
- [x] KR
- [x] Wait for new EN gamedata that will release in 4 hours.
- [ ] CN gamedata fix (yuanyuan repo same time as EN?)
2025-04-09 12:37:10 +08:00
github-actions[bot]
62abaf51d7 docs: Auto Update Changelogs of v5.15.0 (#12289)
* docs: Auto Generate Changelog of Release v5.15.0

* docs: Update CHANGELOG.md

* docs: Update CHANGELOG.md

* docs: changelog

* feat: changelog

* feat: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
2025-04-09 12:35:36 +08:00
github-actions[bot]
51926cd41c chore: Auto Templates Optimization
Triggered by fef3fd4817

[skip changelog]
2025-04-09 04:29:56 +00:00
uye
fef3fd4817 chore: 手动更新新材料 2025-04-09 12:29:32 +08:00
MistEO
11a120b056 ci: MirrorChyan for macos (#12296)
* Update mirrorchyan_release_note.yml

* Update mirrorchyan.yml

* Update mirrorchyan.yml

* Update mirrorchyan_release_note.yml

* Update mirrorchyan.yml

* Update mirrorchyan.yml

* Update mirrorchyan_release_note.yml

* Update mirrorchyan.yml

* Update mirrorchyan.yml
2025-04-09 12:23:02 +08:00
Manicsteiner
86f76f71ea chore: YostarJP ocr fix (#12292) 2025-04-09 11:18:08 +08:00
BxFS
ee41f9c322 feat: 生成问题反馈压缩包&打开debug文件夹按钮 (#12282)
* feat: generate support payload and open debug folder option

* feat: zh-tw and en-us i18n, along with ai-translated ja-jp and ko-kr

* i18n: EN tweak

* fix: 移除重复的常见问题

* chore: UI 调整

* fix: 修复绑定,调整顺序

* chore: 移除不再使用的i18n内容

* perf: 调整关于界面

* fix: 文件过滤

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-04-09 10:17:24 +08:00
Constrat
5ad0f1e1fc feat: EN new clue templates + optimizations 2025-04-08 20:09:21 +02:00
Constrat
e432deee2c fix: readd CN gamedata: stages + chars 2025-04-08 19:40:26 +02:00
Constrat
2b64f974ec feat: EN Siege Alter gamedata 2025-04-08 19:18:17 +02:00
status102
46d3e91483 fix: 自动战斗-战斗列表 突袭难度切换失效
fix #12286
2025-04-08 23:14:24 +08:00
uye
105bf5b865 feat: 支持新 UI 主线导航 (#12278)
* feat: 支持新 UI 主线导航

* 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-04-08 22:46:27 +08:00
uye
73be332b4d chore: 调整主任务勾选框显示 (#12283) 2025-04-08 21:33:24 +08:00
HX3N
eb69190f18 chore: YostarKR ocr and UI updates (#12284) 2025-04-08 15:12:32 +02:00
status102
3096f8e311 rft: Wpf刷理智任务序列化 2025-04-08 19:33:20 +08:00
status102
419b3ae82d rft: Wpf基建任务参数更新迁移 2025-04-08 19:28:03 +08:00
status102
563c9507d5 rft: Wpf迁移工具箱-公招识别任务 2025-04-08 19:23:26 +08:00
github-actions[bot]
13ccf1b851 chore: Auto Templates Optimization
Triggered by e312d425b8

[skip changelog]
2025-04-08 09:40:29 +00:00
Manicsteiner
e312d425b8 chore: YostarJP clue and GUI updates (#12276) 2025-04-08 11:36:03 +02:00
Constrat
517141a5f4 feat: overseas (JP & KR) data (#12274) 2025-04-08 11:30:17 +02:00
AnnAngela
433eb0aa0b fix: 友链字体 [skip changelog] 2025-04-08 16:15:08 +08:00
AnnAngela
5680895daa feat: 调整友链样式 [skip changelog] 2025-04-08 16:11:14 +08:00
github-actions[bot]
3f426ffd35 chore: Auto Templates Optimization
Triggered by 2ec5caf456

[skip changelog]
2025-04-08 07:59:09 +00:00
AnnAngela
2ec5caf456 feat: 官网添加工具箱友链 [skip changelog] 2025-04-08 15:58:52 +08:00
AnnAngela
2540ec0bc3 feat: 官网添加工具箱友链 [skip changelog] (#12272)
* feat: Update HomeLinks.tsx

* feat: arkntools.app.png

* 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-04-08 15:48:22 +08:00
uye
4f81046a40 fix: 15章自动战斗 2025-04-08 12:07:22 +08:00
uye
1e6ae76a2e Revert "fix: 15章 自动战斗"
This reverts commit e2afc7a0cd.
2025-04-08 12:01:19 +08:00
uye
e2afc7a0cd fix: 15章 自动战斗 2025-04-08 11:56:41 +08:00
uye
9c30e9e83e fix: 开始作战 2025-04-08 11:56:41 +08:00
status102
b28ebf3ca9 rft: 远程控制添加任务移除反射 2025-04-08 10:53:23 +08:00
status102
a642024500 chore: 其他地图数据修复 2025-04-08 10:35:55 +08:00
status102
4b61fdf5d9 chore: 主线15章地图修复 2025-04-08 10:26:12 +08:00
uye
0e13f97b8c fix: 修复资源/肉鸽导航 (#12266) 2025-04-08 09:49:39 +08:00
Hao Guan
0475421520 fix(mac): 自动更新 2025-04-08 09:48:22 +08:00
MistEO
c7c17676e2 fix: resource 2025-04-08 09:16:27 +08:00
status102
6a85baede6 fix: wpf外服资源加载错误 2025-04-08 08:47:33 +08:00
Constrat
a935caf588 fix: prettier formatting 2025-04-07 22:11:45 +02:00
github-actions[bot]
34ac9b69f4 chore: Auto Update Game Resources - 2025-04-07
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14318393003

[skip changelog]
2025-04-07 20:04:51 +00:00
MistEO
7174edab5a chore: fix version time 2025-04-08 02:36:11 +08:00
MistEO
6bc2c2167e fix: revert infrast.json temporary 2025-04-08 02:32:57 +08:00
github-actions[bot]
634738a24d chore: Auto Templates Optimization
Triggered by 567e62abe2

[skip changelog]
2025-04-07 18:30:01 +00:00
MistEO
567e62abe2 feat: 手动更新资源 2025-04-08 02:28:55 +08:00
status102
b508d9e306 rft: Wpf CustomTask序列化 (#12264) 2025-04-07 22:50:16 +08:00
Constrat
768c0e289a fix: warning SA1413 in Telegram notifications 2025-04-07 12:02:02 +02:00
uye
f9319906b0 fix: Debug TaskName 忘保存了 2025-04-07 17:41:25 +08:00
uye
b33d88861c Release v5.15.0-beta.2 (#12261) 2025-04-07 00:49:57 +08:00
github-actions[bot]
088be6e970 docs: Auto Update Changelogs of v5.15.0-beta.2 (#12262)
* docs: Auto Generate Changelog of Release v5.15.0-beta.2

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-04-07 00:38:17 +08:00
uye
a6d52b4a44 feat: 将背景设置独立出来 (#12254)
* feat: 将背景设置独立出来

* fix: typo

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

* i18n: 添加翻译

* chore: 调整持久化储存 key 值,透明度和半径得重新手动调整下

* chore: 隐藏过时提示

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-04-06 23:06:27 +08:00
uye
0ff82e143f chore: 添加一个临时定时 (#12243)
* chore: 添加一个临时定时

* chore: 定时器全部改成可单次执行
2025-04-06 22:56:30 +08:00
uye
977cd6c9b6 feat: 添加自定义任务,仅在 debug 模式下可见入口
fix #7407
2025-04-06 18:49:42 +08:00
uye
53b0d56209 fix: 线索翻页限制 10 次,超出次数或未识别到下一页强制给当页第一个好友送线索 2025-04-06 17:17:56 +08:00
uye
079359749d fix: 外部通知 SMTP 与 Qmsg 输入框样式错误
fix #12256
2025-04-06 14:15:37 +08:00
uye
0b92134160 chore: 将密码框样式独立出来 2025-04-06 14:07:52 +08:00
Sherkey Asher
1a7b615cf8 docs: 添加ci文档 (#11924)
* docs: 添加协议文档导航

* docs: 添加ci解析

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

* docs: improve

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
2025-04-06 09:31:38 +08:00
Loong
7479b95179 chore: bump maa-cli to 0.5.4 (#12091) 2025-04-06 01:12:39 +08:00
uye
0fb839f0f6 chore: 提前适应新 UI 的资源关卡和肉鸽图标 2025-04-05 20:28:41 +08:00
github-actions[bot]
704bf6e05a chore: Auto Update Game Resources - 2025-04-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14270171199

[skip changelog]
2025-04-04 16:47:05 +00:00
Constrat
0b6ff2a7ad feat: YostarEN GO navigation preload 2025-04-04 18:37:22 +02:00
Manicsteiner
0b3c18e206 feat: YostarJP GO navigation (#12244) 2025-04-04 18:34:05 +02:00
uye
1bb16ee657 fix: 落了个 ResetRecruitVariables 2025-04-04 23:38:15 +08:00
HX3N
63cd7a56a9 feat: YostarKR GO navigation (#12242) 2025-04-04 20:39:42 +08:00
uye
80039160cf chore: 给反转 CheckBox 加个样式 2025-04-04 18:47:22 +08:00
uye
15bfd243f1 chore: 反转右键效果时更新 tooltip 悬浮提示 2025-04-04 17:24:51 +08:00
uye
763264e110 chore: 添加背景模糊半径滑块 2025-04-04 15:14:45 +08:00
uye
5c405a321e chore: 添加反转主任务右键单击效果勾选项
cc @Constrat
This option only applies to the main task selection. The key name in config has been changed
2025-04-04 14:45:42 +08:00
uye
fa0065cff7 chore: 调整背景模糊默认半径 2025-04-04 14:37:53 +08:00
Weiyou Wang
0dbd5ee80b fix: mac下选择难度 999 导致卡死 (#12235)
* fix: mac下选择难度 999 导致卡死

* refactor: 用常量
2025-04-04 13:22:21 +08:00
Weiyou Wang
219d3a9151 fix: 修复宿舍填充干员时不经过检测盲点首位干员的问题 (#12234) 2025-04-04 11:01:12 +08:00
uye
79f3228389 chore: 优化肉鸽难度选择显示 2025-04-03 23:48:09 +08:00
Rbqwow
f13c265e70 chore: ignore system shits (#12229)
[skip changelog]
2025-04-02 20:29:10 +08:00
Rbqwow
ca11661405 docs: 调整新手上路步骤顺序 (#12228) 2025-04-02 20:28:57 +08:00
HY
5dab97c71e fix: 繁中服生息演算無法讀檔 (#12230) 2025-04-02 11:23:46 +02:00
uye
de1ca4d414 chore: 可修改 gui.json 自定义 Background 模糊半径 2025-04-01 14:02:23 +08:00
uye
bb7eb4f095 Release v5.15.0-beta.1 (#12213)
push push
2025-03-31 20:48:10 +08:00
github-actions[bot]
40e158bb24 docs: Auto Update Changelogs of v5.15.0-beta.1 (#12222)
* docs: Auto Generate Changelog of Release v5.15.0-beta.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-03-31 20:00:07 +08:00
uye
7d0cfcddda feat: 添加控件半透明背景色,新增自定义背景 (#12204)
* feat: 添加控件半透明背景色,新增自定义背景

* chore: 添加个界面提示

* fix: 无法保存不透明度

* chore: 调整背景透明度,添加毛玻璃效果

* chore: 添加缓存

* chore: 删除多余内容

* style: format

* perf: 简化样式声明

* feat: 添加DataGrid半透明效果

* chore: 统一格式

* chore: ItemContainerStyle 改为默认透明

* fix: 修复部分未透明控件

* fix: 类型错误

* chore: 拆分不同样式的ListBox

* chore: 密码框半透明

* chore: 标题栏半透明

* chore: ButtonGroup 中的 RadioButton 选中时半透明

* chore: 调整 ListBoxItem 鼠标悬浮及选中颜色

* chore: 扩大主界面任务栏设置可点击范围

* perf: 小工具页TabControl背景透

* chore: 优化界面显示效果

* chore: 修复置顶按钮在切换主题色时更新不及时

* chore: 添加 PreviewSlider 渐入动画,增加 HoverDelayHelper 辅助类

* chore: HoverDelayHelper 不处理动画

* chore: 优化界面显示

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-03-31 19:56:34 +08:00
HY
c46024cb6a chore: 繁中服「生路」活動導航 (#12224) 2025-03-31 19:38:15 +08:00
github-actions[bot]
df905440f5 chore: Auto Update Game Resources - 2025-03-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14165187946

[skip changelog]
2025-03-31 06:09:17 +00:00
BxFS
42e36f11da fix: CheckLevelMax ocr target "-" -> digits (#12223) 2025-03-31 13:31:34 +08:00
github-actions[bot]
69acd541d3 chore: Auto Update Game Resources - 2025-03-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14164735183

[skip changelog]
2025-03-31 05:29:36 +00:00
晓丶梦丶仁
a8cc94d5b9 chore: update en-bug-report template
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-03-31 11:15:27 +08:00
Constrat
5cd9164d21 feat: YoStarEN Sarkaz theme + JP and KR template optimization 2025-03-30 21:02:38 +02:00
HX3N
b481071e6b chore: YostarKR Sarkaz Theme (#12220) 2025-03-30 20:49:48 +02:00
uye
443c9a74ff chore: gpu 选项禁用滚轮切换
fix #12210
2025-03-31 00:52:51 +08:00
Manicsteiner
acd8afd3b5 chore: YostarJP Sarkaz Theme (#12216) 2025-03-30 20:57:25 +08:00
Manicsteiner
a3795b4312 chore: YostarJP 琳琅诗怀雅 ocr fix (#12219) 2025-03-30 20:51:21 +08:00
uye
d643bd332e chore: 新增 MirrorChyan ErrorCode 提示 (#12202)
* chore: 新增 MirrorChyan ErrorCode 提示

* fix: 漏传显示参数

* fix: 显示错误
2025-03-28 17:01:51 +08:00
MistEO
a145ddc5fc chore: update wording about mirrorchyan (#12208) 2025-03-28 13:21:51 +08:00
github-actions[bot]
d0d71cb45b chore: Auto Update Game Resources - 2025-03-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14066226473

[skip changelog]
2025-03-25 17:28:42 +00:00
github-actions[bot]
bb860a5f26 chore: Auto Update Game Resources - 2025-03-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14065778213

[skip changelog]
2025-03-25 17:06:15 +00:00
github-actions[bot]
4226546b46 chore: Auto Update Game Resources - 2025-03-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14054199041

[skip changelog]
2025-03-25 07:44:03 +00:00
github-actions[bot]
f80d89cee4 chore: Auto Update Game Resources - 2025-03-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14053641056

[skip changelog]
2025-03-25 07:07:18 +00:00
dependabot[bot]
46d7d4b2ad ci: bump apple-actions/import-codesign-certs from 3 to 5 in /.github/workflows in the github-actions group (#12201)
ci: bump apple-actions/import-codesign-certs

Bumps the github-actions group in /.github/workflows with 1 update: [apple-actions/import-codesign-certs](https://github.com/apple-actions/import-codesign-certs).


Updates `apple-actions/import-codesign-certs` from 3 to 5
- [Release notes](https://github.com/apple-actions/import-codesign-certs/releases)
- [Commits](https://github.com/apple-actions/import-codesign-certs/compare/v3...v5)

---
updated-dependencies:
- dependency-name: apple-actions/import-codesign-certs
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-25 11:10:09 +08:00
dantmnf
3c2105eae1 fix: handle leak
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/12199#issuecomment-2746840742
2025-03-24 22:42:54 +08:00
github-actions[bot]
81d5d51938 chore: Auto Update Game Resources - 2025-03-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14033663625

[skip changelog]
2025-03-24 11:06:21 +00:00
MistEO
2f373ba893 docs: add space 2025-03-23 01:49:34 +08:00
MistEO
db2edc29be docs: add space 2025-03-23 01:45:54 +08:00
Constrat
47dc686e89 chore: add delay pre UnlockClues 2025-03-21 12:55:03 +01:00
HX3N
434d5b9f2b fix: YostarKR lower StartToVisit templThreshold (#12193) 2025-03-21 11:05:08 +01:00
github-actions[bot]
5429120a93 chore: Auto Update Game Resources - 2025-03-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13978365308

[skip changelog]
2025-03-20 20:07:01 +00:00
HX3N
5f0e2a8366 chore: YostarKR SSS#6 BuffChoose (#12191) 2025-03-20 19:39:21 +01:00
Constrat
5c06a78ac1 feat: Telegram Topic notification (#12188)
* feat: cs logic

* chore: xaml GUI

* i18n: string localization

* fix: big typo

* fix: xaml formatting

* fix: formatting jp

* chore: variable consistency
2025-03-20 11:09:27 +01:00
晓丶梦丶仁
26917639b9 perf: 孤星搓玉关 2025-03-20 17:36:53 +08:00
晓丶梦丶仁
4676e83921 fix: 保全开始部署 点击过快导致点击无效 (#12185) 2025-03-20 17:15:23 +08:00
github-actions[bot]
b24d1f8b7e chore: Auto Templates Optimization
Triggered by 8d4dc58ddf

[skip changelog]
2025-03-20 09:11:20 +00:00
github-actions[bot]
8d4dc58ddf chore: Auto Update Game Resources - 2025-03-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13965604516

[skip changelog]
2025-03-20 09:10:11 +00:00
github-actions[bot]
8fb585c3bd chore: Auto Update Game Resources - 2025-03-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13964618452

[skip changelog]
2025-03-20 08:08:03 +00:00
status102
d4cfdd0153 fix(wpf): 自动战斗在开启战斗列表时导入作业后,关闭战斗列表开始任务时作业使用错误 2025-03-20 15:33:29 +08:00
Constrat
a82fbe2193 chore: update issue_template to remove new lines for EN 2025-03-19 18:50:38 +01:00
Constrat
616a283538 fix: SSS#6 directional EC and branches 2025-03-19 18:33:21 +01:00
晓丶梦丶仁
38ffe6e047 fix: 控制中枢模板mask (#12177) 2025-03-19 21:01:34 +08:00
uye
b39ef8d44c chore: 移除过时的重连代码 2025-03-19 13:59:33 +08:00
github-actions[bot]
92e81d51be chore: Auto Update Game Resources - 2025-03-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13939071833

[skip changelog]
2025-03-19 04:45:57 +00:00
HY
ebc06d3b9c fix: 繁中服_生息演算組裝道具後卡住 (#12182)
* fix: 繁中服_生息演算組裝道具後卡住

* perf: 改为 ocrReplace

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-03-19 12:40:43 +08:00
github-actions[bot]
6e215b016a chore: Auto Update Game Resources - 2025-03-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13936090872

[skip changelog]
2025-03-19 00:25:33 +00:00
Hao Guan
fb33815586 feat(mac): 任务列表支持多个开始唤醒,以实现多账号 (#12144) 2025-03-19 03:44:32 +08:00
Constrat
ea269d69c7 chore: tweak SSS files for global 2025-03-18 11:18:29 +01:00
Constrat
5453be7ed4 chore: tweaked SSS copilot operators output 2025-03-18 11:10:46 +01:00
Constrat
9c5cb6e020 fix: xaml requires &#160; 2025-03-18 11:10:14 +01:00
Constrat
62ce927ef9 i18n: add space after : 2025-03-18 10:52:50 +01:00
dragonheart107
ed814d77f4 feat: SSS#6 for EN (#12168) 2025-03-18 10:49:56 +01:00
Manicsteiner
2af21754d7 chore: YostarJP EnterInfrastDelicious (#12176) 2025-03-18 12:24:56 +08:00
HY
31e64c87bc chore: 繁中服_聲浪安保派駐_定向導能元件 (#12174) 2025-03-17 10:15:05 +01:00
MistEO
9ae1e097f4 feat: check nightly version with mirrorchyan (#12173)
* ci: trigger alpha upload

* feat: check nightly version with mirrorchyan

* chore: remove l10n
2025-03-17 14:29:12 +08:00
uye
078e03b637 fix: 钼铅识别错误
fix #12169
2025-03-16 21:26:24 +08:00
MistEO
0673d8f790 Merge tag 'v5.14.1' into dev
v5.14.1
2025-03-16 11:47:41 +00:00
MistEO
13c6737d87 Release v5.14.1 (#12164)
for
5631e8ea0d
2025-03-16 19:47:08 +08:00
MistEO
a10009f6ae docs: changelog v5.14.1 2025-03-16 19:26:35 +08:00
MistEO
8a98f06910 feat: 调整下载来源提示 (#12156)
* feat: 调整下载来源提示

* chore: 调整一下toast文本
2025-03-16 19:21:28 +08:00
MistEO
881f3c6393 chore: 资源更新换一个解压目录 (#12153) 2025-03-16 19:21:28 +08:00
github-actions[bot]
2312a6b766 chore: Auto Update Game Resources - 2025-03-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13857358415

[skip changelog]
2025-03-16 19:21:28 +08:00
MistEO
6929abc2db ci: revert resource updater for upstream fix
修了修了 6a574986df (diff-64333ee497f100b1dbf592555a20776fba85b32e6f4b798a96ac74ce4e3269e9)
2025-03-16 19:21:28 +08:00
Constrat
6c0c2d548e chore: set output to UTF_8 for ResourceUpdater 2025-03-16 19:21:28 +08:00
Constrat
1e20c8ce30 fix: update version.json on Arknights-Tile-Pos changes
fix 43c672df54
2025-03-16 19:21:28 +08:00
MistEO
b872cbf0ec ci: manually update resource
https://github.com/yuanyan3060/ArknightsGameResource/issues/25
2025-03-16 19:21:28 +08:00
MistEO
8958b93a98 ci: output resource updater version info 2025-03-16 19:21:28 +08:00
MistEO
a7a48c6145 chore: manual update version 2025-03-16 19:21:28 +08:00
github-actions[bot]
66db13d1ae chore: Auto Update Game Resources - 2025-03-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13853283969

[skip changelog]
2025-03-16 19:21:28 +08:00
github-actions[bot]
673231881e chore: Auto Update Game Resources - 2025-03-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13852722614

[skip changelog]
2025-03-16 19:21:22 +08:00
MistEO
7274b29714 feat: 调整下载来源提示 (#12156)
* feat: 调整下载来源提示

* chore: 调整一下toast文本
2025-03-15 23:58:28 +08:00
MistEO
5631e8ea0d chore: 资源更新换一个解压目录 (#12153) 2025-03-15 14:03:23 +08:00
github-actions[bot]
e180bf6fb4 chore: Auto Update Game Resources - 2025-03-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13857358415

[skip changelog]
2025-03-14 13:16:39 +00:00
MistEO
c911d27a8f ci: revert resource updater for upstream fix
修了修了 6a574986df (diff-64333ee497f100b1dbf592555a20776fba85b32e6f4b798a96ac74ce4e3269e9)
2025-03-14 21:12:53 +08:00
Constrat
2198df02b4 chore: set output to UTF_8 for ResourceUpdater 2025-03-14 11:44:08 +01:00
Constrat
4cb4622438 fix: update version.json on Arknights-Tile-Pos changes
fix 43c672df54
2025-03-14 11:24:09 +01:00
MistEO
9299625f04 ci: manually update resource
https://github.com/yuanyan3060/ArknightsGameResource/issues/25
2025-03-14 18:00:45 +08:00
MistEO
81a53dbb6f ci: output resource updater version info 2025-03-14 17:31:28 +08:00
MistEO
424effe5f2 chore: manual update version 2025-03-14 17:23:56 +08:00
github-actions[bot]
43c672df54 chore: Auto Update Game Resources - 2025-03-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13853283969

[skip changelog]
2025-03-14 09:06:41 +00:00
status102
d0de85c7cd Revert "fix: roguelike already left encounter check and return from map screen (#12088)"
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/12088#issuecomment-2724040534
2025-03-14 16:59:46 +08:00
github-actions[bot]
b25796e4b5 chore: Auto Update Game Resources - 2025-03-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13852722614

[skip changelog]
2025-03-14 08:31:28 +00:00
status102
28259b23f7 rft: Wpf肉鸽任务序列化 (#12124)
* rft(wpf): 肉鸽任务序列化

* perf: 部分参数设置简化
2025-03-14 16:25:38 +08:00
BxFS
cb398487f1 fix: roguelike already left encounter check and return from map screen (#12088)
* fix: back out of map screen in roguelike

* feat: check if already left encounter for RoguelikeStageEncounterTaskPlugin
2025-03-14 16:20:22 +08:00
status102
758f79d1ad perf(core): 自动战斗开始前仅移除相似的召唤物头像缓存 2025-03-14 15:05:40 +08:00
status102
a42b1546b3 fix: 繁中服薩米肉鴿事件ocr
fix #12147
2025-03-14 09:54:18 +08:00
bodayw
04eacd6615 fix: 更新 243 极限效率一天四换排班表 (#12146)
取消 A+C 短班中的宿舍自动填充,避免把已经移出的令重新放进去恢复心情。

Disable dorm autofill in rotation "A+C" to avoid putting Ling back in again.
2025-03-13 14:54:02 +01:00
MistEO
a13550370a docs: 协议抄错了x 2025-03-13 17:59:48 +08:00
MistEO
9ab022f5ba docs: dml 措辞改漏了 2025-03-13 17:57:42 +08:00
MistEO
35089726d9 docs: 优化 DML 相关措辞 2025-03-13 17:56:15 +08:00
MistEO
a3d81c6029 docs: 回滚部分声明措辞 2025-03-13 17:49:49 +08:00
github-actions[bot]
5828b76ea7 chore: Auto Update Game Resources - 2025-03-13
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13830229008

[skip changelog]
2025-03-13 08:31:55 +00:00
github-actions[bot]
882c617031 chore: Auto Update Game Resources - 2025-03-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13807179300

[skip changelog]
2025-03-12 08:46:55 +00:00
MistEO
8523b760e4 Release v5.14.0 (#12139) 2025-03-12 13:14:05 +08:00
github-actions[bot]
f1210a6103 docs: Auto Update Changelogs of v5.14.0 (#12142)
* docs: Auto Generate Changelog of Release v5.14.0

* docs: cahngelog

* docs: changelog

* docs: changelog

* feat: Update CHANGELOG.md

* feat: Update CHANGELOG.md

* docs: Update CHANGELOG.md

* Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2025-03-12 13:08:38 +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
鬼影233
aeb557d004 feat: 适配「滋味」界面主题(YoStarEN) (#12135) 2025-03-11 21:58:34 +08:00
bodayw
ccd343db0f fix: 更新 243 极限效率一天四换排班表 (#12137)
修复格雷伊重复进驻宿舍的排班错误

Fixed the bug that Greyy were designated twice in the dorms
2025-03-11 12:51:31 +01:00
Constrat
15d1a8623e fix: add custom text and roi for SideStory DT 2025-03-10 23:04:19 +01:00
bodayw
d2b2538d77 feat: 更新 243 极限效率一天四换排班表(20250310 修订) (#12132)
---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-03-10 22:17:03 +01:00
github-actions[bot]
8bad202185 chore: Auto Update Game Resources - 2025-03-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13770953282

[skip changelog]
2025-03-10 17:28:25 +00:00
dantmnf
2fd03290e6 chore: deprecate more Intel integrated GPUs
We have issue reports on such generation iGPU.

Xe2 (Lunar Lake, Core Ultra 200V) and Xe-LPG+ (Arrow Lake, Core Ultra
200H) GPUs are still under evaluation.
2025-03-11 00:31:32 +08:00
Constrat
ee0e6a9519 chore: give priority to flint item compared to flint operator
nofix
2025-03-10 14:50:11 +01:00
HX3N
b0ba0fc4fc chore: YostarKR Theme Delicious (#12131) 2025-03-10 13:54:01 +01:00
Manicsteiner
622c22cf24 chore: YostarJP Theme Delicious (#12130) 2025-03-10 20:37:11 +08:00
Manicsteiner
793a4631d6 chore: YostarJP DT stage (#12129) 2025-03-10 20:36:37 +08:00
status102
bb1758b699 fix: 自动战斗费用识别在部分分辨率下概率出错
720p存在故障
2025-03-10 19:05:23 +08:00
HX3N
211e3eaea9 chore: YostarKR DT stage roi and text (#12127) 2025-03-10 19:59:28 +09:00
github-actions[bot]
13d766e071 chore: Auto Update Game Resources - 2025-03-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13759363595

[skip changelog]
2025-03-10 07:44:07 +00:00
github-actions[bot]
4427d37cd3 chore: Auto Update Game Resources - 2025-03-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13758799171

[skip changelog]
2025-03-10 07:06:20 +00:00
github-actions[bot]
2ee090e749 chore: Auto Templates Optimization
Triggered by 56e578f99c

[skip changelog]
2025-03-10 07:04:36 +00:00
BxFS
56e578f99c fix: 尝试修复肉鸽不期而遇退出后仍在尝试点击事件
chore: update tools ignore

feat: check if already left encounter for RoguelikeStageEncounterTaskPlugin

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Signed-off-by: status102 <102887808+status102@users.noreply.github.com>
2025-03-10 15:03:36 +08:00
status102
a033d99f66 rft: wpf招募任务序列化 (#12080) 2025-03-10 12:12:19 +08:00
status102
f101fb5afb fix(wpf): 修复自动战斗-战斗列表批量导入失效 2025-03-09 23:33:38 +08:00
MistEO
325db06cd6 Release v5.14.0-beta.4 (#12121) 2025-03-09 21:19:16 +08:00
github-actions[bot]
b36bd89a32 docs: Auto Update Changelogs of v5.14.0-beta.4 (#12122)
* docs: Auto Generate Changelog of Release v5.14.0-beta.4

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-03-09 21:07:35 +08:00
status102
917534e474 rft: wpf基建任务序列化默认值补全 2025-03-09 20:14:27 +08:00
status102
2e17de4983 perf: 肉鸽投资ocr封装 2025-03-09 20:14:27 +08:00
Sherkey Asher
2aa996b59d feat: SideStory「挽歌燃烧殆尽」导航 (#12094)
* feat: SideStory「挽歌燃烧殆尽」导航

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

* feat: 神秘ocr
2025-03-09 01:05:18 +08:00
github-actions[bot]
ae2f714ec1 chore: Auto Update Game Resources - 2025-03-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13739097764

[skip changelog]
2025-03-08 15:44:20 +00:00
uye
3b73b28e1c chore: 手动更新下活动名称 2025-03-08 23:39:12 +08:00
uye
a786556623 chore: 填写完cdk后自动检查一次更新 2025-03-08 23:27:59 +08:00
uye
abbcbdfdac chore: 删除多余判断 2025-03-08 23:27:59 +08:00
Constrat
2115d2e7c9 fix: typo
[skip changelog] [skip ci]
2025-03-08 16:08:17 +01:00
Constrat
b73087a190 feat: YostarEN DT navigation 2025-03-08 16:07:06 +01:00
status102
7275d126c7 perf: 企鹅物流上报失败-不支持的关卡,输出降级为警告,移除提示中的更新提醒 2025-03-08 16:30:47 +08:00
HX3N
dff4b57d66 chore: YostarKR DT navigation (#12105) 2025-03-08 15:34:17 +08:00
status102
f59ca76dfc perf(wpf): 自动战斗在作业地图不支持时,自动检测资源更新 2025-03-08 10:52:17 +08:00
status102
6bc44b934c perf(wpf): 调整干员识别及仓库识别开始流程 2025-03-08 10:41:44 +08:00
status102
19a73ef5d4 rft: wpf信用任务序列化 2025-03-08 10:41:23 +08:00
Manicsteiner
a42d253962 chore: YostarJP DT テラ飯 preload (#12101) 2025-03-07 21:42:32 +01:00
uye
bfd0ce283e chore: 提取 ResourceReload 方法 2025-03-07 23:26:31 +08:00
status102
c0ff1ddbe9 fix: wpf自动战斗-追加自定干员失效 2025-03-07 20:24:06 +08:00
status102
907d742ba6 perf: 修改初次设置引导中的项目,移除账号切换相关 2025-03-07 19:02:16 +08:00
BxFS
67b680e83a feat: 萨卡兹肉鸽深入调查实装 (#12098)
* feat: Sarkaz Deep Investigation

* refactor: remove duplicate sarkaz confirm pngs
2025-03-07 11:22:07 +01:00
Constrat
3d5189c8a8 style: formatting output
[skip changelog]
2025-03-07 11:15:13 +01:00
MistEO
f5e17393a7 feat: parse release note for resource updater (#12092)
* feat: parse release note for resource udpater

* feat: parse release note for resource udpater

* feat: toast 显示版本信息

* style: whitespace for EN

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-03-07 17:43:02 +08:00
github-actions[bot]
d354f5cefe chore: Auto Update Game Resources - 2025-03-07
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13716403548

[skip changelog]
2025-03-07 08:08:04 +00:00
XuQingTW
7f60b24c15 docs : 枯朽祭坛 维什戴尔 逻各斯 OCR辨識 (#12096)
* Update 枯朽祭坛 维什戴尔 逻各斯

* 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-07 15:31:27 +08:00
github-actions[bot]
75d30fd48c chore: Auto Templates Optimization
Triggered by 1dd501427d

[skip changelog]
2025-03-07 02:34:34 +00:00
github-actions[bot]
1dd501427d chore: Auto Update Game Resources - 2025-03-07
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13712491072

[skip changelog]
2025-03-07 02:33:57 +00:00
status102
c5fb4f099a fix: wpf领取奖励任务序列化错误 2025-03-07 09:59:43 +08:00
status102
e63c471baf rft: wpf领取奖励任务序列化 2025-03-06 22:58:37 +08:00
status102
1090f6bd5a fix: 修改彩蛋gif默认路径为string.Empty 2025-03-06 22:58:36 +08:00
status102
c139c29538 perf: 移除无用的彩蛋控件 2025-03-06 22:58:30 +08:00
BxFS
2f5c625abd fix: sarkaz MS count 1->8 (#12085) 2025-03-06 13:09:18 +01:00
uye
85a19f514a chore: 倒计时添加日志 2025-03-06 17:04:12 +08:00
uye
d57b196649 chore: 添加 spid 2025-03-06 17:04:12 +08:00
uye
7ccd76e99f chore: 调整参数名 2025-03-06 17:04:12 +08:00
github-actions[bot]
bad812ff2a chore: Auto Update Game Resources - 2025-03-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13694387717

[skip changelog]
2025-03-06 08:31:11 +00:00
Roland125
b14a563403 fix: 修复截图速度过快导致不能切换贸易站订单的问题 (#12090)
ChangeToMoneyOrder任务在9ms的截图速度下,点击动作在游戏中无法生效,故添加一个任务前延时。
顺便为ChangeToSyntheicJadeFlagOrder任务也添加一个前延时。
Co-authored-by:@Alan-Charred
2025-03-06 10:15:33 +08:00
status102
c9261d7702 fix: 基建设置UI绑定失效 2025-03-06 09:58:35 +08:00
github-actions[bot]
8f5a398154 chore: Auto Update Game Resources - 2025-03-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13684563437

[skip changelog]
2025-03-05 20:07:10 +00:00
BxFS
bf13b5ebc8 fix: burden/toil tasks threshold 0.9 -> 0.8 (#12087)
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-03-05 18:42:09 +01:00
status102
81e1eb5660 fix: wpf开始唤醒任务在未选择官服/B服时,不再提供账号切换输入 2025-03-05 21:35:53 +08:00
status102
8419dc567e fix: wpf自动战斗-自动编队追加自定干员意外激活
fix #12077
2025-03-05 15:42:53 +08:00
status102
82b63a0c3e rft: Wpf基建任务序列化调整 (#12053)
* rft: Wpf基建任务序列化

* rft: 迁移遗漏的CustomInfrastEnabled
2025-03-04 16:48:50 +08:00
status102
a80d7bbc03 rft: Wpf唤醒任务序列化 2025-03-04 11:57:10 +08:00
status102
bc5e04e6b8 rft: Wpf关闭明日方舟任务序列化 2025-03-03 17:35:39 +08:00
uye
d131261dda chore: 外部通知邮件 html 支持颜色输出 2025-03-03 15:46:57 +08:00
status102
a1d49556d2 ci: nightly版本打包tag获取 (#12076) 2025-03-03 08:15:05 +01:00
status102
e6e6b3d486 fix: log rotate (#12025)
* fix: log rotate

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

* fix: ubuntu

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

* fix: counter

* fix: ubuntu

* fix: static lock

* perf: type

* perf: catch file error

* fix: 修复size计算错误

* revert: 还原阈值为64mb

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

* perf: 移除不必要的锁传递

* rft: 使用streambuf计数

* perf: rename & 移除未使用函数

* fix: platform diff

* perf: init

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-03-03 15:02:06 +08:00
status102
f82a3615b3 ci: release-nightly-ota在获取最近提交之前输出最新标签 2025-03-03 11:56:11 +08:00
Constrat
12ec6e3ca5 fix: remove duplicate strings (#12065) 2025-03-02 14:11:30 +01:00
status102
79097158e5 rft: wpf生息演算任务序列化 2025-03-02 11:51:19 +08:00
github-actions[bot]
36788ed6c7 chore: Auto Update Game Resources - 2025-03-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13604799527

[skip changelog]
2025-03-01 12:33:08 +00:00
BxFS
a74b0e23de fix: Sarkaz MS unable to progress from post StartExplore (#12039)
---------

Signed-off-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-03-01 13:12:17 +01:00
BxFS
eaa85466e3 fix: stuck on StageEnterBattleAgain while in team selection screen (#12059) 2025-03-01 11:53:38 +01:00
uye
d6cab77a7b fix: smtp 格式 2025-03-01 10:38:04 +08:00
uye
a12ea44824 chore: smtp 通知使用 html 2025-03-01 10:05:46 +08:00
github-actions[bot]
4d3124aadb chore: Auto Update Game Resources - 2025-02-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13592914800

[skip changelog]
2025-02-28 17:05:52 +00:00
github-actions[bot]
5a4fe8ce43 chore: Auto Update Game Resources - 2025-02-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13583098168

[skip changelog]
2025-02-28 07:06:36 +00:00
HY
5f1abee203 chore: add sami investigation equipment text and temporary retreat template (#12046)
* chore: add investigation equipment and temporary retreat for sami  (txwy)

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

* chore: KR add template and ocrReplace

* chore: JP template and ocrReplace

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
2025-02-28 11:47:29 +08:00
uye
6070861ed2 fix: 「滋味」主题在有多个 badge 时无法识别基建入口 (#12057)
如下图所示,现将以 `[935, 570, 130, 75]` 为 roi 进行截图。

![screenshot_20250228_084434
copy](https://github.com/user-attachments/assets/6548649e-4476-4beb-be49-ab83712e2c05)

测试结果如下:
```
[2025-02-28 09:03:59.670][TRC][Px1c6e][Tx824b] ││││ match_templ | EnterInfrastDelicious.png score: 0.993298 rect: [ 935, 570, 130, 75 ] roi: [ 930, 540, 230, 180 ]
```

倘若未来有用户遇到模版识别分过低的问题,可以考虑裁减掉此模版的左侧。请务必保留字母 “B”。
2025-02-28 09:47:52 +08:00
pre-commit-ci[bot]
4923cf0277 chore: Auto update by pre-commit hooks [skip changelog] 2025-02-27 22:12:46 +00:00
Weiyou Wang
834d55a156 fix: 「滋味」主题在有多个 badge 时无法识别基建入口 2025-02-28 09:06:35 +11:00
Roland125
49d9af722e fix: 修复公招的几个问题 (#12056)
* fix: 修复不自动招募4星干员时,执行空招募的问题

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

* fix: 修改is_calc_only_task()的判断条件,避免正常招募流程的一种情形(所有星级都不执行招募)被错判为仅公招计算。从公招计算启动招募时,加入-1作为标识。
fix: 在正常招募流程中,自动招募1星时,将1星也加入comfirm_level

* 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-02-27 21:27:55 +08:00
Roland125
ecb098e65c fix: 修复不自动招募4星干员时,会执行空招募的问题 (#12054)
* fix: 修复不自动招募4星干员时,执行空招募的问题

* 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-02-27 19:54:12 +08:00
Rbqwow
55c1391afc docs: 更新开发前须知 (#12043)
* docs: update en-us development

* docs: update other language

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

* fix: typo

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-02-27 14:19:26 +08:00
Constrat
35b1ce3d1d tools: add ignore template
[skip changelog]
2025-02-26 14:34:42 +01:00
github-actions[bot]
e61c61679d chore: Auto Update Game Resources - 2025-02-26
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13542431504

[skip changelog]
2025-02-26 11:06:27 +00:00
github-actions[bot]
6737e8b958 chore: Auto Templates Optimization
Triggered by 520819a8c2

[skip changelog]
2025-02-26 10:50:23 +00:00
status102
520819a8c2 perf: 基建会客室信息板无新访客时,不再进入领取页 2025-02-26 18:48:52 +08:00
uye
8e36b6b0ea style: 格式化
[skip changelog]
2025-02-26 14:39:09 +08:00
uye
05edea23b5 chore: 猫猫改为全局 2025-02-26 14:36:02 +08:00
status102
f933d7a605 fix: 自动战斗追加自定义干员序列化 2025-02-26 14:25:42 +08:00
uye
836e26cb55 Release v5.14.0-beta.3 (#12040) 2025-02-26 12:35:30 +08:00
github-actions[bot]
375daa1d13 docs: Auto Update Changelogs of v5.14.0-beta.3 (#12041)
* docs: Auto Generate Changelog of Release v5.14.0-beta.3

* docs: changelog

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[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-02-26 12:29:56 +08:00
uye
cc7df9d88b fix: 尝试修复启动时不显示ui 2025-02-26 11:16:54 +08:00
status102
3f20295c89 fix: YoStarEN 肉鸽开局分队界面检测ROI扩大 2025-02-26 09:33:07 +08:00
status102
8b1f4ab24d fix: 自动战斗移除点赞时判断作业是否来自云端 2025-02-26 09:31:08 +08:00
status102
e709445fb8 perf: 移除未使用的变量
[skip changelog]
2025-02-26 09:30:06 +08:00
Constrat
fd6c8c2742 docs: update english schema 2025-02-25 21:52:32 +01:00
Rbqwow
6872945e32 fix: typo
[skip changelog]
2025-02-26 00:50:02 +08:00
MistEO
14ee103e19 Revert "ci: 临时措施" (#12033) 2025-02-25 23:20:37 +08:00
github-actions[bot]
589bc60267 chore: Auto Templates Optimization
Triggered by 05c8f3728c

[skip changelog]
2025-02-25 15:03:15 +00:00
MistEO
05c8f3728c Release v5.14.0-beta.2 (#12007) 2025-02-25 22:49:25 +08:00
Constrat
ecd148149e chore: 7a9c5a9f2d for YoStarEN 2025-02-25 15:49:13 +01:00
github-actions[bot]
9ccdd9884a chore: Auto Update Game Resources - 2025-02-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13523913630

[skip changelog]
2025-02-25 14:44:59 +00:00
status102
7597fd7a20 docs: chaneglog 2025-02-25 22:44:37 +08:00
github-actions[bot]
d004729626 docs: Auto Update Changelogs of v5.14.0-beta.2 (#12008)
* docs: Auto Generate Changelog of Release v5.14.0-beta.2

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-02-25 22:41:36 +08:00
BxFS
7a9c5a9f2d fix: 萨米第二次调查装备获取+萨米暂时撤退适配 (#12030)
fix: choose any device and MissionFailedFlag3 for sami DE/DI
2025-02-25 22:32:34 +08:00
github-actions[bot]
83c45934af chore: Auto Templates Optimization
Triggered by 4c8d57cca9

[skip changelog]
2025-02-25 14:31:48 +00:00
Constrat
4c8d57cca9 fix: retake Mizuki IS recruit templates
try to fix triple recruit issue
2025-02-25 15:31:16 +01:00
晓丶梦丶仁
5aa8f17670 docs: 两次大写 Reapply
[skip changelog]
2025-02-25 22:27:38 +08:00
BxFS
76e59348b2 fix: 月度小队/深入调查未启用自动切换会以当前游戏模式开始探索 (#12032)
fix: MS/DE now switch to correct tabs even without autoiterate ticked
2025-02-25 22:23:19 +08:00
uye
931a136d5c feat: ExternalNotification 可选输出详细信息 (#12020)
* feat: ExternalNotification 可选输出详细信息

* i18n: 添加翻译

* feat: 任务出错时额外通知

* chore: 尝试将换行替换成`<br>`

* fix: <br> 不生效
2025-02-25 22:21:08 +08:00
uye
7e2d61d788 feat: 猫猫 (#12017) 2025-02-25 22:20:50 +08:00
status102
16c47f466b fix: 肉鸽深入调查没有指挥分队可选时,随机选择分队跳过干员招募
fix #12016
2025-02-25 21:40:27 +08:00
status102
2ee0114b14 perf: 自动战斗列表非即时添加作业时,使用已读取的缓存替代读取文件 2025-02-25 20:01:26 +08:00
status102
2d3947ecd1 perf: 肉鸽任务参数禁止运行期修改 2025-02-25 20:01:26 +08:00
uye
d69b7e3e49 chore: MirrorChyanCdk 添加 Placeholder 2025-02-25 18:19:27 +08:00
status102
d9256650b7 rft: Wpf自动战斗作业序列化调整 2025-02-25 16:38:01 +08:00
status102
e7fb41f56f perf: 合并视频任务判断 2025-02-25 16:37:55 +08:00
github-actions[bot]
ff007306fc chore: Auto Update Game Resources - 2025-02-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13513664757

[skip changelog]
2025-02-25 04:29:49 +00:00
status102
fe362d09fc rft: Wpf自动战斗任务序列化 2025-02-25 10:55:48 +08:00
MistEO
206352a8e6 ci: fix sync-resource git config 2025-02-25 00:01:25 +08:00
status102
faff79e9c6 feat(wpf): Wpf旧Config增加int读取 (#11987) 2025-02-24 23:38:51 +08:00
uye
7a34a175e6 chore: 添加强制使用 Github 进行版本更新 2025-02-24 23:34:11 +08:00
status102
aac930bdb4 rft: 移动截图耗时显示位置以避免产生GPU加速截图的误导 2025-02-24 23:31:35 +08:00
status102
de3e1cf0ba fix: 自动战斗保全作业地图存在性判断 2025-02-24 22:21:13 +08:00
status102
75c71a90d5 feat: 基建收取会客室周限300信用 (#12014)
* feat: 基建收取会客室周限300信用

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

* chore(tools): add templates to ignore list

* fix: stack overflow

* fix: pipeline

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

* fix: 动画延迟+roi

* fix: 动画加加retry

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-02-24 21:21:47 +08:00
status102
baad476f38 perf: 自动战斗任务类型校验补充
[skip changelog]
2025-02-24 19:54:07 +08:00
status102
94cb4f8f7f rft: Wpf自动战斗重构 (#11977)
* chore: 自动战斗一般作业model

* chore: 自动战斗保全作业model

* chore: 作业model增加输出提示

* rft: 拆分IO

* rft: 重构作业解析、作业集添加

perf: 简化CouldLikeWebJson

rft: 单个作业添加到作业集

perf: 优化作业添加,启动时校验地图是否存在

perf: 优化作业集加载时输出

rft: 移除废弃参数

fix: 作业集作业缓存写入加锁

chore: 简单挪个位置

rft: 整理一下函数

rft: 战斗列表序列化重构优化

chore: 修改log输出位置

chore: func rename & const declare

fix: 批量导入未标注难度的作业时,将按照普通难度追加

fix: 浏览列表中作业时重复添加

chore: 移除未使用变量

fix: 移除重复显示作业详情

fix: 自动战斗作业保存重复导致覆盖

fix: 修复加载作业时解析返回值错误

* rft: 更改战斗列表中任务的缓存路径
2025-02-24 19:29:33 +08:00
github-actions[bot]
4154184fb4 chore: Auto Update Game Resources - 2025-02-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13493432898

[skip changelog]
2025-02-24 08:08:50 +00:00
Constrat
e1860299f7 fix: fast forward text in encounter (#12021) 2025-02-24 08:32:20 +01:00
AnnAngela
d49eea9fbd ci: 临时措施 (#12024) 2025-02-24 10:20:27 +08:00
MistEO
3171c8a84c ci: perf mirrorchyan uploading 2025-02-24 00:52:49 +08:00
晓丶梦丶仁
ab1c6e1c13 perf: IS3 度假村冤魂 防爆桩
Fix #7768
2025-02-23 18:58:43 +08:00
晓丶梦丶仁
6b594d31f4 perf: IS2 精酿杀手 防爆桩
Fix #12012
2025-02-23 18:55:15 +08:00
Rbqwow
c93302501e docs: 此AI非彼AI (#12005)
docs: 这规矩你早就懂的
2025-02-23 18:51:09 +08:00
晓丶梦丶仁
90ce95977b fix: IS2, IS3 支援起重机 缺失 2025-02-23 16:45:29 +08:00
github-actions[bot]
beac7446ff chore: Auto Templates Optimization
Triggered by 730a45d383

[skip changelog]
2025-02-23 03:52:02 +00:00
uye
730a45d383 fix: 「滋味」主题概率无法识别 2025-02-23 11:51:40 +08:00
Constrat
4077409448 tools: update ignore list of templates
[skip changelog]
2025-02-22 16:45:41 +01:00
MistEO
fa24231caf ci: use bot to commit for MaaResource 2025-02-22 12:31:40 +08:00
status102
2d648bf4cc fix: Wpf信用任务-OF-1战斗 修复未勾选刷理智时,仍判断刷理智关卡是否为当前/上次
link to #11996
2025-02-21 20:33:40 +08:00
晓丶梦丶仁
07f46ab421 fix: 肉鸽放弃战斗奖励后仍能识别到掉落 (#12000) 2025-02-21 20:13:22 +08:00
晓丶梦丶仁
d603bbc495 feat: IS4 extend2 事件 转机 2025-02-21 19:44:24 +08:00
uye
d3ca47d386 chore: 拆分 OF-1 与 访问好友回调显示 2025-02-21 19:08:23 +08:00
github-actions[bot]
43992af553 chore: Auto Update Game Resources - 2025-02-21
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13455490910

[skip changelog]
2025-02-21 11:06:04 +00:00
BxFS
73907eb807 fix: Monthly Squad for Global (#11993)
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-02-21 11:57:15 +01:00
status102
e354e17266 perf: wpf自动战斗战斗列表序列化 2025-02-21 18:38:02 +08:00
status102
ca7563d9a2 fix: Wpf选中战斗列表作业时,作业内容重复显示 2025-02-21 18:32:34 +08:00
status102
5fef5b818e chore(wpf): 简单整理一下CopilotViewModel函数
[skip changelog]
2025-02-21 18:28:46 +08:00
status102
6670293ccd feat: Wpf地图查询 2025-02-21 18:28:45 +08:00
status102
e75717260b fix: Wpf地图信息MapInfo字段名更正 2025-02-21 18:28:45 +08:00
dragonheart107
edd46c8f79 chore: clarify different originium types and unify deep investigation in EN (#11995)
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-02-21 11:03:03 +01:00
uye
e42a839828 fix: 会客室进入失败 (#11950)
* chore: 基建滑动后等待动画结束

* fix: office 进入失败后重试

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

* fix: lower case sleep

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-02-21 16:14:30 +08:00
status102
c8d60f65e0 docs: 作业协议补充难度字段 (#11980)
* docs: 作业协议补充难度字段

* i18n: 外文文档
2025-02-21 15:35:23 +08:00
BxFS
afe2165af6 fix: add an missing @ for MonthlySquadCommsBackTwice (#11991) 2025-02-21 10:12:40 +08:00
github-actions[bot]
ff83e07e69 chore: Auto Update Game Resources - 2025-02-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13443728393

[skip changelog]
2025-02-20 20:06:27 +00:00
MistEO
e40e7f08e3 chore: fix typo 2025-02-21 01:09:43 +08:00
MistEO
403579c512 chore: mirrorc with new tab 2025-02-21 01:08:12 +08:00
MistEO
b5a8792350 chore: 删除官网早就不能用了的镜像 2025-02-21 01:04:45 +08:00
Constrat
5d12a9f055 chore: more missing tasks for EN Sami IS
[skip changelog]
2025-02-20 17:14:22 +01:00
晓丶梦丶仁
aa3f472c37 fix: Mac 日服 IS4 识别阈值 (#11979)
fix: mac 日服 IS4 识别阈值
2025-02-20 22:58:36 +08:00
Manicsteiner
9b91ee760b fix: YostarJP IS4 计划耕种 (#11990) 2025-02-20 22:58:04 +08:00
uye
af4e6c1ad3 chore: 官网添加 MirrorChyan 下载链接
需要 html 高手,现在点查看全部会有一个丑陋的动画(
2025-02-20 22:57:45 +08:00
Constrat
5d09cacc6c tools: update MissingJsonTranslate
[skip changelog]
2025-02-20 15:56:57 +01:00
Constrat
7cd4fe3b4f fix: missing tasks for EN 2025-02-20 15:56:46 +01:00
MistEO
7b47443385 ci: 优化mirrorc上传,先传用户多的平台 2025-02-20 22:22:54 +08:00
status102
39e712cf51 fix: 生息演算Mode序列化类型
[skip changelog]
2025-02-20 20:26:23 +08:00
status102
96d725e88a fix: 生息演算Mode序列化类型
[skip changelog]
2025-02-20 19:53:23 +08:00
status102
fcaf4e442e fix: 生息演算Mode序列化类型 2025-02-20 19:52:28 +08:00
HX3N
daee3f88d2 fix: YostarKR Sarkaz CR Node recognition (#11986) 2025-02-20 20:31:19 +09:00
HX3N
8fd4cd8009 fix: YostarKR missing tasks (#11981) 2025-02-20 18:43:41 +09:00
github-actions[bot]
151608c57c chore: Auto Templates Optimization
Triggered by 27b7b59c4a

[skip changelog]
2025-02-20 09:12:02 +00:00
github-actions[bot]
27b7b59c4a chore: Auto Update Game Resources - 2025-02-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13431621324

[skip changelog]
2025-02-20 09:09:01 +00:00
github-actions[bot]
0d59ac68c0 chore: Auto Update Game Resources - 2025-02-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13431262956

[skip changelog]
2025-02-20 08:46:17 +00:00
HY
c166a21a8b chore: add missing tasks and template for txwy (#11985) 2025-02-20 09:38:36 +01:00
Constrat
f0ea039514 fix: typo in xaml themes for Idea Filter + i18n EN 2025-02-19 22:51:17 +01:00
Constrat
7d4ddba8df tools: more FindMissingJson
[skip changelog]
2025-02-19 22:50:49 +01:00
Constrat
7a820560c5 tools: update FindMissingJson
[skip changelog]
2025-02-19 22:37:01 +01:00
Constrat
3d495b1c21 fix: Missing EN Sarkaz tasks 2 2025-02-19 22:33:57 +01:00
Constrat
edc45943e2 fix: EN Sarkaz missing NextLevel task 2025-02-19 22:29:13 +01:00
github-actions[bot]
ea35873645 chore: Auto Update Game Resources - 2025-02-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13421376622

[skip changelog]
2025-02-19 20:06:38 +00:00
Constrat
62aad5a22b fix: EN replace Sguad with Squad 2025-02-19 14:23:20 +01:00
晓丶梦丶仁
876df6e005 fix: 狭路相逢遇到构想卡死 (#11970)
* fix: 狭路相逢遇到构想卡死

* perf: 更改头文件位置

* fix: empty image

* Revert "fix: empty image"

This reverts commit ae11bbf138.

* fix: asst::VisionHelper::correct_rect image is empty

* perf: 识别到构想后输出 trace log

* perf: Matcher, ProcessTask
2025-02-19 21:20:17 +08:00
status102
7b2ec0f967 rft: rename func name
[skip changelog]
2025-02-19 16:33:59 +08:00
status102
25155facf6 feat: 读取地图数据 (#11973) 2025-02-19 14:46:55 +08:00
晓丶梦丶仁
4186fb3080 docs: 更新文档 2025-02-19 14:26:19 +08:00
status102
ebb4b603a4 perf: 避免不必要拷贝
[skip changelog]
2025-02-19 13:07:10 +08:00
status102
3ae29ec453 fix: 移除肉鸽结算插件中的Matcher复用 2025-02-19 13:06:19 +08:00
status102
f3233b12db fix: 修复BattleHelper中的意外报错 2025-02-19 13:06:19 +08:00
晓丶梦丶仁
107c9d330c fix: IS4 绝境?抉择?ocr (#11969) 2025-02-19 10:49:18 +08:00
Constrat
45ae528f17 chore: ResourceUpdater to remove spaces from EN I.S. encounter
just like KR current logic but only for encounters
2025-02-18 17:42:36 +01:00
Constrat
ef2c721fd0 fix: EN remove all spaces from encounter and ignore spaces 2025-02-18 17:36:59 +01:00
github-actions[bot]
842e49cc86 chore: Auto Update Game Resources - 2025-02-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13394475345

[skip changelog]
2025-02-18 15:44:17 +00:00
Constrat
f080f55b88 fix: EN Sarkaz SelectTheme 2025-02-18 16:34:17 +01:00
status102
26d270a51a perf: 萨卡兹肉鸽负荷干员编入入口ROI拆分 (#11966)
* Reapply "chore: Auto Update Game Resources - 2025-02-18"

This reverts commit f55ea6b1f8.

* perf: 国服ROI缩小

* fix: 补充JP、KR的roi
2025-02-18 21:24:26 +08:00
晓丶梦丶仁
53f0807add feat: IS4 extend2 似是而非事件 (#11971) 2025-02-18 20:23:17 +08:00
Constrat
222ab9be7c Release v5.14.0-beta.1 (#11962) 2025-02-18 11:16:43 +01:00
晓丶梦丶仁
3bc44d3e0d docs: changelog
有神人改版号不改changelog
[skip changelog]
2025-02-18 16:47:03 +08:00
status102
54edd21f79 ci: 允许commit message以Reapply开始 (#11967) 2025-02-18 16:26:15 +08:00
github-actions[bot]
5cee25efee docs: Auto Update Changelogs of v5.13.2-beta.1 (#11968)
* docs: Auto Generate Changelog of Release v5.13.2-beta.1

* docs: update changelog.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-02-18 15:16:32 +08:00
晓丶梦丶仁
f8b417506a ci: Allow Reapply for pr names and commit names within pr 2025-02-18 15:00:27 +08:00
晓丶梦丶仁
f55ea6b1f8 Revert "chore: Auto Update Game Resources - 2025-02-18"
This reverts commit 8e63f60a6e.

Revert "revert c3d98ec8822fc41892c07f6b6caef5fd435fbc43"

This reverts commit 6d229c72fe.

Revert "fix: EN服萨卡兹肉鸽负荷干员icon ROI"

This reverts commit 77cc830feb.
2025-02-18 11:05:55 +08:00
github-actions[bot]
8e63f60a6e chore: Auto Update Game Resources - 2025-02-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13382298189

[skip changelog]
2025-02-18 02:55:16 +00:00
status102
77cc830feb fix: EN服萨卡兹肉鸽负荷干员icon ROI
f78deb7b93

PR #11921
2025-02-18 10:36:42 +08:00
status102
6d229c72fe revert c3d98ec882
PR #11921 相关,非预期的CN服资源修改
2025-02-18 10:29:02 +08:00
github-actions[bot]
66c59a3600 docs: Auto Update Changelogs of v5.13.2 (#11963)
* docs: Auto Generate Changelog of Release v5.13.2

* chore: Sarkaz IS for global

* fix: reordering

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-02-17 23:40:33 +01:00
HX3N
f147b89c2b fix: YostarKR updated the StartUpConnectingFlag template (#11960) 2025-02-17 22:26:50 +01:00
Constrat
9d9f3ea70c fix: Fix hidden floor Sarkaz EN
I have no idea where I even pulled off "Hermitage of Sv whatever"
2025-02-17 16:46:48 +01:00
Constrat
b2a458f547 typo: EN tasks
[skip changelo] [skip ci]
2025-02-17 16:42:21 +01:00
Constrat
cd7c6a54e0 feat: YostarEN I.S. modes (#11956) 2025-02-17 15:36:19 +01:00
github-actions[bot]
6f2f239e93 chore: Auto Update Game Resources - 2025-02-17
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13372516459

[skip changelog]
2025-02-17 14:29:00 +00:00
晓丶梦丶仁
d2c5a7d784 fix: EN 服 IS2 导航失效 (#11955) 2025-02-17 22:05:51 +08:00
晓丶梦丶仁
5d42b463c8 fix: 傀影肉鸽可以选择在第五层 BOSS 前暂停
Fix #11953
2025-02-17 21:51:14 +08:00
晓丶梦丶仁
bc7774de4d docs: 调整肉鸽文档 skill_usage 描述,尝试 json5 2025-02-17 21:27:17 +08:00
晓丶梦丶仁
de4af1518c perf: 调整IS4作战、招募 2025-02-17 21:27:17 +08:00
Manicsteiner
3ff11e072b feat: YostarJP Sarkaz roguelike (#11914)
* feat: YostarJP Sarkaz roguelike adaptation

* chore: add more template

* chore: StageBoskyPassageEnter

* chore: edits

* fix: unknown events

* fix: 戴冠式 ocr

weird
squash into 'fix: unknown event' if you want

* feat: IS 1~3 mode6&7

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-02-17 21:22:33 +08:00
晓丶梦丶仁
dd71224d63 perf: 肉鸽为识别错误的事件也添加 callback (#11946)
* perf: 为识别错误的事件也添加 callback

* perf: log.error、修改what内容

* i18n: KR translation

* i18n: JP translation

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
2025-02-17 21:20:38 +08:00
status102
d9c32d5b1e rft: Wpf重构自动公招任务序列化 (#11951) 2025-02-17 21:02:51 +08:00
Constrat
f78deb7b93 feat: YoStarEN Sarkaz roguelike (#11921)
---------
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-02-17 10:54:19 +01:00
uye
1e3d5f28bd fix: StartupUpdateCheck 不生效 2025-02-17 16:36:03 +08:00
晓丶梦丶仁
0fab23f4e4 style: _updateCheck 位置
[skip changelog]
2025-02-17 16:09:27 +08:00
uye
c4c529f3a2 feat: SimpleEncryptionHelper 支持默认字符串 2025-02-17 12:57:10 +08:00
uye
ce4887435a chore: 加解密失败时通知 2025-02-17 11:17:24 +08:00
status102
004d6b4a9b chore: TaskData增加OcrTask的ocrReplace合法性检查 (#11878)
* chore: TaskData增加OcrTask的ocrReplace合法性检查

* docs: 加点注释
2025-02-17 09:25:44 +08:00
status102
efe5f33a22 rft: Wpf重构生息演算任务参数序列化 (#11916) 2025-02-17 09:23:06 +08:00
status102
3182eff718 rft: Wpf重构生息演算任务参数序列化
perf: 移除不必要的分隔符
2025-02-17 09:22:19 +08:00
status102
a4fbee3207 rft: 使用RecruitData代替ocrReplace的外服适配 (#11879)
* rft: use RecruitData instead of ocrReplace

* chore: tasks.json

* docs: 注释

* i18n: txwy tweak

* perf: 加载资源时缓存客户端对应语言的招募tag集

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
2025-02-17 09:14:27 +08:00
uye
9980536522 fix: 外服重复检查资源 (#11927)
fix #11925
2025-02-16 23:05:07 +08:00
github-actions[bot]
0b05cc5b17 chore: Auto Update Game Resources - 2025-02-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13355308934

[skip changelog]
2025-02-16 13:07:58 +00:00
晓丶梦丶仁
39707f70ac perf: 肉鸽难度选项降到18个 (#11934) 2025-02-16 21:06:50 +08:00
晓丶梦丶仁
596257122e perf: IS4 调整公害ew部署 (#11935)
perf: 撒卡字肉鸽调整公害ew部署
2025-02-16 21:06:32 +08:00
HX3N
92d53de182 feat: YostarKR Sarkaz roguelike (#11920)
* chore: add text and ocrReplace

* chore: Stage and Encounter

* chore: roguelike squad

* chore: img 1

* chore: remove space

* chore: img 2

* chore: tweak SelectTheme text

* chore: img 3

* chore: remove space

* chore: remove SpecialValRecognition

* chore: change template size

* chore: StageBoskyPassageEnter

* fix: incorrect template replacement

* i18n: 去伪存真

* i18n: tweak resource translation

* i18n: Roguelike seed and monthly

* i18n: tweak wrong translation

* fix: replace ChooseBurdenOperatorAtStart with a higher score image

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

* fix: StageRefresh roi

* fix: StageRefresh image

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

* fix: StageRefreshConfirm.png templ size

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

* fix: stagerefresh threshold

* fix: ChooseBurdenOperatorAtStart templThreshold

* fix: 纯烬艾雅法拉 ocrReplace

* i18n: 专业人士分队

I keep making mistakes because I'm drunk :P

* fix: remove $ from 相遇 ocrReplace

and replace , > .

* i18n: tweak Endpoint translation

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-02-16 22:05:12 +09:00
晓丶梦丶仁
65a290f447 feat: Sarkaz extend II 专业人士分队 (#11938)
feat: 萨卡兹内容拓展II 专业人士分队
2025-02-16 12:11:00 +08:00
晓丶梦丶仁
76ea0d34e7 ci: issue-checker roguelike label
[skip changelog]
2025-02-16 11:46:50 +08:00
Constrat
ded67fe648 feat: remove spaces for all ocrReplaces for KR + various optimizations (#11926)
* feat: remove spaces for all ocrReplaces for KR + various optimizations

* fix: kr path
2025-02-15 19:58:31 +01:00
Constrat
ffdd316a67 tools: ImageCoordinate cursor tweak 2025-02-15 15:18:44 +01:00
uye
35058aa56e chore: 优化日志输出 2025-02-15 19:49:53 +08:00
uye
3bd7f05694 perf: 热键支持 Windows 键
fix #11922
2025-02-15 11:56:27 +08:00
Constrat
51f2758f7a tools: allow sarkaz in OverseasClient missing
[skip changelog]
2025-02-14 21:47:53 +01:00
BxFS
70a1b34c3a fix: 支持肉鸽特定模式下跳过选队直接选人 (#11915)
fix: provision for certain roguelike mode without RolesDefault and go straight into RecruitMain, like sami.DE.8
2025-02-14 23:55:23 +08:00
Constrat
746d3a514c ci: try to fix pre commit using an updated fork (#11917)
---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-02-14 15:07:18 +01:00
晓丶梦丶仁
5e7dd5eeff ci: disable prettier 2025-02-14 22:00:04 +08:00
status102
16022bcc2d fix: Log Rotate 临时性检查措施 (#11835)
* fix: Log Rotate 增加任务开始时主动检查

* feat: Log Rotate 增加肉鸽每轮探索开始时主动检查

* perf: 移除TaskChain单任务结束后检查
2025-02-14 21:35:14 +08:00
status102
952b1b2f34 rft: 重构任务id保存,支持保存多个同类型任务 2025-02-14 21:22:56 +08:00
Roland125
06a01c257e fix: 3星招募逻辑修复 (#11913)
* fix: 3星招募逻辑修复
2025-02-14 20:04:31 +08:00
MistEO
01900aa7ba Release v5.13.1 (#11911) 2025-02-14 19:58:01 +08:00
晓丶梦丶仁
9d5c5266a4 fix: JP 事件译名重复 (#11910) 2025-02-14 19:44:08 +08:00
status102
172dd92636 chore: typo 2025-02-14 19:37:38 +08:00
github-actions[bot]
7a567a967e docs: Auto Update Changelogs of v5.13.1 (#11912)
* docs: Auto Generate Changelog of Release v5.13.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-02-14 19:35:07 +08:00
Constrat
d09899fb68 ci: missing style output in res-update logging 2025-02-14 12:26:05 +01:00
status102
ec3bd9b48b Revert "perf: 自动战斗BattleStartPre任务合并理智药检测"
This reverts commit d54c408769.
2025-02-14 19:15:02 +08:00
github-actions[bot]
242f165c5c chore: Auto Update Game Resources - 2025-02-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13327901721

[skip changelog]
2025-02-14 11:05:51 +00:00
uye
091d3b0f70 chore: 删除多余 Update
[skip changelog]
2025-02-14 19:01:01 +08:00
uye
c4aafe3dd3 fix: 标题栏不会随资源重载更新 2025-02-14 18:56:52 +08:00
status102
0ec33a46d5 fix: 肉鸽职业组
fix #11901
2025-02-14 18:37:06 +08:00
uye
05812c394e Revert "fix: 修复招募功能中的逻辑漏洞,并添加相应的测试函数 (#11898)"
This reverts commit 40ad3c429c.
2025-02-14 18:33:27 +08:00
github-actions[bot]
f1c27399a3 chore: Auto Update Game Resources - 2025-02-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13327319832

[skip changelog]
2025-02-14 10:29:16 +00:00
uye
72b9d6b983 fix: 资源重载后资源版本界面显示仍为旧版本 2025-02-14 17:42:29 +08:00
晓丶梦丶仁
789884b41c perf: 水月肉鸽开端事件选择 3-3 2025-02-14 17:40:21 +08:00
MistEO
c3478fd090 ci: temp update resource token
急急急,先改了用着。回头看看换成哪个正确的
2025-02-14 16:46:47 +08:00
github-actions[bot]
8abd69a723 chore: Auto Templates Optimization
Triggered by ff1281e386

[skip changelog]
2025-02-14 08:44:27 +00:00
github-actions[bot]
ff1281e386 chore: Auto Update Game Resources - 2025-02-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13325573436

[skip changelog]
2025-02-14 08:43:37 +00:00
AnnAngela
066b844b8e chore: Update CHANGELOG.md 2025-02-14 15:34:30 +08:00
AnnAngela
c425c79d2b chore: Update CHANGELOG.md 2025-02-14 15:34:11 +08:00
uye
f44b11dfc9 Release v5.13.0 (#11896) 2025-02-14 15:30:51 +08:00
github-actions[bot]
927ad515ab docs: Auto Update Changelogs of v5.13.0 (#11897)
* docs: Auto Generate Changelog of Release v5.13.0

* docs: changelog

* docs: changelog

* feat: Update CHANGELOG.md

* feat: Update CHANGELOG.md

* feat: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
2025-02-14 15:30:31 +08:00
Hao Guan
53e1d93352 docs(mac): PlayCover分辨率提示 2025-02-14 14:55:34 +08:00
uye
3ce1cd520f perf: 使用海外源时也通过 mirrorc 检测是否为最新资源,但如果为其他返回值时仍然更新 2025-02-14 14:30:58 +08:00
status102
4df531e749 revert: 4481710605 (#11900)
移除种子刷钱相关业务逻辑入口
2025-02-14 13:35:31 +08:00
status102
e3a21d50ba fix: 自动战斗使用技能keep_waiting情况下在离开战斗、中止任务时无法中断 2025-02-14 12:33:26 +08:00
status102
6cf98066ac Revert "fix: use_skill 在按下停止按钮后不退出 (#11761)"
This reverts commit c94a0b546a.
2025-02-14 12:33:26 +08:00
Roland125
40ad3c429c fix: 修复招募功能中的逻辑漏洞,并添加相应的测试函数 (#11898)
* 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-02-14 10:47:54 +08:00
status102
9b8f92f0f7 revert: 4481710605 2025-02-14 09:49:41 +08:00
uye
89102a1e86 fix: 重复添加干员信息
fix #11895
2025-02-14 09:29:09 +08:00
MistEO
77b5187fd3 chore: remove mirrorchyan line2 2025-02-14 02:19:37 +08:00
Manicsteiner
a4e54a3c7f fix: YostarJP OCR (#11884) 2025-02-13 11:16:43 +01:00
Constrat
1844845d1c ci: remove validator scripts because stale 2025-02-13 10:47:37 +01:00
uye
bbef238e61 chore: 优化肉鸽难度显示 2025-02-13 17:23:03 +08:00
MistEO
47443ef810 Release v5.13.0-beta.8 (#11880) 2025-02-13 15:43:09 +08:00
github-actions[bot]
634c7c6917 docs: Auto Update Changelogs of v5.13.0-beta.8 (#11881)
* docs: Auto Generate Changelog of Release v5.13.0-beta.8

* docs: changelog

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-02-13 15:42:13 +08:00
Constrat
eeb0b78328 feat: script to update version.json (#11875)
* chore: do not modify version.json time in cpp

* feat: add version time updater script

* chore: add version.ps1 to workflow

* feat: implement previous logic from validator.ps1

* feat: add version bool for update-resources

* fix: wrong condition on OTA step
2025-02-13 14:24:47 +08:00
Weiyou Wang
a9032e22a7 fix: YostarJP OCR mismatched parenthesis (#11877)
* fix: mismatched parenthesis

* fix: 换个和之前更接近的版本
2025-02-13 14:10:30 +08:00
BxFS
361256bdf0 fix: 月度小队模式不再试图提前离开肉鸽 (#11872)
fix: monthly squad mode no longer try to leave early
2025-02-13 13:07:29 +08:00
萨拉托加
33811962fe chore: 简化干员名正则 (#11876)
国服也简化一下?照着改的
2025-02-13 12:16:08 +08:00
status102
4a007f497c docs: 自动招募添加少量注释
[skip changelog]
2025-02-13 12:15:49 +08:00
status102
34124cc037 feat!: 自动战斗不再允许使用带TR的导航关卡名禁用自动编队,改为自动检测 (#11868)
* fix: 自动战斗不再允许使用带TR的导航关卡名禁用自动编队,改为自动检测

* 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-02-13 09:49:44 +08:00
MistEO
c5d36d0bf9 chore: 修改mirrorc线路 2025-02-13 01:25:09 +08:00
github-actions[bot]
76c315882d chore: Auto Update Game Resources - 2025-02-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13290844408

[skip changelog]
2025-02-12 17:06:11 +00:00
Constrat
6d99a935d9 i18n: missing spaces after 「」
[skip changelog] [skip ci]
2025-02-12 18:02:45 +01:00
Constrat
334e99026d i18n: missing strings from zh-cn 2025-02-12 17:59:50 +01:00
uye
a8d68dd72d chore: 简化干员名正则 2025-02-13 00:53:06 +08:00
uye
39fdfac0c1 chore: 资源更新后重载 BattleData (#11874) 2025-02-12 21:47:38 +08:00
Constrat
687ebe8827 style: validator.ps1 improved logging 2025-02-12 13:21:50 +01:00
Constrat
dd6aeee59c feat: bypass update resources in formatting cases (#11867) 2025-02-12 12:59:16 +01:00
status102
559c588472 rft: WpfGui引入AsstTaskType代替硬编码 (#11856)
rft: AsstTaskType
2025-02-12 19:44:43 +08:00
uye
96ce68340d perf: 资源更新后无需重启,优化手动更新逻辑 (#11857)
* perf: 资源更新后无需重启,优化手动更新逻辑

* chore: 添加注释

* chore: 重复触发更新时提前返回
2025-02-12 17:51:26 +08:00
BxFS
538f734cc8 fix: Roguelike InitialDrop: SquadDefault -> Squad-EnterPoint (#11870)
fix: Roguelike InitialDrop: Roguelike SquadDefault -> Roguelike Squad-EnterPoint
2025-02-12 17:44:48 +08:00
github-actions[bot]
b321264add chore: Auto Update Game Resources - 2025-02-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13280763199

[skip changelog]
2025-02-12 08:08:09 +00:00
status102
383a3ee34f fix: 肉鸽开局无法选择指挥分队时放弃探索 (#11847)
* fix: 肉鸽开局无法选择指挥分队时放弃探索

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

* fix: 无法选择指挥分队时,随机选一个

* chore: YoStarEN `Squad-EnterPoint`

* chore: 增大EN服roi

* chore: txwy

* chore: jp

* chore: kr

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-02-12 15:58:02 +08:00
Hao Guan
b085aa2d80 chore(mac): MirrorChyan域名 2025-02-12 15:16:41 +08:00
Hao Guan
6b52105797 feat(mac): 肉鸽参数配置新参数 (#11866) 2025-02-12 08:50:32 +08:00
github-actions[bot]
819b74e8ee chore: Auto Update Game Resources - 2025-02-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13271545330

[skip changelog]
2025-02-11 20:06:48 +00:00
github-actions[bot]
1e2ded6dde chore: Auto Update Game Resources - 2025-02-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13266778500

[skip changelog]
2025-02-11 15:44:29 +00:00
HY
7b78e0762e chore: 繁中服「巴別塔」活動導航 (#11863)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-02-11 16:36:20 +01:00
status102
632ff2b027 fix: 自动编队干员选择错误 2025-02-11 21:41:37 +08:00
status102
7799d94699 fix: 自动编队错误
[skip changelog]

fix #11859
2025-02-11 21:29:13 +08:00
status102
d61a7b5e5d perf: MaaCore PackageTask中未进入的subtask将不再输出log (#11783)
perf: 未进入的subtask将不再输出log
2025-02-11 18:27:13 +08:00
status102
d54c408769 perf: 自动战斗BattleStartPre任务合并理智药检测 2025-02-11 14:33:43 +08:00
status102
8ce492dbae fix: Wpf自动战斗无法连接到模拟器后不能自动停止 2025-02-11 14:33:35 +08:00
github-actions[bot]
6985a93b59 chore: Auto Update Game Resources - 2025-02-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13256885880

[skip changelog]
2025-02-11 06:08:22 +00:00
github-actions[bot]
7b737a85f9 chore: Auto Update Game Resources - 2025-02-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13256477009

[skip changelog]
2025-02-11 05:28:38 +00:00
uye
f3f6dd40f1 chore: 修改 MirrorChyan 官网链接 2025-02-11 13:16:34 +08:00
Manicsteiner
c350b62cd2 feat: YostarJP Sarkaz roguelike preload (#11850) 2025-02-11 12:03:47 +08:00
晓丶梦丶仁
0e95ef2192 chore: issue_template bug-report Version 处添加提示 (#11848)
* chore: issue_template bug-report Version 处添加提示

* style: 空格
2025-02-11 12:02:40 +08:00
status102
aaa6aa35bc rft: Wpf肉鸽任务RoguelikeMode参数类型改为int (#11821)
* rft: Wpf肉鸽任务RoguelikeMode参数类型改为int

* fix: UI同步
2025-02-11 11:02:40 +08:00
status102
7b3ba914de perf: 肉鸽投资在同一局内投资系统错误后不再进入投资插件 (#11826) 2025-02-11 11:01:02 +08:00
MistEO
7b547ed88c ci: add retry for macui (#11817)
* ci: add retry for macui

---------

Co-authored-by: Hao Guan <10684225+hguandl@users.noreply.github.com>
2025-02-11 10:51:36 +08:00
dependabot[bot]
7367e9c4e8 ci: bump apple-actions/download-provisioning-profiles from 1 to 3 in /.github/workflows in the github-actions group (#11849)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-11 09:30:01 +08:00
status102
6013c42cd4 Revert "fix: 肉鸽未提供指挥分队时用OCR随便选一个 (#11843)"
This reverts commit fe2dfe1d65.
2025-02-10 19:50:00 +08:00
Constrat
95aa8c9560 i18n: various english tweaks
[skip changelog]
2025-02-10 12:47:59 +01:00
MistEO
d6cf18bd5c chore: update mirrorc tips (#11832)
* chore: update mirrorc tips

* chore: tips翻译调整

* i18n: 修改翻译

* chore: 统一tips

* chore: update cn tips

* chore: 调整 enum 命名

* i18n: 调整翻译

* chore: 调整 UpdateSettings 中文翻译

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-02-10 19:35:17 +08:00
status102
f1ab78279e chore: 上调MaaCore Log Rotate阈值为64MB (#11834) 2025-02-10 17:38:13 +08:00
status102
122f6dfc60 rft: Wpf公告存储拆分 (#11825)
* rft: Wpf公告存储拆分

* rft: 拆分中英公告
2025-02-10 16:20:52 +08:00
status102
dd7517fb67 perf: 自动战斗自动编队在选择职业前编入非干员组干员 (#11830) 2025-02-10 15:44:13 +08:00
status102
656256dc66 fix: null check (#11831)
[skip changelog]
2025-02-10 15:38:18 +08:00
status102
aa4bd03e38 rft: 肉鸽局内参数重构遗留 (#11829)
trader_no_longer_buy & team_full_without_rookie
2025-02-10 15:35:26 +08:00
status102
888a39837d fix: 移除账号切换中不必要的任务 (#11820)
beabba92e3
2025-02-10 15:32:39 +08:00
status102
81b8fa2114 fix: Wpf公告内容显示错误显示为上次内容 (#11824) 2025-02-10 15:31:42 +08:00
status102
83804a7668 docs: 肉鸽参数注释
team_full_without_rookie
2025-02-10 14:46:18 +08:00
BxFS
fe2dfe1d65 fix: 肉鸽未提供指挥分队时用OCR随便选一个 (#11843)
* fix: SquadBackup for situations missing SquadDefault

* refactor: redundant SquadBackup
2025-02-10 14:35:50 +08:00
uye
32d519b272 i18n: 添加翻译 2025-02-09 17:18:48 +08:00
uye
71a2e7f619 chore: 优化界面布局与翻译 2025-02-09 16:57:39 +08:00
uye
38f22e2aa0 chore: DidYouBuyWine 先给注释掉了,41看看有啥活
[skip changelog]
2025-02-09 14:07:18 +08:00
uye
4390ec12b5 chore: MaaVersionClick 的 EasterEggs丢了
[skip changelog]
2025-02-09 12:07:43 +08:00
uye
9a138670c3 chore: 等待延迟前打个日志 2025-02-09 10:23:28 +08:00
status102
39b03e4720 fix: Wpf公告内容显示错误显示为上次内容 2025-02-09 09:36:35 +08:00
status102
8b6cb46655 chore: using (#11823)
[skip changelog]
2025-02-09 08:50:01 +08:00
MistEO
7969378335 ci: fix ci name 2025-02-09 02:52:26 +08:00
uye
547b95a473 Release v5.13.0-beta.7 (#11807)
刷理智最后一次上报失败可能会直接崩溃
2025-02-09 02:29:55 +08:00
github-actions[bot]
13a549a015 docs: Auto Update Changelogs of v5.13.0-beta.7 (#11814)
* docs: Auto Generate Changelog of Release v5.13.0-beta.7

* 更新 CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-02-09 02:26:09 +08:00
uye
2e707458c7 chore: 添加翻译 2025-02-09 02:16:12 +08:00
MistEO
79465ac833 ci: force trigger mirrorchyan release note 2025-02-09 02:12:57 +08:00
uye
ef78c399b9 chore: 取消更新源选择框 2025-02-09 02:05:06 +08:00
MistEO
918ecba24e ci: Create mirrorchyan_release_note.yml (#11816) 2025-02-09 01:44:16 +08:00
MistEO
86663ad2d2 feat: update maa self by mirrorc (#11812)
* feat: update maa self by mirrorc

* refactor: 调整代码

* chore: miss await

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-02-09 01:27:33 +08:00
MistEO
59af6900ad ci: force trigger mirrorc for release 2025-02-09 00:38:01 +08:00
uye
c9e257ea1a chore: debug 不检查资源更新
[skip changelog]

close #11802
2025-02-08 22:30:59 +08:00
Constrat
eaac213d4f docs: change gamedata repo 2
[skip changelog]
2025-02-08 15:21:11 +01:00
Constrat
67a8c4860d docs: change gamedata repo 2025-02-08 15:20:04 +01:00
status102
c47e48a9b6 fix: 肉鸽开局烧水奖励领取失败 2025-02-08 20:09:52 +08:00
status102
f9399fc1d9 rft: Wpf肉鸽任务界面主题参数调整 2025-02-08 19:21:30 +08:00
status102
61db62b21d Revert "rft: 任务执行期间Log Rotate增加检查,并上调阈值至64MiB (#11670)"
This reverts commit 027aaea799.

Revert "fix: rotate_check 位置错误"

This reverts commit 463b4a02ea.

Revert "chore: 单独为肉鸽添加日志检查"

This reverts commit 6342391243.

Revert "chore: 移除过于消耗性能的检查"

This reverts commit 918cebcaf0.

fix #11801
2025-02-08 19:20:44 +08:00
Hao Guan
a1b8c0d103 feat(mac): 开始唤醒支持账号切换 (#11803) 2025-02-08 18:52:42 +08:00
晓丶梦丶仁
a6f99a3e4d chore: issue 模板 将阅读提醒提至 label (#11804)
* chore: issue 模板 将阅读提醒提至 label

* Update .github/ISSUE_TEMPLATE/cn-bug-report.yaml

Co-authored-by: 萨拉托加 <151550168+Saratoga-Official@users.noreply.github.com>

---------

Co-authored-by: 萨拉托加 <151550168+Saratoga-Official@users.noreply.github.com>
2025-02-08 18:00:46 +08:00
uye
72ac9f094d chore: 启动弹出公告前检查内容是否为空 2025-02-08 15:33:09 +08:00
uye
463b4a02ea fix: rotate_check 位置错误 2025-02-08 15:22:00 +08:00
MistEO
6342391243 chore: 单独为肉鸽添加日志检查 2025-02-08 14:48:20 +08:00
MistEO
918cebcaf0 chore: 移除过于消耗性能的检查 2025-02-08 14:36:53 +08:00
MistEO
f455f1425b revert: "fix: 修复上传卡住的问题"
This reverts commit 0d82b1a976.
2025-02-08 14:24:18 +08:00
github-actions[bot]
9e6192db8c chore: Auto Update Game Resources - 2025-02-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13211117921

[skip changelog]
2025-02-08 01:52:10 +00:00
Constrat
d690ecd363 chore: remove duplicates in tasks for global 2025-02-07 20:52:57 +01:00
github-actions[bot]
5420d33c7d chore: Auto Update Game Resources - 2025-02-07
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13206816100

[skip changelog]
2025-02-07 19:38:57 +00:00
Constrat
72355204fc refactor: switch gamedata repos for workflow (#11799)
* refactor: switch gamedata repos for workflow

* refactor: switch gamedata repos for workflow fix

* fix: I'm stupid

* fix: main.cpp resource updater

* ci: fix ps1 script

* fix: I'm stupid 2
2025-02-07 20:35:45 +01:00
HX3N
4e3a0351d6 chore: add missing text for YostarKR (#11798) 2025-02-08 02:22:42 +08:00
github-actions[bot]
b281c993e0 chore: Auto Update Game Resources - 2025-02-07
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13205480241

[skip changelog]
2025-02-07 18:07:49 +00:00
Constrat
34acb5b739 chore: add missing text for YostarEN 2025-02-07 18:48:02 +01:00
uye
038789f301 feat: 自动战斗遇到不支持的关卡时尝试检测资源版本更新 2025-02-08 01:46:43 +08:00
uye
5f784bdf41 chore: 调整界面 2025-02-08 01:19:04 +08:00
uye
9e81a4cc4f Release v5.13.0-beta.6 (#11786) 2025-02-08 00:41:44 +08:00
github-actions[bot]
e23b0b4d2b docs: Auto Update Changelogs of v5.13.0-beta.6 (#11791)
* docs: Auto Generate Changelog of Release v5.13.0-beta.6

* Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-02-08 00:40:36 +08:00
晓丶梦丶仁
ba7f837c3f fix: KR 黑角 OCR (#11794) 2025-02-07 23:29:42 +08:00
Constrat
28e9076e82 fix: border not displaying for http proxy in versionupdatesettings 2025-02-07 15:44:52 +01:00
晓丶梦丶仁
32f80411a8 fix: JP 塑心 OCR (#11792) 2025-02-07 20:21:07 +08:00
Constrat
21cd004974 feat: Paradox Simulation update UI for YoStar (#11793)
chore: remove tasks and delete stale templates
2025-02-07 12:59:56 +01:00
uye
01504ff404 refactor: 重构公告 (#11734)
* refactor: 重构公告

* chore: 公告可数

* chore: TrimEnd -

* fix: 多余删除的 \n

* chore: 修改返回类型

* style: unused using

* chore: 标题支持多行显示

* chore: add english version of noskland

* feat: Switch image based on language

* chore: 点击 Listbox 时 ScrollViewer 滚动到最顶端

* chore: 加个预览图

* chore: 设计时预览

* fix: ---- 没移掉)

* chore: Content 也显示标题内容

* chore: 隐藏按钮

* perf: 优化分隔符删除

* chore: 压缩下图片

* feat: 调整公告关闭按钮布局

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
2025-02-07 19:00:24 +08:00
status102
3f5ab514c0 fix: RoguelikeTheme check
[skip changelog]
2025-02-07 17:22:28 +08:00
status102
01c794b83e fix: 肉鸽非投资模式禁用种子刷钱 2025-02-07 17:16:53 +08:00
status102
14942259e5 fix: 肉鸽烧水分队兼容
fix#11739
2025-02-07 17:14:23 +08:00
晓丶梦丶仁
33e8eefc6e ci: remove pre-commit workflow check (#11788)
* ci: remove pre-commit workflow check

* Revert "ci: remove pre-commit workflow check"

This reverts commit f1708eaa84.

* ci: issue template check
2025-02-07 16:57:42 +08:00
Rbqwow
878b651765 feat: add format hint for proxy setting (#11781)
* feat: add format hint for proxy setting

* fix: SOCKS 到底为什么是全大写的
2025-02-07 16:38:32 +08:00
status102
d8c1fe8108 fix: 禁止RoguelikeStatus拷贝 2025-02-07 15:51:03 +08:00
status102
b96af4cc02 fix: remove wrong commit 2025-02-07 13:25:49 +08:00
status102
349a5b792a rft: 移除RoguelikeLastRewardSelectTaskPlugin,合并烧水奖励选择 2025-02-07 13:25:48 +08:00
status102
06497e1d9a perf: 肉鸽满级移除前置任务检查
eaecef60d1 修改肉鸽开始探索重试
2025-02-07 13:25:48 +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
Hao Guan
551aab1cfb feat(mac): 支持Mirror酱资源更新 (#11768)
* feat(mac): Mirror酱资源更新

* ci: macOS workflow update
2025-02-07 12:35:53 +08:00
晓丶梦丶仁
4f37edcbaf ci(fix): pre-commit.ci prettier hook (#11780)
* ci: 添加 files 字段

* ci: 指定resource路径

* test: 真的递归判断吗

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

* ci: files 换个写法

* ci: files 再换个写法

* ci: 把 files 写全

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-02-07 10:45:57 +08:00
BxFS
3dfee0ac65 fix: CheckLevelMax OCR (#11764) 2025-02-06 22:51:37 +08:00
uye
515b453da4 chore: 调整界面布局 2025-02-06 22:50:48 +08:00
MistEO
0d82b1a976 fix: 修复上传卡住的问题
fix 11770
2025-02-06 22:34:04 +08:00
MistEO
911f2b4bab feat: 添加mirror酱备用线路 (#11777)
* feat: add mirrorc line2

* chore: add logs

* chore: fix replace

* fix: wrong replace
2025-02-06 22:26:16 +08:00
uye
387c6e298b chore: 添加 MirrorChyan 检查更新日志 2025-02-06 21:33:11 +08:00
github-actions[bot]
3712be5b70 chore: Auto Update Game Resources - 2025-02-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13177386747

[skip changelog]
2025-02-06 11:06:04 +00:00
MistEO
12d63cbc2c fix: mirrorc package name 2025-02-06 18:53:13 +08:00
MistEO
6cf10a2c8f ci: use mirrorchyan uploading action 2025-02-06 18:10:41 +08:00
晓丶梦丶仁
c94a0b546a fix: use_skill 在按下停止按钮后不退出 (#11761) 2025-02-06 16:01:00 +08:00
status102
ff51c61744 chore: 减少肉鸽插件不必要函数 2025-02-06 10:50:18 +08:00
晓丶梦丶仁
2ba65cb802 chore(fix): issue_template 的公告链接会导致 mention (#11762)
fix: issue_template 的公告链接会导致 mention
2025-02-06 05:59:04 +08:00
uye
80d85aafe8 fix: Resource Check ret 判断错误 2025-02-05 18:32:04 +08:00
status102
d7bff50abd rft: 简化肉鸽局中数据存储 (#11581)
* rft: 简化肉鸽局中数据存储

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

* perf: 设定容器容量

* perf: 优化调用

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-02-05 18:07:49 +08:00
status102
bad87d0d5e chore: 减少肉鸽插件load_params log输出 2025-02-05 17:21:00 +08:00
status102
c08f38eb2e fix: 肉鸽开始探索反复重试后结束
fix #11755
2025-02-05 17:20:38 +08:00
github-actions[bot]
ad793ba764 chore: Auto Templates Optimization
Triggered by b1ba539945

[skip changelog]
2025-02-05 09:03:52 +00:00
github-actions[bot]
b1ba539945 chore: Auto Update Game Resources - 2025-02-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13153693252

[skip changelog]
2025-02-05 09:02:55 +00:00
Tsukiyowu
663d017a1f fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题 (#11756)
* fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题

* fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题

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

* fix: 修复国际服无法通过文字OCR识别关闭雷电模拟器弹窗的问题

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-02-05 15:39:59 +08:00
晓丶梦丶仁
2dc0f84dcc fix: 狭路相逢事件识别失败 (#11752)
* fix: 狭路相逢事件识别失败

* fix: 中文符号
2025-02-05 15:39:11 +08:00
晓丶梦丶仁
79371dc12f chore: 在 issue_template 中添加链接 (#11751)
* chore: 在 issue_template 中添加链接

* docs: 英文缩进

* docs: 英文描述

* chore: en feature request 删除 faqs
2025-02-05 15:01:36 +08:00
uye
c31fdccbfb chore: 远程控制也添加存储加密 2025-02-05 13:36:35 +08:00
uye
7701272539 chore: 修改 Copilot 界面提示 2025-02-05 11:00:26 +08:00
MistEO
66957eef90 chore: trim mirrorchyan cdk 2025-02-04 23:53:05 +08:00
uye
7738532199 chore: 资源更新和检查更新分开 2025-02-04 22:57:55 +08:00
Tsukiyowu
0d9f495e05 perf: 开始任务自动关闭雷电模拟器 Google 套件窗口 (#11748)
* perf: 开始任务自动关闭雷电模拟器 Google 套件窗口

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

* perf: 开始任务自动关闭雷电模拟器 Google 套件窗口

* perf: 开始任务自动关闭雷电模拟器 Google 套件窗口

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-02-04 22:36:56 +08:00
MistEO
25daf694c1 fix: 修复资源检查提示信息错误 2025-02-04 21:58:27 +08:00
status102
f7152c3061 chore: HttpService调整部分默认值 2025-02-04 12:08:59 +08:00
HY
f4ec9c1bcb fix: 繁中服「黍」辨識問題 (#11738) 2025-02-04 09:47:39 +08:00
MistEO
e080c65b70 ci: perf mirrorchyan download version 2025-02-04 05:02:57 +08:00
MistEO
a532ef9914 ci: remove useless var for mirrorchyan 2025-02-04 04:35:10 +08:00
Constrat
84126547ba style: workflow formatting
[skip changelog]
2025-02-03 21:20:55 +01:00
MistEO
690f2b8841 ci: add mirrorchyan uploading for release (#11735) 2025-02-04 04:17:45 +08:00
HY
1b57a27879 fix: 繁中服無法進入薩米肉鴿 (#11733) 2025-02-03 18:00:39 +01:00
HY
ffc7da7028 chore: 繁中服「懷黍離」導航入口再更動 (#11732) 2025-02-03 17:59:53 +01:00
status102
f62f37904d Release v5.13.0-beta.5 (#11730) 2025-02-03 23:46:19 +08:00
github-actions[bot]
62cb676b6a docs: Auto Update Changelogs of v5.13.0-beta.5 (#11731)
docs: Auto Generate Changelog of Release v5.13.0-beta.5

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-02-03 23:32:31 +08:00
uye
5f6dee8df5 chore: GetAsync catch 未处理 logUri 2025-02-03 19:07:12 +08:00
uye
d1eaff1d22 chore: 加个 json 解析 catch 2025-02-03 18:47:33 +08:00
status102
6e5708bb98 fix: 自动战斗勾选使用理智药时自动编队卡住 2025-02-03 16:51:11 +08:00
Roland125
2ede6097ad fix: 招募测试函数修复 (#11723) 2025-02-03 02:36:38 +08:00
Rbqwow
d2fa4e9b63 Release v5.13.0-beta.4 (#11720) 2025-02-03 02:00:02 +08:00
uye
9d3f859974 docs: 更新 CHANGELOG.md 2025-02-03 01:58:32 +08:00
github-actions[bot]
5f5c406a3d docs: Auto Update Changelogs of v5.13.0-beta.4 (#11721)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
2025-02-03 01:54:13 +08:00
Horror Proton
0f20c91e94 fix: recruitanalyzer return value [skip changelog] 2025-02-03 01:27:27 +08:00
status102
aaf5d826a3 Release v5.13.0-beta.3 (#11718) 2025-02-03 00:17:19 +08:00
github-actions[bot]
dad5bb71ee docs: Auto Update Changelogs of v5.13.0-beta.3 (#11719)
* docs: Auto Generate Changelog of Release v5.13.0-beta.3

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

* docs: changelog

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@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-02-03 00:15:46 +08:00
status102
036b2350e7 Revert "style: follow clang formatting"
This reverts commit 7113ea82aa.
2025-02-02 23:59:54 +08:00
status102
bc81f492f2 Revert "style: clang formatting"
This reverts commit bfe2e29249.
2025-02-02 23:59:46 +08:00
status102
2a78ca9a1b chore: include 2025-02-02 23:54:46 +08:00
uye
85cf5087f7 chore: 更新日志支持惯性运动 2025-02-02 23:40:03 +08:00
Constrat
bfe2e29249 style: clang formatting
[skip changelog]
2025-02-02 14:24:12 +01:00
Constrat
7113ea82aa style: follow clang formatting
[skip changelog]
2025-02-02 13:53:32 +01:00
status102
e5d9f1a191 fix: 肉鸽开局干员使用助战失效
fix MaaAssistantArknights/MaaAssistantArknights#11709
2025-02-02 18:02:07 +08:00
Horror Proton
b888a3e064 fix: fix return value of RecruitImageAnalyzer
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/11600
2025-02-02 17:45:25 +08:00
status102
15bf60f397 fix: 移除二次检查
[skip changelog]
2025-02-02 15:44:55 +08:00
status102
35ab099cce fix: 肉鸽烧水使用分队失效 2025-02-02 15:25:03 +08:00
筱竹聽雨
36ea07b076 perf: 优化存亡之战部署策略 (#11706)
优化存亡之战部署策略
2025-02-02 12:35:41 +08:00
status102
f05c860692 fix: Wpf肉鸽烧水时使用分队UI为空 2025-02-02 10:41:00 +08:00
status102
bee9c1c045 Revert "fix: Wpf肉鸽烧水时使用分队UI为空"
This reverts commit 40f7bc9185.
2025-02-02 10:36:51 +08:00
status102
f5c2b951c6 fix: 自动战斗开始战斗时使用理智药检测失效
fix MaaAssistantArknights/MaaAssistantArknights#11701
2025-02-02 10:09:40 +08:00
github-actions[bot]
6ac39062f2 docs: Auto Update Changelogs of v5.13.0-beta.2 (#11708)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2025-02-02 04:52:35 +08:00
MistEO
31c5e9b29c perf: mirrorchyan toast 2025-02-01 21:09:53 +01:00
MistEO
87faeb12dd fix: mirror-chyan notify error 2025-02-01 20:58:36 +01:00
MistEO
e24d8109ff fix: missing user_agent param for mirrorchyan query 2025-02-01 20:58:24 +01:00
github-actions[bot]
f417f8caae docs: Auto Update Changelogs of v5.13.0-beta.1 (#11703)
* docs: Auto Generate Changelog of Release v5.13.0-beta.1

* docs: add discord invite link + tweak

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-02-01 16:12:54 +01:00
status102
40f7bc9185 fix: Wpf肉鸽烧水时使用分队UI为空 2025-02-01 20:50:06 +08:00
Constrat
6472a448a9 style: fix pre-commit.ci
[skip changelog]
2025-02-01 13:28:34 +01:00
status102
80bfdfa257 perf: 简化肉鸽任务使用助战参数内部存储流程 2025-02-01 20:01:32 +08:00
status102
8477690784 i18n: Mirror酱说明调整 2025-02-01 18:02:34 +08:00
uye
b09eb7cb42 chore: NoSkland 放到 wpf 内部 2025-02-01 17:20:41 +08:00
uye
fc15bad06c chore: CDK 大写
[skip changelog]
2025-02-01 16:55:48 +08:00
uye
ed8b0bcc06 i18n: 添加资源更新提示翻译 2025-02-01 16:03:42 +08:00
status102
59bdc266e9 style: format 2025-02-01 15:40:32 +08:00
uye
9c196d080a feat: 添加资源更新提示 2025-02-01 15:26:13 +08:00
晓丶梦丶仁
d7deb04c74 perf: 将Sarkaz开局添加负荷干员的进入任务改为范围点击 (#11100)
perf: 将开局添加负荷干员的进入任务改为范围点击
2025-01-31 10:23:38 +08:00
Rbqwow
ffab8ec14d docs: 推荐分辨率720P或1080P (#11651)
* docs: 推荐分辨率720P或1080P

* docs: 学姐太啰嗦辣

* docs: 二选一!
2025-01-31 09:49:24 +08:00
status102
027aaea799 rft: 任务执行期间Log Rotate增加检查,并上调阈值至64MiB (#11670)
* fix: Log Rotate在任务执行期间不进行检查导致单体log文件过大

* fix: unsigned type

* perf: 加锁

* perf: 加锁优化

* perf: 上调log单文件大小至64MiB

* perf: 继续优化

* perf: 优化加锁

* fix: 64MB
2025-01-30 23:13:02 +08:00
晓丶梦丶仁
9459388036 fix: 肉鸽临时招募预备干员时, 不额外提升权重 (#11442)
fix: 尝试修复临时招募预备干员的权重过高
2025-01-30 22:22:19 +08:00
uye
684b2c787d chore: 密钥改成 PasswordBox 2025-01-30 19:12:57 +08:00
wryx166
d6eed05b35 docs: 替换.NET8 桌面运行时下载链接为直链 (#11693)
docs: Update faq.md
2025-01-30 02:56:23 +08:00
uye
f28bff152b chore: 免得点一次小眼睛就改一次配置文件
[skip changelog]
2025-01-30 00:50:13 +08:00
uye
a473c610d8 feat: CDK 改为密码框 2025-01-30 00:43:12 +08:00
Rbqwow
786b72e55c fix: 公告窗口触控板滚动异常 (#11684) 2025-01-29 23:33:00 +08:00
Constrat
2d0c19a2f7 i18n: remove chinese punctuation from en 2025-01-29 13:41:35 +01:00
萨拉托加
c6c1832bc6 chore: JP 艾雅法拉 ocrReplace (#11685)
* chore: JP 艾雅法拉 ocrReplace

不能直接正则,还是直接替换吧

* chore: 试试双斜杠转义行不行

* fix: Update resource/global/YoStarJP/resource/tasks.json

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-01-29 19:54:00 +08:00
status102
0ce4006b5e rft: 调整肉鸽选择烧水奖励任务链,重新将Roguelike@LastRewardConfirm并入主任务链 (#11689)
- close #11688, close #11683
2025-01-29 17:29:03 +08:00
status102
d00e26d0fd rft: 调整肉鸽选择烧水奖励任务链,重新将Roguelike@LastRewardConfirm并入主任务链 2025-01-29 17:06:04 +08:00
status102
6b877bcf8f rft: 迁移RoguelikeStartSelect 2025-01-29 16:25:54 +08:00
uye
b4e595ce3b feat: 添加 MirrorChyan 资源更新方式 (#11669)
Co-authored-by: MistEO <mistereo@hotmail.com>
2025-01-29 02:16:16 +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
Constrat
74dd9d2c40 fix: styling 2025-01-28 12:56:36 +01:00
Constrat
1e69ae827e chore: add discord link to main readme 2025-01-28 12:56:05 +01:00
Constrat
8f2fe6a334 feat: Discord link in About Us 2025-01-28 12:14:26 +01:00
Rbqwow
65ff54b98d chore: 修改划火柴设置界面布局 (#11682) 2025-01-28 18:42:24 +08:00
DavidWang19
a5ba2d94e0 fix: 添加不期而遇新事件空无前兆 (#11573) 2025-01-28 17:30:57 +08:00
github-actions[bot]
b4be266d15 chore: Auto Update Game Resources - 2025-01-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/13004384595

[skip changelog]
2025-01-28 05:44:29 +00:00
github-actions[bot]
d6a7e7fe5a chore: Auto Templates Optimization
Triggered by 9ba7ead6c8

[skip changelog]
2025-01-28 05:39:13 +00:00
uye
9ba7ead6c8 feat: 适配新 ui 未进驻选项 2025-01-28 13:38:39 +08:00
teldd1
ce0beb62a1 fix: Attempt retry once screencap for MumuExtras (#11550) 2025-01-27 23:59:01 +08:00
status102
6b7b78802b chore: 繁中划火柴说明没删干净
[skip changelog]
2025-01-27 18:05:43 +08:00
status102
4f62898f31 chore: WpfGui划火柴相关说明调整
回退 57fbe81be1 中对划火柴模式的简中说明调整,并与其他语言尽量保持一致
2025-01-27 17:54:03 +08:00
晓丶梦丶仁
dc8951dd89 perf: 萨卡兹肉鸽不期而遇统一使用默认策略 (#11512) 2025-01-26 20:20:36 +08:00
晓丶梦丶仁
1054cfe93c fix: 肉鸽作战编队截图过快导致截图与实际不符 (#11527) 2025-01-26 20:16:24 +08:00
晓丶梦丶仁
40fa5f8161 Revert "perf: 肉鸽优先拿美愿 (#11558)" (#11565)
This reverts commit 8f5ee4819e, reversing
changes made to 0b0486a4ee.
2025-01-26 20:12:29 +08:00
status102
ea4bffeaa5 fix: 肉鸽烧水未获得目标奖励逻辑补漏
关联 85d928f2e6
2025-01-26 16:08:02 +08:00
status102
a329d55857 fix: 幸运墙领取奖励界面识别过早
fix MaaAssistantArknights/MaaAssistantArknights#11667
2025-01-26 10:15:26 +08:00
Constrat
d7d1f7f2e8 feat: en announcement wpf logic 2025-01-25 16:15:23 +01:00
status102
2b77443ddc ci: pr-checker output
[skip changelog]
2025-01-25 17:13:01 +08:00
status102
85d928f2e6 fix: 临时处理肉鸽烧水flag异常 2025-01-25 16:40:13 +08:00
HY
8688baa623 chore: 繁中服「懷黍離」導航入口更動 (#11662) 2025-01-25 15:48:43 +08:00
uye
ce67295e7d perf: 小工具-仓库识别 隐藏黑边 2025-01-25 02:04:06 +08:00
uye
e79efce17d chore: 调整基建办公室阈值 2025-01-25 02:04:06 +08:00
uye
a40dde9432 chore: 调整 InfrastBottomLeftTab 的 specificRect 2025-01-25 02:04:05 +08:00
Constrat
e785b540c7 ci: disable cache for pnpm (#11653)
test: disable cache for pnpm
2025-01-24 12:48:55 +01:00
uye
2f8dfa3a36 Release v5.12.3 (#11639)
Important stuff for global:
- e71e817577: fixes base navigation
- 9b55aad993: fixes base entering from
siege
2025-01-24 16:30:13 +08:00
uye
c0730c419f docs: Update CHANGELOG.md 2025-01-24 16:23:57 +08:00
github-actions[bot]
a7e5f6ff5f chore: Auto Update Game Resources - 2025-01-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12945163495

[skip changelog]
2025-01-24 07:26:10 +00:00
status102
600cee7395 feat: HttpClient配置Gzip等压缩 2025-01-24 15:15:11 +08:00
HY
14f414f6ca fix: 繁中服-生息演算中,完成生存週期畫面、大地圖畫面卡住 (#11649) 2025-01-24 15:07:38 +08:00
XuQingTW
7d8ab5e77a feat: 繁中服更新活動導航"懷黍離" (#11592)
chore: 繁中服更新活動導航"懷黍離"
2025-01-24 15:07:03 +08:00
HY
3eee1c769a chore: 補上繁中服的加工站、訓練室相關內容 (#11648)
* chore: 補上繁中服的加工站、訓練室相關內容

* 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-01-24 14:51:17 +08:00
uye
7095790129 chore: 调整基建发电站阈值 2025-01-24 13:56:20 +08:00
HY
b831a11746 fix: 繁中服 生息演算讀檔畫面卡住 (#11646)
fix: 生息演算讀檔畫面卡住
2025-01-24 13:48:54 +08:00
uye
0dbe5ac09c chore: 调整基建宿舍阈值 2025-01-24 13:46:59 +08:00
uye
f2ff8d3248 docs: Update CHANGELOG.md 2025-01-24 10:35:04 +08:00
uye
0ec0cdbff1 fix: 基建修复4 (#11642)
* fix: 基建修复4

* 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-01-24 10:32:31 +08:00
Rbqwow
1bc82628f6 docs: README 移除 MaaX,更换前端仓库地址 (#11636) 2025-01-24 10:15:20 +08:00
Constrat
3a90c008b0 docs: update changelog 2025-01-24 02:07:11 +01:00
Constrat
e71e817577 fix: 38c8dd8 68357b9 modified base tasks in Official. Global needs custom ROI to work 2025-01-24 01:16:25 +01:00
github-actions[bot]
cbf7a61260 chore: Auto Templates Optimization
Triggered by 9b55aad993

[skip changelog]
2025-01-23 21:31:58 +00:00
Constrat
9b55aad993 fix: 380bf68 modified Base Infrast Siege for all clients. Reverting for global and co. 2025-01-23 22:31:11 +01:00
uye
1d50dc1587 Release v5.12.2 (#11631) 2025-01-24 00:46:16 +08:00
uye
6ed439063b docs: Update CHANGELOG.md 2025-01-24 00:44:42 +08:00
uye
64ea49044a Release 5.12.2 (#11630) 2025-01-24 00:43:15 +08:00
uye
6802be2a34 docs: Update CHANGELOG.md 2025-01-24 00:43:02 +08:00
uye
38c8dd81e1 fix: 基建修复3 (#11629)
* fix: 反复进出训练室

* fix: 宿舍识别错误

* chore: 更新基建模板

* 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-01-24 00:32:58 +08:00
uye
df96a45b4f fix: 基建确认按钮 2025-01-23 23:06:36 +08:00
uye
8139eca40f Release v5.12.1 (#11624) 2025-01-23 22:06:55 +08:00
uye
aa7e949df9 docs: Update CHANGELOG.md 2025-01-23 21:53:37 +08:00
uye
68357b95bf fix: 基建修复2 (#11618)
* fix: 偶现无法进入训练室

* chore: 更新截图

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

* fix: 有时候点不到设施的确认按钮,沟槽的侧边栏遮挡点击的范围怎么还能变大的

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-01-23 21:48:38 +08:00
HY
1ca9ca4112 feat: 繁中服 生息演算【沙洲遺聞】 (#11620)
* feat: 繁中服 生息演算【沙洲遺聞】

* 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-01-23 12:55:12 +01:00
AoXuan
380bf68cfc fix: “围攻”主题 基建无法打开 (#11615)
* 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-01-23 16:19:16 +08:00
Alisa
93f431431f i18n: Translations update from MAA Weblate (#11607)
* i18n: Translated using Weblate (English (United States))

Currently translated at 97.4% (798 of 819 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/en_US/

* i18n: Translated using Weblate (Japanese)

Currently translated at 97.6% (800 of 819 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/ja/

* i18n: Translated using Weblate (Korean)

Currently translated at 97.5% (799 of 819 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/ko/

* i18n: Translated using Weblate (Chinese (Traditional))

Currently translated at 98.0% (803 of 819 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/zh_Hant/

---------

Co-authored-by: Anonymous <noreply@weblate.org>
2025-01-22 20:39:41 +01:00
github-actions[bot]
1e46f9234a chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12915554449

[skip changelog]
2025-01-22 19:24:55 +00:00
uye
13364bff65 chore: 导航塞 SideStoryStage 下面 2025-01-23 03:24:48 +08:00
uye
8d83ab15c5 Release v5.12.0 (#11606) 2025-01-23 03:14:03 +08:00
github-actions[bot]
bf034aab41 docs: Auto Update Changelogs of v5.12.0 (#11608)
* docs: Auto Generate Changelog of Release v5.12.0

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-01-23 03:13:37 +08:00
uye
6a7fb1643d chore: 我知道稳定版不稳定,所以就叫正式版吧 2025-01-23 03:09:46 +08:00
Sherkey Asher
51a336ae83 fix: 修复基建 (#11598)
* fix: 修复线索被选中标志

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

* fix: 默认主题和黑暗主题的基建图标

* fix: 修复萨米主题基建图标

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

* fix: 修复基建会客室图标识别

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

* fix: 修复主题 大荒城 的基建图标

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

* fix: 基建点击右上角进入的缩小状态模板错误

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

* fix: mini roi

* 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>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2025-01-23 03:05:34 +08:00
uye
e1ed7237a0 chore: 隐藏公告关闭窗口,底部添加关闭按钮 2025-01-23 01:42:21 +08:00
uye
9042abab6a refactor:提取 HandlePreviewMouseWheel 2025-01-23 01:42:21 +08:00
HY
902828dc49 feat: 繁中服 抽幸運牆的功能 (#11602)
feat: 繁中服 抽取龍門幸運牆
2025-01-22 14:36:40 +00:00
github-actions[bot]
7b0fbf9b23 chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12910341481

[skip changelog]
2025-01-22 14:28:44 +00:00
Constrat
0137f9ca11 feat(style): Colored logs for I.S. (#11593)
* feat: Colored logging for I.S. - Dark

* feat: Colored logging for I.S. - Light

* feat: Colored logging for I.S. - AsstProxy logic
2025-01-22 20:51:11 +08:00
github-actions[bot]
dcd7e0a7cf chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12905798158

[skip changelog]
2025-01-22 10:05:38 +00:00
Sherkey Asher
dc545a3ba5 feat: SideStory「相见欢」导航 (#11597) 2025-01-22 16:58:55 +08:00
github-actions[bot]
fc0fa1f078 chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12901577375

[skip changelog]
2025-01-22 05:06:19 +00: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
github-actions[bot]
ed42afa473 chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12900967839

[skip changelog]
2025-01-22 04:07:19 +00:00
status102
7058163f70 fix: 修复基建排班错误和加工站卡住 (#11590)
- close #11499, close #7081
2025-01-22 11:00:00 +08:00
github-actions[bot]
4ee96b8f10 chore: Auto Templates Optimization
Triggered by 0350521a58

[skip changelog]
2025-01-22 02:30:50 +00:00
github-actions[bot]
0350521a58 chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12899930282

[skip changelog]
2025-01-22 02:30:17 +00:00
github-actions[bot]
c91ac4d9dd chore: Auto Update Game Resources - 2025-01-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12899566943

[skip changelog]
2025-01-22 01:54:52 +00: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
Constrat
2359a6e113 perf: give priority to higher value choices in I.S. encounter.json (#11580)
chore: give priority to higher value choices in I.S. encounter.json
2025-01-21 21:31:17 +01:00
Constrat
89d7a3be49 style: fix clang format 2025-01-21 20:34:20 +01:00
status102
87088f7b55 style: include
[skip changelog]
2025-01-21 22:53:09 +08:00
status102
04cd0505c5 fix: 萨卡兹肉鸽种子存钱分队选择失败 2025-01-21 22:46:10 +08:00
萨拉托加
9c2b777b05 fix: tw 黍 百炼嘉维尔 OcrReplace (#11591)
* fix: 黍 OcrReplace

* fix: tw 黍 百炼嘉维尔 OcrReplace

翻阅log发现百炼嘉维尔也错了

* fix: 多复制了一个
2025-01-21 21:15:43 +08:00
HauKuen
ff4454c85b fix: 修复加工站重复执行问题
返回 false 会导致重复执行 on_run_fails 四次,#11415
2025-01-21 16:48:40 +08:00
HauKuen
9e0f58ca46 fix: 修复巫恋组错误应用到源石订单贸易站 2025-01-21 16:34:00 +08:00
Constrat
7d67cefd73 chore: remove duplicates in txwy tasks
[skip changelog]
2025-01-20 11:48:37 +01:00
AoXuan
dc70f2bf2e feat: 萨卡兹肉鸽卫士不语功战斗策略调整 (#11582)
* feat: 萨卡兹肉鸽卫士不语功战斗策略调整

* 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-01-20 18:40:22 +08:00
HX3N
b44b0472b9 chore: YostarKR Mizuki DataTraceBack (#11584)
* chore: YostarKR Mizuki DataTraceBack

* 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-01-20 11:36:24 +01:00
github-actions[bot]
623c930158 chore: Auto Update Game Resources - 2025-01-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12863579196

[skip changelog]
2025-01-20 08:08:28 +00:00
Constrat
f5188ea76c fix: reduce ROI to detect special value in Sami I.S. for EN 2025-01-19 17:37:30 +01:00
github-actions[bot]
2488031e83 chore: Auto Templates Optimization
Triggered by 499e18280a

[skip changelog]
2025-01-19 16:28:53 +00:00
Constrat
499e18280a fix: EN Sami GamePassSkip2 2025-01-19 17:28:34 +01:00
Manicsteiner
09a016b58b chore: YostarJP Mizuki DataTraceBack (#11579) 2025-01-19 16:54:16 +01:00
uye
2d367b55e3 chore: SimpleEncryptionHelper 新增 DataProtectionScope 参数 2025-01-19 23:07:04 +08:00
status102
70cefeb99c fix: 萨卡兹肉鸽使用种子刷钱参数存储分类错误 2025-01-19 22:42:17 +08:00
AoXuan
a832fb028e feat: 萨卡兹肉鸽卫士不语功战斗策略调整 (#11577) 2025-01-19 12:26:10 +00:00
github-actions[bot]
66a2c34be3 chore: Auto Templates Optimization
Triggered by 673e13f462

[skip changelog]
2025-01-19 11:00:18 +00:00
Constrat
673e13f462 fix: Phantom IS GamePass EN template 2025-01-19 11:59:57 +01:00
github-actions[bot]
1f04e25e13 chore: Auto Templates Optimization
Triggered by 4e71d5a186

[skip changelog]
2025-01-18 18:50:04 +00:00
Constrat
4e71d5a186 fix: EN Mizuki stuck on end screen 2025-01-18 19:49:47 +01:00
github-actions[bot]
30ce3bae48 chore: Auto Update Game Resources - 2025-01-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12846446525

[skip changelog]
2025-01-18 18:29:56 +00:00
uye
4271beb615 chore: 目录下存在 DEBUG_skill_ready.txt 时自动收集技能准备状态截图 (#11571)
* feat: 自动截图

* chore: 根目录下存在 DEBUG 或者 DEBUG.txt 时自动保存截图

* style: 优化格式

* chore: 目录下存在 DEBUG_skill_ready.txt 时自动保存截图
2025-01-19 01:28:56 +08:00
MYAknight
0ebf5e5bea feat: 萨卡兹肉鸽添加丛林密布,卡兹瀑布,遮天蔽日,有序清场,血脉之辩 (#11564)
* feat: 添加萨卡兹肉鸽丛林密布,卡兹瀑布,遮天蔽日,有序清场。调整了血脉之辩

优先考虑了维逻n12,焰苇,锏只能低难自律

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

* perf: Update 卡兹瀑布.json

* perf: Update 有序清场.json blacklist

* Update 血脉之辩.json

删除了血脉之辩错误的黑名单

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

* Update 遮天蔽日.json

修改了补充干员的错误坐标

* Update 卡兹瀑布.json

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-01-19 00:03:11 +08:00
Constrat
ada5eb0a0d ci: disable workflows for forks 2025-01-17 13:32:19 +01:00
github-actions[bot]
302fd92754 chore: Auto Templates Optimization
Triggered by 47535d2cdd

[skip changelog]
2025-01-17 11:47:51 +00:00
status102
47535d2cdd perf: 肉鸽战斗完成判定MissionCompletedFlag移除重复模板 2025-01-17 19:46:52 +08:00
uye
6de2f61076 chore: 不将已进驻的干员放入宿舍能用了吗?修了不知道有没有修好 2025-01-17 16:21:38 +08:00
Weiyou Wang
af861d03b5 refactor: [ recruitment tool ] use StrEnum instead of Enum for Theme (#11421)
refactor: use StrEnum instead of Enum for Theme
2025-01-17 14:26:23 +08:00
status102
5eb6737b0b chore: 长草任务ViewModel调整 2025-01-17 11:10:39 +08:00
status102
f333c420f0 rft: WpfGui重构 一键长草任务callback拆分 (#11548)
* rft: 通知拆分

* rft: 移动InvokeProcSubTaskMsg至TaskQueueViewModel

* perf: 优化调用
2025-01-17 10:05:20 +08:00
HX3N
22986f7a19 chore: YostarKR update OrudumActivities (#11563) 2025-01-16 23:28:26 +01:00
Constrat
a519a9eaee fix: incorrect ROI AS navigation for YostarEN & KR 2025-01-16 21:43:05 +01:00
Constrat
cf97aa4c18 fix: Resource Updater for YostarEN (AS-Event) 2025-01-16 18:32:09 +01:00
Constrat
b1a5f92916 feat: Bazaar Orundum activities YostarEN 2025-01-16 18:13:00 +01:00
Constrat
a50d48ddd1 ci: disable ccache (#11562) 2025-01-17 00:16:16 +08:00
Constrat
21a90dca17 fix: add delay to Roguelike@QuickFormation 2025-01-16 16:59:06 +01:00
github-actions[bot]
2deff411bf chore: Auto Update Game Resources - 2025-01-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12811691772

[skip changelog]
2025-01-16 15:06:21 +00:00
Manicsteiner
bac348b6e8 chore: YostarJP ocr update (#11561) 2025-01-16 15:51:52 +01:00
DavidWang19
8f5ee4819e perf: 肉鸽优先拿美愿 (#11558)
美愿给的藏品比不期而遇稳定且多数情况强力适合
2025-01-16 09:41:36 +00:00
uye
0b0486a4ee fix: 弹出公告或窗口时开始任务,进度条会显示在新窗口 2025-01-16 15:50:42 +08:00
github-actions[bot]
28c5d624c2 chore: Auto Update Game Resources - 2025-01-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12804046533

[skip changelog]
2025-01-16 07:25:46 +00:00
WWPXX
98d0777a79 优先美愿
大多数情况强力且适合
2025-01-16 13:03:17 +08:00
WWPXX
350b5b7023 优先美愿
美愿藏品大多数情况下会很适合切比较强力
2025-01-16 13:02:20 +08:00
github-actions[bot]
774bbf2c03 chore: Auto Update Game Resources - 2025-01-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12801521024

[skip changelog]
2025-01-16 03:28:46 +00:00
status102
3a43d26aef perf: 简化萨卡兹肉鸽种子入口 2025-01-16 11:26:13 +08:00
uye
a3ca02c8a5 chore: 剿灭任务失败不报错 2025-01-16 10:28:04 +08:00
github-actions[bot]
d0a84e0d0f chore: Auto Update Game Resources - 2025-01-15
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12794721573

[skip changelog]
2025-01-15 18:30:29 +00:00
不留
59f3667aa2 fix: 修复肉鸽种子模式引起的异常卡死 (#11552)
* fix: 优化种子存钱流程,避免卡死

* fix: Update tasks.json

* chore: 完善 task 注释

* fix: 加回不该乱删的字符(心虚

* perf: 命名、doc

* perf: Update tasks.json

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-01-16 02:10:13 +08:00
status102
81b0f4a988 fix: 94a8e01543 (#11553) 2025-01-16 00:01:51 +08:00
pre-commit-ci[bot]
be441991ca chore: Auto update by pre-commit hooks [skip changelog] 2025-01-15 15:38:17 +00:00
BxFS
794f1717a1 fix: Return-White.png 识别 (#11469)
* fix: remove edge from Return-White.png, possible fix for #11461

* fix: templThreshold for Return-White.png 0.8 -> 0.7

* doc: Return-White.png
2025-01-15 23:33:55 +08:00
status102
0549fd0347 fix: 94a8e01543 2025-01-15 23:28:21 +08:00
status102
ecaf6a8f53 perf: 延后WpfGui肉鸽开始探索次数输出至SubTaskCompleted 2025-01-15 23:21:10 +08:00
status102
102bc8cb31 perf: 肉鸽投资移除手中没钱时的额外检测重试 2025-01-15 23:18:30 +08:00
status102
c7d808c0bd style: format
[skip changelog]
2025-01-15 20:25:11 +08:00
status102
56e136e717 chore: tasks.json配置JsonSchema 2025-01-15 20:23:35 +08:00
status102
94a8e01543 fix: 截图失败时清空image_payload 2025-01-15 20:18:36 +08:00
status102
eaecef60d1 fix: 修复肉鸽开始探索重试时额外占用开始次数 2025-01-15 20:16:12 +08:00
Constrat
eafb294209 fix: empty string option 2025-01-14 23:44:47 +01:00
Constrat
7f0dd034c4 rft: reapply reclamation rft on taskqueueviewmodel 2025-01-14 19:37:22 +01:00
Constrat
caa7fac662 feat: InvertNullFunction method 2025-01-14 19:33:13 +01:00
status102
f6c0627e32 rft: WpfGui长草任务迁移至TaskQueue 2025-01-14 22:43:23 +08:00
status102
6dc64c65a2 rft: Wpf重构 拆分模拟器关闭相关 (#11547)
* rft: Wpf重构 拆分模拟器控制相关

* style: null check
2025-01-14 22:40:10 +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
502y
7afa244e6a feat: 优化下载速度显示 (#11541)
* feat: 优化下载速度显示

下载速度超过1MiB/s时以MiB/s为单位显示下载速度

* feat: apply review

* style: format

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2025-01-14 20:32:17 +08:00
Weiyou Wang
3fa01d304c feat: 萨卡兹肉鸽刷开局 2 构想 (#11277)
* feat: 萨卡兹肉鸽刷开局 2 构想

* feat: wpf 支持

* feat: 补上语言文件

* fix: 不太对劲,改改逻辑
2025-01-14 18:38:59 +08:00
jbwfu
ceb5d45085 fix: get display for General (#11516)
* fix: get display for General

* perf: Optimize screen resolution retrieval
2025-01-14 16:49:18 +08:00
github-actions[bot]
0a6e7b48c7 chore: Auto Templates Optimization
Triggered by 0938351e6a

[skip changelog]
2025-01-14 00:24:01 +00:00
Constrat
0938351e6a chore: YostarEN Phantom IS update run end skip 2025-01-14 01:23:41 +01:00
Weiyou Wang
432684550d fix: 生息演算为点击右上角天数任务添加重试机制 (#11540) 2025-01-13 18:39:51 +01:00
Constrat
681a09201a tools: ignore templates for overseas
[skip changelog]
2025-01-13 18:36:37 +01:00
github-actions[bot]
447fa76acb chore: Auto Templates Optimization
Triggered by 6d143de11b

[skip changelog]
2025-01-13 17:24:42 +00:00
Constrat
6d143de11b chore: missing templates yostaren phantom IS 2025-01-13 18:23:50 +01:00
Constrat
0e990e163c style: pre-commit annoys the fuck out of me
[skip changelog]
2025-01-13 15:35:40 +01:00
Horror Proton
86d422087f chore: remove -Werror from CMakeLists.txt
fix: #10512
2025-01-13 21:02:26 +08:00
Constrat
9b3f2874ed ci: use GITHUB_TOKEN and run only in org PRs 2025-01-13 13:42:39 +01:00
github-actions[bot]
ddf634ab30 chore: Auto Update Game Resources - 2025-01-13
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12746486126

[skip changelog]
2025-01-13 11:44:06 +00:00
Constrat
a55c977441 feat: preload YostarEN AS navitation 2025-01-13 12:27:00 +01:00
github-actions[bot]
ba415a937d chore: Auto Update Game Resources - 2025-01-13
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12745859046

[skip changelog]
2025-01-13 11:05:48 +00:00
github-actions[bot]
a113526ca9 chore: Auto Update Game Resources - 2025-01-13
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12744876785

[skip changelog]
2025-01-13 10:07:06 +00:00
status102
524fe9e22a chore: PlayToolsController start_game及input方法增加log输出提示 2025-01-13 18:02:00 +08:00
status102
ba33274087 style: format 2025-01-13 18:01:52 +08:00
HX3N
41a551fc12 chore: YostarKR AS navigation (#11537) 2025-01-13 10:44:24 +01:00
Manicsteiner
0e56713f48 chore: YostarJP AS navigation (#11535) 2025-01-13 10:44:03 +01:00
status102
04d0f59144 rft: Wpf重构 拆分开始唤醒任务 (#11533)
* rft: Wpf重构 拆分 开始唤醒

* perf: 移除未使用引用
2025-01-13 17:37:09 +08:00
uye
c5d9644e70 chore: 修改雷电截图增强描述 2025-01-13 16:35:44 +08:00
github-actions[bot]
e3afd3d4b5 chore: Auto Update Game Resources - 2025-01-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12734802683

[skip changelog]
2025-01-12 15:26:17 +00:00
status102
f2a8d3619c style: nullable
[skip changelog]
2025-01-12 21:46:29 +08:00
status102
3afc19fd1b Release v5.12.0-beta.1 (#11529) 2025-01-12 21:31:00 +08:00
status102
2d2ecc8862 docs: changelog to v5.12.0-b1 2025-01-12 21:11:55 +08:00
status102
1d48465456 perf: 肉鸽难度设置移动当前选项至列表顶部 2025-01-12 21:01:01 +08:00
晓丶梦丶仁
be7db3fa40 docs: changelog 难度描述 (#11532)
docs: 难度
2025-01-12 20:57:20 +08:00
status102
8aaad31a7b docs: changelog 2025-01-12 20:56:37 +08:00
github-actions[bot]
dcc4aa0d7f docs: Auto Update Changelogs of v5.11.2 (#11530)
* docs: Auto Generate Changelog of Release v5.11.2

* docs: 手写部分

* docs: 写串了

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2025-01-12 20:50:14 +08:00
晓丶梦丶仁
bda924566f docs: 为肉鸽参数 start_with_seed 添加文档 (#11531)
docs: 为 start_with_seed 添加文档
2025-01-12 20:20:00 +08:00
github-actions[bot]
6b8b32ae5e chore: Auto Update Game Resources - 2025-01-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12733331220

[skip changelog]
2025-01-12 12:08:54 +00: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
uye
7b8d1dade0 chore: Release 模式下,如文件夹中包含 DEBUG.txt 也会输出 DBG 日志 (#11496)
* chore: Release 模式,如文件夹中包含 DEBUG.txt 也会输出 DBG 日志

* chore: lambda 被否了

* chore: 不读 DEBUG
2025-01-12 17:46:38 +08:00
status102
40e133a806 rft: 移动企鹅物流及一图流上报设置 至 运行设置 2025-01-12 11:57:18 +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
Constrat
321992a284 tools: update ignore of json text for overseas
[skip changelog]
2025-01-11 15:31:23 +01:00
github-actions[bot]
0fdcae4c21 chore: Auto Update Game Resources - 2025-01-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12723177357

[skip changelog]
2025-01-11 09:44:19 +00:00
github-actions[bot]
ca060c6088 chore: Auto Update Game Resources - 2025-01-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12722557665

[skip changelog]
2025-01-11 08:07:05 +00:00
Constrat
8caac62e18 ci: limit automatic workflow to this repo only
[skip changelog]
2025-01-10 23:37:22 +01:00
Constrat
3436904035 style: follow prettier
[skip changelog]
2025-01-10 19:21:21 +01:00
Constrat
7f8eb5deb7 chore: cleanup workflow
[skip changelog]
2025-01-10 16:25:58 +01:00
Constrat
ae0fe4c054 chore: allow workflow dispatch to delete cache
[skip changelog]
2025-01-10 16:21:00 +01:00
github-actions[bot]
0d3168782e chore: Auto Update Game Resources - 2025-01-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12711374120

[skip changelog]
2025-01-10 14:28:40 +00: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
晓丶梦丶仁
0bce9b0ba8 feat: 为肉鸽开始探索添加 cd 识别 (#11443) 2025-01-10 20:21:07 +08:00
晓丶梦丶仁
e6e8b2f783 perf: 新增投掷手干员组并调整优先级 2025-01-10 20:06:20 +08:00
晓丶梦丶仁
dc220f05cf feat: 萨卡兹肉鸽冰川期作战策略 2025-01-10 20:06:20 +08:00
uye
f8fa4cdb5a fix: 肉鸽烧热水没烧出来会从预设难度开始,而不是返回n0 2025-01-09 23:30:17 +08:00
晓丶梦丶仁
30d3aec48a fix: tasks.json png后缀 (#11511)
[skip changelog]
2025-01-09 22:39:58 +08:00
Horror Proton
8fa2591d1c chore: disable maybe-uninitialized for gcc 14 [skip changelog]
fix: #10512
2025-01-09 21:46:20 +08:00
Constrat
e6d76e5049 chore: ignore blame for e3d63894b2 oxipng optimization 2025-01-09 13:27:15 +01:00
Constrat
f56beb312f tools: update ignore templates for overseas 2
[skip changelog]
2025-01-09 13:26:54 +01:00
Constrat
f435beea8f tools: update ignore templates for overseas
[skip changelog]
2025-01-09 13:17:59 +01:00
晓丶梦丶仁
669e289d27 feat: 萨卡兹内容拓展II点刺进入商店获得构想 (#11509) 2025-01-09 13:10:18 +01:00
Constrat
96b2084b64 chore: disable link checker in issues and PRs (#11506) 2025-01-09 17:40:59 +08:00
github-actions[bot]
af613af810 chore: Auto Update Game Resources - 2025-01-09
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12686742405

[skip changelog]
2025-01-09 09:08:40 +00:00
晓丶梦丶仁
5e79834287 perf: 优化傀影肉鸽雪山上的来客ew部署 (#11195) 2025-01-09 01:23:32 +08:00
晓丶梦丶仁
2c5f027534 fix: 删除傀影肉鸽远方来客意义不明的撤退 (#11194) 2025-01-09 01:23:25 +08:00
Constrat
b224237503 fix: delay and retry downloads on resource updater (#11504) 2025-01-07 16:28:55 +01:00
Constrat
71b7f80207 chore: use API for cache-deletion 2025-01-06 23:54:43 +01:00
Constrat
4ba078784a fix: use read/write secret to delete cache on pr merge 2025-01-06 17:09:50 +01:00
Windsland
76c4096761 docs: 肉鸽辅助协议文档翻译 (#11360) 2025-01-06 16:36:51 +01:00
status102
868467ec1f fix: 博朗台计算等待时间失败数据处理 2025-01-06 20:02:15 +08:00
status102
4367865f6f chore: 移除不再使用的代码 for 最小化启动模拟器
by uye
2025-01-06 19:59:13 +08:00
Constrat
da73ba18dc fix: increase fetch depth for release nightly-ota to generate tags
(might need successive increases)
2025-01-06 00:10:51 +01:00
Constrat
17ef7a759c ci: uncomment test
[skip changelog]
[skip ci]
2025-01-05 10:06:57 +01:00
Roland125
b9f2d793f5 fix:修正nothing to select情况下的判断逻辑 2025-01-05 11:22:19 +08:00
Constrat
01d63d9d63 style: add name to workflow
[skip changelog]
2025-01-04 16:15:42 +01:00
Constrat
1e9380f418 ci: delete stale cache after pr merge 2025-01-04 16:11:18 +01:00
github-actions[bot]
325e83920c chore: Auto Templates Optimization
Triggered by 9c0b40b367

[skip changelog]
2025-01-04 14:14:31 +00:00
Constrat
9c0b40b367 fix: update Collect Rewards template for EN
fix #11485
2025-01-04 15:14:12 +01:00
Constrat
6149329707 ci: delete stale cache script 2025-01-04 15:05:27 +01:00
萨拉托加
ecc6962024 fix: tw OcrReplace 肉鸽招募助战 (#11487)
fix: 招募助战识别
2025-01-04 21:45:00 +08:00
Constrat
be36a88607 chore: move push tag later in the workflow in case or errors (#11480)
chore: move push tag later in the workflow in case or errors
2025-01-04 14:21:17 +01:00
Constrat
026b0742c2 style: i18n tweak
[skip changelog]
[skip ci]
2025-01-04 13:00:55 +01:00
Roland125
1e29fe6525 feat:不自动招募1/5/6星干员时,不计入最大确认招募次数 (#11380)
* feat:不自动招募1/5/6星干员时,不计入最大确认招募次数
test:添加相应的测试函数(仅Relwithdebinfo生效)
fix:添加calc_task_result_type结构体的构造函数。修改其用法,使得代码更直观。

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

* fix:修复跳过特定招募计数功能中的逻辑错误#11380

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

* Revert "fix:修复跳过特定招募计数功能中的逻辑错误#11380"

This reverts commit 4870e127aa.

* fix:修复跳过特定招募计数功能中的逻辑错误#11380

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

* fix: do not return early for calc only task

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2025-01-04 19:41:40 +08:00
Constrat
81b1465cd1 style(ci): change job name
[skip changelog]
2025-01-04 11:51:58 +01:00
uye
b960f0305c chore: 上报添加 User-Agent 2025-01-04 14:03:03 +08:00
uye
b396063d7d chore: 修改上报抬头 2025-01-04 12:50:44 +08:00
Constrat
1a408a7234 chore: Use %B to consider header for skip changelog 2025-01-03 23:54:24 +01:00
Constrat
e203728fb5 i18n: DependencySetup
[skip changelog]
2025-01-03 22:54:45 +01:00
Constrat
6d0ca82418 fix: EN SL roi navigation
[skip changelog]
2025-01-03 19:32:55 +01:00
github-actions[bot]
d09fed8f95 chore: Auto Update Game Resources - 2025-01-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12601175680

[skip changelog]
2025-01-03 17:05:44 +00:00
github-actions[bot]
e874df408b chore: Auto Update Game Resources - 2025-01-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12594093152

[skip changelog]
2025-01-03 07:06:19 +00:00
HY
03c1fc8d28 fix: 繁中服作戰失敗畫面卡住 (#11479) 2025-01-02 16:18:05 +01:00
github-actions[bot]
e78f94d59f chore: Auto Templates Optimization
Triggered by 512a199382

[skip changelog]
2025-01-02 11:47:08 +00:00
Constrat
512a199382 fix: InitialDrop.png更新
Co-authored-by: BxFS <15606086+BxFS@users.noreply.github.com>
2025-01-02 12:46:44 +01:00
github-actions[bot]
c4317b556b chore: Auto Templates Optimization
Triggered by 3efab62747

[skip changelog]
2025-01-02 11:26:54 +00:00
Constrat
3efab62747 Revert "test: try setup dotnet cache"
This reverts commit 835d9b9816.
[skip changelog]
[skip ci]
2025-01-02 12:21:38 +01:00
Constrat
835d9b9816 test: try setup dotnet cache 2025-01-02 12:19:52 +01:00
uye
3bedb90578 feat: 干员识别排除当前客户端未出干员 2025-01-02 10:27:35 +08:00
uye
d63085002a feat: 肉鸽开局干员列表排除当前客户端未出干员 2025-01-02 10:20:06 +08:00
Constrat
23602d95f2 fix: txwy duplicates in tasks.json 2025-01-01 18:17:10 +01:00
Constrat
f522a38f68 chore: EN duplicates in tasks.json + SSS Buffs 2025-01-01 18:14:09 +01:00
Manicsteiner
2556b0f9ed chore: YostarJP phantom roguelike game pass, SSS#6 (#11473) 2025-01-01 18:13:44 +01:00
Constrat
e24842913f ci: dotnet restore not needed for smoke-testing
[skip changelog]
2025-01-01 18:07:35 +01:00
Constrat
2f70d3d665 ci: fix consistency in cache key for res-update
[skip changelog]
2025-01-01 17:54:49 +01:00
Constrat
44349b2775 style: simplify key for res-update-game
[skip changelog]
2025-01-01 17:43:59 +01:00
Constrat
fbf26fe628 ci: smoke-testing cache + scope (#11474) 2025-01-01 17:40:49 +01:00
Constrat
28eb7efff2 fix: MaaDeps needs to be ignored
21c33e68ea
207172b366
[skip changelog]
2025-01-01 16:45:36 +01:00
Constrat
c0f2eb3471 fix: github workflow syntax for smoke-testing
[skip changelog]
2025-01-01 16:07:39 +01:00
Constrat
a184f8fe89 ci: increase operations-per-run stale.yml
[skip changelog]
2025-01-01 15:32:12 +01:00
Constrat
0ef899f955 ci: smoke-testing restore cache on all branches. Save only on dev. 2025-01-01 15:25:06 +01:00
momomochi987
7ca44dd84c chore: 繁中服「源石塵行動」復刻活動導航 2025-01-01 13:00:20 +01:00
github-actions[bot]
40700ef1bd chore: Auto Update Game Resources - 2025-01-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12568688579

[skip changelog]
2025-01-01 08:08:00 +00:00
Constrat
b47adf15fd fix: fetch tags for nightly ota
[skip changelog]
2025-01-01 01:00:37 +01:00
Constrat
ca53694c71 fix: typo
[skip changelog]
2025-01-01 00:53:27 +01:00
Constrat
c6c85f76ad fix: checkout depth for nightly ota 2025-01-01 00:52:14 +01:00
Constrat
47f649c96d ci: use API for release-nightly-ota cancel (#11467) 2024-12-31 20:07:01 +01:00
github-actions[bot]
a17c8f2eef chore: Auto Update Game Resources - 2024-12-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12562807371

[skip changelog]
2024-12-31 18:32:52 +00:00
uye
57bfafbaeb chore: battle_data 未实装干员添加字段提示 2025-01-01 02:25:00 +08:00
uye
ab2debfd32 chore: 别用 1234567890ABCDEF 去连模拟器了 2025-01-01 02:25:00 +08:00
Constrat
e20cb789e6 refactor: remove error bypass, tweak powershell syntax
[skip changelog]
2024-12-31 18:04:18 +01:00
Constrat
fd81de52d4 Revert "refactor: move resource copy to test script"
This reverts commit 2b501bb815.
2024-12-31 17:35:49 +01:00
Constrat
2b501bb815 refactor: move resource copy to test script
[skip changelog]
2024-12-31 17:27:50 +01:00
Constrat
fe8739c587 style: tweaked resource updater validator output
[skip changelog]
2024-12-31 17:11:31 +01:00
github-actions[bot]
14e71e3aaa chore: Auto Update Game Resources - 2024-12-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12561593984

[skip changelog]
2024-12-31 16:06:33 +00:00
uye
1e35d0ef02 fix: 更新 “视相“ 主题后未关闭退出基建弹窗时无法回到主界面
fix #11463
2024-12-31 15:46:08 +08:00
Constrat
f8b1ce122a perf: manual recursion + robocopy for smoke-testing (#11458) 2024-12-30 10:03:41 +01:00
uye
3a01a7f50c chore: 启动 MAA 后直接运行启动 MAA 后自动开启模拟器 改为独立配置 2024-12-30 15:08:26 +08:00
uye
afd286d72b chore: 只有一个配置的时候不显示 此选项页为全局配置 2024-12-30 15:05:53 +08:00
uye
53d86fb008 chore: 当前配置不存在时尝试读取全局配置 2024-12-30 15:04:18 +08:00
uye
581e4649d5 fix: 手动输入关卡名使用剩余理智 选项无法保存 2024-12-30 13:21:52 +08:00
status102
f95f1b8cc6 chore: Config序列化参数不转义中文 2024-12-30 10:24:10 +08:00
Constrat
430164d52d perf: implement cache for smoke-test (#11457) 2024-12-29 22:20:19 +01:00
Constrat
d64863a6cf ci: implement ps script for smoke-testing (#11455) 2024-12-29 20:43:16 +01:00
uye
c0a0657f42 Release v5.11.1 (#11450) 2024-12-29 21:43:35 +08:00
uye
447d6d0aee docs: Update CHANGELOG.md (#11452) 2024-12-29 21:42:16 +08: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
Constrat
562e84aa97 fix: StartButton1 ocrReplace syntax error in JP tasks.json 2024-12-29 13:20:53 +01:00
status102
bab71d1da4 fix: 移除多余的Gui配置 2024-12-29 20:05:56 +08:00
Sherkey Asher
e1fab541e5 feat: 适配界面主题「大荒」与「视相」 (#11449) 2024-12-29 18:06:13 +08:00
github-actions[bot]
8d12d313f5 chore: Auto Update Game Resources - 2024-12-29
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12533972992

[skip changelog]
2024-12-29 08:45:08 +00:00
status102
c643045b57 style: 设置界面Instance
[skip changleog]
2024-12-29 15:31:07 +08:00
uye
b72b30ab6d chore: 改漏了
[skip changelog]
2024-12-29 13:16:38 +08:00
uye
d1e6ca611a fix: characterNamesClientAdd 获取错误 2024-12-29 11:49:48 +08:00
Constrat
47b8fc72a5 ci: revert builds to ubuntu 22.04 (#11446)
* ci: revert builds to 22.04

* fix: only ci requires ubuntu 22.04
2024-12-29 11:42:29 +08:00
github-actions[bot]
a0047a6d49 chore: Auto Update Game Resources - 2024-12-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12529391655

[skip changelog]
2024-12-28 20:06:16 +00:00
uye
4eef588031 chore: MAA 启动相关改为全局配置 2024-12-28 16:45:04 +08:00
uye
00439ecfa9 chore: 界面设置改为全局配置 2024-12-28 16:38:45 +08:00
uye
24542bc4fc chore: 热键改为全局配置 2024-12-28 16:07:23 +08:00
uye
8b4dd70b48 feat: 支持 XX-EX1 类型关卡名列表添加
fix #11425
2024-12-28 15:38:12 +08:00
uye
ea4256a9f2 chore: 最小化到托盘和使用托盘图标改为全局配置 2024-12-28 15:24:06 +08:00
Constrat
395d53fe0c refactor: cleanup set tag script
[skip changelog]
2024-12-28 00:27:07 +01:00
Constrat
a6a02e5c6e fix: typo
[skip changelog]
2024-12-27 16:44:02 +01:00
Constrat
f55db60431 ci: nightly workflow tweaks (#11441)
* style: comment for changelog generator python

* chore: optimize conditional check for commit build

* feat: remove semver and unify checker and setter tag

* style: tweaked debug output
2024-12-27 16:29:37 +01:00
Constrat
881a852d96 ci: revert single point cancel run
[skip changelog]
2024-12-27 12:06:35 +01:00
uye
ef9fbf81da feat: 添加运行库安装脚本 2024-12-27 13:29:01 +08:00
Constrat
2a31a33194 ci: utilize changelog generator as version difference checker (#11437) 2024-12-27 00:27:10 +01:00
uye
7317087458 Release v5.11.0 (#11427)
好像没啥新东西,收拾收拾准备发正式版了
2024-12-26 23:15:25 +08:00
AnnAngela
92b69fbe93 chore: 看了下没合并,删了 2024-12-26 21:47:20 +08:00
Constrat
a4369b7d59 chore: update CHANGELOG 2024-12-26 14:38:08 +01:00
github-actions[bot]
a73f1fe939 docs: Auto Update Changelogs of v5.11.0 (#11434)
* docs: Auto Generate Changelog of Release v5.11.0

* Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
2024-12-26 21:33:15 +08:00
Constrat
ae69496159 chore: change secret (#11435) 2024-12-26 14:05:04 +01:00
晓丶梦丶仁
6b1854afe7 chore: tw OcrReplace 添加关卡内道具 (#11431) 2024-12-26 15:39:29 +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
github-actions[bot]
0b3bfa9678 chore: Auto Update Game Resources - 2024-12-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12496168511

[skip changelog]
2024-12-25 20:06:34 +00:00
github-actions[bot]
16db020f04 chore: Auto Update Game Resources - 2024-12-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12484382224

[skip changelog]
2024-12-24 17:05:35 +00:00
uye
fd95858e65 fix: “启动 MAA 后直接最小化”选项功能失效
fix #11419
2024-12-25 00:12:50 +08:00
Constrat
45c803def4 fix: RA2 crafting list
fix e1177db348
2024-12-24 15:39:55 +01:00
Hao Guan
74c7cb0bc6 chore: Mac GUI 界面改进和修复 (#11422) 2024-12-24 18:09:43 +11:00
github-actions[bot]
cd15f14d5c chore: Auto Update Game Resources - 2024-12-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12478342783

[skip changelog]
2024-12-24 07:06:22 +00:00
Constrat
01e4b2470f feat: RA2 multi-crafting 2024-12-23 18:07:35 +01:00
github-actions[bot]
b7c763375e chore: Auto Update Game Resources - 2024-12-23
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12467337602

[skip changelog]
2024-12-23 13:12:48 +00:00
HX3N
4f35c1d7c4 chore: YostarKR HE rerun navigation 2024-12-22 12:58:15 +01:00
Weiyou Wang
19fc7d3472 fix: crop ClueSelected template to make sure it works under long clue names (#11409)
---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-12-22 00:22:55 +01:00
HY
ae4239597d chore: 更新繁中服進入肉鴿的方式 (#11386) 2024-12-22 01:54:00 +08:00
晓丶梦丶仁
be67372350 fix: RA删除存档时重复识别 (#11406) 2024-12-22 03:20:32 +11:00
Constrat
4e382eccd4 style: prettier fix
[skip changelog]
2024-12-21 16:00:48 +01:00
Constrat
96c6abe1c9 ci: reorder optimize templates steps 2024-12-21 15:59:19 +01:00
github-actions[bot]
a02a7a91ee chore: Auto Templates Optimization
Triggered by dce5d55672

[skip changelog]
2024-12-21 14:47:18 +00:00
Constrat
dce5d55672 ci: allow manual workflow dispatch for optimize templates 2024-12-21 15:46:26 +01:00
Constrat
7e46255ca6 ci: remove limit from stale action 2024-12-21 15:37:00 +01:00
Constrat
3b25f8d8da ci: remove cache from markdown-checker (#11405)
* test: remove cache from markdown checker

* chore: remove caching from markdown-checker

difference in times is minimal
2024-12-21 15:21:14 +01:00
Constrat
70119da5b2 fix: typo
[skip changelog]
2024-12-21 14:18:26 +01:00
Constrat
7629c089f4 perf(ci): use API instead of gh cache 2024-12-21 14:05:19 +01:00
Constrat
4c38bb4094 refactor: smoke-testing bash -> powershell 2024-12-21 00:32:41 +01:00
Constrat
2f7bea450b fix: git init to allow gh commands 2024-12-21 00:13:37 +01:00
Constrat
1cc457266f fix: GH_TOKEN for smoke testing + fail_fast 2024-12-20 23:46:33 +01:00
Constrat
1b89299c9c ci: perf improvement with caching (#11400) 2024-12-20 23:31:40 +01:00
github-actions[bot]
570648a89c chore: Auto Update Game Resources - 2024-12-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12435747249

[skip changelog]
2024-12-20 17:27:48 +00:00
uye
35d9b03b96 fix: 卡达,玛露西尔基建技能效率错误
fix #10604
2024-12-20 19:54:12 +08: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
github-actions[bot]
0d746a4053 chore: Auto Update Game Resources - 2024-12-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12430011384

[skip changelog]
2024-12-20 10:44:37 +00:00
github-actions[bot]
06685f185c chore: Auto Update Game Resources - 2024-12-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12427814028

[skip changelog]
2024-12-20 08:08:15 +00: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
github-actions[bot]
2b573aedaf chore: Auto Update Game Resources - 2024-12-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12425552718

[skip changelog]
2024-12-20 04:29:42 +00:00
uye
b1cabfca1a feat: RS-5 导航 2024-12-19 20:35:14 +08:00
github-actions[bot]
588ec01baf chore: Auto Update Game Resources - 2024-12-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12408675210

[skip changelog]
2024-12-19 08:08:01 +00:00
github-actions[bot]
6a9390170d chore: Auto Update Game Resources - 2024-12-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12400485796

[skip changelog]
2024-12-18 20:07:40 +00:00
github-actions[bot]
d81b61dd46 chore: Auto Update Game Resources - 2024-12-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12397804878

[skip changelog]
2024-12-18 17:08:07 +00:00
Constrat
74989c14ef fix: resource updater txwy second error from intern-kun 2024-12-18 18:05:13 +01:00
github-actions[bot]
7b1f41a064 chore: Auto Update Game Resources - 2024-12-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12396980389

[skip changelog]
2024-12-18 16:17:55 +00:00
Constrat
848201f71a fix: txwy gamedata xaml typo
intern-kun fucked up [again]
2024-12-18 17:15:41 +01:00
Constrat
d3ab6c4060 fix: precommit prettier
[skip changelog]
[skip ci]
2024-12-18 13:46:37 +01:00
uye
229bdb6514 fix: 修复肉鸽选难度偶现识别错误 2024-12-18 20:32:20 +08:00
Constrat
d7f4f974d3 ci: remove cancel status from optimize templates
I hate the red cross. If cancel, the workflow is not failed, but github doesn't know
2024-12-18 13:09:35 +01:00
Weiyou Wang
411bba66f8 fix: 生息演算无存档刷点模式,允许在确认离开当前区块后没有 Loading Text 的情况下等待 (#11381) 2024-12-18 19:59:21 +08:00
pre-commit-ci[bot]
9cfde0b6a6 chore: Auto update by pre-commit hooks [skip changelog] 2024-12-18 12:45:52 +01:00
momomochi987
424fe44e30 chore: 適配繁中服「圍攻行動」主題介面 2024-12-18 12:45:52 +01:00
momomochi987
074088de08 chore: 繁中服「水晶箭行動」活動導航 2024-12-18 12:45:25 +01:00
github-actions[bot]
012671159c chore: Auto Update Game Resources - 2024-12-17
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12371648406

[skip changelog]
2024-12-17 11:02:24 +00:00
Horror Proton
21ce4d5fbb chore: fix typo [skip changelog] 2024-12-17 16:28:09 +08:00
Horror Proton
12c57cc762 chore: suppress false positive warning of gcc12 2024-12-17 16:06:47 +08:00
Roland125
64f4358c77 fix: Try to fix the compilation failure on aarch64 (#11378)
fix:Try to fix the compilation failure on aarch64
2024-12-17 15:22:36 +08:00
Rbqwow
8fb2734f7c build: Update turbo from 2.2.3 to 2.3.3 (#11376) 2024-12-17 15:16:52 +08:00
lianghong
ff7fff97fa feat: add discord webhook external notification (#11373) 2024-12-17 14:50:10 +08:00
uye
e57efd0d79 chore: 添加 python 资源加载示例 2024-12-17 13:31:50 +08:00
uye
e4c03d2775 feat: 重新适配 DepotEnter 多界面主题 2024-12-17 13:26:20 +08:00
uye
42dfa2233c Revert "feat: DepotEnter适配界面主题 (#7145)"
This reverts commit 113f3235b3.
2024-12-17 13:21:36 +08:00
uye
f6882998dd Revert "chore: 在Python脚本中添加活动关导航下载与加载的示例 (#3916)"
This reverts commit 16d8ae1ec5.
2024-12-17 13:14:09 +08:00
uye
da7b0bf51a Revert "chore: 改进Python脚本中incremental_path参数说明"
This reverts commit 4284b47940.
2024-12-17 13:13:41 +08:00
uye
8c4a47916b chore: 移除设置指引的 skip 2024-12-17 09:53:35 +08:00
Constrat
3c965f556b fix: powershell instead of bash 2024-12-16 23:14:43 +01:00
bodayw
b5113dee24 feat: 更新 243 极限效率一天四换排班表(20241216 修订)
根据[公孙长乐 2024-12-16 新视频](https://www.bilibili.com/video/BV13gBwYbEG5/?t=158)制作。

变化不大,只是用引星棘刺替换掉了斑点。

Spot -> Thorns the Lodestar for gold manufacture
2024-12-16 10:57:20 +01:00
Constrat
c925d4d85b ci: blame ignore only commits when ignore-revs is modified 2024-12-16 00:25:20 +01:00
github-actions[bot]
d11893a05a chore: auto blame ignore
[skip changelog]
2024-12-15 23:01:26 +00:00
Constrat
272d71fa29 ci: disable blame ignore cron + revert 2024-12-16 00:00:19 +01:00
github-actions[bot]
5140055482 chore: auto blame ignore
[skip changelog]
2024-12-15 22:30:28 +00:00
Constrat
0a38544023 revert: changes from blame-ignore test 2024-12-15 23:29:38 +01:00
github-actions[bot]
6dc53704b8 chore: auto blame ignore
[skip changelog]
2024-12-15 22:28:14 +00:00
Constrat
9577fc4e95 fix: precommit for blame-ignore + bypass on artifact missing 2024-12-15 23:27:14 +01:00
Constrat
355cbbc32b ci: switching blame-ignore to file less commit tracking 2024-12-15 23:23:04 +01:00
Constrat
6311c1c612 ci: fix release nightly ota anti duplicate logic to git log past 24 hours 2024-12-15 23:22:19 +01:00
Constrat
d5d5daee8e ci: bump res update game upload action version 2024-12-15 23:21:54 +01:00
github-actions[bot]
d684b3b6f0 chore: auto blame ignore
[skip changelog]
2024-12-15 21:47:20 +00:00
Constrat
d56404207f Revert "fix: ci release nightly ota if condition"
This reverts commit 2d5aee85f8.

Working on a much better solution
2024-12-15 22:31:34 +01:00
Constrat
2d5aee85f8 fix: ci release nightly ota if condition 2024-12-15 22:28:24 +01:00
uye
c4f3a1c795 Release v5.11.0-beta.2 (#11366) 2024-12-15 20:53:58 +08:00
github-actions[bot]
88673a2f16 docs: Auto Update Changelogs of v5.11.0-beta.2 (#11367)
docs: Auto Generate Changelog of Release v5.11.0-beta.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-12-15 18:01:19 +08:00
github-actions[bot]
15c60163a8 chore: Auto Update Game Resources - 2024-12-15
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12336158813

[skip changelog]
2024-12-15 05:26:57 +00:00
github-actions[bot]
d18e824c70 chore: auto blame ignore
[skip changelog]
2024-12-14 21:47:24 +00:00
Constrat
3587b57a3a ci: typo + consistency 2024-12-14 15:52:28 +01:00
Constrat
fec66d5c05 fix: Shu EN regex 2024-12-14 15:50:31 +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
github-actions[bot]
cbd71c0d74 chore: auto blame ignore
[skip changelog]
2024-12-13 21:49:37 +00:00
Constrat
d57487dfb0 ci: styling formatting + cron adjustment 2024-12-13 15:04:18 +01:00
github-actions[bot]
8bbc4c2209 chore: auto blame ignore
[skip changelog]
2024-12-13 13:41:59 +00:00
Constrat
540ac8939c ci: prevent duplicate runs (#11362)
From https://github.com/zopefoundation/meta/issues/145#issuecomment-1247814559
2024-12-13 14:22:30 +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
github-actions[bot]
e9e20e78c3 chore: Auto Update Game Resources - 2024-12-12
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12293072744

[skip changelog]
2024-12-12 09:05:52 +00:00
Mike Qu
62da79859f docs: 增加Mac模拟器:蓝叠模拟器air版 (#11349)
* docs: 增加Mac模拟器:蓝叠模拟器air版

* docs: 添加文档中“蓝叠模拟器air版”部分的翻译
2024-12-12 15:49:59 +08:00
lianghong
91b4fc1025 chore: add YostarJP ocrReplace 黑角 (#11350)
---------

Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
2024-12-11 16:58:12 +01:00
Constrat
79fb27cbac ci: disable optimize-templates on PR merge (#11355) 2024-12-11 16:56:27 +01:00
github-actions[bot]
81cd1ae247 chore: Auto Templates Optimization
Triggered by 1e6bab9a0b

[skip changelog]
2024-12-11 12:29:01 +00:00
HX3N
1e6bab9a0b fix: YostarKR improved StageBoskyPassageEnter recognition score (#11351) 2024-12-11 21:28:41 +09:00
Constrat
4d70df7457 ci: stop sync resource on forked repos 2024-12-11 12:15:35 +01:00
github-actions[bot]
7081bb3a43 chore: Auto Templates Optimization
Triggered by 07023b15a4

[skip changelog]
2024-12-11 10:38:22 +00:00
Weiyou Wang
07023b15a4 feat: 为选择线索添加判定 (#11323)
* feat: 为选择线索添加判定

* 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-12-11 21:38:01 +11:00
status102
e96c698fe9 Reapply "style: 修改变量以符合项目风格"
This reverts commit 94d445d354.
2024-12-11 14:02:04 +08:00
uye
e250f780c0 fix: CheckComboBox 初始化报错
fix #11344
fix #11342
2024-12-11 11:33:45 +08:00
status102
94d445d354 Revert "style: 修改变量以符合项目风格"
This reverts commit 8cc0779541.
2024-12-11 11:01:56 +08:00
Constrat
11ea7470b4 fix: SSS recruitment flag EN 2024-12-10 13:38:50 +01:00
Constrat
70cf5096f3 ci: fix pr merges calling optimizing workflow 2024-12-10 13:29:48 +01:00
github-actions[bot]
85e6f51724 chore: Auto Templates Optimization
Triggered by ec3c3543f3

[skip changelog]
2024-12-10 12:13:35 +00:00
HX3N
ec3c3543f3 fix: YostarKR improved StageMysteriousPresageEnter recognition score (#11336)
* fix: YostarKR improved StageMysteriousPresageEnter recognition score

* 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-12-10 13:13:11 +01:00
github-actions[bot]
0696fde360 chore: Auto Templates Optimization
Triggered by d73d4e7e8c

[skip changelog]
2024-12-10 11:30:05 +00:00
晓丶梦丶仁
d73d4e7e8c fix: 网络卡顿导致领邮件失败 (#11333) 2024-12-10 19:29:11 +08:00
status102
8cc0779541 style: 修改变量以符合项目风格
[skip changelog]
2024-12-10 11:03:51 +08:00
晓丶梦丶仁
c778353cda fix: 进入去伪存真后识别太快导致错过 close collection 识别 2024-12-09 22:18:47 +01:00
status102
ccca4afc53 rft: WpfGui重构 部分拆分设置-关于 (#11330) 2024-12-09 21:34:02 +08:00
status102
524d5fa2a0 rft: WpfGui重构 拆分设置-性能设置 (#11329) 2024-12-09 21:07:53 +08:00
status102
fdbe389995 fix: 小工具-公招识别 绑定失效 2024-12-09 20:33:54 +08:00
Weiyou Wang
3065689ed2 fix: 增加 Tales@RA@ResourceGained 任务的 roi (#11322) 2024-12-09 15:57:20 +08:00
Constrat
2654499f62 ci/nightly-schedule (#11317)
* ci: add daily schedule for nightly ota build

* ci: add checker for no changes

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

* ci: reduce fetch default to 10

* style: clarify what the limits are

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-12-09 00:37:52 +01:00
萨拉托加
32dac5731c chore: 更新保全派驻荒地群兽音乐厅,多索雷斯在建地块新作业 (#11318)
* chore: 转移旧保全作业

* chore: Delete resource/copilot/SSS_交战荒野-维什戴尔+澄闪+浊心斯卡蒂+纯烬艾雅法拉or流明-皇家科学院望远镜.json

* chore: Delete resource/copilot/SSS_交战荒野_澄闪+塞雷娅+纯烬艾雅法拉or流明+重岳or水月or阿斯卡纶_皇家科学院望远镜.json

* chore: Delete resource/copilot/SSS_玉门市集-维什戴尔+澄闪+浊心斯卡蒂+纯烬艾雅法拉or流明-攀云机.json

* chore: Delete resource/copilot/SSS_玉门市集_澄闪+塞雷娅+维什戴尔+纯烬艾雅法拉+重岳or水月or阿斯卡纶_攀云机.json

* chore: 更新多索雷斯在建地块和荒地群兽音乐厅新作业

* fix: 保全派驻中出现的塑心识别错误修复

* chore: 改逗号

* 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-12-08 16:10:16 +01:00
status102
8a4fb52830 rft: 简化完成后动作UI绑定 (#11316) 2024-12-08 18:08:32 +08:00
status102
74aa188bd4 rft: WpfGui重构 拆分一键长草-公招任务 (#11311) 2024-12-08 14:53:29 +08:00
Manicsteiner
9b2400040f fix: YostarJP MedicineExpiringTime ocr fix (#11307) 2024-12-07 13:35:54 +08:00
Constrat
29e74c1f50 style: tweak unsupported level logging (#11305)
* style: add `: ` between ID and reasoning

* style: standardyze comma
2024-12-07 08:41:21 +08:00
__Chisato__
b3d4269476 feat: enhance MAA website animation for a more elegant appearance (#11303)
* feat: enhance MAA website animation for a more elegant appearance

* fix: briefly appears scrollbar which cause a bad animation apperance.
2024-12-06 17:53:15 +01:00
晓丶梦丶仁
68776ea8af fix: 将萨卡兹肉鸽 CloseCollection 的 Continue 和 Close 改为 RGBCount (#11302)
* fix: 将萨卡兹肉鸽的 next 鱼骨改为 RGBCount

* fix: 再缩小rgb范围

* fix: 将 close 也改为 rgbcount
2024-12-06 22:45:39 +08:00
Constrat
4a11d0eeb0 style: clangd formatting
fix 941a98d
[skip changelog]
2024-12-06 15:17:05 +01:00
uye
941a98d90a fix: 仓库识别无法识别 ”万“ 2024-12-06 19:23:07 +08:00
uye
f549c1feee perf: 优化仓库识别显示,减少读取文件次数,优化文件占用 2024-12-06 18:36:38 +08:00
Rbqwow
fe1deb1f23 fix: 移除多余的阻止休眠设置选项 (#11301) 2024-12-06 08:48:17 +08:00
uye
941c5bee4e Release v5.11.0-beta.1 (#11299) 2024-12-06 02:00:46 +08:00
Hao Guan
f803a6510d fix: 设置Xcode版本为15.3 (#11298) 2024-12-06 01:40:51 +08:00
uye
dc016a982c Release v5.11.0-beta.1 (#11291) 2024-12-05 23:34:10 +08:00
github-actions[bot]
0b1b48a42f docs: Auto Update Changelogs of v5.11.0-beta.1 (#11297)
docs: Auto Generate Changelog of Release v5.11.0-beta.1

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-12-05 23:19:55 +08:00
Hao Guan
1c5bbd1602 feat: Mac GUI重构&多语言 (#11295) 2024-12-06 00:02:00 +11:00
Constrat
14b99f8538 tools: style for clone_data powershell script
[skip changelog]
2024-12-05 11:23:12 +01:00
Sherkey Asher
f22f817ed2 feat: SideStory「出苍白海」导航 (#11294) 2024-12-05 10:23:11 +01:00
ManicSteiner
e7925f5191 chore: remove Yostar servers reclamation algorithm temp edits 2024-12-05 10:22:44 +01:00
github-actions[bot]
30fe628a30 chore: Auto Update Game Resources - 2024-12-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12176469017

[skip changelog]
2024-12-05 09:04:00 +00:00
晓丶梦丶仁
5e126b6c09 fix: 萨卡兹肉鸽点刺成锭分队开局思维阻塞 (#11276) 2024-12-05 16:12:49 +08:00
github-actions[bot]
84a8313d6c chore: Auto Update Game Resources - 2024-12-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12175584842

[skip changelog]
2024-12-05 08:04:13 +00:00
uye
f69bab0594 chore: 管理员权限启动无法使用开机自启 (#11290)
* chore: 管理员权限启动无法使用开机自启

* i18n: zh-tw tweak

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
2024-12-05 13:25:56 +08:00
github-actions[bot]
3c9b3c53fc chore: Auto Update Game Resources - 2024-12-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12172993213

[skip changelog]
2024-12-05 04:04:17 +00:00
github-actions[bot]
3977bdd69d chore: Auto Update Game Resources - 2024-12-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12172132319

[skip changelog]
2024-12-05 02:37:51 +00:00
Constrat
79c656e271 Revert "ci: change author from github bot to github actions"
This reverts commit d4f49b60fc

[skip changelog]
2024-12-04 11:03:54 +01:00
Github Actions
fc8e43037e chore: Auto Update Game Resources - 2024-12-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12155829857

[skip changelog]
2024-12-04 08:29:56 +00:00
Constrat
d4f49b60fc ci: change author from github bot to github actions 2024-12-04 08:25:32 +01:00
Constrat
02b0234a27 tools: style linking
[skip changelog]
2024-12-04 08:14:11 +01:00
github-actions[bot]
26aed3ea0f chore: Auto Update Game Resources - 2024-12-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12154667539

[skip changelog]
2024-12-04 07:04:06 +00:00
uye
bf656ab6eb chore: 因为资源版本上报失败时添加提示 2024-12-04 13:36:05 +08:00
github-actions[bot]
f450292a51 chore: Auto Update Game Resources - 2024-12-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12153038136

[skip changelog]
2024-12-04 04:29:31 +00:00
Manicsteiner
488040a140 feat: YostarJP manually add BP new operators (#11286) 2024-12-04 13:18:02 +09:00
HX3N
4ddf92e827 chore: YostarKR add BP new operators (#11285)
chore: add BP new operators
2024-12-04 13:16:14 +09:00
github-actions[bot]
db81dd428a chore: Auto Update Game Resources - 2024-12-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12149226729

[skip changelog]
2024-12-03 22:27:47 +00:00
Constrat
df5ee99fc0 fix: missing battle_data BP event 2024-12-03 23:26:19 +01:00
Constrat
2d9637372e feat: add BP new operators
@Manicsteiner @HX3N the repo for the res data is not working. Manual patch is required.
2024-12-03 20:57:46 +01:00
Constrat
437bf628f1 chore: small wpf changes for HelpUsWithOverseasServersTip
[skip changelog]
2024-12-03 15:29:12 +01:00
uye
7b2b69dd03 fix: 双击托盘图标可能导致窗口位置错误
fix #11274
2024-12-03 12:08:39 +08:00
uye
79e526833b chore: 移除多余代码 2024-12-03 11:09:27 +08:00
HX3N
cf4ea870cb chore: YostarKR BP navigation (#11279) 2024-12-03 09:49:20 +08:00
Hao Guan
8c6d72c88d fix: Mac GUI日志&肉鸽难度设置 (#11273) 2024-12-03 09:45:40 +08:00
status102
f7a5bad3a9 rft: WpfGui重构 拆分一键长草-刷理智任务 (#11223) 2024-12-02 20:19:08 +08:00
Weiyou Wang
1523683633 fix: 为 ios端降低 Sarkaz@Roguelike@DecreaseBurdenAbandonThought 任务模版匹配的 threshold (#11266) 2024-12-01 21:09:20 +08:00
github-actions[bot]
ac2b7d461d chore: Auto Update Game Resources - 2024-12-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12105111052

[skip changelog]
2024-12-01 11:42:36 +00:00
Constrat
a724ddddfb feat: YostarEN BP navigation 2024-12-01 12:37:56 +01:00
ManicSteiner
bdd3b3396f chore: YostarJP BP navigation 2024-12-01 12:08:28 +01:00
github-actions[bot]
94f5a264ca chore: Auto Update Game Resources - 2024-12-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12104839023

[skip changelog]
2024-12-01 11:03:08 +00:00
晓丶梦丶仁
b4a674efe5 perf: 账号切换退出账号增加OCR (#11258)
* perf: 尝试增强账号切换功能稳定性

* fix: 将带文字的模板匹配的闭运算设为false

* Revert "fix: 将带文字的模板匹配的闭运算设为false"

This reverts commit afe42d1679.
2024-12-01 09:44:00 +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
uye
c36a4cab44 fix: 干员识别中出现卫戍中的 4★ 预备干员 及 特有 6★
fix #11253
2024-11-28 21:39:25 +08:00
Hao Guan
901e61ae78 fix: Mac GUI 优化作业列表 (#11250) 2024-11-28 07:35:36 +11:00
Constrat
c246b30991 ci: optimize-templates skip when PR is merged 2024-11-27 11:07:43 +01:00
uye
cc138a42df fix: 新下载的 MAA 会在加载关卡时报错 2024-11-27 15:44:37 +08:00
github-actions[bot]
bf01575dc1 chore: Auto Templates Optimization
Triggered by e7aab4d034

[skip changelog]
2024-11-27 03:24:54 +00:00
HY
e7aab4d034 fix: 繁中服無法訪問好友 (#11248)
* 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>
2024-11-27 11:24:08 +08:00
Hao Guan
185b980d9e fix: macOS 肉鸽参数&客户端包名 (#11245)
* fixes #11245 #9878
2024-11-27 02:27:14 +11:00
Constrat
033f24731a style: fix clang style 2024-11-26 13:55:08 +01:00
status102
8fa17ad8af fix: remove test code
[skip changelog]
2024-11-26 20:33:00 +08:00
status102
23fa98b4d4 perf: 优化葛朗台,碎石在理智不会溢出时不再等待
close #11048
2024-11-26 09:51:41 +08:00
Constrat
310e59e582 style: fix precommit styling
[skip changelog]
2024-11-25 23:41:57 +01:00
Constrat
d7f34153a7 ci: option to enable / disable dependency in workflow. (#11240)
* perf: remove depdencies

* ci: toggleable dependency for res-upd in case of rate limitations
2024-11-25 23:35:10 +01:00
github-actions[bot]
8e494d47fb chore: Auto Update Game Resources - 2024-11-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12019059285

[skip changelog]
2024-11-25 21:26:18 +00:00
status102
4c95f3504e rft: WpfGui游戏设置修改为运行设置 (#11209)
* rft: 暂停下干员

* rft: 掉线自动重连

* rft: 执行脚本

* rft: 不睡眠

* rft: 肉鸽延迟停止

* i18n: 游戏设置->运行设置

* i18n: EN tweak

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-11-25 13:10:46 +01:00
uye
247e47a754 refactor: 优化 StageManager 代码结构 (#11233)
* chore: 漏改了)

* refactor: 优化 StageManager 代码结构

* perf: ClientType

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-11-25 17:54:59 +08:00
github-actions[bot]
2b7a590aa6 chore: Auto Update Game Resources - 2024-11-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/12006608884

[skip changelog]
2024-11-25 09:04:17 +00:00
uye
25e32840aa fix: UI 更新后自动填充有概率拉取其他设施内干员
fix #11072
2024-11-24 22:44:25 +08:00
Constrat
53ba8f28b6 i18n: EN tweaks
[skip ci]
2024-11-24 11:32:29 +01:00
uye
24bb091e4d chore: 通过控制台退出模拟器时不再kill端口
fix #11234
2024-11-24 18:17:57 +08:00
github-actions[bot]
122b32731e chore: Auto Update Game Resources - 2024-11-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11994398667

[skip changelog]
2024-11-24 08:04:47 +00:00
status102
2f8d624bcb fix: 避免非预期的任务参数设置检查 (#11232) 2024-11-24 14:15:54 +08:00
AoXuan
fbb8193091 docs: 修改常见问题中的下载/安装问题的描述 (#11229) 2024-11-23 23:55:50 +08:00
status102
99406da8eb rft: WpfGui重构 拆分一键长草-领取奖励任务 (#11228) 2024-11-23 21:47:40 +08:00
晓丶梦丶仁
50652cda12 fix: 肉鸽构想不足过高阈值导致 mac 版无法识别 2024-11-23 12:16:47 +01:00
Constrat
fdffb9cc89 ci(fix): add precedency to fix latest GHA runner issues
Lately you can't find 4 runner at the same time
2024-11-23 09:20:43 +01:00
Constrat
7eb9fcaed2 ci(perf): remove compression from res-update-game (#11224)
* perf: change compression level

* perf: reduce compression to 0
2024-11-23 09:14:37 +01:00
Manicsteiner
0c534b94b9 chore: YostarJP ocr replace 魔王 (#11222) 2024-11-23 09:39:44 +08:00
uye
cd0a53fbe5 fix: 切换配置后不会自动启动 2024-11-23 01:15:06 +08:00
uye
39997a467b fix: API 中被删除的已关闭活动关卡被误判为常驻关卡 2024-11-22 22:41:07 +08:00
status102
7ea94ef014 rft: WpfGui重构 拆分一键长草-基建任务任务 (#11219)
* rft: WpfGui重构 拆分`一键长草-基建任务`

* perf: 简化
2024-11-22 21:48:21 +08:00
status102
47d8b0f604 chore: format & nullable
[skip changelog]
2024-11-22 21:44:20 +08:00
status102
89fe3ddcc2 rft: WpfGui重构 拆分一键长草-获取信用及购物任务 (#11218)
* rft: WpfGui重构 拆分`一键长草-获取信用及购物任务`

* perf: 修改绑定
2024-11-22 18:41:11 +08:00
github-actions[bot]
0e7a5e8974 chore: Auto Update Game Resources - 2024-11-21
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11961103501

[skip changelog]
2024-11-21 20:28:01 +00:00
github-actions[bot]
c7cf92df67 chore: Auto Update Game Resources - 2024-11-21
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11958454227

[skip changelog]
2024-11-21 17:26:51 +00:00
uye
885a1a8a6c chore: 成功代理不再减少任务失败计数 2024-11-21 23:33:31 +08:00
Rbqwow
70f26f5f73 Revert "fix: 刷理智失败次数限制未生效" (#11210)
This reverts commit a8c04a4b17.

[skip changelog]
2024-11-21 23:07:48 +08:00
pre-commit-ci[bot]
82859d6a12 chore: Auto update by pre-commit hooks [skip changelog] 2024-11-21 22:52:18 +08:00
uye
a8c04a4b17 fix: 刷理智失败次数限制未生效
fix #11207
2024-11-21 19:55:52 +08:00
LogicDX342
d166461c12 fix: 修改邮件通知中特殊字符的处理方式 (#11169)
* fix: 修改邮件通知中特殊字符的处理方式

* refactor: use string.Empty instead of empty string literals

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-11-21 19:01:37 +08:00
github-actions[bot]
6a2f25a8bd chore: Auto Update Game Resources - 2024-11-21
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11948745257

[skip changelog]
2024-11-21 07:42:23 +00:00
github-actions[bot]
3d127fba5f chore: Auto Update Game Resources - 2024-11-21
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11948524322

[skip changelog]
2024-11-21 07:25:45 +00:00
uye
bae7fcbe90 fix: 访问好友在部分背景下无法进入 2024-11-21 15:20:15 +08:00
github-actions[bot]
0935da1cd6 chore: Auto Update Game Resources - 2024-11-21
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11948246374

[skip changelog]
2024-11-21 07:03:48 +00:00
status102
c987b3a3e1 perf: 简化绑定 2024-11-21 13:07:45 +08:00
status102
e7742bc226 rft: WpfGui重构 拆分一键长草-自动肉鸽 (#11201) 2024-11-21 09:18:15 +08:00
uye
bdea1f5554 fix: 命令行切换配置后弹出公告 2024-11-21 00:52:25 +08:00
uye
184da533a5 fix: 加载顺序 2024-11-21 00:35:12 +08:00
uye
8bed0b9705 perf: 优化参数解析 2024-11-21 00:22:13 +08:00
uye
214a3021b0 fix: typo
[skip changelog][skip ci]
2024-11-20 23:14:58 +08:00
uye
a8398e017a fix: typo
[skip changelog]
2024-11-20 22:56:21 +08:00
uye
3a311dbd6d fix: 使用命令行切换配置时有可能使关卡选择被覆盖
fix #11199
2024-11-20 22:47:44 +08:00
uye
219459eb7e chore: 移除过渡代码 2024-11-20 22:47:44 +08:00
HX3N
9a8dc9b9a4 chore: YostarKR SSSBuffChoose ocr fix 2024-11-20 15:41:44 +01:00
Constrat
9b490f37f6 chore(tools): automatically remove spaces for YoStarKR in CharsNameOcrReplace (#11205)
fix 962f8b200d
cc @HX3N
2024-11-20 14:41:24 +00:00
Constrat
03a99a9a99 feat(EN): SSS#5 ocr replace for conductive elements 2024-11-20 11:41:07 +01:00
status102
e9bb0681a2 rft: WpfGui重构 拆分设置-远程控制 (#11202)
* rft: WpfGui重构 拆分`设置-远程控制`

* perf: 移除
2024-11-20 16:48:52 +08:00
HX3N
962f8b200d chore: YostarKR SSS#5 ocr added (#11200)
chore: YostarKR SSS#5 ocr updated
2024-11-20 13:20:01 +08:00
status102
8ccf5da63e rft: WpfGui重构 拆分设置-定时执行 (#11192)
rft: 拆分 设置-定时执行
2024-11-20 09:24:19 +08:00
github-actions[bot]
5445ca5c53 chore: Auto Update Game Resources - 2024-11-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11919906794

[skip changelog]
2024-11-19 19:03:02 +00:00
github-actions[bot]
3175d67da3 chore: Auto Templates Optimization
Triggered by b69203ffa5

[skip changelog]
2024-11-19 19:00:50 +00:00
nnnn1111
b69203ffa5 fix(EN): IS2 missing templates for recruiting and obtaining relics (#11196)
* Update tasks.json

fixing recruit

* fixing is2 image templates

 fixing is2 image templates for collecting rewards and finishing game

* Delete resource/global/YoStarEN/resource/template/Phantom@Roguelike@GetDropSelectReward.png

* Add files via upload

* 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-19 20:00:00 +01:00
Constrat
09cee87600 fix(EN): not entering recruitment when in mall with recruitment permit item on screen 2024-11-19 11:24:22 +01:00
status102
c27ae95a89 rft: 拆分 设置-界面设置 (#11188)
* rft: 拆分 设置-界面设置

* style: format

* fix: 还原错误变更
2024-11-19 09:13:19 +08:00
Constrat
bbfa3a21eb feat: SSS#5 for global
fix #11189
2024-11-18 19:07:30 +01:00
momomochi987
fad068ba71 chore: 繁中服保全派駐的新定向導能元件 2024-11-18 19:00:51 +01:00
status102
66684553a5 rft: 拆分 设置-游戏设置 (#11185)
* rft: 拆分 设置-游戏设置

* perf: 简化数据绑定
2024-11-18 20:47:16 +08:00
status102
6435d700a9 rft: rename ExternalNotificationDataContext to ExternalNotificationSettings 2024-11-18 17:02:21 +08:00
status102
37bf2841b4 rft: rename VersionUpdateDataContext to VersionUpdateSettings 2024-11-18 16:59:52 +08:00
萨拉托加
12bfe03c58 fix: 荒芜拉普兰德 OcrReplace (#11184)
fix:荒芜拉普兰德的识别

Fix #11183
2024-11-18 16:12:31 +08:00
uye
cb1a609350 Release v5.10.2 (#11178) 2024-11-18 00:05:12 +08:00
uye
64f55cd2c6 docs: Update CHANGELOG.md 2024-11-17 22:33:53 +08:00
uye
449838625c fix: SMTP 发件人和收件人读取错误 2024-11-17 22:26:27 +08:00
status102
748293b91a Release v5.10.1 (#11171) 2024-11-17 13:47:59 +08:00
github-actions[bot]
e9db404960 docs: Auto Update Changelogs of v5.10.1 (#11172)
* docs: Auto Generate Changelog of Release v5.10.1

* Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-11-17 13:26:29 +08:00
status102
4cc3051da5 fix: 遗漏变量
[skip changelog]
2024-11-17 13:16:54 +08:00
status102
a2902fdd29 Revert "rft: 拆分 设置-界面设置 (#11153)"
This reverts commit 1c14b211d3.

# Conflicts:
#	src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
2024-11-17 13:08:43 +08:00
status102
94031f7da9 rft: 拆分 一键长草-生息演算 任务设置 (#11166)
* rft: 拆分 一键长草-生息演算 任务设置

* fix: 移除遗漏
2024-11-17 09:19:15 +08:00
status102
fc3bade2df fix: 软件更新-版本选择 判断遗漏 2024-11-17 08:58:58 +08:00
晓丶梦丶仁
1c1852b940 fix: 完成招募后点击进入但无响应 (#11167) 2024-11-16 21:45:52 +08:00
XuQingTW
1ed394b034 fix: 臺服薩米肉鴿 "恃强凌弱" 辨識錯誤 (#11157)
* Update tasks.json

* Update tasks.json

* Update resource/global/txwy/resource/tasks.json
2024-11-16 17:30:11 +08:00
status102
63fb2293c4 fix: 补回遗漏的判定
[skip changelog]
2024-11-16 15:40:17 +08:00
status102
d6b24b26c0 rft: 拆分 设置-启动设置 (#11152)
* rft: 拆分 设置-启动设置

* chore: 加点注释
2024-11-16 15:07:38 +08:00
status102
1c14b211d3 rft: 拆分 设置-界面设置 (#11153)
* rft: 拆分 设置-界面设置

* rft: 还原菜单相关内容到SettingsViewModel
2024-11-16 11:07:37 +08:00
uye
3e4ca1111c Release v5.10.0 (#11161) 2024-11-16 00:19:14 +08:00
github-actions[bot]
efa0050cb7 docs: Auto Update Changelogs of v5.10.0 (#11162)
* docs: Auto Generate Changelog of Release v5.10.0

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-11-16 00:13:46 +08:00
github-actions[bot]
343ceb40f5 chore: Auto Templates Optimization
Triggered by b634aef1c4

[skip changelog]
2024-11-15 14:29:17 +00:00
uye
b634aef1c4 fix: 无法进入通用图标的活动 2024-11-15 22:28:11 +08:00
github-actions[bot]
36feae8e16 chore: Auto Update Game Resources - 2024-11-15
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11853309361

[skip changelog]
2024-11-15 09:06:01 +00:00
Manicsteiner
82a6326be2 chore: YostarJP ocr update (#11155) 2024-11-15 16:38:55 +08:00
github-actions[bot]
d58ed52cbe chore: Auto Update Game Resources - 2024-11-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11842348389

[skip changelog]
2024-11-14 17:26:43 +00:00
status102
5e959927f4 fix: 外部通知无法进行发送设置 2024-11-14 22:30:29 +08:00
status102
1d24adfa89 perf: 移除SettingsViewModel不必要的绑定 2024-11-14 19:43:32 +08:00
github-actions[bot]
53916b3b9d chore: Auto Update Game Resources - 2024-11-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11835883872

[skip changelog]
2024-11-14 11:03:15 +00:00
github-actions[bot]
4edc788c13 chore: Auto Update Game Resources - 2024-11-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11833427346

[skip changelog]
2024-11-14 08:29:22 +00:00
晓丶梦丶仁
f3b07e8f84 fix: 根据roi进行截图的小工具无法识别文件路径 (#11114) 2024-11-14 16:07:52 +08:00
status102
4254668bfb fix: 修复连接设置下 开始前、结束后脚本及运行任务时休眠设置绑定 2024-11-14 13:00:30 +08:00
status102
0295638422 rft: 移动统一部分设置路径 2024-11-14 09:54:45 +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
status102
4ac175d1f0 perf: 优化DataContext绑定 2024-11-13 23:30:34 +08:00
status102
ae1adb84fb fix: 修复 连接设置 数据绑定 2024-11-13 23:14:51 +08:00
uye
b4df55d4d6 fix: 误点一键换宿舍 2024-11-13 23:03:45 +08:00
status102
bdb16e5a32 rft: 拆分 设置-连接设置 (#11120)
* rft: 拆分 设置-连接设置

* rft: 迁移Model路径以细分ViewModel

* rft: 迁移Model及UserControl路径以细分Views
2024-11-13 19:41:52 +08:00
github-actions[bot]
6ae13d87a0 chore: Auto Templates Optimization
Triggered by 0be44e2696

[skip changelog]
2024-11-13 10:58:56 +00:00
Manicsteiner
0be44e2696 chore: YostarEN Sami@Roguelike@GamePassSkip1 (#11148) 2024-11-13 18:57:52 +08:00
Hao Guan
a8d6be994a chore: 优化依赖下载脚本,避免重复下载 (#11115)
* chore: 优化依赖下载脚本,避免重复下载

[skip changelog]
2024-11-13 16:59:51 +08:00
uye
ffa7ce55ee fix: 尝试修复进度条问题 2024-11-13 01:19:59 +08:00
Weiyou Wang
378ecd7629 fix: 修复肉鸽选难度的若干 Bug (#11131)
* fix: 选择最高难度的时候会 SubTaskError,修一下

* refactor: 加点 Log 方便 debug

* fix: MAA 无法识别 N0,会从虚空中读到奇怪的字符
2024-11-12 12:29:29 +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
status102
a277fa550c perf: WpfGui优化任务进度显示 (#11055)
perf: 优化任务进度显示
2024-11-12 13:52:22 +08:00
hepari
f349fa8421 docs: Fix typo in docs/ko-kr/manual/newbie.md (#11134) 2024-11-12 10:29:02 +08:00
LogicDX342
66411c76f1 fix: 移除了邮件通知中可能的非法字符 (#11110)
fix: normalize line endings in email title and content
2024-11-11 09:21:54 +08:00
Weiyou Wang
f52d9ca449 fix: 从 wpf 层面上不再允许用户在萨卡兹肉鸽用奇怪的分队刷源石锭 (#11125)
* fix: 从 wpf 层面上不再允许用户在萨卡兹肉鸽用奇怪的分队刷源石锭

* doc: 加点注释

* chore: 优化肉鸽编队储存结构

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-11-11 01:01:47 +08:00
uye
b54a3d52fa fix: 二星干员无法开始悖论模拟
fix #10594
fix #11116
2024-11-11 00:25:08 +08:00
Weiyou Wang
f1d60f3654 fix: 只凹直升的时候不再需要去 N0 打到 3 层 (#11124)
* fix: 只凹直升的时候不再需要去 N0 打到 3 层

* refactor: 更多的参数有效性检查
2024-11-10 22:27:36 +08:00
status102
5e47bed765 rft: 拆分 设置-外部通知 (#11113)
* rft: 拆分 设置-外部通知

* chore: 加点注释
2024-11-10 22:25:02 +08:00
uye
89fd84518b chore: 更新 153/4 宿舍排班 2024-11-10 21:51:19 +08:00
Hao Guan
9ded9435f4 feat: Mac GUI 一键更新资源 (#11123) 2024-11-10 21:31:10 +08:00
Hao Guan
5fe64e4105 feat: Mac GUI 肉鸽改进 & 一键资源更新 (#11121) 2024-11-10 19:16:08 +08:00
status102
067944a472 style: format and init
[skip changelog]
2024-11-09 14:48:10 +08:00
status102
f5aa884005 fix: 自动战斗未启用战斗列表时,禁用理智药使用 2024-11-09 14:46:49 +08:00
status102
90751cdb53 fix: 8ef3a34ddf
[skip changelog]
2024-11-09 13:58:04 +08:00
status102
8ef3a34ddf style: 设置-软件更新 添加注释
[skip changelog]
2024-11-09 13:49:34 +08:00
status102
1f18b8647e Reapply "rft: 拆分设置-软件更新 (#11085)"
This reverts commit a080a3f8e4.
2024-11-09 12:22:38 +08:00
晓丶梦丶仁
f1f2255b5b fix: 肉鸽不期而遇闪退 (#11087)
fix: 不期而遇闪退
2024-11-09 09:10:22 +08:00
晓丶梦丶仁
7925360b22 fix: 萨卡兹肉鸽 原初异途 点进一片莲瓣 (#11106)
fix: 原初异途点进一片莲瓣
2024-11-09 02:20:55 +08:00
status102
e6862636a6 fix: 调整自动战斗参数默认值 2024-11-08 17:12:51 +08:00
github-actions[bot]
89ced63090 chore: Auto Update Game Resources - 2024-11-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11739128948

[skip changelog]
2024-11-08 09:03:29 +00:00
Ali (Daixin) Tian
225b6155fa perf: 公招三星优先tag 改为复选框 (#11097)
* feat: Replace AutoRecruitHighPriority (公招三星优先tag) Textbox with CheckComboBox & ListBox

* chore: update translation for AutoRecruitHighPriority and AutoRecruitHighPriorityTooltip

* perf: UI perform

* fix: Assign default value of _autoRecruitFirstList as empty string

* i18n: 支持外服及显示语言切换

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-11-08 11:50:41 +08:00
status102
a080a3f8e4 Revert "rft: 拆分设置-软件更新 (#11085)"
This reverts commit 57d79eddcf.
2024-11-08 10:04:18 +08:00
晓丶梦丶仁
3757626b2a fix: 萨卡兹肉鸽降低 Sarkaz@Roguelike@CloseCollectionContinue 阈值 (#11090) 2024-11-08 09:04:41 +08:00
Weiyou Wang
e13f1e357a chore: 更新 macos.cmake 中的库版本 (#11101)
* chore: 更新 macos.cmake 中的库版本

* 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-07 20:09:35 +08:00
status102
57d79eddcf rft: 拆分设置-软件更新 (#11085)
* rft: 拆分设置-软件更新

* perf: static var

* style: format
2024-11-07 12:30:22 +08:00
uye
3b91c61816 fix: 导航进商店 2024-11-07 09:57:28 +08:00
Rbqwow
04e2524d40 fix: ExternalNotificationTips 未居中 (#11093)
* fix: ExternalNotificationTips 未居中

* 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-07 00:13:21 +08:00
uye
4b4fdb9a03 feat: 远程通知配置加密 (#11076)
* feat: 远程通知配置加密

* fix: 无法发送外部通知
2024-11-06 15:02:51 +08:00
github-actions[bot]
75a279b25e chore: Auto Update Game Resources - 2024-11-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11698542850

[skip changelog]
2024-11-06 06:45:22 +00:00
Manicsteiner
3f2db7d83f chore: YostarJP phantom roguelike ocr update (#11084) 2024-11-06 14:41:44 +08:00
uye
56ec14acb9 chore: 调整 153/4 宿舍
[skip changelog]
2024-11-06 14:12:12 +08:00
uye
84f6ebd897 fix: 153/4 宿舍 2024-11-06 13:48:10 +08:00
uye
4a19a0417f feat: 新增 153 4 班排班表 2024-11-06 13:34:15 +08:00
uye
fd40a8c218 feat: 开始前/结束后 脚本用双引号包裹时支持带参数
-minimized -noWindow 有额外处理

fix #10813
2024-11-06 01:44:27 +08:00
HX3N
8c05d5063b i18n: YostarKR fixed the reversed description for ReclamationEarlyTip (#11078) 2024-11-06 00:18:19 +08:00
Constrat
d5617d6304 fix: Greyy alter and BattleQuickFormationOCR opencv tweaks
for the umpteenth time a change to the main threshold value reducing hoping to detect Nearl Alter, Gavial and other stupid long names.
2024-11-05 15:04:21 +01:00
github-actions[bot]
216d78f6e8 chore: Auto Update Game Resources - 2024-11-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11685401615

[skip changelog]
2024-11-05 13:42:30 +00:00
github-actions[bot]
20ab374337 chore: Auto Templates Optimization
Triggered by 72119ac361

[skip changelog]
2024-11-05 13:38:20 +00:00
Weiyou Wang
72119ac361 feat: 自动编队允许指定助战单位 (#11075)
* feat: 自动编队自动借助战

Revert d78fc68

fix: 招募助战后继续(缺少点击快速招募)

i18n: 翻译

style: clang-format

fix: basetask template

fix: werror

perf: 注释、format

i18n: en

perf: 完成功能实现,复用task,进行gui输出

perf: 更改默认状态

feat: BattleFormationTask

Revert 385541a (Back to c2849d2)

* fix: 缺干员回到主界面的时候应该点确认而不是返回

* feat: 助战干员职业选择栏模版

* refactor: UseSupportUnitTaskPlugin

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

* perf: 默认值适配国服

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

* feat: try_find_and_apply_support_unit

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

* fix: 大概可以用了

* fix: 补充 struct 的构造函数

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

* fix: 添加默认构造函数

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

* fix: 改改类型

* fix: callback[what] 纠正

* perf: roi及初始化优化

* perf: 简化中英文查找

* perf: rename func

* perf: click roi

* fix: 在点击助战干员的行动后添加 LoadingText

* fix: 打点 Log

* fix: remove unused function

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2024-11-06 00:37:43 +11:00
Constrat
3de378b7f7 docs: tasks doc clarification
[skip changelog]
2024-11-05 13:35:28 +01:00
status102
a17ac2ea69 Revert "feat: 自动编队允许指定助战单位 (#10820)"
This reverts commit 3c97864f0a.
2024-11-05 17:57:24 +08:00
status102
38e3ff5c50 Revert "chore: Auto Update Game Resources - 2024-11-05"
This reverts commit ddd926e073.
2024-11-05 17:57:11 +08:00
status102
c5ce1f79c2 Revert "chore: Auto Templates Optimization"
This reverts commit 46aa097801.
2024-11-05 17:55:39 +08:00
uye
9cb69b49d7 fix: click 泊松分布超出范围 2024-11-05 16:12:10 +08:00
Weiyou Wang
1456e11803 fix: 为 PVChapterToPV 添加 1 秒的 postDelay (#11074)
应该够了吧?
应该吧?
2024-11-05 14:37:59 +08:00
github-actions[bot]
ddd926e073 chore: Auto Update Game Resources - 2024-11-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11678777106

[skip changelog]
2024-11-05 06:29:35 +00:00
github-actions[bot]
46aa097801 chore: Auto Templates Optimization
Triggered by 3c97864f0a

[skip changelog]
2024-11-05 06:09:54 +00:00
晓丶梦丶仁
3c97864f0a feat: 自动编队允许指定助战单位 (#10820)
* feat: 自动编队自动借助战

Revert d78fc68

fix: 招募助战后继续(缺少点击快速招募)

i18n: 翻译

style: clang-format

fix: basetask template

fix: werror

perf: 注释、format

i18n: en

perf: 完成功能实现,复用task,进行gui输出

perf: 更改默认状态

feat: BattleFormationTask

Revert 385541a (Back to  c2849d2)

* fix: 缺干员回到主界面的时候应该点确认而不是返回

* feat: 助战干员职业选择栏模版

* refactor: UseSupportUnitTaskPlugin

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

* perf: 默认值适配国服

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

* feat: try_find_and_apply_support_unit

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

* fix: 大概可以用了

* fix: 补充 struct 的构造函数

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

* fix: 添加默认构造函数

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

* fix: 改改类型

* fix: callback[what] 纠正

* perf: roi及初始化优化

* perf: 简化中英文查找

* perf: rename func

* perf: click roi

* fix: 在点击助战干员的行动后添加 LoadingText

* fix: 打点 Log

* fix: remove unused function

---------

Co-authored-by: Weiyou Wang <44151844+Alan-Charred@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-11-05 17:09:25 +11:00
Weiyou Wang
e83d188d10 fix: enlarge rectMove offset for PV-10 (#11073) 2024-11-05 17:08:19 +11:00
uye
5a028c506d fix: pv-10 2024-11-04 23:13:27 +08:00
uye
4a4e8e47a9 chore: 移除最小化启动模拟器选项 2024-11-04 22:43:15 +08:00
sjdei
5256640fc3 fix: 修正繁中服薩米肉鴿坍縮範式的官方名稱 (#11066)
修正實質性坍縮少了個性
和圖像損壞寫成影像損壞
2024-11-04 21:46:39 +08:00
uye
be01c24635 chore: remove test
[skip changelog]
2024-11-04 21:13:48 +08:00
uye
75e14c8379 fix: 修改任务/基建列表顺序后未开始任务会在程序重启后失效
fix #10094
2024-11-04 20:58:42 +08:00
github-actions[bot]
0b0e007d05 chore: Auto Templates Optimization
Triggered by 2306eb40ae

[skip changelog]
2024-11-04 11:49:30 +00:00
Manicsteiner
2306eb40ae chore: YostarJP clue and ocr update (#11053)
* chore: YostarJP clue

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

* chore: update ocr

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-11-04 19:49:08 +08:00
ForeverDragon
ab0d6324cb fix: Server酱通知推送无法正常推送到微信服务号 (#11057)
fix:Server酱通知推送无法正常推送到微信服务号

Server酱的title参数服务号通道不支持换行,并加入title的长度限制。
title: 消息标题,必填。最大长度为 32 。
2024-11-04 19:46:47 +08:00
uye
a4de0ef66c docs: 添加用户群链接 2024-11-04 18:42:37 +08:00
status102
f013a5980d rft: BattleFormation 移除未使用函数
[skip changelog]
2024-11-04 18:31:32 +08:00
uye
616c12951b perf: 优化访问好友模板匹配 2024-11-04 16:49:21 +08:00
pre-commit-ci[bot]
14bab28e63 chore: Auto update by pre-commit hooks [skip changelog] 2024-11-04 13:19:06 +08:00
uye
755aeff1cd chore: 未进驻选项勾选状态与客户端版本无关
[skip changelog]
2024-11-04 03:16:19 +08:00
uye
2a93ea01d2 fix: UI 更新后无法开趴 2024-11-04 01:21:29 +08:00
uye
1d3f543fbd chore: 更新 153/3 换基建配置,宿舍全指定 2024-11-04 01:03:01 +08:00
uye
059cd38f73 Release v5.9.0 (#11038) 2024-11-03 22:17:50 +08:00
github-actions[bot]
2916be666d docs: Auto Update Changelogs of v5.9.0 (#11039)
* docs: Auto Generate Changelog of Release v5.9.0

* docs: changelog

* docs: changelog

* docs: changelog

* chore: 更新 CHANGELOG.md

* chore: 更新 CHANGELOG.md

* chore: 不造谣.jpg

* chore: 更新 CHANGELOG.md

* chore: 更新 CHANGELOG.md

* chore: 更新 CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
2024-11-03 22:15:04 +08:00
Weiyou Wang
2996de0a18 fix: 为 PV-10 添加偏移 (#11045) 2024-11-03 21:41:19 +08:00
uye
6c91a87474 chore: 国服用不了未进驻 2024-11-03 12:23:15 +08:00
status102
d0c03174d9 fix: 明日方舟资源更新文本提示roi 2024-11-03 11:15:26 +08:00
Rbqwow
5bbd4923a8 docs: 补充连战次数文档 (#11028) 2024-11-03 10:56:05 +08:00
Hao Guan
315216d7fd feat: Mac GUI 支持手动资源更新 (#11036) 2024-11-03 10:55:24 +08:00
Rbqwow
17251bb417 build: Update turbo from v2.0.9 to v2.2.3 (#11029)
build: update turbo from v2.0.9 to v2.2.3
2024-11-03 10:55:12 +08:00
Weiyou Wang
9f10c31f33 fix: 为生息演算无存档刷点模式,点击区域节点任务加上 1 秒的 postDelay (#11035) 2024-11-03 10:54:41 +08:00
uye
aff03a3bbd fix: UpdateStageList 只在 ui 线程执行 2024-11-03 04:00:07 +08:00
uye
62195dfa0b fix: 跨日更新崩溃 2024-11-03 04:01:44 +08:00
uye
b2ec0007e4 Release v5.9.0-beta.3 (#11032) 2024-11-03 02:16:53 +08:00
uye
3c30f19198 fix: 默认值!!!
[skip changelog]
2024-11-03 02:13:14 +08:00
uye
02229b32db Release v5.9.0-beta.3 (#11030) 2024-11-03 02:06:48 +08:00
uye
ed166e1011 chore: 改个 key,避开之前的 1:09
[skip changelog]
2024-11-03 02:05:50 +08:00
uye
d7545f20fe chore: 分钟取整 2024-11-03 02:00:57 +08:00
uye
730da23524 fix: 公招默认值错误 2024-11-03 01:50:41 +08:00
uye
ff124dd085 chore: 使用 baseTask
[skip changelog]
2024-11-03 01:50:15 +08:00
github-actions[bot]
8e41170298 chore: Auto Update Game Resources - 2024-11-02
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11643913685

[skip changelog]
2024-11-02 15:42:23 +00:00
uye
da937c6d5a chore: 修改幸运墙逻辑 2024-11-02 23:35:51 +08:00
uye
afcfdd394d Release v5.9.0-beta.2 (#11023) 2024-11-02 23:19:43 +08:00
github-actions[bot]
b2392e419e docs: Auto Update Changelogs of v5.9.0-beta.2 (#11024)
* docs: Auto Generate Changelog of Release v5.9.0-beta.2

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-11-02 23:11:35 +08:00
status102
4d2978ff07 Revert "fix: 肉鸽难度存储错误值修复"
This reverts commit 9d633c100c.
2024-11-02 22:18:59 +08:00
status102
bd0a51ecb3 chore: changelog_generator 2024-11-02 22:10:54 +08:00
status102
1270f69261 perf: 自动公招时间属性设置优化 (#11025)
* perf: 招募时间属性设置

* style: format

* style: format
2024-11-02 22:00:21 +08:00
github-actions[bot]
f12729ec6a chore: Auto Templates Optimization
Triggered by b0ca5f6165

[skip changelog]
2024-11-02 12:37:12 +00:00
vonnoq
b0ca5f6165 fix: 替換繁中服「跳過」圖片 (#10991)
原本自動戰鬥前劇情都不會跳過
目前更改後暫時正常
2024-11-02 20:36:43 +08:00
uye
9c5ba9e3ae refactor: 可自定义3~5星招募时间 (#11019) 2024-11-02 20:35:18 +08:00
status102
70aa3558f0 chore: ChangelogGenerator检查commit message中的skip changelog是否为自动追加 (#11016) 2024-11-02 20:34:27 +08:00
uye
89a0c947a6 perf: 优化关卡列表更新 (#11022)
* perf: 优化关卡列表更新

* fix: 显示错误

* chore: 调整结构
2024-11-02 20:33:34 +08:00
Constrat
5b97f8d063 tools: update validator.ps1 to return to starting directory after ending call 2024-11-02 12:39:07 +01:00
Constrat
99d4fc16f7 chore: remove duplicates inside CharsNameOcrReplace for Yostar & txwy 2024-11-02 12:38:41 +01:00
Constrat
950c7959b8 fix: YostarEN regex for new operators 2024-11-02 12:24:17 +01:00
Constrat
7355f3e2f7 fix: revert fd959ae341 because Yostar finally fixed the templates for EN. It only took 3 months 2024-11-02 11:35:15 +01:00
uye
5c59ce6662 chore: 修改延迟时间
[skip changelog]
2024-11-02 16:49:16 +08:00
uye
82ede27999 fix: 肉鸽偏后的分队选错 2024-11-02 16:48:20 +08:00
github-actions[bot]
bff501f250 chore: Auto Templates Optimization
Triggered by bcd8b02270

[skip changelog]
2024-11-02 02:23:08 +00:00
Sherkey Asher
bcd8b02270 feat: 支持最新的幸运墙任务 (#11008)
* feat: 支持最新的幸运墙任务

* 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-02 10:22:48 +08:00
status102
9d633c100c fix: 肉鸽难度存储错误值修复
fix #10998
2024-11-02 10:02:16 +08:00
status102
fe90503f6d Revert "fix: 肉鸽难度存储错误值修复"
This reverts commit fe470f3188.
2024-11-02 10:00:50 +08:00
status102
fe470f3188 fix: 肉鸽难度存储错误值修复
fix #11012
2024-11-02 09:07:05 +08:00
status102
ffeb9d3e6e Revert "chore: PV 关卡地图数据 (#11003)"
This reverts commit 0dced4556b.

Link to 42982a8fad
2024-11-02 08:48:17 +08:00
uye
f6d0426ee7 fix: 无法按信赖排序基建 2024-11-02 01:21:50 +08:00
github-actions[bot]
d1818c4b44 chore: Auto Update Game Resources - 2024-11-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11632956232

[skip changelog]
2024-11-01 16:44:44 +00:00
github-actions[bot]
ebe4775a71 chore: Auto Templates Optimization
Triggered by 3036c88ada

[skip changelog]
2024-11-01 16:42:21 +00:00
HX3N
3036c88ada chore: YostarKR EP14 update (#10988)
* chore: YostarKR EP14 ocr update

* chore: add Recruit tag

* chore: operator ocr

* chore: MiningActivity

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

* fix: EnterChapterDifficulty ocr

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-11-01 17:41:56 +01:00
Windsland
98630837bb fix: 修改基建 InfrastOperListTab 部分的 roi (#10999) (#11001)
* fix: 修改基建 InfrastOperListTab 部分的 roi (#10999)

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

* fix: update roi for unification.

* 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-01 17:41:17 +01:00
uye
a69d5d92f3 fix: 导航错误 2024-11-02 00:41:03 +08:00
github-actions[bot]
42982a8fad chore: Auto Update Game Resources - 2024-11-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11632723590

[skip changelog]
2024-11-01 16:29:32 +00:00
status102
6865ed0f80 fix: 基建换班宿舍任务期间重进宿舍后,重置过滤状态记录 (#11007)
- link #10968
2024-11-01 23:58:26 +08:00
uye
9086c0df30 feat: SideStory「揭幕者们」 2024-11-01 23:42:07 +08:00
status102
c3f034f977 fix: 基建换班宿舍任务期间重进宿舍后,重置过滤状态记录 2024-11-01 23:03:19 +08:00
status102
fe1e105df3 Revert "fix: 要求每次进入基建宿舍后都重新选择一遍筛选条件 (#10968)"
This reverts commit b28ffcc13e.
2024-11-01 23:03:19 +08:00
Constrat
ec17e7f799 fix: revert ede078f to fix b28ffcc for EN 2024-11-01 15:19:54 +01:00
github-actions[bot]
963b250aa6 chore: Auto Update Game Resources - 2024-11-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11630578840

[skip changelog]
2024-11-01 14:03:16 +00:00
status102
0dced4556b chore: PV 关卡地图数据 (#11003)
* chore: PV地图数据

* chore: 添加关卡名
2024-11-01 22:00:57 +08:00
github-actions[bot]
023518bf0d chore: Auto Update Game Resources - 2024-11-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11628602183

[skip changelog]
2024-11-01 11:24:13 +00:00
github-actions[bot]
8449677510 chore: Auto Update Game Resources - 2024-11-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11628355828

[skip changelog]
2024-11-01 11:03:22 +00:00
status102
8ba4ba137d perf: 肉鸽难度不可用 / 不切换时禁用插件 (#10993) 2024-11-01 15:23:55 +08:00
github-actions[bot]
611379083e chore: Auto Update Game Resources - 2024-11-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11623242775

[skip changelog]
2024-11-01 02:37:20 +00:00
Constrat
2e6388420a feat: new tag for recruitment
thanks @HX3N I just hope it's the correct tag lol
2024-11-01 00:21:18 +01:00
Constrat
a4984e9831 fix: OCR for Wisadel EN 2024-10-31 19:46:34 +01:00
status102
71216b8d4d i18n: UI 优化 2024-11-01 02:21:10 +08:00
status102
d1f242090e perf: 肉鸽不切换难度时禁用插件 2024-11-01 01:47:39 +08:00
Constrat
c7572b5864 fix: change roi for MiningActivities 2024-10-31 18:34:51 +01:00
github-actions[bot]
e1e210c99d chore: Auto Update Game Resources - 2024-10-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11616832469

[skip changelog]
2024-10-31 17:27:09 +00:00
github-actions[bot]
63885d1a04 chore: Auto Templates Optimization
Triggered by a8233796be

[skip changelog]
2024-10-31 17:16:46 +00:00
Constrat
a8233796be feat: MiningActivity for YostarEN 2024-10-31 18:16:25 +01:00
github-actions[bot]
51874622e4 chore: Auto Update Game Resources - 2024-10-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11616458820

[skip changelog]
2024-10-31 17:03:27 +00:00
status102
043ce3aa2b Revert 50ea5deaee 2024-11-01 00:59:53 +08:00
uye
a6bbd936e0 Release v5.9.0-beta.1 (#10989) 2024-10-31 23:53:31 +08:00
github-actions[bot]
90d816c619 docs: Auto Update Changelogs of v5.9.0-beta.1 (#10990)
* docs: Auto Generate Changelog of Release v5.9.0-beta.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-10-31 23:17:39 +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
github-actions[bot]
84b471bed5 chore: Auto Templates Optimization
Triggered by 2d05141535

[skip changelog]
2024-10-31 14:37:47 +00:00
晓丶梦丶仁
c711f3e05e perf: 适配萨卡兹内容拓展Ⅰ (#10976)
* perf: 适配萨卡兹内容拓展Ⅰ


---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-10-31 22:15:03 +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
晓丶梦丶仁
bc39c2d2ec perf: 肉鸽选难度允许不选难度 (#10979)
* perf: 肉鸽选难度允许不选难度

* fix: 在插件中对 gui 传入的 -1 值做特殊处理
2024-10-31 21:41:36 +08:00
Weiyou Wang
3ecbf8bc26 fix: 修复对 expected_collapsal_paradigms 参数支持 (#10978)
* fix: 修复对 expected_collapsal_paradigms 参数支持

* refactor: 简化一下

* feat: ui 添加坍缩列表

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-10-31 21:35:49 +08:00
github-actions[bot]
5cca9e5e1f chore: Auto Update Game Resources - 2024-10-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11612833844

[skip changelog]
2024-10-31 13:29:15 +00:00
HY
e740012e81 chore: 繁中服「銀心湖列車」活動導航 (#10987) 2024-10-31 14:22:26 +01:00
Manicsteiner
2d05141535 chore: YostarJP EP14 ocr update (#10986) 2024-10-31 14:21:16 +01:00
uye
57c0692444 chore: 优化模拟器最小化启动 2024-10-31 20:20:13 +08:00
uye
5e40d92a61 perf: 优化互斥锁 2024-10-31 20:20:13 +08:00
github-actions[bot]
6ade1ab7a6 chore: Auto Update Game Resources - 2024-10-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11607948614

[skip changelog]
2024-10-31 07:42:07 +00:00
github-actions[bot]
ed3d64e849 chore: Auto Update Game Resources - 2024-10-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11607762212

[skip changelog]
2024-10-31 07:25:32 +00:00
github-actions[bot]
6c7376f445 chore: Auto Update Game Resources - 2024-10-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11606931077

[skip changelog]
2024-10-31 06:04:08 +00:00
github-actions[bot]
ef08237fd6 chore: Auto Update Game Resources - 2024-10-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11606621259

[skip changelog]
2024-10-31 05:27:42 +00:00
1lyvianis
9a0013026f docs: 移除赘字 (#10977) 2024-10-31 01:31:53 +08:00
uye
2a598bda65 chore: 对 gui.json 排序 2024-10-30 12:47:37 +08:00
Weiyou Wang
b28ffcc13e fix: 要求每次进入基建宿舍后都重新选择一遍筛选条件 (#10968)
* fix: 要求每次进入基建宿舍后都重新选择一遍筛选条件

* chore: Auto update by pre-commit hooks
* fix: 修复死循环,替换为只执行一遍

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>

* refactor: 加个 log,未来用于检测

---------

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>
2024-10-30 11:22:44 +08:00
uye
2dcd54a2d8 fix: 肉鸽难度默认值错误 2024-10-30 10:51:04 +08:00
uye
acf4c9ccc7 fix: 1234567890ABCDEF 给爷爬 2024-10-30 10:48:35 +08:00
萨拉托加
ccbf15e5a2 chore: 更新 Feature request 模板 (#10971)
* chore: Update cn-feature-request.yaml

* chore: Update en-feature-request.yaml
2024-10-30 09:51:56 +08:00
github-actions[bot]
e2ad6b69f8 chore: Auto Update Game Resources - 2024-10-29
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11578851601

[skip changelog]
2024-10-29 17:03:16 +00:00
Constrat
b152814afb fix: Special Access not claiming 2024-10-29 17:51:25 +01:00
uye
5014fb8e70 chore: 修改版本不一致描述,提前 return 位置 2024-10-29 18:03:40 +08:00
uye
3d2307fced chore: 资源更新失败时弹出吐司通知 2024-10-29 17:19:37 +08:00
uye
8f483ae1ed feat: 添加直接显示吐司内容函数,固定Show执行线程 2024-10-29 17:10:54 +08:00
uye
b1ad1b2b55 chore: 设置代理时提高github优先度 2024-10-29 17:08:38 +08:00
uye
c533e7379a chore: 移除多余变量 2024-10-29 16:53:48 +08:00
uye
1f69ccb654 fix: 修复手动关闭或闪退后,无法截图到新窗口 2024-10-29 16:24:40 +08:00
uye
627fa36b69 feat: 添加主任务进度条 2024-10-29 16:06:38 +08:00
uye
82e2c2ad6d chore: remove test 2024-10-29 15:22:11 +08:00
uye
f678f65c8e perf: 调整关卡选择更新逻辑 (#10913) 2024-10-29 14:47:52 +08:00
晓丶梦丶仁
aee8ba3aea fix: 为生息演算无存档刷点数模式最后的删除存档任务添加重试机制 (#10965)
fix: 为 Tales@RA@PNS-ProsperityBelowLimit-SwipeSave 任务添加重试机制
2024-10-29 14:44:59 +08:00
uye
2b7a457cbd perf: 优化全主线关卡导航 2024-10-29 13:37:31 +08:00
github-actions[bot]
f02208c7c6 chore: Auto Update Game Resources - 2024-10-29
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11565843426

[skip changelog]
2024-10-29 01:55:24 +00: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
github-actions[bot]
2802e169d3 chore: Auto Update Game Resources - 2024-10-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11563361341

[skip changelog]
2024-10-28 22:03:16 +00:00
Constrat
1049b17d9e feat: Special Access YostarEN 2024-10-28 22:53:59 +01:00
uye
28f5e009a2 feat: 支持状态栏显示进度条 2024-10-29 02:57:07 +08:00
Manicsteiner
906de62d58 chore: YostarJP EP14 preload (#10954)
* chore: YostarJP EP14 preload

* 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-10-28 15:25:59 +08:00
Weiyou Wang
9be4b9c157 fix: 快速编队向左滑动后等待可能的画面回弹 2024-10-28 11:25:38 +08:00
status102
e0b963aef8 style: format
[skip changelog]
2024-10-28 09:24:38 +08:00
Weiyou Wang
2445453de0 fix: MuMu bridge connection (#10937)
* fix: MuMu bridge connection

* fix: global adaptation

* chore: 调整布局,优化变量位置

* fix: 网络桥接模式设置不再与自动检测链接相关

* chore: 自动检测时禁用增强模式开关

* chore: 添加开启桥接的提示

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-10-27 23:07:16 +08:00
status102
eaeaab7b18 fix: MaaCore RoguelikeTask 补充未选择刷开局模式下启用凹精二的禁用判定 2024-10-27 19:24:08 +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
不留
d464d87d07 chore: 部分中文与英文中追加间隔;修正理智识别的理智上限注释 (#10945)
* fix: 优化 UI 界面部分中文文本显示效果

* fix: 理智识别的理智上限校验修改

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

* chore: 注释

* 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>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-10-27 19:11:59 +08:00
uye
e7872bb76e fix: typo 2024-10-27 18:18:36 +08:00
uye
e83888d548 chore: 调整切换语言显示 2024-10-27 18:07:59 +08:00
uye
cc3afa83bd chore: 优化互斥锁描述 2024-10-27 10:22:03 +08:00
github-actions[bot]
fce556ff46 chore: Auto Update Game Resources - 2024-10-27
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11536680996

[skip changelog]
2024-10-27 01:57:35 +00:00
status102
6e965ef2da feat: AbstractTask新增附加已有插件、插件查找
Revert c89b63b78e
2024-10-27 09:13:12 +08:00
github-actions[bot]
afc39b5843 chore: Auto Templates Optimization
Triggered by b430f36bb4

[skip changelog]
2024-10-27 01:05:20 +00:00
Weiyou Wang
b430f36bb4 feat: 点刺成锭分队,刷钱 (#10901)
* feat: fastInvestment

* feat: wpf 适配

* refactor: 点刺成锭分队快速编队

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

* feat: 投资模式下点刺成锭分队直接放弃招募

* refactor: 投资模式下点刺成锭分队不再考虑思维负荷

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

* fix: 修复放弃招募机会时卡顿的问题,模版和 roi 错了

* refactor: 进一步优化

* fix: 取消投资模式下快速定位点刺成锭分队的功能,照顾非全解锁玩家

* fix: 尝试修复跳过 StrategyChange 的问题

* fix: set_squad 提前

* feat: 根据需要启用/禁用 <思维负荷干员编队功能>

* refactor: 加点注释

* fix: 减少需要匹配的模版

* 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>
2024-10-27 09:04:25 +08:00
status102
7d6212026b fix: 理智识别的理智上限校验修改 2024-10-26 23:18:26 +08:00
github-actions[bot]
5480c20328 chore: Auto Update Game Resources - 2024-10-26
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11532771894

[skip changelog]
2024-10-26 15:06:33 +00:00
uye
2e9950ab60 Release v5.8.1 (#10933) 2024-10-26 21:52:42 +08:00
github-actions[bot]
dcfe9510d2 docs: Auto Update Changelogs of v5.8.1 (#10934)
* docs: Auto Generate Changelog of Release v5.8.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-10-26 21:50:09 +08: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
uye
cdb7e781bf chore: 优化描述 2024-10-26 19:34:25 +08:00
uye
22c26483dc chore: 修改 QQ 群文案 2024-10-26 19:24:34 +08:00
uye
2f6a6dfafc fix: 购物卡在确认界面 2024-10-26 18:55:18 +08:00
uye
5dc3512bb8 perf: 关卡导航 2024-10-26 18:42:11 +08:00
uye
6943051574 Release v5.8.0 (#10920) 2024-10-26 16:38:53 +08:00
AnnAngela
5cbebd574f chore: v5.8.0 highlight (#10925)
* chore: v5.8.0 highlight

* chore: 优化说明
2024-10-26 16:38:22 +08:00
github-actions[bot]
53d58e1b54 docs: Auto Update Changelogs of v5.8.0 (#10921)
* docs: Auto Generate Changelog of Release v5.8.0

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-10-26 13:35:28 +08:00
Zhanyuan Guo
723c27bab2 chore: MAA 多开限制提示优化 (#10922)
chore: MAA 多开限制语句更新
2024-10-26 11:05:36 +08:00
Constrat
65b5a586c6 fix: YostarEN BB navigation 2024-10-25 13:18:43 +02:00
uye
9a41644725 perf: 优化设置指引 2024-10-25 17:46:57 +08:00
uye
d2d80a2858 fix: 关卡导航失败
fix #10906
2024-10-24 18:33:28 +08:00
Loong
62dd266c63 chore: bump maa-cli to 0.5.1 (#10899) 2024-10-24 18:19:06 +08:00
github-actions[bot]
ef504ddcb9 chore: Auto Update Game Resources - 2024-10-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11495126212

[skip changelog]
2024-10-24 08:04:18 +00:00
uye
0ae9f9ed5c fix: 无法导航至关卡9-19刷理智
fix #10904
2024-10-24 15:12:44 +08:00
uye
a497a3cfc3 fix: 错误分类 changelog (#10887) 2024-10-23 19:40:47 +08:00
github-actions[bot]
72265d2db2 chore: Auto Update Game Resources - 2024-10-23
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11476617759

[skip changelog]
2024-10-23 09:03:42 +00:00
github-actions[bot]
e3b6ab3962 chore: Auto Update Game Resources - 2024-10-22
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11467634738

[skip changelog]
2024-10-22 20:03:51 +00:00
status102
f7772bc814 chore: pre-commit-ci 添加 clang-format 支持 (#9969)
* chore: pre-commit-ci 添加 clang-format 支持

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

[blame ignore]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-10-22 17:20:24 +08:00
pre-commit-ci[bot]
d3796ea4b3 chore: Auto update by pre-commit hooks [skip changelog] 2024-10-22 08:40:28 +00:00
SherkeyXD
6fecfa640d chore: pre-commit-ci 添加 clang-format 支持 2024-10-22 16:27:39 +08:00
Weiyou Wang
ea1c74ab01 fix: 部分情况下信用购物因过度动画购买错误 (#10893) 2024-10-22 15:40:00 +11:00
Weiyou Wang
7e251a154b fix: semicolon missing (#10892) 2024-10-22 11:42:31 +08:00
uye
8bc6dc9bb9 fix: 部分情况下信用购物因过度动画购买错误 2024-10-22 11:04:50 +08:00
uye
798869cbdb chore: 添加日志 2024-10-21 17:03:19 +08:00
uye
fcbf8838c7 chore: 调整雷电自动检测支持端口 2024-10-21 15:23:30 +08:00
uye
085d401ec5 fix: YostarKR add ocrReplace on RecruitSupportConfirm (#10883)
``` python
[2024-10-20 11:57:32.113][TRC][Px311c][Tx87ac] asst::WordOcr [{ 지운유닛모집: [ 5, 10, 128, 25 ], score: 0.654263 }] by OCR Pipeline , cost 76 ms
[2024-10-20 11:57:32.114][INF][Px311c][Tx87ac] Assistant::append_callback | SubTaskError {"class":"asst::ProcessTask","details":{},"first":["Roguelike@RecruitSupportConfirm"],"pre_task":"","subtask":"ProcessTask","taskchain":"Roguelike","taskid":1,"uuid":""}
[2024-10-20 11:57:32.114][TRC][Px311c][Tx87ac] asst::ProcessTask::run | leave, 1694 ms
```
2024-10-21 12:53:29 +08:00
HX3N
00850f209d fix: YostarKR add ocrReplace on RecruitSupportConfirm 2024-10-21 10:47:02 +09:00
uye
deb9ad3e11 Release v5.8.0-beta.2 (#10879) 2024-10-21 02:50:45 +08:00
Rbqwow
ae49d0c3fe docs: 更正错误说明 (#10881)
docs: 7555 改成 16384

[skip changelog]
2024-10-21 02:25:30 +08:00
github-actions[bot]
26f46a7464 docs: Auto Update Changelogs of v5.8.0-beta.2 (#10880)
* docs: Auto Generate Changelog of Release v5.8.0-beta.2

* docs: 给 #10807 添加pr指引

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2024-10-21 02:18:48 +08:00
晓丶梦丶仁
e24b5e18be fix: 修复肉鸽阵容完备度中单个干员重复出现于多个干员组的问题 (#10806)
* fix: 修复肉鸽阵容完备度中单个干员重复出现于多个干员组的问题

* style: clang
2024-10-21 02:18:34 +08:00
uye
5e5b18edea feat: 软件更新中添加手动更新资源版本 (#10877) 2024-10-21 01:02:03 +08:00
uye
beabba92e3 fix: 官服切换账号识别问题
#10878
2024-10-21 01:00:31 +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
github-actions[bot]
b7835b84ed chore: Auto Update Game Resources - 2024-10-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11427982563

[skip changelog]
2024-10-20 16:44:14 +00:00
晓丶梦丶仁
a3b483ffe8 docs: 更新肉鸽文档 (#10807) 2024-10-21 00:41:11 +08:00
Weiyou Wang
7ab291a843 fix: 公开招募检测 Tag 失败时尝试识别 <继续招募> 按钮 (#10846)
* fix: 公开招募检测 Tag 失败时尝试识别 <继续招募> 按钮

* fix: 部分界面仍会卡在放弃招募界面

* chore: 成功返回的公招允许重试

* chore: EN, JP and txwy RecruitConfirm

* chore: KR RecruitConfirm

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
2024-10-21 00:39:39 +08:00
晓丶梦丶仁
246df99a78 fix: 降低 肉鸽投资确认 模板匹配阈值 (#10864) 2024-10-21 00:37:06 +08:00
Zhanyuan Guo
fc01083c47 feat(#3767):restricted multi-instance under same MAA (#10869)
* feat(#3767):restricted multi-instance under same MAA.exe

使用了 @THSLP13 的方案。

* Revert "feat(#3767):restricted multi-instance under same MAA.exe"

This reverts commit 53f50c646d.

* feat(#3767):restricted multi-instance for the same MAA
取消注释并使用变量记录互斥锁存在情况,拆分了提示信息的i18n。
2024-10-21 00:36:24 +08:00
lcebot
139d87cdb1 fix: typo in[docs] 更新MuMu截图增强模式中端口的文本描述 (#10866)
fix: typo on line 383
2024-10-20 12:55:39 +08:00
Anonymous
7ffcbbff1b i18n: Translated using Weblate (English (United States))
Currently translated at 99.4% (780 of 784 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/en_US/
2024-10-19 21:33:08 +02:00
uye
0d6ad34b92 fix: 自动编队无法选中特种标签页 2024-10-19 22:06:35 +08:00
uye
69da388948 fix: b 服切换账号无法选择下拉列表中的中文名 2024-10-18 21:01:30 +08:00
AoXuan
d20cc1031e docs: 更新MuMu截图增强模式中端口的文本描述 (#10851)
* docs: 更新MuMu截图增强模式中端口的文本描述

fix #10848

* docs: 更新MuMu截图增强模式中端口的文本描述

* docs: 更新MuMu截图增强模式中端口的文本描述

添加空格
2024-10-18 20:12:47 +08:00
github-actions[bot]
ce08ab921e chore: Auto Update Game Resources - 2024-10-18
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11402490530

[skip changelog]
2024-10-18 11:03:19 +00:00
萨拉托加
3f8a9ff8bc fix: 修复维多利亚正则错误 (#10850) 2024-10-18 16:57:08 +08:00
Constrat
018e54ffe0 fix: update BB navigation for EX YostarEN 2024-10-18 08:57:49 +02:00
AnnAngela
64ae91b048 fix: GO 识别错误 (#10844)
See #10843
2024-10-18 11:09:42 +08:00
uye
d23f6b1b18 docs: 支持mumu后台保活,通过包名获取display_id 2024-10-18 09:29:11 +08:00
uye
5172acf64b Release v5.8.0-beta.1 (#10839)
咋没发出去)
2024-10-18 09:25:28 +08:00
github-actions[bot]
d77e280434 chore: Auto Update Game Resources - 2024-10-17
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11391345466

[skip changelog]
2024-10-17 19:03:21 +00:00
uye
de181e805b Release v5.8.0-beta.1 (#10832) 2024-10-18 00:52:38 +08:00
uye
783c77d2d9 docs: Update CHANGELOG.md
[skip ci][skip changelog]
2024-10-18 00:52:10 +08:00
github-actions[bot]
9c7efd138b docs: Auto Update Changelogs of v5.8.0-beta.1 (#10834)
docs: Auto Generate Changelog of Release v5.8.0-beta.1

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-10-18 00:49:45 +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
晓丶梦丶仁
f10d011893 fix: CharsNameOcrReplace 维娜·维多利亚 (#10818)
* fix: CharsNameOcrReplace 维娜·维多利亚

* fix: 修改

* Update tasks.json
2024-10-17 23:52:17 +08:00
AoXuan
7fd7dea530 feat: 新增server酱3的推送逻辑 (#10805)
* feat: 新增server酱3的推送逻辑

新增server酱3的推送逻辑(通过 sendkey 判断)

* feat: 兼容server酱3最新的接口格式

兼容server酱3最新的接口格式

* chore: annotation
2024-10-17 15:05:45 +08:00
uye
dee8df8f78 feat: b服支持多分辨率多 dpi 登录 (#10817)
* feat: b服支持多分辨率多 dpi 登录

* chore: 调整 b 服 AccountCurrentOCRBili 识别范围

* chore: 删除 UI 多余显示

* chore: 删除多余图片
2024-10-17 13:52:30 +08:00
MistEO
e5874b581b ci: update DirectML to 1.15.2 for Windows (#10827) 2024-10-17 12:54:57 +08:00
晓丶梦丶仁
f45ddc4a70 perf: IS Phantom Update 雕匠与石像.json (#10829)
perf: Update 雕匠与石像.json
2024-10-17 12:53:39 +08:00
晓丶梦丶仁
1e4cfd04a0 perf: 更新肉鸽 ew 优先级 (#10830)
* perf: 更新肉鸽 ew 优先级
2024-10-17 12:52:49 +08:00
晓丶梦丶仁
9a6c8b57e6 perf: 将萨米、萨卡兹肉鸽阵容完备度的 益达、玛恩纳、水陈 组调为2 (#10831) 2024-10-17 12:52:31 +08:00
晓丶梦丶仁
8d80c4d1da perf: RA加快开局教程对话 (#10824)
perf: 加快开局教程对话
2024-10-16 19:53:17 +08:00
github-actions[bot]
393ce18356 chore: Auto Update Game Resources - 2024-10-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11362807178

[skip changelog]
2024-10-16 09:27:23 +00:00
ManicSteiner
332785354b chore: revert 09cdf4e [skip changelog] 2024-10-16 11:23:45 +02:00
Constrat
158fc9849d Revert "ci: use runs/job instead of just runs for ResourceUpdater"
This reverts commit 87e6d9a442.
2024-10-16 11:22:02 +02:00
github-actions[bot]
7c617ec62c chore: Auto Update Game Resources - 2024-10-16
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11362411676/job/update-game-resources

[skip changelog]
2024-10-16 09:06:11 +00:00
dependabot[bot]
54878c88ea ci: bump lycheeverse/lychee-action from 1 to 2 in /.github/workflows in the github-actions group (#10810)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Loong <40141251+wangl-cc@users.noreply.github.com>
2024-10-15 18:22:27 +02:00
uye
09cdf4e14c fix: 日服偶现无法开始行动
fix #10771
2024-10-15 16:55:58 +08:00
github-actions[bot]
a3499053a8 chore: Auto Update Game Resources - 2024-10-15
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11342224983/job/update-game-resources

[skip changelog]
2024-10-15 08:29:22 +00:00
status102
3493160256 chore: Mumu regex 2024-10-15 15:12:06 +08:00
晓丶梦丶仁
fc6bf94b13 chore: 更新 bug-issue 模板 (#10811)
* chore: Update cn-bug-report.yaml

* chore: Update en-bug-report.yaml (#10812)
2024-10-15 01:11:20 +08:00
Rbqwow
69c8c0e2f2 fix: 修复错误的定时 7分钟最大值 (#10804) 2024-10-14 08:47:08 +08:00
github-actions[bot]
db3ab147a1 chore: Auto Templates Optimization
Triggered by 79a7174c78

[skip changelog]
2024-10-13 21:55:58 +00:00
HX3N
79a7174c78 fix: YostarKR replaced StageFerociousPresageEnter.png to improve recognition score 2024-10-13 23:55:37 +02:00
晓丶梦丶仁
033a8732f3 perf: 降低萨米、萨卡兹肉鸽 维娜·维多利亚 招募优先级 (#10792)
* perf: 降低萨米肉鸽 维娜·维多利亚 招募优先级

* perf: 降低萨卡兹肉鸽 维娜·维多利亚 招募优先级 (#10793)

* perf: 萨米、萨卡兹肉鸽降低维娜部署优先度
2024-10-14 01:28:39 +11:00
晓丶梦丶仁
c0b71c5ddf perf: 傀影肉鸽招募适配乌尔比安 (#10798)
* perf: 傀影肉鸽招募适配乌尔比安

* fix: 快训练
2024-10-13 22:17:18 +08:00
uye
13fd031941 style: 格式化
[skip changelog]
2024-10-13 18:24:43 +08:00
uye
10726377c6 fix: 部署/开技能后添加等待过度动画延迟,避免屏幕倾斜遇到的识别错误 2024-10-13 18:24:43 +08:00
status102
fa49fd7789 fix: 移除无效的try-catch
fix #10772
2024-10-13 16:26:34 +08:00
Constrat
87e6d9a442 ci: use runs/job instead of just runs for ResourceUpdater 2024-10-12 13:05:38 +02:00
github-actions[bot]
f4a3c8afda chore: Auto Templates Optimization
Triggered by dd0a08c708

[skip changelog]
2024-10-12 10:52:27 +00:00
Constrat
dd0a08c708 fix: update YostarEN MallSiege template
fix #10777
2024-10-12 12:52:00 +02:00
swablueme
683a64feda fix: fix ROI box for babel EN OCR 2024-10-12 12:17:49 +02:00
Constrat
b13bc21cad fix: remove custom EnterInfrastSiege for YostarEN
Yostar finally removed their "custom" template for the global.
No reason why they did that.
fix #10777
2024-10-12 01:19:01 +02:00
MistEO
fa83a5a8df fix: mumu display id error if startup ark manually (#10787) 2024-10-12 02:01:03 +08:00
MistEO
69fc490459 fix: mumu display id error when ark not startup (#10786) 2024-10-12 01:42:22 +08:00
github-actions[bot]
bdf0a6fd27 chore: Auto Update Game Resources - 2024-10-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11293249751

[skip changelog]
2024-10-11 13:29:07 +00:00
uye
f685f37905 fix: 获取信用及购物中不勾选访问好友也会执行
fix #10776
有人返回写错喽
2024-10-11 21:24:35 +08:00
uye
c7038260ed feat: GO 导航 2024-10-11 21:13:34 +08:00
github-actions[bot]
0f7f454074 chore: Auto Update Game Resources - 2024-10-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11292674417

[skip changelog]
2024-10-11 12:52:07 +00:00
晓丶梦丶仁
20d79460f0 fix: 维娜·维多利亚 OcrReplace (#10763)
* fix: 维娜·维多利亚 OcrReplace

* fix: 维娜 识别错误

* fix: ・·

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-10-11 20:41:31 +08:00
MistEO
6c1b91749a feat: 支持mumu后台保活,通过包名获取display_id (#10713)
* feat: 支持mumu后台保活,通过包名获取display_id

* perf: 调整mumu extras需要的信息

* perf: 适配UI

* fix: build error

* feat: 每次截图前都获取display id

* feat: 每次启动app重新获取display id

* fix: 修复mumu保活多屏幕时分辨率错误

* 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-10-11 20:41:17 +08:00
Manicsteiner
30ae6d2ad9 chore: YostarJP ocr fix (#10780) 2024-10-11 20:36:48 +08:00
github-actions[bot]
9b9b201a63 chore: Auto Update Game Resources - 2024-10-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11286848046

[skip changelog]
2024-10-11 05:27:10 +00:00
github-actions[bot]
a331c55bf8 chore: Auto Update Game Resources - 2024-10-11
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11286618350

[skip changelog]
2024-10-11 05:03:20 +00:00
status102
5d099b4eb9 feat: 自动战斗-战斗列表增加单任务作业查看 (#10764) 2024-10-11 09:33:52 +08:00
github-actions[bot]
4770311c55 chore: Auto Update Game Resources - 2024-10-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11281470425

[skip changelog]
2024-10-10 20:26:59 +00:00
HX3N
a5c642a9ca fix: YostarKR tweak Sami StageEnterBattleAgain specificRect (#10767)
* fix: add SamiRoguelikeStageEnterBattleAgain

* chore: fix ocr and remove duplicate
2024-10-11 05:04:06 +09:00
github-actions[bot]
df63d861a5 chore: Auto Update Game Resources - 2024-10-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11279493039

[skip changelog]
2024-10-10 18:03:51 +00:00
Wangqiusu
95f620f08c perf: 萨米、萨卡兹肉鸽招募适配维娜 · 维多利亚 (#10765)
* perf: 萨米肉鸽招募适配维娜 · 维多利亚

* perf: 萨卡兹肉鸽招募适配维娜 · 维多利亚
2024-10-10 21:48:54 +08:00
github-actions[bot]
504da130e7 chore: Auto Update Game Resources - 2024-10-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11273620413

[skip changelog]
2024-10-10 12:05:01 +00:00
晓丶梦丶仁
3f53c2b3fb fix: 更换确认助战 roi 时填写值错误 (#10762)
* fix: 更换确认助战 roi 时填写值错误

* fix: roi

* fix: 标点
2024-10-10 22:35:24 +11:00
Rbqwow
9367a86f96 chore: Issue 模板添加雷电截图增强相关 (#10754)
chore: 雷电也做了
2024-10-10 19:25:27 +08:00
github-actions[bot]
fa3dffaf9f chore: Auto Update Game Resources - 2024-10-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11273040685

[skip changelog]
2024-10-10 11:24:38 +00:00
status102
385541a44d perf: 自动战斗自定义添加干员编队时按职业选择 2024-10-10 19:15:04 +08:00
Wallsman
c2849d2c32 doc: Update JP バベル (#10758) 2024-10-10 09:55:55 +01:00
github-actions[bot]
b3a2e710ab chore: Auto Update Game Resources - 2024-10-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11268652786

[skip changelog]
2024-10-10 06:29:42 +00:00
Weiyou Wang
26bb6b29f5 fix: 为随机借助战功能添加点击确认按钮的步骤 (#10757) 2024-10-10 14:18:58 +08:00
github-actions[bot]
92ea90ac0e chore: Auto Update Game Resources - 2024-10-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11268148241

[skip changelog]
2024-10-10 05:43:04 +00:00
github-actions[bot]
e699b8c890 chore: Auto Update Game Resources - 2024-10-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11267986742

[skip changelog]
2024-10-10 05:27:18 +00:00
Weiyou Wang
e25ef273ba chore: fix issue-checker macGui regex (#10755) 2024-10-10 09:46:46 +08:00
晓丶梦丶仁
7b3d741440 docs: 明确文档中的 MacOS 称呼 (#10734)
* docs: Update macos.md

* docs: update en-us

* chore: update issue checker macgui regex

f**k regex

* chore: simplified regex as more readable

---------

Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-10-09 23:35:36 +01:00
github-actions[bot]
83d158d015 chore: Auto Update Game Resources - 2024-10-09
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11253617189

[skip changelog]
2024-10-09 11:03:17 +00:00
Constrat
562ffbf5d3 feat: YostarEN BB navigation 2024-10-09 13:00:04 +02:00
HX3N
90e4508011 feat: YostarKR BB navigation 2024-10-09 12:49:20 +02:00
github-actions[bot]
194c34c189 chore: Auto Update Game Resources - 2024-10-09
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11251409086

[skip changelog]
2024-10-09 08:44:54 +00:00
github-actions[bot]
cf9fc094b6 chore: Auto Update Game Resources - 2024-10-09
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11248001830

[skip changelog]
2024-10-09 04:03:48 +00:00
github-actions[bot]
f445e26b73 chore: Auto Update Game Resources - 2024-10-09
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11247083202

[skip changelog]
2024-10-09 02:27:12 +00:00
uye
1d28f6e830 perf: 雷电截图增强支持自动检测模拟器安装路径 2024-10-08 18:40:52 +08:00
uye
71a7f8aa05 docs: 修改文档匹配算法描述错误 2024-10-08 18:40:52 +08:00
Constrat
cc26e0815c ci: dependabot prettier action major version skip 2024-10-07 16:48:31 +02:00
Constrat
48d2d25996 fix: increase ROI size for Tales@RA@Craft
fix #10742
2024-10-07 12:20:21 +02:00
Constrat
167739b5c5 ci: Resource Updater push perfs (#10733)
---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-10-04 15:14:02 +01:00
uye
ece52124a9 Release v5.7.0 (#10716) 2024-10-03 14:47:11 +08:00
AnnAngela
5e3988ba91 chore: v5.7.0 highlight (#10719)
* chore: v5.7.0 highlight

* chore: Update CHANGELOG.md
2024-10-03 14:46:33 +08:00
github-actions[bot]
192ad2cf6f docs: Auto Update Changelogs of v5.7.0 (#10717)
* docs: Auto Generate Changelog of Release v5.7.0

* docs: Update CHANGELOG.md

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-10-02 17:55:25 +08:00
Constrat
627dbe4189 ci: add commit triggerer for optimize templates
[skip changelog]
2024-10-02 11:48:20 +02:00
uye
f8e6880899 chore: 将生息演算的 策略 选项移至常规设置 2024-10-02 15:25:51 +08:00
github-actions[bot]
df21dcb201 chore: Auto Templates Optimization
[skip changelog]
2024-10-02 06:29:42 +00:00
uye
73bf9f4e21 chore: 优化编队模板图片,识别不到对应职业图标时在 全部 中寻找 2024-10-02 14:29:13 +08:00
uye
69da70c1ba chore: 截图延迟过高时自动降低目标帧率 2024-10-02 12:14:10 +08:00
MistEO
9d00d3851e fix: 修复漏了的初始化 2024-10-01 22:29:17 +08:00
uye
bd44c5f0fa Release v5.7.0-beta.2 (#10708) 2024-10-01 09:37:48 +08:00
github-actions[bot]
1759f8c234 docs: Auto Update Changelogs of v5.7.0-beta.2 (#10709)
* docs: Auto Generate Changelog of Release v5.7.0-beta.2

* docs: changelog

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[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>
2024-10-01 09:32:59 +08:00
uye
cdc9903e9f fix: 肉鸽重新编队应在首页执行 (#10465)
#9510
正常来说 cur_page 变量都是正确的,可以作为判断依据,既不用每次都划几下也不用识别左侧是否还有干员。
2024-09-30 20:40:43 +08:00
uye
6f31264c48 chore: 优化可清除内容的下拉框显示效果
Co-authored-by: Weiyou Wang <Weiyou.Wang@anu.edu.au>
2024-09-29 22:10:43 +08:00
uye
1c686c4b5a chore: 移除 ConnectSettingsUserControl 设计时高度限制 2024-09-29 22:10:43 +08:00
github-actions[bot]
6ef35b1e74 chore: Auto Update Game Resources - 2024-09-29
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11092239248

[skip changelog]
2024-09-29 11:23:46 +00:00
Manicsteiner
f50f72678e docs: LD screenshot JP translate (#10659)
* docs: LD screenshot JP translate

* docs: 添加缺少的翻译

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-09-29 17:29:30 +08:00
github-actions[bot]
e6102b579e chore: Auto Templates Optimization
[skip changelog]
2024-09-29 09:01:38 +00:00
uye
2d214bb3ea fix: 自动编队偶现无法匹配职业图标 2024-09-29 17:01:11 +08:00
uye
142c8aad3c chore: 掉落统计显示当前关卡名称 2024-09-29 15:47:19 +08:00
github-actions[bot]
0185d4908d chore: Auto Update Game Resources - 2024-09-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11086632710

[skip changelog]
2024-09-28 20:03:23 +00:00
github-actions[bot]
3fcff1f09d chore: Auto Templates Optimization
[skip changelog]
2024-09-28 16:42:38 +00:00
Weiyou Wang
7ab323d3dd feat: 为战斗界面识别模块添加部署费用左侧图标的识别 (#10702)
* feat: 为战斗界面识别模块添加部署费用左侧图标的识别

* 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-29 00:42:19 +08:00
Constrat
5d76565ba2 chore: removed wrong tooltip from AllowUseStoneSave 2024-09-28 15:15:35 +02:00
Constrat
236742c3ab i18n: EN tweak for Use Originium option 2024-09-28 14:52:23 +02:00
Constrat
6f72b444ac i18n: EN tweak 2024-09-28 13:35:36 +02:00
github-actions[bot]
5e1e931c2d chore: Auto Update Game Resources - 2024-09-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11082572356

[skip changelog]
2024-09-28 08:43:53 +00:00
HX3N
b6a7d3bfc8 perf: switch to StageSideStory.png for OD YostarKR
ref: c234f0f4d9
2024-09-28 10:38:48 +02:00
github-actions[bot]
6f16995ce6 chore: Auto Update Game Resources - 2024-09-28
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11082113884

[skip changelog]
2024-09-28 07:24:15 +00:00
XuQingTW
9e15bf6a60 fix: 繁中服干员Ocr辨識更新 煌、艾雅法拉、涤火杰西卡、史尔特尔、湮滅之相 (#10678)
* Update tasks.json

* Update tasks.json

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

* Update tasks.json

* 更新 tasks.json

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>

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

* remove .*-

好吧,最後在戰鬥中炸掉了

* Update tasks.json

---------

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>
2024-09-28 15:03:38 +08:00
github-actions[bot]
d3d2cd307b chore: Auto Update Game Resources - 2024-09-27
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11074474437

[skip changelog]
2024-09-27 16:45:14 +00:00
uye
55a3f83e8a chore: 执行完成后动作前输出当前选择的动作 2024-09-28 00:39:58 +08:00
Constrat
c234f0f4d9 perf: switch to StageSideStory.png for OD YostarEN 2024-09-27 18:39:38 +02:00
uye
501cc62096 chore: 调整 bug report 2024-09-28 00:27:32 +08:00
uye
4ab1e3704b perf: InvokeAsync 前判断是否已经在 ui 线程 2024-09-28 00:09:28 +08:00
uye
f88c90aa0c fix: 强制定时启动前显示窗口 导致程序崩溃
fix #10692
2024-09-27 23:47:26 +08:00
Constrat
c3a36da016 fix: ResourceUpdater always returning 0 even on error 2024-09-27 16:41:11 +02:00
Constrat
afbbedd88f refactor: Update ResourceUpdater script and clone_data_repo.ps1
- Refactor the ResourceUpdater script to use the correct validator.ps1 script instead of script.ps1.
- Update the clone_data_repo.ps1 script to use parallel jobs for cloning and sparse-checkout of the Official and Overseas repositories.
- Remove the penguin_stages.ps1 and penguin_stages.sh scripts, as they are no longer needed.
2024-09-27 16:16:33 +02:00
Constrat
122af971c3 chore(tools): cd to starting dir for script tools 2024-09-27 13:12:48 +02:00
Constrat
90e5f37a9f fix: ResourceUpdater git diff not finding pngs 2024-09-27 13:12:34 +02:00
github-actions[bot]
e1a4010e98 chore: Auto Update Game Resources - 2024-09-27
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11068980966

[skip changelog]
2024-09-27 10:30:30 +00:00
github-actions[bot]
30310ca40a chore: Auto Templates Optimization
[skip changelog]
2024-09-27 10:11:53 +00:00
pre-commit-ci[bot]
b5a93c5f9f chore: Auto update by pre-commit hooks [skip changelog] 2024-09-27 12:11:31 +02:00
HX3N
20fed4c971 fix: YostarKR switch OD navigation to template 2024-09-27 12:11:31 +02:00
github-actions[bot]
90f9ba7e9e chore: Auto Update Game Resources - 2024-09-27
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11067735736

[skip changelog]
2024-09-27 09:03:55 +00:00
github-actions[bot]
2530598b6f chore: Auto Update Game Resources - 2024-09-27
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11066872387

[skip changelog]
2024-09-27 08:04:23 +00:00
github-actions[bot]
0a132b241f chore: Auto Templates Optimization
[skip changelog]
2024-09-27 07:56:03 +00:00
Constrat
d07506012f fix: switch OD navigation to template 2024-09-27 09:55:16 +02:00
github-actions[bot]
e1b8fefd12 chore: Auto Update Game Resources - 2024-09-27
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11063149181

[skip changelog]
2024-09-27 01:53:59 +00:00
XuQingTW
80a55c9327 chore: ZT關卡導引更新 2024-09-27 09:32:42 +08:00
Constrat
ea6ccf4885 refactor: ResourceUpdater tweaks and code optimizations (#10689)
* refactor: move penguin stages download to repo download step

* chore: reduced logging level for res upd

* perf: moved penguin to txwy workflow + thread error management
2024-09-26 21:59:06 +01:00
Constrat
4b258d57bc fix: renamed input directory 2024-09-26 15:34:11 +02:00
Constrat
35607fd056 fix: uncommented update stages section. 2024-09-26 15:28:58 +02:00
Constrat
bda8c30f18 perf!: Full multithread implementation for ResourceUpdater.exe + method refactoring
This should be the last big change, since I've reached sub 1.5 seconds. Every method is now parallelized :)
2024-09-26 13:03:36 +02:00
Constrat
9a6a2ad31b chore: more threading, namespace refactoring for ResourceUpdater 2024-09-25 22:05:11 +02:00
github-actions[bot]
aa02e5e23d chore: Auto Update Game Resources - 2024-09-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11031810007

[skip changelog]
2024-09-25 11:13:48 +00:00
Constrat
ae18f00679 feat(perf): ResourceUpdater.exe implements multi-threading + fix for missing foldartals
Lighter implementation compared to #10683
2024-09-25 13:10:17 +02:00
Weiyou Wang
f4ba45957a fix: 调整肉鸽 StageTraderRefreshWithDice 任务的 roi 参数 (#10686)
fix: adjust roi for task "Roguelike@StageTraderRefreshWithDice"
2024-09-25 18:36:55 +08:00
Constrat
e59a5e2b7a style: added elapsed time + generic log formatting for resupd 2024-09-25 11:21:30 +02:00
Constrat
f40036d6df Revert "feat(perf): multithreaded resource updater" (#10684)
Revert "feat(perf): multithreaded resource updater (#10683)"

This reverts commit d8f3dded11.
2024-09-24 20:25:04 +01:00
Constrat
d8f3dded11 feat(perf): multithreaded resource updater (#10683)
* feat(perf): multithreading for resource updater

* perf: multithread penguin request

* style: formatting

* test: remove test comments
2024-09-24 19:20:50 +01:00
Constrat
49aa88a35c fix: resupd clone data script wrong location 2024-09-24 17:08:44 +02:00
status102
43a9d2ec9f perf: 开始唤醒增加资源更新Ocr (#10680)
* perf: 开始唤醒增加资源更新Ocr

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

* docs: unexpected change

* 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-24 16:47:53 +08:00
github-actions[bot]
574e4da878 chore: Auto Update Game Resources - 2024-09-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11010000736

[skip changelog]
2024-09-24 08:33:16 +00:00
Constrat
7cd1047886 fix: txwy gamedata + various refactoring for resource updater 2024-09-24 10:29:46 +02:00
晓丶梦丶仁
261e4f22cf chore: 更新 bug-issue 模板 (#10675)
* chore: 更新 bug-issue 模板

* chore: 更新 en-bug-issue 模板

---------

Co-authored-by: 晓丶梦丶仁 <daydream1020623818@gmail.com>
2024-09-23 17:50:27 +08:00
uye
f42f527015 fix: 强制定时启动报错 2024-09-23 12:58:06 +08:00
uye
f38c88c7f4 chore: TimerSettings 改用 NumericUpDown 验证输入 2024-09-23 12:27:26 +08:00
uye
525140fa75 chore: 定时启动添加日志 2024-09-23 11:44:49 +08:00
uye
0075b59da1 chore: 主定时器改用 Timer 2024-09-23 11:22:32 +08:00
uye
cb331b653c chore: 在 ui 线程清除日志 2024-09-23 11:21:29 +08:00
Weiyou Wang
e78420fac6 fix: 降低 Tales@RA@LeaveCurrentZone 任务的 templThreshold (#10658)
fix: decrease template match score threshold for task <Tales@RA@LeaveCurrentZone>
2024-09-22 19:40:46 +08:00
uye
e7e32a22fa Release v5.7.0-beta.1 (#10635) 2024-09-21 23:41:32 +08:00
github-actions[bot]
8bd0ce5626 docs: Auto Update Changelogs of v5.7.0-beta.1 (#10657)
* docs: Auto Generate Changelog of Release v5.7.0-beta.1

* docs: changelog

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-09-21 23:41:16 +08:00
uye
94ff657808 perf: 优化 RecognizerViewModel (#10641)
* perf: 优化 RecognizerViewModel

删除多余变量,避免大量内存重复申请

* perf: 优化 peep 逻辑

* chore: 优化异步截图

* perf: 移除不必要的任务调用

* perf: 优化截图

* chore: stream 使用 using

* chore: TestLinkAndGetImage 改用 AsstGetFreshImageAsync

* refactor: 提取 peep 页面,允许自定义触发器间隔

* chore: 添加 PeepInterval 最小值

* chore: 避免重复订阅事件

* chore: _peepImageTimer 改用 System.Timers.Timer

* refactor: PeepInterval 改为 PeepTargetFps

* fix: 截图时间过长时导致队列阻塞无法停止观测

* perf: 增加截图任务并发限制

* chore: 调整变量名

说起来真有人能截图截到 Int.Max 吗

* chore: 调整初始分配线程数

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-09-21 22:53:19 +08:00
Rbqwow
608efbec1f docs: 更新雷电截图增强文档和 Issue 模板 (#10638)
* docs: 更新雷电截图增强文档 zh&en

* docs: 更新雷電截圖增強文件 zh-tw

* docs: LD9 Hyper-V feat. dant

* docs: LD9 Hyper-V zh-tw

* docs: official --> Chinese

* chore: 主要是更新雷电 Issue 模板

* docs: 更新雷电受支持版本

* i18n: en tweak

* docs: kr docs update

* chore: kr link tweak

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
2024-09-21 22:50:20 +08:00
uye
e15a15e074 docs: 文档错别字
fix #10652
2024-09-21 17:00:13 +08:00
HX3N
db8265086e chore: YostarKR ocr fix 2024-09-20 20:53:01 +01:00
uye
ebe7c808d5 chore: ss-open 使用 StageSideStory.png 2024-09-20 19:09:58 +08:00
Daydreamer514
af7a93c179 perf: tasks.json 十四章内容补充 (#10644) 2024-09-20 10:13:54 +08:00
Sherkey
50251278ed feat: CV-4 navigation 2024-09-20 10:13:26 +08:00
status102
6c25ec2f46 perf: 截图测试使用GetFreshImage替代添加冗余任务 2024-09-20 10:11:08 +08:00
github-actions[bot]
f202c0f0d3 chore: Auto Update Game Resources - 2024-09-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10946156436

[skip changelog]
2024-09-19 17:43:36 +00:00
github-actions[bot]
259925c1f2 chore: Auto Update Game Resources - 2024-09-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10945927985

[skip changelog]
2024-09-19 17:27:07 +00:00
Constrat
f9bfec7dee fix: Dormitory theme may block OCR sequence in EN
fix #10645
2024-09-19 17:45:07 +02:00
github-actions[bot]
8f97191ee9 chore: Auto Update Game Resources - 2024-09-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10940589681

[skip changelog]
2024-09-19 12:06:38 +00:00
Constrat
2c212376b8 chore: OD tasks for navigation
(from MaaRelease)
2024-09-19 12:02:30 +00:00
github-actions[bot]
b9824460c5 chore: Auto Update Game Resources - 2024-09-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10939680568

[skip changelog]
2024-09-19 11:04:36 +00:00
github-actions[bot]
1f0b884e33 chore: Auto Update Game Resources - 2024-09-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10937846813

[skip changelog]
2024-09-19 09:04:34 +00:00
github-actions[bot]
4d6567ffdd chore: Auto Update Game Resources - 2024-09-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10937305462

[skip changelog]
2024-09-19 08:30:03 +00:00
github-actions[bot]
89ce9ae546 chore: Auto Update Game Resources - 2024-09-19
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10936068948

[skip changelog]
2024-09-19 07:04:32 +00:00
uye
82a5f53ff1 chore: 启动后对已有配置排序
fix https://github.com/orgs/MaaAssistantArknights/discussions/10633
2024-09-18 19:44:07 +08:00
uye
ae77c07311 feat: capture fresh image (#10460)
* feat: 使用 AsstAsyncScreencap 的实时截图

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>

* feat: 增加空阻塞任务以便调试

* chore: 增加帧率显示

---------

Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
2024-09-18 00:41:30 +08:00
uye
c4e320526c feat: LD 截图 (#10581)
* feat: EmulatorExtras 子模块更新

* feat: 写了一坨

* feat: 大概是能用了

* feat: ui 支持 ld 截图增强

* chore: 修改 LdSpecialScreenshot 颜色,调整版本要求描述

* chore: 使用 steady_clock

* chore: 移除未使用变量
2024-09-17 22:52:18 +08:00
uye
4734d2600d chore: 喜报! (#10578)
* chore: 喜报!

* fix: 无法复制完整信息

* perf: 优化彩色显示效果

* feat: 支持切换ErrorView

* feat: 添加UI开关

* fix: 绑定不生效

* chore: 修改标题

* chore: 改成正常的翻译

* chore: 去除多余翻译

* chore: 调整淡入时长

* chore: 降低点图片质量

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
2024-09-17 22:51:43 +08:00
Constrat
a47597879c i18n: SSS log EN tweak 2024-09-17 11:44:16 +02:00
uye
1e6a985bc7 fix: 下干员操作不显示干员组名字
fix #10629
2024-09-16 23:26:53 +08:00
AnnAngela
557abe700e ci: 重新尝试让机器人对 commit 签名 (#10626) 2024-09-16 17:31:39 +08:00
status102
b8ea0d41a7 i18n: zh任务链完成耗时 2024-09-16 17:23:08 +08:00
uye
ffb7da7a58 Release v5.6.2 (#10624) 2024-09-16 16:39:39 +08:00
uye
9c80f7a04d docs: Update CHANGELOG.md 2024-09-16 16:39:12 +08:00
uye
d2040d3328 fix: adb lite 无法连接 2024-09-16 16:35:28 +08:00
github-actions[bot]
885f248364 chore: Auto Update Game Resources - 2024-09-15
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10873910401

[skip changelog]
2024-09-15 20:04:29 +00:00
github-actions[bot]
bac30b6678 chore: Auto Templates Optimization
[skip changelog]
2024-09-15 18:18:07 +00:00
HY
2a8cb64801 chore: 更新繁中服「日間」主題介面截圖 (#10620)
* chore: 更新繁中服「日間」主題介面截圖

* 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-15 19:17:18 +01:00
uye
d77778fb5d Release v5.6.1 (#10614) 2024-09-15 22:27:00 +08:00
uye
eef2a80b36 fix: 配置问题 (#10601)
* fix: _configurationBakFile 不生效

* chore: HttpService 使用 SettingsViewModel 属性

* chore: GetValue 增加同步锁

* chore: 备份有错误的配置文件

* chore: 使用 ConcurrentDictionary

* style: 减少缩进

* chore: 移除未使用变量

* chore: 目录下存在 DEBUG/DEBUG.txt 的情况下输出更低等级的日志信息

* fix: 无配置文件时报错

* chore: gui.log 输出日志等级

* chore: 给写入文件的时候加锁

* perf: 减少重复检查

* fix: omit

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-09-15 22:04:11 +08:00
Manicsteiner
0618dd6e50 chore: fix txwy 琳瑯詩懷雅 ocr (#10618)
* chore: fix txwy 琳瑯詩懷雅 ocr

* chore: 台服还没实装焰影苇草?

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2024-09-15 21:52:59 +08:00
github-actions[bot]
463bd84c6f docs: Auto Update Changelogs of v5.6.1 (#10616)
* docs: Auto Generate Changelog of Release v5.6.1

* docs: changelog

* docs: changelog

---------

Co-authored-by: status102 <status102@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-09-15 21:50:32 +08:00
status102
bc14b6cf27 fix: try to fix gen-changelog 2024-09-15 15:33:59 +08:00
uye
ef2873c977 fix: 重置战斗参数状态错误 2024-09-15 15:12:12 +08:00
Autumn Sound
331bfa11ce feat: 移除在非windows上locale的实现 (#9680) 2024-09-15 14:17:32 +08:00
Daydreamer514
b27df9b509 perf: 傀影肉鸽优化雕匠与石像作战策略 (#10613) 2024-09-14 18:07:07 +00:00
dragonheart107
a7be240c4a i18n: RA2 replace brush with farm (#10610)
fix mistranslation 'brush' into farm en-us.xaml
2024-09-14 22:35:54 +08:00
Hao Guan
40c0898427 fix: macOS build script (#10609)
[skip changelog]
2024-09-14 19:17:26 +08:00
uye
34a2b083d8 perf: 使用 devices 判断是否需要连接 (#10606)
* perf: 使用 devices 判断是否需要连接

* chore: 判断是否存在捕获组
2024-09-14 14:29:01 +08:00
Daydreamer514
a99c900658 perf: 优化萨米肉鸽半吊子之旅部署策略 (#10576) 2024-09-13 20:38:36 +08:00
Constrat
5a3698a396 chore: Update EN CR navigation EX stages 2024-09-13 10:04:59 +02:00
Daydreamer514
5cf3f0ac7b docs: 修正容器的默认标题介绍 (#10593) 2024-09-13 10:39:08 +08:00
Constrat
389ce2d5fd fix: EN R6S collab regex 2024-09-12 15:36:07 +02:00
Constrat
2e4bb63acf i18n: EN reduced copilot output 2024-09-12 15:18:26 +02:00
uye
02ff6e0c63 perf: 优化 connect 逻辑 (#10571)
* chore: 优化 connect 对实体设备和已有错误路径下自动检测的支持

* perf: 优化 core 对 connect 成功的判断逻辑

may fix 类似 #10426 的异常情况
2024-09-12 13:07:36 +08:00
Weiyou Wang
2b3435b66d fix: 修正生息演算滑动参数,为离开区域节点相关任务添加回滚 (#10556)
* fix: adjust swipe parameters of task "Tales@RA@PIS-ClickTool"

* fix: 为离开区域节点相关任务添加回滚

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

* fix: 为 NextDay 加入回滚机制

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-12 11:22:09 +10:00
uye
fbca4a6bf0 perf: 增强任务和基建列表健壮性,部分异常配置下可自动还原
fix #10583
2024-09-11 22:56:36 +08:00
Constrat
1c00f4277e fix: missing parameter for system notification
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/10562#issuecomment-2342509182
2024-09-11 10:53:10 +02:00
github-actions[bot]
fca3c26564 chore: Auto Update Game Resources - 2024-09-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10796949497

[skip changelog]
2024-09-10 16:45:30 +00:00
Constrat
838a1d9844 chore: international english date format 2024-09-10 15:48:06 +02:00
Constrat
08f44e066d feat: time diff log output and notification (#10562)
* feat: StartTaskTime + diff calculation

* chore: updated xaml with TimeDiff

* feat: logic for all task complete timediff log

* chore: update xaml for timediff log output

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>

* i18n: chinese tweak

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-09-10 12:03:52 +01:00
github-actions[bot]
ba596c74f8 chore: Auto Templates Optimization
[skip changelog]
2024-09-10 10:49:04 +00:00
Constrat
6081a04f2e fix: EN EnterInfrastSiege
Apparently reverting was not a fix (don't know how it worked).

Anyway the template seems identical to the CN, but it's 10 pixel smaller, making the matching <0.5
2024-09-10 12:48:36 +02:00
uye
7744a30869 fix: 阻止休眠时保持屏幕常亮功能无效
fix #10575
2024-09-10 18:43:02 +08:00
Rbqwow
e9003c772c docs: 更新 google play beta 开发者模拟器相关文档 (#10572) 2024-09-10 18:31:44 +08:00
晓丶梦丶仁
a0e1fc1b2d docs: 补充战斗流程协议对 delay 的描述 2024-09-10 13:14:58 +08:00
晓丶梦丶仁
ae1a8cfcba docs: 优化肉鸽文档对 key 干员和 0 希望干员的描述 2024-09-10 13:14:58 +08:00
晓丶梦丶仁
77f812b1ac perf: 优化傀影肉鸽覆水难收撤退策略 (#10541) 2024-09-10 12:36:00 +08:00
uye
5e11128fa2 chore: 添加移动 MAA.exe 的解决方案 (#10565)
* chore: 添加移动 MAA.exe 的解决方案

* i18n: tweak kR

---------

Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
2024-09-10 09:59:01 +08:00
AnnAngela
1d6481448a ci: 机器人也想要 verified (#10570) 2024-09-10 09:35:59 +08:00
github-actions[bot]
46d4c5ceb2 chore: Auto Templates Optimization
[skip changelog]
2024-09-09 17:20:51 +00:00
Manicsteiner
701579d863 feat: new theme for txwy (#10566) 2024-09-09 18:20:24 +01:00
晓丶梦丶仁
a12f3d8fc9 fix: 将肉鸽招募的等级限制改为精一55级 2024-09-10 01:10:16 +08:00
dependabot[bot]
f998118d44 ci: bump peter-evans/create-pull-request from 6 to 7 in /.github/workflows in the github-actions group (#10563) 2024-09-09 13:57:42 +00:00
uye
07129479a8 perf: 公招识别得分较低
fix #10513
2024-09-09 20:40:18 +08:00
HX3N
f8f9a70dca i18n: KR tweaked translations (#10560) 2024-09-09 19:53:26 +08:00
status102
abb471ba74 perf: Wpf版本号显示最小宽度调整 2024-09-09 19:44:05 +08:00
Constrat
40327e4f4a Revert 02dc16d
Somehow now it works with the original CN template. No idea of what changed.
2024-09-09 12:17:59 +02:00
github-actions[bot]
b1c607518c chore: Auto Update Game Resources - 2024-09-09
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10770032581

[skip changelog]
2024-09-09 09:08:15 +00:00
uye
26781dd864 chore: Shutdown() 增加输出调用者信息 2024-09-09 15:41:11 +08:00
uye
4bd5b9ee79 chore: 关机倒计时前显示窗口 2024-09-09 14:58:32 +08:00
uye
32535dc79f chore: Add logging for timer cancellation status 2024-09-09 14:46:05 +08:00
zzyyyl
b224518303 refactor: 重构 ProcessTask (#10001) 2024-09-09 11:23:44 +08:00
Manicsteiner
fb0410174c fix: Reclamation scroll down (#10554) 2024-09-09 09:32:44 +08:00
github-actions[bot]
fa9bc36f3b chore: Auto Update Game Resources - 2024-09-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10758987058

[skip changelog]
2024-09-08 10:05:15 +00:00
github-actions[bot]
927ab19e3e chore: Auto Templates Optimization
[skip changelog]
2024-09-08 09:56:45 +00: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
status102
6529b8b1bc perf: 调整MumuExtras未生效->Mumu截图增强未生效 2024-09-08 17:46:16 +08:00
uye
32c64823ee perf: 拆分技能识别与使用 (#10536)
* perf: 拆分技能识别与使用

* chore: 调整 use_all_ready_skill 技能使用过快判断
2024-09-08 16:27:10 +08:00
晓丶梦丶仁
e4cf893ed5 docs: 肉鸽文档招募 offset 添加默认值描述 (#10552) 2024-09-08 15:32:59 +08:00
status102
a9e2eb901e fix: 尝试修复日服理智药使用数量识别 2024-09-08 15:29:00 +08:00
uye
ca2d9ccf0b chore: 增加未取消关机的日志 2024-09-08 15:19:51 +08:00
uye
43d184c57c chore: 加点关机日志 2024-09-08 15:04:05 +08:00
uye
6866c57f48 fix: 未输入完整开局干员时点选会清空已输入内容 2024-09-07 22:36:04 +08:00
Constrat
7023d7ea57 fix: xaml escape character
fix ee96efe
2024-09-07 12:41:10 +02:00
Constrat
ee96efeede i18n: en-us Expiring potion hour consistency
@status102 should give a better idea
2024-09-07 12:02:56 +02:00
uye
7e5aa9402c chore: 调整使用技能间隔日志输出等级,调整间隔时间 2024-09-07 14:21:18 +08:00
status102
1ec890214d style: format
[skip changelog]
2024-09-07 14:02:29 +08:00
status102
ccdd0c9e06 style: format
[skip changelog]
2024-09-07 14:02:29 +08:00
uye
7d31fc8c29 perf: 允许 TimerCanceledAsync 提前返回
#10520
2024-09-07 13:51:38 +08:00
晓丶梦丶仁
a82e162957 perf: 优化傀影肉鸽雕匠与石像部署策略 (#10441)
* perf: 添加Phantom肉鸽雕匠与石像部署坐标黑名单

* perf: 优化replacehome
2024-09-07 09:02:17 +08:00
晓丶梦丶仁
aa55e51b2c ci: issue-checker 补全生息演算 lable 关键字 (#10478)
ci: issue checker 补全生息演算标签关键字
2024-09-06 23:37:33 +08:00
Loong
c6e929933f ci: create macOS runtime files in CI (#10509)
* ci: create macOS runtime files in CI

* ci: fix zip flags
2024-09-06 16:14:05 +01:00
HX3N
c552395b56 docs: update glossary (#10510)
[skip changelog]
2024-09-06 22:22:02 +08:00
晓丶梦丶仁
d82934783b perf: 优化傀影肉鸽 ew, logos 招募策略 2024-09-06 21:28:43 +08:00
晓丶梦丶仁
9262fe180a perf: 优化傀影肉鸽从众效应部署策略 2024-09-06 21:28:43 +08:00
Constrat
ce6fb339e1 chore: resource updater workflow (#10507)
* chore: add branch specification

* test: unorder file to allow action to run

* chore: Auto Update Game Resources - 2024-09-06

https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10737645508

[skip changelog]

* test: revert the order + shallow git pull

* test: shallow

* chore: Auto Update Game Resources - 2024-09-06

https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10737703107

[skip changelog]

* refactor: different get branch command

* perf: use ref_name and refactor if logic

* fix: conflicts

* debug: uncomment
2024-09-06 13:03:14 +01:00
github-actions[bot]
a793341181 chore: Auto Update Game Resources - 2024-09-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10737395372

[skip changelog]
2024-09-06 11:16:32 +00:00
Constrat
c2a285eaa2 test: modify files to allow changes 2024-09-06 13:15:22 +02:00
Constrat
598575d13c style: action id run in resource updater commit 2024-09-06 13:12:14 +02:00
Constrat
c59fb8413c style: res-update yml log output 2024-09-06 10:15:15 +02:00
Constrat
1293504c64 perf: resource updater validator in native powershell (#10493)
* perf: native pwsh resourceupdatevalidator

* chore: pwsh implementation in workflow

* style: ps1 formatting

* style: remove log warning

* style: more log styling output

* style: too many lines lol

* style: log end output format new line instead of json
for readibility
2024-09-06 09:11:27 +01:00
github-actions[bot]
9b92283954 chore: Auto Templates Optimization
[skip changelog]
2024-09-06 08:01:21 +00:00
Constrat
02dc16d5a3 fix: YostarEN EnterInfrast Siege theme
without this the score is MistCity: 0.62. No idea how they are different
2024-09-06 10:00:59 +02:00
github-actions[bot]
2056cbef00 chore: Auto Update Game Resources - 2024-09-06
[skip changelog]
2024-09-06 05:28:20 +00:00
Manicsteiner
e9336d78ec fix: Reclamation for Yostar servers (#10498)
* fix: Reclamation for Yostar servers

* chore: add more ocr replace
2024-09-06 13:19:36 +08:00
Wallsman
8829cdc70f Add JP「オペレーション ルーセントアローヘッド」 (#10501)
Add JP「オペレーション ルーセントアローヘッド」
2024-09-06 13:18:13 +08:00
uye
453ce619f8 chore: 修改存储的构建日期 2024-09-06 12:10:22 +08:00
AnnAngela
77a66a1aee ci: 更新 issue checker 配置并补充注释 (#10472) 2024-09-06 08:53:41 +08:00
github-actions[bot]
86a4f23038 chore: Auto Templates Optimization
[skip changelog]
2024-09-05 21:48:03 +00:00
Constrat
5deda05370 feat: YostarEN Rainbow6Siege theme 2024-09-05 23:47:36 +02:00
github-actions[bot]
854c8af83f chore: Auto Update Game Resources - 2024-09-05
[skip changelog]
2024-09-05 18:30:00 +00:00
uye
ab62d1e6e7 Release v5.6.0 (#10492) 2024-09-06 01:30:43 +08:00
github-actions[bot]
3aa60a91e6 docs: Auto Update Changelogs of v5.6.0 (#10494)
* docs: Auto Generate Changelog of Release v5.6.0

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-09-06 01:30:29 +08:00
github-actions[bot]
6b571b2c63 chore: Auto Update Game Resources - 2024-09-05
[skip changelog]
2024-09-05 17:27:00 +00:00
uye
c6c640c2a6 feat: date format language based (#10424)
c479834d38
2024-09-06 00:08:33 +08:00
uye
e5d5a48033 chore: 邪道 2024-09-06 00:04:19 +08:00
YueLengM
8857eb03ea fix: 修改回到干员首页的条件 2024-09-05 23:38:40 +08:00
uye
93ed600d1c ci: github 图片 2024-09-05 23:07:31 +08:00
uye
a9eb6ed025 chore: 修改格式化条件 2024-09-05 22:56:42 +08:00
uye
4e395b62ae feat: 允许自定义时间格式 2024-09-05 22:27:22 +08:00
Constrat
45e8548b07 test: fix convert a Symbol value to a string 2024-09-05 15:10:55 +01:00
晓丶梦丶仁
a89e2e4143 fix: cn char ocr replace 添加phonoR-0 (#10479) 2024-09-05 14:38:20 +01:00
HX3N
56afb55340 chore: YostarKR CR new operators ocr (#10488) 2024-09-05 14:35:29 +01:00
Manicsteiner
593c00a36f chore: YostarJP CR new operators ocr (#10487)
* chore: YostarJP CR new operators ocr

* chore: Ela ocr fix for 720p
2024-09-05 14:35:04 +01:00
github-actions[bot]
db09953636 chore: Auto Templates Optimization
[skip changelog]
2024-09-05 13:32:48 +00:00
Manicsteiner
506e1228cf chore: YostarJP siege theme (#10485) 2024-09-05 14:32:26 +01:00
HX3N
f73edd5874 feat: YostarKR siege theme (#10483)
* feat: YostarKR siege theme
2024-09-05 14:31:40 +01:00
uye
7e304a8a23 perf: UI 2024-09-05 21:30:26 +08:00
status102
bacb892a46 perf: UI 2024-09-05 21:17:28 +08:00
uye
f59f539817 chore: 添加翻译 2024-09-05 21:00:41 +08:00
status102
2396a7e67f fix: wrong var 2024-09-05 21:00:03 +08:00
uye
c17593e913 chore: 调整格式化字符串 2024-09-05 20:23:43 +08:00
status102
7e32a8ce40 chore: issue模板更新 2024-09-05 18:31:47 +08:00
晓丶梦丶仁
18af8f0bf8 chore: 更新 bug issue 模板 (#10475)
* chore: cn

* chore: en

* chore: 其它截图方式举例删除windows自带截图
2024-09-05 17:43:13 +08:00
status102
5f4d505f0f perf: 优化版本号换行 2024-09-05 17:37:47 +08:00
github-actions[bot]
f4a6d50e17 chore: Auto Update Game Resources - 2024-09-05
[skip changelog]
2024-09-05 08:42:50 +00:00
AnnAngela
5b19ee109d ci: 修复 bug (#10484) 2024-09-05 16:41:14 +08:00
晓丶梦丶仁
576c0b472b fix: 生息演算将"Tales@RA@FinishCalc"的roi回退到第二次refactor前 (#10482) 2024-09-05 16:06:27 +08:00
uye
533662d9e9 chore: 修改点击复制内容 2024-09-05 15:44:16 +08:00
uye
92d4b012cb chore: 获取当地区域格式字符串 2024-09-05 15:34:46 +08:00
status102
be872da15b perf: 添加MAA版本号,简化版本显示 2024-09-05 15:01:15 +08:00
status102
1bf3ce832e style: format for conflict
[skip changelog]
2024-09-05 11:23:06 +08:00
AnnAngela
9b1b5bc2e9 ci: 更新 issue-checker (#10434) 2024-09-05 10:52:27 +08:00
status102
0485307acb perf: 优化日期显示格式 2024-09-05 09:13:37 +08:00
uye
9f30777e73 feat: 拆分资源日期,新增构建日期 2024-09-05 08:28:50 +08:00
Constrat
c6c6b862ca feat: date format language based 2024-09-05 08:22:43 +08:00
uye
773a5ceff4 refactor: 重构CheckAfterCompleted,添加睡眠 (#10458) 2024-09-05 00:01:45 +08:00
status102
e3d69ba4e5 perf: 优化资源版本号、UI版本号、Core版本号在外文及其他情况下的显示 2024-09-04 23:52:50 +08:00
YueLengM
1d0de2fcfa fix: 已在首页时不再触发翻至首页 2024-09-04 23:40:49 +08:00
YueLengM
29d052e34f fix: 肉鸽重新编队应先回到首页 2024-09-04 23:27:09 +08:00
status102
60516bf79c perf: UI优化 2024-09-04 20:33:43 +08:00
status102
30acf5d150 fix: 完成后动作睡眠更正提示文本 2024-09-04 19:48:14 +08:00
Hao Guan
b31810faaa refactor: Mac GUI StopGame (#10347) 2024-09-04 19:43:59 +08:00
晓丶梦丶仁
41bb236867 fix: CharsNameOcrReplace添加"宝箱的肉?" (#10459) 2024-09-04 19:42:22 +08:00
uye
0d85a37dc7 refactor: 重构 SleepManagement 2024-09-04 19:14:45 +08:00
uye
4c07483079 chore: 调整 SleepManagement 调用 2024-09-04 18:17:34 +08:00
uye
b39678faad fix: 界面更新后悖论模拟无法开始战斗 (#10439)
* fix: 界面更新后悖论模拟无法开始战斗

* chore(docs): change clarification

* chore: 使用 HSV 匹配

* docs: task update info

* fix: 外服 method 错误

---------

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>
2024-09-04 17:58:21 +08:00
uye
8454075468 fix: 生息演算无法循环 2024-09-04 17:51:04 +08:00
AnnAngela
9d96081f47 ci: 当仅 version.json 的 last_updated 有变动时,回退对应服务器所有资源文件改动 (#10453) 2024-09-04 17:21:42 +08:00
status102
13befbf153 chore: 移除错误的基建作业 (#10457) 2024-09-04 16:14:24 +08:00
uye
13bb0a9261 fix: 勾选睡眠的情况下无法勾选IfNoOtherMaa 2024-09-04 16:12:04 +08:00
uye
c109854749 chore: 添加休眠相关提示 2024-09-04 16:10:17 +08:00
uye
89d016e88e refactor: 重构CheckAfterCompleted,添加睡眠 2024-09-04 15:46:59 +08:00
zzyyyl
aa014333af chore: 更新 mask-range 工具 2024-09-04 03:15:01 +08:00
晓丶梦丶仁
6acb8301c2 perf: 全肉鸽招募适配玛露西尔 (#10442) 2024-09-04 02:14:05 +08:00
uye
28fbe72e24 docs: 添加缺少的 HSV 文档 (#10445) 2024-09-03 22:40:32 +08:00
Manicsteiner
39ac002224 chore(tools): 查找肉鸽招募中未提及的干员 (#9865) 2024-09-03 21:04:11 +08:00
uye
f4362b44f9 docs: 添加缺失的生息演算参数 (#10446) 2024-09-03 20:56:04 +08:00
uye
78f3e7678b fix: 允许吃源石保存状态在任务完成时仍会重置状态
fix #10447
2024-09-03 20:50:31 +08:00
uye
76c5708be7 chore: 截图延迟过大时可能会关闭可关闭技能 2024-09-03 17:19:34 +08:00
uye
62bc8bd007 fix: 识别不到基建入口时会在其他界面滑动导致误触 2024-09-03 03:09:37 +08:00
uye
f618d776d7 chore: 启动时删除多余文件 2024-09-03 02:20:38 +08:00
uye
8ce0950ff4 fix: miss warning 2024-09-03 01:00:21 +08:00
github-actions[bot]
92b4fee512 chore: Auto Update Game Resources - 2024-09-02
[skip changelog]
2024-09-02 15:41:41 +00:00
uye
b5c62832ed feat: SideStory「泰拉饭」 2024-09-02 23:39:07 +08:00
Constrat
d510c12f94 chore(tools): update ignore list after RA refactor 2024-09-02 17:23:28 +02:00
github-actions[bot]
b88de666f1 chore: Auto Templates Optimization
[skip changelog]
2024-09-02 15:16:34 +00:00
Sherkey
df285b9a66 feat: 适配「滋味」界面主题 (#10427)
* feat: 适配「滋味」界面主题

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

* chore(tools): new theme temp ignore

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-09-02 16:16:07 +01:00
Hao Guan
c7d4d6362a feat: Mac GUI 适配重构后的生息演算任务(#10425) 2024-09-02 23:07:03 +08:00
ManicSteiner
50bcd9de1c chore: YostarJP CR navigation 2024-09-02 15:59:49 +01:00
Constrat
9511070f3d feat: YostarEN CR navigation 2024-09-02 13:47:09 +02:00
HX3N
bbfbf96b83 chore: YostarKR CR stage navigation 2024-09-02 12:47:04 +01:00
github-actions[bot]
39d0ad576e chore: Auto Update Game Resources - 2024-09-02
[skip changelog]
2024-09-02 08:27:58 +00:00
uye
33e69aaeb8 Release v5.6.0-beta.2 (#10417) 2024-09-02 14:13:26 +08:00
github-actions[bot]
ac6944dbae chore: Auto Update Game Resources - 2024-09-02
[skip changelog]
2024-09-02 05:02:10 +00:00
uye
a04a4b837f docs: Update CHANGELOG.md 2024-09-02 12:59:17 +08:00
uye
42b773f219 feat: 生息演算模式 1 道具组装任务链插件化 (#10411) 2024-09-02 12:50:36 +08:00
github-actions[bot]
4dfc4dc3c6 chore: Auto Update Game Resources - 2024-09-02
[skip changelog]
2024-09-02 04:02:01 +00:00
github-actions[bot]
ba93f8c8e9 chore: Auto Update Game Resources - 2024-09-02
[skip changelog]
2024-09-02 03:28:16 +00:00
uye
b6b15f498f feat: UI 支持 生息演算 num_craft_batches 参数 2024-09-02 11:27:42 +08:00
Weiyou Wang
4528b2213e fix: sln 2024-09-02 13:04:51 +10:00
Weiyou Wang
5c645e7564 fix: sln 2024-09-02 12:58:52 +10:00
Weiyou Wang
d8f321564c fix: need_exit 2024-09-02 12:51:28 +10:00
uye
c479834d38 chore: 调整资源版本显示 2024-09-02 10:41:58 +08:00
status102
f3fa4ff001 fix: sln 2024-09-02 10:12:48 +08:00
uye
35f3bb193f chore: UI 支持选择增加支援道具的方式 2024-09-02 10:01:20 +08:00
uye
45a5e14dde chore: 编队时不在干员数据内的显示输入的名称 2024-09-02 09:33:44 +08:00
uye
f2b96645c8 chore: 化动编队日志输出 2024-09-02 09:25:29 +08:00
uye
5349fe0635 fix: sarkaz 仓库识别错误 2024-09-01 23:52:18 +08:00
github-actions[bot]
cfef166602 docs: Auto Update Changelogs of v5.6.0-beta.2 (#10418)
* docs: Auto Generate Changelog of Release v5.6.0-beta.2

* docs: changelog

* docs: Update CHANGELOG.md

---------

Co-authored-by: status102 <status102@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-09-01 23:40:21 +08:00
github-actions[bot]
0ecaaa5400 chore: Auto Templates Optimization
[skip changelog]
2024-09-01 15:39:21 +00:00
Sherkey
022fcc2b13 feat: 适配「词祭」界面主题 (#10331)
* feat: 适配萨卡兹界面主题

* chore: 更新 GetImageFromROI 工具组

* perf: Mall 从 OCR 切换为模板匹配

* fix: smoke testing missing algorithm

* fix: template name consistency

* feat: EN templates

* fix: remove Mall task from global
!!! NEED TEMPLATES !!!
smoke testing

* chore: YostarJP mall template

* chore: YostarKR mall template

* chore: txwy mall template
---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
2024-09-01 23:38:49 +08:00
Weiyou Wang
f3ede6858a refactor: 统一 namespace 用法 2024-09-01 20:23:11 +10:00
Weiyou Wang
d862a2fec5 fix: Tales@RA@PIS-ResourceGained 2024-09-01 20:16:12 +10:00
Weiyou Wang
4d824d08af feat: 加入hold模式 2024-09-01 20:11:47 +10:00
晓丶梦丶仁
69e7b399b6 perf: 全肉鸽招募适配娜仁图亚、艾拉 (#10385)
* perf: 全肉鸽招募适配娜仁图亚、艾拉

fix #10382

* changes to skill

* Update recruitment.json

* Update recruitment.json

* feat:rebase

* feat:rebase

* fix:error

* feat:rebase

---------

Co-authored-by: 梁星逢 <qswl5959@gmail.com>
2024-09-01 16:50:19 +08:00
Sherkey
117e074a84 fix: OTA打包时对跳过的版本做删除处理 (#10020) 2024-09-01 16:46:36 +08:00
uye
4a07315e19 feat: 外部通知支持多选 (#10395)
* feat: 外部通知支持多选

* chore: 不必要的 using
2024-09-01 16:43:25 +08:00
uye
1610e3b81a refactor: 重构 FightSettingsUserControl (#10407)
* feat: 添加允许吃源石保存状态翻译

* refactor: 重构 FightSettingsUserControl

* fix: 绑定错误

* chore: 吃源石后的*根据AllowUseStoneSave改变
2024-09-01 16:43:06 +08:00
uye
ee360c3ddf style: 调整 ResourceDictionary 格式化规则 2024-09-01 16:35:28 +08:00
Manicsteiner
9273cf6abe fix: Reclamation for YostarJP (#10414) 2024-09-01 14:45:12 +08:00
uye
e60d708548 chore: 调用PowerManagement.Shutdown();后再次调用Bootstrapper.Shutdown(); 2024-09-01 13:22:59 +08:00
uye
784b94a440 chore: 关机前尝试保存配置
fix #10405
2024-09-01 13:08:49 +08:00
uye
bd926c64f6 chore: 调整令牌关闭强度 2024-09-01 12:59:21 +08:00
github-actions[bot]
f65210ed93 chore: Auto Update Game Resources - 2024-08-31
[skip changelog]
2024-08-31 20:25:23 +00:00
Weiyou Wang
6569089abb feat: ReclamationCraftTaskPlugin 2024-08-31 23:38:48 +10:00
Weiyou Wang
950961a089 feat: AbstractReclamationTaskPlugin 2024-08-31 21:58:50 +10:00
Weiyou Wang
5a10df22d3 feat: 生息演算新参数: num_craft_batches 2024-08-31 21:58:50 +10:00
github-actions[bot]
881e46f499 chore: Auto Update Game Resources - 2024-08-31
[skip changelog]
2024-08-31 11:23:36 +00:00
Weiyou Wang
8aa9b63306 refactor: 顺带补上缺失的 Roguelike\Sami filter 并修正注释 2024-08-31 19:30:53 +10:00
Weiyou Wang
872b400bec refactor: 把 Fire@Reclamation 的插件移入 Deprecated 文件夹 2024-08-31 19:30:52 +10:00
Weiyou Wang
1608136bea refactor: 合成 -> 组装 2024-08-31 19:14:13 +10:00
Weiyou Wang
fdb9f7e295 refactor: Within The Sand -> Within the Sand 2024-08-31 19:14:13 +10:00
uye
d869103497 ci: Update issue-checker.yml
[skip changelog]
2024-08-31 14:36:19 +08:00
uye
f40ba2e58f chore: 生息演算添加沙中之火选择项 2024-08-31 10:07:21 +08:00
uye
17cb0ae3e4 fix: 生息演算主题读取配置错误 2024-08-31 09:45:18 +08:00
uye
af9dd71b30 fix: 萨卡兹肉鸽多选招募券模板错误
fix #10401
2024-08-31 00:19:10 +08:00
status102
4c6deb571a perf: Mumu截图增强路径清空时不再检查路径是否存在 2024-08-29 20:20:36 +08:00
zzyyyl
e13f4611d1 feat!: 更新保全 strategies 逻辑 (#10314)
* feat: 保全策略更新

* docs: 修改保全文档对 strategies 的描述

* style: format

[skip changelog]

* feat: 无可用工具人且无 core 时允许检查同一格的后续策略

* style: format

[skip changelog]

* feat: 不再检查干员是否暴毙

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>

* fix: 修复m_all_cores可能插入空core名字导致保全战斗主要部署逻辑结束后仍然识别待部署区

* fix: var reset

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-08-29 19:53:52 +08:00
status102
6dcb77f168 refactor: 迁移公告相关配置 (#10399)
* refactor: 迁移公告相关配置

* style: format

* fix: config save

* chore: remove using
2024-08-29 19:53:32 +08:00
uye
5872d6606e ci: pre-commit-ci 不开心
[skip changelog]
2024-08-29 15:31:30 +08:00
uye
5875de69aa chore: 第一次启动时默认不勾选肉鸽和生息演算 2024-08-29 14:17:04 +08:00
uye
9a1f59206d style: 格式化
[skip changelog]
2024-08-29 14:15:47 +08:00
Weiyou Wang
d5ed0db686 fix: 肉鸽编队检测在未触底时返回 true (#10396) 2024-08-29 11:54:09 +08:00
uye
962dcc3b51 Update issue-checker.yml
[skip changelog]
2024-08-29 11:51:48 +08:00
uye
25e409f8d0 ci: Update issue-checker.yml
[skip changelog]
2024-08-29 11:42:20 +08:00
uye
f7a4b4bac4 ci: Update issue-checker.yml
[skip changelog]
2024-08-29 11:04:52 +08:00
uye
3910bfa0fa ci: Update issue-checker.yml
[skip changelog]
2024-08-29 09:47:26 +08:00
uye
20cebf57cd chore: 病毒话术升级了)
[skip changelog]
2024-08-29 09:40:44 +08:00
uye
f94b1d2c11 fix: DoDragDrop 拖动操作已在进行中 (#10368)
fix #10367
2024-08-29 00:43:35 +08:00
Loong
11c1cdcae8 chore: bump maa-cli to 0.4.12 (#10390) 2024-08-28 21:55:52 +08:00
github-actions[bot]
14f25c8638 chore: Auto Update Game Resources - 2024-08-27
[skip changelog]
2024-08-27 23:41:27 +00:00
github-actions[bot]
d1fad4efd4 chore: Auto Templates Optimization
[skip changelog]
2024-08-27 23:26:18 +00:00
Weiyou Wang
cdd4c4c78e refactor: 重构生息演算 (#10356)
* refactor: 调整 tasks.json 中部分 doc field 格式

* feat: ReclamationConfig

* refactor: ReclamationTask

* refactor: template <Tales@Reclamation@ProsperityNoSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityNoSave>

* refactor: template <Tales@Reclamation@ProsperityInSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityInSave>

* refactor: 生息点数达到上限后停止任务

* refactor: global adaption

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

* chore: YostarKR CancelEnterBuildMode

* fix: typo in MaaCore.vcxproj

* refactor: Wpf Gui Support (still under progress)

* refactor: practice of template tasks

* refactor: strategy -> mode; mode -> difficulty

* refactor: WpfGui strategy -> mode; mode -> difficulty

* refactor: Tales@Reclamation -> Tales@RA

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

* refactor: simplify task names

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

* feat: 如果当前编队规模大于等于7人则清空当前编队

* refactor: 简化部分任务流

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

* feat: 跳过可能的对话事件

* fix: 修复部分任务流

* fix: add ocrReplace for JP "Tales@RA@ClickShrubberyGalore"

* fix: 加个 delay 防卡顿

* fix: enlarge roi

* feat: 加入日文适配

* fix: 部分任务 guard 通过后操作不一定马上起效,delay 未知,加入特殊处理

* refactor: 任务链描述

* fix: fix wrong task name

* fix: Yostar Confirmation window

* i18n: tweak YostarKR

* fix: enlarge roi for robustness

---------

Co-authored-by: 晓丶梦丶仁 <1020623818@qq.com>
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-28 09:25:54 +10:00
github-actions[bot]
808e0d2863 chore: Auto Templates Optimization
[skip changelog]
2024-08-27 10:25:02 +00:00
Constrat
465f49fbe4 perf: duplicates templates from I.S. (#10376)
* perf: remove duplicate templates

* chore(tools): update ignore templates

* fix: more IS EN trader regex
2024-08-27 12:24:18 +02:00
uye
75e723a1b4 chore: 调整 check link 提示样式 2024-08-27 17:29:48 +08:00
IzakyL
1199b7de42 chore(issue-checker): 对comment中的未知链接进行提醒 (#10379)
* chore(issue-checker): bump zzyyyl/issue-checker from 1.9 to 1.10

* chore(issue-checker): 对comment中的未知链接进行提醒

* chore: 修改正则表达式

* chore: 修改正则表达式

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-08-27 17:17:56 +08:00
萨拉托加
d141db3680 chore: 保全作业添加玉门市集并优化交战荒野 (#10375)
* chore: 保全作业添加玉门市集并优化交战荒野

* chore: Delete resource/copilot/SSS_交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json

* 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>
2024-08-27 12:00:32 +08:00
dependabot[bot]
43ec787767 ci: bump zzyyyl/issue-checker
Bumps the github-actions group in /.github/workflows with 1 update: [zzyyyl/issue-checker](https://github.com/zzyyyl/issue-checker).


Updates `zzyyyl/issue-checker` from 1.9 to 1.10
- [Release notes](https://github.com/zzyyyl/issue-checker/releases)
- [Commits](https://github.com/zzyyyl/issue-checker/compare/v1.9...v1.10)

---
updated-dependencies:
- dependency-name: zzyyyl/issue-checker
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-26 15:14:04 +01:00
Constrat
49e74fa293 fix(Roguelike): insert delay after SquadConfirm
enhanced screenshot is too fast
2024-08-26 15:37:49 +02:00
github-actions[bot]
dcf9f0ffe1 chore: Auto Templates Optimization
[skip changelog]
2024-08-26 13:06:53 +00:00
Constrat
cc9e3a516c fix: add second skill template (#10377)
* fix: add second skill template

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

* chore: increase score requirement

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-26 15:06:31 +02:00
Constrat
77de769213 fix: EN IS Trader Regex
[skip changelog]
2024-08-26 14:57:54 +02:00
Constrat
eccc5e08f8 chore(tools): update ignore templates 2024-08-26 11:58:59 +02:00
status102
ee9c1f38ba fix: 使用匹配后偏移代替每日任务 2024-08-26 10:42:31 +01:00
status102
21c33e68ea chore: ignore MaaDeps (#10371)
[skip changelog]
2024-08-26 10:45:55 +08:00
uye
b03e5a56e9 perf: 优化外部通知界面显示 (#10363)
* perf: 优化外部通知界面显示

* chore: TextBlock warp
2024-08-26 00:13:32 +08:00
uye
de26d22f79 refactor: 获取任务端口无效时不进行轮询 (#10321) 2024-08-26 00:10:56 +08:00
Rbqwow
75c82df749 chore: 更新 bug issue 模板 (#10357)
* chore: 更新 bug issue 模板

* chore: review
2024-08-25 22:26:14 +08:00
github-actions[bot]
64eb5536e1 chore: Auto Templates Optimization
[skip changelog]
2024-08-25 13:31:52 +00:00
Horror Proton
fcf5bb696c feat: 使用变换后的图像进行技能按钮识别 (#10293)
* feat: use `cv::warpPerspective` in `use_skill`

* chore: remove unused reclamation task info

* chore: Auto update by pre-commit hooks 

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-25 21:31:34 +08:00
dantmnf
e227d71813 chore: use CsWin32 source generator instead of random pinvoke library (#10361)
* chore: use CsWin32 source generator instead of random pinvoke library

* fix: use local D3D12CreateDevice definition
2024-08-25 19:46:32 +08:00
github-actions[bot]
bdfc1f139c chore: Auto Update Game Resources - 2024-08-24
[skip changelog]
2024-08-24 16:01:45 +00:00
github-actions[bot]
9b80ba96c7 chore: Auto Templates Optimization
[skip changelog]
2024-08-24 15:59:15 +00:00
晓丶梦丶仁
2afb29191a feat: 生息演算2刷开局清空编队干员 (#10359)
* feat: 生息演算2清空编队干员


* perf: 缩小模板图片以避免可能的外服适配

* fix: 把兜底糊完整

* docs: 修改描述

* docs: 修改描述


* feat: 适配日服

* feat: 适配韩服

* feat: 适配EN服

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-24 23:58:52 +08:00
晓丶梦丶仁
d929b433db fix: add ocrReplace for JP "Reclamation2CopiousCoppice" (#10362) 2024-08-24 22:34:08 +08:00
octopus yan
6fe87e4eca feat: add Qmsg notification (#10358)
* feat: add Qmsg notification (#9078)

* fix: Qmsg 配置UI
2024-08-24 21:46:11 +08:00
uye
8edcf183a5 chore: 删除子模块 2024-08-24 16:16:44 +08:00
晓丶梦丶仁
5a66f65287 perf: 生息演算2将第四日开启今日的识别改为模板匹配 (#10355)
* perf: 生息演算2将第四日开启今日的识别改为模板匹配

* 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-08-24 15:56:24 +08:00
dantmnf
207172b366 chore: remove MaaDeps submodule (#10354)
still referenced in maadeps-download.py

Co-authored-by: dantmnf <dantmnf@users.noreply.github.com>
2024-08-24 15:54:04 +08:00
晓丶梦丶仁
a04269bdcb fix: 生息演算2"Reclamation2StageEnter"->next纠正 (#10353)
fix: 重构的时候写错next了

[skip changelog]
2024-08-24 15:53:23 +08:00
uye
736b0055d8 fix: 勾选启动MAA后直接最小化后点击隐藏托盘图标后无法显示MAA 2024-08-24 13:46:13 +08:00
MistEO
7888158f1b docs: 贡献者头像添加 105 上限 (#10351) 2024-08-24 11:57:00 +08:00
Constrat
18257c70e7 chore: RoguelikeRoutingTaskPlugin.h missing VS22 filter 2024-08-23 22:54:16 +02:00
github-actions[bot]
55e8436b5f chore: Auto Templates Optimization
[skip changelog]
2024-08-23 20:35:50 +00:00
Constrat
4798f4df06 fix: EN needs templates for clue exchange
the number font is different, score too low
2024-08-23 22:34:46 +02:00
Constrat
f7d9856c85 fix: add delay after selecting clue 2024-08-23 22:34:21 +02:00
Constrat
5470c313e2 fix(ci): remove "" in nightly
fix #10308
2024-08-23 13:28:48 +02:00
Constrat
3be685c560 feat: GetLocalizedNames for Infrast and Copilot output (#10335)
* feat: GetLocalizedNames for Infrast output

* feat: Localization for Copilot steps

* i18n: EN tweak
2024-08-23 12:13:23 +02:00
zzyyyl
ec93472984 chore(issue-checker): bump zzyyyl/issue-checker from 1.8 to 1.9 2024-08-23 15:41:39 +08:00
uye
c8c90c1604 chore: 公招识别拥有全干员时不显示未拥有干员数量 2024-08-23 11:58:46 +08:00
Constrat
89261430cb i18n: EN tweak
[skip changelog]
2024-08-23 00:18:47 +02:00
Constrat
971699bcbe fix: c# warning
[skip changelog]
2024-08-22 23:56:15 +02:00
uye
046b3329ea fix: roi 错误 2024-08-22 21:16:55 +08:00
uye
0fd48d774a fix: SL 导航错误 2024-08-22 21:13:14 +08:00
github-actions[bot]
92d187558e chore: Auto Update Game Resources - 2024-08-22
[skip changelog]
2024-08-22 11:22:49 +00:00
ManicSteiner
7c3c5b81d4 chore: YostarJP ocr fix 2024-08-22 10:35:22 +01:00
ManicSteiner
019e483f91 i18n: JP ZH-TW GPU option & reclamation translation 2024-08-22 10:33:58 +01:00
github-actions[bot]
62eae0ad59 chore: Auto Update Game Resources - 2024-08-22
[skip changelog]
2024-08-22 09:03:23 +00:00
github-actions[bot]
ae923d65f9 chore: Auto Update Game Resources - 2024-08-22
[skip changelog]
2024-08-22 07:41:29 +00:00
github-actions[bot]
46f5475df0 chore: Auto Update Game Resources - 2024-08-22
[skip changelog]
2024-08-22 05:25:17 +00:00
uye
c3a5471ca2 refactor: 重构 OperBox 输出与显示 (#10320)
* refactor: 重构 OperBox 输出与显示

* refactor: 空值处理
2024-08-22 13:15:58 +08:00
uye
8e6ba0e21a refactor: 重构定时器和重启询问 (#10078) 2024-08-22 13:15:22 +08:00
SherkeyXD
b2b8137d16 fix: 修复调试版本判断条件 2024-08-22 10:41:53 +08:00
github-actions[bot]
c0eb5a2819 chore: Auto Update Game Resources - 2024-08-21
[skip changelog]
2024-08-21 20:25:55 +00:00
github-actions[bot]
3d44d574a2 chore: Auto Update Game Resources - 2024-08-21
[skip changelog]
2024-08-21 20:02:03 +00:00
HX3N
13886380a6 i18n: KR GpuDeprecated translation 2024-08-21 20:49:46 +01:00
github-actions[bot]
cb87f2f614 chore: Auto Update Game Resources - 2024-08-21
[skip changelog]
2024-08-21 17:01:34 +00:00
Constrat
eb70b3ddd2 feat: FC rerun navigation fix EN 2024-08-21 13:50:04 +02:00
github-actions[bot]
8d0e9bb9c0 chore: Auto Update Game Resources - 2024-08-21
[skip changelog]
2024-08-21 11:21:35 +00:00
SherkeyXD
10d51c6c38 chore: fix WPF Warning 2024-08-21 19:12:02 +08:00
SherkeyXD
ffdf42a72f chore: 修改过时的Binding方法 2024-08-21 19:08:19 +08:00
github-actions[bot]
4dde138858 chore: Auto Update Game Resources - 2024-08-21
[skip changelog]
2024-08-21 07:01:58 +00:00
Manicsteiner
4db4297c4f chore: YostarJP FC navigation (#10316) 2024-08-21 12:11:22 +08:00
uye
f07ff1bf27 feat: 允许手动指定WPFGUI中干员名称显示语言 (#10310) 2024-08-21 11:38:29 +08:00
uye
77808ffca2 style: 优化格式 2024-08-21 10:21:18 +08:00
uye
a737e978bd refactor: RecognizerViewModel 改用 GetLocalizedCharacterName 2024-08-21 10:20:37 +08:00
袜子魔
af5ff9b07b build(deps): Maa-HTTP-Java update lib (#10288) 2024-08-21 09:38:20 +08:00
Manicsteiner
5f9e4905ac perf: CopilotViewModel (#10099) 2024-08-21 09:33:44 +08:00
status102
78e82ced53 style: format
[skip changelog]
2024-08-20 23:30:54 +08:00
ManicSteiner
3509638773 fix: buff选项不符合规则时显示原始内容 2024-08-20 22:46:20 +08:00
ManicSteiner
637b302cc3 feat: 干员识别支持指定语言 2024-08-20 22:43:09 +08:00
ManicSteiner
c80a6fff05 feat: 允许手动指定WPFGUI中干员名称显示语言 2024-08-20 20:31:26 +08:00
PukNgae Cryolitia
4a493fb466 fix: std::ranges::views::join with LLVM clang 16 on darwin (#10309)
Reported-by: https://github.com/Cryolitia/nur-packages/actions/runs/10464433944/job/28978028891
Tested-by: https://github.com/Cryolitia/nur-packages/actions/runs/10469889715/job/28993864791
2024-08-20 18:17:57 +07:00
status102
4a156f4c7f perf: Win10以上系统在退出时Wpf不再清除Toast (#10307)
perf: Win10以上系统在退出时不再清除Toast
2024-08-20 19:17:31 +08:00
zzyyyl
db4b80e967 feat: 公招错误时保存截图
link to #10302
2024-08-20 19:13:09 +08:00
status102
72a78402fb style: format
[skip changelog]
2024-08-20 16:49:26 +08:00
uye
af27e95fdc fix: 多配置下公告和更新日志显示异常 2024-08-20 15:59:25 +08:00
status102
d539d26ac8 fix: 修复保全战斗在core干员重复时只会放1次bug (#10306) 2024-08-20 15:07:00 +08:00
status102
bceea3bd93 perf: 保全开局水泥换牌兼容 2024-08-20 14:17:21 +08:00
status102
3625fb18c4 fix: 修复保全战斗在core干员重复时只会放1次bug 2024-08-20 14:16:35 +08:00
github-actions[bot]
2991ab3ad7 chore: Auto Update Game Resources - 2024-08-20
[skip changelog]
2024-08-20 00:59:54 +00:00
Weiyou Wang
078d8ee50d chore: 整理 tasks.json 中记录的肉鸽插件参数 (#10290)
* refactor: 整理 tasks.json 中记录的肉鸽插件参数

* chore: delete unused roi fields
2024-08-20 10:32:44 +10:00
status102
ed8873580b Revert "feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core" (#10300)
* Revert "feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core"

This reverts commit d57e74a2e6.

* Revert "feat: 保全作战相同location以json写的策略顺序执行"

This reverts commit 0af22cd776.
2024-08-20 08:00:50 +08:00
Rbqwow
dc153b34c7 docs: 修改下载地址
[skip changelog]
2024-08-20 06:23:24 +08:00
晓丶梦丶仁
d57e74a2e6 feat: 保全作战保留core不过牌且放置core后回到待部署则重放工具人和core 2024-08-20 00:47:59 +08:00
晓丶梦丶仁
0af22cd776 feat: 保全作战相同location以json写的策略顺序执行 2024-08-20 00:47:59 +08:00
uye
7ec665dd91 fix: ProxyType 重启不生效 2024-08-19 23:44:23 +08:00
uye
fa0786d627 chore: 优化界面显示 2024-08-19 23:40:40 +08:00
Constrat
d201dea34f style: git blame ignore revs 2024-08-19 16:41:51 +02:00
github-actions[bot]
637f67d4a1 chore: auto blame ignore
[skip changelog]
2024-08-19 14:38:01 +00:00
Constrat
7521b526ee fix: rev-list instead of rev-parse 2024-08-19 16:37:13 +02:00
Constrat
6c4582faa6 docs: git blame ignore 2024-08-19 16:34:37 +02:00
Constrat
0171d9c025 chore: clearout git blame 2024-08-19 16:31:52 +02:00
Constrat
8b34d53358 fix: revert to simple if 2024-08-19 16:31:33 +02:00
Constrat
008d06b7b5 fix: fetching depth 0 2024-08-19 16:29:14 +02:00
Constrat
5e8241fc7c fix: impossiblity of fetch-depth modification. reverting + generic perfs 2024-08-19 16:26:49 +02:00
uye
cb1b627e20 chore: MuMu12EmulatorPath Placeholder 添加示例提示 2024-08-19 22:00:34 +08:00
github-actions[bot]
a4463100c1 chore: auto blame ignore
[skip changelog]
2024-08-19 13:45:24 +00:00
Constrat
c89362ab82 debug: add workflow debugging 2024-08-19 15:44:57 +02:00
github-actions[bot]
eb11ed16ef chore: auto blame ignore
[skip changelog]
2024-08-19 13:41:23 +00:00
Constrat
b0d54c8a3f style: prettier 2024-08-19 15:40:58 +02:00
Constrat
498ea5f6a4 test: remove last checked commit 2024-08-19 15:38:39 +02:00
github-actions[bot]
39fe945e30 chore: auto blame ignore
[skip changelog]
2024-08-19 13:29:25 +00:00
Constrat
9994819e13 perf: blame ignore (#10296)
* fix: forgot branch

* chore: auto blame ignore

* chore: remove commits.txt, add only last check and blame ignore

* test: STYLE ONLY
[blame ignore]

* fix: checkout depth

* chore: auto blame ignore

[skip changelog]

* debug: remove debug artifacts

* perf: reduced steps number and optimized shell script

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-08-19 15:28:39 +02:00
Constrat
969493a031 chore: remove unwanted workflow artifacts
[skip changelog]
2024-08-19 14:42:11 +02:00
github-actions[bot]
5bdc822b7a chore: auto blame ignore 2024-08-19 11:16:16 +00:00
Constrat
90fac774ce feat(ci): automation for blame ignore (#10295)
* feat(ci): automation for blame ignore

* 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-08-19 13:14:36 +02:00
Constrat
5fdea2ada4 chore: git blame added styling commits (#10283)
chore: added styling commits
2024-08-19 09:12:43 +01:00
SherkeyXD
6188a2ba3f chore: smoking-test中肉鸽参数更新 2024-08-19 14:02:11 +08:00
SherkeyXD
facbff3ef2 chore: smoking-test添加领取奖励的测试 2024-08-19 14:02:11 +08:00
SherkeyXD
c3f867624c chore: 移除tasks中的默认值 2024-08-19 14:02:11 +08:00
uye
48e2f72008 Release v5.6.0-beta.1 (#10271) 2024-08-19 12:52:33 +08:00
github-actions[bot]
d79690a269 docs: Auto Update Changelogs of v5.6.0-beta.1 (#10278)
* docs: Auto Generate Changelog of Release v5.6.0-beta.1

* docs: Update CHANGELOG.md

* docs: changelog

* docs: changelog

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-08-19 12:51:25 +08:00
萨拉托加
17ef91e259 chore: 添加交战荒野保全作业 (#10286)
* feat:添加一份保全作业

* Rename MAACopilot_保全派驻-交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json to SSS_保全派驻-交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json

* Rename SSS_保全派驻-交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json to SSS_交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json

* 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-08-19 11:34:40 +10:00
status102
f70f4500e1 Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员" (#10285)
Revert "chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员 (#10284)"

This reverts commit 575a0fce81.

不该是chore吧,要发版了等发版完再进
2024-08-19 07:49:25 +08:00
晓丶梦丶仁
575a0fce81 chore: 保全作战相同location以json写的策略顺序执行、全局保留core干员不作为过牌干员 (#10284)
* feat: SSSstrategy之间同一位置需按json内写的顺序放置

* fix: 添加哈希函数

* fix: 修改错误参数

* refactor: 改用shared_ptr

* feat: 保全作业将不允许用核心干员作为工具人

* fix: 实现全局保core

* fix: 增加顺序tag减少bug

---------

Co-authored-by: Weiyou Wang <blspgzs@gmail.com>
2024-08-19 07:36:22 +08:00
Loong
ba35b711d2 fix: 去除干员 OCR 识别结果中的前导下划线 (#10280)
* fix: 去除干员 OCR 识别结果中的前导下划线

* fix: make sure at least one character following the underscore

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-08-18 22:52:37 +02:00
Constrat
56f1bf6b66 refactor: remove unneccesary Grid.Column fields 2024-08-18 22:51:37 +02:00
晓丶梦丶仁
d41e436f4f refactor: 生息演算2用户界面提醒 (#10281)
docs: update zh-cn.xaml
2024-08-19 04:38:11 +08:00
Constrat
a0dd8e60df i18n: english tweak
[skip ci]
2024-08-18 22:35:44 +02:00
Constrat
6b89a87a02 Revert "fix: multithread double free in Logger"
This reverts commit 7631e9a5d2.
2024-08-18 22:29:18 +02:00
Constrat
d3b09741c7 chore(wpfgui): removed unnecessary fields + adb path centering 2024-08-18 22:17:58 +02:00
Constrat
56654a4ddf i18n: english tweak
[skip changelog] [skip ci]
2024-08-18 22:10:03 +02:00
Constrat
a4a2b8456b style: tightened margins for GUI settings 2024-08-18 22:06:22 +02:00
Horror Proton
7631e9a5d2 fix: multithread double free in Logger 2024-08-19 00:18:14 +08:00
uye
bc4694a1a0 feat: 允许选择WPFGUI中的干员名称显示语言 (#10079)
允许选择“干员名称显示语言”为“跟随MAA”或“跟随游戏客户端”。
这个应该不会需要更多选项吧()
先糊一坨,睡了()

已知问题:
 - 所有相关内容都需要重启客户端才能生效

TODO:
 - 将“切换语言后重启MAA”引入此处选项修改后任务
 - Other languages
 - 更多显示干员名称的区域,如 #10067 提到的招募小工具界面
 - 拆分重置 #9457 

待讨论:
 - 更多的专有名词


![图片](https://github.com/user-attachments/assets/cf384f22-0549-40cd-a698-07b6d4316818)
2024-08-18 23:11:29 +08:00
ManicSteiner
cab776350a chore: revert ui perf (commit 80c34a0) 2024-08-18 23:09:13 +08:00
Hao Guan
ffe8bfcf09 chore: update maadeps to 2024-08-17 (#10268)
* chore: update maadeps

* chore: FIXME: temporarily hold maadeps version for windows package

---------

Co-authored-by: dantmnf <dantmnf@users.noreply.github.com>
2024-08-18 23:01:26 +08:00
uye
5f3f93473f chore: 减少保全截图间隔 2024-08-18 22:31:36 +08:00
Manicsteiner
66a9b4ebfa Merge branch 'dev' into feat_opername 2024-08-18 22:26:30 +08:00
status102
435a374915 fix: 截图速度过快时可能卡在公招放弃界面 2024-08-18 20:33:51 +08:00
status102
d04f2f64b4 Revert "fix: 截图速度过快时可能卡在公招放弃界面"
This reverts commit 6c2ed8a0b7.
2024-08-18 20:33:50 +08:00
uye
ed489bab8f fix: 获得导能元件时可能错误判断是否在战斗中 2024-08-18 20:33:27 +08:00
DL_君逸寒
77a3e49cfd perf: 优化 玉门市集 保全派驻作业 (#10276)
* perf: 优化 玉门市集 保全派驻作业

perf: 优化 玉门市集 保全派驻作业

* 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-08-18 20:01:40 +08:00
uye
70aded1a40 chore: 移动旧保全文件至old文件夹 2024-08-18 19:45:40 +08:00
uye
6c2ed8a0b7 fix: 截图速度过快时可能卡在公招放弃界面 2024-08-18 17:59:21 +08:00
Loong
e64140408c chore: bump maa-cli to 0.4.11 (#10274) 2024-08-18 10:44:04 +01:00
晓丶梦丶仁
8a4bf6ae0c perf: 删除萨卡兹肉鸽作战策略空数组 (#10275)
[skip changelog]
2024-08-18 17:43:51 +08:00
DL_君逸寒
945ff7ca30 perf: 优化 交战荒野、玉门市集 保全派驻作业 (#10273)
* perf: 优化 交战荒野 保全派驻作业

perf: 优化 交战荒野 保全派驻作业

* perf: 优化 玉门市集 保全派驻作业

perf: 优化 玉门市集 保全派驻作业

* 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-08-18 17:09:46 +08:00
uye
54e6481310 docs: 修改 README 2024-08-18 16:36:46 +08:00
uye
4c3a65c407 chore: 修改 版本更新 界面 2024-08-18 15:55:25 +08:00
uye
788275c131 docs: 更新 README 2024-08-18 15:38:32 +08:00
Linisdjxm
0bf6beac84 feat: 增加SOCKS5支持 (#10061) 2024-08-18 15:08:47 +08:00
uye
8c68d90a3d refactor(config) : reorganize settings loading (#10133)
重新组织配置读取的函数。虽然还是没找到 #2535 的根因。

ConfigHelper 使用.bak前应该先检查一下.bak是否可以被有效解析,可能会出现两者同时解析失败的情况 

AsstConnect 勾选自动检测的逻辑处理感觉有些乱,也一并重写了一下。
2024-08-18 15:03:08 +08:00
Hao Guan
1d06e808f8 feat: Mac GUI自动编队添加信赖干员 2024-08-18 15:02:03 +08:00
uye
9f8c3f583d fix: 生息演算可能无法退出组装台 2024-08-18 14:53:29 +08:00
晓丶梦丶仁
58056d0ccb fix: 国服CharsNameOcrReplace (#10269)
* fix: 国服CharsNameOcrReplace

* fix: 国服OCR替换改进

* fix: 同上

* fix: 麻了
2024-08-18 01:44:47 +08:00
Loong
9bf4111d98 chore: add flag -fexperimental-library for clang < 16 (#10265)
* Revert "ci: 在 macOS 上使用 clang 18"

This reverts commit dde048fb4c.

* feat: add -fexperimental-library for clang < 16
2024-08-18 00:04:53 +08:00
zzyyyl
653f1c296a fix: 修复 "-MO-" 会被替换为 "-M0-" 导致的关卡识别错误 (#10263) 2024-08-17 23:53:41 +08:00
Hao Guan
2816d36221 fix: 修复Safari下官网显示问题
[skip changelog]
2024-08-17 23:06:48 +08:00
AnnAngela
b5080423ef ci: 修复比较链接 2024-08-17 22:10:01 +08:00
uye
7464b1b06b test: ci "(]"\"" 2024-08-17 20:24:41 +08:00
AnnAngela
2c5f79c2a5 ci: 用 nodejs 读取 changelog (#10267) 2024-08-17 20:15:16 +08:00
uye
bd52348126 chore: 移除不必要的引用 "()" 2024-08-17 19:32:25 +08:00
AnnAngela
17b04ae60d ci: 修复 changelog 错误的问题 (#10266)
ci: 这样行不行
2024-08-17 19:29:33 +08:00
uye
52998a5db0 ci: Update release-nightly-ota.yml 2024-08-17 18:39:58 +08:00
uye
ca4458f20d Revert "test: ci(123)"
This reverts commit 105054138b6ee7da48650d878506a4bbcdc9582b.
2024-08-17 18:02:01 +08:00
uye
884edc604b test: ci 2024-08-17 18:02:01 +08:00
uye
ebc0d3e26d ci: Update release-nightly-ota.yml 2024-08-17 18:01:27 +08:00
uye
1905d5923b Revert "test: test ci(123)"
This reverts commit 184bc53a11620b18e932041d898ea3d73d87070f.
2024-08-17 17:38:23 +08:00
uye
48df7ee075 test: test ci 2024-08-17 17:38:23 +08:00
uye
aaeb6f4c11 ci: Update release-nightly-ota.yml 2024-08-17 17:37:04 +08:00
uye
c0e3756a96 Revert "test: test ci"
This reverts commit 3cc5aa554a3a8bab759a4238b409c28734485983.
2024-08-17 17:14:23 +08:00
uye
bade06bee1 test: test ci 2024-08-17 17:14:22 +08:00
uye
9032f77010 ci: Update release-nightly-ota.yml 2024-08-17 17:13:20 +08:00
晓丶梦丶仁
8b31031f8b fix: 国服干员名ocr替换 (#10262) 2024-08-17 16:39:17 +08:00
uye
420e743bce ci: 调整字符串拼接 2024-08-17 16:26:26 +08:00
zzyyyl
21e19ccdcb perf: 使用 views::join 2024-08-17 16:18:14 +08:00
Weiyou Wang
dde048fb4c ci: 在 macOS 上使用 clang 18 2024-08-17 16:18:06 +08:00
uye
2190016c06 feat: winapi 关机/睡眠/休眠 2024-08-17 15:49:19 +08:00
github-actions[bot]
b094bf8600 chore: Auto Templates Optimization
[skip changelog]
2024-08-16 19:30:33 +00:00
pre-commit-ci[bot]
74ed921355 chore: Auto update by pre-commit hooks [skip changelog] 2024-08-16 20:30:09 +01:00
nifaOwO
cd9ba50d57 chore: 替換繁中服薩米肉鴿結算截圖
替換寄了的結算圖
2024-08-16 20:30:09 +01:00
github-actions[bot]
a2b1c8a95b chore: Auto Update Game Resources - 2024-08-16
[skip changelog]
2024-08-16 17:52:32 +00:00
zzyyyl
99fe87a005 Revert "feat: ci 在 macOS 上使用 clang 18.1.8 (#10254)"
This reverts commit f260c78bb9.
2024-08-17 01:41:32 +08:00
Weiyou Wang
f260c78bb9 feat: ci 在 macOS 上使用 clang 18.1.8 (#10254) 2024-08-17 01:32:28 +08:00
zzyyyl
d788c5ad73 feat!: 拆分 maskRange,允许禁用数色时闭运算 (#10250)
- 数色时使用的参数从 maskRange 中拆分并命名为 colorScales(-s 代表它是 list of color scale)
- 增加 colorWithClose 开关数色时闭运算,默认为 true
- maskRange 回退为仅支持 `array<int, 2>` (即 `pair<int,
int>`)的输入,但代码中保留彩色和多个范围的支持
- colorScale 支持 `list<array<array<int, 3>, 2> | array<int, 2>>`,TaskData
实现中额外允许(不推荐的)
`array<int, 2>` 和 `list<array<array<int, 3>, 2> | array<int, 1>, 2> |
array<int, 2>>`

fix #10235
2024-08-17 01:31:58 +08:00
zzyyyl
84af1ee70e fix: 修复数色闭运算导致的 StageRefresh FP 2024-08-17 01:22:26 +08:00
zzyyyl
92f24ec988 feat!: 拆分 maskRange 与 colorScales;增加 colorWithClose 开关数色时闭运算 2024-08-17 01:22:17 +08:00
DL_君逸寒
4937464195 feat: 新增 交战荒野、玉门市集 保全派驻作业 (#10253)
* feat: 新增 交战荒野 保全派驻作业

feat: 新增 交战荒野 保全派驻作业

* feat: 新增 玉门市集 保全派驻作业

feat: 新增 玉门市集 保全派驻作业

* 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-08-16 23:50:42 +08:00
github-actions[bot]
810d347e95 chore: Auto Update Game Resources - 2024-08-16
[skip changelog]
2024-08-16 11:01:54 +00:00
Constrat
6b6a20e6d3 fix: modified ROI for Phantom EN
fix #10244
2024-08-16 12:49:09 +02:00
zzyyyl
cc150d9a4a style: prettier 2024-08-16 10:31:20 +08:00
uye
7330494e58 fix: 繁中 tasks 格式错误 2024-08-15 23:40:30 +08:00
XuQingTW
63064ca3ca feat: 不義之財 導航更新 (#10249)
Update tasks.json
2024-08-15 22:19:14 +08:00
Constrat
ccc9d046c8 fix: Phantom EN IS encounter
fix #10243
2024-08-15 12:48:43 +02:00
HX3N
6bf06c6c72 chore: YostarKR fix typo
[skip changelog]
2024-08-15 18:27:38 +09:00
HX3N
ff84e07881 chore: YostarKR add ocrReplace W
[skip changelog]
2024-08-15 18:26:15 +09:00
github-actions[bot]
03a7440473 chore: Auto Update Game Resources - 2024-08-15
[skip changelog]
2024-08-15 09:01:50 +00:00
zzyyyl
ebdb594515 chore(issue-checker): 增加 module: others 分类的关键词,并给长正则换行
[skip changelog]
2024-08-15 14:06:33 +08:00
zzyyyl
5e0aaecc3e fix: 修复采购中心字被挡住后出错
fix #10194
2024-08-15 12:57:24 +08:00
github-actions[bot]
fe4449d2ea chore: Auto Update Game Resources - 2024-08-14
[skip changelog]
2024-08-14 17:01:42 +00:00
github-actions[bot]
09ed6d6ff7 chore: Auto Update Game Resources - 2024-08-14
[skip changelog]
2024-08-14 07:01:49 +00:00
ManicSteiner
4b781d9a9d chore: YostarJP fix ocr 涙目のペッロー 2024-08-14 14:13:05 +08:00
HX3N
ee1f24f60e chore: YostarKR tweak ocrReplace 雨! 2024-08-14 14:46:15 +09:00
ManicSteiner
f5f9873684 chore: YostarJP reclamation2 continue 2024-08-14 13:31:19 +08:00
github-actions[bot]
fdbd7a05f0 chore: Auto Update Game Resources - 2024-08-13
[skip changelog]
2024-08-13 20:02:11 +00:00
github-actions[bot]
62b530b48f chore: Auto Templates Optimization
[skip changelog]
2024-08-13 19:43:21 +00:00
晓丶梦丶仁
0c774de473 refactor: 允许在生息演算内任意位置开始任务,进出关卡、跳过天数任务复用 (#10238)
* refactor: 允许用户在不同位置开始生息演算任务

* refactor: 重命名图片,任务复用test

* fix: 国服任务名修改

* refactor: 外服任务名替换

* refactor: 给EN服添上继续探索

* refactor: 复用进出关卡、跳过天数,并适配外服

* i18n: Complete "Reclamation2BeginContinue" for KR

* fix: 任务名(为侯国玉)

* fix: 缩小roi,调整开始任务顺序

* fix: 增强开始任务稳定性
2024-08-14 03:43:00 +08:00
Rbqwow
8de4d75683 chore: 更新 MuMu Issue 模板
[skip changelog]
2024-08-14 02:28:49 +08:00
晓丶梦丶仁
366881fe8f refactor: 允许用户在不同位置开始生息演算任务 (#10237) 2024-08-13 22:43:44 +08:00
晓丶梦丶仁
92e477dd45 fix: 傀影肉鸽卡在商店界面 (#10236) 2024-08-13 22:43:23 +08:00
Constrat
5ef663af0d chore: subtask iteration output tweak 2024-08-13 16:25:28 +02:00
uye
7d02255b46 docs: 修改 mumu 截图增强模式支持版本 2024-08-13 22:17:05 +08:00
dragonheart107
a7e545034c docs: typos, fluidity and ML fixes for en-us docs (#10231)
* i18n: tweak

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-08-13 14:23:11 +02:00
Constrat
e1556c4b45 fix: reduce Mizuki IS en select recruit threshold 2024-08-13 14:19:04 +02:00
梁星逢
c45b685c17 perf: 添加萨卡兹肉鸽作业"炉工志愿队","血脉之辩","见闻峰会" (#10228)
* feat: 添加萨卡兹肉鸽作业"炉工志愿队","血脉之辩","见闻峰会"

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

* revert: default.json

* Update default.json

* change default.json

* perf: 修改部分replace home和blacklist

* perf: 修改见闻峰会blacklist

---------

Co-authored-by: 晓丶梦丶仁 <1020623818@qq.com>
2024-08-13 17:49:51 +08:00
github-actions[bot]
f4f016b407 chore: Auto Update Game Resources - 2024-08-13
[skip changelog]
2024-08-13 08:42:53 +00:00
github-actions[bot]
634b22175d chore: Auto Templates Optimization
[skip changelog]
2024-08-13 08:38:54 +00:00
晓丶梦丶仁
e07baaafec refactor: 将生息演算:沙洲遗闻由任务树重构为任务环,以便使用出口、后续重构 (#10223) (#10229) (#10230)
* refactor!: 将生息演算:沙洲遗闻由任务树重构为任务环,以便使用出口、后续重构 (#10229)

* style: 删除RA2Ex以免混淆视线且方便revert

* refactor: 重构begin模块

* refactor: 重构丰饶灌木林模块

* refactor: 重构聚羽之地模块

* refactor: 完成剩余部分(缺少图片名重构)

* style: 把RA2Ex放回来(同时缺图片和外服适配)

* refactor: 完成英日韩三服任务名转移

* refactor: 替换图片名

* refactor: 新图片名写入任务template

* fix: 补上忘改了的任务名

* fix: 为旧任务更名并允许Ex复用

* fix: 任务名错乱

* fix: 修复模板匹配的空图片名

* fix: 补足落下的任务名

* fix: 韩服任务名打错

* fix: 补齐日服OCR替换

* fix: 补齐韩服OCR替换
2024-08-13 16:38:35 +08:00
status102
165afc8d90 fix: 日服理智药正在使用数量识别错误
fix #10172
2024-08-13 16:07:15 +08:00
Weiyou Wang
657a1c254f chore: update TaskSorter (#10224)
添加对萨卡兹肉鸽任务 Sarkaz@Roguelike 和生息演算两个主题 Fire@Reclamation, Tales@Reclamation 的排序
2024-08-12 22:43:21 +10:00
github-actions[bot]
38139b9091 chore: Auto Update Game Resources - 2024-08-12
[skip changelog]
2024-08-12 11:23:48 +00:00
Weiyou Wang
bf10bcdaa6 refactor: polish code for collapsal paradigm plugin (#10198)
* refactor: 复用 LoadingText

* refactor: 删除国际服 tasks.json 中冗余内容

* refactor: 改用 task 实现点击与滑动操作,并为精简后的相关 config task 添加注释
2024-08-12 21:03:45 +10:00
github-actions[bot]
87cd2f107f chore: Auto Update Game Resources - 2024-08-12
[skip changelog]
2024-08-12 11:01:55 +00:00
github-actions[bot]
0e3d51db02 chore: Auto Templates Optimization
[skip changelog]
2024-08-12 10:51:07 +00:00
Weiyou Wang
332d067112 refactor: 整理生息演算<沙中之火>的任务流 (#10215)
* refactor: 为沙中之火的模版文件名加上SandFire前缀

* refactor: 整理生息演算任务顺序,将 Reclamation 放在 Reclamation2 之前

* refactor: 整理沙中之火任务流

* refactor: append SandFire prefix

* fix: 补上隐试生成的任务

* refactor: 为国际服沙中之火的模版文件名加上SandFire前缀

* refactor: 适配国际服

* refactor: SandFire -> Fire

* 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-08-12 20:48:40 +10:00
晓丶梦丶仁
4c348d6cf0 fix: 战斗结束掉落过程弹窗 (#10218) 2024-08-12 17:24:55 +08:00
github-actions[bot]
148dfede6c chore: Auto Update Game Resources - 2024-08-12
[skip changelog]
2024-08-12 06:43:29 +00:00
HX3N
9639c04448 chore: YostarKR Reclamation2ExClickProduct add ocrReplace 2024-08-12 15:40:45 +09:00
zzyyyl
de8ba8af63 fix: 修复部分设备萨卡兹肉鸽商店 StageTraderEnter 得分过低
fix #10160
2024-08-12 12:56:16 +08:00
zzyyyl
d719a81d1c feat: 数色前先通过闭运算填充小空洞,避免数色的得分过低 2024-08-12 12:54:56 +08:00
Constrat
d2ce2399b9 fix: delay between Mall and CreditStoreOcr for refresh lag 2024-08-11 23:41:31 +02:00
Constrat
59ee90dd10 chore: added regex for EX stages (#10211)
* chore: added regex for EX stages

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

* perf: remove unneccesart regex

* perf: non-greedy quantifier
2024-08-11 21:34:00 +02:00
uye
736f836232 chore: 减少debug下截图数量最大值 2024-08-11 23:51:38 +08:00
晓丶梦丶仁
d319bac4a5 i18n: 生息演算停止任务返回主页面OCR 2024-08-11 22:20:29 +08:00
github-actions[bot]
06785bad3f chore: Auto Update Game Resources - 2024-08-11
[skip changelog]
2024-08-11 13:41:33 +00:00
ManicSteiner
a3f7b0af9a chore: YostarJP Reclamation2QuitToMainPage 2024-08-11 21:38:12 +08:00
uye
7681b80ec8 fix: json格式错误
[skip changelog]
2024-08-11 20:40:00 +08:00
uye
3509e1ae1b i18n: 生息演算停止任务 2024-08-11 20:26:03 +08:00
github-actions[bot]
0dea692e41 chore: Auto Update Game Resources - 2024-08-11
[skip changelog]
2024-08-11 11:41:54 +00:00
github-actions[bot]
bd346bd578 chore: Auto Templates Optimization
[skip changelog]
2024-08-11 11:29:51 +00:00
晓丶梦丶仁
2116fbf347 feat: 生息演算刷满后停止任务 (#10197)
* feat: 生息演算刷满后停止任务

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

* fix: 修改出口

* fix: 我也不知道我写的什么玩意 revert掉

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

* fix: 用Stop结束任务

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

* perf: 删掉多余图片

* feat: 完成后不删除存档并返回主页面

* chore: Auto update by pre-commit hooks [skip changelog]
2024-08-11 19:29:33 +08:00
uye
a61c6130e2 chore: 扩大组装台寻找范围 2024-08-11 19:27:43 +08:00
status102
80c34a07e1 chore: ui perf
[skip changelog]
2024-08-11 16:56:42 +08:00
晓丶梦丶仁
a0bfa4cd48 fix: 在舍弃思绪过程中识别可关闭弹窗 (#10184) 2024-08-11 13:15:05 +08:00
uye
6f431852e3 fix: 缺失 return
[skip changelog]
我脑子一定是烧坏了
2024-08-11 10:57:17 +08:00
uye
11605b7982 fix: 错误的判断条件
fix #10185
2024-08-11 10:42:50 +08:00
github-actions[bot]
86dfe16551 chore: Auto Update Game Resources - 2024-08-11
[skip changelog]
2024-08-11 01:34:44 +00:00
status102
f47020ce7f chore: task name
[skip changelog]
2024-08-11 09:17:23 +08:00
HX3N
7855c64765 docs: KR fix typo integration.md
[skip changelog]
2024-08-11 06:12:04 +09: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
HX3N
f7ab391eff fix: YostarKR Reclamation2CopiousCoppice add ocrReplace 2024-08-11 02:47:32 +09:00
uye
c96f2e66b2 feat: 完成后勾选界面添加清空按钮
fix #10190
2024-08-11 00:07:44 +08:00
萨拉托加
cfdc61eb46 fix: 台服目前坍縮值改为當前坍縮值 (#10186) 2024-08-10 20:46:42 +08:00
Constrat
3b6404b7e6 i18n: MAA webplate manual changes
ref: #10178
2024-08-10 11:54:30 +02:00
uye
0879dc2788 chore: Replace Poptip with ToolTip and Add InitialShowDelay for PostActionSetting.Once 2024-08-10 15:55:36 +08:00
github-actions[bot]
c847cb6942 chore: Auto Update Game Resources - 2024-08-10
[skip changelog]
2024-08-10 07:41:31 +00:00
uye
0e51aaba09 fix: 不必要的重置连接
fix #10183
2024-08-10 15:29:27 +08:00
ManicSteiner
73841ee525 fix: YostarJP Reclamation2Ex text 2024-08-10 15:21:38 +08:00
status102
67e30955f7 perf: 优化完成后动作仅一次提示文本的显示和描述 (#10182)
* docs: 仅一次

* docs: 仅一次

* docs: 仅一次

* perf: 优化提示显示

* chore: 优化文本
2024-08-10 15:02:56 +08:00
晓丶梦丶仁
290d10418c fix: 肉鸽探索失败后执行ClickToStartPointAfterFailed点进讲述者 (#10177) 2024-08-10 10:44:01 +08:00
Loong
946a164907 chore: bump maa-cli to 0.4.10 (#10179) 2024-08-09 21:14:16 +01:00
uye
444bb7909e chore: 修改自动检测连接后重置连接状态 2024-08-10 01:27:04 +08:00
Constrat
e585b91339 fix(i18n): wrong key in translation en-us 2024-08-09 18:59:36 +02:00
uye
24de93fbfb chore: 修改生息演算不同模式的介绍 (#10169)
* chore: 修改生息演算不同模式的介绍

* i18n: KR tweak

use official? word

* i18n: english tweaks

* chore: 修改开始界面翻译

* chore: KR 修改开始界面翻译

also aligned the format with that of the other server

chore: fix typo

---------

Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-08-10 00:09:25 +08:00
CY-Zhu
53deb4d0d3 chore: coding style upgrade (#10157)
chore: code style upgrade
2024-08-10 00:05:40 +08:00
Loong
3994e845ad fix: validate filename before using it to avoid crash (#10138)
When custom mode is enabled and filename is not set, the program will crash.
This patch adds a check to validate the filename before using it to avoid the crash.
2024-08-09 23:50:17 +08:00
uye
b3e1cba56b fix: gui_new.json 退出不报错,死锁问题 2024-08-09 22:55:27 +08:00
Constrat
0074cf0ae0 chore: add int convertion to release-ota (#10174)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-09 22:31:33 +08:00
github-actions[bot]
5cabfa755f chore: Auto Update Game Resources - 2024-08-09
[skip changelog]
2024-08-09 14:02:40 +00:00
Constrat
9a14f70223 chore: remove unused templates from ResourceUpdater 2024-08-09 15:57:44 +02:00
Rbqwow
eb591c0343 chore: 发布 bug issue 时提供 gui.json 2024-08-09 21:41:18 +08:00
dantmnf
11aeb1ccb8 chore: adjust gpu information log level 2024-08-09 21:39:21 +08:00
github-actions[bot]
05ac9c286d chore: Auto Update Game Resources - 2024-08-09
[skip changelog]
2024-08-09 13:04:33 +00:00
github-actions[bot]
cdc69eea08 chore: Auto Templates Optimization
[skip changelog]
2024-08-09 12:54:38 +00:00
Weiyou Wang
c82aeb0256 feat: 加入肉鸽节点地图识别功能,并应用于萨卡兹肉鸽蓝图快速过图 (#9812)
* feat: 添加 RoguelikeMode::FastPass,负责用蓝图分队快速过图

* chore: update templates for RoguelikeMap and RoguelikeRouting

* feat: RoguelikeMap

* feat: RoguelikeMapConfig

* feat: BrightPointAnalyzer

* feat: RoguelikeRouting

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

* fix: 修复会卡在商店门口的bug

* fix: adapt new plugin-registration signature

* chore: try fix submodule

* perf: 复用task

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

* fix: 为函数申明补上定义

---------

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>
2024-08-09 22:54:19 +10:00
github-actions[bot]
7e9b5d0006 chore: Auto Update Game Resources - 2024-08-09
[skip changelog]
2024-08-09 03:25:47 +00:00
github-actions[bot]
f64aca75a5 chore: Auto Templates Optimization
[skip changelog]
2024-08-09 03:10:24 +00:00
HY
b6cb642778 chore: 繁中服「不義之財」活動導航 (#10153)
* chore: 繁中服「不義之財」活動導航

* 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-08-09 11:10:01 +08:00
Weiyou Wang
87b01d90f8 chore: 为肉鸽编队滑页触底判定的代码添加注释 (#10156) 2024-08-09 11:08:47 +08:00
HX3N
9e76c47a09 docs: YostarKR update connection.md
updated to align with cn's connection.md
[skip changelog]
2024-08-09 11:05:21 +09:00
Rbqwow
9487cc8b06 docs: 方舟专版现支持截图增强 2024-08-09 01:03:08 +08:00
CY-Zhu
411b8f6a4f docs: add minor tip in CN doc and sync EN doc. (#10155)
* docs: add minor tip in CN doc and sync EN doc.

* i18n: tweak

---------

Co-authored-by: Chengyun Zhu <zhuchengyun.hf@outlook.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-08-08 15:52:33 +00:00
Constrat
ae1c6a6b8f docs: link to change for Global RA2 2024-08-08 17:48:15 +02:00
HX3N
5505f8030f fix: Reclamation2EX Yostar confirmation window
Needs to be edited if confirmation window is removed later
2024-08-08 23:22:32 +09:00
Constrat
24377f19a2 chore: convert workflow input values to int (#10151)
* chore: always convert limits to int

* test: comment for testing

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

* chore: change conversion

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

* debug: add echo

* chore: change logic

* perf: optimize logic

* perf: change logic again

* debug: remove debug echo

* debug: remove commets

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-08 21:48:12 +08:00
Weiyou Wang
2ec467ef04 feat: improve recruitment_tool (#10152)
* fix: 修复 find next 逻辑

* feat: auto-adjust window size and style

* feat: press Q to display more hints
2024-08-08 23:41:36 +10:00
HX3N
fef78b2e6b fix: Reclamation2EX YostarKR specific notification
fix #10150
2024-08-08 22:23:04 +09:00
SherkeyXD
3c40a48ab5 feat: SideStory「太阳甩在身后」二三阶段导航 2024-08-08 20:35:17 +08:00
github-actions[bot]
8a3595991a chore: Auto Update Game Resources - 2024-08-08
[skip changelog]
2024-08-08 11:23:37 +00:00
github-actions[bot]
7505461ccc chore: Auto Templates Optimization
[skip changelog]
2024-08-08 11:18:21 +00:00
zayn7lie
89f35b616d feat: YostarEN Reclamation2 (#10143) 2024-08-08 13:18:02 +02:00
github-actions[bot]
b557d9f8c6 chore: Auto Update Game Resources - 2024-08-08
[skip changelog]
2024-08-08 09:04:16 +00:00
status102
c7fe02ebbb perf: Mumu截图增强启用但未生效时禁止运行,直到关闭增强或配置有效 2024-08-08 16:48:24 +08:00
uye
402d68f478 chore: 修改截图测试提示 2024-08-08 16:33:56 +08:00
acturea
06a8cb68ff refactor(main): Extract connection detection logic to method
Refactored the connection detection logic in AsstProxy.cs to a separate method for improved readability and maintainability. Adjusted return types in SettingsViewModel.cs to return empty strings instead of nulls for better consistency.

Signed-off-by: acturea <acturea@gmail.com>
2024-08-08 16:32:42 +08:00
acturea
c707825a92 fix(ConfigurationHelper): Clarify log messages for config loading
Revised log messages to better indicate the failure in loading the configuration and the use of default settings. This enhances the clarity and usefulness of the log outputs.

Signed-off-by: acturea <acturea@gmail.com>
2024-08-08 16:32:16 +08:00
acturea
9c69899620 refactor(ConfigurationHelper): streamline configuration loading
Refactored the configuration loading process for simplicity and clarity. Extracted several methods to manage specific tasks like directory existence and configuration parsing, improving code organization. Reduced redundancy and enhanced readability.

Signed-off-by: acturea <acturea@gmail.com>
2024-08-08 16:32:15 +08:00
晓丶梦丶仁
56f4702278 fix: 识别思绪太快导致无法点击驮兽归队 (#10109)
fix: 识别思绪太快导致无法点击(CloseCollection-Close/Continue))
2024-08-08 16:29:38 +08:00
github-actions[bot]
72446cedd3 chore: Auto Update Game Resources - 2024-08-08
[skip changelog]
2024-08-08 06:02:13 +00:00
github-actions[bot]
286b2e147d chore: Auto Update Game Resources - 2024-08-08
[skip changelog]
2024-08-08 05:25:33 +00:00
status102
c01b52a6d2 perf: nullable enable
[skip changelog]
2024-08-08 11:04:24 +08:00
status102
0afe548fd6 perf: null check
[skip changelog]
2024-08-08 11:00:47 +08:00
Constrat
06d45ea0bf refactor: changed config name to make more logical sense 2024-08-08 00:05:02 +02:00
Constrat
43a097d03b fix: invert bypass daily logic from #10113 2024-08-07 23:36:19 +02:00
github-actions[bot]
54a4a789c3 chore: Auto Update Game Resources - 2024-08-07
[skip changelog]
2024-08-07 21:24:32 +00:00
github-actions[bot]
22f0231587 chore: Auto Templates Optimization
[skip changelog]
2024-08-07 21:16:48 +00:00
Constrat
d762da42e1 chore: change HS navigation to template because of interface change 2024-08-07 23:16:17 +02:00
Weiyou Wang
b1241f4f74 feat: 肉鸽招募设置 recruitment.json 文件维护工具 (#9700)
* feat: recruitment_tool

* fix: delete duplicate items from recruitment.json

* refactor: refine doc fields in recruitment.json files

* fix: 修复 recruitment 数据完整性

* refactor: refine recruitment.json files

* chore: update .gitignore file
2024-08-08 06:30:32 +10:00
Weiyou Wang
f50ab269d7 fix: 修改肉鸽编队滑页触底判断 (#9243, #9328) (#10116)
fix: 修改肉鸽编队滑页触底判断
2024-08-08 02:22:21 +08:00
uye
d39f4a0327 refactor: TimerProperties/MuMuEmulator12ConnectionExtras Property changed notify 2024-08-07 23:58:28 +08:00
uye
fc9cb70024 chore: 优化 mumu 注册表路径读取 2024-08-07 23:38:16 +08:00
status102
ed94f0af51 perf: 移除测试代码 2024-08-07 22:55:08 +08:00
octopus_yan
104f8e8de7 feat: 开启mumu增强截图时尝试读取注册表地址并自动填充 (#9076) 2024-08-07 22:54:56 +08:00
uye
5253bdc808 chore: 修改 mumu 截图增强 日志输出颜色 2024-08-07 22:52:53 +08:00
Manicsteiner
91fbaff4f4 chore: YostarJP Reclamation2 ocr replace (#10132) 2024-08-07 16:07:11 +02:00
Manicsteiner
7bda539e49 feat: YostarJP Reclamation2 (#10131) 2024-08-07 21:18:15 +09:00
github-actions[bot]
6277e5fa47 chore: Auto Templates Optimization
[skip changelog]
2024-08-07 09:06:17 +00:00
HX3N
d194f4895f feat: YostarKR Reclamation2 (#10127)
* feat: YostarKR Reclamation2

chore: tasks init

* chore: Initial work on tasks

* chore: Reclamation2SkipDays1 and fix ocr

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

* chore: fix typo
2024-08-07 18:05:47 +09:00
github-actions[bot]
d0310dc61c chore: Auto Templates Optimization
[skip changelog]
2024-08-07 08:40:51 +00:00
HX3N
cf659e0055 chore: YostarKR HS navigation update (#10129)
* chore: YostarKR HS navigation update

* 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-08-07 17:40:28 +09:00
Chengyun Zhu
dcfddbdfdd i18n: EN translate for reclamation 2024-08-07 09:12:52 +01:00
Constrat
242eab79c7 feat: visiting only once a day logic and gui (#10113)
* feat: cs logic for daily visiting

* chore: wpf gui for setting

* i18n: localizations for wpf settings

* feat: daily lock bypass logic

* i18n: change key and localization

* chore: wpf gui
currently using 3rd gui option

* style: tweaked wpf gui

* fix: merge conflicts

* fix: conflicts?
2024-08-07 10:11:32 +02:00
github-actions[bot]
75a25f0711 chore: Auto Update Game Resources - 2024-08-07
[skip changelog]
2024-08-07 08:01:54 +00:00
github-actions[bot]
e29304dd9f chore: Auto Templates Optimization
[skip changelog]
2024-08-07 07:48:43 +00:00
ManicSteiner
856b7ee4d3 chore: YostarJP HS navigation update 2024-08-07 08:48:18 +01:00
HX3N
2ba4eb866a i18n: YostarKR tweak translation 2024-08-07 15:24:33 +09:00
status102
74b05d60e1 perf: 为完成后选项追加右键激活仅一次,且与当前选项激活状态同步 2024-08-07 13:22:22 +08:00
HX3N
875af8f213 fix: YostarKR CheckCollapsalParadigms
ocr fix and tweak translation
remove Mizuki@Roguelike@DataTraceback
2024-08-07 14:00:45 +09:00
status102
a3173eb04c perf: 合并肉鸽插件中止控制 2024-08-07 12:06:43 +08:00
Constrat
749a97775f refactor: combined AskRestartToApplySettings methods through parameter 2024-08-07 00:17:32 +02:00
Constrat
adf2501615 chore: reclamation algorithm #2 except txwy 2024-08-06 23:36:28 +02:00
Constrat
33a5f275a1 ci: skip workflow if previous commit is github_actions[bot] 2024-08-06 23:26:51 +02:00
Constrat
0095c44431 ci(perf): kill outdated workflow on same branch 2024-08-06 22:20:00 +01:00
github-actions[bot]
13b127c468 chore: Auto Templates Optimization
[skip changelog]
2024-08-06 20:22:34 +00:00
Rbqwow
9108f01264 docs: 本地加载logo
[skip changelog]
2024-08-07 04:21:28 +08:00
Rbqwow
4c05c081c3 docs: 更新“新手上路”
[skip changelog]
2024-08-07 04:08:13 +08:00
晓丶梦丶仁
d5e4d0efd7 fix: 萨米肉鸽无法正常识别Level name (#10115) 2024-08-07 01:35:48 +08:00
晓丶梦丶仁
880917b64c Revert "chore: 肉鸽继续尝试探索但并不直接放弃"
This reverts commit 9711111a36.
2024-08-07 00:53:01 +08:00
status102
0e6ed98b68 chore: 简化肉鸽刷塌缩范式的日志输出 2024-08-07 00:07:18 +08:00
uye
e207a74995 perf: 优化截图增强显示 2024-08-06 22:19:48 +08:00
uye
daa6596b41 perf: 优化截图测试 2024-08-06 22:19:25 +08:00
uye
d3b26140e3 chore: UI 增加缺少的回调 2024-08-06 19:46:28 +08:00
uye
f89b59e680 fix: 开启 MuMu 截图增强后重启模拟器未重启 MAA 后出现截图失败
fix #10110
2024-08-06 18:34:41 +08:00
uye
2829a5701d feat: 基建列表增加 全/反选 按钮,列表区域可响应滚动
fix #10102
2024-08-06 00:59:49 +08:00
Constrat
96fdcb55d2 fix: Encounter IS4 EN
fix #10087 #10090
2024-08-05 17:35:54 +02:00
Constrat
740e49cc4e Revert "chore: Add OCR for EN Roguelike" (#10101)
Revert "chore: Add OCR for EN Roguelike (#10090)"

This reverts commit e722615273.
2024-08-05 15:23:55 +00:00
uye
f8f13fc533 feat: 远程控制支持生息演算2(? 2024-08-05 23:05:15 +08:00
uye
463fdfdaab fix: 远程控制领取奖励事件报错
fix #10097
2024-08-05 23:05:15 +08:00
ManicSteiner
57c5185104 perf: remove using globalization 2024-08-05 22:51:23 +08:00
ManicSteiner
9c26964779 feat: 适配自动战斗 2024-08-05 22:45:53 +08:00
ManicSteiner
3898c2fc42 feat: 适配编组、干员识别、公招 2024-08-05 22:27:09 +08:00
Rbqwow
1749cd18c3 docs: 更新备选关卡文档 2024-08-05 22:25:54 +08:00
status102
0085e1242f Revert "ci: 允许Merge出现在pr中的commit name (#10098)"
This reverts commit b78e7109f2.

不允许提交Merge commit,所以该内容无意义且与规则冲突
2024-08-05 21:34:35 +08:00
晓丶梦丶仁
b78e7109f2 ci: 允许Merge出现在pr中的commit name (#10098) 2024-08-05 21:04:19 +08:00
uye
5328640ace feat: 不要在酒吧里点酒吧 2024-08-05 18:41:40 +08:00
晓丶梦丶仁
e722615273 chore: Add OCR for EN Roguelike (#10090)
* chore: Add OCR for EN Roguelike

fix #10087

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

* chore: Add OCR for EN Roguelike

* chore: Auto update by pre-commit hooks [skip changelog]
2024-08-05 14:44:28 +08:00
ManicSteiner
faa68bf51e feat: restart MAA after change OperNameLanguage 2024-08-05 14:09:43 +08:00
ManicSteiner
b8f49ca656 chore: OperNameLanguage i18n 2024-08-05 14:06:55 +08:00
晓丶梦丶仁
a0c1904ae9 fix: Stuck after recruit in Trader Stage
fix #10012
2024-08-05 13:54:36 +08:00
晓丶梦丶仁
b71e535541 chore: 把revert回来的逗号删掉
[skip changelog]
2024-08-05 13:45:16 +08:00
status102
01ab3165f6 Revert "chore: 提醒用户如gui相关的bug可以跳过配置信息 (#10066)"
This reverts commit b41a99a719.
2024-08-05 13:37:40 +08:00
github-actions[bot]
44731c7771 chore: Auto Templates Optimization
[skip changelog]
2024-08-04 17:28:38 +00:00
Rbqwow
0773d31fd7 docs: 重写网页 PR 教程 (#10005)
* docs: 初步重写 PR 网页教程

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

* docs: 再加一个按钮

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

* fix: 先把图片路径修了

* docs: 不新建分支了

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

* docs: 修复坏图片

* docs: 完成英语翻译 | English version completed (translated by gpt)

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

* i18n: english tweaks

* i18n: english tweaks

---------

Co-authored-by: 晓丶梦丶仁 <1020623818@qq.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-08-05 01:01:17 +08:00
Loong
86318dc3ff chore: bump maa-cli to 0.4.9 (#10081) 2024-08-04 18:01:01 +01:00
ManicSteiner
46abd60d9d feat: 允许选择WPFGUI中的干员名称显示语言 2024-08-04 23:50:30 +08:00
XuQingTW
2dceadbd7d chore: 台服增加OCR替换 (#10076)
* 台服tasks,json

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

* chore: 增加几个字符串开始符

* docs: 添加注释

---------

Co-authored-by: XuQingTW <71360856+jiahe2004@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <1020623818@qq.com>
2024-08-04 22:55:29 +08:00
SherkeyXD
9e2f4084a8 ci: cancel txwy res update in fork repo 2024-08-04 21:29:42 +08:00
SherkeyXD
5731c4e0be fix: 修复幸运墙点击次数不定的问题 2024-08-04 21:26:16 +08:00
uye
c776897e72 chore: 清理跨版本垃圾 2024-08-04 20:40:28 +08:00
github-actions[bot]
ae071ab379 chore: Auto Update Game Resources - 2024-08-03
[skip changelog]
2024-08-03 23:41:37 +00:00
ManicSteiner
8b43f4a1ec chore: update ocr text for YostarJP 2024-08-04 00:28:10 +01:00
Lancarus
24ad0b1802 feat: 肉鸽适配新干员用法 (#10069)
* feat: 适配新干员用法
2024-08-04 05:24:57 +08:00
HX3N
cfc26bf7ba chore: 1ef2e664f1 for YostarKR 2024-08-04 04:07:03 +09:00
晓丶梦丶仁
b41a99a719 chore: 提醒用户如gui相关的bug可以跳过配置信息 (#10066)
* chore: 提醒用户如gui相关的bug可以跳过配置信息

* chore: Remind users that GUI-related bugs can skip configuration information
2024-08-03 15:22:51 +00:00
uye
5c0825328c Release v5.5.11452 (#10052) 2024-08-03 23:21:44 +08:00
uye
cacec2b614 docs: Update CHANGELOG.md 2024-08-03 23:21:05 +08:00
晓丶梦丶仁
c63af68d6c chore: add some OCR replace for txwy (#10056)
* chore: add some OCR Replace for txwy

* 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-08-03 22:23:26 +08:00
github-actions[bot]
99962c1405 chore: Auto Templates Optimization
[skip changelog]
2024-08-03 13:59:34 +00:00
晓丶梦丶仁
d488a5afba fix: 替换合成思绪思绪不足识别模板 (#10063)
* 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>
2024-08-03 21:59:13 +08:00
github-actions[bot]
592f47200c chore: Auto Update Game Resources - 2024-08-03
[skip changelog]
2024-08-03 13:23:59 +00:00
晓丶梦丶仁
77518e50a6 chore: 更新bug report模板 (#10060) 2024-08-03 13:15:10 +00:00
晓丶梦丶仁
42799aafda chore: 更新issue - bug report模板 (#10058)
* chore: 更新issue模板

* style: 将"id: others"->"description"的格式设置为默认换行
2024-08-03 21:06:40 +08:00
Constrat
8c6b2514e6 chore: 1ef2e664f1 for EN
@HX3N @manicsteiner check your clients
2024-08-03 15:02:02 +02:00
Constrat
c6a8967c8b fix: YostarEN Training room vacant ocr 2024-08-03 13:22:14 +02:00
abc1763613206
bb2a44c539 fix: 查询进程时仅使用 packageName 2024-08-03 17:07:04 +08:00
status102
7c7f44bb45 perf: 增加完成后动作仅一次时锁定退模拟器和MAA
[skip changelog]
2024-08-03 16:49:42 +08:00
uye
5e7e988de0 chore: 修改 完成后 逻辑 2024-08-03 12:38:35 +08:00
uye
d08b3f4d4d style: 格式化代码 2024-08-03 12:38:35 +08:00
SherkeyXD
1ef2e664f1 fix: 修复幸运墙无法点击三次的问题 2024-08-03 11:07:25 +08:00
status102
aa083beaaf fix: 修复完成后动作同时启用无其他MAA+休眠时,无法正确读取 2024-08-03 10:59:10 +08:00
github-actions[bot]
8704585bb0 docs: Auto Update Changelogs of v5.5.11452 (#10053)
docs: Auto Generate Changelog of Release v5.5.11452

Co-authored-by: status102 <status102@users.noreply.github.com>
2024-08-03 10:40:58 +08:00
zzyyyl
8eec24a15c feat: 删除 action ClickRand (#10003) 2024-08-03 09:35:43 +08:00
zzyyyl
58f44d8fb8 perf: log prints non-empty ocr_replace results
related to dedc3c7d4a
2024-08-02 21:10:25 +08:00
uye
b8437e4035 feat: 托盘图标右键菜单增加“重启MAA”选项
fix #10015
2024-08-02 20:49:22 +08:00
status102
fe17ecfccc fix: 完成后动作保存错误 2024-08-02 20:15:31 +08:00
github-actions[bot]
67735d600a chore: Auto Update Game Resources - 2024-08-02
[skip changelog]
2024-08-02 11:01:57 +00:00
Manicsteiner
a544fcb683 chore: remove YostarJP Sami@Roguelike@MissionFailedFlag2.png (#10041) 2024-08-02 18:56:10 +08:00
Constrat
909d875426 chore: missing Secluded Passage for IS4 EN
[skip ci]
2024-08-02 12:50:12 +02:00
Constrat
5abad4e282 chore: space between name and skill for infrast training room 2024-08-02 12:31:42 +02:00
HX3N
5d75f4a214 chore: YostarKR revert remove \n
[skip changelog]
2024-08-02 17:34:31 +09:00
uye
e00e230d27 Release v5.5.11451 (#10034) 2024-08-02 15:39:24 +08:00
status102
f4ed000684 perf: 简化完成后动作逻辑
[skip changelog]
2024-08-02 15:38:18 +08:00
uye
0e5b83cf80 sytle: 删除无用 using
[skip changelog]
2024-08-02 15:37:47 +08:00
uye
e1c3d5083c Release v5.5.114514 (#10027) 2024-08-02 15:04:04 +08:00
github-actions[bot]
519cc493e0 docs: Auto Update Changelogs of v5.5.114514 (#10030)
* docs: Auto Generate Changelog of Release v5.5.114514

* docs: changelog

---------

Co-authored-by: status102 <status102@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-08-02 15:03:39 +08:00
github-actions[bot]
9017e60538 chore: Auto Update Game Resources - 2024-08-02
[skip changelog]
2024-08-02 06:44:10 +00:00
uye
bc1c01a1bc fix: fix smoking-test 2024-08-02 14:37:39 +08:00
HX3N
920d5735f8 chore: YostarKR ocr fix
why is \n here?
2024-08-02 15:30:04 +09:00
uye
0095332a0a chore: 修改不支持关卡的提示 2024-08-02 14:11:12 +08:00
uye
086d68cb8c ci: fix ci 2024-08-02 14:02:23 +08:00
uye
0f2b501974 ci: use old type2-runtime 2024-08-02 13:39:57 +08:00
Horror Proton
837c5bc04a feat: fallback to General config 2024-08-02 13:32:51 +08:00
Horror Proton
271985fcb4 feat: merge Waydroid config 2024-08-02 13:29:48 +08:00
boyu.liu
eb141d6eda feat: Add connection config for waydroid emulator 2024-08-02 13:29:48 +08:00
uye
adf7ea8a79 ci: update type2-runtime 2024-08-02 13:24:42 +08:00
status102
dc923fa092 perf: 完成后动作标题下方增加分隔线 2024-08-02 13:10:59 +08:00
uye
ce0ed9b169 chore: 格式化专精剩余时间输出 2024-08-02 12:44:54 +08:00
uye
4c9cd8ae91 chore: 屏蔽资源版本更新 2024-08-02 12:28:37 +08:00
DavidWang19
69de3b94a9 feat: 新增去伪存真节点gui记录 2024-08-02 02:09:39 +01:00
HX3N
7e35d609f6 docs: update glossary
[skip changelog]
2024-08-02 07:20:48 +09:00
HX3N
7f17ea83d6 fix: YostarKR training seprate string
fix #10021
2024-08-02 05:18:45 +09:00
uye
db733b6310 fix: proxy 取值错误 2024-08-02 03:11:24 +08:00
uye
be58898ac9 fix: 定时检查更新与界面显示不符 2024-08-02 02:56:05 +08:00
Rbqwow
4a266c905b chore: 更新 Issue 模板 2024-08-02 02:15:02 +08:00
github-actions[bot]
4abae82403 chore: Auto Templates Optimization
[skip changelog]
2024-08-01 18:11:21 +00:00
Constrat
484e8a9c23 fix: paths for auto optimizayion 2024-08-01 20:10:24 +02:00
Constrat
4b1750f093 chore: YostarEN trader regex 2024-08-01 20:05:19 +02:00
Constrat
fd959ae341 fix: Tweaked training room timer detection + new TrainingLevel templates
Yostar fucked up the templates with this update
2024-08-01 19:47:19 +02:00
Manicsteiner
08fa9313c3 chore: lucky wall, StartToVisit for YostarJP (#10019) 2024-08-02 01:07:52 +09:00
HX3N
8088a840c9 fix: YostarKR OrundumActivitiesconfirm
[skip changelog]
2024-08-01 22:07:19 +09:00
Constrat
872bc5e78d ci(perf): add concurrency to block previous runs in case of new pushes (#9932) 2024-08-01 17:55:43 +02:00
Constrat
4450e4f36c fix: caching for res-upd 2024-08-01 17:18:23 +02:00
Constrat
2e4809bb25 revert: fix: caching
modified wrong workflow
2024-08-01 16:28:43 +02:00
SherkeyXD
5f5eccda72 feat: SideStory「太阳甩在身后」导航 2024-08-01 20:19:01 +08:00
Rbqwow
954e4a68f0 docs: use gpt to translate zh-cn to en-us (#10007) 2024-08-01 19:38:50 +08:00
Constrat
5108899bc3 fix: YostarEN Sami I.S. encounter regex 2024-08-01 13:31:19 +02:00
Constrat
83bf7d5718 i18n: EN tweak
[skip ci]
2024-08-01 13:13:14 +02:00
Constrat
99e8f47ce1 fix: OrundumActivities confirmation on global 2024-08-01 13:07:00 +02:00
Constrat
b54a1bc4fc fix: caching 2024-08-01 12:27:32 +02:00
github-actions[bot]
3134f3d468 chore: Auto Update Game Resources - 2024-08-01
[skip changelog]
2024-08-01 10:14:53 +00:00
Constrat
db14568241 fix: res-upd optimize_template
(I am stupid)
2024-08-01 12:13:01 +02:00
Constrat
f0b06ba771 fix: res-upd optimize-templates 2024-08-01 12:08:01 +02:00
Constrat
1ceec50e50 fix: oxipng for ResourceUpdater 2024-08-01 12:00:26 +02:00
Constrat
e745dc9d7b fix: ResourceUpdater KR Shamare incosistency 2024-08-01 11:50:35 +02:00
github-actions[bot]
43f7f1f167 chore: Auto Templates Optimization
[skip changelog]
2024-08-01 09:38:07 +00:00
Sherkey
9f6b6f0257 fix: 幸运墙适配夏活 2024-08-01 17:37:47 +08:00
Constrat
a03972b19c fix: YostarEN revert StartToVisit template 2024-08-01 09:35:27 +02:00
HX3N
b5d7bbd631 fix: YostarKR remove StartToVisit
UI has changed, so it has been removed
2024-08-01 10:22:09 +09:00
github-actions[bot]
aed6652217 chore: Auto Update Game Resources - 2024-07-31
[skip changelog]
2024-07-31 22:28:02 +00:00
HX3N
199d9d350d fix: YostarKR roguelike navigation 2024-08-01 06:56:52 +09:00
Constrat
12849a7ca0 fix: Manual HS operators ocrReplace 2024-07-31 23:52:04 +02:00
Constrat
77305e2f52 fix: YostarEN roguelike navigation
reverting #8769  previous temporary fix for #8764
2024-07-31 23:18:03 +02:00
HX3N
f44095e8e7 chore: YostarKR Sami roguelike expansion and fix ocr 2024-08-01 05:31:59 +09:00
github-actions[bot]
cbc2a18c7a chore: Auto Templates Optimization
[skip changelog]
2024-07-31 20:10:06 +00:00
github-actions[bot]
4deeeb8ea2 chore: Auto Update Game Resources - 2024-07-31
[skip changelog]
2024-07-31 18:45:13 +00:00
Constrat
018e0a82cc feat: Daily Orundum from Lucky wall YostarEN 2024-07-31 20:39:16 +02:00
github-actions[bot]
16e6093633 chore: Auto Update Game Resources - 2024-07-31
[skip changelog]
2024-07-31 18:29:45 +00:00
Constrat
f77d978aec feat: Daily Orundum from Lucky wall YostarEN 2024-07-31 20:12:40 +02:00
Constrat
1d1f67c55d docs: GameData Yostar citation 2024-07-31 18:58:48 +02:00
ManicSteiner
698990562e chore: YostarJP ocr fix 黍 2024-07-31 15:02:39 +01:00
status102
0372a7d36c fix: 修复截图测试会触发完成后动作的Bug (#10002)
* fix: 修复截图测试会触发完成后动作的Bug

* fix: var name

* fix: 完成后动作修复
2024-07-31 20:18:26 +08:00
zzyyyl
8581db53f9 fix: 修复萨卡兹肉鸽去伪存真节点卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9966#issuecomment-2260174971
2024-07-31 19:46:32 +08:00
HX3N
2beedb7e0d chore: 幸运墙 免费单抽 for YostarKR
chore: tasksort
2024-07-31 20:42:05 +09:00
Constrat
0bb28cc626 perf: use starts_with instead of compare 2024-07-31 12:53:11 +02:00
Lancarus
fe7cc5f7b0 feat: 增加一些肉鸽参数 (#9875)
* feat: 增加一些肉鸽参数

* feat: 根据获得的藏品改变招募优先级

* fix: 重复定义、注释空函数
2024-07-31 18:43:59 +08:00
Constrat
6781323d55 fix: recruitment data runs only on "char_" 2024-07-31 12:35:36 +02:00
github-actions[bot]
a8e0c2a63e chore: Auto Update Game Resources - 2024-07-31
[skip changelog]
2024-07-31 10:01:09 +00:00
Constrat
18c5555388 fix: typo + YostarJP ghost THRM-EX appearing twice (no idea what's going on) 2024-07-31 11:53:21 +02:00
Rbqwow
64e429ea02 docs: 更新其他文档 更新部分翻译 2024-07-31 17:45:34 +08:00
Constrat
c51aeecd06 fix: trap_470_tmantic having same name as 맨티코어 instead of "Manticore Killer" 2024-07-31 11:22:06 +02:00
zzyyyl
cf87918d79 perf: 增加日志输出 PackageTask 的当前 subtask 2024-07-31 17:17:01 +08:00
ManicSteiner
8682a6e6cf chore: StartToVisit ROI for Yostar servers 2024-07-31 10:06:17 +01:00
Constrat
55d3883d58 tools: updated ignore list 2024-07-31 11:02:23 +02:00
zzyyyl
dedc3c7d4a perf: 减少部分日志输出 2024-07-31 16:58:01 +08:00
Manicsteiner
0d7b37e38b chore: 幸运墙 免费单抽 for YostarJP (#9994) 2024-07-31 10:34:30 +02:00
Manicsteiner
29d52c3832 chore: roguelike navigation for YostarJP (#9995) 2024-07-31 10:33:36 +02:00
晓丶梦丶仁
5720d7d887 perf: 优化萨卡兹肉鸽排风口作战策略 (#9987)
* perf: 优化萨卡兹肉鸽排风口作战策略

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

* perf: meeting requests

* perf: final change

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-31 16:28:41 +08:00
status102
513823ba5d perf: 截图测试按钮增加翻译,移动至全局层级 2024-07-31 15:07:44 +08:00
dantmnf
c17c036a0f feat: deprecate legacy GPUs (#9990)
blacklist GPU if:
* no FL 12_0
* driver predates DirectML GA
* Intel: pre-Xe (Gen9, Gen11)
* AMD: pre-Polaris (Sea Islands, Volcanic Islands, Arctic Islands)
* NVIDIA: pre-Pascal (Kepler, Maxwell)
2024-07-31 13:22:26 +08:00
XBB
a8d406e57c feat!: 可组合式完成后任务 (#9960)
* feat: 可组合完成后指令

* feat: 勾选式完成后指令

* style: xaml format

* perf: 统一默认值

* perf: 移除未使用的键

* style: 遵循项目风格

* fix: 移除废弃判断

* perf: visible -> isEnable

* perf: UI 对齐

* chore: 修正仅一次配置提示文本

* perf: 移除原来的任务结束配置键

* perf: 修正绑定值格式

* perf: 修改 仅一次 逻辑与当前一致

* perf: 移除不再使用的显示文本及翻译

* perf: 移除 仅一次 的额外提示

* revert: format

* fix: 修复部分情况仅一次动作后未能还原

* fix: 修复部分情况仅一次动作后未能还原

* fix: for Rider

* perf: 减少Config写入

* perf: 取消`仅一次`时,保存动作到配置

* perf: 左下角显示仅一次

* perf: 增加提示

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-07-31 11:07:59 +08:00
Wallsman
72c85b3f5b chore: Update ja-jp.json
JP 懐黍離
2024-07-31 09:00:17 +08:00
Rbqwow
7986f03568 docs: 修复Readme中的Weblate链接 2024-07-31 04:12:24 +08:00
Rbqwow
1d5f19a418 docs: fix a614dda
[skip changelog]
2024-07-31 04:01:56 +08:00
Lancarus
03c50e634a docs: Update 肉鸽辅助协议.md 2024-07-31 02:52:44 +08:00
Lancarus
a614dda122 docs: Update 肉鸽辅助协议.md 2024-07-31 02:51:40 +08:00
筱竹聽雨
3f842303d8 perf: 添加萨卡兹肉鸽排风口战斗策略 (#9978)
* perf: 添加/改进萨卡兹肉鸽排风口战斗策略

* fix: 文件名后缀增加.json

* perf: 优化萨卡兹肉鸽排风口作战策略

* perf: 优化萨卡兹肉鸽ew招募优先级

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

* perf: 回退ew招募优先级

---------

Co-authored-by: 晓丶梦丶仁 <1020623818@qq.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
2024-07-30 23:50:31 +08:00
晓丶梦丶仁
8a04d42a92 perf: 优化萨卡兹肉鸽ew精二优先级 (#9984) 2024-07-30 15:37:39 +00:00
Rbqwow
afedc19d57 docs: 再见了 所有的 抄作业.com
[skip changelog]
2024-07-30 22:20:54 +08:00
Constrat
7d502f9e42 ci: modifications to staly.yml
We closed the retro active issues, now can reduce the weight on the runs now
2024-07-30 15:52:02 +02:00
Rbqwow
c551d393cb ci: rename Check Markdown files to Check Dead Links
[skip changelog]
2024-07-30 21:41:08 +08:00
Rbqwow
07d7e32348 docs: fix 16912e3
[skip changelog]
2024-07-30 21:39:43 +08:00
Lancarus
16912e3290 docs: Update integrated-strategy-schema.md 2024-07-30 20:27:19 +08:00
zzyyyl
b6a3c61dfe Revert "feat: 印象加深后卡住时截图"
This reverts commit 3a4fbd0193.

refer to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9966#issuecomment-2255696252
2024-07-30 19:25:31 +08:00
Rbqwow
ad56e24127 docs: 补充后台保活限定词和自动战斗帧数要求 2024-07-30 18:42:21 +08:00
Sherkey
724ce1f541 feat: HTTP2 (#9967) 2024-07-30 18:35:18 +08:00
status102
68f463760a Revert "feat: 战斗流程协议命令块增强 (#9952)"
This reverts commit 10eac1ffc6, reversing
changes made to 7476bb67a1.
2024-07-30 17:38:28 +08:00
萨拉托加
10eac1ffc6 feat: 战斗流程协议命令块增强 (#9952)
[#9951](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9951)
2024-07-30 15:54:10 +08:00
Weiyou Wang
7476bb67a1 fix: 修复debug模式在intel mac系统下无法通过编译的问题 (#9940)
疑似bug原因为无法自动将 std::chrono::milliseconds 转换为 std::string
2024-07-30 15:11:25 +10:00
晓丶梦丶仁
57c9df9dc9 perf: 萨卡兹肉鸽添加浮空城接舷战作战策略 (#9971)
* perf: 萨卡兹肉鸽添加浮空城接弦战作战策略

* 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-07-30 12:22:02 +08:00
SherkeyXD
5beecae05f feat: wpf 使用 HTTP2 2024-07-29 21:19:44 +08:00
HX3N
b80265f24d feat: YostarKR HS navigation 2024-07-29 22:17:44 +09:00
SherkeyXD
87bc5cf235 feat: core上报任务使用HTTP2 2024-07-29 20:41:48 +08:00
Constrat
5f7c76e007 feat: YostarEN HS navigation 2024-07-29 13:30:00 +02:00
ValenciaFly
1efd262315 fix: 修复某个环节使用range操作后,数据属性由int->int64_t导致的编译警告 2024-07-29 17:46:37 +08:00
ValenciaFly
89ac713d92 fix: 消除linux下门禁的编译提示 2024-07-29 16:49:29 +08:00
zzyyyl
29ca30cb99 chore(tools): 更新 ChangelogGenerator
* 没有某个分类的提交时不生成该类标题

* 忽略 build|ci|style|debug 类型的提交

* coauthors 改为 list, 避免协作者顺序被随机打乱

* 由于 ignore_merge_author 默认值实际上是 True, 命令行参数调整为 merge_author
2024-07-29 16:20:23 +08:00
zzyyyl
d905457092 chore: 统一 commitizen 2024-07-29 16:06:46 +08:00
zzyyyl
4f88127091 style: 删除过期注释
[skip changelog] [skip ci]
2024-07-29 15:24:57 +08:00
ValenciaFly
c8f2696d4c fix: 修复Linux/MacOS下关于PointInfo的编译问题 2024-07-29 15:16:27 +08:00
status102
7fc2531a8c fix: 移除tasks.json中的无效参数
@Lancarus
2024-07-29 15:11:33 +08:00
ValenciaFly
95ea69a78f doc: 更新战斗流程协议 2024-07-29 14:41:49 +08:00
ValenciaFly
557329075f fix: 更新一些操作的中文命名,当锚点不匹配时新增退出条件作为保护 2024-07-29 14:41:26 +08:00
Sherkey
bbe5602bf6 Release v5.5.0 (#9961) 2024-07-29 14:37:06 +08:00
github-actions[bot]
2ad1f22298 docs: Auto Update Changelogs of v5.5.0 (#9962)
docs: changelog

docs: changelog

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
2024-07-29 14:33:15 +08:00
status102
84acb20806 perf: Wpf肉鸽非刷等级模式时,隐藏第五层BOSS前停下设置 2024-07-29 14:16:25 +08:00
github-actions[bot]
171c5891ec chore: Auto Update Game Resources - 2024-07-29
[skip changelog]
2024-07-29 06:04:24 +00:00
晓丶梦丶仁
338e4e40b1 fix: 肉鸽部分范围点击任务点进萨卡兹肉鸽思绪界面 (#9953)
* fix: 肉鸽旧的范围点击导致意外点开萨卡兹肉鸽思绪界面

* fix: 肉鸽旧的范围点击导致意外点开萨卡兹肉鸽思绪界面

* fix: 删除旧的空模板
2024-07-29 13:45:10 +08:00
晓丶梦丶仁
e32c6bb2d6 fix: 萨卡兹肉鸽进入新一层识别太快导致先点击思绪后驼兽归队/混沌未来中逃脱 (#9946)
* 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>
2024-07-29 13:44:41 +08:00
GalvinGao
5fc26287cb feat: change penguin CN mirror domain to alvorna.com (#9959)
feat: change penguin cn to alvorna.com
2024-07-29 05:42:23 +00:00
Manicsteiner
298e995c6b chore: YostarJP HS navigation (#9958) 2024-07-29 13:41:23 +08:00
status102
8bbce5b3e5 perf: 简化RoguelikeTask set_param (#9905)
* perf: 简化RoguelikeTask set_param

* fix: return value
2024-07-29 13:09:25 +08:00
ValenciaFly
7b205f62fe fix: 修复在MacOs中的门禁错误 2024-07-29 13:00:37 +08:00
valencia_fly
6527c9859e fix: 修复部分功能上不能正常运行 2024-07-29 13:00:32 +08:00
valencia_fly
5ccaab3302 feat: 支持在命令块中加入锚点,并且支持锚点相关操作 2024-07-29 13:00:27 +08:00
valencia_fly
6035f67aad fix: 修复在解析until命令块时,category字段是冲突的。 2024-07-29 13:00:23 +08:00
valencia_fly
a930afe949 feat: 作业命令块增强,支持命令触发条件的策略变更,支持循环命令,条件命令,派发命令以及无序命令组 2024-07-29 13:00:19 +08:00
github-actions[bot]
3d73780c01 chore: Auto Update Game Resources - 2024-07-28
[skip changelog]
2024-07-28 11:03:34 +00:00
Constrat
06709a4057 perf: implement actionsx/prettier for resource updater (#9949) 2024-07-28 11:56:50 +01:00
uye
4571877241 chore: 修改弹窗尺寸 2024-07-28 16:16:00 +08:00
uye
9711111a36 chore: 肉鸽继续尝试探索但并不直接放弃
fix #9897
2024-07-28 14:12:10 +08:00
Constrat
6b9aa97eec test: add res-update-game-unix.yml 2024-07-27 21:59:56 +02:00
github-actions[bot]
fe32a357a0 chore: Auto Templates Optimization
[skip changelog]
2024-07-27 18:50:09 +00:00
Rbqwow
d21ab5c668 docs: 本地加载所有图片 2024-07-28 02:33:18 +08:00
Loong
140c75d461 ci: only check github and github raw links (#9855) 2024-07-28 01:33:49 +08:00
zzyyyl
30e59cbdbe fix: 萨卡兹肉鸽命运所指关卡识别使用 HSVCount 避免达不到阈值 2024-07-28 01:23:44 +08:00
zzyyyl
0a2b003fce feat: 删去 CcoeffHSV, HSVCount 时的模板匹配采用 RGB 的 Ccoeff
CcoeffHSV 有致命缺陷: (0, 0, 0) 与 (179, 0, 0) 应为相似颜色,因为 Hue 是循环的

* feat: HSVCount & RGBCount 的返回结果为点积

为了尽量保证 0.8 的阈值

* workaround: HSVCount & RGBCount 时 maskRange 不再对模板匹配生效

否则数色时的模板匹配结果将不准确,之后可以分开 maskRange 和 colorRange, 后者的格式可以讨论后再做决定
2024-07-28 01:11:59 +08:00
zzyyyl
2a7ecf6074 debug: 更新 DebugTask 方便模板匹配测试 2024-07-27 23:59:15 +08:00
zzyyyl
640eed235b perf: RGBCount 和 HSVCount 改为 数色 和 模板匹配 的几何平均;优化 count 的实现方法 2024-07-27 23:59:07 +08:00
status102
d915385031 perf: Mumu截图增强设置增加测试按钮 (#9881)
![image](https://github.com/user-attachments/assets/985827e8-2254-489c-a10f-cc5dae03bc93)

![0A8}0`7GBVZ)YODI
`N%H~0](https://github.com/user-attachments/assets/250869e4-c661-47ee-80a5-e7c507fe4d08)
2024-07-27 22:20:11 +08:00
status102
112c576a95 perf: 优化窗口显示效果 2024-07-27 22:18:30 +08:00
zzyyyl
b42d5ecd62 feat: RGBCount 和 HSVCount 改为 数色 和 模板匹配 的算术平均 2024-07-27 22:10:31 +08:00
zzyyyl
de955494aa chore: 更新 mask-range 工具 2024-07-27 20:17:46 +08:00
zzyyyl
5a93b0427b fix: 更新 先行一步 & 失与得 的掩码范围以增加得分 2024-07-27 20:15:35 +08:00
zzyyyl
d9b641e6b5 fix: 萨卡兹肉鸽部分关卡识别使用 HSVCount 避免达不到阈值 (#9931)
之前的图感觉像是 1080p 截图后压成 720p 的,很糊

这个 PR 我只在我自己的 720p 模拟器下测过

fix #9930
fix #9937
2024-07-27 18:21:52 +08:00
zzyyyl
9bcf350706 fix: 修复思维边界无法选择的问题
思维边界模板使用 720p 下的截图,并改为使用 HSVCount
2024-07-27 18:07:22 +08:00
zzyyyl
f4d767df04 fix: 修复失与得无法选择的问题
失与得模板使用 720p 下的截图,并改为使用 HSVCount
2024-07-27 18:07:22 +08:00
zzyyyl
93120e9a18 fix: 修复先行一步无法选择的问题
先行一步模板使用 720p 下的截图,并改为使用 HSVCount
2024-07-27 18:07:22 +08:00
zzyyyl
eddb064957 perf: 萨卡兹肉鸽普通作战关卡识别使用 HSVCount 2024-07-27 18:07:14 +08:00
zzyyyl
aef7bba79b feat: 数色算法现在改为原来的结果与 ccoeff 结果的点积 2024-07-27 18:06:41 +08:00
zzyyyl
ba7e4fc995 chore: Add requirements.txt for MaskRangeTool 2024-07-27 16:10:25 +08:00
zzyyyl
4bec53c435 chore: 整理 mask_range 工具 2024-07-27 16:03:47 +08:00
Sherkey
c17ec74461 ci: remove stale cache for ci (#9935) 2024-07-27 09:56:56 +02:00
zzyyyl
4a93784be0 debug: remove testing image 2024-07-27 14:40:41 +08:00
zzyyyl
19e35c7457 debug: 调整 DebugTask 测试模板匹配时的输出信息 2024-07-27 14:35:12 +08:00
zzyyyl
54c84d4322 chore: generate_mask_range 增加用于比较两图的函数 2024-07-27 14:35:04 +08:00
uye
abd064150a Release v5.5.0-beta.2 (#9938) 2024-07-27 13:58:43 +08:00
github-actions[bot]
1820aa9120 docs: Auto Update Changelogs of v5.5.0-beta.2 (#9939)
* docs: Auto Generate Changelog of Release v5.5.0-beta.2

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-07-27 05:58:03 +00:00
zzyyyl
f36173fa45 fix: 修复萨卡兹肉鸽去伪存真印象重建后卡死
fix #9936
2024-07-27 13:18:02 +08:00
Hao Guan
1d34d82cd1 fix: macOS CI Xcode版本 2024-07-27 10:14:15 +08:00
Constrat
456319cffd fix: top operator unrecognized recruitment 2024-07-26 22:45:10 +01:00
github-actions[bot]
f3c5e34d16 chore: Auto Templates Optimization
[skip changelog]
2024-07-26 20:34:34 +00:00
Constrat
871d88ffe1 debug: add testing image 2024-07-26 22:33:57 +02:00
Constrat
b31728b9c4 debug: remove testing image 2024-07-26 22:30:28 +02:00
Constrat
7872ae0fae perf: prvent double consecutive runs 2024-07-26 22:29:43 +02:00
github-actions[bot]
4c688fad87 chore: Auto Templates Optimization
[skip changelog]
2024-07-26 20:17:06 +00:00
Constrat
34ba4248a4 fix: wrong variable format
i'm dumb
2024-07-26 22:16:13 +02:00
Constrat
fb2fe90953 debug: add testing image 2024-07-26 22:11:14 +02:00
Constrat
bf6256573a style: change name action 2024-07-26 22:10:40 +02:00
Constrat
8dc21b9b52 ci(fix): install oxipng 2024-07-26 22:08:30 +02:00
Constrat
513ddd4f2b debug: remove testing png 2024-07-26 21:59:48 +02:00
zzyyyl
1e8b218970 debug: 更新 DebugTask 方便模板匹配测试 2024-07-27 03:32:11 +08:00
zzyyyl
6a03d27714 fix: 修复 StrategyChange 时 next 丢失的问题
悲报: zzyyyl 的黑魔法成绩不及格
2024-07-27 02:24:13 +08:00
SherkeyXD
1a2619419f chore: fix docsearch base 2024-07-27 02:05:38 +08:00
Constrat
873ea0e4bf test: auto optimize-templates.yml 2024-07-26 20:05:10 +02:00
Constrat
8447cd1c28 chore: add requirements.txt for optimize-templates.py 2024-07-26 18:54:09 +01:00
Constrat
06ea04e31e ci: optimize templates perf and fixes 2024-07-26 18:53:24 +01:00
Constrat
e692059267 Revert "ci: optimize templates perf and fixes" (#9929) 2024-07-26 18:49:49 +01:00
Constrat
78c0a0cbaf ci: optimize templates perf and fixes (#9928) 2024-07-26 18:47:12 +01:00
Horror Proton
dfa200a83b fix: fix zip filename encoding issue
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9840
2024-07-27 01:31:20 +08:00
uye
ad4f69e349 Release v5.5.0-beta.2 (#9922) 2024-07-27 01:01:02 +08:00
SherkeyXD
c2b980317a chore: rollback @vuepress/plugin-docsearch version
close #9835
2024-07-27 00:51:34 +08:00
uye
98d6d21020 chore: 图片改为弹窗显示 2024-07-27 00:40:25 +08:00
Constrat
f5822e645d feat: first implementation (#9927) 2024-07-26 16:41:32 +01:00
zzyyyl
f2f093aa87 perf: oxipng 2024-07-26 22:50:42 +08:00
github-actions[bot]
2208b5252d docs: Auto Update Changelogs of v5.5.0-beta.2 (#9926)
* docs: Auto Generate Changelog of Release v5.5.0-beta.2

* docs: update

* docs: update

* docs: update

* docs: Update CHANGELOG.md

---------

Co-authored-by: status102 <status102@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-07-26 22:47:55 +08:00
uye
1d59efdce2 fix: 完成制造通知弹出时,无法正确识别到所有宿舍
fix #7877
2024-07-26 22:44:34 +08:00
zzyyyl
43cecbbedd fix: 尝试修复萨卡兹肉鸽刷新节点次数耗尽卡死的问题
感觉是前置延迟短了,动画还没放完,灰度值偏高导致的,但是这个东西没匹配上也不好加截图,就先靠脑测了)

fix #9924
2024-07-26 19:46:30 +08:00
zzyyyl
1d63f39c1f fix: 尝试修复萨卡兹肉鸽刷新节点次数耗尽卡死的问题
link to #9924
2024-07-26 19:26:08 +08:00
github-actions[bot]
848c5331cf chore: Auto Update Game Resources - 2024-07-26
[skip changelog]
2024-07-26 11:24:35 +00:00
zzyyyl
29a2448421 perf(debug): 简单处理 DEBUG 的时候 OCR 很卡的问题 2024-07-26 19:20:45 +08:00
zzyyyl
3a4fbd0193 feat: 印象加深后卡住时截图 2024-07-26 19:15:31 +08:00
Constrat
73361fdc5b ci(refactor): cleaned up comments + alias 2024-07-26 11:21:43 +02:00
Sherkey
bc3ad67a02 style: prettier 的宽度上限设置为 120 (#9918)
* style: prettier 的宽度上限设置为 120

* 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-07-26 15:34:52 +08:00
zzyyyl
0f7a8c5246 perf: 使用 oxipng 优化模板图片 2024-07-26 15:30:21 +08:00
Constrat
893c37e5d0 ci(style): git diff output formatting 2024-07-26 00:27:32 +02:00
Constrat
f30b1899cc feat: optimize templates in resource updater 2024-07-26 00:16:57 +02:00
Constrat
fef326b367 style: removed empty lines
[skip ci][skip changelog]
2024-07-25 23:27:08 +02:00
Constrat
91a33a9f5b fix(ci): prettified res-update workflow 2024-07-25 23:21:10 +02:00
github-actions[bot]
7fd1c8941c chore: Auto Update Game Resources - 2024-07-25
[skip changelog]
2024-07-25 21:13:59 +00:00
Constrat
951f7835a7 ci(fix): use github-actions[bot] credentials 2024-07-25 23:12:07 +02:00
Constrat
b310735a34 ci(refactor): cleanup + edit to allow resource updater
[skip changelog]
2024-07-25 23:09:40 +02:00
Constrat
473ddc24e6 ci: trying to use github-actions[bot] as committer for res updt
[skip changelog]
2024-07-25 23:06:44 +02:00
Constrat
bd98173e01 fix: res-updt bypasses branch protection 2024-07-25 23:03:08 +02:00
zzyyyl
7cca2b2357 chore: Auto Update Game Resources - 2024-07-25
[skip changelog]
2024-07-25 19:21:39 +00:00
zzyyyl
02a397c749 chore: GenerateMaskRange 可以直接展示 mask_range 掩码后的图片 2024-07-26 01:34:12 +08:00
zzyyyl
c69e212be9 fix: 修复印象加深后卡住的问题
fix #9890
2024-07-26 01:34:04 +08:00
zzyyyl
598c1fa541 fix: 修复萨卡兹肉鸽刷新节点次数耗尽卡死的问题
fix #9907
2024-07-26 01:08:05 +08:00
Sherkey
34540de430 feat: 肉鸽五层 BOSS 前暂停功能 (#9801)
* feat: 肉鸽五层 BOSS 前暂停功能

Co-authored-by: Lancarus <34369130+Lancarus@users.noreply.github.com>
Co-authored-by: DavidWang19 <dwang0340@gmail.com>
2024-07-25 11:50:45 +01:00
HY
5cf99f870a chore: 繁中服「綠野幻夢」復刻活動導航 (#9913) 2024-07-25 10:36:38 +01:00
Rbqwow
fa9159fde7 chore: do not close enhancement issue 2024-07-25 14:08:22 +08:00
zzyyyl
ff9ba449dd chore: 更新 mask_range 生成工具 2024-07-25 12:37:01 +08:00
status102
c3e11e75a0 perf: 简化RoguelikeTask set_params
[skip changelog]
2024-07-25 09:59:20 +08:00
status102
de10aeb983 perf: 简化RoguelikeTask set_params 2024-07-25 09:25:45 +08:00
DavidWang19
2e7aa2d1f0 fix: 调整主界面多个掉落物识别阈值 2024-07-24 12:05:51 +01:00
Constrat
99d16f91bc fix: 修复萨卡兹肉鸽的自动战斗文件 拆东补西.json 的语法问题 (#9903)
修复 #9901 的问题
2024-07-24 08:31:29 +01:00
SST-03
4fed9fd491 fix: 修复 拆东补西.json 的语法问题 2024-07-24 15:20:25 +08:00
AnnAngela
94c9ea2cfb chore: dont close stale issue too late (#9899) 2024-07-24 00:40:45 +00:00
DavidWang19
f212344585 fix: 调整刷新按钮阈值 2024-07-23 19:20:30 +01:00
Constrat
dae1c9b541 rft: Check if only sorted resource updater
[skip changelog]
2024-07-23 19:46:18 +02:00
Constrat
928224f73b chore(ci): removed cancel steps as not needed
[skip changelog]
2024-07-23 18:11:38 +02:00
Constrat
6eb02d9045 revert: reverting resource updater workflow to before e158b73
[skip changelog]
(No test changes)
2024-07-23 17:07:09 +02:00
Constrat
9ffdb6fc42 fix: trying to fix missing permissions for R.U.
[skip changelog]
2024-07-23 16:56:38 +02:00
zzyyyl
acc6520f28 chore: Auto Update Game Resources - 2024-07-23
[skip changelog]
2024-07-23 14:49:19 +00:00
Constrat
9f6a642349 revert: unrevert for ResourceUpdater
[skip changelog]
issue seems to be related to the ruleset, instead of the workflow itself
2024-07-23 16:34:46 +02:00
status102
87dee5c8ad perf: 修改 set_params 以避免语义不一致 2024-07-23 22:30:51 +08:00
Constrat
3b863c176e revert: to misteoworkflow for R.U.
[skip changelog]
2024-07-23 16:26:28 +02:00
Constrat
dec6961d9c revert: 3909a037fd for Resource Updater
[skip changelog]
2024-07-23 16:23:16 +02:00
Weiyou Wang
978dde365a refactor: 肉鸽坍缩范式插件代码整理 (#9833) 2024-07-23 22:48:37 +10:00
status102
be8d124211 fix: 肉鸽插件set_params补充 (#9893) 2024-07-23 12:35:54 +00:00
status102
e48fe00d6c perf: 迁移肉鸽投资参数设置 2024-07-23 19:38:21 +08:00
zzyyyl
cdf5847bc9 feat: 禁止插件修改自身 enable 2024-07-23 19:26:48 +08:00
status102
88aac0099a fix: set_params语义一致化 2024-07-23 18:29:50 +08:00
zzyyyl
9bfdec238c fix: compile error 2024-07-23 18:22:56 +08:00
zzyyyl
e299977244 fix: compile error 2024-07-23 18:21:32 +08:00
zzyyyl
a6f991a6e5 fix: override 2024-07-23 18:13:24 +08:00
zzyyyl
755d928123 fix: compile error 2024-07-23 18:02:39 +08:00
Weiyou Wang
50cb0ed9f7 feat: MultiTemplMatcher (#9850)
* feat: MultiMatcher

* fix: 修正对threshold的处理
2024-07-23 17:55:56 +08:00
zzyyyl
9b58ede500 feat: 使用 set_params + set_enable 管理插件而不是延迟注册插件
feat: 将部分逻辑从 RoguelikeTask 移至对应的 set_params
2024-07-23 17:52:45 +08:00
zzyyyl
d4fc9e2531 feat: 将 config 逻辑从 RoguelikeTask::set_params 移至 RoguelikeConfig::set_params 2024-07-23 17:49:22 +08:00
zzyyyl
42b272398a feat: 将部分逻辑从 RoguelikeTask 移至对应插件的 set_params 2024-07-23 17:49:22 +08:00
zzyyyl
b0076809aa feat: 使用 set_params + set_enable 管理插件而不是延迟注册插件 2024-07-23 17:49:13 +08:00
status102
20ddfedfb7 fix: 移除find_plugin
[skip changelog]
2024-07-23 17:41:59 +08:00
status102
c89b63b78e revert: 移除find_plugin
@zzyyyl

link to 7ee9415863
2024-07-23 17:19:37 +08:00
dantmnf
09830dde00 feat: win32 console-aware debug logger
[skip changelog]
2024-07-23 16:58:18 +08:00
zzyyyl
18cd3a9495 Revert "feat!: 允许插件Verify期间自变更enable,以禁用非预期的启用 (#9876)"
This reverts commit ddee6b8aea, reversing
changes made to d4163b10b3.
2024-07-23 16:22:46 +08:00
status102
d3a4696e2a perf: 非萨米肉鸽时禁用仅萨米用插件 (#9888)
* perf: 非萨米肉鸽时禁用仅萨米用插件

* style: format

* Revert 0b2140a7ad
2024-07-23 07:18:27 +00:00
AnnAngela
21429db907 chore: dont close issue too early (#9887) 2024-07-23 07:17:10 +00:00
zzyyyl
e158b73337 ci: res-update-game push-action using MISTEOWORKFLOW to bypass required status checks
[skip changelog]
2024-07-23 13:41:40 +08:00
Lancarus
51153ce76d fix: 合成思绪出现藏品二选一时卡住 (#9883) 2024-07-23 12:51:41 +08:00
Lancarus
e9fdeaf476 fix: 增加肉鸽分队存储及判断,避免蓝图队影响其他肉鸽存钱 2024-07-23 12:13:51 +08:00
status102
478c493589 perf: 复用RoguelikeControl停止流程 2024-07-23 12:13:50 +08:00
status102
2712b9cf48 perf: find_plugin 追加 const 修饰 2024-07-23 12:13:50 +08:00
Sherkey
68039317be feat: 隐藏托盘图标选项 (#9819)
close #9464
2024-07-23 12:13:38 +08:00
status102
9def4fd479 fix: 更换了任务 2024-07-23 10:37:13 +08:00
status102
e8d4a64e14 perf: WpfGui添加对坍缩范式插件callback的nullable check (#9848) 2024-07-23 10:08:32 +08:00
status102
c97abfdeb0 perf: Mumu截图增强设置增加测试按钮 2024-07-23 09:35:40 +08:00
status102
713dd2b5a2 perf: 非萨米肉鸽时禁用仅萨米用插件 (#9880) 2024-07-23 09:10:23 +08:00
status102
ddee6b8aea feat!: 允许插件Verify期间自变更enable,以禁用非预期的启用 (#9876) 2024-07-23 09:07:26 +08:00
AnnAngela
d4163b10b3 ci: 让我也康康今天又更新了啥 (#9879) 2024-07-23 00:53:42 +00:00
status102
b6c3dd98a5 style: format 2024-07-23 08:23:39 +08:00
status102
0b2140a7ad perf: 非萨米肉鸽时禁用仅萨米用插件 2024-07-23 08:23:25 +08:00
status102
a8657429be Revert "feat: 肉鸽插件添加设置参数功能,设置失败的插件会被自动disable (#9862)"
This reverts commit 5aaaae758f.
2024-07-23 08:06:38 +08:00
status102
371a54c2f2 feat!: 允许插件Verify期间自变更enable,以禁用非预期的启用 2024-07-23 07:57:34 +08:00
status102
5b6e54de14 perf: 存款满后禁用肉鸽投资插件 2024-07-23 07:57:33 +08:00
Constrat
f704533086 fix: pre-commit-ci error
[skip changelog]
2024-07-22 22:16:32 +02:00
Constrat
e2de008ef6 perf: increase operations to 800
[skip changelog]
2024-07-22 22:11:53 +02:00
Constrat
ace0dbcad7 chore: change cron to allow more frequent checks, to lower the issue workload temporarily
[skip changelog]
2024-07-22 22:11:15 +02:00
Constrat
254d8a21a8 fix: workaround for cache not being saved stale.yml + bump in operations
[skip changelog]
2024-07-22 21:47:42 +02:00
Constrat
2d08f5f87f perf: reduce operations per run
[skip changelog]
2024-07-22 21:36:17 +02:00
Constrat
13aa6286d1 style: stale message change
[skip changelog]
2024-07-22 21:30:27 +02:00
Constrat
55bca1b173 perf: increase even more operations per run stale.yml
[skip changelog]
2024-07-22 21:03:04 +02:00
Constrat
26a1ee9eec ci: remove debug mode
[skip changelog]
2024-07-22 20:58:39 +02:00
Constrat
7b0b0f6d5b ci: debug and non-long term options for stale.yml
[skip changelog]
2024-07-22 20:58:20 +02:00
Constrat
6df0ee07f2 style: ci name change
[skip changelog]
2024-07-22 20:52:49 +02:00
Constrat
69dde6100c chore: Manual Resource Update 2024-07-22 20:48:53 +02:00
Constrat
a2f82fa1b4 feat: close inactive issues (#9866)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
2024-07-22 18:27:48 +00:00
Lancarus
bad3639340 perf: 优化萨卡兹肉鸽部分策略 (#9871) 2024-07-23 01:45:32 +08:00
Saratoga
5526f29113 feat: 添加并修改三层boss肉鸽作业 (#9868) 2024-07-23 01:41:27 +08:00
Weiyou Wang
5aaaae758f feat: 肉鸽插件添加设置参数功能,设置失败的插件会被自动disable (#9862)
* feat: 肉鸽插件添加设置参数功能,设置失败的插件会被自动移除

* feat: 肉鸽插件设置参数示例——坍缩范式插件

* refactor: 保留 virtual 关键字
2024-07-23 03:09:29 +10:00
CASUUU
1d057ac63d perf: 萨卡兹肉鸽藏品排序.json (#9761) 2024-07-23 00:41:53 +08:00
zzyyyl
75410a1913 feat: 插件 verify 前先判断 enable 2024-07-22 22:37:08 +08:00
zzyyyl
5e9501ba8e feat!: 增加图像匹配算法 RGBCount, HSVCount (#9795)
新增基于找色的图像匹配算法(

- RGBCount
   先将待匹配区域和模板图片依据 maskRange 二值化,以 F1-score 为指标计算 RGB 颜色空间内的相似度
- HSVCount
   类似 RGBCount,颜色空间换为 HSV
2024-07-22 22:31:10 +08:00
Constrat
272fd395e0 fix: ci dependabot directory
[skip changelog]
2024-07-22 16:11:26 +02:00
Constrat
ea5f5e6b3a ci: limit dependabot only to .github
[skip changelog]
2024-07-22 16:01:32 +02:00
Constrat
d5aa510fc6 chore: dependabot back to default
[skip changelo]
2024-07-22 15:58:34 +02:00
dependabot[bot]
01a864650a ci: bump github actions versions (#9859)
Updates `softprops/action-gh-release` from 1 to 2
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2)

Updates `peter-evans/create-pull-request` from 5 to 6
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v5...v6)

Updates `kentaro-m/auto-assign-action` from 1.2.5 to 2.0.0
- [Release notes](https://github.com/kentaro-m/auto-assign-action/releases)
- [Commits](https://github.com/kentaro-m/auto-assign-action/compare/v1.2.5...v2.0.0)

Updates `andymckay/cancel-action` from 0.3 to 0.5
- [Release notes](https://github.com/andymckay/cancel-action/releases)
- [Commits](https://github.com/andymckay/cancel-action/compare/0.3...0.5)


Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-22 14:41:37 +01:00
Constrat
774b12dc96 chore: re evaluate dependabot
[skip changelog]
2024-07-22 15:27:50 +02:00
Constrat
53804bbbbe ci: dependabot change prefix
[skip changelog]
2024-07-22 15:22:12 +02:00
Constrat
91500aca09 ci: dependabot gh actions automation (#9836) 2024-07-22 14:16:14 +01:00
zzyyyl
a4444dc7e0 feat: 增加特定情况下检查到 roi 为全屏的警告 (#9674) 2024-07-22 20:09:29 +08:00
Saratoga
6ec07666d8 feat: 添加几个肉鸽作业 (#9854)
* 更新肉鸽抓人逻辑

* 上传几个三层boss的作业
2024-07-22 19:59:05 +08:00
SherkeyXD
ab8a1f1782 docs: 修复 docsearch 路径错误的问题 2024-07-22 19:53:21 +08:00
zzyyyl
4c428607fb chore: 避免 ci 出红叉
原来之前不给 push 加 trigger 是因为 cancelled 了也算不通过吗(

[skip changelog]
2024-07-22 18:15:58 +08:00
zzyyyl
b8a51ba171 chore: update-game-resources 时再输出 user 信息 2024-07-22 18:13:37 +08:00
zzyyyl
3909a037fd chore: 优化资源更新流程 (#9635)
chore: 更新 res-update-game

- 开始前打印 actor 与 token 持有者信息
- committer 为 token 持有者
- 更准确的 email
- 修改 ResourceUpdater 和 res-update-game.yml 时也触发流程
2024-07-22 18:07:39 +08:00
status102
063fc498bd perf: 拆分肉鸽数据 (#9841) 2024-07-22 09:45:39 +00:00
pre-commit-ci[bot]
5e9655b543 fix: 修复隐式全屏 roi 相关警告
* fix: 修复 DropsFlag 相关 task 的 roi 为全屏的问题

* perf: 统一肉鸽 Stage 类任务 baseTask 继承到对应 theme

* fix: 修复 Sami@Roguelike@StageBoonsAI6 的 roi 为全屏的问题

fix #9557
2024-07-22 17:29:43 +08:00
zzyyyl
cb4d9c43e3 feat: 增加特定情况下检查到 roi 为全屏的警告
perf: 对隐式全屏 roi 检测加点注释
2024-07-22 17:18:57 +08:00
Weiyou Wang
9342969191 refactor: WpfGui添加对坍缩范式插件callback的nullable check 2024-07-22 18:39:13 +10:00
status102
7ee9415863 feat: AbstractTask新增附加已有插件、插件查找 (#9816)
* feat: 新增插件查找

* feat: AbstractTask增加附加已有插件

* perf: attach -> append
2024-07-22 16:28:33 +08:00
Lancarus
8d75c42adc fix: 肉鸽卡在干员技能面板 (#9843) 2024-07-22 15:01:11 +08:00
zzyyyl
3373651ed1 docs: 更新 task-schema 文档中对 method 的描述 2024-07-22 14:50:00 +08:00
zzyyyl
f1cf3d0710 feat: HSVCount 的例子 2024-07-22 14:43:43 +08:00
zzyyyl
1c116be819 feat!: 增加图像匹配算法 RGBCount, HSVCount
feat: 使用 F1-score 作为返回结果而不是 Recall

perf: 简化 F1-score 计算
2024-07-22 14:43:35 +08:00
zzyyyl
5e378259ce feat!: mask_range 支持彩色掩码 (#9818) 2024-07-22 14:42:10 +08:00
Alisa
a8a43c5789 i18n: Translations update from MAA Weblate (#9845)
* i18n: Translated using Weblate (Japanese)

Currently translated at 99.0% (728 of 735 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/ja/

* i18n: Translated using Weblate (Korean)

Currently translated at 99.3% (730 of 735 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/ko/

* i18n: Translated using Weblate (Chinese (Traditional))

Currently translated at 99.7% (733 of 735 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/zh_Hant/

---------

Co-authored-by: Anonymous <noreply@weblate.org>
2024-07-22 14:41:21 +08:00
zzyyyl
f95a2dd39e feat: 删除 HashTaskInfo 相关 (#9724) 2024-07-22 14:39:30 +08:00
zzyyyl
b3c2b871ea chore: clang-format 格式修改 (#9586)
- 运算符后分割;
- 逗号不放行首;
- 行字符限制重新设回 120.
2024-07-22 14:24:14 +08:00
zzyyyl
5aaa208dee docs: 更新 task-schema 文档中对 maskRange 的描述 2024-07-22 13:12:18 +08:00
zzyyyl
6bf79144ac chore: 新增一个工具根据模板中的重要颜色生成 mask_range 2024-07-22 13:12:18 +08:00
zzyyyl
1573af9f54 feat: mask_range 支持彩色掩码 2024-07-22 13:12:10 +08:00
status102
43e5e9b6bd fix: 肉鸽高级设置-投资模式启用购物选项说明补充:进入2层 2024-07-22 12:01:01 +08:00
status102
5ca253b51d perf: 修改开始战斗时的理智药输出分隔符 2024-07-22 12:01:01 +08:00
uye
85f1a719a3 fix: 未开启自定义基建可能遇到的除数为0 2024-07-22 10:49:08 +08:00
SherkeyXD
423a37bfbb fix: 修复基建排版表数量为为0时引起的崩溃问题 2024-07-22 10:41:03 +08:00
status102
5b1d8b2805 perf: 简化肉鸽结算输出
[skip changelog]
2024-07-22 10:31:35 +08:00
status102
fc74d96efc style: format
@Alan-Charred
2024-07-22 10:31:05 +08:00
status102
b6e347d15b perf: 迁移部分肉鸽数据 2024-07-22 10:26:20 +08:00
status102
c6ad3c756a perf: 减少肉鸽Config拷贝 2024-07-22 10:06:01 +08:00
status102
9d82cb8fb5 feat: 肉鸽插件增加每局重置,以免全部堆积到Config (#9828)
* feat: 肉鸽插件增加每局重置,以免全部堆积到Config
2024-07-22 10:01:51 +08:00
status102
50ddefa763 perf: 简化肉鸽Config和部分设置 (#9822) 2024-07-22 08:21:54 +08:00
Constrat
47a6424c26 style: tweaks 2024-07-21 22:50:47 +02:00
Hao Guan
b842261f20 feat: Mac GUI 关闭游戏任务 2024-07-22 04:32:21 +08:00
Hao Guan
1b4092188d feat: Mac GUI 肉鸽凹精二和生息演算设置 2024-07-22 02:54:58 +08:00
Rbqwow
77c0a1d837 docs: 添加 adb-lite 说明 2024-07-22 01:40:41 +08:00
XBB
b28497f1a4 fix: 使在隐藏到托盘时隐藏托盘图标不可用 2024-07-21 23:40:24 +08:00
XBB
cc0a959013 fix: 使用Visibility控制隐藏到托盘选项 2024-07-21 23:40:24 +08:00
XBB
396ba7043a feat: 隐藏托盘图标选项 2024-07-21 23:40:24 +08:00
SherkeyXD
71d85cf6d0 ci: 完善pr-checker的提示 2024-07-21 23:38:57 +08:00
Sherkey
37bef043a3 fix: 修正文档网页右上角search组件本地化显示问题 (#9804)
当前: 

![now](https://i.postimg.cc/mrcRRpJF/2024-07-21-013337.png)

修正后:

![zh](https://i.postimg.cc/wj4HCYfp/2024-07-21-012436.png)

![en](https://i.postimg.cc/6pptbphc/2024-07-21-012448.png)
2024-07-21 23:37:53 +08:00
Hao Guan
4551b82364 perf: macOS编译脚本支持ccache 2024-07-21 23:18:45 +08:00
uye
a57d8cf46d fix: 修复更换不同班次数的基建排班表可能遇到的数组越界
fix #9779
2024-07-21 22:48:45 +08:00
Hao Guan
140aec0cbe fix: 调整iOS萨卡兹肉鸽节点刷新模板识别阈值 2024-07-21 22:33:44 +08:00
Hao Guan
184aeed007 chore: 优化macOS编译脚本 2024-07-21 22:32:49 +08:00
status102
485f1f7e0a fix: 错误获取到萨米塌缩插件 (#9827) 2024-07-21 21:54:21 +08:00
status102
e467f9007e fix: 错误获取到萨米塌缩插件 2024-07-21 21:48:57 +08:00
zzyyyl
31d66f722c docs: 更新 task-schema.md 文档 2024-07-21 20:48:41 +08:00
zzyyyl
0bcfc2eadc docs: 删除 maa_task_schema 中 hash 任务相关 2024-07-21 20:48:07 +08:00
zzyyyl
334a2e5f70 feat: 删除 HashTaskInfo 相关 2024-07-21 20:33:55 +08:00
Constrat
f79da224ae feat: numbers only in TimerSettings 2024-07-21 14:25:38 +02:00
status102
21e3728b99 fix: unchanged var name 2024-07-21 17:00:11 +08:00
status102
478df7d5c0 perf: 迁移部分参数设置 2024-07-21 16:51:53 +08:00
status102
206829dfa6 perf: 简化期望获得塌缩设置 2024-07-21 16:49:09 +08:00
status102
0a38d42985 perf: 移除不必要函数 2024-07-21 16:29:52 +08:00
status102
863478d0e0 fix: 修复肉鸽插件重复注册 (#9817) 2024-07-21 16:12:55 +08:00
zzyyyl
d5f186a897 ci: markdown-checker exclude https://ark.yituliu.cn/ 2024-07-21 16:01:51 +08:00
status102
041f00e07d fix: 使用asst::ranges替代std::ranges
@Alan-Charred
2024-07-21 15:53:34 +08:00
status102
2ebaa0a978 fix: 修复肉鸽插件重复注册 2024-07-21 15:46:18 +08:00
DavidWang19
e5c6bc5191 fix: 更改开局选上一局奖励的顺序 2024-07-21 07:14:23 +01:00
DavidWang19
8ae3d9a952 fix: 修复拿取掉落物时卡死的问题 2024-07-21 07:00:54 +01:00
DavidWang19
0ed11717a7 fix: 修复卡死在先行一步/驮兽归队等问题 2024-07-21 06:35:01 +01:00
DavidWang19
9c41379645 fix: 修复离开不期而遇后点进负荷界面的问题 2024-07-21 06:19:04 +01:00
zzyyyl
ae53e6ac63 perf: 优化模板图片 2024-07-21 13:02:23 +08:00
zzyyyl
ac432c841c perf: 避免空 method 警告
set_method 只允许一种方法;增加多处 set_method
2024-07-21 12:44:47 +08:00
Constrat
9e1165243c chore: Auto Update Game Resources - 2024-07-21
[skip changelog]
2024-07-21 04:25:44 +00:00
DavidWang19
2bfbc1b8c2 fix: 修复当蓝图队为第一个分队时无法识别的问题 2024-07-21 05:11:10 +01:00
Constrat
be853ba12d chore: Auto Update Game Resources - 2024-07-21
[skip changelog]
2024-07-21 04:01:55 +00:00
DavidWang19
2cbc61b085 fix: 修复紧急作战刷新次数达到上限后卡死的问题 2024-07-21 04:50:24 +01:00
Lancarus
984f09872a feat: 投资模式增加非开局干员直接招募第一位 (#9803) 2024-07-21 11:44:21 +08:00
HX3N
45624a50a5 chore: tweak KR docs
[skip changelog]
2024-07-21 05:53:48 +09:00
HX3N
0e172089a5 docs: KR 添加 MAA 格式化要求说明
Reflect changes from 879d136fe7
2024-07-21 05:16:26 +09:00
Rbqwow
ee910d176d fix: issue-bot 错误匹配 #9771
[skip changelog]
2024-07-21 03:30:50 +08:00
Constrat
fd6f70f5e0 chore: Auto Update Game Resources - 2024-07-20
[skip changelog]
2024-07-20 19:02:15 +00:00
SevMeowple
bbee68d4f8 fix: 修正右上角search组件本地化显示问题 2024-07-21 02:21:39 +08:00
SherkeyXD
879d136fe7 docs: 添加 MAA 格式化要求说明 2024-07-21 01:46:17 +08:00
Constrat
184d26cad2 chore: Auto Update Game Resources - 2024-07-20
[skip changelog]
2024-07-20 12:02:13 +00:00
Lancarus
a1bd49951d feat: 萨卡兹肉鸽自动印象重建 (#9789) 2024-07-20 19:56:53 +08:00
Constrat
6eec5cbaf2 chore: Auto Update Game Resources - 2024-07-20
[skip changelog]
2024-07-20 11:41:33 +00:00
Lancarus
01ca06d6e6 feat: 萨卡兹去伪存真节点尝试合成思绪 (#9792)
* feat: 萨卡兹去伪存真尝试合成

* 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>
2024-07-20 19:34:13 +08:00
Constrat
ddbac35c1b fix(ci): switch downloading artifact order 2024-07-20 13:06:24 +02:00
Constrat
b1dd6114fc chore: Auto Update Game Resources - 2024-07-20
[skip changelog]
2024-07-20 10:26:05 +00:00
DavidWang19
0e1cf6d040 perf: 蓝图队速刷肉鸽 (#9773)
perf: 蓝图队速刷肉鸽

---------

Co-authored-by: Lancarus <34369130+Lancarus@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>
2024-07-20 11:19:01 +01:00
zzyyyl
f9543a890e fix: 修复 methods 为空时直接崩溃的问题 2024-07-20 18:09:54 +08:00
status102
e2f661edd7 fix: 扩大肉鸽投资检测阈值,减少识别错误 (#9787) 2024-07-20 16:59:47 +08:00
status102
d6a179ea43 perf: 移除意料外的等待 2024-07-20 16:48:27 +08:00
status102
ad3439be7a perf: 扩大投资中间图片匹配阈值 2024-07-20 16:40:56 +08:00
zzyyyl
72796f2799 Revert "fix: 修复多次设置参数时肉鸽插件重复注册 (#9786)"
This reverts commit 0b480c3f28, reversing
changes made to 8a450576bc.
2024-07-20 16:25:02 +08:00
zzyyyl
46b28d5df3 chore(issue-checker): 有 core 标签不打 ambiguous 2024-07-20 13:36:16 +08:00
zzyyyl
1736c93b09 fix: hsv 匹配时不要修改原图
cvtColor 传 const ref 居然会直接改,qwq
2024-07-20 13:27:30 +08:00
Rbqwow
b219e74d2b chore: issue-bot 增加关键词 (#9771)
添加 `module: core` `MuMu API` 标签
增加 `module: infrast` `module: others` `WpfGui` 的匹配关键词
2024-07-20 13:24:16 +08:00
status102
0b480c3f28 fix: 修复多次设置参数时肉鸽插件重复注册 (#9786) 2024-07-20 13:03:10 +08:00
zzyyyl
8a450576bc feat: 支持自定义 MatchTemplate 匹配方法 (#9785) 2024-07-20 12:57:03 +08:00
status102
e977734c7b fix: 修复多次设置参数时肉鸽插件重复注册 2024-07-20 12:39:22 +08:00
zzyyyl
d85f3c38f6 docs: 更新 task-schema 文档 2024-07-20 12:38:17 +08:00
zzyyyl
fd0037ba62 feat: 支持自定义 MatchTemplate 匹配方法 2024-07-20 12:36:02 +08:00
status102
7983519488 perf: 肉鸽Config部分返回改为const ref,移除部分变量 (#9741) 2024-07-20 12:23:08 +08:00
status102
0f0b7c9517 perf: 移除肉鸽投资部分变量,简化肉鸽Config 2024-07-20 12:20:41 +08:00
Constrat
f440353dc4 fix: typof5e8c68a60a34c29ed5792e527fdcadcc7b839da
[skip changelog]
2024-07-20 00:13:58 +02:00
Constrat
f5e8c68a60 style(ci): echo output
[skip changelog]
2024-07-20 00:09:35 +02:00
Constrat
8a5d5b7a7b perf: cache and targeting for prettier res update game (#9777) 2024-07-19 23:03:20 +01:00
zzyyyl
a684711df1 chore: avoid generate package.json & package-lock.json while res-update-game 2024-07-20 01:06:35 +08:00
zzyyyl
5f3730b767 chore: Auto Update Game Resources - 2024-07-19
[skip changelog]
2024-07-19 17:03:12 +00:00
zzyyyl
a330053500 chore: Add prettier in res-update-game 2024-07-20 01:00:54 +08:00
zzyyyl
189ee960f9 chore: Add prettier in res-update-game 2024-07-20 00:56:17 +08:00
zzyyyl
674b4e25d0 chore: 更新 OptimizeTemplates 使得图像优化的结果必定通过 pre-commit-ci 的检查 2024-07-20 00:51:47 +08:00
Constrat
7a758bce84 chore: Auto Update Game Resources - 2024-07-19
[skip changelog]
2024-07-19 16:43:00 +00:00
zzyyyl
f0bdccdf0d chore: Auto update by pre-commit hooks [skip changelog] 2024-07-20 00:29:10 +08:00
zzyyyl
8b4b1e9b43 chore: Auto update by pre-commit hooks [skip changelog] 2024-07-20 00:14:51 +08:00
Constrat
546bfc399c chore: Auto Update Game Resources - 2024-07-19
[skip changelog]
2024-07-19 16:11:50 +00:00
Constrat
2984b35da2 fix(ci): res-update typo
[skip changelog]
2024-07-19 18:10:37 +02:00
SherkeyXD
dbf47ce5ae perf: 优化不期而遇策略 2024-07-20 00:06:04 +08:00
uye
b60eea2def chore: 优化弹窗判断逻辑 2024-07-19 23:35:08 +08:00
SherkeyXD
74350ef1e0 feat: 添加思绪数据 2024-07-19 23:27:54 +08:00
晓丶梦丶仁
6b0631aa46 chore: 优化萨卡兹肉鸽公害部署策略 (#9766)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-19 16:10:53 +01:00
晓丶梦丶仁
3932290c2e fix: 修复萨卡兹肉鸽无法识别思绪阻滞 (#9767) 2024-07-19 16:10:24 +01:00
晓丶梦丶仁
a03d45e651 perf: 优化萨卡兹肉鸽安全检查部署策略 (#9759) 2024-07-19 22:50:28 +08:00
zzyyyl
b1092542d4 chore: Update tools/OptimizeTemplates/optimize_templates.json 2024-07-19 22:23:03 +08:00
zzyyyl
179a59651d perf: 修复 pre-commit ci 2024-07-19 22:16:01 +08:00
zzyyyl
ef347db33b chore: 删去 pre-commit-ci 中 oxipng 的 --alpha 参数
README 里写着说这个玩意不是严格意义的无损压缩
2024-07-19 22:05:10 +08:00
zzyyyl
20a17b2704 chore: Update .prettierignore 2024-07-19 21:58:38 +08:00
zzyyyl
df2f2a6783 chore: Update .prettierignore 2024-07-19 21:53:44 +08:00
zzyyyl
e3d63894b2 perf: 使用 oxipng 优化模板图片
oxipng -o max --fast -Z -s
2024-07-19 21:53:44 +08:00
zzyyyl
6aecdf86ff chore: OptimizeTemplates 脚本改为使用 oxipng
oxipng -o max --fast -Z -s
2024-07-19 21:53:25 +08:00
Lemon-miaow
797bf26c40 fix: 修复肉鸽主题选择的导航问题 (#9756)
fix: 肉鸽主题选择的导航问题 #9754
2024-07-19 20:20:50 +08:00
Constrat
d04410d1f6 chore(ci): bump setup-msbuild to v2
[skip changelog]
2024-07-19 11:19:42 +02:00
Manicsteiner
4ab5c5416b chore: bump maatouch to v1.1.0 (#9749) 2024-07-19 10:05:45 +01:00
晓丶梦丶仁
01d4a4b27b fix: 修复萨卡兹肉鸽卡死在思绪界面 (#9746)
* fix: 修复萨卡兹肉鸽卡死在思绪界面
2024-07-19 08:12:52 +01:00
Sherkey
4e58606a79 chore: 使用 pre-commit-ci 来格式化与压缩文件 (#9732)
close #9641

利用 [pre-commit-ci](https://pre-commit.ci/) 来对文件做强制性格式化/检查

当前状况:

| 格式 | Formatter |
| --- | --- |
| json | [prettier](https://github.com/pre-commit/mirrors-prettier) |
None |
| yaml | [prettier](https://github.com/pre-commit/mirrors-prettier) |
None |
| markdown |
[markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2) |

| 格式 | Compresser |
| --- | --- |
| png | [lychee](https://github.com/lycheeverse/lychee) |


计划中:
+ ~~对 markdown 使用 [lychee](https://github.com/lycheeverse/lychee),完全从
[markdown-checker](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/.github/workflows/markdown-checker.yml)
工作流迁移至 [pre-commit-ci](https://pre-commit.ci/)~~
  由于涉及到 GITHUB_TOKEN 问题,迁移可能性不大
2024-07-19 13:35:34 +08:00
HYY
9efc6efcdf perf: 优化萨卡兹肉鸽拆东补西部署策略 (#9744)
* perf: 优化萨卡兹肉鸽拆东补西部署策略
2024-07-19 06:16:47 +01:00
SherkeyXD
e657f1beb3 ci: update workflow name 2024-07-19 11:51:03 +08:00
pre-commit-ci[bot]
d84da5d01a chore: Auto update by pre-commit hooks [skip changelog] 2024-07-19 03:48:02 +00:00
SherkeyXD
686a929d1b chore: 压缩存储库中的所有图片
由于文件过多 CI 要跑很久,直接本地跑了
2024-07-19 11:46:44 +08:00
SherkeyXD
7ab2274d5e chore: 使用 pre-commit-ci 来格式化与压缩文件 2024-07-19 11:46:42 +08:00
status102
273fd28389 chore: 修正文件路径 2024-07-19 10:10:27 +08:00
status102
81b95a0979 perf: 肉鸽Config部分返回改为const ref
调整部分变量名缩短行长,避免换行

[skip changelog]
2024-07-19 09:51:57 +08:00
Hao Guan
994e78e787 feat: Mac GUI 支持萨卡兹肉鸽、开始/停止任务快捷键 2024-07-19 09:45:35 +08:00
晓丶梦丶仁
f48c1b9d21 perf: 优化萨卡兹肉鸽安全检查部署策略 (#9739)
perf: 优化安全检查部署策略
2024-07-19 02:40:36 +01:00
晓丶梦丶仁
9581f7cc94 fix: 萨卡兹肉鸽重复使用思绪导致卡死 (#9738)
* fix: 萨卡兹肉鸽重复使用思绪导致卡死
2024-07-19 02:39:51 +01:00
Constrat
ccd65ad9fa Revert "feat(ci): allow cache overwriting"
This reverts commit 01d7896831.
2024-07-19 01:14:38 +02:00
Constrat
01d7896831 feat(ci): allow cache overwriting 2024-07-19 00:57:50 +02:00
Constrat
9860e6163e chore(ci): bump microsoft/setup-msbuild to v2
[skip changelog]
2024-07-19 00:43:59 +02:00
Constrat
d4d8b2d6be perf(ci): parallelism for resource updater action (#9736) 2024-07-18 23:35:50 +01:00
Constrat
a7b6144435 chore(ci): remove unused include + style 2024-07-19 00:32:16 +02:00
Constrat
da5953ee91 perf(ci): limit resource cloning to depth 1
[skip changelog]
2024-07-18 22:11:26 +02:00
zayn7lie
e7a081c1a5 perf(tools): do the name and cropping direction feat with the CropRoi tool (#9679)
* feat: use relative path for image read and write

* feat: make sure cropping is available in any dirction
2024-07-18 20:58:16 +01:00
uye
d685ce0e89 Release v5.5.0-beta.1 (#9707) 2024-07-19 03:44:28 +08:00
github-actions[bot]
115eaff478 docs: Auto Update Changelogs of v5.5.0-beta.1 (#9735)
* docs: Auto Generate Changelog of Release v5.5.0-beta.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-07-19 03:44:06 +08:00
Manicsteiner
5efef16a2e chore: OD navigation (#9729) 2024-07-19 03:34:55 +08:00
DavidWang19
2ed2376763 fix: 尝试修复肉鸽第四层开头卡死的问题 2024-07-18 19:42:58 +01:00
Constrat
ee147b0083 chore: Auto Update Game Resources - 2024-07-18
[skip changelog]
2024-07-18 18:01:41 +00:00
zzyyyl
697ce6e33e fix: 修复 萨卡兹肉鸽 LastReward5 少前缀的问题 2024-07-19 01:45:26 +08:00
zzyyyl
dc5f1506f4 perf: 优化 Roguelike@SelectTheme 的写法
[skip changelog]
2024-07-19 01:45:26 +08:00
zzyyyl
8b41e0518d style: 补齐任务 template 的 .png
[skip changelog]
2024-07-19 01:45:13 +08:00
Constrat
39997e0b1c fix: EN WB navigation
[skip changelog]
2024-07-18 19:34:52 +02:00
晓丶梦丶仁
860c4ee3d9 fix: 萨卡兹肉鸽战斗结束领奖励时因思绪异常而卡死 (#9731)
* fix: 萨卡兹肉鸽战斗结束领奖励时因思绪异常而卡死

---------

Co-authored-by: DavidWang19 <dwang0340@gmail.com>
2024-07-18 18:10:16 +01:00
Constrat
31c54233c7 chore: Auto Update Game Resources - 2024-07-18
[skip changelog]
2024-07-18 17:01:43 +00:00
DavidWang19
0ea0f751fc fix: 增加猩红甬道的OcrReplace 2024-07-18 17:33:25 +01:00
Constrat
6c26417a28 perf(ci): Caching for ResourceUpdater 2024-07-18 18:15:13 +02:00
Constrat
1bc0a0df0c chore: Auto Update Game Resources - 2024-07-18
[skip changelog]
2024-07-18 15:26:52 +00:00
晓丶梦丶仁
415766bfe5 feat: 萨卡兹肉鸽混乱或阻滞时先使用一个再舍弃 (#9727)
* feat: 萨卡兹肉鸽混乱或阻滞时先使用一个再舍弃
2024-07-18 16:16:28 +01:00
DavidWang19
ae493cff4e fix: 修复肉鸽每层识别 2024-07-18 15:23:20 +01:00
晓丶梦丶仁
65bdd25c0d perf: 优化夺路而跳部署策略 (#9726) 2024-07-18 14:38:28 +01:00
DavidWang19
0fd393b9ed fix: 调整失与得阈值 2024-07-18 14:37:47 +01:00
Constrat
6c631b1015 chore: Auto Update Game Resources - 2024-07-18
[skip changelog]
2024-07-18 13:27:56 +00:00
DavidWang19
2e724180a9 fix: 修复萨卡兹肉鸽卡死在结算界面的问题 2024-07-18 14:20:41 +01:00
DavidWang19
806a97d5ae fix: 修复萨卡兹肉鸽商店不能刷新的问题 2024-07-18 13:11:32 +01:00
status102
10f2528453 perf: 扩大肉鸽商店投资roi (#9725)
[skip changelog]
2024-07-18 19:57:47 +08:00
Constrat
21b4d5f226 chore(tools): updated ps1 for resource update cloning
[skip changelog]
2024-07-18 13:48:06 +02:00
CASUUU
672e121e4a perf: update Sarkaz shopping.json (#9721)
* perf: update Sarkaz shopping.json

* style: 格式化json文件

---------

Co-authored-by: Sherkey <57581480+SherkeyXD@users.noreply.github.com>
2024-07-18 12:44:13 +01:00
DavidWang19
1b022b8afb fix: 修复肉鸽关卡通用策略无法识别费用的问题 2024-07-18 12:40:39 +01:00
status102
157a586524 perf: 自动战斗-战斗列表 批量导入关卡名正则优化 (#9723) 2024-07-18 19:14:58 +08:00
status102
02f326c053 perf: 自动战斗-战斗列表 批量导入关卡名正则优化 2024-07-18 18:30:09 +08:00
晓丶梦丶仁
e579462aa6 fix: 删除萨卡兹肉鸽开局负荷干员与舍弃思绪功能模板匹配文件名重复描述 (#9722) 2024-07-18 11:27:57 +01:00
DavidWang19
9c671bded9 fix: 调整树洞阈值 2024-07-18 10:30:27 +01:00
晓丶梦丶仁
f507bae326 fix: 萨卡兹肉鸽舍弃思绪识别位置修改 (#9717) 2024-07-18 09:31:15 +01:00
HX3N
cc4bffa716 docs: update glossary
and fix ja-jp.json typo (cause weblate error)
2024-07-18 17:25:53 +09:00
HX3N
70e9031ac9 chore: YostarKR WB navigation 2024-07-18 17:09:29 +09:00
Manicsteiner
1559f08173 chore: YostarJP WB navigation (#9715) 2024-07-18 15:58:46 +08:00
Constrat
7dad3879ad chore: Auto Update Game Resources - 2024-07-18
[skip changelog]
2024-07-18 07:24:57 +00:00
Constrat
7fd2a8783b chore: Auto Update Game Resources - 2024-07-18
[skip changelog]
2024-07-18 07:03:27 +00:00
Constrat
f45ccaeeb5 chore: Auto Update Game Resources - 2024-07-18
[skip changelog]
2024-07-18 06:44:19 +00:00
晓丶梦丶仁
4c67e80f91 feat: 萨卡兹肉鸽添加混乱与阻滞时舍弃思维功能 (#9711)
* feat: 添加混乱与阻滞时舍弃思维功能

* fix: 误触干员负荷界面
2024-07-18 07:37:33 +01:00
晓丶梦丶仁
fe0eca5a00 perf: 优化第一层作战策略黑名单 (#9710) 2024-07-18 07:23:15 +01:00
Lancarus
8e21efdcf5 perf: 适配新干员用法&调整萨卡兹肉鸽4星优先度 (#9713) 2024-07-18 14:16:27 +08:00
uye
4244e2ef88 chore: 添加弹窗提示 2024-07-18 13:56:34 +08:00
DavidWang19
10598b3e74 fix: 调整节点阈值 2024-07-18 05:29:29 +01:00
Constrat
f2f158ba67 feat: Global SSS#4 copilot adaptation 2024-07-17 22:55:27 +02:00
Constrat
ba8a2182db chore: Auto Update Game Resources - 2024-07-17
[skip changelog]
2024-07-17 20:03:17 +00:00
DavidWang19
0347e82a47 fix: 修复卡死在紧急安全检查的问题 2024-07-17 20:52:13 +01:00
Constrat
29e0c36c2d i18n: en tweaks
[skip changelog]
2024-07-17 21:38:17 +02:00
Constrat
fd7062773a i18n: more tweaks
[skip changelog]
2024-07-17 21:33:05 +02:00
Constrat
66dbfb6990 i18n: EN tweak
[skip changelog]
I swear webplate is more of a hassle then a help.
Correct translations are changed with wrong ones.
2024-07-17 21:32:21 +02:00
HY
a8a2299880 chore: 補充繁中服保全派駐#3 相關內容 (#9701) 2024-07-17 20:23:16 +01:00
Constrat
03c3991a1f chore(i18n): Sami no longer beta
[skip changelog] [no ci]
2024-07-17 21:21:45 +02:00
SherkeyXD
462440d784 style: 优化所有肉鸽文件的json排版 2024-07-18 00:34:43 +08:00
晓丶梦丶仁
6d6cb1c1d6 perf: 优化战斗策略应对天灾年代之刺 (#9702) 2024-07-17 16:38:42 +01:00
DavidWang19
6691f7c52c feat: 修复萨卡兹肉鸽卡死在战斗失败的问题 2024-07-17 16:23:48 +01:00
Constrat
47545a831c chore: Auto Update Game Resources - 2024-07-17
[skip changelog]
2024-07-17 15:03:26 +00:00
DavidWang19
5d56ff9cd2 feat: 适配萨卡兹肉鸽 (#9677)
* feat: 适配萨卡兹肉鸽

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
Co-authored-by: Lemon-miaow <61692393+Lemon-miaow@users.noreply.github.com>
Co-authored-by: Weiyou Wang <blspgzs@gmail.com>
2024-07-17 15:56:16 +01:00
Loong
f6b20861c5 ci: ignore more site (#9698) 2024-07-17 15:43:59 +01: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
Manicsteiner
75733e82ec chore: YostarJP ocr fix (#9692)
[skip changelog]
2024-07-17 12:07:03 +01:00
HX3N
62cee63841 chore: fix typo
[skip changelog]
2024-07-17 17:55:28 +09:00
HX3N
ff8aeceada chore: YostarKR add SSSBuffChoose 2024-07-17 17:49:05 +09:00
uye
e5666653ff style: 优化格式 2024-07-17 10:59:14 +08:00
uye
3c7d7ae100 fix: 修改材料名称注释 2024-07-17 10:23:35 +08:00
status102
9af863655d perf: 复用RoguelikeCollapsalParadigmTaskPlugin插件 (#9682) 2024-07-17 05:17:41 +10:00
Constrat
af0840aa45 fix: typo + skill usage for global
[skip changelog]
2024-07-16 19:51:01 +02:00
Constrat
09043136b6 chore: SSS#4 Automaton Arena 2024-07-16 19:47:13 +02:00
Loong
fd18e5704f chore: bump maa-cli to 0.4.8 and update documents (#9683)
* chore: bump maa-cli to 0.4.8 and update documents

* docs: 合并 cli 文档中的 README 和 intro

* docs: fix broken link to CLI guide

* docs: update order of CLI manual pages
2024-07-16 18:39:02 +01:00
Constrat
5b50a9864f chore: Global SSS#4 copilot
(Translation work in progress)
2024-07-16 18:54:29 +02:00
ManicSteiner
dba73b39a6 chore: update ja-jp.xaml 2024-07-16 17:36:58 +01:00
Constrat
c2196759d2 chore: Auto Update Game Resources - 2024-07-16
[skip changelog]
2024-07-16 11:03:44 +00:00
Rbqwow
db1c86f20d docs: 修复被随机排序破坏的超链接 2024-07-16 18:08:35 +08:00
Rbqwow
42db60eb88 docs: 谁动我缩进了
[skip changelog]
2024-07-16 17:49:32 +08:00
Constrat
911c6836ce chore: Auto Update Game Resources - 2024-07-16
[skip changelog]
2024-07-16 09:43:33 +00:00
Constrat
0d2186ab3b chore: Auto Update Game Resources - 2024-07-16
[skip changelog]
2024-07-16 08:28:53 +00:00
Weiyou Wang
8570023f94 refactor: 萨米肉鸽配置文件/插件单独文件夹 (#9651)
* refactor: sami roguelike plugins
2024-07-16 00:32:58 +01:00
Constrat
569800bf9c chore: Auto Update Game Resources - 2024-07-15
[skip changelog]
2024-07-15 20:03:36 +00:00
Rbqwow
f528f5c233 chore: 把mumu issue复选框改成正常人看的
[skip changelog]
2024-07-16 01:30:12 +08:00
Constrat
5aa16e1c71 fix: YostarEN SSS#4 buffs and branches 2024-07-15 18:26:06 +02:00
uye
2428a4610c chore: 优化更新策略 2024-07-15 16:35:01 +08:00
uye
5d8c0213a5 fix: test data 2024-07-15 14:52:55 +08:00
uye
f76461ac31 chore: 更新部分配置修改为全局配置 2024-07-15 14:50:37 +08:00
uye
a26909a019 chore: 优化版本更新 2024-07-15 12:56:01 +08:00
uye
906760e680 chore: make AskRestartToApplySettingsYoStarEN static 2024-07-15 12:56:00 +08:00
Weiyou Wang
5a4cffa02d refactor: 统一肉鸽模式介绍文字 (#9669) 2024-07-15 05:41:54 +01:00
status102
a6b2c03af3 docs: 修改Task协议文档,以符合cache默认值 2024-07-14 20:19:50 +08:00
SherkeyXD
312e0296bd chore: CHANGELOG中文档修改独立分类 2024-07-14 15:01:34 +08:00
Hao Guan
0a6e7c794b feat: Mac GUI 添加萨米肉鸽策略 2024-07-14 13:18:01 +08:00
Constrat
c60d5544e9 fix: tweak Reed Alter, Noir Corne alter regex 2024-07-13 23:21:47 +02:00
zzyyyl
d52b1e13ec perf: 保持 commit 树不分叉
[skip changelog] [skip ci]
2024-07-14 03:06:44 +08:00
SherkeyXD
05668443fc ci: 更新checkout至v4
这怎么还有个漏网之鱼)
2024-07-14 02:55:25 +08:00
SherkeyXD
b495a16a0a docs: Update Changelogs of v5.4.1 2024-07-14 02:32:32 +08:00
Rbqwow
c6fa1a7258 docs: fix 17f0172
[skip changelog]
2024-07-14 02:04:47 +08:00
Rbqwow
c3bb7c8d17 docs: 修改win7相关问题描述&更新运行库 2024-07-14 02:04:46 +08:00
Rbqwow
530e32f1a1 docs: 修复字体和评论区分类 2024-07-14 02:04:44 +08:00
Rbqwow
d8f364aa58 docs: fix a bad link 2024-07-14 02:04:43 +08:00
Rbqwow
40f33fd2f2 docs: make i18n warnings show only once 2024-07-14 02:04:42 +08:00
uye
c632054716 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-14 01:47:19 +08:00
Constrat
38c1f77326 feat: YoStarEN resolution warning on client switch (#9539)
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-07-14 01:47:17 +08:00
Constrat
f74004d954 fix(docs): MD022/blanks-around-headings
[skip changelog]
2024-07-13 17:11:26 +02:00
Constrat
7eaf4f2de3 docs: beautified example images
[skip changelog]
2024-07-13 17:07:47 +02:00
status102
73458d38ca fix: 自动战斗开始时移除召唤物类头像缓存,以避免跨局错误识别相似技能的召唤物 (#9649)
* fix: 自动战斗开始时移除召唤物类头像缓存,以避免跨局错误识别相似技能的召唤物

* chore: description
2024-07-13 22:53:04 +08:00
Constrat
e6eef5a03d docs(chore): updated EN example images for consistency
[skip changelog]
2024-07-13 16:38:36 +02:00
DavidWang19
e20f429ae4 feat: WPF Gui support for roguelike collapsal paradigm task plugin (#9648)
* feat: WPF Gui support for roguelike collapsal paradigm task plugin
2024-07-13 14:34:36 +01:00
Constrat
434d05bcd9 chore: Auto Update Game Resources - 2024-07-13
[skip changelog]
2024-07-13 12:47:41 +00:00
Constrat
1ea5104aee docs: updated EN example images
[skip changelog]
2024-07-13 14:46:36 +02:00
zzyyyl
e18a46acfa perf: 删除 tasks.json 冗余行 (#9645) 2024-07-13 20:36:43 +08:00
Constrat
fcf25b2a2a chore: link for yostaren resolution
[skip changelo]
2024-07-13 14:14:12 +02:00
Constrat
624cef1e8c docs: more EN localization tweaks
[no ci] [skip changelog]
2024-07-13 14:13:19 +02:00
Constrat
9b7f1e36e0 docs: localized symbols for en_US
[no ci] [skip changelog]
2024-07-13 12:59:57 +02:00
HY
6963037ba0 fix: 繁中服部分角色無法正確辨識 (#9647) 2024-07-13 10:19:46 +01:00
zzyyyl
2642053096 feat: 增加 BattlePauseCancel 重试上限 2024-07-13 12:05:11 +08:00
zzyyyl
1da98683f3 fix: 修复连接前同步参数时日志报错的问题 (#9644)
m_controller is not inited
2024-07-13 10:02:16 +08:00
zzyyyl
ed4c7c0a04 fix: roi out of bounds 2024-07-13 08:27:28 +08:00
zzyyyl
05870cc6c7 feat: cache 统一默认为 false (#9642)
workaround for #9639

之后删了
2024-07-13 08:10:00 +08:00
zzyyyl
7a66c5315d feat: 重新加入 tasks.json 的默认值检查 (#9583) 2024-07-13 08:08:06 +08:00
Alisa
68e56325b6 i18n: Translations update from MAA Weblate (#9640)
* i18n: Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (723 of 723 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/zh_Hans/

* i18n: Translated using Weblate (English (United States))

Currently translated at 99.1% (717 of 723 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/en_US/

* i18n: Translated using Weblate (Japanese)

Currently translated at 99.1% (717 of 723 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/ja/

* i18n: Translated using Weblate (Korean)

Currently translated at 99.4% (719 of 723 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/ko/

---------

Co-authored-by: Rbqwow <Rbqwow@users.noreply.weblate.maa-org.net>
2024-07-12 23:26:24 +08:00
zzyyyl
140db8e274 feat: 由ci生成的非正式/公测/内测版判断为调试版本并且不再检查更新 (#9632)
close #7712

Fix of #7719
2024-07-12 23:09:47 +08:00
zzyyyl
8c3643b691 feat: 隐式空 text 检测仅对无基任务生效 2024-07-12 20:40:19 +08:00
status102
cef5797419 perf: add log output (#9636) 2024-07-12 19:36:46 +08:00
Weiyou Wang
8535c53289 fix: 修复萨米肉鸽因插件注册顺序导致的无法运行问题 (#9633)
* fix: m_roguelike_register_plugins

* refactor: !(A == B) --> (A != B)
2024-07-12 17:57:09 +08:00
SherkeyXD
aa032b5790 feat: 为调试版本添加无需更新的提示 2024-07-12 12:33:39 +08:00
SherkeyXD
b49a495f78 feat: 由ci生成的非正式/公测/内测版判断为调试版本并且不再检查更新
Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
2024-07-12 12:33:31 +08:00
Constrat
970e45209a chore: Auto Update Game Resources - 2024-07-11
[skip changelog]
2024-07-11 17:26:57 +00:00
Constrat
edbf4aefda Style/gui consistency (#9567) 2024-07-11 18:26:33 +01:00
Weiyou Wang
87ea4fe357 fix: 修复坍缩范式插件导致的Gui和傀影/水月肉鸽初始化Bug (#9573)
* fix: call Clp_Pd plugin function directly from Encounter & FoldartalUse plugins

* refactor: 去除 tasks.json 中的冗余

* fix: 修正坍缩范式插件对banner文字位置的判断

* refactor: get_rare_clp_pds直接使用find结果返回

* refactor: delete code for debug

* refactor: 减少hard coding

* refactor: 减少hard coding

* refactor: use canonical debug mode

* refactor: add explanation for m_need_check_panel in comment

* fix: 日版翻译更正 thanks to @Manicsteiner

* refactor: refine the condition for using clp_pd_plugin in *.cpp files

* refactor: refine condition check for enabling clp_pd_task plugin

* refactor: change back to ASST_DEBUG
2024-07-12 01:12:02 +08:00
Manicsteiner
694572694d chore: YostarJP add SSSBuffChoose (#9629) 2024-07-11 23:28:28 +08:00
Sherkey
8b90bd7968 refactor: 肉鸽资源加载逻辑及目录结构重构 (#9555)
Todos:
~~+ [ ] autocopilot 也重构一下~~
+ [x] encounter 采用类似 tasks.json 的覆盖模式,各个模式的事件配置覆盖到 `default.json` 上面
+ [x] 肉鸽插件加载主题化(待定)
+ [x] Wait for #9561
2024-07-11 20:11:45 +08:00
Weiyou Wang
22221cce21 fix: delete mode tag which is no longer used 2024-07-11 18:26:44 +08:00
Constrat
f93f7979e1 chore: Auto Update Game Resources - 2024-07-11
[skip changelog]
2024-07-11 07:43:06 +00:00
Weiyou Wang
b3d991070e refactor: reduce redundancy in encounter.json files 2024-07-11 14:04:17 +08:00
Weiyou Wang
df9791e5d9 refactor: 肉鸽根据主题选择加载的插件 2024-07-11 14:04:16 +08:00
Weiyou Wang
4921fb7558 refactor: 重构肉鸽不期而遇策略的加载与使用 2024-07-11 14:03:44 +08:00
皆川すみれ
dadbfd92d0 fix: 为InfrastEnteredFlag添加延迟以避免信用通知对右上角基建提醒的遮挡 (#9597)
* fix: add postdelay for InfrastEnteredFlag to avoid office notification conflication

为InfrastEnteredFlag添加延迟以避免信用通知对右上角基建提醒的遮挡

* fix: remove comma
2024-07-11 13:55:19 +08:00
Sherkey
25e9e0d745 docs: fix Weblate status preview in README (#9616)
Fix Weblate preview images and links in
[README.md](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/README.md#%E5%A4%9A%E8%AF%AD%E8%A8%80-i18n)
.

![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/61692393/3546cb41-acad-4aaa-bcab-a850ef337010)

↓


![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/61692393/c11b272c-d077-4f4a-902e-ecf999ac0c66)
2024-07-11 01:32:29 +08:00
Lemon-miaow
44a0b20c49 docs: Fix README.md 2024-07-11 01:27:37 +08:00
Weiyou Wang
7d8cb51689 fix: allow CMake build MaaCore with ASST_DEBUG under macOS 2024-07-11 00:02:39 +08:00
Rbqwow
f10eb36229 docs: fix 17f0172
[skip changelog]
2024-07-10 17:39:34 +08:00
Wallsman
5a303d9c34 Update ja-jp.json
Update JP ニヤニヤ谷
2024-07-10 18:25:58 +09:00
dantmnf
4473a45e63 fix: leak fastdeploy objects to avoid crash 2024-07-10 14:44:39 +08:00
Sherkey
48f9188fb4 chore: 删除 Qodana 静态检查 (#9553)
目前 Qodana 的许可证不知因为什么原因过期了,已经六个月没有运行过了
并且由于 Github 的 Secret 存储机制,没有很好的在 PR 上工作的方法
因此提议删除
2024-07-10 14:19:37 +08:00
uye
f761605bfc chore: 增加 ResourceUpdater 日志 2024-07-10 11:25:50 +08:00
ChingCdesu
2ba2db3c5a pref: 将Head和ETag请求设置为Connection: close 2024-07-10 10:08:57 +08:00
Alisa
ff8ba97918 i18n: Translations update from MAA Weblate (#9598)
* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (723 of 723 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/zh_Hant/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (579 of 579 strings)

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

---------

Co-authored-by: momomochi <as99us301@gmail.com>
2024-07-10 09:43:19 +08:00
Rbqwow
17f01726b4 docs: 修改win7相关问题描述&更新运行库 2024-07-10 04:23:49 +08:00
Constrat
1b8911f550 chore: Auto Update Game Resources - 2024-07-09
[skip changelog]
2024-07-09 17:26:34 +00:00
HX3N
9f5e502d42 chore: YostarKR ocr fix and remove SkipThePreBattlePlot
remove duplicate and follow CN  maskRange value
2024-07-10 01:37:43 +09:00
Weiyou Wang
1f49d6363d fix: Roguelike Invest System offset (#9590) 2024-07-10 00:18:25 +08:00
Manicsteiner
1e55c956b7 chore: YostarJP cor fix and roguelike shop text (#9591) 2024-07-09 18:01:58 +02:00
HY
e97b54173b fix: 修正繁中服薩米肉鴿獎勵無法多選一的問題 (#9584)
fix #9574, fix #9547, fix #9514, fix #9472
2024-07-09 20:10:56 +08:00
Constrat
496af0800f chore: Auto Update Game Resources - 2024-07-09
[skip changelog]
2024-07-09 08:28:53 +00:00
Constrat
34d0a637cf chore: Auto Update Game Resources - 2024-07-09
[skip changelog]
2024-07-09 07:25:16 +00:00
alisa
43c5306ba4 fix: add zh-tw glossary for weblate 2024-07-09 12:44:46 +08:00
alisa
718de46ac7 fix: merge glossary json into one for better webalte compatibility 2024-07-09 12:25:41 +08:00
alisa
b8df114b73 feat: change glossary from markdown to JSON 2024-07-09 12:12:57 +08:00
Constrat
fb560915d5 chore: Auto Update Game Resources - 2024-07-09
[skip changelog]
2024-07-09 04:02:50 +00:00
alisa
994be62578 feat: update turbo to v2 2024-07-09 11:00:17 +08:00
Constrat
41a87e3806 chore: Auto Update Game Resources - 2024-07-09
[skip changelog]
2024-07-09 02:22:29 +00:00
Horror Proton
78545b8dfe fix: fix typings in Recruit task
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9517
2024-07-09 00:31:49 +08:00
EvATive7
e7bff44fe1 chore: update python API (#9538)
* chore: update python API

* fix: remove non-exist return value

* style: docstring of param of set_static_option

* feat: python API get_image
2024-07-08 21:52:01 +08:00
Rbqwow
a530b93b5f docs: 修复字体和评论区分类 2024-07-08 17:18:41 +08:00
SherkeyXD
fd9c0d3f6e docs: 跟进肉鸽不期而遇目录重构的文档修改 2024-07-08 13:04:00 +08:00
Sherkey
e4e22d3c51 feat: 添加萨米肉鸽天途半道关卡战斗策略 (#9337) 2024-07-08 12:53:27 +08:00
Rbqwow
a50c00ea8f docs: fix a bad link 2024-07-08 05:05:56 +08:00
Rbqwow
a0608eb314 docs: make i18n warnings show only once 2024-07-08 04:11:16 +08:00
Constrat
a340d515ad refactor: Yostar interface consistency
[no ci] [skip changelog]
2024-07-07 21:37:41 +02:00
SherkeyXD
7891ba2c8d refactor: 重构肉鸽不期而遇策略的目录格式 2024-07-08 03:30:24 +08:00
SherkeyXD
6c61e42d9b chore: 规范化肉鸽策略命名 2024-07-08 03:29:42 +08:00
Constrat
11cc3b04b9 refactor: YoStar -> Yostar only for interfaces (#9548) 2024-07-07 21:28:16 +02:00
Rbqwow
6b63576798 fix: wrong proxy detection 2024-07-08 03:27:52 +08:00
Sherkey
c2f71bd49b docs: 增加关于肉鸽任务刷探索范式功能的说明 (#9552) 2024-07-08 03:01:40 +08:00
SherkeyXD
7071432e6c chore: 删除 Qodana 静态检查 2024-07-08 02:40:19 +08: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
Constrat
b6ba67b2b8 chore: Auto Update Game Resources - 2024-07-07
[skip changelog]
2024-07-07 13:03:44 +00:00
Sherkey
20b6cea436 feat: 增加识别坍缩范式的插件,增加萨米肉鸽刷隐藏坍缩范式模式 (#9172)
### 更新功能

1. 增加`RoguelikeMode::CLP_PDS = 5`作为萨米肉鸽刷隐藏坍缩范式的模式,可且仅可用于萨米肉鸽。

在此模式下,将在每次回到关卡选择界面时检查坍缩状态,同时会优先使用带有`_collapse`后缀的战斗部署方案,也会使用特有的不期而遇和购物设置。

2. 肉鸽任务新增以下参数:
- `check_collapsal_paradigms`:是否检查坍缩范式,若`mode = 5`则默认为`true`,否则为`false`。
- `double_check_collapsal_paradigms`:是否增加对坍缩范式的检查频率,若`mode =
5`则默认为`true`,否则为`false`。
- `expected_collapsal_paradigms`:需要刷的坍缩范式,若`mode = 5`则默认为两组隐藏坍缩范式。
- `use_foldartal`:是否使用密文板,若`mode = 5`则默认为`false`,否则为`true`。

### 机制介绍

本插件将以两种不同的手段检查坍缩范式:

- 在选关界面点击屏幕中上方展开坍缩状态栏(以下称`Panel Check`);
- 观察屏幕右侧是否有坍缩范式通知(以下称`Banner Check`)。

获取坍缩值的方法多种多样,本插件考虑到了以下情况:

1. 战斗后因非完美战斗而使坍缩值增加,进行`Banner Check`。
2. 战斗后因获得收藏品而使坍缩值变动,进行`Banner Check`。
3. 在不期而遇等(MAA中失与得等节点也会触发不期而遇插件)节点中使坍缩值变动,进行`Banner Check`。
4. 再诡异行商节点中因购买收藏品而使坍缩值变动,进行`Banner Check`。
5. 因使用密文版而使坍缩值减少,进行`Banner Check`。
6. 因进入新的一层而使坍缩值增加,进行`Panel Check`。
7. 若进行`Banner
Check`时发现坍缩范式消退,因不知道会不会一次性消退两层(即便会也概率极低),会在下一次回到选关洁面的时候额外触发一次`Panel
Check`。
8. 在`double_check_collapsal_paradigms =
true`的情况下,每次回到选关界面的时候都会额外触发一次`Panel
Check`以验证是否之前有漏、多记录坍缩范式,并以回调信息的形式传回Debug信息。

**注意事项**

1.
为了防止错过坍缩范式通知,会适当sleep,若检测到屏幕下方有`正在提交反馈至神经`的提示的话会额外sleep。所以开启检查坍缩范式的功能后整体流程会变得拖沓一些(目前在我本人可接受范围内)。
2.
在`RoguelikeMode::CLP_PDS`模式下,获得不需要的坍缩范式会直接重开,遇到需要的坍缩范式则会停止任务。理论上可能在不期而遇事件中获得了不需要的坍缩范式,但因为右上角没有退出按钮而没有及时重开。但我目前没有观察到这样的情形,故没有做处理。不放心的话请设置`double_check_collapsal_paradigms
= true`,等回到选关界面后再检查一遍已获得的坍缩范式。
3.
无论如何,强烈推荐开启`double_check_collapsal_paradigms`。慢点就慢点,求稳才是关键。在我本人测试的过程中,遇到过一两次遗漏`Banner
Check`的情况(截图错过了右上角通知),幸好在额外触发的`Panel
Check`中补上了。怀疑是系统卡顿或网络延迟所致(我在澳大利亚用着MBP2017开着MUMU+MAA刷官服,时间长了后模拟器本身就偶尔会卡住)。

### 回调信息

当`check_collapsal_paradigms == true`时会输出类似于下方的回调信息:
```C++
callback(AsstMsg::SubTaskExtraInfo, json::object { 
    { "what", "RoguelikeCollapsalParadigms" },
    { "details", json::object {
        { "cur", "目空一些" },
        { "deepen_or_weaken", 1 },
        { "prev", "睁眼瞎" }
    } }
});
```
其中`deepen_or_weaken = 1`代表坍缩范式从`prev`加深至`cur`,若`deepen_or_weaken =
-1`则代表坍缩范式消退。
偶尔也会有测试信息以`deepen_or_weaken = 0`被传回,主要用于我自己测试用。

### 任务设置范例

以下是我的测试用任务设置:
```Python
asst.append_task('Roguelike', {
    'theme': 'Sami',
    'mode': 5,
    'investment_enabled': False,
    'squad': '远程战术分队',
    'roles': '稳扎稳打',
    'core_char': '维什戴尔',
    # 'expected_collapsal_paradigms': ['趋同性消耗'],
    # 'check_collapsal_paradigms': True, # 在mode = 5时默认为True
    double_check_collapsal_paradigms': True, # 建议打开,以防万一错过了什么
    # 'use_foldartal': False # 在mode = 5时默认为False
})
```
建议在难度10刷隐藏坍缩,我只做了第一层的漏怪作业且以`维什戴尔`为战斗核心。

### To-Do(s)

- [ ] 补充相关文档 (要不就把上述文字作为文档吧?)

### Need Help

- [ ] 外服适配
- [ ] UI适配

---

小孩子不懂事乱写的代码,请各位多指教。
2024-07-07 20:56:14 +08:00
EvATive7
e3d1359626 fix: switch account failed when MuMuEmulator12Extras is enabled 2024-07-07 12:34:54 +02:00
Constrat
4b7cc9dc1e feat: YoStarEN resolution warning on client switch (#9539)
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-07-07 12:27:39 +02:00
uye
b2d06dd24d Release v5.4.0 (#9535) 2024-07-07 17:41:02 +08:00
uye
002bf0ab02 docs: Update CHANGELOG.md
[skip changelog]
2024-07-07 17:40:32 +08:00
uye
2baf567120 docs: Update CHANGELOG.md
[skip changelog]
2024-07-07 17:39:43 +08:00
github-actions[bot]
44aa11eccc docs: Auto Update Changelogs of v5.4.0 (#9546)
* docs: Auto Generate Changelog of Release v5.4.0

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-07-07 17:36:50 +08:00
Constrat
3c50d37ddd chore: 1080 requirement for YoStarEN
[skip changelog]
2024-07-06 15:44:36 +02:00
Autumn Sound
860bd8f155 feat: 减少上报企鹅物流的重试次数和等待时间 (#9527) 2024-07-06 11:06:17 +08:00
Constrat
89213dfbff chore: Auto Update Game Resources - 2024-07-05
[skip changelog]
2024-07-05 11:02:28 +00:00
Constrat
265c1b4ffe chore: Auto Update Game Resources - 2024-07-05
[skip changelog]
2024-07-05 01:34:47 +00:00
Constrat
112db812fb chore: Auto Update Game Resources - 2024-07-04
[skip changelog]
2024-07-04 20:03:32 +00:00
Hao Guan
aec6c0c070 chore: 适配PlayCover更新 2024-07-03 01:17:27 +08:00
Constrat
ad6ba8f81c chore: Auto Update Game Resources - 2024-07-02
[skip changelog]
2024-07-02 11:03:27 +00:00
Constrat
f20c839af5 chore: Auto Update Game Resources - 2024-07-02
[skip changelog]
2024-07-02 07:02:54 +00:00
Constrat
0aae618a29 chore: Auto Update Game Resources - 2024-07-01
[skip changelog]
2024-07-01 19:03:21 +00:00
Constrat
2bc9796c0c chore: Auto Update Game Resources - 2024-07-01
[skip changelog]
2024-07-01 15:03:28 +00:00
Constrat
37aff29443 chore: Auto Update Game Resources - 2024-06-27
[skip changelog]
2024-06-27 15:26:58 +00:00
HY
bc14fcb0dd chore: 繁中服「火山旅夢」活動導航 (#9497) 2024-06-27 17:17:22 +02:00
bodayw
3f858de1f3 feat: 更新 243 极限效率一天四换排班表(20240608 修订) (#9496) 2024-06-27 16:09:15 +02:00
Constrat
a624ffc461 chore: Auto Update Game Resources - 2024-06-27
[skip changelog]
2024-06-27 07:43:13 +00:00
Constrat
a0c90d4d8d chore: Auto Update Game Resources - 2024-06-27
[skip changelog]
2024-06-27 07:24:20 +00:00
Weiyou Wang
b4c8112322 feat: global adaptation 2024-06-27 15:24:48 +10:00
uye
b59fdc8db8 fix: test code
[skip changelog]
2024-06-27 00:49:13 +08:00
uye
f6f458a660 perf: 优化日志输出控制 2024-06-27 00:41:38 +08:00
uye
9ad82247db chore: 简化Release日志输出 2024-06-26 18:50:23 +08:00
Weiyou Wang
ef09a3ef12 feat: modify the combat strategy for collapse 2024-06-26 15:13:36 +10:00
HY
fa7f04c55b fix: 修正繁中服薩米肉鴿無法開始探索、密文板無法宣告的問題 (#9484) 2024-06-25 20:53:28 +01:00
Constrat
5252f67faf chore: unlocks update options (#9471)
chore: unlocks update options when UpdateCheck = false
2024-06-25 17:47:34 +08:00
Constrat
01ffe4886e chore: Auto Update Game Resources - 2024-06-25
[skip changelog]
2024-06-25 09:03:26 +00:00
Constrat
5bce745838 chore: Auto Update Game Resources - 2024-06-25
[skip changelog]
2024-06-25 08:28:38 +00:00
Constrat
6b0e1ef9ac Revert "chore: unlocks update options when UpdateCheck = false"
This reverts commit 4ff0343916.
2024-06-24 12:11:30 +02:00
Constrat
4ff0343916 chore: unlocks update options when UpdateCheck = false 2024-06-24 12:10:57 +02:00
uye
ec7720e3d0 chore: 一键启动(x
[skip changelog]
2024-06-23 22:56:00 +08:00
zzyyyl
37a8e5b0d9 feat: 更新模板图片优化工具并优化模板图片 (#9459)
* feat: 更新优化模板图片的工具

* perf: 优化模板图片

共缩小 1.31 MiB
2024-06-23 22:48:02 +08:00
uye
8bfb223dac fix: 五周年活动结束后单选领取月卡功能时报错
fix #9452
2024-06-22 18:12:04 +08:00
uye
adf18f00af chore: 修改日志输出
[skip changelog]
2024-06-22 16:15:43 +08:00
HY
6d72bb6e24 chore: 補充繁中服薩米肉鴿相關內容 (#9450) 2024-06-22 10:05:45 +02:00
Constrat
07669bc806 fix: increase mask range for SkipThePreBattlePlotConfirm (#9446) 2024-06-22 11:49:50 +08:00
Manicsteiner
a586c526a0 chore: YoStarJP ocr fix 锏 (#9447) 2024-06-22 11:48:55 +08:00
Constrat
5e66b9bfc8 chore: Auto Update Game Resources - 2024-06-22
[skip changelog]
2024-06-22 03:43:17 +00:00
HX3N
c587b11904 chore: YoStarKR modified CharsNameOcrReplace 2024-06-22 12:19:43 +09:00
HX3N
550353f9f9 chore: update operator.md 2024-06-22 12:03:15 +09:00
Constrat
ce00d41141 fix: optimized RSChapterToRS YostarEN
[skip changelog]
2024-06-22 00:16:57 +02:00
Constrat
973582a52e fix: priority to Flint 点火石 trap instead of operator 2024-06-22 00:12:24 +02:00
Constrat
a36c8f7644 chore: Auto Update Game Resources - 2024-06-21
[skip changelog]
2024-06-21 21:03:04 +00:00
Constrat
b7561c5b17 fix: ResourceUpdater temporary fix for trap_138_winstone having same as Flint
ref #9445
2024-06-21 22:59:48 +02:00
Constrat
b5cf46ddd0 chore: Improve error output in recruitment ResourceUpdater 2024-06-21 22:50:29 +02:00
uye
e295c1a830 feat: suppress pop-up changelog and announcements
[skip changelog]
2024-06-22 01:52:54 +08:00
Wallsman
5003df7cf8 Update operators.md
JP「銀心湖列車」Update
2024-06-22 01:23:33 +09:00
神代綺凛
35e1af29cd fix: arkntools localization (#9438) 2024-06-21 19:38:14 +08:00
uye
357353e23c chore: 删除多余 style 2024-06-21 17:44:40 +08:00
uye
fbd42db377 Release v5.4.0-beta.2 (#9423) 2024-06-21 17:09:49 +08:00
github-actions[bot]
80c1b50254 docs: Auto Update Changelogs of v5.4.0-beta.2 (#9437)
* docs: Auto Generate Changelog of Release v5.4.0-beta.2

* docs: Update CHANGELOG.md

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-06-21 17:09:28 +08:00
uye
3e3aad1569 perf: 优化仓库识别结果展示,支持多语言显示 (#9434) 2024-06-21 16:54:50 +08:00
lingting
3a18ab2970 feat: 无法连接设备时尝试断开连接然后重新连接 (#9433) 2024-06-21 16:53:09 +08:00
HY
0d8c150c21 chore: 初步適配繁中服薩米肉鴿 (#9429)
* chore: 更新薩米肉鴿相關 task

* chore: 補充薩米肉鴿相關截圖
2024-06-20 16:40:09 +01:00
Manicsteiner
55a6c41216 chore: YoStarJP RS navigation (#9427) 2024-06-20 16:39:27 +01:00
Manicsteiner
a4a8bf644d chore: YoStarJP roguelike ocr fix (#9426) 2024-06-20 16:39:14 +01:00
IzakyL
f4cc72a44b refactor: 继续#7904的重构 (#9409) 2024-06-20 17:55:56 +08:00
Constrat
114bd8d2d0 feat: YostarEN RS navigation 2024-06-20 11:46:02 +02:00
Rbqwow
d04838b846 chore: update cn-mumu-report.yaml 2024-06-20 15:42:05 +08:00
HX3N
063c8d54ef feat: YoStarKR RS stage navigation 2024-06-20 16:36:21 +09:00
uye
f815d850e6 style: 优化代码 2024-06-19 18:08:51 +08:00
Horror Proton
b5eb2a004f chore: fix missing includes 2024-06-19 17:15:48 +08:00
Horror Proton
fa51662273 refactor: use factory function instead of class 2024-06-19 17:06:43 +08:00
uye
ab484ffdc4 perf: 优化数据绑定逻辑,减少 AsstProxy 逻辑处理 2024-06-19 17:01:42 +08:00
uye
3efe3cc698 perf: 优化肉鸽选项显示逻辑 2024-06-19 17:01:42 +08:00
Constrat
9f242800e8 chore: Auto Update Game Resources - 2024-06-18
[skip changelog]
2024-06-18 20:03:16 +00:00
zzyyyl
c170147162 chore(issue-checker): bump zzyyyl/issue-checker from 1.7 to 1.8 2024-06-18 16:49:09 +08:00
zzyyyl
9eaa4a4afa chore(issue-checker): 修正生息演算相关打标签逻辑
现在不会给打了 reclamation 的再打 ambiguous 了

link to #8302
2024-06-18 16:39:56 +08:00
HX3N
14e546b4c3 i18n: YoStar add translations for new feat
EN/JP translation may require corrections
2024-06-18 01:45:15 +09:00
SherkeyXD
4ae002e1bb chore: changelog生成器repo独立设置 2024-06-17 03:29:09 +08:00
uye
8cc725f3e8 chore: 增加更新时解压更新包失败日志,增加解压失败解决方案 2024-06-16 19:30:39 +08:00
晓丶梦丶仁
718d2d07fa perf: 优化萨米肉鸽棘刺技能携带 (#9400) 2024-06-16 18:59:30 +08:00
Horror Proton
f5dea882d0 refactor: move functions to TileCalc2 and TileDef 2024-06-16 10:47:59 +08:00
Manicsteiner
98ecb301b4 chore: Amiya new promotion in RoguelikeBattleTaskPlugin (#9377) 2024-06-15 18:11:57 +08:00
uye
54dcd2736a perf: 优化热更新 2024-06-15 16:23:20 +08:00
dantmnf
d2e5001e7e fix: intentionally leak onnxruntime objects to avoid crash
This should be reverted when it get fixed upstream
2024-06-14 18:28:53 +08:00
dantmnf
d6572b2c7e feat: GPU acceleration (DX12/DirectML)
Co-authored-by: SherkeyXD <253294679@qq.com>
2024-06-14 18:26:41 +08:00
Constrat
3e5b6dd4fb chore: Auto Update Game Resources - 2024-06-14
[skip changelog]
2024-06-14 09:42:24 +00:00
HX3N
ccfcbd830d chore: YoStarKR fix ocr and add Collapsal
[skip changelog]
2024-06-14 18:37:31 +09:00
Weiyou Wang
895a22fcfe feat: modify the combat strategy for collapse 2024-06-14 18:53:14 +10:00
梁星逢
ff41a13170 fix: 弹药类技能不能二次关闭的问题 (#9379)
fix: 弹药类技能二次关闭问题
2024-06-14 03:21:15 +08:00
梁星逢
c9744cb5f0 fix: 自动战斗跳过对话模板更新 (#9380)
fix: 跳过对话模板更新
2024-06-14 03:20:37 +08:00
uye
d1a60aa1bb fix: 无法跳过关卡开始的剧情 2024-06-14 00:55:46 +08:00
uye
d1b581a3f5 feat: SideStory「生路」活动导航 2024-06-14 00:04:11 +08:00
zzyyyl
3d862ec61b chore(pr-checker): 允许使用“feat!”表示重大更新 2024-06-13 17:55:39 +08:00
zzyyyl
198043b865 chore(issue-checker): 允许使用“feat!”表示重大更新 2024-06-13 17:51:24 +08:00
zzyyyl
2dbd8fc83a chore(issue-checker): 修正肉鸽标签中关于 “I.S.” 的正则
[skip changelog]
2024-06-13 17:47:29 +08:00
Constrat
fd53a3e516 chore: Auto Update Game Resources - 2024-06-13
[skip changelog]
2024-06-13 06:03:33 +00:00
Constrat
1a40aa3fae chore: Auto Update Game Resources - 2024-06-13
[skip changelog]
2024-06-13 02:20:34 +00:00
Horror Proton
268cfebd13 fix: add /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9321
ref https://github.com/actions/runner-images/issues/10004
ref https://github.com/microsoft/STL/releases/tag/vs-2022-17.10
2024-06-13 09:46:58 +08:00
status102
f4572f9f94 fix: 战斗列表禁用包含非法字符的关卡名添加 (#9363)
* fix: 战斗列表禁用包含非法字符的关卡名添加
2024-06-12 12:49:58 +00:00
Lancarus
90d3c140fe feat: 增加暂停放技能和暂停撤退 (#9348) 2024-06-12 18:22:52 +08:00
Constrat
f2ca2e48aa chore: Auto Update Game Resources - 2024-06-12
[skip changelog]
2024-06-12 09:02:37 +00:00
dantmnf
4f1ef65a9c fix: add AsstSetConnectionExtras to wine bridge
useless though
2024-06-11 23:52:59 +08:00
dantmnf
1b2cc439f2 fix: check before destroy callback 2024-06-11 23:42:17 +08:00
dantmnf
33bca2e82a chore: use NativeLibrary for wine check 2024-06-11 23:36:47 +08:00
Fryze
6d9b12eff6 fix: depot analyzer to detect multipliers for KR (#9343) 2024-06-11 18:39:17 +09:00
uye
d6a65ec5db chore: 更新 py 回调 2024-06-11 03:10:22 +08:00
uye
825f3afe3f perf: 优化关卡选择为剿灭时的逻辑判断
fix #9327
2024-06-11 01:09:03 +08:00
uye
229d280724 fix: en 服在没有源石和理智药的情况下无法退出刷理智任务
fix #9329
2024-06-11 00:39:58 +08:00
Weiyou Wang
7f9c5c0b8c refactor: callback messages are now in English 2024-06-11 00:53:33 +10:00
Weiyou Wang
ed407de99c feat: global adaptation 2024-06-10 20:32:54 +10:00
Weiyou Wang
34d8a26c0a refactor: double check when expanding the collapsal paradigm panel 2024-06-10 20:32:54 +10:00
Weiyou Wang
7ef398bd54 refactor: use MatchTemplate instead of OcrDetect to recognise the current zone 2024-06-10 20:32:47 +10:00
Weiyou Wang
60d58bf93e refactor: matcher result will contain the name of the matched template 2024-06-10 18:49:39 +10:00
Fryze
47aa717a4d chore: Amiya new promotion (#9347) 2024-06-10 09:22:01 +02:00
IzakyL
ea5ae36654 docs: 修正临时招募优先度描述错误 (#9344) 2024-06-10 12:36:58 +08:00
铃语
7c58f1d493 perf: 优化肉鸽shopping策略 (#9332) 2024-06-10 02:07:14 +08:00
晓丶梦丶仁
ba9c282d96 feat: 添加萨米肉鸽天途半道关卡战斗策略 2024-06-09 22:09:02 +08:00
SherkeyXD
b704c9a941 chore: StyleCop链接使用cdn 2024-06-09 21:52:50 +08:00
SherkeyXD
0e2e1222a9 fix: 修复时间比较报错的问题 2024-06-09 21:44:29 +08:00
ChingCdesu
b1ecfd8304 fix: 刷理智结束时有概率报错 2024-06-09 19:18:51 +08:00
Weiyou Wang
327115b003 fix: 将上滑操作触发条件从“检测到3个坍缩范式”降低至“检测到2个坍缩范式” 2024-06-09 20:20:03 +10:00
晓丶梦丶仁
4fff19a738 perf: 优化萨米肉鸽夺树者高台对boss输出策略 (#9294) 2024-06-09 13:18:41 +08:00
Horror Proton
624b9834b0 fix: fix endless loop in InfrastProductionTask
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8941
2024-06-09 11:01:20 +08:00
Horror Proton
c0b3ea28ea fix: fix coredump caused by screencap failure 2024-06-08 22:38:14 +08:00
铃语
6ec82116b7 fix: 保全文件命名错误 (#9322) 2024-06-08 14:32:12 +00:00
uye
1fc47ab475 perf: 更新关卡列表与提示延迟至空闲时间,避免动态修改关卡列表 2024-06-08 16:28:55 +08:00
uye
3286bf6164 Release v5.4.0-beta.1 (#9309) 2024-06-08 15:18:57 +08:00
github-actions[bot]
f72d36c67b docs: Auto Update Changelogs of v5.4.0-beta.1 (#9311)
* docs: Auto Generate Changelog of Release v5.4.0-beta.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-06-08 15:17:38 +08:00
Rbqwow
d03a5cfc2c chore: issue模板添加mumu反馈 (#8993)
* chore: issue模板添加mumu反馈

* chore: 修改方舟专版说明

* chore: update

* chore: update

* fix: typo

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>

* chore: bad uye

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>

* chore: fix

* chore: update

* chore: update

* chore: fix

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-06-08 00:06:57 +08:00
uye
77ccb26512 feat: 在理智恢复满时推送信息 (#9285)
fix #6919
2024-06-08 00:06:01 +08:00
Toby Shi
f078e19ce1 fix: #7266: 公招没有使用足量的加急许可 2024-06-07 18:10:39 +08:00
uye
0d8103777c feat: 增加设置开机自启失败提示 2024-06-07 15:18:04 +08:00
uye
1640f99668 fix: “dorm_notstationed_enabled”参数默认值错误
fix #9282
2024-06-07 15:00:08 +08:00
uye
83412902fb fix: 基建换班重试时只找缺少干员,已选干员无法入驻
fix #7429
2024-06-07 14:56:09 +08:00
Weiyou Wang
742898c624 feat: global adaptation 2024-06-07 12:00:54 +10:00
Weiyou Wang
9e8009299c feat: 初步实现肉鸽模式5:刷隐藏坍缩 2024-06-07 12:00:35 +10:00
uye
bed66f2c7b fix: 生息演算更新后无法选择日期
fix #9295
2024-06-06 21:48:08 +08:00
wlwxj
ce4e8692a7 docs: fix wrong link maa_cli (#9264)
* fix: doc_maacil

* fix

---------

Co-authored-by: 铃语 <74061867+ntgmc@users.noreply.github.com>
2024-06-06 20:18:35 +08:00
uye
67cb180ba8 chroe: 增加开技能最小间隔时间 2024-06-06 17:36:35 +08:00
uye
09baaf2c20 chore: 界面添加支援道具名称提示,传入内容为空白时自动切换为”荧光棒“ 2024-06-06 14:45:27 +08:00
Constrat
1102d933c8 chore: Auto Update Game Resources - 2024-06-05
[skip changelog]
2024-06-05 17:25:37 +00:00
Lancarus
b3f7af41ef docs: Update 肉鸽辅助协议.md 2024-06-06 00:39:46 +08:00
Constrat
b70e1ef492 chore: Auto Update Game Resources - 2024-06-05
[skip changelog]
2024-06-05 08:27:46 +00:00
Constrat
3532b4483e chore: Auto Update Game Resources - 2024-06-05
[skip changelog]
2024-06-05 07:03:41 +00:00
Constrat
ac43a1d5c9 chore: Auto Update Game Resources - 2024-06-05
[skip changelog]
2024-06-05 04:03:34 +00:00
Constrat
325ca10c70 chore: Auto Update Game Resources - 2024-06-05
[skip changelog]
2024-06-05 02:34:12 +00:00
uye
8cc7fe3e33 fix: 选择休眠动作则结束后脚本没时间运行
fix #7023
2024-06-05 00:22:11 +08:00
Hao Guan
39f09a4142 feat: MacGui 自定义填写招募次数 (#6182) 2024-06-04 22:49:41 +08:00
status102
9e3fd79b89 perf: 在掉落不超出一页时,不额外滑动掉落列表及截图拼接 (#9260)
缺少数据,尚未测试在掉落超出1页时的运行情况
2024-06-04 22:33:59 +08:00
uye
11b64cae3a fix: constexpr 构造错误 2024-06-04 20:55:49 +08:00
uye
0f14c11e3d feat: 增加保全、肉鸽、抄作业可配置截图最小间隔 2024-06-04 20:39:05 +08:00
Lancarus
e1c9705ff2 fix: 尝试修复水月肉鸽卡数据回溯 (#9276) 2024-06-04 20:29:17 +08:00
晓丶梦丶仁
8c45959ea6 perf: 优化萨米肉鸽自然之怒ew部署 (#9280) 2024-06-04 20:28:29 +08:00
uye
655e03f815 fix: 肉鸽部分选项在未显示时仍然生效
fix #9278
2024-06-04 16:26:45 +08:00
Weiyou Wang
47f912e998 feat: Roguelike任务下加入use_foldartal参数选项以控制是否使用密文版,默认为true 2024-06-04 02:44:14 +10:00
Lancarus
6c19c1ccbd fix: 尝试修复肉鸽编队错误,max page误判时仍然重置回最左边 (#9262) 2024-06-03 23:42:10 +08:00
70CentsApple
ef458b41fd fix: 公招 m_first_tag 匹配个数少于 3 个时的非预期情况 (#9258)
* fix: `m_first_tag` 匹配个数少于 3 个时的非预期情况

* docs: 添加刷新前提描述
2024-06-03 14:36:18 +00:00
梁星逢
f9a216ed2f fix: 尝试修复生息演算不进入下一天 (#9273)
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9271
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9272
2024-06-03 15:31:25 +08:00
Hao Guan
063e44a8b8 chore: 更新macOS SDK版本 2024-06-03 12:27:34 +08:00
Constrat
065c09b9d6 chore: Auto Update Game Resources - 2024-06-02
[skip changelog]
2024-06-02 20:03:20 +00:00
uye
e8eda19c02 perf: 垂直滑动优化 2024-06-03 01:25:06 +08:00
Constrat
66cde22297 chore: Auto Update Game Resources - 2024-06-02
[skip changelog]
2024-06-02 17:02:56 +00:00
uye
f89d71d5c1 feat: 生息演算支持制造物品刷点数 (#9268)
* feat: 支持制造物品刷点数

* feat: ui 支持 Reclamation2Ex 参数

* chore: 修改界面描述
2024-06-03 00:48:53 +08:00
uye
41e6c76d56 fix: 部分界面显示不全
fix #8865
2024-06-02 23:24:07 +08:00
Constrat
33cb6ef8eb chore: Auto Update Game Resources - 2024-06-02
[skip changelog]
2024-06-02 11:23:40 +00:00
Constrat
2e05ebb696 chore: reduced filename
check description for more info
2024-06-02 10:54:55 +02:00
status102
f62162317e perf: 在掉落不超出一页时,不额外滑动掉落列表及截图拼接 2024-06-02 12:17:43 +08:00
Lancarus
442c4218d4 fix: 自然之怒.json格式错误 2024-06-02 12:09:12 +08:00
晓丶梦丶仁
42e4e0223d perf: 优化萨米ew部署策略 (#9249) 2024-06-02 01:10:23 +08:00
uye
3fa6e72604 chore: Add trace log for scaled coordinates in ControlScaleProxy click & swipe 2024-06-01 00:19:00 +08:00
Hao Guan
10dd024bcf fix: Mac Gui使用Swift 5.9以下的语法 2024-05-31 17:33:50 +08:00
Hao Guan
8c245946a6 fix: 修复Mac Gui在CI的编译错误 2024-05-31 17:23:17 +08:00
Hao Guan
c8b32ba265 feat: Mac Gui 支持连战次数、指定掉落 2024-05-31 16:54:38 +08:00
Lancarus
ca557d7000 perf: 优化萨米肉鸽策略 (#9234) 2024-05-30 01:18:11 +08:00
Constrat
23e60d386c fix: unable to get rewards because ReceiveAward is too fast 2024-05-29 11:39:07 +02:00
Constrat
cc15014b9c chore: Auto Update Game Resources - 2024-05-28
[skip changelog]
2024-05-28 16:27:28 +00:00
Lancarus
d4d392819e perf: 优化萨米肉鸽策略 (#9232) 2024-05-28 21:28:19 +08:00
Lancarus
1bf5a67c87 perf: 优化萨米肉鸽部分关卡策略 (#9224) 2024-05-28 08:58:50 +08:00
Constrat
53df9b4e4d chore: Auto Update Game Resources - 2024-05-28
[skip changelog]
2024-05-28 00:05:20 +00:00
Lancarus
c6d332d625 fix: 尝试修复萨米卡0干扰并优化密文板使用策略 (#9223) 2024-05-28 07:48:25 +08:00
Lancarus
3b08454352 fix: 肉鸽特殊情况下第三层boss门口退出 (#9222) 2024-05-28 00:15:12 +08:00
北雁 Cryolitia
6240ca54ed ci: no need to checkout sumodule after https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/9168 2024-05-27 23:07:19 +08:00
uye
6c4d5951ae fix: call_command timeout时提前返回 std::nullopt
fix #9218
fix #9102
2024-05-27 18:23:39 +08:00
Linisdjxm
1652647f17 feat:在特定环节执行启动前/后脚本 (#9153)
* feat:在特定环节执行启动前/后脚本

* fix:fix
2024-05-26 23:01:29 +08:00
uye
7c57454c1b chore: 忽略括号周围resharper格式检查 2024-05-26 22:56:39 +08:00
uye
78f6ca6fa8 refactor: 统一使用OnUIThread,AddLog默认在ui线程执行 2024-05-26 22:25:54 +08:00
status102
d44a5f8257 fix: type cast 2024-05-26 16:55:01 +08:00
Constrat
f76a8627cc Revert "fix: adding delay between swipe and click" (#9170)
This reverts commit b4fc3528de.
2024-05-26 09:48:56 +02:00
status102
84bee958ce perf: 增加理智药插件中间结果输出
[skip changelog]
2024-05-26 13:28:56 +08:00
status102
d4d809dd45 style: format 2024-05-26 11:23:44 +08:00
北雁 Cryolitia
5b7029ca76 docs(treewide): fix license typo
introduced in b8e63a1223 (diff-4d3cb3f2d417ec9595021db8d2d4eb91950a210be491d64525152588b3a2f908R10)
2024-05-26 06:21:33 +08:00
aleck099
9855f565ab docs(回调消息协议): 增加「实例已销毁」 (#9201)
In addition to commit 1f9aa4c7a7

Co-authored-by: aleck099 <aleck099@outlook.com>
2024-05-26 06:05:21 +08:00
北雁 Cryolitia
4d0304b804 docs: add CITATION
by user required
follows: https://docs.github.com/zh/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-citation-files
2024-05-26 06:02:12 +08:00
北雁 Cryolitia
ccd6fbef29 docs: add LICENSE.SPDX
follows: https://spdx.github.io/spdx-spec/v2.3/
2024-05-26 06:02:12 +08:00
Constrat
de61d407f6 chore: Auto Update Game Resources - 2024-05-25
[skip changelog]
2024-05-25 20:03:16 +00:00
Manicsteiner
106bba6679 chore: YoStarJP roguelike ocr fix (#9203) 2024-05-25 20:47:32 +01:00
uye
303e0dd036 Release v5.3.1 (#9209) 2024-05-26 03:08:58 +08:00
github-actions[bot]
fff1e5d7ff docs: Auto Update Changelogs of v5.3.1 (#9210)
* docs: Auto Generate Changelog of Release v5.3.1

* Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-05-26 03:08:37 +08:00
uye
33823e1c81 fix: 暂时忽略吐司通知报错 2024-05-26 03:05:27 +08:00
uye
321347fa6b fix: 老版本 win10 吐司通知报错 2024-05-25 23:53:23 +08:00
Horror Proton
fa355d48bc chore: fix cmake fastdeploy target name 2024-05-25 16:15:21 +08:00
uye
c413b14df3 Release v5.3.0 (#9196) 2024-05-25 15:57:29 +08:00
uye
fc69d98d22 chore: Update CHANGELOG.md 2024-05-25 15:56:03 +08:00
github-actions[bot]
43dd9b5250 docs: Auto Update Changelogs of v5.3.0 (#9197)
* docs: Auto Generate Changelog of Release v5.3.0

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-05-25 15:46:29 +08:00
Manicsteiner
62bac0c6b9 feat: Sami theme for YoStarJP (#9194) 2024-05-25 08:38:25 +02:00
Loong
92ffafb769 feat: add cmake option USE_RANGE_V3 (#9169)
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2024-05-25 04:47:11 +00:00
Horror Proton
8c9cec989a chore: include path of onnxruntime>=1.16 2024-05-25 12:32:22 +08:00
Horror Proton
b727e1d152 chore: cmake fastdeploy_ppocr, windows only option 2024-05-25 12:32:22 +08:00
Horror Proton
c69b810619 chore: update CMakeLists.txt 2024-05-25 12:32:22 +08:00
HX3N
295743e448 feat: Sami theme for YostarKR
EnterInfrastSami seems almost identical to CN...

might need tweaks when it comes out
2024-05-25 03:53:20 +09:00
Constrat
297f1612fe fix: YostarEN Phantom ISencounter
fix 9190
[skip changelog]
2024-05-24 20:13:18 +02:00
Constrat
49c5b3dff5 feat: Sami theme for YostarEN
might need tweaks when it comes out
2024-05-24 20:03:48 +02:00
Constrat
4629705d17 feat: DepotEnter for YostarEN themes 2024-05-24 20:00:09 +02:00
Constrat
2dec6372e0 chore(tools): updated missingtemplates py for overseas 2024-05-24 19:59:48 +02:00
Constrat
37fe1c97ea i18n: forgot to save changes
same as f3b02fbc98
[no ci] [skip changelog]
2024-05-24 19:34:49 +02:00
Constrat
f3b02fbc98 i18n: Arknight -> Arknights correction
[no ci] [skip changelog]
2024-05-24 19:30:52 +02:00
uye
8254c5b0fd fix: 部分立绘使用「银凇」主题无法进入刷理智任务
fix #9193
2024-05-25 00:42:20 +08:00
uye
b6f2df28b3 chore: 修改 mumu12 支持版本提示 2024-05-24 23:52:28 +08:00
Constrat
f7d30de263 chore: Auto Update Game Resources - 2024-05-24
[skip changelog]
2024-05-24 10:43:13 +00:00
Constrat
e2c43fc437 chore: Auto Update Game Resources - 2024-05-24
[skip changelog]
2024-05-24 09:03:27 +00:00
Constrat
22ff69e89a chore: Auto Update Game Resources - 2024-05-24
[skip changelog]
2024-05-24 07:42:20 +00:00
PukNgae Cryolitia
993ddae3bd refactor(WpfGui): config (#7683)
* refctor: config/GUI

* revert file

* Reduce warning

* refactor: config/{AnnouncementInfo|VersionUpdate}

* chore: 更新至 .net 8

真搞不懂这个吐司)

* feat: 使用 HandyControl 的 NotifyIcon

* fix: 尝试显示 Toast

* fix: 超链接点击报错

* fix: 开始前后脚本添加UseShellExecute = true,

* feat: 在托盘图标右键前往 Release 页

* fix: 超链接点击报错

* ci: Update smoke-testing.yml

* ci: Update smoke-testing.yml

* ci: 修复windows ci运行错误的问题

* fix: 移除过时的安全性方法

* chore: 对于GlobalHotKey包忽略框架版本不兼容警告

* chore: 调整csproj文件结构并删除旧的dotsettings文件

* chore: 不再生成maa.deps.json文件

* chore: 不再生成runtimes文件夹,且Release模式下不生成Maa.pdb文件

* feat: 升级至C#12.0并解决smoke-testing问题

* ci: 修复ci版本检测错误的问题

* ci: 使用的sdk更改为dotnet8.0正式版

* fix: smoke-testing.yml乱码

* ci: release-nightly-ota.yml

* chore: able to publish as single file and NUKE Fody

* fix: wpf build process

* chore: 在 ci 中为 MaaBuilder 添加日志折叠

* chore: 添加 RID 来修复 CI 问题

* style: 根据warning修改代码格式,并禁用部分警告

* 谁把我fody删了

* fix build

* Config/Rft: Timer, InfrastOrder, DragItemIsChecked

* rft/config: GUI

* chore: 更新至 .net 8

真搞不懂这个吐司)

* feat: 使用 HandyControl 的 NotifyIcon

* fix: 尝试显示 Toast

* fix: 超链接点击报错

* fix: 开始前后脚本添加UseShellExecute = true,

* feat: 在托盘图标右键前往 Release 页

* fix: 超链接点击报错

* ci: Update smoke-testing.yml

* ci: Update smoke-testing.yml

* ci: 修复windows ci运行错误的问题

* fix: 移除过时的安全性方法

* chore: 对于GlobalHotKey包忽略框架版本不兼容警告

* chore: 调整csproj文件结构并删除旧的dotsettings文件

* chore: 不再生成maa.deps.json文件

* chore: 不再生成runtimes文件夹,且Release模式下不生成Maa.pdb文件

* feat: 升级至C#12.0并解决smoke-testing问题

* ci: 修复ci版本检测错误的问题

* ci: 使用的sdk更改为dotnet8.0正式版

* fix: smoke-testing.yml乱码

* ci: release-nightly-ota.yml

* chore: able to publish as single file and NUKE Fody

* fix: wpf build process

* chore: 在 ci 中为 MaaBuilder 添加日志折叠

* chore: 添加 RID 来修复 CI 问题

* style: 根据warning修改代码格式,并禁用部分警告

* fix: 配置修改后无法保存

* update

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: 枫雨 <35213527+moomiji@users.noreply.github.com>
Co-authored-by: SherkeyXD <253294679@qq.com>
Co-authored-by: alisa <alisa@alisaqaq.moe>
2024-05-24 09:36:14 +08:00
Constrat
e5813e6430 chore: Auto Update Game Resources - 2024-05-23
[skip changelog]
2024-05-23 17:03:03 +00:00
Lancarus
cda4a9b498 perf: 优化萨米肉鸽策略 (#9185) 2024-05-23 22:39:13 +08:00
uye
3e4ad00c20 Release v5.3.0-beta.3 (#9182) 2024-05-23 21:48:43 +08:00
github-actions[bot]
86fc8a87fd docs: Auto Update Changelogs of v5.3.0-beta.3 (#9184)
* docs: Auto Generate Changelog of Release v5.3.0-beta.3

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-05-23 21:47:36 +08:00
uye
fed45e98b1 chore: 更新 mumu12 截图增强模式使用说明 2024-05-23 21:40:59 +08:00
Constrat
3edd84f137 chore: Auto Update Game Resources - 2024-05-23
[skip changelog]
2024-05-23 08:03:28 +00:00
HX3N
b79e3e7516 fix: handling KR-specific announcements (#9177)
fix #9175

created task on YoStarKR, since the announcement does not appear on other servers.
Adding a new task shouldn't be a problem, right?
2024-05-23 15:45:20 +08:00
Constrat
b05332fd04 chore: Auto Update Game Resources - 2024-05-23
[skip changelog]
2024-05-23 07:03:25 +00:00
Horror Proton
15cde5284b fix: update roi of RecruitNoPermit
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9150
2024-05-22 15:43:48 +08:00
aur3l14no
b5ae4f9fbc fix: change swipe position in StageDropsTaskPlugin 2024-05-22 15:09:08 +08:00
Constrat
8904bc1eab chore: Auto Update Game Resources - 2024-05-21
[skip changelog]
2024-05-21 11:03:07 +00:00
dantmnf
e0e49b5542 fix: attempt to fix winrt notification crash 2024-05-21 18:17:35 +08:00
uye
1e7e5b6d9f Revert "chore: force Aero2 theme" 2024-05-21 18:16:22 +08:00
HX3N
e5fb933b98 chore: YoStarKR IS navigation 2024-05-21 19:04:34 +09:00
Constrat
c343756e30 chore: Auto Update Game Resources - 2024-05-21
[skip changelog]
2024-05-21 10:02:33 +00:00
Constrat
ce4c9cd87c feat: YostarEN Siracusano navigation
EnterChapterIS might need future regex. Wait for event
2024-05-21 09:50:07 +00:00
Manicsteiner
748a602327 chore: YoStarJP IS rerun navigation (#9164) 2024-05-21 17:28:28 +08:00
Horror Proton
8df651bb82 feat: add workaround to limit roguelike framerate 2024-05-20 20:36:44 +08:00
Constrat
b4fc3528de fix: adding delay between swipe and click 2024-05-19 18:03:23 +02:00
Constrat
fb638a9c08 fix: delay between FriendsList analyze and click 2024-05-19 11:13:50 +02:00
Constrat
8bc3558cb5 chore: Auto Update Game Resources - 2024-05-19
[skip changelog]
2024-05-19 00:32:50 +00:00
Lancarus
28333e3f75 fix: 尝试修复肉鸽编队不选干员 (#9148) 2024-05-19 08:05:46 +08:00
Lancarus
c5cfd44a21 perf: 优化萨米肉鸽策略 (#9149) 2024-05-19 08:02:54 +08:00
Constrat
072057beff chore: Auto Update Game Resources - 2024-05-18
[skip changelog]
2024-05-18 20:24:13 +00:00
Lancarus
e35b09b19d feat: 萨米肉鸽刷等级增加商店刷新 (#9142)
* feat: 萨米肉鸽刷等级增加商店刷新

* chore: EN template + ignore

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-05-19 04:21:09 +08:00
Constrat
f52dbd116e chore(tools): bumped ignore template list
[skip ci] [skip changelog]
2024-05-18 16:09:00 +02:00
Constrat
031ff11bd8 feat: Improved Recruitment tab readability 2024-05-18 15:47:26 +02:00
Constrat
976f813ad2 fix: StartUpConnectingFlag not detecting 2024-05-18 14:49:15 +02:00
Constrat
2f8a5481f7 fix: regex Terra Research Commission
[skip ci] [skip changelog]
2024-05-17 19:38:54 +02:00
Constrat
750aa2ac67 refactor: StartGameTaskPlugin.cpp for improved readability 2024-05-17 17:09:31 +02:00
uye
41e488d2e7 Release v5.3.0-beta.2 (#9132) 2024-05-17 21:26:01 +08:00
uye
a01c5756a1 fix: typo 2024-05-17 21:11:18 +08:00
uye
0dc3ad50d3 Release v5.3.0-beta.2 (#9127) 2024-05-17 20:54:55 +08:00
uye
a429b634f5 feat: 「健将」名片识别
fix #9121
2024-05-17 20:51:55 +08:00
uye
75bb86b573 docs: Auto Update Changelogs of v5.3.0-beta.2 (#9128)
Target RP:
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/9127

<details><summary>Debug info</summary>

```
tag_name: v5.3.0-beta.2
pr_title: docs: Auto Update Changelogs of v5.3.0-beta.2
latest_stable_tag: v5.2.3
newest_tag: v5.3.0-beta.1
latest: v5.3.0-beta.1
```

</details>
2024-05-17 16:06:24 +08:00
uye
a57d719ed5 docs:Update CHANGELOG.md 2024-05-17 16:06:03 +08:00
ABA2396
cf98c29553 docs: Auto Generate Changelog of Release v5.3.0-beta.2 2024-05-17 07:58:33 +00:00
uye
e27ff5502a perf: auto start optimization + MAC fix (#9083)
I have no way to test for MAC
2024-05-17 09:27:50 +08:00
Constrat
b396f37221 chore: Auto Update Game Resources - 2024-05-15
[skip changelog]
2024-05-15 14:03:22 +00:00
Constrat
a6f533afc6 chore: Auto Update Game Resources - 2024-05-15
[skip changelog]
2024-05-15 09:03:06 +00:00
SherkeyXD
02decce31e fix: 再次修正赠送月卡选项卡位移导致的领取失败问题 2024-05-15 11:18:49 +08:00
Constrat
ecab6b1ad2 chore: Auto Update Game Resources - 2024-05-14
[skip changelog]
2024-05-14 20:02:51 +00:00
Lancarus
6d7d595354 perf: 优化萨米肉鸽策略 (#9114) 2024-05-15 01:31:12 +08:00
Lancarus
17fca4e1ea fix: 部署失败后不清除已占用格子 (#9111) 2024-05-15 01:08:40 +08:00
HY
58b18c3782 chore: 繁中服「塵影餘音」復刻活動導航 (#9108) 2024-05-14 20:45:28 +08:00
Constrat
7ab466a17b feat: Stop implementation 2024-05-14 08:12:04 +00:00
Constrat
56c939d0e5 chore: Auto Update Game Resources - 2024-05-14
[skip changelog]
2024-05-14 07:42:34 +00:00
uye
73a3ba7f48 chore: 添加超链接未设置默认浏览器的报错解决方案 2024-05-14 13:35:23 +08:00
Horror Proton
c4b94ace10 fix: remove incorrect use of __cpp_lib_ranges 2024-05-13 18:56:47 +08:00
Horror Proton
94efd15f91 feat: add compile def to disable emulator extras 2024-05-13 18:35:50 +08:00
Constrat
47b38d5416 docs: run MaaWpfGui under Wine
ref 1f9aa4c7a7 #8960)
2024-05-12 18:30:01 +02:00
dantmnf
1f9aa4c7a7 feat: Wine 支持 (#8960)
* feat: WineRuntimeInformation

* fix: system theme crash under wine

* refactor: toast notification

* feat: add destory callback

* feat: detect winegcc

* feat: use native MaaCore under Wine

* feat: libnotify integration

* chore: disable hardware accelration under Wine

* fix: distorted icon under Wine

* chore: use Environment.ProcessPath instead of cursed alternatives

* chore: don't filter *.exe when using native MaaCore

* chore: force Aero2 theme

* chore: allow build MaaWpfGui without Windows

You need to extract native .NET SDK on top of Windows .NET SDK to get a working WPF SDK.

* feat: fontconfig integration

* docs: run MaaWpfGui under Wine
2024-05-12 23:27:46 +08:00
Zhaoyang Li
15eb4f87d8 docs: fix a bad link (#9085) 2024-05-12 15:22:16 +01:00
Constrat
b42f010e9d perf: optimized variable usage + limited for + general rewriting for readability 2024-05-12 16:03:37 +02:00
Constrat
63f3b90f1c revert: PlayToolsController returns 2024-05-12 16:02:29 +02:00
Constrat
32d06df501 chore: Add get_controller_type() to discern Android / PlayTools 2024-05-12 12:07:29 +02:00
Constrat
175c396053 fix: return specific values for auto starting methods 2024-05-12 11:10:43 +02:00
uye
de5dd23b36 fix: 触控模式不可用时仍继续任务 2024-05-12 16:41:01 +08:00
Constrat
16036b1b56 fix: increased roi + foldartal regex for EN 2024-05-11 22:59:51 +02:00
HX3N
64af0f5202 i18n: YoStarKR translation fix
add Reclamation translation
2024-05-12 02:15:25 +09:00
Manicsteiner
465c389c07 chore: YoStarJP ocr fix (#9068) 2024-05-11 15:55:47 +01:00
AnnAngela
9ec3c9f158 ci: macOS 版本使用运行于 M1 芯片的 macOS 14 系统编译 (#9071) 2024-05-11 20:33:55 +08:00
AnnAngela
3a18e5799a ci: 无需手动验证 doc (#9070) 2024-05-11 11:29:22 +00:00
uye
051c22ebdb Release v5.3.0-beta.1 (#9063) 2024-05-11 18:16:52 +08:00
Constrat
5cc8f751f2 chore: missing ocr
[skip ci] [skip changelog]
2024-05-11 11:51:48 +02:00
Constrat
f8da676839 fix: json InfrastEnterOperList typo
[skip ci] [skip changelog]
2024-05-11 11:38:26 +02:00
Constrat
a722071115 i18n: keep challenge consistency 2024-05-11 11:36:01 +02:00
Constrat
45e8ce93b5 fix: updated infrastructure EN ocr InfrastEnterOperList 2024-05-11 11:29:58 +02:00
github-actions[bot]
ae41b5fc5c docs: Auto Update Changelogs of v5.3.0-beta.1 (#9067)
* docs: Auto Generate Changelog of Release v5.3.0-beta.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-05-11 17:29:23 +08:00
uye
d0e3cba92e Revert "perf: mumu12模拟器路径默认值置空"
This reverts commit 76b03fdda9.
2024-05-11 17:22:47 +08:00
Alisa
9606274a28 i18n: Translations update from MAA Weblate (#9066)
i18n: Translated using Weblate (Chinese (Traditional))

Currently translated at 98.3% (696 of 708 strings)

i18n: Translated using Weblate (Korean)

Currently translated at 95.7% (678 of 708 strings)

i18n: Translated using Weblate (Japanese)

Currently translated at 97.8% (693 of 708 strings)

i18n: Translated using Weblate (English (United States))

Currently translated at 98.3% (696 of 708 strings)

i18n: Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (708 of 708 strings)


Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/en_US/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/ja/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/ko/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/zh_Hans/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/zh_Hant/
Translation: MaaAssistantArknights/MAA WPF Gui

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: uye <2396806385@qq.com>
2024-05-11 17:12:53 +08:00
Constrat
4dd3f0cba3 refactor: rename $isAllEqual to $noDiff
[skip changelog]
2024-05-10 17:43:19 +02:00
Constrat
752b2d7066 i18n: add favourite tip for i18n (#9051)
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Manicsteiner <63437036+Manicsteiner@users.noreply.github.com>
2024-05-10 16:05:39 +01:00
uye
cbcfeac0de feat: 连战次数选项可隐藏 2024-05-10 22:28:53 +08:00
uye
4fd6030779 fix: 理智药数量识别错误
fix #9060
2024-05-10 19:12:21 +08:00
uye
41f2b72a9f chore: remove unused directives 2024-05-10 17:37:15 +08:00
uye
222b82f3f5 chore: 添加 MuMu 截图增强模式 启用方法提示 2024-05-10 17:31:10 +08:00
Toby Shi
b3cf1a5b01 feat: 自动公招公招手动确认支援机械改为手动确认1星 (#9047) 2024-05-10 11:29:46 +08:00
Rbqwow
4bc1e22058 docs: 更新文档 (#8981)
* docs: 新手上路同步英文文档

* doc:

* doc: 将新手上路写进readme

* doc: 补充日志说明&修复格式

* doc: 同步gui修改

* doc: 强调官方mumu

* doc: 添加克隆子模块说明

* doc: mumu12和uu加速器
2024-05-10 10:17:21 +08:00
KuTaKe
7251099996 fix(ocr):干员识别修正: 崖心8 -> 崖心 (#9048)
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-05-09 21:06:17 +01:00
Constrat
cbf4bbcf6a chore: reset score to default
[skip ci] [skip changelog]
2024-05-09 21:26:25 +02:00
Constrat
1ddf8f0236 perf: duplicate template
[skip ci] [skip changelog]
2024-05-09 21:02:20 +02:00
AnnAngela
5e2f206d95 ci: 补上另一个actions/checkout@v4 (#9044) 2024-05-09 09:46:07 +00:00
AnnAngela
cdd7e6cb12 ci: 更新 actions/checkout@v4 (#9042) 2024-05-09 08:25:19 +00:00
AnnAngela
6eb85ff640 ci: 修复受损引用 (#9041) 2024-05-09 07:36:09 +00:00
uye
6c62a8462d fix: 关卡导航无法识别部分关卡 2024-05-09 10:06:08 +08:00
uye
fa98339687 fix: 重复延迟 2024-05-09 09:33:40 +08:00
Manicsteiner
e9b485ac5b chore: YoStarJP ocr fix (#9033) 2024-05-08 17:06:37 +01:00
Constrat
ad63509588 fix: Skadi Alter EN ocr
[skip ci] [skip changelog]
2024-05-08 16:58:19 +02:00
uye
212836c466 fix: 自动编队选错排在末尾的干员 2024-05-08 18:01:37 +08:00
Constrat
4601501939 chore: Auto Update Game Resources - 2024-05-08
[skip changelog]
2024-05-08 09:03:52 +00:00
Constrat
d109106dcb fix: 塑心 ocr fix jp
fix #9028
[skip changelog]
2024-05-07 17:51:52 +02:00
HX3N
6896df67d4 docs: update glossary 2024-05-07 21:12:14 +09:00
uye
6b0f7ea6ef style: format TaskQueueViewModel 2024-05-07 14:38:49 +08:00
Wallsman
cdec1e1925 add JP ツウィリングトゥルムの黄金 2024-05-07 07:11:59 +09:00
Constrat
d03571fb2a feat: auto retry start on app startup crash (#8966) 2024-05-06 21:04:26 +01:00
Manicsteiner
214744aa69 chore: YoStarJP ocr fix (#9022)
fix #9012
2024-05-06 21:03:25 +01:00
Lancarus
f6bf20f7e3 perf: 优化肉鸽ew优先度 (#9020) 2024-05-06 21:42:52 +08:00
uye
c5d6bfa506 fix: 暂停下干员卡在结束部署后 2024-05-06 14:25:41 +08:00
uye
67456c0cb2 docs: Update bug-report (#9015)
* Update cn-bug-report.yaml

* docs: Update en-bug-report.yaml
2024-05-06 13:28:03 +08:00
Constrat
da78caa4f2 chore: Auto Update Game Resources - 2024-05-05
[skip changelog]
2024-05-05 14:25:08 +00:00
Manicsteiner
40c736ea46 chore: YoStarJP roguelike fix (#8991) 2024-05-05 15:11:28 +01:00
Constrat
b5f9b7601e fix: increase delay post "Mission Start" button (#8950)
fix: increase delay for SkipPreBattlePlot to compensate for loading times
2024-05-05 15:10:15 +01:00
Constrat
d70ce66cb4 fix: delay after enter floor affected by fast screenshots
ref afbe5e2 afbe5e2e03 (commitcomment-141687499)
2024-05-05 12:03:41 +02:00
AnnAngela
f0b8774d35 feat: 添加状态监测站 (#9001) 2024-05-05 07:18:07 +00:00
status102
62dbe304ca chore: 修复LT14-04地图参数 2024-05-05 13:01:36 +08:00
status102
d7034ab3f4 chore: 移动旧保全作业 2024-05-05 12:15:14 +08:00
status102
76b03fdda9 perf: mumu12模拟器路径默认值置空 2024-05-05 12:02:42 +08:00
status102
9a81ebe8df fix: 修复截图增强模式禁用时,模拟器路径无效时无法启动 2024-05-05 12:00:17 +08:00
status102
79cc49c512 chore: 更正Wpf中的MuMu 独家极速操控模式MuMu 截图增强模式 2024-05-05 10:00:33 +08:00
uye
e00c98ed11 chore: 路径不存在时弹窗提示 2024-05-04 20:41:44 +08:00
status102
928e2994a2 fix: typo
[skip changelog]
2024-05-04 20:01:23 +08:00
uye
43cd479aa7 chore: 连接时判断截图方式是否生效 2024-05-04 19:57:08 +08:00
status102
4a59b32911 perf: 增加Mumu12模拟器截图增强配置的模拟器路径存在检查
[skip changelog]
2024-05-04 19:56:38 +08:00
uye
7677fac783 chore: 修改注释 2024-05-04 19:29:55 +08:00
uye
8fffaa2eb0 fix: mumu模拟器连接失败
fix #8986
2024-05-04 19:17:24 +08:00
uye
978f35967e fix: MuMu极速模式关卡导航切换关卡难度报错
fix #8983
2024-05-04 17:24:54 +08:00
status102
6bed31fe28 perf: Mumu12模拟器截图增强模式禁用时隐藏配置项输入框 2024-05-04 17:24:37 +08:00
uye
49f24e42f1 style: format AsstProxy 2024-05-04 17:16:28 +08:00
status102
c70cd85a04 fix: unexpected change 2024-05-04 17:14:36 +08:00
status102
2b8f320ee1 perf: 增加Mumu12模拟器截图增强配置的模拟器路径存在检查 2024-05-04 17:12:27 +08:00
uye
e16ec680b2 fix: 开关 MuMu 极速操控需要重启生效
fix #8980
2024-05-04 16:44:22 +08:00
MistEO
afbe5e2e03 fix: 修复肉鸽关卡识别受截图速度影响的问题 2024-05-04 16:14:37 +08:00
Horror Proton
e36b185505 fix: fallback to normal for empty m_first_tags
format code

fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8968
2024-05-04 11:52:31 +08:00
Horror Proton
5f31cd9ab0 docs: fix markdown format 2024-05-04 11:45:12 +08:00
Rbqwow
a7d7a65a97 docs: 更新文档 MuMu 运行库 蓝叠 (#8964)
* doc: 添加蓝叠卸载说明

* doc: 优化新手上路安装运行库部分

* doc:  添加MuMu独家极速操控模式文档

* doc: 补充剩余理智说明

* doc: 改进新手上路安装运行库

* doc: Update docs/用户手册/新手上路.md

---------

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2024-05-04 03:33:47 +00:00
Lancarus
ae93554f58 feat: 肉鸽适配新干员用法 (#8967) 2024-05-04 03:38:34 +08:00
bodayw
23945022e0 fix: 一图流 243 一天四换换班结束时的日志信息 (#8838) 2024-05-04 03:30:32 +08:00
MistEO
605dcda98a feat: mumu extras (#8939)
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-05-03 22:05:37 +08:00
uye
0165469ad0 docs: Update CHANGELOG.md 2024-05-03 21:00:45 +08:00
uye
949618ca3c Release v5.2.3 (#8962) 2024-05-03 20:32:32 +08:00
github-actions[bot]
0d1f415172 docs: Auto Update Changelogs of v5.2.3 (#8963)
* docs: Auto Generate Changelog of Release v5.2.3

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-05-03 20:32:04 +08:00
70CentsApple
362a872b00 feat: 新增公招 3 星 Tag 的倾向策略 (#8868)
* feat: 新增3星Tag的倾向策略

* docs: add docs for `first_tags`

* i18n: remove unexpected dots

* fix: 在 `NoExtra` 模式下返回默认 `final_combination`
2024-05-03 09:16:50 +00:00
Constrat
b3d9f6b64c chore: Auto Update Game Resources - 2024-05-02
[skip changelog]
2024-05-02 20:03:03 +00:00
HX3N
7f4854c47d chore: YoStarKR Improved RecruitRefresh recognition score 2024-05-02 21:03:42 +09:00
Sherkey
60af8c0f14 feat: 开放限时开采许可的ui (#8952)
Related: https://github.com/MaaAssistantArknights/MaaMacGui/pull/16
2024-05-02 17:46:02 +08:00
HX3N
8673a36de4 chore: YoStarKR fix some ocr 2024-05-02 16:13:58 +09:00
Hao Guan
82c6425c77 feat: Mac GUI 支持限时开采许可 2024-05-02 13:49:20 +08:00
Constrat
0fe64b28e0 chore: Auto Update Game Resources - 2024-05-01
[skip changelog]
2024-05-01 19:23:30 +00:00
Constrat
60446de766 chore: Auto Update Game Resources - 2024-05-01
[skip changelog]
2024-05-01 19:03:11 +00:00
SherkeyXD
36b7c4191c fix: 修复限时开采任务过早点击关闭的问题 2024-05-02 02:30:28 +08:00
SherkeyXD
8dcfcc06a8 feat: 开放限时开采许可的ui 2024-05-02 01:39:51 +08:00
SherkeyXD
34dd31fbbd fix: 修正赠送月卡选项卡位移导致的领取失败问题 2024-05-02 01:19:04 +08:00
Manicsteiner
704145a3d9 fix: 避免识别到不存在的连续作战图标 (#8951) 2024-05-01 22:45:51 +08:00
Constrat
4129033c3f fix: EN Vigil ocr
[skip changelog]
2024-05-01 12:00:49 +02:00
Constrat
a20f4097e4 chore: Auto Update Game Resources - 2024-05-01
[skip changelog]
2024-05-01 08:02:23 +00:00
Constrat
9dbf4e85ad chore: Auto Update Game Resources - 2024-05-01
[skip changelog]
2024-05-01 04:03:08 +00:00
Constrat
265ba6d2a6 chore: Auto Update Game Resources - 2024-05-01
[skip changelog]
2024-05-01 03:03:51 +00:00
Constrat
85d508a76f chore: Auto Update Game Resources - 2024-05-01
[skip changelog]
2024-05-01 02:44:01 +00:00
Constrat
6f6dccf02e chore: Auto Update Game Resources - 2024-05-01
[skip changelog]
2024-05-01 02:31:36 +00:00
Constrat
084fbb6f11 chore: Auto Update Game Resources - 2024-04-30
[skip changelog]
2024-04-30 17:04:21 +00:00
Constrat
9c3663c5d9 chore: Auto Update Game Resources - 2024-04-30
[skip changelog]
2024-04-30 07:24:45 +00:00
Hao Guan
0b08f525b2 feat: Mac GUI 领取赠送月卡 2024-04-30 11:43:18 +08:00
Loong
adcfb3dcf4 chore: bump maa-cli to v0.4.7 and update docs
- Bump maa-cli from v0.4.5 to v0.4.7
- Rename cli directory to user_manual_for_cli
- Change some icon of files
- Update cli documentation in en-us as same structure as zh-cn
2024-04-29 19:40:27 +08:00
uye
1f8bb96cc4 Release v5.2.2 (#8933) 2024-04-29 11:13:56 +08:00
uye
35e399c29d docs: Update CHANGELOG.md 2024-04-29 11:13:19 +08:00
github-actions[bot]
e675b4bd21 docs: Auto Update Changelogs of v5.2.2 (#8936)
* docs: Auto Generate Changelog of Release v5.2.2

* Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-04-29 11:11:03 +08:00
DavidWang19
9c843a9dc5 Update encounter.json
fix: 修复不进入树篱之途节点的问题
2024-04-29 03:59:48 +01:00
uye
0caf181bca chore: 调整UnsupportedLevel界面提示说明 2024-04-29 10:44:57 +08:00
uye
58a64c05a9 docs: update 新手上路.md 2024-04-29 09:50:27 +08:00
AnnAngela
414c7201eb feat: CC 镜像路径变动 (#8935) 2024-04-29 09:19:16 +08:00
uye
711b0ea043 feat: 标题栏显示多选框 (#8932)
* feat: 标题栏显示多选框

* chore: 完善标题栏显示多选框

* chore: 标题滚动可选开启

* feat: 标题栏内容可选隐藏

* i18n: 标题栏多选框内容翻译

* i18n: 标题栏选项翻译

---------

Co-authored-by: 枫雨 <35213527+moomiji@users.noreply.github.com>
2024-04-29 02:04:10 +08:00
SherkeyXD
cc970f60f2 docs: 更新Award的集成文档 2024-04-28 16:37:00 +08:00
uye
c12362a34b fix: 第一次启动时无法检测蓝叠国际版的adb路径
fix #8921
fix #8748
2024-04-28 15:24:57 +08:00
SherkeyXD
7d91810871 fix: 修复开始唤醒时卡在五周年月卡的问题 2024-04-28 09:11:44 +08:00
HX3N
7d847eaf0a feat: YoStarKR ZT navigation 2024-04-28 04:35:19 +09:00
Sherkey
78258ccc6f feat: 支持五周年赠送月卡的领取 (#8918) 2024-04-28 00:12:20 +08:00
Constrat
682b1458ee chore: Auto Update Game Resources - 2024-04-27
[skip changelog]
2024-04-27 14:03:09 +00:00
dantmnf
42154a24d7 fix: crash on background update 2024-04-27 20:25:00 +08:00
Constrat
fa08675fc5 feat: EN ZT navigation 2024-04-27 09:44:35 +02:00
Manicsteiner
a90792d17a chore: YoStarJP ZT navigation (#8912) 2024-04-27 08:12:17 +01:00
HX3N
772b3b010e docs: fix incorrect link in KR docs
and modify warning message
2024-04-27 01:37:17 +09:00
枫雨
167014fcef feat: "粘贴剪贴板"右键可添加作业集
- 鼠标放作业名称上可显示作业ID
2024-04-26 23:53:41 +08:00
uye
ce012da241 fix: 导航报错 2024-04-26 13:55:56 +08:00
status102
2ed9e994a4 fix: 修复#8892导致的崩溃
fix #8896, #8898

link to #8892
2024-04-26 08:46:21 +08:00
HY
3c151f8422 chore: 繁中服「空想花庭」活動導航 (#8897) 2024-04-25 15:18:30 +01:00
Constrat
8a02c9d75a i18n: translation fix
[skip changelog]
2024-04-25 16:15:49 +02:00
枫雨
fe742acb1c fix: 修复开局干员搜索的性能和显示问题 2024-04-25 22:06:52 +08:00
status102
72baf23452 fix: 增加对地图文件检查,避免只存在索引 (#8895)
- close #8860
2024-04-25 21:51:37 +08:00
uye
5e9055d5d8 chore: 标题滚动可选开启 2024-04-25 20:08:36 +08:00
status102
da8b1b669f fix: 增加对地图文件检查,避免只存在索引 2024-04-25 20:07:17 +08:00
Constrat
c6949bb76a chore: Auto Update Game Resources - 2024-04-25
[skip changelog]
2024-04-25 11:43:04 +00:00
uye
ff7136447a chore: 生息演算更新后BB导航 2024-04-25 19:17:40 +08:00
HX3N
1bd8dce63a fix: Copilot Combatlist H-1x-x Stage recognition (#8892)
fix: Copilot Combatlist H-1x-x Stage recognition (#8990)
2024-04-25 18:35:11 +09:00
uye
e94cbb1b7c fix: 标题过长时无法显示置顶按钮 2024-04-25 17:22:56 +08:00
Constrat
646d1e2172 chore: Auto Update Game Resources - 2024-04-25
[skip changelog]
2024-04-25 09:03:38 +00:00
枫雨
ff1164776b perf: 撤回掉修 NumericUpDown 的反射 2024-04-25 15:58:07 +08:00
枫雨
bc7de558e9 chore: update HandyControls to 3.5.2 2024-04-25 15:29:20 +08:00
枫雨
5e03372d56 chore: 更好的开局干员搜索
close #8889
2024-04-25 15:16:57 +08:00
枫雨
c668ebc4a9 chore: 更好的开局干员验证 2024-04-25 15:16:57 +08:00
Rbqwow
e1526c939a docs: 新手引导 (#8749)
* docs: 新手引导
2024-04-24 23:58:07 +08:00
alisa
fd5d523460 ci: fix azure deployment_environment error 2024-04-24 10:30:18 +08:00
alisa
bc01f3bf25 ci: fix unexpected build and deploy behavior 2024-04-24 10:22:18 +08:00
alisa
a2fcfadba2 ci: update website deployment action to support deployment_environment 2024-04-24 10:08:19 +08:00
Alisa
c2bd0133ba refactor: 合并 MAA Website 仓库 (#8886)
* chore: migrate maa website

* ci: change docs build test to website build test

* fix: rename artifact name to dist

* ci: add workflow to deploy website to azure
2024-04-24 09:31:52 +08:00
uye
cf2455770d fix: Unable to cast object of type LinearGradientBrush to type SolidColorBrush 2024-04-23 20:55:08 +08:00
Manicsteiner
0c4e9958fd chore: update YoStarJP DepotEnterMistCity (#8885)
[skip changelog]
2024-04-23 09:56:43 +01:00
alisa
01c96431ce feat: add google analytics to docs 2024-04-23 10:24:48 +08:00
uye
1e856c9a28 chore: 改个置顶的图标 2024-04-22 18:24:13 +08:00
uye
4c031484af feat: 界面置顶功能
close #8861
2024-04-22 18:12:19 +08:00
uye
d01d7b1368 fix: 日服 基建 火龙S黑角 识别错误
fix #8862
2024-04-22 16:30:09 +08:00
status102
03be3e77d6 fix 2024-04-22 10:07:44 +08:00
status102
a162f20f73 fix: 修复干员名识别识别含有《。前缀时,预处理结果错误
fix #8878
2024-04-22 10:04:40 +08:00
Rbqwow
a469b1d4ca docs: 更新明日方舟工具箱地址 (#8835) 2024-04-21 20:28:28 +08:00
Horror Proton
c084ad2593 fix: add quote around adb args with character | 2024-04-20 20:17:33 +08:00
Constrat
9960c5b7cd chore: Auto Update Game Resources - 2024-04-18
[skip changelog]
2024-04-18 09:03:16 +00:00
Constrat
ec27c41840 feat: EN Mist City theme 2024-04-18 09:30:55 +02:00
DL_君逸寒
11bc14592e feat: 新增 边地移动城镇另外两个元件的保全派驻作业 (#8858) 2024-04-18 07:38:20 +01:00
DL_君逸寒
c102233a54 perf: 优化边城保全声波记录扩音器脚本打法及修改脚本名称 (#8857) 2024-04-18 07:37:58 +01:00
Constrat
eba917d38a feat: YostarEN Dark theme 2024-04-17 23:20:53 +02:00
Manicsteiner
037991a66b chore: YoStarJP new UI theme templates (#8851) 2024-04-17 21:16:08 +01:00
Constrat
b532155b42 feat: EN IS4 all squads implementation
fix #8850
2024-04-17 15:58:29 +02:00
Constrat
c2d014a74d fix: EN adverse farming cache error
fix #8849
2024-04-17 15:49:20 +02:00
DL_君逸寒
827594cc29 feat: 新增 多索雷斯商业地块 保全派驻作业 (#8848) 2024-04-17 12:51:30 +01:00
DL_君逸寒
fb2f88e71b feat: 阿尔斯特甜品制作平台追加作业 (#8847) 2024-04-17 12:51:21 +01:00
Constrat
27bd5054fa chore: Auto Update Game Resources - 2024-04-17
[skip changelog]
2024-04-17 09:02:47 +00:00
AnnAngela
1ddd7023bc ci: 无变动时不再发起更新资源 (#8846) 2024-04-17 04:01:45 +00:00
DL_君逸寒
09c04eec27 feat: 新增 多索雷斯商业地块、边地移动城镇 保全派驻作业 (#8843) 2024-04-16 18:41:22 +01:00
HX3N
21cf20fea8 chore: YoStarKR add new UI Interface template images
Dark and MistCity Theme

DepotEnter / EnterInfrast / Friends / GachaEnter / OperBoxEnter / Recruit / Task / Terminal

deleted EnterOperator.png as it is no longer in use
2024-04-17 00:38:53 +09:00
HX3N
070662c513 chore: YoStarKR modify task.json
correction of U-Official recognition error and modify some Item
2024-04-17 00:26:12 +09:00
Constrat
0368f6e31a chore: Auto Update Game Resources - 2024-04-16
[skip changelog]
2024-04-16 12:06:50 +00:00
HX3N
eb9fc59e0a docs: modify KR document
fix typos and standardize formatting

(arranged the paragraphs to start with 'warning', followed by 'tip')
2024-04-16 20:38:25 +09:00
Constrat
b0a76fea8d chore: Auto Update Game Resources - 2024-04-16
[skip changelog]
2024-04-16 11:21:58 +00:00
碳黑橙子
5a65afbb49 doc: 修复404的链接 (#8839) 2024-04-16 10:18:48 +01:00
Wallsman
a22212c558 JP Chapter13 Update 2024-04-16 17:01:06 +09:00
Constrat
936db94023 chore: Auto Update Game Resources - 2024-04-16
[skip changelog]
2024-04-16 07:42:45 +00:00
Constrat
c0aee71d7b chore: Auto Update Game Resources - 2024-04-16
[skip changelog]
2024-04-16 07:24:26 +00:00
uye
fd13d970c1 Release v5.2.1 (#8831) 2024-04-15 19:45:04 +08:00
github-actions[bot]
08ecc3913c docs: Auto Update Changelogs of v5.2.1 (#8832)
* docs: Auto Generate Changelog of Release v5.2.1

* docs: Update CHANGELOG.md

* docs: changelog

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-04-15 19:44:28 +08:00
uye
e0dbd0a7a5 chore: BB-4 导航
fix #8824
2024-04-15 16:29:29 +08:00
bodayw
489403f832 feat: 更新一图流生成 243 极限效率一天四换排班表 (#8825)
* feat: 更新一图流生成 243 极限效率一天四换排班表

* fix: 243 极限效率一天四换一图流版宿舍换班问题

在开启“不将已进驻的干员放入宿舍”的情况下有可能导致下一次换班时宿舍找不到指定的人

* fix: 恢复旧版一图流生成 243 极限一天三换排班表
2024-04-15 15:01:01 +08:00
uye
b79de46f7f fix: 导航报错 2024-04-15 14:04:16 +08:00
AnnAngela
f5b6bf1ced feat: 巴别塔二、三阶段导航预载 (#8829)
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/8827#discussion_r1565112368
2024-04-15 03:52:21 +00:00
AnnAngela
28d66894b8 feat: 巴别塔导航数据 (#8827) 2024-04-15 01:39:33 +00:00
HY
8b8ab2664f fix: 替換繁中服 StartToVisit 圖片 (#8817)
fix: 替換 StartToVisit 圖片
2024-04-12 21:50:24 +08:00
HX3N
bfc4f25756 docs: YoStarKR update operators.md 2024-04-12 12:26:40 +09:00
uye
7346ab4d6c fix: 无法进行访问好友 2024-04-12 01:31:48 +08:00
Constrat
dc2f99b32f chore: Auto Update Game Resources - 2024-04-11
[skip changelog]
2024-04-11 08:28:35 +00:00
uye
951634fbef style: ResourceUpdater 2024-04-11 13:46:27 +08:00
Constrat
b4b753c357 chore: Auto Update Game Resources - 2024-04-11
[skip changelog]
2024-04-11 04:02:54 +00:00
Constrat
ad723c9d3b chore: Auto Update Game Resources - 2024-04-11
[skip changelog]
2024-04-11 02:28:40 +00:00
uye
4c505faa86 fix: 部分场景下无法执行访问好友
fix #8775
2024-04-10 12:32:24 +08:00
vonnoq
cc2082e214 fix: 繁中服幹員識別修正 (#8807) 2024-04-09 18:38:44 +01:00
Manicsteiner
7635e124f9 docs: change image transparency (#8802) 2024-04-09 16:01:09 +01:00
Constrat
f0b07b7819 docs: en transparency
ref: 0c5a79f
2024-04-09 17:00:47 +02:00
HX3N
4de621c182 docs: update and refactor KR docs (#8793)
* docs: update readme

* docs: Update Android Device and CLI

* docs:  Improvement of Document Structure

* docs: update schema

* docs: update sidebar and dev docs

* docs: reconstruction

* docs: navbar

* docs: fix incorrect link

docs: sidebar

docs: fix somethings

* docs: update image

* docs: Correcting missing or incorrect links

* docs: change image link

* docs: change sidebar display

Last Check

* docs: correcting incorrect
2024-04-09 23:25:20 +09:00
uye
0c5a79f5a7 docs: 修改文档图片透明度
cc @Constrat @HX3N @Manicsteiner
2024-04-09 16:50:44 +08:00
Constrat
8795288e76 chore: Auto Update Game Resources - 2024-04-09
[skip changelog]
2024-04-09 07:42:51 +00:00
Constrat
470cefa834 chore: Auto Update Game Resources - 2024-04-09
[skip changelog]
2024-04-09 07:24:34 +00:00
status102
56122a6af2 perf: 战斗列表处于激活时,浏览带有难度标识的作业会自动添加对应难度到战斗列表 (#8491) 2024-04-08 17:33:24 +08:00
HoshinoAyako
d0121ba22e fix: 假日场景下,银淞主题UI无法进入基建 (#8795)
修复了roi范围
540+200=740>720

去除了模板的灰色色块
2024-04-08 16:27:48 +08:00
uye
b2eeaaa33e chore: 修改抗干扰值日志输出 2024-04-08 10:25:06 +08:00
uye
04044b4f7e docs: 生息演算介绍Update zh-cn.xaml 2024-04-07 17:24:01 +08:00
uye
8391b601fc fix: 抗干扰值解析 2024-04-07 16:16:07 +08:00
uye
0e3da9cf85 fix: switch not valid string_t 2024-04-07 15:28:18 +08:00
uye
390165b661 fix: 肉鸽解析Vision失败 2024-04-07 15:14:47 +08:00
Constrat
ea1446ea5b fix: 特米米 in battle ocr detection (#8788)
* fix: 特米米 in battle ocr detection

* chore: updated regex
2024-04-07 14:46:06 +08:00
Constrat
63d21f1ccb chore: Auto Update Game Resources - 2024-04-06
[skip changelog]
2024-04-06 13:43:04 +00:00
Constrat
a1b9a36b23 fix: reduced score for Recruitment IS4
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8613#issuecomment-2041072238
[skip changelog]
2024-04-06 15:39:57 +02:00
Manicsteiner
20d8151895 fix: YoStarJP ocr グラベル (#8780)
[skip changelog]
2024-04-04 21:25:30 +01:00
Loong
0be47d1cb8 docs: use relative md instead of html links 2024-04-03 19:14:28 +08:00
Loong
73ad1c62e9 docs: split and update CLI documents 2024-04-03 19:14:28 +08:00
Manicsteiner
dcf331fabc chore: YoStarJP ocr fix (#8768)
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-04-03 10:08:14 +01:00
Constrat
03343070d0 chore: Auto Update Game Resources - 2024-04-03
[skip changelog]
2024-04-03 08:44:30 +00:00
Manicsteiner
bca181c365 fix: Global IS navigation (#8769) 2024-04-03 09:36:28 +01:00
uye
e1228e26fb fix: 刷理智愚人号任务出错
fix #8773
2024-04-03 16:13:03 +08:00
uye
74342c0a25 fix: 无奖励关卡无法匹配愚人号部分关卡 2024-04-03 15:54:27 +08:00
uye
b4c180f275 perf: Add missing headers & optimize the code 2024-04-03 15:31:20 +08:00
uye
b3350ac23b feat: Add Bark notification provider (#8701)
What is Bark?
https://bark.day.app/
2024-04-03 15:08:17 +08:00
uye
1c94820755 fix: 泡普卡识别错误
fix #7878
2024-04-03 14:11:26 +08:00
Constrat
41506ffa6f chore: Auto Update Game Resources - 2024-04-03
[skip changelog]
2024-04-03 03:02:57 +00:00
status102
f9717be116 perf: nullable
[skip changelog]
2024-04-03 10:54:30 +08:00
Horror Proton
f896ab1f84 fix: 尝试修复肉鸽导航 (#8764)
* fix: fix roguelike navigation

* chore: fix roguelike resource ci error
2024-04-03 10:49:31 +08:00
uye
8e00c54833 perf: 优化 LocalizationHelper 2024-04-03 10:36:43 +08:00
Constrat
c351323605 chore: Auto Update Game Resources - 2024-04-02
[skip changelog]
2024-04-02 17:26:33 +00:00
uye
9a1b8e8cc8 chore: 叉掉不触发 2024-04-03 00:30:11 +08:00
uye
70376024fa Revert "chore: 叉掉不触发"
This reverts commit 9c887176d5.
2024-04-03 00:27:43 +08:00
Constrat
44319974c5 chore: Auto Update Game Resources - 2024-04-02
[skip changelog]
2024-04-02 11:22:59 +00:00
Constrat
dc080cca33 chore: Auto Update Game Resources - 2024-04-02
[skip changelog]
2024-04-02 11:02:50 +00:00
uye
a529d83758 fix: pallas 无法获取 DynamicResource 2024-04-02 18:15:02 +08:00
uye
c5cf3900d4 fix: 找不到语言资源文件 2024-04-02 18:15:02 +08:00
Constrat
774b74575b chore: Auto Update Game Resources - 2024-04-02
[skip changelog]
2024-04-02 07:25:08 +00:00
Constrat
4165234f9c chore: Auto Update Game Resources - 2024-04-02
[skip changelog]
2024-04-02 07:03:30 +00:00
uye
be08f05be4 chore: 加点不期而遇的日志 2024-04-02 14:26:00 +08:00
uye
bf49151640 chore: LastBuyWineTime 改为全局配置 2024-04-02 10:28:01 +08:00
uye
9c887176d5 chore: 叉掉不触发 2024-04-02 09:32:10 +08:00
Constrat
a48a24932e chore: Auto Update Game Resources - 2024-04-01
[skip changelog]
2024-04-01 19:03:30 +00:00
Loong
2111a401b2 chore: update maa-cli to 0.4.5 and build with vendored-openssl 2024-04-01 23:13:57 +08:00
status102
246a628acf ci: 修改nightly changelog忽略多余抬头 2024-04-01 22:32:55 +08:00
status102
ef7e64a180 ci: 修正nightly读取changelog.md
[skip changelog]
2024-04-01 21:44:57 +08:00
Constrat
b954513444 style: Remote Control spacing 2024-04-01 14:51:09 +02:00
status102
57243d944d ci: 修正nightly使用生成文件 2024-04-01 20:20:11 +08:00
uye
4cc4ec9c64 chore: 一天只喝一次酒 2024-04-01 16:54:46 +08:00
Constrat
33818281c1 chore: Auto Update Game Resources - 2024-04-01
[skip changelog]
2024-04-01 08:27:52 +00:00
uye
9f05c01c5d style: LocalizationHelper & SettingsViewModel 2024-04-01 14:34:29 +08:00
uye
b8e69f62db fix: 无法进入设置
fix #8755
2024-04-01 11:25:26 +08:00
Horror Proton
2000bc3597 docs: sync with upstream, re-arrange for linux users (#8733)
- Upstream docs update:
https://github.com/MaaAssistantArknights/maa-cli/pull/248

- 明确区分编译MAA动态库,安装MAA动态库与安装maa-cli并添加相关指引

- 使用 markdownlint 格式化文本

- docs/zh-tw/1.6-CLI使用說明.md: 使用OpenCC转换,与简体中文最新文档同步

_TODO_: 日语与韩语文档待同步

---

review point: 需繁体中文文化环境相关的本地人员审阅繁体中文部分用语及习惯用词

*请勿 squash merge,应直接merge或rebase
2024-04-01 10:37:41 +08:00
AnnAngela
a0ce5e1acf ci: 修复gen_changelog的错误操作 (#8756) 2024-04-01 02:03:39 +00:00
Sherkey
b3b09a966d chore: 修复changelog_generator编码问题,以及部分重构 (#8739)
* ci: 修正changelog生成时的编码问题

* refactor: 使用更加现代的python写法部分重构changelog_generator
2024-04-01 08:24:34 +08:00
Constrat
17a3718853 i18n: EN correction 2024-03-31 17:04:17 +02:00
Constrat
f56643a1c0 i18n: translation small error fixes 2024-03-31 17:03:11 +02:00
Horror Proton
cd347b73e7 feat: calculate position of skill & retreat button 2024-03-31 10:16:20 +08:00
北雁 Cryolitia
8c2d73d76e docs: fix breakline 2024-03-31 10:15:23 +08:00
北雁 Cryolitia
724c3d0623 docs: declare license AGPL-3.0-only 2024-03-31 10:15:23 +08:00
Constrat
2f4dc75540 chore: Auto Update Game Resources - 2024-03-30
[skip changelog]
2024-03-30 20:03:29 +00:00
Constrat
02ec5be3a2 perf: Improved InfrastFilterMenuNotStationedButton recognition score 2024-03-30 17:05:00 +01:00
Loong
5c40b54bd2 ci: generate changelog with python script for nightly (#8728)
ci: generate changelog with python script for nightly releases
2024-03-30 23:39:15 +08:00
北雁 Cryolitia
42338942f5 docs: re-arrange for linux users
明确区分编译MAA动态库,安装MAA动态库与安装maa-cli并添加相关指引

使用 markdownlint 格式化文本

docs/zh-tw/1.6-CLI使用說明.md: 使用OpenCC转换,与简体中文最新文档同步

TODO: 日语与韩语文档待同步
2024-03-30 20:59:41 +08:00
北雁 Cryolitia
437a6958e4 docs: sync with upstream
https://github.com/MaaAssistantArknights/maa-cli/pull/248
2024-03-30 19:22:38 +08:00
status102
df90caba1b ci: output format 2024-03-29 11:06:47 +08:00
HX3N
38f7c32018 fix: YoStarKR Executor alter regex (#8723)
* fix: YoStarKR Executor alter ocr fix

* fix: Eyjafjalla the Hvít Aska regex
2024-03-28 20:50:08 +00:00
uye
fe11b359f4 Release v5.2.1-beta.1 (#8719) 2024-03-28 19:25:32 +08:00
github-actions[bot]
f3a86a94ac docs: (#8720)
* docs: Auto Generate Changelog of Release v5.2.1-beta.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-03-28 19:21:44 +08:00
uye
d945ef1d1b fix: 信用购买卡在购买完成界面
fix #8674
2024-03-28 18:25:40 +08:00
uye
21098fbeb8 chore: 修改不支持的关卡提示 2024-03-28 18:10:55 +08:00
Nitori
36d54df766 feat: add Bark Server configuration key 2024-03-28 15:53:30 +08:00
Nitori
c19302755d feat: Add Bark notification provider 2024-03-28 15:53:28 +08:00
uye
5a20a85dfe fix: macos 生息演算无法退出关卡
fix #8579
2024-03-28 14:53:33 +08:00
Valtameri Sieluna
379349d71a feat: add multi external notifications (#8628)
* feat: add discord notification

* feat: add telegram notification

* feat: add missing langauges

* fix: add missing space
2024-03-27 12:26:20 +08:00
MistEO
6b289e9c9b chore: 去掉太慢的clang-format配置 2024-03-26 16:35:05 +08:00
status102
979f2e91da fix: 训练室读取干员名失效 2024-03-26 14:49:22 +08:00
Constrat
02b1f0db62 fix: IS4 Rain! encounter regex
fix #8709
2024-03-25 18:28:11 +01:00
Rbqwow
dbb550f71a doc: 添加蓝叠核心版本推荐 (#8688) 2024-03-25 03:09:03 +08:00
guguji12
c4c1cbc7f5 doc: Update 肉鸽辅助协议.md (#8703)
订正错别字
2024-03-25 03:08:17 +08:00
status102
030b3f718e revert 35c639326e
[skip changelog]
2024-03-23 17:31:10 +08:00
status102
cf05d0d4bb perf: 肉鸽投资模式进入第二层拓展为投资模式启用购物、招募 (#8620)
perf: 肉鸽投资模式`进入第二层`拓展为`投资模式启用购物、招募`
2024-03-23 14:33:00 +08:00
Saratoga
6f450c18a2 fix: 干员名ocrReplace追加一煌-> & 夹子 2024-03-23 14:29:09 +08:00
status102
006201d12f fix: BattleQuickFormationOCR roi
[skip changelog]
2024-03-23 09:01:49 +08:00
status102
3b01249c11 fix: train regex
fix #8685
2024-03-23 08:30:55 +08:00
status102
35c639326e perf: 调整编队干员识别roi 2024-03-22 22:40:07 +08:00
status102
f4ea366bf3 fix: 干员名识别移除前缀c 2024-03-22 22:40:07 +08:00
status102
303162ed8b fix: 补充低信赖筛选错误 2024-03-22 22:39:50 +08:00
Manicsteiner
558f35e39b fix: custom ROI and notes for StartToVisit txwy (#8682) 2024-03-22 13:10:59 +00:00
status102
6eee1d85bc perf: 基建干员专精干员名替换优化
[skip changelog]
2024-03-22 17:47:48 +08:00
status102
3d3d8c1036 perf: 移除过多的剧情检查 2024-03-22 16:48:35 +08:00
status102
c00d1673f5 fix: 战斗中教程剧情导致错误的倍速切换 2024-03-22 16:20:29 +08:00
status102
634117c687 fix: 自动战斗-自动编队-补充低信赖时自动关闭特关 2024-03-22 11:42:48 +08:00
Constrat
2cd3781f00 feat: Skip the story before a battle for EN 2024-03-21 19:58:59 +01:00
HX3N
b4ee62714b fix: YoStarKR SkipThePreBattlePlot (#8671)
* fix: YoStarKR SkipThePreBattlePlot

* revert: change image

* fix: templThreshold

* fix: Remove fields except maskRange
2024-03-21 16:17:59 +01:00
status102
93f34fa002 fix: 干员名识别一山-> 2024-03-21 21:53:38 +08:00
Constrat
99e53443c3 chore: Auto Update Game Resources - 2024-03-21
[skip changelog]
2024-03-21 09:24:32 +00:00
Constrat
9e814827df chore: Auto Update Game Resources - 2024-03-21
[skip changelog]
2024-03-21 09:03:15 +00:00
Constrat
55e9ec4e1f fix: trying to fix the SkipPreBattle
[skip changelog]
2024-03-20 21:05:52 +01:00
Constrat
acf01e5698 chore: Auto Update Game Resources - 2024-03-20
[skip changelog]
2024-03-20 20:03:18 +00:00
Constrat
015ad7863f chore: Auto Update Game Resources - 2024-03-20
[skip changelog]
2024-03-20 19:42:43 +00:00
HX3N
f57bc040d5 fix: YoStarKR ocrReplace (#8665)
* fix: YoStarKR ocrReplace

fix Character / Encounter / Foldartal

* fix: regex

* fix: minimize duplicate
2024-03-20 19:26:10 +00:00
status102
de43c04f68 chore: 修改changelog_generator的无序列表格式,从- 改为* 2024-03-20 19:35:09 +08:00
Constrat
aabd8a199b chore: Auto Update Game Resources - 2024-03-20
[skip changelog]
2024-03-20 09:43:45 +00:00
Constrat
366e700c10 fix: OCR replace for Auto Battle (CV) 2024-03-19 18:22:39 +01:00
Constrat
80f30d4c8b fix: CV roi for navigation 2024-03-19 18:07:43 +01:00
Constrat
6796a2dcd1 chore: Auto Update Game Resources - 2024-03-19
[skip changelog]
2024-03-19 17:03:42 +00:00
Constrat
9f808db912 fix: Eyja Alter EN regex for SSS 2024-03-19 18:02:59 +01:00
Manicsteiner
48003b344d fix: YoStarJP ocrreplace (#8663) 2024-03-19 16:49:49 +00:00
Constrat
9e1b44491c chore: Auto Update Game Resources - 2024-03-19
[skip changelog]
2024-03-19 15:42:52 +00:00
Constrat
22900fdd71 perf: optimized roi for EN infrast training 2024-03-19 16:32:03 +01:00
HY
b2a604e7da chore: 繁中服「孤星」活動導航 (#8662) 2024-03-19 15:06:37 +00:00
status102
73bbf5fb68 ci: 调整nightly自动changelog格式
[skip changelog]
2024-03-19 19:16:50 +08:00
status102
fd762415e5 ci: 调整nightly自动changelog格式
[skip changelog]
2024-03-19 17:13:57 +08:00
uye
9d2a4720e7 fix: 所有任务都添加失败时清空任务列表
fix #8658
2024-03-19 16:50:37 +08:00
Constrat
05127b1f56 chore: Auto Update Game Resources - 2024-03-19
[skip changelog]
2024-03-19 07:42:23 +00:00
Constrat
f958383e3a chore: Auto Update Game Resources - 2024-03-19
[skip changelog]
2024-03-19 07:23:22 +00:00
Constrat
c3dbf2b129 chore: Auto Update Game Resources - 2024-03-19
[skip changelog]
2024-03-19 07:02:47 +00:00
EROTCZ
4b11f96141 fix: txwy ocrreplace (#8655)
Update tasks.json

繁中服基建換班濯塵芙蓉辨認異常
2024-03-19 14:45:22 +08:00
uye
05a1233c13 perf: 专精干员名称按ui语言显示 2024-03-19 14:41:56 +08:00
Constrat
0bde2ae92d chore: Auto Update Game Resources - 2024-03-19
[skip changelog]
2024-03-19 04:26:29 +00:00
Lin Chengfeng
1cc8381d4d fix: match the correct file suffix 2024-03-18 20:17:30 +08:00
Horror Proton
f6b81886fa chore: remobe unwanted files [skip changelog] 2024-03-18 19:46:47 +08:00
status102
155e45ea5c ci: 修复格式
[skip changelog]
2024-03-18 08:16:02 +08:00
HX3N
3594217fb0 chore: YoStarKR CV stage navigation and add Conductive Unit Upgrade (#8649)
* chore: YoStarKR CV stage navigation

* feat: YoStarKR SSS#3 add Conductive Unit upgrade
2024-03-17 20:53:26 +00:00
Constrat
98772abb3e chore: Auto Update Game Resources - 2024-03-17
[skip changelog]
2024-03-17 16:03:27 +00:00
Constrat
9a7369f9be chore: EN CV navigation 2024-03-17 16:46:15 +01:00
Manicsteiner
393cf1b373 chore: YoStarJP ダーティマネー navigation (#8647) 2024-03-17 15:21:54 +00:00
Constrat
81a5227005 fix: SSS json version
[skip changelog]
2024-03-17 16:19:24 +01:00
David
c3e18d3eef Feat: YostarEN SSS#3 (#8645)
* chore: removed older global SSS

* feat: SSSBuffChoose

* chore: moved older SSS scripts to /old

* feat: translated SSS scripts

* style: typo

* style: more typos

* style: even more typos

* fix: final ocr tweaks

* chore: added Conductive Unit replace

* fix: misindetification + highest priority for Equipment Activation Valve

* fix: skill activations
2024-03-17 15:11:32 +00:00
HX3N
5856ad2afe feat: YoStarKR SSS#3 (#8643)
Update tasks.json
2024-03-17 10:03:14 +00:00
vonnoq
58bac2c1d0 feat: 台服保全開場選元件ocr替换 (#8641) 2024-03-17 14:13:12 +08:00
Manicsteiner
2efe941daf feat: YoStarJP SSS#4 (#8630) 2024-03-16 17:35:32 +00:00
David
767edee59c fix: Eyjafjalla Alter ocr
Fix  #8629
[Skip changelog]
2024-03-16 08:50:16 +01:00
status102
e0d332e3fa ci: 移除空格转义 2024-03-16 15:29:55 +08:00
status102
302a82eb68 ci: 调整字符串拼接
[skip changelog]
2024-03-16 14:59:54 +08:00
status102
e2f15fbb16 ci: 修复nightly的changelog tag选取 2024-03-16 10:52:38 +08:00
status102
430f656a95 fix: 自动战斗作业自动点赞检测 2024-03-16 10:43:23 +08:00
status102
dcd6011141 fix: 自动战斗日志时间丢失
[skip changelog]
2024-03-16 09:42:12 +08:00
Constrat
531e169a1e fix: IS4 strategy level and encounter
[skip changelog]
2024-03-15 15:04:56 +01:00
HX3N
8ff37f3f73 chore: YoStarKR update operator.md (#8626) 2024-03-15 13:42:43 +00:00
Constrat
cf6cb8ab14 chore: Auto Update Game Resources - 2024-03-15
[skip changelog]
2024-03-15 11:04:04 +00:00
status102
217e3d40dd ci: 再修一下 2024-03-15 18:49:25 +08:00
status102
c686f8e187 ci: 尝试修复换行混乱 2024-03-15 18:09:46 +08:00
Wallsman
af8ff14e18 Update operators.md for JP ダーティマネー
Update operators.md for JP ダーティマネー
2024-03-15 18:40:08 +09:00
status102
897f8066fc ci: 修改自动生成changelog与上个tag对比,而非与上个公版 2024-03-15 16:48:13 +08:00
MistEO
5f8c3e0e02 chore: Update .clang-format
SeparateDefinitionBlocks: Always
2024-03-15 16:42:21 +08:00
Constrat
871f611141 chore: IS4 last template
[skip changelog]
2024-03-15 09:41:59 +01:00
Constrat
b250d7ac26 chore: IS4 template
[skip changelog]
2024-03-15 09:15:25 +01:00
status102
6c1f95637c ci: nightly auto changelog (#8614)
* ci: nightly auto changelog

* perf: 移除不必要的参数

* perf: review

Co-authored-by: AnnAngela <naganjue@vip.qq.com>

---------

Co-authored-by: AnnAngela <naganjue@vip.qq.com>
2024-03-15 15:51:05 +08:00
status102
37ae5d611e perf: 肉鸽投资模式进入第二层拓展为投资模式启用购物、招募 2024-03-15 11:40:14 +08:00
uye
a6be1dc4d5 fix: 外服小车名称识别 2024-03-14 23:18:21 +08:00
zayn7lie
a7db686116 docs: rename Linux模拟器.md to Linux模拟器&容器.md (#8513)
Update and rename Linux模拟器.md to Linux模拟器&容器.md
2024-03-14 23:09:26 +08:00
Constrat
6c06e49168 fix: IS4 EN foldartal declare text 2024-03-14 14:46:10 +01:00
Constrat
4d2214e413 i18n: EN consistencies
[skip ci] [skip changelog]
2024-03-14 14:30:20 +01:00
David
478765a2df fix: Foldartal use for IS4 - overseas (#8612)
* feat: resource updater Sami@Roguelike@FoldartalUseOcr

* chore: updated tasks
2024-03-14 13:08:32 +01:00
Constrat
c2aa103a49 chore: IS4 template
[skip changelog]
2024-03-14 12:04:43 +01:00
status102
aa7f98b836 ci: pr checker 2024-03-14 17:38:03 +08:00
Constrat
2915678e90 chore: Auto Update Game Resources - 2024-03-14
[skip changelog]
2024-03-14 09:02:44 +00:00
Constrat
3af7dd863a chore: IS4 bosky passage template
[skip changelog]
2024-03-14 08:38:39 +01:00
AnnAngela
2ac2ec7f79 ci: 优化changelog (#8608) 2024-03-14 07:25:43 +00:00
status102
7cc1e7b551 perf: 自动战斗-自动编队存储编队信息 (#8542) 2024-03-14 11:24:18 +08:00
status102
a4e5c595d3 style: var name 2024-03-14 11:22:36 +08:00
uye
54be213527 Release v5.2.0 (#8603) 2024-03-14 11:15:33 +08:00
github-actions[bot]
d160fc6572 docs: Auto Update Changelogs of v5.2.0 (#8606)
* docs: Auto Generate Changelog of Release v5.2.0

* docs: Update CHANGELOG.md

* docs: changelog

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-03-14 11:15:16 +08:00
uye
1858055b49 style: 格式化 2024-03-14 10:29:50 +08:00
Constrat
81f934647f chore: IS4 template
[skip ci] [skip changelog]
2024-03-13 22:03:54 +01:00
Constrat
ab76804767 chore: IS4 EN higher floors NextLevel text 2024-03-13 21:28:58 +01:00
Constrat
9759890b68 chore: Auto Update Game Resources - 2024-03-13
[skip changelog]
2024-03-13 20:03:24 +00:00
Constrat
a017f5a546 chore: removed threshold for IS trasks
[skip changelog]
[skip ci]
2024-03-13 20:50:44 +01:00
Constrat
6e35bb6379 fix: IS4 EN drop recruit selection option 2024-03-13 20:41:02 +01:00
Constrat
811c38e6a8 chore: Auto Update Game Resources - 2024-03-13
[skip changelog]
2024-03-13 13:44:28 +00:00
Constrat
e3fb8e608b chore: IS4 tasks
[skip changelog]
2024-03-13 14:39:32 +01:00
Constrat
0ad2df9813 refactor(tools): removed parenthesis for OCR
[skip changelog]
2024-03-13 13:28:06 +01:00
uye
d1a1010e53 fix: 基建換班 Lancet-2/Castle-3 识别异常
fix #8593
fix #7072
fix #8026
2024-03-13 18:17:13 +08:00
status102
a5fa75543b perf: 下调截图用时>800ms时的警告等级 2024-03-13 17:08:19 +08:00
status102
f9599282f9 fix: InfrastTrainingOperatorAndSkill.OcrReplace
[skip changelog]
2024-03-13 14:57:18 +08:00
status102
ba449e89f2 fix: 基建专精干员名切割错误 2024-03-13 10:01:06 +08:00
Constrat
b57a27fe2e chore: Auto Update Game Resources - 2024-03-12
[skip changelog]
2024-03-12 21:42:51 +00:00
Constrat
19fb2b0583 fix: file extension change for template
[skip changelog]
2024-03-12 22:23:36 +01:00
Constrat
2bd4bd58bc chore: safe house task IS4
[skip ci] [skip changelog]
2024-03-12 22:20:31 +01:00
Constrat
becd5e1a69 fix: IS4 EN floor detection workaround + continue text algorithm 2024-03-12 22:17:44 +01:00
Constrat
b46a6e5f82 chore(tools): ignore json translations
[skip changelog]
2024-03-12 22:16:44 +01:00
Constrat
374861e561 chore: IS4 EN templates
[skip changelog]
2024-03-12 22:16:24 +01:00
Constrat
50c804c7e0 fix: IS formation first operator misplace 2024-03-12 21:44:23 +01:00
Constrat
e4ce8009ad feat: added foldartal totems to resource updater 2024-03-12 21:43:36 +01:00
Constrat
60482d7dea chore: IS4 EN templates
[skip changelog]
2024-03-12 19:33:19 +01:00
Constrat
36b7cc180e chore(tools): ignoring templates Overseas 2024-03-12 19:32:50 +01:00
Constrat
d79a9b92ed chore: IS4 templates
[skip ci] [skip changelog]
2024-03-12 18:46:07 +01:00
status102
f90fc74916 fix: 修复#7848 2024-03-12 22:50:14 +08:00
status102
ce37e751de perf: 调整CopilotViewModel.AddLog
[skip changlog]
2024-03-12 18:07:09 +08:00
status102
c6ee063189 fix: 肉鸽投资无法禁用 2024-03-12 15:39:18 +08:00
status102
529e053edd perf: Toast改为win10API 2024-03-12 10:00:55 +08:00
Constrat
714015bb8e fix: increased roi for RoguelikeFormationOcr EN (fix long names) 2024-03-11 23:12:49 +01:00
Constrat
bda25e549f fix: ocr for trader shopping 2024-03-11 22:50:19 +01:00
Constrat
b5b30f9539 style: fix style typos
[skip ci] [skip changelog]
2024-03-11 16:53:24 +01:00
Constrat
58a2dc831c perf: reduced IS stages according to new Auto Updater EN
[skip changelog]
2024-03-11 16:51:49 +01:00
Constrat
5c0f903f43 perf: reduced Resource Auto Updater duplicate IS stages 2024-03-11 16:51:12 +01:00
Constrat
30cd2fc487 perf: redundant regex removed for EN 2024-03-11 16:50:48 +01:00
status102
fc2449feeb fix: 修修
[skip changelog]
2024-03-11 19:34:17 +08:00
status102
2725b30841 perf: 基建专精干员名增加ocrReplace 2024-03-11 19:23:05 +08:00
uye
8274997c45 style: typo 2024-03-11 17:50:27 +08:00
Manicsteiner
f89eca7794 perf: 水月肉鸽添加缺失干员用法 (#8574) 2024-03-11 17:43:53 +08:00
uye
2dee06a0f0 perf: 训练室干员名识别优化
fix #8352
fix #8566
2024-03-11 11:28:54 +08:00
status102
5153082de5 perf: TemplDecOCRer的RegionOCRer引入use_raw 2024-03-11 10:50:17 +08:00
Constrat
177f72fd01 chore: B-> 8 for NumberOcrReplace
[skip changelog]
2024-03-10 22:50:04 +01:00
Constrat
dd2e09f7ed chore: Auto Update Game Resources - 2024-03-10
[skip changelog]
2024-03-10 20:44:15 +00:00
David
47f93548fc Feat: IS4 - YostarEN early adaptation (#8524)
* chore: new IS4EN templates

* perf: optimized regex for trader shopping

* chore: encounter regex

* chore: encounters regex

* fix: regexed spaces between encounters.

* perf: RoguelikeTraderShoppingOcr regex reduction

* chore: floors strategies

* i18n: IS4 translations
[skip ci]

* fix: missing transl
[skip ci]

* chore: more templates

* fix: encounter not recognized correctly

* chore: templates

* fix: attempt to fix wrong level recognition in IS
2024-03-10 20:37:48 +00:00
status102
b318c4a878 docs: 调整账号切换功能说明 2024-03-10 23:15:23 +08:00
Constrat
9f3ff3c07a chore: Auto Update Game Resources - 2024-03-10
[skip changelog]
2024-03-10 14:42:33 +00:00
Constrat
482bfb7f39 style(tools): Resource updater
#8499 #8500
[skip changelog]
2024-03-10 15:35:29 +01:00
Constrat
e26e1f7f38 fix: missing trader item 2024-03-10 15:35:29 +01:00
HX3N
11f0aa4e2e chore: YoStarKR update tasks (#8568)
Update tasks.json
2024-03-10 13:00:45 +00:00
Lancarus
4915ef3276 perf: 肉鸽适配新干员用法 (#8565) 2024-03-10 19:51:01 +08:00
status102
60440f262b docs: 调整账号切换功能说明 2024-03-10 17:57:07 +08:00
Constrat
2992a1a02e chore(tools): ignore templates
[skip changelog]
2024-03-09 22:52:20 +01:00
HX3N
84b722ab23 chore: YoStarKR ROI for StartToVisit (#8558) 2024-03-09 20:59:46 +00:00
Hao Guan
b2c532e7aa chore: 锁定Xcode SDK版本 (#8533) 2024-03-10 04:06:55 +08:00
Manicsteiner
cdc15ee101 chore: YoStarJP ROI for StartToVisit, sami template StageFerociousPre… (#8555)
chore: YoStarJP ROI for StartToVisit, sami template StageFerociousPresageEnter
2024-03-09 16:55:06 +00:00
uye
56e545de3a fix: 蓝叠模拟器多开,在正确配置关键词时,两个MAA实例会指向同一个模拟器实例
fix #8547
2024-03-09 19:02:42 +08:00
Constrat
51e656ae8e chore: Auto Update Game Resources - 2024-03-09
[skip changelog]
2024-03-09 09:03:37 +00:00
status102
1c3d9be1b2 perf: 简化输出
[skip changelog]
2024-03-09 17:00:34 +08:00
Constrat
3e3c2450c8 fix: custom ROI for StartToVisit YostarEN
fix #8540
fix #8537
2024-03-09 09:45:45 +01:00
status102
dbb9e1c554 perf: FAQ文档增加截图耗时较长/过长说明,移除Wpf中的优化提示 2024-03-09 16:16:28 +08:00
Lancarus
1fd26107b9 perf: 密文板输入框支持全角分号 (#8545) 2024-03-09 15:58:07 +08:00
Lancarus
8054460c1a perf: 格式化#8539 (#8544) 2024-03-09 15:52:43 +08:00
uye
01ea6c00a9 feat: 萨米肉鸽增加凹远见密文板 (#8539) 2024-03-09 15:28:49 +08:00
status102
4361cb5ee3 perf: 减少不必要的变量赋值
[skip changelog]
2024-03-09 15:14:10 +08:00
status102
fa55db7e1e perf: 略微上调干员部署滑动
参照#7246
2024-03-09 15:14:10 +08:00
MistEO
94a69d74c1 chore: update clang-format 2024-03-09 15:06:15 +08:00
uye
581b95db0d fix: 「银淞」无法进入基建
fix #8541
2024-03-09 14:57:19 +08:00
Lancarus
18355621b9 perf: 肉鸽失败重试次数上限改为999 2024-03-09 12:29:16 +08:00
Lancarus
bf73e14937 feat: 萨米肉鸽增加凹远见密文板 2024-03-09 12:17:13 +08:00
uye
04b230cc8c Release v5.2.0-beta.2 (#8525) 2024-03-09 03:34:37 +08:00
github-actions[bot]
1ee4dd9f58 docs: Auto Update Changelogs of v5.2.0-beta.2 (#8526)
* docs: Auto Generate Changelog of Release v5.2.0-beta.2

* docs: Update CHANGELOG.md

* docs: changelog

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-03-09 03:34:23 +08:00
Constrat
6b5f836e22 perf(auto-updater): reduced IS trader items + auto space remover for KR 2024-03-08 20:16:52 +01:00
status102
f12323deeb fix: 修复肉鸽投资ocr几率出错 2024-03-08 19:37:47 +08:00
Rbqwow
97aa809072 docs: fix links&winget&rip wsa (#8485)
* docs: 修复损坏的超链接&使用winget安装运行库

* doc: rip wsa
2024-03-08 18:19:14 +08:00
Constrat
d9ca21913b perf: removed duplicate regex
[skip ci] [skip changelog]
2024-03-08 10:35:36 +01:00
uye
11c5419871 chore: 调整访问好友的模板图 2024-03-08 16:11:47 +08:00
Constrat
b4438d7a9f chore: Auto Update Game Resources - 2024-03-08
[skip changelog]
2024-03-08 08:03:50 +00:00
uye
486efee545 fix: 「围攻」部分透明度高的模板图片无法识别
fix #8507
2024-03-08 16:01:19 +08:00
Constrat
8a28f57ac0 perf: reduced items count in Auto Resource Updater 2024-03-08 08:54:30 +01:00
Constrat
fba373469d chore: Auto Update Game Resources - 2024-03-08
[skip changelog]
2024-03-08 07:25:20 +00:00
Manicsteiner
e997986102 chore: YoStarJP roguelike data remove duplicate and fixes (#8521) 2024-03-08 15:15:51 +08:00
zzyyyl
979e3af778 feat: 根据灰度二值化关卡名后再识别 (#7848)
feat: RegionOCRer 允许设置参数使 OCR 识别时的图片为二值化的;关卡名二值化后再识别
2024-03-08 08:59:10 +08:00
Constrat
33c6f06773 i18n: changed Sami theme name to reduce issues 2024-03-07 23:07:13 +01:00
Lemon-miaow
9da3312a22 feat: Templates for new GUI (Siege) and fix #8503 (#8510)
* templates for new GUI (Siege)

* templates for new GUI (Siege)

* change roi
2024-03-07 19:22:50 +01:00
Constrat
3d4923b78d chore: Auto Update Game Resources - 2024-03-07
[skip changelog]
2024-03-07 15:25:00 +00:00
HY
9c6ae6cd06 chore: 繁中服「愚人號」復刻活動導航 (#8505) 2024-03-07 16:10:43 +01:00
Constrat
dfbc147ffb chore: Auto Update Game Resources - 2024-03-07
[skip changelog]
2024-03-07 12:30:24 +00:00
uye
127803b3b5 feat: 水晶箭行动活动导航 2024-03-07 20:24:43 +08:00
HX3N
1f1f94b2cb chore: YoStarKR update tasks for Sami roguelike (#8495)
* chore: YoStarKR update tasks for Sami roguelike

chore: update tasks.json

chore: YoStarKR update tasks (NextLevel)

* chore: Add missing items and remove duplicates

* chore: run resource updater

executed the Resource Updater that was in #8493

* chore: tweak 解脱 and 解脱? regex
2024-03-07 10:14:40 +01:00
David
3412d57f2c feat: Visit Friends can be toggled off (#8488) 2024-03-07 16:58:42 +08:00
status102
14d8bc0f5d perf: null check
[skip changelog]
2024-03-07 16:27:31 +08:00
Constrat
26b0589e0b chore: Auto Update Game Resources - 2024-03-07
[skip changelog]
2024-03-07 08:24:29 +00:00
Constrat
8b4c73e01a chore: Auto Update Game Resources - 2024-03-07
[skip changelog]
2024-03-07 04:02:58 +00:00
Constrat
1246f2f582 chore: Auto Update Game Resources - 2024-03-07
[skip changelog]
2024-03-07 02:23:48 +00:00
status102
90be17900d Revert "perf: 优化仓库识别速度 (#8113)"
This reverts commit 7df2060c3c.
2024-03-06 22:13:52 +08:00
status102
51d637659c perf: 移除不可达代码
[skip changelog]
2024-03-06 22:10:59 +08:00
status102
c217eaefc0 perf(WpfGui): 指定Wpf目标操作系统版本为win10 (#8409)
* perf(WpfGui): 指定Wpf目标操作系统版本为win10

* docs: 补充windows10 1809相关说明

* Revert "docs: 补充windows10 1809相关说明"

This reverts commit 97d8cb8b73.
2024-03-06 18:07:42 +08:00
Manicsteiner
d3245dcb86 chore: YoStarJP Sami rogue templates and tasks (#8486)
* chore: YoStarJP Sami rogue templates and tasks

* chore: add RoguelikeTempRecruitFlag.png

* chore: add remained templates
2024-03-06 08:31:54 +01:00
status102
589d5962b9 perf: null check
[skip changelog]
2024-03-06 14:33:32 +08:00
status102
2e1d34e43c perf: null check
[skip changelog]
2024-03-06 12:36:01 +08:00
Constrat
0e9151266a chor(tools): added more ignore templates
[skip ci] [skip changelog]
2024-03-05 22:44:57 +01:00
Constrat
0dfba56443 chore(tools): removed sami from ignore list
[skip changelog]
[skip ci]
2024-03-05 22:31:18 +01:00
Constrat
f49427e1dc fix: greyy alter ocr in battle
[skip ci]
2024-03-05 22:10:32 +01:00
Constrat
9160d6d912 chore: Auto Update Game Resources - 2024-03-05
[skip changelog]
2024-03-05 17:42:40 +00:00
Constrat
5abe552d56 fix: DV navigation
[skip ci] [skip navigation]
2024-03-05 18:34:44 +01:00
Constrat
d3ff599ab4 fix: "Retrospection" needed for "Rerun" events
[skip ci]
2024-03-05 18:31:03 +01:00
Constrat
3bbd61aedf Revert "feat: VisitFriends can be toggled off"
This reverts commit 37d92becca.
2024-03-05 18:03:41 +01:00
Constrat
ea77fcce91 chore: Auto Update Game Resources - 2024-03-05
[skip changelog]
2024-03-05 17:03:26 +00:00
Constrat
37d92becca feat: VisitFriends can be toggled off 2024-03-05 18:02:28 +01:00
Clock
1f0b06b165 chore: update template images (YostarKR) 2024-03-06 01:55:39 +09:00
Clock
845a9995aa chore: add missing resource for YoStarKR 2024-03-06 01:16:51 +09:00
Clock
ad87ab956b chore: update YostarKR resources 2024-03-06 01:06:22 +09:00
uye
aef7a82007 chore: 添加截图过长解决方案 2024-03-06 00:01:04 +08:00
HX3N
a3d7745954 chore: YoStarKR Sami roguelike templates and tasks (#8487) 2024-03-06 00:50:09 +09:00
Constrat
d4dc518774 chore: Auto Update Game Resources - 2024-03-05
[skip changelog]
2024-03-05 11:22:34 +00:00
uye
9203b3d9c3 Release v5.2.0-beta.1 (#8483) 2024-03-05 16:33:46 +08:00
github-actions[bot]
925bdf2a81 docs: Auto Update Changelogs of v5.2.0-beta.1 (#8484)
* docs: Auto Generate Changelog of Release v5.2.0-beta.1

* docs: changelog

* docs: changelog

* docs: changelog

* docs: changelog

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-03-05 16:32:57 +08:00
Constrat
0db0149b01 chore: Auto Update Game Resources - 2024-03-05
[skip changelog]
2024-03-05 07:02:33 +00:00
Clock
0dd832526c chore: Update ko-kr.xaml 2024-03-04 23:12:28 +09:00
status102
d393a227ea perf: 战斗列表添加作业时自动滚动到添加位置 (#8455)
perf: 战斗列表添加作业时自动滚动到添加位置
2024-03-04 18:38:35 +08:00
Constrat
a9b580da1e chore: DV navigation
d65fd35341
2024-03-04 11:20:51 +01:00
Constrat
543964929b chore: Auto Update Game Resources - 2024-03-04
[skip changelog]
2024-03-04 09:31:55 +00:00
status102
55d10017a1 perf: 使用PropertyChangedEventArgs.NewStartingIndex代替固定滚动到最后一个ListItem 2024-03-04 17:09:00 +08:00
Manicsteiner
87d3993226 chore: YoStarJP task for 翠玉の夢 and sami rogue (#8475) 2024-03-04 16:52:31 +08:00
Manicsteiner
c44d9132ad perf: 肉鸽开局奖励template删除文字部分 (#7991)
perf: standardized rewards for all clients, add more rewards of mizuki rogue
2024-03-04 16:48:45 +08:00
status102
dcbca0c672 perf(WpfGui): 统一碎石、吃药最大值为999
[skip changelog]
2024-03-04 16:34:07 +08:00
status102
c555bd5021 docs: 更正同时使用理智药+碎石的短路说明 (#8452)
docs: 更正同时使用理智药+碎石的短路说明
2024-03-04 14:42:25 +08:00
Constrat
dbddb55595 chore: Auto Update Game Resources - 2024-03-04
[skip changelog]
2024-03-04 04:06:27 +00:00
Fryze
9aa361cb6e chore: update resources for YostarKR (#8450) 2024-03-03 18:37:52 +01:00
Lancarus
94a8b7dcb1 perf: 增加肉鸽商店中招募券的购买优先度 (#8469)
* perf: 增加肉鸽商店中招募券的购买优先度
2024-03-03 22:19:49 +08:00
Rbqwow
3aa1261a34 doc: 合并还没冲突的冲突&重新写个例子 (#9) 2024-03-03 21:32:30 +08:00
Lancarus
32632402d3 fix: 傀影肉鸽选项造成的卡死 (#8468) 2024-03-03 20:10:50 +08:00
status102
26a1734e7a perf: 战斗列表添加作业时自动滚动到底部 2024-03-03 15:18:03 +08:00
status102
31c23c44e7 refactor: 调整SettingsViewModel的init (#8467)
[skip changelog]
2024-03-03 14:31:28 +08:00
status102
6c65842a9c refactor: 调整init
[skip changelog]
2024-03-03 14:02:15 +08:00
status102
c5370d1f1c fix: 已勾选理智药时再勾选碎石,无法自动9999
[skip changelog]
2024-03-03 11:47:54 +08:00
status102
2c72213108 fix: 修复取消勾选理智药时错误调整至9999 2024-03-03 10:44:42 +08:00
uye
12d1cf2ea6 perf: 抽卡风险提示默认选择取消 2024-03-03 03:05:35 +08:00
uye
f7270a349e fix: 生息演算卡在战斗结算
fix #8404
2024-03-03 02:00:16 +08:00
Lancarus
e61783dfec fix: 助战勾选框不出现bug (#8459) 2024-03-03 01:42:11 +08:00
status102
88c9054a91 fix: revert some change
[skip changelog]
2024-03-02 19:51:46 +08:00
Constrat
e8b1a4a65a style: tweaked comment description
[skip ci] [skip changelog]
2024-03-02 12:00:37 +01:00
Constrat
035ff6c926 style(i18n): spacing for reconnection gui log
[skip ci][skip changelog]
2024-03-02 11:08:08 +01:00
status102
8b5fb20957 docs: 更正同时使用理智药+碎石的短路说明 2024-03-02 16:14:49 +08:00
status102
e6367fd2a7 perf(WpfGui): 碎石时锁定理智药使用量为9999 (#8415)
perf(WpfGui): 碎石时锁定理智药使用量为9999
2024-03-02 13:50:05 +08:00
Lancarus
f725860acf fix: 修复肉鸽重复部署一个干员后不会开启技能 (#8447) 2024-03-02 13:27:03 +08:00
Constrat
4319a0f4ef chore: Auto Update Game Resources - 2024-03-02
[skip changelog]
2024-03-02 05:25:09 +00:00
status102
858de4ef40 perf: reduce warning
[skip changelog]
2024-03-02 09:13:36 +08:00
status102
6bcb238f9a perf(WpfGui): 运行期允许滚动战斗列表
fix #8421
2024-03-02 08:43:19 +08:00
Constrat
690c99c4e3 fix: updated YostarEN infrast templates
fix #8439
2024-03-01 20:19:35 +01:00
FreeSky-X
7df2060c3c perf: 优化仓库识别速度 (#8113)
* perf:仓库识别

* perf:仓储识别

* fix:depot遗漏材料

* fix:ci集成

* fix:定位得分低

* feat: update analyze_all_items, format code

---------

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2024-03-01 21:29:41 +08:00
Manicsteiner
8157dedc22 i18n: update ja-jp.xaml for sami (#8435) 2024-02-29 20:45:49 +01:00
HX3N
8f4e63d633 i18n: updated ko-kr.xaml for 探索者的银凇止境 (#8433)
i18n: some change
2024-02-29 20:45:40 +01:00
Manicsteiner
531c65ed7c perf: 肉鸽开局干员 隐藏未实装干员 (#8436) 2024-02-29 20:42:50 +01:00
Manicsteiner
f3d6358dd7 docs: update glossary (#8437) 2024-02-29 20:13:54 +01:00
Constrat
9b2da02bdd chore(tools): updated ignore templates list
[skip ci] [skip changelog]
2024-02-28 22:13:14 +01:00
Lancarus
999f9087b5 feat: 刷开局模式增加萨米肉鸽生活队凹密文板 (#8408)
* feat: 增加萨米肉鸽凹密文板UI,优化肉鸽部分UI的显示

* feat: 凹开局板子相关逻辑

* perf: 优化相关逻辑

* perf: 传参使用array代替string

* style: format

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-02-28 13:01:15 +08:00
Manicsteiner
400dc9f42f chore: YoStarJP modified template image (#8423) 2024-02-28 12:15:52 +08:00
HX3N
5397727f95 chore: YoStarKR modified ocrReplace and template image (#8418)
chore: YoStarKR modified ocrReplace and template image due to UI Changes
2024-02-27 19:58:08 +01:00
Constrat
437ae363ae chore: updated Friends Terminal templates for EN after 27-02-2024 update
[skip ci]
2024-02-27 19:56:32 +01:00
Constrat
129cff1ac2 i18n: EN tweak raid -> challenge
[skip ci] [skip changelog]
2024-02-27 19:25:23 +01:00
Constrat
637b8be32c chore: Auto Update Game Resources - 2024-02-27
[skip changelog]
2024-02-27 12:03:21 +00:00
status102
3c7f0d8e00 perf: 减少部分传参
[skip changelog]
2024-02-27 20:00:29 +08:00
Constrat
eca4f95612 chore: Auto Update Game Resources - 2024-02-27
[skip changelog]
2024-02-27 11:23:26 +00:00
uye
d0392b70c7 chore: await Async 2024-02-27 11:19:44 +08:00
status102
5581776313 perf(WpfGui): 碎石时锁定理智药使用量为9999 2024-02-27 11:09:01 +08:00
Constrat
8a7cf9ee56 chore: Auto Update Game Resources - 2024-02-27
[skip changelog]
2024-02-27 03:03:46 +00:00
uye
1ec93236f6 docs: 更新&重构文档 (#8316)
~~怎么就发版了~~
把除了jp以外所有的`<br>`全都改成了双空格或者回车 jp在另一个专门写jp的pr ~~md就好好去用md的换行啊kora!~~
更新所有的一图流链接 ~~甚至改了个maacore注释结果一直触发action对不起github~~
添加win7用net8的缓解措施
添加手机助手会占用adb
改了一些小东西 大概 具体看comment
加回了mumu6的文档 但是标记停更
同步zh的readme和根目录下的的readme
修改了一些文风 大概更贴近“官方文档”这种? 哪里不对劲可以说说(
2024-02-27 10:33:27 +08:00
Manicsteiner
55f5c5508e docs: refactor JP docs (#8298)
* docs: refactor JP docs

* docs: JP docs update part2

* docs: JP docs update part3

* docs: JP docs update part4

* docs: JP docs update part5

* docs: JP docs update part6

* docs: JPdocs update part7

* docs: JPdocs update part8

* docs: JPdocs update part8

* docs: JPdocs update part10

* docs: JPdocs update part11

* docs: JPdocs update part12
2024-02-27 10:19:07 +08:00
uye
af71f497ec fix: [台服] 自定義基建換班辨認 麒麟R夜刀 失敗
fix #7698
2024-02-27 10:15:21 +08:00
status102
436eabcb76 perf: 识别不到干员的重试次数下调为1 2024-02-26 19:38:20 +08:00
status102
4ec8c32a9d fix: 回调自动编队时识别不到干员的重试次数
[skip changelog]
2024-02-26 19:17:41 +08:00
status102
55345e6efa fix: 修复使用干员组切换技能用法失效 (#8410)
fix: 修复使用干员组切换技能用法失效
2024-02-26 08:05:13 +08:00
status102
61fbb12099 perf(MaaCore): 移除自动战斗设置参数时不必要的警告输出 2024-02-25 22:45:11 +08:00
SmilingPie
1079844c22 perf: 优化自动编队逻辑 (#8393)
现在当识别到缺失的干员时会记录并继续编队,全部编队完成后一并报告并退出
并将自动编队重试次数调为0(不重试)
TODO:当仅缺失一个干员时自动借助战
2024-02-25 21:50:55 +08:00
status102
931b11339c fix: 修复使用干员组切换技能用法失效 2024-02-25 20:58:51 +08:00
status102
6f29561f57 perf: 调整基建专精输出文本 2024-02-25 20:10:44 +08:00
status102
172dfa62a4 perf: 移除肉鸽投资相关的无用代码 2024-02-25 18:28:38 +08:00
status102
cf15e7d65b perf: 优化自动战斗-干员追加处理正则及jarry初始化
[skip changelog]
2024-02-25 16:48:39 +08:00
status102
0ee6079edc perf(WpfGui): 肉鸽高级设置-只凹精二,不可用时隐藏 2024-02-25 16:12:59 +08:00
Horror Proton
0478eb3be8 fix: update yituliu report url
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8332
2024-02-25 11:11:35 +08:00
MistEO
3fdc1d2011 chore: update meojson to v4.0.1 2024-02-25 01:10:19 +08:00
MistEO
3ee30f23ff fix: wrong std::move of meojson 2024-02-25 00:02:27 +08:00
status102
50f6813de8 perf: asst.log中的输出使用相对路径取代绝对路径 (#8385)
* perf: AbstractConfig::Load改为输出相对路径

* perf: 输出相对路径
2024-02-24 22:31:19 +08:00
MistEO
c8cc39515a fix: build error from meojson updates 2024-02-24 22:25:19 +08:00
MistEO
bc4313e9e2 chore: update meojson to v4.0.0 2024-02-24 22:25:19 +08:00
status102
33dac71960 fix: 修复引航者试炼S4地图TN-1、TN-3的部分数据错误 2024-02-24 20:31:40 +08:00
HX3N
9de91e8709 chore: update operator.md (#8403)
add kr operator
[skip changelog]
2024-02-24 12:32:39 +01:00
Lancarus
84f34ebdb2 perf: 优化傀影肉鸽部分关卡策略 (#8401) 2024-02-24 19:00:04 +08:00
status102
1ba2c557d5 chore: 触发版本更新
[skip changelog]
2024-02-24 18:13:32 +08:00
status102
647cf6d656 fix: 修复引航者试炼S4地图TN-2、TN-4的部分数据错误 2024-02-24 18:00:05 +08:00
status102
501003b108 fix: 干员冷却RectMove 2024-02-24 16:17:51 +08:00
Wallsman
9c94dfea97 Update operators.md
Update 「樹影にて眠る」
2024-02-24 14:56:42 +09:00
status102
53b644b688 fix: 修复肉鸽切换模式时,投资可能在禁用的情况下显示已启用
fix #8396
2024-02-24 12:14:06 +08:00
status102
1f2a6ca7eb perf: 结束后动作仅一次在执行后不恢复为无动作,而是上一次的选择项 (#8387)
perf: 结束后动作`仅一次`在执行后不恢复为`无动作`,而是上一次的选择项
2024-02-24 10:57:46 +08:00
status102
762e433036 perf: 将肉鸽开局干员组和开局干员移动至常规设置,未勾选使用助战时隐藏可选非好友助战 (#8389) 2024-02-24 01:16:50 +08:00
status102
3d85b7a351 perf(WpfGui): 当自动战斗选择不支持的关卡时,输出作业中的关卡名 2024-02-23 17:41:55 +08:00
status102
b40a5ec180 perf: 结束后动作仅一次在执行后不恢复为无动作,而是上一次的选择项 2024-02-23 10:58:41 +08:00
Constrat
f92f2f729f fix: b1d62d4d29 2024-02-22 17:46:50 +01:00
Constrat
b1d62d4d29 i18n: ContinueTraining EN translation
[skip changelog]
2024-02-22 16:20:54 +01:00
status102
4067c9d369 chore: 领航者S4地图 2024-02-22 23:14:26 +08:00
uye
ac3dcd9175 chore: 删除continue 2024-02-22 20:30:15 +08:00
uye
7fe35dfa24 fix: 肉鸽闪退 2024-02-22 20:26:11 +08:00
Constrat
9867a46106 chore: Auto Update Game Resources - 2024-02-22
[skip changelog]
2024-02-22 10:25:53 +00:00
Rbqwow
3001fc30ba doc: 于是我加回了mumu6 2024-02-22 18:23:36 +08:00
Rbqwow
4e02c82efd docs: review update 2024-02-22 18:17:32 +08:00
Constrat
573a16e143 chore: Auto Update Game Resources - 2024-02-22
[skip changelog]
2024-02-22 06:43:09 +00:00
uye
7e97aadb5f feat: 支持肉鸽事件choice_require解析 (#7904)
- fix #5442 
- fix #7789 
- fix #7800 
- fix #7900 
- fix #7938
- fix #7943
2024-02-22 14:35:06 +08:00
Constrat
d6a4c9df20 chore: Auto Update Game Resources - 2024-02-21
[skip changelog]
2024-02-21 20:24:16 +00:00
Horror Proton
6f00c2db39 fix: fix ocr replace [skip changelog] 2024-02-21 21:55:26 +08:00
Horror Proton
078feead6f fix: fix oper rect in InfrastOperImageAnalyzer
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8377
2024-02-21 18:23:28 +08:00
Horror Proton
396460fe7e fix: update template DepotEnterMistCity
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8344
2024-02-21 00:57:10 +08:00
aur3l14no
d5cac654cb chore: 增加连接配置项 CompatPOSIXShellWithoutScreencapErr (#8359)
增加连接配置项 CompatPOSIXShellWithoutScreencapErr

以支援 Linux + AMDGPU 的情形
2024-02-20 17:59:27 +08:00
Horror Proton
d3686d4262 fix: update ocr replace for 亚梅塔 and 「弦驚] 2024-02-20 17:26:59 +08:00
Horror Proton
18f572e0e3 fix: fix oper rect in InfrastOperImageAnalyzer
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8362
2024-02-20 17:13:52 +08:00
Alisa
15b537b0e2 i18n: Translations update from MAA Weblate (#8339)
* Translated using Weblate (Japanese)

Currently translated at 99.4% (680 of 684 strings)

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translated using Weblate (Chinese (Traditional))

Currently translated at 99.6% (659 of 661 strings)

Translated using Weblate (Japanese)

Currently translated at 99.3% (657 of 661 strings)

Translated using Weblate (English (United States))

Currently translated at 99.3% (657 of 661 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 98.1% (649 of 661 strings)

Co-authored-by: Manicsteiner <manicsteiner@outlook.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: drunkenQCat <songjh123123@outlook.com>
Co-authored-by: uye <2396806385@qq.com>
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/en_US/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/ja/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/zh_Hans/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/zh_Hant/
Translation: MaaAssistantArknights/MAA WPF Gui

* i18n: en typos

* style: format

---------

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Manicsteiner <manicsteiner@outlook.com>
Co-authored-by: drunkenQCat <songjh123123@outlook.com>
Co-authored-by: uye <2396806385@qq.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-02-20 11:19:57 +08:00
Sherkey
58e1788072 fix: 修复未识别到幸运墙时报错的问题 2024-02-19 21:05:39 +08:00
status102
ed7da40e60 perf: 版本字符串中文资源优化对齐 2024-02-19 15:48:51 +08:00
Rbqwow
dd5e9519a9 docs: 把被git顶丢的改加来 2024-02-18 23:31:19 +08:00
Rbqwow
7dce5b6c25 doc: 加个停更版本号 2024-02-18 23:19:13 +08:00
status102
1a65cd840b fix: 修复部分角色冷却识别错误 (#8366)
fix: 修复部分角色冷却识别错误
2024-02-18 22:57:24 +08:00
status102
e6bf3c4605 chore: 待部署区识别debug时m_image_draw增加冷却中文本 2024-02-18 22:44:31 +08:00
status102
39693497ea fix: 修复部分角色冷却识别错误 2024-02-18 22:41:48 +08:00
status102
65e96f7313 docs: 用户手册补充备选关卡相关 (#8355)
* docs: 用户手册补充备选关卡相关

* style: format
2024-02-18 20:31:44 +08:00
Manicsteiner
88aa5cc9e9 chore: YoStarJP training template (#8351) 2024-02-18 12:42:56 +01:00
status102
4f55990e8f fix: typo 2024-02-18 12:01:27 +08:00
status102
d9486f2432 perf: fix some info from visual studio 2024-02-18 09:48:34 +08:00
status102
e8e9937c43 fix: 战斗列表突袭标志点击后暂时不可见 2024-02-18 09:13:10 +08:00
status102
4a464c14ec fix: 自动战斗-战斗列表的突袭关描述从Adverse修正为Raid (#8082)
* fix: 修复WpfGui中对突袭关的错误描述
2024-02-17 19:28:31 +08:00
Constrat
f4df22907a chore: Auto Update Game Resources - 2024-02-16
[skip changelog]
2024-02-16 11:03:14 +00:00
status102
4fb9aa2c8b perf: 如果待部署区未识别干员全部为冷却中,则跳过暂停识别 (#8337)
perf: 如果待部署区未识别干员全部为冷却中,则跳过暂停识别
2024-02-16 17:21:12 +08:00
status102
6c79ff49ee fix: 修复部分情况下待部署区干员无法正确识别为冷却中 (#8336)
* fix: 修复部分情况下待部署区干员无法正确识别为冷却中

* fix: remove test code
2024-02-15 19:42:35 +08:00
status102
6d8ca0f3ae perf: 如果待部署区未识别干员全部为冷却中,则跳过暂停识别 2024-02-15 16:15:54 +08:00
Rbqwow
8e69781d5e docs: 修细节&更新 2024-02-14 23:18:06 +08:00
Rbqwow
627fd12893 doc: 接着修超链接&合并修改 2024-02-14 21:55:42 +08:00
Rbqwow
c704e2aa70 doc: readme超链接改错了 改回来 2024-02-14 21:52:28 +08:00
Rbqwow
f3eef61341 docs: 修复所有的一图流失效链接&同步两个readme 2024-02-14 21:43:00 +08:00
Rbqwow
e346b24d33 docs: 改掉en-us的<br> 2024-02-14 21:26:29 +08:00
Rbqwow
95b3bea4be docs: 改掉ko-kr的<br>和bug 2024-02-14 21:24:41 +08:00
Rbqwow
294cfee63f docs: 改掉zh-tw的<br> 2024-02-14 21:19:25 +08:00
Rbqwow
05625c3f5e docs: xjb改点细节 2024-02-14 21:11:16 +08:00
Rbqwow
7686c29a10 docs: 接着改<br> 2024-02-14 20:54:37 +08:00
Rbqwow
d42722b127 docs: 改掉所有能改的<br> 2024-02-14 20:49:09 +08:00
Rbqwow
04c921c873 doc: 改掉readme所有的<br> 2024-02-14 20:21:45 +08:00
Rbqwow
55a9db2218 doc: 改掉readme中多余的空行 2024-02-14 20:18:50 +08:00
Rbqwow
3ac0a1d1d4 chore: 改回去! 2024-02-14 20:17:29 +08:00
Rbqwow
60ad3e1f7c doc: 添加关闭手机助手 2024-02-14 20:16:35 +08:00
Rbqwow
7a88dbb780 doc: 改两个字 2024-02-12 23:38:57 +08:00
Rbqwow
5dc39561e3 doc: 添加win7缓解措施 2024-02-12 22:19:42 +08:00
SherkeyXD
3d11713555 refactor: 初步重构 choice_require 结构 2024-02-05 16:02:31 +08:00
zzyyyl
a4024f19c5 perf: 优化代码 2024-02-05 16:02:31 +08:00
zzyyyl
be34b07274 perf: 将实现移入 .cpp 并稍作优化 2024-02-05 16:02:31 +08:00
Horror Proton
6365c70196 fix: fix task name of SpecialValRecognition, etc 2024-02-05 16:02:31 +08:00
uye
1a99d4d95d fix: 抗干扰值字段名错误 2024-02-05 16:02:31 +08:00
uye
b71168e601 style: 调整返回格式 2024-02-05 16:02:31 +08:00
uye
a72dfbee70 fix: typo 2024-02-05 16:02:31 +08:00
uye
6bf3619d66 fix: requirement.chaos_level.type改为枚举 2024-02-05 16:02:31 +08:00
uye
b725c3aa72 chore: 循环中判断是否点击了停止 2024-02-05 16:02:31 +08:00
uye
ac4d249b35 chore: 识别到hp的时候从下往上点 2024-02-05 16:02:31 +08:00
uye
167991fae4 fix: typo 2024-02-05 16:02:31 +08:00
uye
8e8378583a feat: 添加hp识别判断是否成功点击 2024-02-05 16:02:31 +08:00
uye
808c10446d chore: use utils::chars_to_number<int, true> 2024-02-05 16:02:31 +08:00
uye
6cc215e552 chore: "Sami" -> RoguelikeTheme::Sami
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-02-05 16:02:31 +08:00
uye
e876017275 chore: ChaosLevel支持字符串类型的value 2024-02-05 16:02:31 +08:00
uye
6e5aed1317 chore: choice_require添加choose属性 2024-02-05 16:02:31 +08:00
uye
eb0838a485 feat: 支持肉鸽事件choice_require解析 2024-02-05 16:02:31 +08:00
7346 changed files with 1298822 additions and 318572 deletions

View File

@@ -1,35 +1,42 @@
Language: Json
ColumnLimit: 1000
IndentWidth: 4
---
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
# for clang-format 20.0.0
Language: Cpp
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
BasedOnStyle: "WebKit"
# AccessModifierOffset: 2
AlignAfterOpenBracket: "AlwaysBreak"
AlignArrayOfStructures: None
AlignConsecutiveMacros: None
AlignConsecutiveAssignments: None
AlignConsecutiveBitFields: None
AlignConsecutiveDeclarations: None
AlignConsecutiveMacros: None
# AlignConsecutiveShortCaseStatements: None
AlignEscapedNewlines: Left
AlignOperands: Align
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortEnumsOnASingleLine: false
AllowShortBlocksOnASingleLine: Empty
AlignTrailingComments:
Kind: Always
OverEmptyLines: 1
AllowAllArgumentsOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
# AllowShortCompoundRequirementOnASingleLine: true
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: InlineOnly
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: Inline
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true
AttributeMacros:
- __capability
BinPackArguments: true
BinPackParameters: true
BreakAfterReturnType: Automatic
AlwaysBreakBeforeMultilineStrings: true
BreakTemplateDeclarations: Yes
# AttributeMacros:
# - __pragma
# - _Pragma
# - __attribute__
# - __declspec
BinPackArguments: false
BinPackParameters: false
BitFieldColonSpacing: After
BraceWrapping:
AfterCaseLabel: false
AfterClass: true
@@ -37,159 +44,148 @@ BraceWrapping:
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
# AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: false
AfterUnion: true
AfterExternBlock: true
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
# BracedInitializerIndentWidth: 4
BreakAfterAttributes: Never
BreakAfterJavaFieldAnnotations: true
BreakArrays: true
BreakBeforeBinaryOperators: None
BreakBeforeConceptDeclarations: true
BreakBeforeBraces: Custom
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeConceptDeclarations: Always
BreakBeforeInlineASMColon: OnlyMultiline
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
BreakStringLiterals: true
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
QualifierAlignment: Leave
# CommentPragmas: '^ MEO pragma:'
CompactNamespaces: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: false
DeriveLineEnding: true
DerivePointerAlignment: false
DisableFormat: false
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: LogicalBlock
ExperimentalAutoDetectBinPacking: false
PackConstructorInitializers: BinPack
BasedOnStyle: ''
ConstructorInitializerAllOnOneLineOrOnePerLine: false
AllowAllConstructorInitializersOnNextLine: true
# ExperimentalAutoDetectBinPacking: true
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IfMacros:
- KJ_IF_MAYBE
# ForEachMacros:
# - foreach
# - Q_FOREACH
# - BOOST_FOREACH
# IfMacros:
# - 'KJ_IF_MAYBE'
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
Priority: 3
SortPriority: 0
CaseSensitive: false
- Regex: '.*'
Priority: 1
SortPriority: 0
CaseSensitive: false
IncludeIsMainRegex: '(Test)?$'
IncludeIsMainSourceRegex: ''
# IncludeCategories:
# IncludeIsMainRegex:
# IncludeIsMainSourceRegex:
IndentAccessModifiers: false
IndentCaseLabels: false
IndentCaseBlocks: false
IndentGotoLabels: true
IndentPPDirectives: None
IndentCaseLabels: false
IndentExternBlock: AfterExternBlock
IndentGotoLabels: false
IndentPPDirectives: None
IndentRequiresClause: false
IndentWidth: 4
IndentWrappedFunctionNames: false
InsertTrailingCommas: None
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
IndentWrappedFunctionNames: true
InsertBraces: true
InsertNewlineAtEOF: true
InsertTrailingCommas: Wrapped
IntegerLiteralSeparator:
Binary: 4
BinaryMinDigits: 9
Decimal: 3
DecimalMinDigits: 7
Hex: -1
# JavaImportGroups:
# JavaScriptQuotes:
# JavaScriptWrapImports:
KeepEmptyLinesAtEOF: true
KeepEmptyLinesAtTheStartOfBlocks: false
LambdaBodyIndentation: Signature
MacroBlockBegin: ''
MacroBlockEnd: ''
# LineEnding: LF
# MacroBlockBegin: "MAA.*_NS_BEGIN$"
# MacroBlockEnd: "MAA.*_NS_END$"
# Macros:
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 2
ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakOpenParenthesis: 0
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 1000
PenaltyIndentedWhitespace: 0
NamespaceIndentation: None
# NamespaceMacros:
# ObjCBinPackProtocolList:
# ObjCBlockIndentWidth:
# ObjCBreakBeforeNestedBlockParam:
# ObjCSpaceAfterProperty:
# ObjCSpaceBeforeProtocolList:
PackConstructorInitializers: Never
# PenaltyBreakAssignment:
# PenaltyBreakBeforeFirstCallParameter:
# PenaltyBreakComment:
# PenaltyBreakFirstLessLess:
# PenaltyBreakOpenParenthesis:
# PenaltyBreakTemplateDeclaration:
# PenaltyExcessCharacter:
# PenaltyIndentedWhitespace:
# PenaltyReturnTypeOnItsOwnLine:
PointerAlignment: Left
PPIndentWidth: -1
ReferenceAlignment: Pointer
ReflowComments: true
# QualifierAlignment: Custom
# QualifierOrder:
# - inline
# - static
# - const
# - constexpr
# - type
ReferenceAlignment: Left
ReflowComments: Always
RemoveBracesLLVM: false
RemoveParentheses: Leave
RemoveSemicolon: false
RequiresClausePosition: OwnLine
SeparateDefinitionBlocks: Leave
ShortNamespaceLines: 50
RequiresExpressionIndentation: OuterScope
SeparateDefinitionBlocks: Always
ShortNamespaceLines: 1000
SortIncludes: CaseSensitive
SortJavaStaticImport: Before
SortUsingDeclarations: true
# SortJavaStaticImport:
SortUsingDeclarations: Lexicographic
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceAroundPointerQualifiers: Default
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeJsonColon: false
SpaceBeforeParens: ControlStatements
SpaceBeforeParensOptions:
AfterControlStatements: true
AfterForeachMacros: true
AfterFunctionDefinitionName: false
AfterFunctionDeclarationName: false
AfterIfMacros: true
AfterOverloadedOperator: false
AfterRequiresInClause: true
AfterRequiresInExpression: true
BeforeNonEmptyParentheses: false
SpaceAroundPointerQualifiers: Default
# SpaceBeforeParensOptions:
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: Never
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInLineCommentPrefix:
Minimum: 1
Maximum: -1
SpacesInParentheses: false
SpacesInParens: Never
SpacesInSquareBrackets: false
SpaceBeforeSquareBrackets: false
BitFieldColonSpacing: Both
Standard: c++20
StatementAttributeLikeMacros:
- Q_EMIT
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
# StatementAttributeLikeMacros:
# StatementMacros:
TabWidth: 4
UseCRLF: false
# TypeNames:
# TypenameMacros:
UseTab: Never
WhitespaceSensitiveMacros:
- STRINGIZE
- PP_STRINGIZE
- BOOST_PP_STRINGIZE
- NS_SWIFT_NAME
- CF_SWIFT_NAME
# VerilogBreakBetweenInstancePorts:
# WhitespaceSensitiveMacros:
RemoveEmptyLinesInUnwrappedLines: true

29
.devcontainer/Dockerfile Normal file
View File

@@ -0,0 +1,29 @@
FROM mcr.microsoft.com/devcontainers/base:ubuntu
USER vscode
ENV CONDA_DIR=/home/vscode/miniconda
ENV PATH="$CONDA_DIR/bin:$PATH"
ARG PYTHON_VERSION=3.12
ARG NODEJS_VERSION=24
# Install Miniconda
RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh \
&& bash ~/miniconda.sh -b -p $CONDA_DIR \
&& rm ~/miniconda.sh \
&& conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main \
&& conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
# Configure conda environment
RUN eval "$(conda shell.bash hook)" \
&& conda create -n maa python=$PYTHON_VERSION -y \
&& conda activate maa \
&& conda install -y conda-forge::nodejs=$NODEJS_VERSION \
&& pip install pre-commit black \
&& npm install -g pnpm
# Finalize conda setup
RUN conda init \
&& conda config --set auto_activate false \
&& echo "conda activate maa" >> ~/.bashrc

View File

@@ -1,16 +1,50 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
{
"image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04",
"features": {
"ghcr.io/devcontainers/features/python:1": {},
"ghcr.io/devcontainers/features/sshd:1": {}
"name": "MAA",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
// "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"build": {
"dockerfile": "Dockerfile"
},
"postCreateCommand": "sudo sh -ce 'apt update && apt install g++-12 -y && echo export CC=gcc-12 CXX=g++-12 >> /etc/profile.d/set-compiler.sh'",
// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [3001],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "bash .devcontainer/post-create.sh",
// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"DavidAnson.vscode-markdownlint"
]
"mkxml.vscode-filesize",
"nekosu.maa-support",
"DavidAnson.vscode-markdownlint",
"esbenp.prettier-vscode",
"vue.volar",
"ms-python.python",
"ms-python.black-formatter"
],
"settings": {
// format
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[markdown]": {
"editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
},
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
},
// python
"python.terminal.launchArgs": ["-u"],
"python.defaultInterpreterPath": "/home/vscode/miniconda/envs/maa/bin/python",
"python.terminal.activateEnvironment": false
}
}
}
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}

View File

@@ -0,0 +1,21 @@
#!/bin/bash
WORKSPACE=$(pwd)
# conda activate maa
echo "===================="
echo "Setting up git safe.directory for $WORKSPACE and its submodules..."
cd "$WORKSPACE"
git config --global --add safe.directory "$WORKSPACE"
git submodule foreach --recursive 'git config --global --add safe.directory "$toplevel/$path"'
echo "===================="
cd "$WORKSPACE"
echo "Installing dependencies for python..."
# pip install -r tools/.../requirements.txt
# pip install -r tools/.../requirements-dev.txt
echo "===================="
echo "Installing dependencies for nodejs..."
cd "$WORKSPACE"/docs
pnpm install --frozen-lockfile

View File

@@ -10,72 +10,3 @@ end_of_line = lf
[*.json]
indent_size = 4
[*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}]
indent_size = 4
# Visual C++ Code Style settings
cpp_generate_documentation_comments = xml
# Visual C++ Formatting settings
cpp_indent_braces = false
cpp_indent_multi_line_relative_to = innermost_parenthesis
cpp_indent_within_parentheses = indent
cpp_indent_preserve_within_parentheses = true
cpp_indent_case_contents = true
cpp_indent_case_labels = false
cpp_indent_case_contents_when_block = false
cpp_indent_lambda_braces_when_parameter = true
cpp_indent_goto_labels = one_left
cpp_indent_preprocessor = leftmost_column
cpp_indent_access_specifiers = false
cpp_indent_namespace_contents = true
cpp_indent_preserve_comments = false
cpp_new_line_before_open_brace_namespace = new_line
cpp_new_line_before_open_brace_type = new_line
cpp_new_line_before_open_brace_function = new_line
cpp_new_line_before_open_brace_block = same_line
cpp_new_line_before_open_brace_lambda = same_line
cpp_new_line_scope_braces_on_separate_lines = false
cpp_new_line_close_brace_same_line_empty_type = false
cpp_new_line_close_brace_same_line_empty_function = false
cpp_new_line_before_catch = true
cpp_new_line_before_else = true
cpp_new_line_before_while_in_do_while = false
cpp_space_before_function_open_parenthesis = remove
cpp_space_within_parameter_list_parentheses = false
cpp_space_between_empty_parameter_list_parentheses = false
cpp_space_after_keywords_in_control_flow_statements = true
cpp_space_within_control_flow_statement_parentheses = false
cpp_space_before_lambda_open_parenthesis = false
cpp_space_within_cast_parentheses = false
cpp_space_after_cast_close_parenthesis = false
cpp_space_within_expression_parentheses = false
cpp_space_before_block_open_brace = true
cpp_space_between_empty_braces = false
cpp_space_before_initializer_list_open_brace = false
cpp_space_within_initializer_list_braces = true
cpp_space_preserve_in_initializer_list = true
cpp_space_before_open_square_bracket = false
cpp_space_within_square_brackets = false
cpp_space_before_empty_square_brackets = false
cpp_space_between_empty_square_brackets = false
cpp_space_group_square_brackets = true
cpp_space_within_lambda_brackets = false
cpp_space_between_empty_lambda_brackets = false
cpp_space_before_comma = false
cpp_space_after_comma = true
cpp_space_remove_around_member_operators = true
cpp_space_before_inheritance_colon = true
cpp_space_before_constructor_colon = true
cpp_space_remove_before_semicolon = true
cpp_space_after_semicolon = false
cpp_space_remove_around_unary_operator = true
cpp_space_around_binary_operator = insert
cpp_space_around_assignment_operator = insert
cpp_space_pointer_reference_alignment = left
cpp_space_around_ternary_operator = insert
cpp_wrap_preserve_blocks = one_liners

View File

@@ -13,6 +13,7 @@
290cc30f153a0206bd870a0a58cb6338aa16ea34
db9afdc77e85d5fc462d923fca5318be021656cd
a5daac889a55baf8895918d4964f20dad1938470
9ed30c5658c88edf1ef839771a53c7d599183b8b
# incorrect format of 3rdparty/resource/Arknights-Tile-Pos/levels.json
65d654e54b9d04d1902c9ee9f9fb2679520adafd
@@ -22,6 +23,7 @@ a5daac889a55baf8895918d4964f20dad1938470
206df466fd5e3d8ef80387049b0c5011fb58cada
c9b5aa638a97397ab8666031ea646904527afc09
559c913fca0dd0966896396e251be13f76ea3e52
# Re-structure again.
4b3b84df8f487be0ac86506c28dbebc4635f1282
91abbb7f175b93a58368a136acf3799666f770d2
@@ -29,3 +31,24 @@ c9b5aa638a97397ab8666031ea646904527afc09
bae271c09bb79e5cc2a7f8491ce882d276ac97b4
3d83b80dd67d996a5f4f1732fe1eb36cacc7605e
21617270bcef2456cb7f89e54560ca6788450711
# resource/*.json prettier mass styling
d84da5d01a872540d520bc87408d4524e07cfa39
546bfc399cdd140a9812f44b5e6bc89fccfda5fa
f0bdccdf0da7fac29f475951f0f43d3ab56a7ffe
7a758bce844bc2778f04a789195efbd17681dac7
5f3730b76785b1168125eb3b5edbed399722f8f9
bc3ad67a02cb3b8e154c06955cf17091c4265000
# oxipng template optimization
e3d63894b28b2ef5e2405e144a32a6981de5e1b2
# refactor: divide tasks.json into multiple jsons
dce6e317c8e56836662b64ac4b3d1a69b4ff4dd8
# usage: add "[blame ignore]" to the commit message
# This file is managed by an automated workflow
# Do not add, remove or modify lines below this comment
# as they are automatically appended
# --------------------------------------------------- #
f7772bc814c52f9a5e65af02404cf54b70fe0a32

1
.gitattributes vendored
View File

@@ -8,4 +8,5 @@
*.json text eol=lf
*.md text eol=lf
*.yml text eol=lf
*.yaml text eol=lf

1
.github/.last-blame-ignore-commit vendored Normal file
View File

@@ -0,0 +1 @@
272d71fa2938f945832f86232532b86a9e5406b8

View File

@@ -1,20 +1,22 @@
name: Bug 反馈(使用中文)
description: 识别错误、操作异常、连接错误等
labels: ['bug']
labels: ["bug"]
body:
- type: checkboxes
id: checks
attributes:
label: 在提问之前...
label: 请确认自己完成了下列必选项之后再进行勾选,若未完成必选项或勾选了"我未仔细阅读"选项将视为自愿接受被直接关闭 Issue
options:
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
required: true
- label: 填写了简短且清晰明确的标题,以便开发者在翻阅 issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: true
- label: 已查看最新测试版本的更新内容,并未提及该 bug 已被修复的情况
required: true
- label: 已检查了置顶议题pinned issue确认我的问题未被提及
required: true
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
required: false
- label: 未仔细阅读这些内容,只是一键已读[所有内容](/MaaAssistantArknights/MaaAssistantArknights/issues),并相信这不会影响问题的处理
required: false
- label: 填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: false
- label: 使用的是当前更新版本的最新版, 并已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/), [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容并未提及该 Bug 已被修复的情况
required: false
- label: 我已检查了 [常见问题](https://docs.maa.plus/zh-cn/manual/faq.html), [公告](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) 确认我的问题未被提及
required: false
- type: textarea
id: describe
attributes:
@@ -26,32 +28,49 @@ body:
id: version
attributes:
label: Version
description: >-
请提供 MAA 版本。可在 MAA -> 设置 -> 软件更新中找到。(点击图标可复制
description: |
请提供 MAA 版本。可在 MAA -> 设置 -> 软件更新中找到。点击图标可复制
请分别点击 `资源版本` 和 `MAA 版本` 并粘贴,最终应有 5 行版本信息。
placeholder: |
Resource Version:
UI Version:
Core Version:
MAA Version:
validations:
required: true
- type: textarea
id: logs
attributes:
label: 日志文件
label: 日志和配置文件
description: |
**上传 `debug` 文件夹中的 `asst.log` 和 `gui.log` 日志文件,并说明问题出现的大致时间点**
**请在 MAA -> 设置 -> 问题反馈中找到生成日志压缩包按钮,点击并上传压缩包**
**请直接将完整的文件拖拽进来,而非自己裁切或复制的片段;若文件体积过大可压缩后再上传**
如果你在使用 MacBook请点击屏幕左上角的“文件”点击“打开日志文件夹”
placeholder: |
请确认上传文件前已关闭 MAA
validations:
required: true
- type: textarea
id: configuration
attributes:
label: 配置信息
description: |
请说明操作系统及版本、模拟器品牌、模拟器分辨率、DPI、帧率
若正在使用 MuMu 或雷电 9请说明截图增强是否开启
最后请说明 GPU 加速推理是否开启,若开启请提供 GPU 型号。
validations:
required: true
- type: textarea
id: screenshots
attributes:
label: 截图
label: 截图或录屏
description: |
如果有,添加屏幕截图以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
`debug` 目录下按功能分类的文件夹内,有一些自动截图的错误图片,若有相关的,请一并打包上传
可上传屏幕截图或录制以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
若是**识别相关问题**,请尽可能提供模拟器自带的截图工具截取的无遮挡的**原图**(或通过 adb 截取原图)
用其他的工具如QQ截取的图片包含窗口边框不利于我们排除bug
`debug` 文件夹下有一些自动截图的错误图片,若有相关的,请一并打包上传
用其他的工具如QQ/微信)截取的图片包含窗口边框且长宽比、分辨率不固定不利于我们排除bug
若文件体积过大可压缩后再上传
validations:
required: false
- type: textarea
@@ -59,7 +78,6 @@ body:
attributes:
label: 还有别的吗?
description: |
使用的模拟器?操作系统?相关的配置?链接?参考资料?
任何能让我们对你所遇到的问题有更多了解的东西
validations:
required: false

View File

@@ -1,16 +1,22 @@
name: 需求建议(使用中文)
description: 新功能、建议等
labels: ['enhancement']
labels: ["enhancement"]
body:
- type: checkboxes
id: checks
attributes:
label: 在提问之前...
label: 请确认自己完成了下列必选项之后再进行勾选,若未完成必选项或勾选了"我未仔细阅读"选项将视为自愿接受被直接关闭 Issue
options:
- label: 填写了简短且清晰明确的标题,以便开发者在翻阅 issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: true
- label: 基本确定这是一个新功能/建议,而不是遇到了 bug不确定的话请附上日志
required: true
- label: 基本确定这是一个新功能/建议,而不是遇到了 Bug不确定的话请附上日志
required: false
- label: 未仔细阅读这些内容,只是一键已读[所有内容](/MaaAssistantArknights/MaaAssistantArknights/issues),并相信这不会影响问题的处理
required: false
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: false
- label: 我使用的是当前更新版本的最新版, 并已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/), [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容,确认我的建议未被提及
required: false
- label: 我已检查了 [常见问题](https://docs.maa.plus/zh-cn/manual/faq.html), [公告](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) 确认我的建议未被提及
required: false
- type: textarea
id: describe
attributes:

View File

@@ -0,0 +1,85 @@
name: 雷电截图增强反馈(使用中文)
description: 有关雷电 9 截图增强功能的集中反馈
labels: ["LD9 API"]
body:
- type: checkboxes
id: checks
attributes:
label: 在提问之前...
options:
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
required: false
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: false
- label: 我已检查了[公告](/MaaAssistantArknights/MaaAssistantArknights/issues/7732)、[活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues)、[已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed),确认我的问题未被提及
required: false
- label: 我未仔细阅读这些内容,只是一键已读[所有内容](/MaaAssistantArknights/MaaAssistantArknights/issues),并相信这不会影响问题的处理
required: false
- label: 我正在使用最新的 MAA 公测版本和最新的官版雷电 9 模拟器
required: false
- label: 我已参考文档确定安装路径、实例编号填写正确,并确认在关闭截图增强模式后问题消失
required: false
- label: 我未开启高帧率,且模拟器帧数设置为 60
required: false
- type: textarea
id: describe
attributes:
label: 问题描述
description: 描述问题时请尽可能详细
validations:
required: true
- type: textarea
id: version
attributes:
label: Version
description: |
请提供 MAA 版本和雷电 9 版本。MAA 版本可在 MAA -> 设置 -> 软件更新中找到(点击图标可复制)。
雷电 9 版本可在右上角菜单按钮 -> 关于雷电 中找到。
placeholder: |
Resource Version:
MAA Version:
雷电 9 版本号:
validations:
required: true
- type: textarea
id: logs
attributes:
label: MAA 日志和配置文件
description: |
**请在 MAA -> 设置 -> 问题反馈中找到生成日志压缩包按钮,点击并上传压缩包**
**请直接将完整的文件拖拽进来,而非自己裁切或复制的片段;若文件体积过大可压缩后再上传**
placeholder: |
请确认上传文件前已关闭 MAA
validations:
required: true
- type: textarea
id: ldlogs
attributes:
label: 雷电 9 诊断信息
description: |
**在雷电 9 右上角菜单按钮 -> 诊断信息 中点击 复制信息,并将全部内容粘贴进来。**
validations:
required: true
- type: textarea
id: screenshots
attributes:
label: 截图
description: |
`debug` 目录下按功能分类的文件夹内,有一些自动截图的错误图片,若有相关的,请一并打包上传
可上传屏幕截图或录制以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
若是**识别相关问题**,请尽可能提供模拟器自带的截图工具截取的无遮挡的**原图**(或通过 adb 截取原图)
用其他的工具如QQ/微信截取的图片包含窗口边框且长宽比、分辨率不固定不利于我们排除bug
若文件体积过大可压缩后再上传
validations:
required: false
- type: textarea
id: others
attributes:
label: 其他
description: |
GPU 加速推理是否开启,若开启请提供 GPU 型号。
亦或者任何能让我们对你所遇到的问题有更多了解的东西
validations:
required: false

View File

@@ -0,0 +1,86 @@
name: MuMu 截图增强反馈(使用中文)
description: 有关 MuMu 截图增强功能的集中反馈
labels: ["MuMu API"]
body:
- type: checkboxes
id: checks
attributes:
label: 在提问之前...
options:
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
required: false
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: false
- label: 我已检查了[公告](/MaaAssistantArknights/MaaAssistantArknights/issues/7732)、[活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues)、[已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed),确认我的问题未被提及
required: false
- label: 我未仔细阅读这些内容,只是一键已读[所有内容](/MaaAssistantArknights/MaaAssistantArknights/issues),并相信这不会影响问题的处理
required: false
- label: 我正在使用最新的 MAA 公测版本和最新的官版或方舟专版 MuMu 模拟器
required: false
- label: 我已参考文档确定安装路径、实例编号、屏幕编号填写正确,并确认在关闭截图增强模式后问题消失
required: false
- label: 我未开启动态帧率及后台保活,模拟器帧数为 60显存使用策略为“画面表现更好”
required: false
- type: textarea
id: describe
attributes:
label: 问题描述
description: 描述问题时请尽可能详细
validations:
required: true
- type: textarea
id: version
attributes:
label: Version
description: |
请提供 MAA 版本和 MuMu 版本。MAA 版本可在 MAA -> 设置 -> 软件更新中找到(点击图标可复制)。
MuMu 版本可在右上角菜单按钮 -> 关于 MuMu 中找到。
placeholder: |
Resource Version:
MAA Version:
MuMu 版本号:
validations:
required: true
- type: textarea
id: logs
attributes:
label: MAA 日志和配置文件
description: |
**请在 MAA -> 设置 -> 问题反馈中找到生成日志压缩包按钮,点击并上传压缩包**
**请直接将完整的文件拖拽进来,而非自己裁切或复制的片段;若文件体积过大可压缩后再上传**
placeholder: |
请确认上传文件前已关闭 MAA
validations:
required: true
- type: textarea
id: mumulogs
attributes:
label: MuMu 问题诊断
description: |
**在 MuMu 右上角菜单按钮 -> 问题诊断 中点击 复制配置信息,并将全部内容粘贴进来。**
**注意隐去 电脑出口IP地址 等以保护个人隐私**
validations:
required: true
- type: textarea
id: screenshots
attributes:
label: 截图
description: |
`debug` 目录下按功能分类的文件夹内,有一些自动截图的错误图片,若有相关的,请一并打包上传
可上传屏幕截图或录制以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
若是**识别相关问题**,请尽可能提供模拟器自带的截图工具截取的无遮挡的**原图**(或通过 adb 截取原图)
用其他的工具如QQ/微信截取的图片包含窗口边框且长宽比、分辨率不固定不利于我们排除bug
若文件体积过大可压缩后再上传
validations:
required: false
- type: textarea
id: others
attributes:
label: 其他
description: |
GPU 加速推理是否开启,若开启请提供 GPU 型号。
亦或者任何能让我们对你所遇到的问题有更多了解的东西
validations:
required: false

View File

@@ -1,6 +1,6 @@
name: 其他议题(使用中文)
description: 提出问题,而不是 bug 反馈或需求建议
labels: ['question']
description: 提出问题,而不是 Bug 反馈或需求建议
labels: ["question"]
body:
- type: textarea
id: describe

View File

@@ -1,33 +1,24 @@
name: Bug Report (in English)
description: >-
Recognition errors, operation abnormalities,
connection errors, etc.
labels: ['bug']
description: Recognition errors, operation abnormalities, connection errors, etc.
labels: ["bug"]
body:
- type: checkboxes
id: checks
attributes:
label: Before raising the issue...
label: |
Please ensure that you have completed the required items before checking the boxes.
Issues with incomplete required items or with the 'I did not read carefully' option checked will be considered voluntary acceptance of direct closure.
options:
- label: >-
I understand that Issues are for feedback and problem solving,
not trolling the comments section, and will provide as
much information as possible to help solve the problem.
required: true
- label: >-
I filled in a short, clear title
so that developers could quickly identify the general problem
when going through the issue list.
Instead of "Some suggestions", "Stuck", etc.
required: true
- label: >-
I have checked the latest beta update and there is no mention
of the bug being fixed.
required: true
- label: >-
I have reviewed the pinned issues and confirmed that my issue
is not mentioned.
required: true
- label: I understand that Issues are for feedback and problem solving, not trolling the comments section, and will provide as much information as possible to help solve the problem.
required: true
- label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc.
required: true
- label: I am using the latest version of the current update version, and have reviewed the [update content](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) released to date, [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) unreleased update content and there is no mention of the bug being fixed.
required: true
- label: I have checked all the options without carefully reading the content and believe this will not affect issue resolution.
required: false
- label: I have reviewed the [FAQs](https://docs.maa.plus/en-us/manual/faq.html), [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) to ensure that my issue has not been mentioned.
required: true
- type: textarea
id: describe
attributes:
@@ -39,32 +30,48 @@ body:
id: version
attributes:
label: Version
description: >-
Please provide the MAA version. Can be found in MAA -> Settings -> Update. (Click to copy)
description: |
Please provide the MAA version. Can be found in MAA -> Settings -> Update. Click to copy.
Click on `Resource Version` and `MAA Version` and paste them respectively. There should be 5 lines of version information in total.
placeholder: |
Resource Version:
UI Version:
Core Version:
MAA Version:
validations:
required: true
- type: textarea
id: logs
attributes:
label: Log files
description: >-
**Upload the `asst.log` and `gui.log` log file in the `debug` folder and**
**indicate the approximate point in time when the problem occurred.**
label: Log and config files
description: |
**Please locate the Generate Support Payload button under MAA Settings -> Issue Report, click the button, and upload the generated zip file**
**Please drag and drop the full file in, not your own cuttings or copies;**
**compress it before uploading if too large.**
**Please drag and drop the full file in, not your own cuttings or copies; compress it before uploading if too large.**
If you are using MacBook, please click the "File" option in the top-left corner of the screen, then click "Open Log Folder".
placeholder: |
Please confirm that MAA is not running before uploading files.
validations:
required: true
- type: textarea
id: configuration
attributes:
label: Configuration information
description: |
Please specify the operating system and version, emulator brand, emulator resolution, DPI, and frame rate;
If you are using MuMu or LDPlayer 9, please specify whether Screenshot Enhancement is enabled;
Finally, please specify whether GPU accelerated inference is enabled, and if so, provide the GPU model.
validations:
required: true
- type: textarea
id: screenshots
attributes:
label: Screenshots
description: >-
If available, add screenshots to help explain your problem,
label: Screenshots or recordings
description: |
In the `debug` directory, within the functionally categorized folders,
there are some error images captured automatically.
If related to this issue, please upload them together.
If available, upload screenshots and recordings to help explain your problem,
including but not limited to screenshots of MAA software,
screenshots of game screens.
@@ -72,23 +79,18 @@ body:
the **original image** taken by the emulator's own screenshot tool
(or via adb).
Screenshots taken with other tools may contain the frames of the window/emulator, which makes it harder for us to debug.
The `debug` folder has some automatic screenshots of the error images,
if you have any,
please upload them together.
Screenshots taken with other tools may contain the frames of the window/emulator
and their aspect ratio and resolution are inconsistent,
which makes it harder for us to debug.
If the file size is too large, you may compress it before uploading.
validations:
required: false
- type: textarea
id: others
attributes:
label: Anthing else?
description: >-
Emulator used, operating system, related configuration, links,
reference material, etc.
Anything that will give us more insight into the problem
you are having.
label: Anything else?
description: |
Anything that will give us more insight into the problem you are having.
validations:
required: false

View File

@@ -1,16 +1,24 @@
name: Feature Request (in English)
description: New features, suggestions, etc.
labels: ['enhancement']
labels: ["enhancement"]
body:
- type: checkboxes
id: checks
attributes:
label: Before raising the issue...
label: |
Please ensure that you have completed the required items before checking the boxes.
Issues with incomplete required items or with the 'I did not read carefully' option checked will be considered voluntary acceptance of direct closure.
options:
- label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc.
required: true
- label: I'm probably sure this is a new feature/suggestion and not a bug encountered (please attach logs if you're not sure)
required: true
- label: I'm probably sure this is a new feature/suggestion and not a bug encountered (please attach logs if you're not sure).
required: true
- label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc.
required: true
- label: I am using the latest version of the current update version, and have reviewed the [update content](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) released to date, [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) unreleased update content and there is no mention of this feature/suggestion being added.
required: true
- label: I have checked all the options without carefully reading the content and believe this will not affect issue resolution.
required: false
- label: I have reviewed the [FAQs](https://docs.maa.plus/en-us/manual/faq.html), [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) to ensure that my feature/suggestion has not been mentioned.
required: true
- type: textarea
id: describe
attributes:

View File

@@ -1,6 +1,6 @@
name: Others (in English)
description: Ask a question rather than a bug report or feature request.
labels: ['question']
labels: ["question"]
body:
- type: textarea
id: describe

18
.github/dependabot.yaml vendored Normal file
View File

@@ -0,0 +1,18 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /.github/workflows
schedule:
interval: weekly
commit-message:
prefix: ci
assignees:
- AnnAngela
- Constrat
groups:
github-actions:
patterns:
- "*"
ignore:
- dependency-name: "Nerixyz/actionsx-prettier"
versions: ["3.0.0"]

File diff suppressed because it is too large Load Diff

38
.github/pr_cache_remover.ps1 vendored Normal file
View File

@@ -0,0 +1,38 @@
$totalClearedSize = 0
$cacheList = gh cache list --json id,ref,sizeInBytes | ConvertFrom-Json
$prCaches = $cacheList | Where-Object { $_.ref -like "*merge*" }
if (-not $prCaches) {
Write-Output "No PR caches found."
exit
}
foreach ($cache in $prCaches) {
$cacheId = $cache.id
$cacheRef = $cache.ref
$cacheSizeInBytes = $cache.sizeInBytes
if ($cacheRef -match "refs/pull/(\d+)/merge") {
$prNumber = $matches[1]
Write-Host "PR #${prNumber}: " -NoNewline
$prStatus = gh pr view $prNumber --json state | ConvertFrom-Json
Write-Host $prStatus.state -NoNewline
if ($prStatus.state -eq "MERGED" -or $prStatus.state -eq "CLOSED") {
Write-Host " -> DELETING"
gh cache delete $cacheId
$totalClearedSize += $cacheSizeInBytes
}
else {
Write-Host ""
}
}
}
$formattedSize = "{0:N2}" -f ($totalClearedSize / 1MB)
Write-Output "Cleared size: $formattedSize MB"

158095
.github/qodana.sarif.json vendored

File diff suppressed because it is too large Load Diff

View File

@@ -11,7 +11,6 @@ reviewers:
# A list of assignees to be added to pull requests (GitHub user name)
assignees:
- AnnAngela
# A list of keywords to be skipped the process that add reviewers if pull requests include it
# skipKeywords:
# - wip

75
.github/stale_cache_cleanup.ps1 vendored Normal file
View File

@@ -0,0 +1,75 @@
$totalClearedSize = 0
$cacheList = gh cache list --json id,key,ref,sizeInBytes,createdAt | ConvertFrom-Json
# List of keys to process
$keyPatterns = @(
"Windows-x64-nuget",
"Windows-x64-maadeps",
"Windows-arm64-nuget",
"Windows-arm64-maadeps",
"macOS-x64-maadeps",
"macOS-arm64-maadeps",
"Linux-x64-maadeps",
"Linux-arm64-maadeps",
"Smoke-testing"
)
# Filter caches matching any of our key patterns
$matchingCaches = $cacheList | Where-Object {
$cache = $_
($keyPatterns | Where-Object { $cache.key -like "*$_*" }).Count -gt 0
}
# Get unique branch references from the matching caches
$branches = $matchingCaches | Select-Object -Property ref -Unique | ForEach-Object { $_.ref }
Write-Output "Found caches across $($branches.Count) branches"
foreach ($branch in $branches) {
# Extract branch name from ref for display
$branchName = $branch -replace "refs/heads/", ""
if ($branch -match "refs/pull/(\d+)/merge") {
$branchName = "PR #$($matches[1])"
}
Write-Output "Processing caches for branch: $branchName"
# Filter for current branch caches
$branchCaches = $matchingCaches | Where-Object { $_.ref -eq $branch }
foreach ($pattern in $keyPatterns) {
Write-Output " Processing $branchName branch caches for pattern: $pattern"
# Filter for caches matching the current key pattern within branch
$patternCaches = $branchCaches | Where-Object { $_.key -like "*$pattern*" }
if (-not $patternCaches) {
Write-Output " No $branchName branch caches found for pattern: $pattern"
continue
}
# Sort by creation time (newest first)
$sortedCaches = $patternCaches | Sort-Object -Property createdAt -Descending
# Keep the first one (latest) and delete the rest
$latestCache = $sortedCaches[0]
Write-Output " Keeping latest cache for $branchName/${pattern}: '$($latestCache.key)' (ID: $($latestCache.id))"
# Delete all except the latest one
for ($i = 1; $i -lt $sortedCaches.Count; $i++) {
$cache = $sortedCaches[$i]
$cacheId = $cache.id
$cacheKey = $cache.key
Write-Output " Deleting cache for $branchName/${pattern}: '$cacheKey' (ID: $cacheId)"
gh cache delete $cacheId
$totalClearedSize += $cache.sizeInBytes
}
}
Write-Output ""
}
$formattedSize = "{0:N2}" -f ($totalClearedSize / 1MB)
Write-Output "Total cleared size: $formattedSize MB"

59
.github/stale_cache_dev.ps1 vendored Normal file
View File

@@ -0,0 +1,59 @@
$totalClearedSize = 0
$cacheList = gh cache list --json id,key,ref,sizeInBytes,createdAt | ConvertFrom-Json
# Filter for dev branch caches only
$devCaches = $cacheList | Where-Object { $_.ref -eq "refs/heads/dev" }
if (-not $devCaches) {
Write-Output "No caches found for dev branch."
exit
}
# List of keys to process
$keyPatterns = @(
"Windows-x64-nuget",
"Windows-x64-maadeps",
"Windows-arm64-nuget",
"Windows-arm64-maadeps",
"macOS-x64-maadeps",
"macOS-arm64-maadeps",
"Linux-x64-maadeps",
"Linux-arm64-maadeps",
"Smoke-testing"
)
foreach ($pattern in $keyPatterns) {
Write-Output "Processing dev branch caches for pattern: $pattern"
# Filter for caches matching the current key pattern within dev branch
$matchingCaches = $devCaches | Where-Object { $_.key -like "*$pattern*" }
if (-not $matchingCaches) {
Write-Output " No dev branch caches found for pattern: $pattern"
continue
}
# Sort by creation time (newest first)
$sortedCaches = $matchingCaches | Sort-Object -Property createdAt -Descending
# Keep the first one (latest) and delete the rest
$latestCache = $sortedCaches[0]
Write-Output " Keeping latest dev branch cache: '$($latestCache.key)' (ID: $($latestCache.id))"
# Delete all except the latest one
for ($i = 1; $i -lt $sortedCaches.Count; $i++) {
$cache = $sortedCaches[$i]
$cacheId = $cache.id
$cacheKey = $cache.key
Write-Output " Deleting dev branch cache: '$cacheKey' (ID: $cacheId)"
gh cache delete $cacheId
$totalClearedSize += $cache.sizeInBytes
}
Write-Output ""
}
$formattedSize = "{0:N2}" -f ($totalClearedSize / 1MB)
Write-Output "Total cleared size: $formattedSize MB"

49
.github/workflows/blame-ignore.yml vendored Normal file
View File

@@ -0,0 +1,49 @@
name: Git Blame Ignore
on:
schedule:
- cron: "45 21 * * *" # Runs daily at 22:00 UTC
workflow_dispatch:
jobs:
blame-ignore:
if: github.repository_owner == 'MaaAssistantArknights'
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v5
with:
fetch-depth: 0
persist-credentials: false # Needed to bypass protection rules in Push changes
- name: Check blame
id: check_changes
run: |
LAST_CHECKED_COMMIT=$(cat .github/.last-blame-ignore-commit 2>/dev/null || git rev-list --max-parents=0 HEAD)
git log $LAST_CHECKED_COMMIT..HEAD --pretty=format:"%H %s" --grep="\[blame ignore\]" | awk '{print $1}' >> .git-blame-ignore-revs
git diff --quiet .git-blame-ignore-revs
- name: Commit and Push changes
if: ${{ steps.check_changes.outcome == 'failure' }}
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git rev-parse HEAD > .github/.last-blame-ignore-commit
git add .github/.last-blame-ignore-commit .git-blame-ignore-revs
git commit -m "chore: auto blame ignore" -m "[skip changelog]"
- name: Push changes
if: ${{ steps.check_changes.outcome == 'failure' }}
uses: ad-m/github-push-action@master
with:
branch: ${{ github.ref }}
github_token: ${{ secrets.MAA_RESOURCE_SYNC }}
- name: Stop if no changes
if: ${{ steps.check_changes.outcome == 'success' }}
uses: andymckay/cancel-action@0.5

39
.github/workflows/cache-delete.yml vendored Normal file
View File

@@ -0,0 +1,39 @@
name: Delete Cache
on:
pull_request:
types: [closed]
workflow_dispatch:
inputs:
pr_number:
description: "PR Number"
required: true
jobs:
cache-delete:
# Run only on organization branches with PRs
if: github.event_name == 'workflow_dispatch' ||
github.event.pull_request.head.repo.full_name ==
github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
steps:
- name: Delete cache on PR merged
run: |
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
PR_NUMBER=${{ github.event.inputs.pr_number }}
else
PR_NUMBER=${{ github.event.pull_request.number }}
fi
echo "PR Number: $PR_NUMBER"
curl -s -L https://api.github.com/repos/Maaassistantarknights/Maaassistantarknights/actions/caches |
jq -r --arg PR_NUMBER "refs/pull/$PR_NUMBER/merge" '.actions_caches[] | select(.ref == $PR_NUMBER) | .id' |
while read -r id; do
echo "Deleting cache with ID: $id"
curl -L -X DELETE \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"https://api.github.com/repos/MaaAssistantArknights/MaaAssistantArknights/actions/caches/$id"
done

View File

@@ -12,9 +12,9 @@ on:
- "src/**"
- "cmake/**"
- "CMakeLists.txt"
- "MAA.sln"
- ".github/workflows/ci.yml"
- "!**/*.md"
- "tools/maadeps-download.py"
pull_request:
branches:
- "dev"
@@ -24,19 +24,28 @@ on:
- "src/**"
- "cmake/**"
- "CMakeLists.txt"
- "MAA.sln"
- "!**/*.md"
- "tools/maadeps-download.py"
workflow_dispatch:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
meta:
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
outputs:
tag: ${{ steps.set_tag.outputs.tag }}
prerelease: ${{ steps.set_pre.outputs.prerelease }}
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
path: temp
show-progress: false
@@ -80,6 +89,8 @@ jobs:
fi
echo >> CHANGELOG.md
echo "**Full Changelog**: [$last_tag -> $this_tag](https://github.com/MaaAssistantArknights/MaaAssistantArknights/compare/${last_tag}...${this_tag})" >> CHANGELOG.md
echo >> CHANGELOG.md
echo "[已有 Mirror酱 CDK前往 Mirror酱 高速下载](https://mirrorchyan.com/zh/projects?rid=MAA&source=maagh-release)" >> CHANGELOG.md
- name: Upload changelog to Github
uses: actions/upload-artifact@v4
@@ -89,24 +100,57 @@ jobs:
path: CHANGELOG.md
windows:
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name
needs: meta
strategy:
matrix:
include:
- msbuild_target: x64
lowercase_target: x64
- msbuild_target: ARM64
lowercase_target: arm64
env:
MAABUILDER_TARGET_PLATFORM: ${{ matrix.msbuild_target }}
arch: [arm64, x64]
fail-fast: false
runs-on: windows-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
show-progress: false
- name: Fetch submodules
run: |
git submodule update --init --depth 1 3rdparty/EmulatorExtras
- name: Cache MaaDeps
id: cache-maadeps
uses: actions/cache@v4
with:
path: |
./MaaDeps
key: ${{ runner.os }}-${{ matrix.arch }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
- name: Bootstrap MaaDeps
if: steps.cache-maadeps.outputs.cache-hit != 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
python3 tools/maadeps-download.py ${{ matrix.arch }}-windows
- name: Config cmake
run: |
mkdir -p build
cmake -B build ${{ matrix.arch == 'arm64' && '-A ARM64' }} -DCMAKE_BUILD_TYPE=Release -DMAADEPS_TRIPLET='maa-${{ matrix.arch }}-windows' -DINSTALL_RESOURCE=ON -DINSTALL_PYTHON=ON -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' -DBUILD_WPF_GUI=OFF
- name: Build
run: |
cmake --build build --config Release --parallel $env:NUMBER_OF_PROCESSORS
- name: Install
run: |
mkdir -p install
cmake --install build --prefix install --config Release
- name: Cache .nuke/temp, ~/.nuget/packages
id: cache-nuget
uses: actions/cache@v4
@@ -114,29 +158,13 @@ jobs:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ matrix.msbuild_target }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
key: ${{ runner.os }}-${{ matrix.arch }}-nuget-${{ hashFiles('**/*.csproj') }}
- name: Restore dependencies
if: steps.cache-nuget.outputs.cache-hit != 'true'
run: dotnet restore
run: dotnet restore src/MaaWpfGui/MaaWpfGui.csproj
- name: Bootstrap MaaDeps
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
python3 maadeps-download.py ${{ matrix.lowercase_target }}-windows
- name: Create fake event file
shell: bash
run: cp -v "$GITHUB_EVENT_PATH" ./event.json
- name: Merge Event Data with Inputs
if: startsWith(github.ref, 'refs/tags/v')
shell: bash
run: |
cat "$GITHUB_EVENT_PATH" | jq '. + { "inputs": {"ReleaseSimulation": "${{ needs.meta.outputs.tag }}"} }' | tee ./event.json
- name: Taggify Version
- name: Taggify Version for csproj
run: |
$csprojPath = "src/MaaWpfGui/MaaWpfGui.csproj"
$csprojPath = Resolve-Path -Path $csprojPath
@@ -153,90 +181,103 @@ jobs:
$node.FileVersion = $match
$node.AssemblyVersion = $match
$csproj.Save($csprojPath)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Build
- name: Publish WPF GUI
continue-on-error: true
run: |
$env:GITHUB_WORKFLOW = 'dev-build-win' # pretend this is a dev-build-win workflow
$env:GITHUB_EVENT_PATH = "$pwd\\event.json"
$env:GITHUB_REF = "refs/heads/not_master"
$env:MAA_BUILDER_MAA_VERSION = '${{ needs.meta.outputs.tag }}'
./build.cmd DevBuild
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
dotnet publish src/MaaWpfGui/MaaWpfGui.csproj -c Release -o install
- name: Cleanup checksum file
run: |
rm -vf ./artifacts/checksum.json
- name: Organize Install Files
shell: bash
run: |
rm -rf install/*.pdb
rm -rf install/msvc-debug
rm -rf install/*.h
cp tools/DependencySetup_依赖库安装.bat install
- name: Zip files
run: |
cd install
Compress-Archive -Destination MAA-${{ needs.meta.outputs.tag }}-win-${{ matrix.arch }}.zip -Path ./*
- name: Upload MAA to Github
uses: actions/upload-artifact@v4
with:
name: MAA-win-${{ matrix.lowercase_target }}
path: artifacts
name: MAA-win-${{ matrix.arch }}
path: install/*.zip
ubuntu:
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name
needs: meta
runs-on: ubuntu-latest
strategy:
matrix:
arch: [aarch64, x86_64]
fail-fast: false
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
show-progress: false
submodules: recursive
- name: Install cross compile toolchains
if: ${{ matrix.arch != 'x86_64' }}
- name: Fetch submodules
run: |
sudo apt-get update
sudo apt-get install g++-12-aarch64-linux-gnu g++-12-aarch64-linux-gnu
git submodule update --init --depth 1 3rdparty/EmulatorExtras
git submodule update --init --depth 1 src/maa-cli
- name: Setup ccache
uses: Chocobo1/setup-ccache-action@v1
- name: Cache MaaDeps
id: cache-maadeps
uses: actions/cache@v4
with:
remove_stale_cache: false
path: ./MaaDeps
key: ${{ runner.os }}-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
- name: Bootstrap MaaDeps
if: steps.cache-maadeps.outputs.cache-hit != 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
python3 maadeps-download.py ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux
python3 tools/maadeps-download.py ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux
- name: Build MAA
- name: Config cmake
run: |
mkdir -p build
cmake -B build \
-DCMAKE_BUILD_TYPE=Release \
-DMAADEPS_TRIPLET='maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux' \
-DINSTALL_THIRD_LIBS=ON \
-DINSTALL_RESOURCE=ON \
-DINSTALL_PYTHON=ON \
-DMAA_VERSION='${{ needs.meta.outputs.tag }}'
cmake --build build --parallel $(nproc --all)
-DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' \
-DCMAKE_TOOLCHAIN_FILE=MaaDeps/cmake/maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux-toolchain.cmake
mkdir -p install
cmake --install build --prefix install
- name: Build
run: |
cmake --build build --config Release --parallel $(nproc)
env:
CC: ${{ matrix.arch == 'x86_64' && 'ccache gcc-12' || 'ccache aarch64-linux-gnu-gcc-12' }}
CXX: ${{ matrix.arch == 'x86_64' && 'ccache g++-12' || 'ccache aarch64-linux-gnu-g++-12' }}
CLICOLOR_FORCE: 1
- name: Setup Rust
- name: Install
run: |
mkdir -p install
cmake --install build --prefix install --config Release
- name: Setup Cross Compile Toolchains for CLI
uses: ./src/maa-cli/.github/actions/setup
with:
os: ubuntu-latest
arch: ${{ matrix.arch }}
target_arch: ${{ matrix.arch }}
- name: Build CLI
run: |
cargo build --release --locked --package maa-cli \
${{ matrix.arch != 'x86_64' && '--features vendored-openssl' || '' }}
cargo build --release --locked --package maa-cli --features vendored-openssl
cp -v target/$CARGO_BUILD_TARGET/release/maa $GITHUB_WORKSPACE/install/maa
cargo build --release --locked --package maa-cli --no-default-features \
--features ${{ matrix.arch != 'x86_64' && 'git2,vendored-openssl' || 'git2' }}
--features git2,vendored-openssl
cp -v target/$CARGO_BUILD_TARGET/release/maa $GITHUB_WORKSPACE/appimage-maa
working-directory: src/maa-cli
@@ -268,11 +309,11 @@ jobs:
ln -sv usr/share/maa/maa Maa.AppDir/AppRun
mkdir -pv Maa.AppDir/usr/share/metainfo/
cp -v tools/AppImage/io.github.maaassistantarknights.maaassistantarknights.metainfo.xml Maa.AppDir/usr/share/metainfo/
wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
# appimagetool with embedded runtime does not support cross build, till AppImage/appimagetool 7a10b8
wget "https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-${{ matrix.arch }}"
wget "https://github.com/AppImage/type2-runtime/releases/download/old/runtime-fuse3-${{ matrix.arch }}"
chmod a+x appimagetool-x86_64.AppImage
ARCH=${{ matrix.arch }} ./appimagetool-x86_64.AppImage --runtime-file runtime-${{ matrix.arch }} Maa.AppDir
ARCH=${{ matrix.arch }} ./appimagetool-x86_64.AppImage --runtime-file runtime-fuse3-${{ matrix.arch }} Maa.AppDir
chmod a+x MaaAssistantArknights-${{ matrix.arch }}.AppImage
mv -v MaaAssistantArknights-${{ matrix.arch }}.AppImage $GITHUB_WORKSPACE/release/MAA-${{ needs.meta.outputs.tag }}-linux-${{ matrix.arch }}.AppImage
@@ -291,36 +332,56 @@ jobs:
release/*.tar.gz
macOS-Core:
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name
needs: meta
runs-on: macos-13
runs-on: macos-latest
strategy:
matrix:
arch: [arm64, x86_64]
fail-fast: false
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
show-progress: false
- name: Install Dependencies
run: |
brew install ninja
# ninja 1.13.1 is already installed and up-to-date.
# - name: Install Dependencies
# run: |
# brew install ninja
- name: Cache MaaDeps
id: cache-maadeps
uses: actions/cache@v4
with:
path: ./MaaDeps
key: ${{ runner.os }}-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
- name: Bootstrap MaaDeps
run: |
[[ ${{ matrix.arch }} = "arm64" ]] && triplet="arm64-osx" || triplet="x64-osx"
python3 maadeps-download.py ${triplet}
python3 tools/maadeps-download.py ${triplet}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Configure MaaCore
- name: Config cmake
run: |
cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES='${{ matrix.arch }}' -DMAA_VERSION='${{ needs.meta.outputs.tag }}'
cmake -B build -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_OSX_ARCHITECTURES='${{ matrix.arch }}' \
-DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}'
- name: Build MaaCore
- name: Build
run: |
cmake --build build
cmake --install build --prefix install
cmake --build build --config Release --parallel $(sysctl -n hw.logicalcpu)
- name: Install
run: |
cmake --install build --prefix install --config Release
- name: Upload MAA to Github
uses: actions/upload-artifact@v4
@@ -329,34 +390,62 @@ jobs:
path: "install/*.dylib"
macOS-GUI:
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name
needs: [meta, macOS-Core]
runs-on: macos-13
runs-on: macos-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
show-progress: false
submodules: recursive
- name: Install Dependencies
if: startsWith(github.ref, 'refs/tags/v')
run: |
brew install graphicsmagick imagemagick
npm install -g create-dmg
- name: Fetch submodules
run: |
git submodule update --init --depth 1 src/MaaMacGui
- name: Download Arm64 MAA from Github
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: MAACore-macos-arm64
path: install-arm64
- name: Download x64 MAA from Github
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: MAACore-macos-x86_64
path: install-x86_64
- name: Install Developer ID Certificate
if: startsWith(github.ref, 'refs/tags/v')
uses: ssrobins/import-codesign-certs@v2
uses: apple-actions/import-codesign-certs@v5
with:
p12-file-base64: ${{ secrets.HGUANDL_SIGN_CERT_P12 }}
p12-password: ${{ secrets.HGUANDL_SIGN_CERT_PASSWD }}
- name: Download Provisioning Profiles
if: startsWith(github.ref, 'refs/tags/v')
uses: apple-actions/download-provisioning-profiles@v4
with:
bundle-id: "com.hguandl.MeoAsstMac"
issuer-id: ${{ secrets.HGUANDL_APPSTORE_ISSUER }}
api-key-id: ${{ secrets.HGUANDL_APPSTORE_KEYID }}
api-private-key: ${{ secrets.HGUANDL_APPSTORE_KEY }}
- name: Setup Xcode Toolchain
if: true
run: |
sudo xcode-select -s /Applications/Xcode_16.1.app/Contents/Developer
- name: Build Universal Binaries
run: |
mkdir build
@@ -364,10 +453,28 @@ jobs:
lipo -create install-arm64/$LIB_NAME install-x86_64/$LIB_NAME -output build/$LIB_NAME
done
- name: Archive Runtime Files
run: |
mkdir runtime && cd runtime
name='MAA-${{ needs.meta.outputs.tag }}-macos-runtime-universal'
mkdir "$name" && cd "$name"
cp -v ../../build/*.dylib .
ln -vs libonnxruntime*.dylib libonnxruntime.dylib
ln -vs libopencv_world4*.dylib libopencv_world4.dylib
cp -vr ../../resource .
cd .. || exit 1
zip -yrX9 "$name.zip" "$name"
- name: Upload MAA runtime to Github
uses: actions/upload-artifact@v4
with:
name: MAA-macos-runtime-universal
path: runtime/MAA-${{ needs.meta.outputs.tag }}-macos-runtime-universal.zip
- name: Build XCFramework
run: |
xcodebuild -create-xcframework -library libMaaCore.dylib -headers ../include -output MaaCore.xcframework
xcodebuild -create-xcframework -library libMaaDerpLearning.dylib -output MaaDerpLearning.xcframework
xcodebuild -create-xcframework -library libfastdeploy_ppocr.dylib -output fastdeploy_ppocr.xcframework
xcodebuild -create-xcframework -library libonnxruntime.*.dylib -output ONNXRuntime.xcframework
xcodebuild -create-xcframework -library libopencv*.dylib -output OpenCV.xcframework
working-directory: build
@@ -381,9 +488,9 @@ jobs:
- name: Build MAA
run: |
if ${{ startsWith(github.ref, 'refs/tags/v') }}; then
xcodebuild -project MeoAsstMac.xcodeproj -scheme MAA archive -archivePath MAA.xcarchive -configuration Release
xcodebuild -scheme MAA archive -archivePath MAA.xcarchive
else
xcodebuild CODE_SIGN_IDENTITY="-" DEVELOPMENT_TEAM="-" ONLY_ACTIVE_ARCH=NO -project MeoAsstMac.xcodeproj -scheme MAA archive -archivePath MAA.xcarchive -configuration Debug
xcodebuild CODE_SIGNING_ALLOWED=NO -scheme MAA archive -archivePath MAA.xcarchive
fi
working-directory: src/MaaMacGui
@@ -396,10 +503,8 @@ jobs:
- name: Create Disk Image
if: startsWith(github.ref, 'refs/tags/v')
run: |
mkdir Image
mv Export/MAA.app Image/
ln -s /Applications Image/
hdiutil create -volname MAA -srcfolder Image -ov -fs APFS -format ULMO MAA.dmg
create-dmg Export/MAA.app
mv MAA*.dmg MAA.dmg
working-directory: src/MaaMacGui
- name: Archive Debug Symbols
@@ -420,16 +525,25 @@ jobs:
- name: Notarize Image
if: startsWith(github.ref, 'refs/tags/v')
run: |
find . -name "*.dmg" | while read dmg; do
codesign -s "$NOTARY_TEAM" --timestamp ${dmg}
xcrun notarytool submit --apple-id "$NOTARY_USER" --password "$NOTARY_PASSWD" --team-id "$NOTARY_TEAM" --wait ${dmg}
xcrun stapler staple ${dmg}
done
uses: nick-fields/retry@v3
with:
max_attempts: 3
timeout_minutes: 15
command: |
cd release
echo "$APPSTORE_KEY" > "AuthKey_${APPSTORE_KEYID}.p8"
dmg="MAA-${{ needs.meta.outputs.tag }}-macos-universal.dmg"
xcrun notarytool submit -k "AuthKey_${APPSTORE_KEYID}.p8" -d "$APPSTORE_KEYID" -i "$ISSUER_ID" --wait ${dmg}
env:
NOTARY_USER: ${{ secrets.HGUANDL_NOTARY_AAPL_ID }}
NOTARY_PASSWD: ${{ secrets.HGUANDL_NOTARY_PASSWD }}
NOTARY_TEAM: ${{ secrets.HGUANDL_SIGN_IDENTITY }}
APPSTORE_KEYID: ${{ secrets.HGUANDL_APPSTORE_KEYID }}
APPSTORE_KEY: ${{ secrets.HGUANDL_APPSTORE_KEY }}
ISSUER_ID: ${{ secrets.HGUANDL_APPSTORE_ISSUER }}
- name: Attach Notarization Tickets
if: startsWith(github.ref, 'refs/tags/v')
run: |
dmg="MAA-${{ needs.meta.outputs.tag }}-macos-universal.dmg"
xcrun stapler staple ${dmg}
working-directory: release
- name: Upload MAA to Github
@@ -439,12 +553,16 @@ jobs:
path: ${{ startsWith(github.ref, 'refs/tags/v') && 'release/MAA*' || 'src/MaaMacGui/MAA.xcarchive/**' }}
release:
if: startsWith(github.ref, 'refs/tags/v')
needs: [meta, windows, ubuntu, macOS-GUI]
# Prevent duplicate runs on organization branches with PRs
if: (github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name) && startsWith(github.ref, 'refs/tags/v')
needs: [meta, windows, ubuntu, macOS-Core, macOS-GUI]
runs-on: ubuntu-latest
steps:
- name: Download MAA from Github
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
path: assets
@@ -457,15 +575,31 @@ jobs:
find . -type f | while read f; do mv -fvt . $f; done
- name: Release to Github
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2.3.3
with:
body_path: CHANGELOG.md
files: |
assets/*
prerelease: ${{ needs.meta.outputs.prerelease != 'false' }}
- name: Trigger MirrorChyan
run: |
gh workflow run --repo $GITHUB_REPOSITORY mirrorchyan
gh workflow run --repo $GITHUB_REPOSITORY mirrorchyan_release_note
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Trigger secondary workflows # ref: https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
run: |
gh workflow run --repo $GITHUB_REPOSITORY release-ota
env:
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
- name: Create issue if failed
if: failure()
uses: actions-cool/issues-helper@v3
with:
actions: "create-issue"
title: "Failed Release"
body: |
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

57
.github/workflows/codeql-core.yml vendored Normal file
View File

@@ -0,0 +1,57 @@
name: "CodeQL MaaCore and MaaWpfGui Analysis"
on:
pull_request:
branches: ["dev"]
paths:
- "3rdparty/include/**"
- "include/**"
- "src/**"
- "cmake/**"
- "CMakeLists.txt"
- ".github/workflows/codeql-core.yml"
- "!**/*.md"
- "!**/*.xaml"
schedule:
- cron: "45 11 * * *" # Runs daily at 11:45 UTC
workflow_dispatch:
permissions:
actions: write
contents: read
packages: read
security-events: write
jobs:
analyze-manual:
name: Analyze MaaCore and MaaWpfGui
runs-on: windows-latest
steps:
- name: Checkout repository
uses: actions/checkout@v5
with:
show-progress: false
- name: Setup CodeQL
uses: github/codeql-action/init@v3
with:
languages: c-cpp,csharp
build-mode: manual
- name: Run CodeQL
uses: github/codeql-action/analyze@v3
with:
category: "/language:multi-manual"
- name: Delete old caches
shell: pwsh
run: |
$oldCaches = gh cache list --key codeql --order asc --json key | ConvertFrom-Json | Select-Object -SkipLast 1
foreach ($cache in $oldCaches) {
if ($cache.key) {
Write-Host "Deleting cache: $($cache.key)"
gh cache delete $cache.key
}
}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

36
.github/workflows/codeql-wf.yml vendored Normal file
View File

@@ -0,0 +1,36 @@
name: "CodeQL Workflows Analysis"
on:
pull_request:
branches: ["dev"]
paths:
- ".github/**/*.yml"
schedule:
- cron: "00 12 * * *" # Runs daily at 12:00 UTC
workflow_dispatch:
permissions:
actions: write
contents: read
security-events: write
jobs:
analyze-workflows:
name: Analyze GitHub Workflows
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v5
with:
show-progress: false
- name: Setup CodeQL for GitHub Actions
uses: github/codeql-action/init@v3
with:
languages: actions
build-mode: none
- name: Run CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:multi-none"

View File

@@ -1,48 +0,0 @@
name: Build Test for docs
on:
push:
branches-ignore:
- "master"
paths:
- "docs/**"
pull_request:
branches:
- "dev"
paths:
- "docs/**"
workflow_dispatch:
jobs:
build-test:
timeout-minutes: 20
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v4
with:
fetch-depth: 1
show-progress: false
- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: 20
- name: Install dependencies
run: npm i
working-directory: "./docs"
- name: Cleanup files
run: rm tsconfig.json
working-directory: "./docs"
- name: Build
run: npm run build
working-directory: "./docs"
- name: Upload artifact to GitHub
uses: actions/upload-artifact@v4
with:
name: docs
path: "./docs/.vuepress/dist"

View File

@@ -2,22 +2,28 @@ name: gen-changelog
on:
pull_request:
types: [opened, reopened, ready_for_review]
types:
- opened
- reopened
- ready_for_review
workflow_dispatch:
jobs:
gen:
if: github.event.pull_request.draft == false && startsWith(github.event.pull_request.title, 'Release v') # startsWith 表达式不区分大小写
# startsWith 表达式不区分大小写
if: github.event.pull_request.draft == false && startsWith(github.event.pull_request.title, 'Release v')
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0
show-progress: false
- name: Extract tag name
id: extract_tag
env:
PR_BODY: ${{ format('{0}/{1}', runner.temp, 'output' ) }}
run: |
tag_name=$(echo "${{ github.event.pull_request.title }}" | sed -E 's/(Release|release)//' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
echo "tag_name=$tag_name" >> $GITHUB_OUTPUT
@@ -27,19 +33,33 @@ jobs:
latest_stable_tag=$(git tag -l 'v*' | grep -v '-' | sort -V | tail -n 1) # 上一个 stable 版本
newest_tag=$(git describe --tags --match "v*" --abbrev=0) # 最新版本
echo "latest_stable_tag: $latest_stable_tag"
echo "newest_tag: $newest_tag"
echo "latest_stable_tag=$latest_stable_tag" >> $GITHUB_OUTPUT
echo "newest_tag=$newest_tag" >> $GITHUB_OUTPUT
if [[ $tag_name == *-* ]]; then # 判断新版本是否为 beta 版本
latest=$newest_tag # 若是,则将 latest 参数设置为最新版本
if [[ $tag_name == *-* ]]; then # 判断新版本是否为 beta 版本
latest=$newest_tag # 若是,则将 latest 参数设置为最新版本
else
latest=$latest_stable_tag # 若否,则设置为上一个 stable 版本
latest=$latest_stable_tag # 若否,则设置为上一个 stable 版本
fi
echo "latest=$latest" >> $GITHUB_OUTPUT
cat $GITHUB_OUTPUT
echo '======='
echo 'Target PR: ${{ github.event.pull_request.html_url }}' >> $PR_BODY
echo '' >> $PR_BODY
echo '<details><summary>Debug info</summary>' >> $PR_BODY
echo '' >> $PR_BODY
echo '```' >> $PR_BODY
sed 's/=/: /1' $GITHUB_OUTPUT >> $PR_BODY
echo '```' >> $PR_BODY
echo '' >> $PR_BODY
echo '</details>' >> $PR_BODY
cat $PR_BODY
- name: Generate Changelog
run: |
git switch dev
@@ -59,11 +79,12 @@ jobs:
git commit -m "$commit_msg"
- name: Create PR
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v7
with:
sign-commits: true
token: ${{ secrets.GITHUB_TOKEN }}
title: ${{ steps.extract_tag.outputs.pr_title }}
body: ${{ github.event.pull_request.html_url }}
body-path: ${{ format('{0}/{1}', runner.temp, 'output' ) }}
base: "dev"
branch: "changelog"
delete-branch: true
@@ -73,6 +94,6 @@ jobs:
AnnAngela
- name: Add reviewers to release PR
uses: kentaro-m/auto-assign-action@v1.2.5
uses: kentaro-m/auto-assign-action@v2.0.0
with:
configuration-path: ".github/release_reviewers.yaml"

View File

@@ -0,0 +1,152 @@
name: Auto Close not reading issues or Fold checkboxes
on:
issues:
types: [opened]
jobs:
check-then-close-or-fold:
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Check for duplicate issues in last hour
id: duplicate-check
uses: actions/github-script@v8
with:
script: |
const oneHourAgo = new Date(Date.now() - 60 * 60 * 1000);
const currentIssueCreatedAt = new Date(context.payload.issue.created_at);
const issueAuthor = context.payload.issue.user.login;
// 重新获取该用户最近的 issues
const { data: userIssues } = await github.rest.issues.listForRepo({
owner: context.repo.owner,
repo: context.repo.repo,
creator: issueAuthor,
state: 'all',
since: oneHourAgo.toISOString(),
per_page: 30
});
// 过滤出1小时内创建的其他 issues排除当前 issue
const recentIssues = userIssues.filter(issue => {
const issueCreatedAt = new Date(issue.created_at);
return issue.number !== context.issue.number &&
issueCreatedAt >= oneHourAgo &&
issueCreatedAt < currentIssueCreatedAt;
});
if (recentIssues.length > 0) {
// 给当前 issue 添加标签
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
labels: ['rapid-submission']
});
// 给1小时内的其他 issues 也添加标签
for (const issue of recentIssues) {
try {
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue.number,
labels: ['rapid-submission']
});
console.log(`Added rapid-submission label to issue #${issue.number}`);
} catch (error) {
console.log(`Failed to add label to issue #${issue.number}: ${error.message}`);
}
}
}
- name: Check checkbox status
id: unread-checkbox-check
uses: actions/github-script@v8
with:
script: |
// 找不到###就算了
if (!/###([^#]+)###/.test(context.payload.issue.body)) {
return false;
}
var checkList = /###([^#]+)###/.exec(context.payload.issue.body)[1];
const UnreadRegexCn = /- \[x\]\s*.*?我.*未仔细阅读/i;
const UnreadRegexCn_ = /- \[ \]\s*.*?我.*未仔细阅读/i;
if (/- \[(x| )\]\s*.*?[\u4e00-\u9fa5]+/i.test(checkList)) { // 中英区分
if (UnreadRegexCn.test(checkList)) {
return true;
}
checkList = checkList.replace(UnreadRegexCn_, "");
return /- \[ \]\s*.*?[\u4e00-\u9fa5]+/i.test(checkList);
}
const texts = [
'I have checked all the options without carefully reading the content and believe this will not affect issue resolution.'];
return texts.some(text => new RegExp(`- \\[x\\]\\s*${text}`).test(context.payload.issue.body));
- name: Close and lock issue
if: steps.unread-checkbox-check.outputs.result == 'true'
uses: actions/github-script@v8
with:
script: |
await github.rest.issues.update({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
state: 'closed',
state_reason: 'not_planned'
});
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
labels: ['low-quality-report']
});
await github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
body: '因为未阅读模板提示并正确提交,触发了自动关闭规则\n\nBecause the template prompt was not read and submitted correctly, the automatic closing rule was triggered'
});
- name: Fold checkboxes
if: steps.unread-checkbox-check.outputs.result == 'false'
uses: actions/github-script@v8
with:
script: |
const originalBody = context.payload.issue.body;
if (originalBody.includes('<details><summary>Checkboxes</summary>\n\n')) {
return;
}
const checkboxSectionRegex_cn_bug = /([\s\S]*?)(### 问题描述\n\n)/;
const checkboxSectionRegex_cn_feat = /([\s\S]*?)(### 说说你遇到的问题?\n\n)/;
const checkboxSectionRegex_en_bug = /([\s\S]*?)(### Description\n\n)/;
const checkboxSectionRegex_en_feat = /([\s\S]*?)(### The problems you have encountered?\n\n)/;
const foldedBody_cn_bug = originalBody.replace(
checkboxSectionRegex_cn_bug,
`<details><summary>Checkboxes</summary>\n\n$1\n\n</details>\n\n$2`
);
const foldedBody_cn_feat = foldedBody_cn_bug.replace(
checkboxSectionRegex_cn_feat,
`<details><summary>Checkboxes</summary>\n\n$1\n\n</details>\n\n$2`
);
const foldedBody_en_bug = foldedBody_cn_feat.replace(
checkboxSectionRegex_en_bug,
`<details><summary>Checkboxes</summary>\n\n$1\n\n</details>\n\n$2`
);
const foldedBody = foldedBody_en_bug.replace(
checkboxSectionRegex_en_feat,
`<details><summary>Checkboxes</summary>\n\n$1\n\n</details>\n\n$2`
);
await github.rest.issues.update({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
body: foldedBody
});

View File

@@ -1,4 +1,5 @@
name: "Issue Checker"
on:
issues:
types: [opened, edited]
@@ -16,7 +17,7 @@ jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: zzyyyl/issue-checker@v1.7
- uses: MaaAssistantArknights/issue-checker@v1.14
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/issue-checker.yml

63
.github/workflows/markdown-checker.yml vendored Normal file
View File

@@ -0,0 +1,63 @@
name: Check Dead Links
on:
schedule:
- cron: "0 0 * * 2" # Every Tuesday at 00:00 UTC
push:
branches:
- dev
paths:
- "**/*.md"
- "docs/**"
- ".github/workflows/markdown-checker.yml"
pull_request:
branches:
- dev
paths:
- "**/*.md"
- "docs/**"
- ".github/workflows/markdown-checker.yml"
workflow_dispatch:
jobs:
check-links:
if: github.repository_owner == 'MaaAssistantArknights' && github.event.head_commit.author.email != '41898282+github-actions[bot]@users.noreply.github.com'
name: Check Dead Links
runs-on: ubuntu-latest
permissions:
pull-requests: write
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Check out code
uses: actions/checkout@v5
with:
show-progress: false
- name: Cache Primes
id: cache-primes
uses: actions/cache@v4
with:
path: .lycheecache
key: lychee-cache
- name: Check dead links
uses: lycheeverse/lychee-action@v2
with:
# 仅检查内部链接,排除所有外部链接
args: >
--verbose --no-progress
--cache --max-cache-age 1d --cache-exclude-status '429, 500..599'
--exclude 'https?://.*'
--exclude-path 'docs/zh-tw/manual/introduction/introduction_old.md'
--exclude-path 'docs/ja-jp/manual/introduction/introduction_old.md'
-- './docs/**/*.md' './README.md'
- name: Comment (only for PR)
if: failure() && github.event_name == 'pull_request'
uses: marocchino/sticky-pull-request-comment@v2
with:
message: |
Dead links found in the documentation. Please fix them.
Details: https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/${{ github.run_id }}

71
.github/workflows/mirrorchyan.yml vendored Normal file
View File

@@ -0,0 +1,71 @@
name: mirrorchyan
on:
workflow_dispatch:
jobs:
mirrorchyan:
runs-on: macos-latest
steps:
- name: Upload MAA win x64
uses: MirrorChyan/uploading-action@v1
if: always()
with:
filetype: latest-release
filename: "*MAA-*-win-x64.zip"
mirrorchyan_rid: MAA
github_token: ${{ secrets.GITHUB_TOKEN }}
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
upload_token: ${{ secrets.MirrorChyanUploadToken }}
os: win
arch: x64
- name: Upload MAA win arm64
uses: MirrorChyan/uploading-action@v1
if: always()
with:
filetype: latest-release
filename: "*MAA-*-win-arm64.zip"
mirrorchyan_rid: MAA
github_token: ${{ secrets.GITHUB_TOKEN }}
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
upload_token: ${{ secrets.MirrorChyanUploadToken }}
os: win
arch: arm64
- name: Upload MAA macos arm64
uses: MirrorChyan/uploading-action@v1
if: always()
with:
filetype: latest-release
filename: "MAA-*-macos-universal.dmg"
extra_zip: true
mirrorchyan_rid: MAA
github_token: ${{ secrets.GITHUB_TOKEN }}
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
upload_token: ${{ secrets.MirrorChyanUploadToken }}
os: macos
arch: arm64
- name: Upload MAA macos x64
uses: MirrorChyan/uploading-action@v1
if: always()
with:
filetype: latest-release
filename: "MAA-*-macos-universal.dmg"
extra_zip: true
mirrorchyan_rid: MAA
github_token: ${{ secrets.GITHUB_TOKEN }}
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
upload_token: ${{ secrets.MirrorChyanUploadToken }}
os: macos
arch: x64

View File

@@ -0,0 +1,19 @@
name: mirrorchyan_release_note
on:
workflow_dispatch:
release:
types: [edited]
jobs:
mirrorchyan:
runs-on: macos-latest
steps:
- name: Release Note for MAA
uses: MirrorChyan/release-note-action@v1
with:
mirrorchyan_rid: MAA
upload_token: ${{ secrets.MirrorChyanUploadToken }}
github_token: ${{ secrets.GITHUB_TOKEN }}

109
.github/workflows/optimize-templates.yml vendored Normal file
View File

@@ -0,0 +1,109 @@
name: Optimize PNG Templates
on:
push:
branches:
- "dev"
paths:
- "resource/**/*.png"
- "docs/.vuepress/public/images/**"
- "website/apps/web/public/**"
- "website/apps/web/src/assets/links/**"
workflow_dispatch:
inputs:
commit_message:
description: "Commit Message"
type: string
required: false
jobs:
optimize-png:
# Skip workflow to prevent double consecutive runs
# Skip workflow on PR merges
if: github.repository_owner == 'MaaAssistantArknights' && ${{ github.event.head_commit.author.email != '41898282+github-actions[bot]@users.noreply.github.com' }}
runs-on: ubuntu-latest
steps:
- name: Check for direct push
id: check_push
run: |
if [[ "${{ github.event_name }}" != "workflow_dispatch" ]]; then
pr_merge_status=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
"https://api.github.com/repos/${{ github.repository }}/commits/${{ github.event.after }}/pulls" | xargs)
if [[ "$pr_merge_status" == "[ ]" ]]; then
echo "Direct push detected. Proceeding..."
echo "is_pr=False" >> $GITHUB_OUTPUT
else
echo "PR merge detected. Exiting."
echo "is_pr=True" >> $GITHUB_OUTPUT
fi
else
echo "Manual trigger detected. Proceeding..."
echo "is_pr=False" >> $GITHUB_OUTPUT
fi
- name: Checkout repository
if: steps.check_push.outputs.is_pr != 'True'
uses: actions/checkout@v5
with:
show-progress: false
persist-credentials: false
- name: Setup python
if: steps.check_push.outputs.is_pr != 'True'
uses: actions/setup-python@v6
with:
python-version: "3.11"
# - name: Cache Python packages
# id: cache_python
# if: steps.check_push.outputs.is_pr != 'True' && always()
# uses: actions/cache@v4
# with:
# path: ${{ env.pythonLocation }}/lib/python3.11/site-packages
# key: ${{ runner.os }}-pip-optimize-templates-${{ hashFiles('./tools/OptimizeTemplates/requirements.txt') }}
- name: Install dependencies
# if: steps.check_push.outputs.is_pr != 'True' && steps.cache_python.outputs.cache-hit != 'true'
if: steps.check_push.outputs.is_pr != 'True'
run: |
pip install -r tools/OptimizeTemplates/requirements.txt
- name: Setup oxipng
if: steps.check_push.outputs.is_pr != 'True'
uses: baptiste0928/cargo-install@v3
with:
crate: oxipng
- name: Run optimize_templates
if: steps.check_push.outputs.is_pr != 'True'
run: |
python3 tools/OptimizeTemplates/optimize_templates.py
- name: Commit changes
id: commit_changes
if: steps.check_push.outputs.is_pr != 'True'
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add .
if git diff-index --quiet HEAD --; then
echo "No changes to commit"
else
commit_msg="${{ github.event.inputs.commit_message }}"
if [ -z "$commit_msg" ]; then
commit_msg="chore: Auto Templates Optimization"
fi
git commit -m "$commit_msg" -m "Triggered by ${{github.sha}}" -m "[skip changelog]"
git pull origin $(git rev-parse --abbrev-ref HEAD) --unshallow --rebase
echo "have_commits=True" >> $GITHUB_OUTPUT
fi
- name: Push changes
if: steps.check_push.outputs.is_pr != 'True' && steps.commit_changes.outputs.have_commits == 'True' && github.repository_owner == 'MaaAssistantArknights'
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.MAA_RESOURCE_SYNC }}
branch: ${{ github.ref }}

View File

@@ -9,6 +9,7 @@ on:
workflow_dispatch:
inputs:
tag:
description: "Name of the tag to create for the release"
type: string
required: true
@@ -19,7 +20,7 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0
token: ${{ secrets.MAARELEASE_RELEASE }}

View File

@@ -1,22 +1,17 @@
name: PR Checker
on:
pull_request:
pull_request_target:
types: [opened, edited, ready_for_review, reopened, synchronize]
permissions:
issues: write
pull-requests: write
jobs:
check_commit_name_in_pr:
if: ${{ !github.event.pull_request.merged && github.base_ref != 'master' }}
runs-on: ubuntu-latest
steps:
- name: Cleanup Previous Comment
uses: actions/github-script@v7
uses: actions/github-script@v8
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const { data: comments } = await github.rest.issues.listComments({
owner: context.repo.owner,
@@ -32,11 +27,9 @@ jobs:
comment_id: previousComment.id
});
}
- name: Check Commits
uses: actions/github-script@v7
uses: actions/github-script@v8
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const { data: commits } = await github.rest.pulls.listCommits({
owner: context.repo.owner,
@@ -45,7 +38,7 @@ jobs:
per_page: 100
});
const regex = /^((build|chore|ci|docs?|feat|fix|perf|refactor|rft|style|test|i18n|typo)[\:\.\(\,]|[Rr]evert|[Rr]elease)/;
const regex = /^((build|chore|ci|docs?|feat!?|fix|perf|refactor|rft|style|test|i18n|typo|debug)[\:\.\(\,]|[Rr]evert|[Rr]elease|[Rr]eapply)/;
const invalidCommits = commits.filter(commit => !regex.test(commit.commit.message) || commit.parents.length > 1);
console.log(`Checked ${commits.length} commit(s)`);
@@ -58,7 +51,7 @@ jobs:
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.pull_request.number,
body: `## ⚠️ Found ${invalidCommits.length} invalid commit(s):\n\n${invalidCommitInfoList}\n\n---\nPlease follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) format.`
body: `## ⚠️ Found ${invalidCommits.length} invalid commit(s):\n\n${invalidCommitInfoList}\n\n---\nPlease follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) format, and **DO NOT** use merge commits.\n请遵循 [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) 格式,以及**不要**使用Merge Commit修改 Commit Message 无法绕过检测)。`
});
core.setFailed(`Found ${invalidCommits.length} invalid commit(s):\n${invalidCommitNames.join("\n-------------------\n")}`);

View File

@@ -1,45 +0,0 @@
name: Qodana static analysis
on:
workflow_dispatch:
pull_request: # 在 PR 更新的场合进行扫描
paths:
- ".github/workflows/qodana.yml"
- "src/MaaWpfGui/*"
- "qodana.yaml"
- "src/MaaWpfGui/**"
- "MAA.sln"
push: # 在主分支推送代码的场合进行扫描
branches:
- master
- "releases/*"
- dev
paths:
- ".github/workflows/qodana.yml"
- "src/MaaWpfGui/**"
- "qodana.yaml"
permissions:
contents: write
pull-requests: write
checks: write
jobs:
qodana:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
fetch-depth: 0 # a full history is required for pull request analysis
show-progress: false
- name: Qodana Scan
uses: JetBrains/qodana-action@main
with:
pr-mode: false
post-pr-comment: true
args: --baseline,.github/qodana.sarif.json
env:
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

View File

@@ -1,6 +1,8 @@
name: release-nightly-ota
on:
schedule:
- cron: "0 22 * * *" # Runs daily at 22:00 UTC
workflow_dispatch:
inputs:
release_body:
@@ -11,73 +13,238 @@ on:
description: "Commit to build (git checkout)"
type: string
required: false
limit:
limit_maa:
description: "Number of releases to fetch from MaaAssistantArknights"
required: true
default: 30
default: 10
type: number
limit_2:
limit_maarelease:
description: "Number of releases to fetch from MaaRelease"
required: true
default: 30
default: 10
type: number
jobs:
build-win-nightly:
if: github.repository_owner == 'MaaAssistantArknights'
runs-on: windows-latest
strategy:
matrix:
include:
- msbuild_target: x64
lowercase_target: x64
arch: [x64]
fail-fast: false
env:
MAABUILDER_TARGET_PLATFORM: ${{ matrix.msbuild_target }}
outputs:
tag: ${{ steps.set_tag.outputs.tag }}
pre_version: ${{ steps.set_tag.outputs.pre_version }}
main_tag_name: ${{ steps.push_main_tag.outputs.main_tag_name }}
changelog: ${{ steps.read_changelog.outputs.content }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
# repository: 'MaaAssistantArknights/MaaAssistantArknights'
submodules: recursive
#ref: ${{ inputs.ref }}
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}
fetch-depth: 250
- name: Checkout ref
- name: Fetch tags
run: |
if ("${{ inputs.ref }}" -ne "") {
git checkout --progress --recurse-submodules ${{ inputs.ref || 'dev' }}
}
git fetch --depth=250 --tags
- name: Install semver
- name: Fetch submodules
run: |
npm install --global --progress semver
git submodule update --init --depth 1 3rdparty/EmulatorExtras
- name: Set tag
- name: Checkout ref (if provided)
if: inputs.ref != ''
run: |
git checkout --progress --recurse-submodules ${{ inputs.ref }}
- name: Check for Changes and Set tag
id: set_tag
run: |
$described = $(git describe --tags --long --match 'v*')
$ids = $($described -split "-")
if ($ids.length -eq 3) {
$ver = "v$(semver --increment $ids[0].Substring(1))"
$pre_version = "$($ids[0])"
$dist = `printf "%03d"` $ids[1]
echo "tag=$ver-alpha.1.d$($dist).$($ids[2])" >> $env:GITHUB_OUTPUT
echo "pre_version=$pre_version" >> $env:GITHUB_OUTPUT
# Fetch the latest tag from the repository
$latest_tag = git describe --tags --abbrev=0
Write-Output "Previous Tag: $latest_tag"
Write-Output "latest_tag=$latest_tag" >> $env:GITHUB_OUTPUT
# Check for changes between the latest tag and HEAD
$recent_changes = git log "$latest_tag..HEAD" --oneline
if (-not $recent_changes) {
Write-Output "No commits. Cancelling workflow..."
Write-Output "cancel_run=true" >> $env:GITHUB_ENV
exit 0
} else {
Write-Output "Recent commits: $recent_changes"
Write-Output "Commits found. Continuing build..."
Write-Output "cancel_run=false" >> $env:GITHUB_ENV
}
# Get the full description of the current commit
$described = git describe --tags --long --match 'v*'
Write-Output "New Described: $described"
$ids = $described -split "-"
if ($ids.Length -eq 3) {
# Extract and parse the current version
$current_version = $ids[0].Substring(1)
$parts = $current_version -split '\.'
if ($parts.Length -ne 3) {
Write-Error "Invalid version format: $current_version. Expected 'major.minor.patch'."
exit 1
}
# Increment the patch version
$parts[2] = [int]$parts[2] + 1
$new_version = "$($parts[0]).$($parts[1]).$($parts[2])"
# Construct the new tag and pre_version
$ver = "v$new_version"
$pre_version = $ids[0]
$dist = "{0:D3}" -f [int]$ids[1]
Write-Output "pre_version=$pre_version" >> $env:GITHUB_OUTPUT
Write-Output "New Tag: $ver-alpha.1.d$dist.$($ids[2])"
Write-Output "tag=$ver-alpha.1.d$dist.$($ids[2])" >> $env:GITHUB_OUTPUT
exit 0
}
if ($ids.length -eq 4) {
$dist = `printf "%03d"` $ids[2]
$pre_version = "$($ids[0])""-""$($ids[1])"
echo "tag=$($ids[0])-$($ids[1]).d$($dist).$($ids[3])" >> $env:GITHUB_OUTPUT
echo "pre_version=$pre_version" >> $env:GITHUB_OUTPUT
if ($ids.Length -eq 4) {
$dist = "{0:D3}" -f [int]$ids[2]
$pre_version = "$($ids[0])-$($ids[1])"
Write-Output "Pre Version: $pre_version"
Write-Output "pre_version=$pre_version" >> $env:GITHUB_OUTPUT
Write-Output "tag: $pre_version.d$dist.$($ids[3])"
Write-Output "tag=$pre_version.d$dist.$($ids[3])" >> $env:GITHUB_OUTPUT
exit 0
}
exit 1
- name: Stop if no changes
if: env.cancel_run == 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
curl -s -L -X POST `
-H "Accept: application/vnd.github+json" `
-H "Authorization: Bearer ${{ secrets.MAA_ACTION_READ_WRITE }}" `
-H "X-GitHub-Api-Version: 2022-11-28" `
"https://api.github.com/repos/MaaAssistantArknights/MaaAssistantArknights/actions/runs/${{ github.run_id }}/cancel" > $null
gh run watch ${{ github.run_id }}
- name: Generate Changelog
id: generate_changelog
run: |
python3 tools/ChangelogGenerator/changelog_generator.py --latest "${{ steps.set_tag.outputs.latest_tag }}" --tag "${{ steps.set_tag.outputs.tag }}"
Get-Content .\changelog.md | Select-Object -Skip 2 | Out-File -FilePath changelog_notag.md -Encoding utf8
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PYTHONIOENCODING: "utf-8"
- name: Stop if no changes
if: steps.generate_changelog.outputs.cancel_run == 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
curl -s -L -X POST `
-H "Accept: application/vnd.github+json" `
-H "Authorization: Bearer ${{ secrets.MAA_ACTION_READ_WRITE }}" `
-H "X-GitHub-Api-Version: 2022-11-28" `
"https://api.github.com/repos/MaaAssistantArknights/MaaAssistantArknights/actions/runs/${{ github.run_id }}/cancel" > $null
gh run watch ${{ github.run_id }}
- name: Read Changelog to variable
id: read_changelog
uses: juliangruber/read-file-action@v1
with:
path: ./changelog_notag.md
- name: Cache MaaDeps
id: cache-maadeps
uses: actions/cache@v4
with:
path: |
./MaaDeps
key: ${{ runner.os }}-${{ matrix.arch }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
- name: Bootstrap MaaDeps
if: steps.cache-maadeps.outputs.cache-hit != 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
python3 tools/maadeps-download.py ${{ matrix.arch }}-windows
- name: Config cmake
run: |
mkdir -p build
cmake -B build ${{ matrix.arch == 'arm64' && '-A ARM64' }} -DCMAKE_BUILD_TYPE=Release -DMAADEPS_TRIPLET='maa-${{ matrix.arch }}-windows' -DINSTALL_RESOURCE=ON -DINSTALL_PYTHON=ON -DMAA_HASH_VERSION='${{ steps.set_tag.outputs.tag }}' -DBUILD_WPF_GUI=OFF
- name: Build
run: |
cmake --build build --config Release --parallel $env:NUMBER_OF_PROCESSORS
- name: Install
run: |
mkdir -p install
cmake --install build --prefix install --config Release
- name: Cache .nuke/temp, ~/.nuget/packages
id: cache-nuget
uses: actions/cache@v4
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ matrix.arch }}-nuget-${{ hashFiles('**/*.csproj') }}
- name: Restore dependencies
if: steps.cache-nuget.outputs.cache-hit != 'true'
run: dotnet restore src/MaaWpfGui/MaaWpfGui.csproj
- name: Taggify Version for csproj
run: |
$csprojPath = "src/MaaWpfGui/MaaWpfGui.csproj"
$csprojPath = Resolve-Path -Path $csprojPath
$tag = '${{ steps.set_tag.outputs.tag }}' -replace '.*?/', ''
if ($tag -match '\d+(\.\d+){1,3}') {
$match = $Matches[0]
} else {
$match = "0.0.1"
}
[xml]$csproj = Get-Content -Path $csprojPath
$node = $csproj.Project.PropertyGroup | where {$_.ApplicationVersion -ne $null}
$node.InformationalVersion = $tag
$node.Version = $match
$node.FileVersion = $match
$node.AssemblyVersion = $match
$csproj.Save($csprojPath)
- name: Publish WPF GUI
run: |
dotnet publish src/MaaWpfGui/MaaWpfGui.csproj -c Release -o install
- name: Organize Install Files
shell: bash
run: |
rm -rf install/*.pdb
rm -rf install/msvc-debug
rm -rf install/*.h
cp tools/DependencySetup_依赖库安装.bat install
- name: Upload MAA to Github
uses: actions/upload-artifact@v4
with:
name: MAA-win-${{ matrix.arch }}
path: install
- name: Push tag to main repo
id: push_main_tag
run: |
@@ -89,70 +256,13 @@ jobs:
git push --tags origin HEAD:refs/tags/$main_tag_name -f
echo "main_tag_name=$main_tag_name" >> $env:GITHUB_OUTPUT
- name: Cache .nuke/temp, ~/.nuget/packages
id: cache-nuget
uses: actions/cache@v4
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: |
python3 maadeps-download.py ${{ matrix.lowercase_target }}-windows
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Taggify Version
run: |
$csprojPath = "src/MaaWpfGui/MaaWpfGui.csproj"
$csprojPath = Resolve-Path -Path $csprojPath
$tag = '${{ steps.set_tag.outputs.tag }}' -replace '.*?/', ''
if ($tag -match '\d+(\.\d+){1,3}') {
$match = $Matches[0]
} else {
$match = "0.0.1"
}
echo "Tag value: $tag"
echo "Version value: $match"
[xml]$csproj = Get-Content -Path $csprojPath
$node = $csproj.Project.PropertyGroup | where {$_.ApplicationVersion -ne $null}
$node.InformationalVersion = $tag
$node.Version = $match
$node.FileVersion = $match
$node.AssemblyVersion = $match
$csproj.Save($csprojPath)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Run './build.cmd DevBuild'
run: |
$env:GITHUB_WORKFLOW = 'dev-build-win' # pretend this is a dev-build-win workflow
$env:MAA_BUILDER_MAA_VERSION = "${{ steps.set_tag.outputs.tag }}"
echo "tag: " $env:MAA_BUILDER_MAA_VERSION
./build.cmd DevBuild
env:
Reason: "Build nightly version"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload MAA to Github
uses: actions/upload-artifact@v4
with:
name: MAA-win-${{ matrix.lowercase_target }}
path: artifacts
push-tag:
if: github.repository_owner == 'MaaAssistantArknights'
needs: build-win-nightly
runs-on: ubuntu-latest
steps:
- name: Fetch MaaRelease
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
fetch-depth: 0
@@ -170,6 +280,7 @@ jobs:
git push --tags origin HEAD:refs/tags/${{ needs.build-win-nightly.outputs.tag }}
make-ota:
if: github.repository_owner == 'MaaAssistantArknights'
needs: [build-win-nightly, push-tag]
strategy:
matrix:
@@ -181,14 +292,14 @@ jobs:
echo ${{ needs.build-win-nightly.outputs.tag }}
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
path: MaaAssistantArknights
token: ${{ secrets.MAARELEASE_RELEASE }}
show-progress: false
- name: Download MAA from Github
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: MAA-win-${{ matrix.target }}
path: ${{ format('{0}/{1}', 'build-ota', needs.build-win-nightly.outputs.tag) }}
@@ -197,8 +308,17 @@ jobs:
run: |
mkdir -pv build-ota && cd build-ota
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 30 }} | tee ./release_maa.txt
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit ${{ inputs.limit_2 || 30 }} | tee ./release_mr.txt
# Convert inputs to integers
limit_maa=${{ inputs.limit_maa || 10 }}
limit_maa=${limit_maa%.*}
echo "Parsed limit_maa: $limit_maa"
limit_maarelease=${{ inputs.limit_maarelease || 10 }}
limit_maarelease=${limit_maarelease%.*}
echo "Parsed limit_maarelease: $limit_maarelease"
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit $limit_maa | tee ./release_maa.txt
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit $limit_maarelease | tee ./release_mr.txt
echo ${{ needs.build-win-nightly.outputs.tag }} > ./config
cat ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
@@ -218,8 +338,7 @@ jobs:
cd build-ota
pushd ${{ needs.build-win-nightly.outputs.tag }}
zip -d *.zip '*.lib' '*.pdb' '*.exp' '*.config' '*.xml'
mv *.zip MAA-${{ env.release_tag }}-win-${{ matrix.target }}.zip
zip -r MAA-${{ env.release_tag }}-win-${{ matrix.target }}.zip ./*
popd
$GITHUB_WORKSPACE/MaaAssistantArknights/tools/OTAPacker/build.sh 'MaaAssistantArknights/MaaAssistantArknights' ./config ${{ matrix.target }} "${{ github.repository_owner }}/MaaRelease"
@@ -227,22 +346,6 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Make release body
id: make_release_body
shell: bash
run: |
pre_version=${{ needs.build-win-nightly.outputs.pre_version }}
cur_version=${{ needs.build-win-nightly.outputs.main_tag_name }}
echo -e "${{ inputs.release_body || '' }}\n\n**Full Changelog**: [$pre_version -> $cur_version](https://github.com/$GITHUB_REPOSITORY/compare/$pre_version...$cur_version)" > alpha_changelog.md
export r=$(cat alpha_changelog.md)
# https://github.com/svenstaro/upload-release-action
r="${r//'%'/'%25'}" # Multiline escape sequences for %
r="${r//$'\n'/'%0A'}" # Multiline escape sequences for '\n'
r="${r//$'\r'/'%0D'}" # Multiline escape sequences for '\r'
echo $r
echo "full_release_body=$r" >> $GITHUB_OUTPUT
- name: Upload to MaaRelease
uses: svenstaro/upload-release-action@v2
with:
@@ -253,10 +356,17 @@ jobs:
tag: ${{ env.release_tag }}
prerelease: true
overwrite: true
body: ${{ steps.make_release_body.outputs.full_release_body }}
body: |
${{ inputs.release_body || '' }}
${{ needs.build-win-nightly.outputs.changelog }}
**Full Changelog**: [${{ needs.build-win-nightly.outputs.pre_version }} -> ${{ needs.build-win-nightly.outputs.main_tag_name }}](https://github.com/${{ github.repository }}/compare/${{ needs.build-win-nightly.outputs.pre_version }}...${{ needs.build-win-nightly.outputs.main_tag_name }})
- name: Setup release mirror
run: |
gh workflow --repo MaaAssistantArknights/MaaRelease run release-mirrors.yml
gh workflow --repo MaaAssistantArknights/MaaRelease run mirrorchyan_alpha.yml
gh workflow --repo MaaAssistantArknights/MaaRelease run mirrorchyan_alpha_release_note.yml
env:
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}

View File

@@ -25,8 +25,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Fetch MaaRelease
uses: actions/checkout@v3
uses: actions/checkout@v5
with:
show-progress: false
repository: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
path: MaaRelease
fetch-depth: 0
@@ -36,8 +37,18 @@ jobs:
id: fetchReleaseInfo
run: |
mkdir -pv build-ota && cd build-ota
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 31 }} | tee ./release_maa.txt
gh release list --repo "MaaAssistantArknights/MaaRelease" --limit ${{ inputs.limit_2 || 30 }} | tee ./release_mr.txt
# Convert inputs to integers
limit=${{ inputs.limit || 31 }}
limit=${limit%.*}
echo "Parsed limit: $limit"
limit_2=${{ inputs.limit_2 || 30 }}
limit_2=${limit_2%.*}
echo "Parsed limit_2: $limit_2"
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit $limit | tee ./release_maa.txt
gh release list --repo "MaaAssistantArknights/MaaRelease" --limit $limit_2 | tee ./release_mr.txt
head -n 1 ./release_maa.txt | awk '{ print $1 }' > ./config
tail -n +1 ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
@@ -83,19 +94,24 @@ jobs:
- x64
steps:
- name: Download release config
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: MaaReleaseConfig
path: ./MaaReleaseConfig
- name: Fetch MaaRelease
uses: actions/checkout@v3
uses: actions/checkout@v5
with:
show-progress: false
repository: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
path: MaaRelease
fetch-depth: 0
token: ${{ secrets.MAARELEASE_RELEASE }}
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v5
with:
show-progress: false
path: MaaAssistantArknights
- name: Download latest version for server
@@ -121,9 +137,18 @@ jobs:
prerelease: ${{ fromJSON(needs.create-tag.outputs.prerelease) }}
overwrite: true
- name: Create issue if failed
if: failure()
uses: actions-cool/issues-helper@v3
with:
actions: "create-issue"
title: "Failed make release OTA for Windows"
body: |
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
make-ota-mac:
needs: create-tag
runs-on: macos-13
runs-on: macos-14
steps:
- name: Fetch release info
run: gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 31 }} | tee ./release_maa.txt
@@ -153,31 +178,6 @@ jobs:
run: |
find ./packages -type f ! \( -name 'MAA-${{ needs.create-tag.outputs.release_tag }}-macos-universal.dmg' -o -name '*.delta' -o -name '*.xml' \) -print -delete
- name: Unpack the .dmg files for .dylib
run: |
cd ${{ runner.temp }}
mkdir -p macos-runtime-temp
echo ::group::Attaching release package...
hdiutil attach ${{ github.workspace }}/packages/MAA-${{ needs.create-tag.outputs.release_tag }}-macos-universal.dmg
echo ::endgroup::
echo ::group::Copying files...
cp -v /Volumes/MAA/MAA.app/Contents/Frameworks/*.dylib macos-runtime-temp/
cp -vr /Volumes/MAA/MAA.app/Contents/Resources/resource macos-runtime-temp/resource
echo ::endgroup::
echo ::group::Linking files...
libonnxruntime_file=$(basename macos-runtime-temp/libonnxruntime*.dylib)
ln -vs $libonnxruntime_file macos-runtime-temp/libonnxruntime.dylib
libopencv_world_file=$(basename macos-runtime-temp/libopencv_world*.dylib)
ln -vs $libopencv_world_file macos-runtime-temp/libopencv_world4.dylib
echo ::endgroup::
cd macos-runtime-temp
echo ::group::Compressing files...
zip -yrX9 ${{ github.workspace }}/packages/MAA-${{ needs.create-tag.outputs.release_tag }}-macos-runtime-universal.zip *
echo ::endgroup::
echo ::group::Detaching release package...
hdiutil detach /Volumes/MAA
echo ::endgroup::
- name: Upload to MaaRelease
uses: svenstaro/upload-release-action@v2
with:
@@ -189,6 +189,15 @@ jobs:
prerelease: ${{ fromJSON(needs.create-tag.outputs.prerelease) }}
overwrite: true
- name: Create issue if failed
if: failure()
uses: actions-cool/issues-helper@v3
with:
actions: "create-issue"
title: "Failed make release OTA for macos"
body: |
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
release:
needs:
- make-ota
@@ -200,30 +209,3 @@ jobs:
- name: Setup release mirror
run: |
gh workflow --repo MaaAssistantArknights/MaaRelease run release-mirrors.yml
- name: Deploy docs
run: |
mkdir -p ${{ runner.temp }}/new
mkdir -p ${{ runner.temp }}/old
gh api /repos/MaaAssistantArknights/MaaAssistantArknights/tags --jq '.[].name' > ${{ runner.temp }}/release_maa.txt
export NEW_VERSION=$(sed -n '1p' ${{ runner.temp }}/release_maa.txt)
echo "NEW_VERSION: $NEW_VERSION"
export OLD_VERSION=$(sed -n '2p' ${{ runner.temp }}/release_maa.txt)
echo "OLD_VERSION: $OLD_VERSION"
gh api "/repos/MaaAssistantArknights/MaaAssistantArknights/tarball/$NEW_VERSION" > ${{ runner.temp }}/new.tar.gz
gh api "/repos/MaaAssistantArknights/MaaAssistantArknights/tarball/$OLD_VERSION" > ${{ runner.temp }}/old.tar.gz
tar -xzf ${{ runner.temp }}/new.tar.gz -C ${{ runner.temp }}/new
tar -xzf ${{ runner.temp }}/old.tar.gz -C ${{ runner.temp }}/old
export NEW_PATH="${{ runner.temp }}/new/$(ls ${{ runner.temp }}/new)/docs"
echo "NEW_PATH: $NEW_PATH"
export OLD_PATH="${{ runner.temp }}/old/$(ls ${{ runner.temp }}/old)/docs"
echo "OLD_PATH: $OLD_PATH"
export DOCS_DIFF=$(diff -aqr $NEW_PATH $OLD_PATH)
if [ -n "$DOCS_DIFF" ]; then
echo "Found changes, start to deploy the docs:"
echo "$DOCS_DIFF"
gh workflow --repo MaaAssistantArknights/maa-website run build-and-deploy.yaml
echo "Deploying the docs."
else
echo "Nothing changed, exit."
fi

View File

@@ -1,8 +1,8 @@
name: res-update-game
name: Resource Updater
on:
schedule:
- cron: "*/20 * * * *"
- cron: "*/20 * * * *" # Runs every 20 minutes
workflow_dispatch:
inputs:
commit_message:
@@ -11,38 +11,18 @@ on:
required: false
jobs:
update-game-resources:
clone-resources-official:
if: github.repository_owner == 'MaaAssistantArknights'
runs-on: windows-latest
env:
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
runs-on: ubuntu-latest
steps:
- name: Checkout MAA
uses: actions/checkout@v4
with:
show-progress: false
token: ${{ secrets.MISTEOWORKFLOW }}
- name: Bootstrap MaaDeps
run: |
python3 maadeps-download.py x64-windows
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1
- name: Build Resource Updater
run: |
MSBUILD tools/ResourceUpdater/ResourceUpdater.vcxproj /t:rebuild /p:Configuration="Release" /p:Platform="x64" /p:BuildProjectReferences=false /m
- name: Clone ArknightsGameResource for Official
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
show-progress: false
repository: yuanyan3060/ArknightsGameResource
ref: main
path: .\tools\ResourceUpdater\x64\Release\Official
path: ./Official
sparse-checkout-cone-mode: false
sparse-checkout: |
/levels.json
/item
@@ -54,135 +34,319 @@ jobs:
/gamedata/excel/gacha_table.json
/gamedata/excel/roguelike_topic_table.json
/gamedata/excel/activity_table.json
sparse-checkout-cone-mode: false
- name: Upload Official
uses: actions/upload-artifact@v4
with:
name: official
path: ./Official
compression-level: 0
clone-resources-overseas:
if: github.repository_owner == 'MaaAssistantArknights'
runs-on: ubuntu-latest
steps:
- name: Clone ArknightsGameResource_Yostar for Overseas
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
show-progress: false
repository: Kengxxiao/ArknightsGameData_YoStar
ref: main
path: .\tools\ResourceUpdater\x64\Release\Overseas
sparse-checkout: |
/en_US/gamedata/excel/item_table.json
/en_US/gamedata/excel/building_data.json
/en_US/gamedata/excel/range_table.json
/en_US/gamedata/excel/character_table.json
/en_US/gamedata/excel/gacha_table.json
/en_US/gamedata/excel/roguelike_topic_table.json
/en_US/gamedata/excel/activity_table.json
/ja_JP/gamedata/excel/item_table.json
/ja_JP/gamedata/excel/building_data.json
/ja_JP/gamedata/excel/range_table.json
/ja_JP/gamedata/excel/character_table.json
/ja_JP/gamedata/excel/gacha_table.json
/ja_JP/gamedata/excel/roguelike_topic_table.json
/ja_JP/gamedata/excel/activity_table.json
/ko_KR/gamedata/excel/item_table.json
/ko_KR/gamedata/excel/building_data.json
/ko_KR/gamedata/excel/range_table.json
/ko_KR/gamedata/excel/character_table.json
/ko_KR/gamedata/excel/gacha_table.json
/ko_KR/gamedata/excel/roguelike_topic_table.json
/ko_KR/gamedata/excel/activity_table.json
repository: ArknightsAssets/ArknightsGamedata
ref: master
path: ./Overseas
sparse-checkout-cone-mode: false
sparse-checkout: |
/en/gamedata/excel/item_table.json
/en/gamedata/excel/building_data.json
/en/gamedata/excel/range_table.json
/en/gamedata/excel/character_table.json
/en/gamedata/excel/gacha_table.json
/en/gamedata/excel/roguelike_topic_table.json
/en/gamedata/excel/activity_table.json
/jp/gamedata/excel/item_table.json
/jp/gamedata/excel/building_data.json
/jp/gamedata/excel/range_table.json
/jp/gamedata/excel/character_table.json
/jp/gamedata/excel/gacha_table.json
/jp/gamedata/excel/roguelike_topic_table.json
/jp/gamedata/excel/activity_table.json
/kr/gamedata/excel/item_table.json
/kr/gamedata/excel/building_data.json
/kr/gamedata/excel/range_table.json
/kr/gamedata/excel/character_table.json
/kr/gamedata/excel/gacha_table.json
/kr/gamedata/excel/roguelike_topic_table.json
/kr/gamedata/excel/activity_table.json
- name: Upload Official
uses: actions/upload-artifact@v4
with:
name: overseas
path: ./Overseas
compression-level: 0
clone-resources-txwy:
if: github.repository_owner == 'MaaAssistantArknights'
runs-on: ubuntu-latest
steps:
- name: Clone arknights-toolbox-update for Taiwan
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
show-progress: false
repository: arkntools/arknights-toolbox-update
ref: data-tw
path: .\tools\ResourceUpdater\x64\Release\Overseas\zh_TW\gamedata\excel
path: ./excel
token: ${{ secrets.ARKNTOOLS_MAA_RESOURCE_UPDATER}}
- name: Download stages.json from Penguin Stats
run: |
cd "./excel"
baseUrl="https://penguin-stats.io/PenguinStats/api/v2/stages?server="
parameters=("CN" "US" "JP" "KR")
for param in "${parameters[@]}"; do
{
if curl -s -o "stages_${param}.json" "${baseUrl}${param}"; then
echo "Successfully fetched data for ${param}"
else
echo "Failed to fetch data for ${param}" >&2
exit 1
fi
} &
done
wait
- name: Upload Official
uses: actions/upload-artifact@v4
with:
name: txwy
path: ./excel
compression-level: 0
update-game-resources:
# In case of rate limitations on the runners/instances, add dependency, by removing the comment
# needs: [clone-resources-official, clone-resources-overseas, clone-resources-txwy]
if: github.repository_owner == 'MaaAssistantArknights'
runs-on: macos-latest
steps:
- name: Checkout MAA
uses: actions/checkout@v5
with:
# TL;DR https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9872#issuecomment-2251378371
# actions/checkout uses ${{ secrets.GITHUB_TOKEN }} by default, meaning all steps will inherit it
persist-credentials: false # Needed to bypass protection rules in Push changes
show-progress: false
fetch-depth: 3
- name: Restore ResourceUpdater from cache
id: resupd-cache
uses: actions/cache/restore@v4
with:
key: ResourceUpdater-${{ runner.os }}-${{ hashFiles('tools/ResourceUpdater/main.cpp') }}
path: |
./tools/ResourceUpdater/libopencv_world4.4.11.0.dylib
./tools/ResourceUpdater/res_updater
- name: Cache MaaDeps
if: steps.resupd-cache.outputs.cache-hit != 'true'
id: maadeps-cache
uses: actions/cache@v4
with:
path: |
./MaaDeps
key: ${{ runner.os }}-arm64-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
- name: Bootstrap MaaDeps
if: steps.resupd-cache.outputs.cache-hit != 'true' && steps.maadeps-cache.outputs.cache-hit != 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
python3 tools/maadeps-download.py arm64-osx
- name: Config cmake
if: steps.resupd-cache.outputs.cache-hit != 'true'
run: |
cd tools/ResourceUpdater
mkdir -p build
cmake -B build -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DMAADEPS_TRIPLET='maa-arm64-osx' \
-DWITH_HASH_VERSION=ON
- name: Build
if: steps.resupd-cache.outputs.cache-hit != 'true'
run: |
cmake --build tools/ResourceUpdater/build --config Release --parallel $(sysctl -n hw.logicalcpu)
- name: Install
if: steps.resupd-cache.outputs.cache-hit != 'true'
run: |
cmake --install tools/ResourceUpdater/build --prefix tools/ResourceUpdater --config Release
- name: Save ResourceUpdater to cache
if: always() && steps.resupd-cache.outputs.cache-hit != 'true'
uses: actions/cache/save@v4
with:
key: ResourceUpdater-${{ runner.os }}-${{ hashFiles('tools/ResourceUpdater/main.cpp') }}
path: |
./tools/ResourceUpdater/libopencv_world4.4.11.0.dylib
./tools/ResourceUpdater/res_updater
- name: Download txwy
id: download-txwy
uses: actions/download-artifact@v5
continue-on-error: true
with:
name: txwy
path: ./tools/ResourceUpdater/Overseas/tw/gamedata/excel
- name: Delay txwy
if: steps.download-txwy.outcome == 'failure'
run: |
sleep 10
- name: Re-download txwy
if: steps.download-txwy.outcome == 'failure'
uses: actions/download-artifact@v5
with:
name: txwy
path: ./tools/ResourceUpdater/Overseas/tw/gamedata/excel
- name: Download Overseas
id: download-overseas
uses: actions/download-artifact@v5
continue-on-error: true
with:
name: overseas
path: ./tools/ResourceUpdater/Overseas
- name: Delay Overseas
if: steps.download-overseas.outcome == 'failure'
run: |
sleep 10
- name: Re-download Overseas
if: steps.download-overseas.outcome == 'failure'
uses: actions/download-artifact@v5
with:
name: overseas
path: ./tools/ResourceUpdater/Overseas
- name: Download Official
id: download-official
uses: actions/download-artifact@v5
continue-on-error: true
with:
name: official
path: ./tools/ResourceUpdater/Official
- name: Delay Official
if: steps.download-official.outcome == 'failure'
run: |
sleep 10
- name: Re-download Official
if: steps.download-official.outcome == 'failure'
uses: actions/download-artifact@v5
with:
name: official
path: ./tools/ResourceUpdater/Official
- name: Run Resource Updater
run: |
.\tools\ResourceUpdater\x64\Release\ResourceUpdater.exe
./tools/ResourceUpdater/res_updater
- name: Overseas Tasks Ordering
- name: Task Sorting
id: task_sorting
run: |
python3 tools/TaskSorter/TaskSorter.py
echo "gitdiff=$(echo $(git diff --name-only --diff-filter=ACM 2>/dev/null | grep '\.json$'))" >> $GITHUB_OUTPUT
- name: Check if only sorted
id: check_only_sorted
- name: Run prettier
uses: Nerixyz/actionsx-prettier@v3-adj
with:
args: -w ${{ steps.task_sorting.outputs.gitdiff }}
- name: Update version.json date if necessary
id: update_version
run: |
git status
./tools/ResourceUpdater/version.zsh
$diff = $(git diff --numstat HEAD | findstr -i resource)
if ($LASTEXITCODE -ne 0) {
echo "no diff"
exit 0
}
- name: Setup python
if: steps.update_version.outputs.contains_png == 'True'
uses: actions/setup-python@v6
with:
python-version: "3.11"
echo "diff: "$diff
$sp = $($diff -split "\s+")
$numbers = $($sp | Where-Object { $_ -match "^\d+$" })
echo "numbers: "$numbers
- name: Cache Python packages
if: always() && steps.update_version.outputs.contains_png == 'True'
id: cache_python
uses: actions/cache@v4
with:
path: ${{ env.pythonLocation }}/Lib/site-packages
key: ${{ runner.os }}-pip-optimize-templates-${{ hashFiles('./tools/OptimizeTemplates/requirements.txt') }}
$length = $numbers.Length
$isAllEqual = $true
for ($i = 0; $i -lt $length; $i += 2) {
$firstNumber = $numbers[$i]
$secondNumber = $numbers[$i+1]
- name: Install dependencies
if: steps.cache_python.outputs.cache-hit != 'true' && steps.update_version.outputs.contains_png == 'True'
run: |
pip install -r tools/OptimizeTemplates/requirements.txt
if ($firstNumber -gt 1) {
$isAllEqual = $false
break
}
if ($firstNumber -ne $secondNumber) {
$isAllEqual = $false
break
}
}
echo "isAllEqual: "$isAllEqual
echo "only_sorted=$isAllEqual" >> $env:GITHUB_OUTPUT
- name: Setup oxipng
if: steps.update_version.outputs.contains_png == 'True'
uses: baptiste0928/cargo-install@v3
with:
crate: oxipng
- name: Cancelling
if: steps.check_only_sorted.outputs.only_sorted == 'True'
uses: andymckay/cancel-action@0.3
- name: Run optimize_templates
if: steps.update_version.outputs.contains_png == 'True'
run: |
python3 tools/OptimizeTemplates/optimize_templates.py -p resource/template/items/ resource/template/infrast/
- name: Add files to git
if: steps.check_only_sorted.outputs.only_sorted != 'True'
if: steps.update_version.outputs.changes == 'True'
id: add_files
run: |
git status
git config user.name "$env:GITHUB_ACTOR"
git config user.email "$env:GITHUB_ACTOR@users.noreply.github.com"
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add .
$commit_msg = "${{ github.event.inputs.commit_message }}"
if (-not [string]::IsNullOrWhiteSpace($commit_msg)) {
$commit_msg = $commit_msg.Trim()
} else {
$commit_msg = "chore: Auto Update Game Resources - $(Get-Date -Format 'yyyy-MM-dd')"
}
git commit -m "$commit_msg" -m "[skip changelog]"
if ($LASTEXITCODE -eq 0) {
echo "have_commits=True" >> $env:GITHUB_OUTPUT
}
commit_msg="${{ github.event.inputs.commit_message }}"
if [ -z "$commit_msg" ]; then
commit_msg="chore: Auto Update Game Resources - $(date '+%Y-%m-%d')"
else
commit_msg=$(echo "$commit_msg" | xargs) # Trim whitespace
fi
git pull origin $(git rev-parse --abbrev-ref HEAD) --unshallow --rebase
run_url="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
- name: Cancelling
if: steps.add_files.outputs.have_commits != 'True'
uses: andymckay/cancel-action@0.3
git commit -m "$commit_msg" -m "$run_url" -m "[skip changelog]"
if [ $? -eq 0 ]; then
echo "have_commits=True" >> $GITHUB_OUTPUT
fi
- name: Push changes # push the output folder to your repo
git pull origin ${{ github.ref_name }} --rebase
- name: Push changes
if: steps.add_files.outputs.have_commits == 'True'
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.MISTEOWORKFLOW }}
branch: ${{ github.ref }}
github_token: ${{ secrets.MAA_RESOURCE_SYNC }}
- name: Update OTA resource
run: |
gh workflow --repo MaaAssistantArknights/MaaRelease run update-resource.yml
# - name: Update OTA resource
# if: steps.update_version.outputs.update_resources == 'True'
# env:
# GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
# run: |
# gh workflow --repo MaaAssistantArknights/MaaRelease run update-resource.yml
# - name: Release # ref: https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
# if: steps.add_files.outputs.have_commits == 'True'
# run: |
# gh workflow run release-nightly-ota -f release_body="Auto Release of Resource Updates"
# env:
# GH_TOKEN: ${{ github.token }}
- name: Add cancelled status
if: steps.update_version.outputs.changes != 'True' || steps.add_files.outputs.have_commits != 'True'
uses: andymckay/cancel-action@0.5
# - name: Release # ref: https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
# if: steps.add_files.outputs.have_commits == 'True'
# run: |
# gh workflow run release-nightly-ota -f release_body="Auto Release of Resource Updates"

View File

@@ -1,77 +1,128 @@
name: test
name: smoke-testing
on:
push:
paths:
- ".github/workflows/smoke-testing.yml"
- "3rdparty/include/**"
- "include/**"
- "src/**"
- "src/Cpp/**"
- "src/MaaCore/**"
- "resource/**"
- "!**/*.md"
- "cmake/**"
- "CMakeLists.txt"
- "MAA.sln"
- "resource/**"
- "MaaDeps/**"
- "!**/*.md"
- "tools/maadeps-download.py"
pull_request:
paths:
- ".github/workflows/smoke-testing.yml"
- "3rdparty/include/**"
- "include/**"
- "src/**"
- "src/Cpp/**"
- "src/MaaCore/**"
- "resource/**"
- "!**/*.md"
- "cmake/**"
- "CMakeLists.txt"
- "MAA.sln"
- "resource/**"
- "MaaDeps/**"
- "!**/*.md"
- "tools/maadeps-download.py"
workflow_dispatch:
jobs:
smoke-testing:
runs-on: windows-latest
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name
runs-on: macos-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
show-progress: false
- name: Restore dependencies
run: dotnet restore
- name: Generate cache key
id: cache_key
run: |
echo "key=Smoke-testing-${{ hashFiles('src/Cpp/**', 'src/MaaCore/**', '3rdparty/include/**', 'include/**', 'cmake/**', 'CMakeLists.txt', 'tools/maadeps-download.py', 'tools/linux-toolchain-download.py') }}" >> $GITHUB_OUTPUT
- name: Restore cache smoke-testing
id: smoke-cache
uses: actions/cache/restore@v4
with:
key: ${{ steps.cache_key.outputs.key }}
path: |
./install/libfastdeploy_ppocr.dylib
./install/libMaaCore.dylib
./install/libonnxruntime.1.19.2.dylib
./install/libopencv_world4.4.11.0.dylib
./install/smoke_test
- name: Fetch submodules
if: steps.smoke-cache.outputs.cache-hit != 'true'
run: |
git submodule update --init --depth 1 3rdparty/EmulatorExtras
- name: Cache MaaDeps
if: steps.smoke-cache.outputs.cache-hit != 'true'
id: maadeps-cache
uses: actions/cache@v4
with:
path: ./MaaDeps
key: ${{ runner.os }}-arm64-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
- name: Bootstrap MaaDeps
if: steps.smoke-cache.outputs.cache-hit != 'true' && steps.maadeps-cache.outputs.cache-hit != 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
python3 maadeps-download.py x64-windows
python3 tools/maadeps-download.py arm64-osx
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1
- name: Build MaaSample
- name: Config cmake
if: steps.smoke-cache.outputs.cache-hit != 'true'
run: |
MSBUILD src/Cpp/MaaSample.slnf /t:rebuild /p:Configuration="Debug" /p:Platform="x64" /m
mkdir -p build
cmake -B build -GNinja \
-DCMAKE_BUILD_TYPE=Debug \
-DMAADEPS_TRIPLET='maa-arm64-osx' \
-DBUILD_SMOKE_TEST=ON \
-DINSTALL_RESOURCE=ON \
-DWITH_HASH_VERSION=ON
- name: Run tests - Official #用来判断是不是国服资源出错导致外服全炸
- name: Build
if: steps.smoke-cache.outputs.cache-hit != 'true'
run: |
.\x64\Debug\Sample.exe
cmake --build build --config Debug --parallel $(sysctl -n hw.logicalcpu)
- name: Run tests - YoStarJP
- name: Install
if: steps.smoke-cache.outputs.cache-hit != 'true'
run: |
.\x64\Debug\Sample.exe YoStarJP
- name: Run tests - YoStarEN
mkdir -p install
cmake --install build --prefix install --config Debug
- name: Make link for cache smoke-testing
if: steps.smoke-cache.outputs.cache-hit == 'true'
run: |
.\x64\Debug\Sample.exe YoStarEN
- name: Run tests - YoStarKR
ln -s "$(pwd)/resource" install/resource
- name: Run tests
run: |
.\x64\Debug\Sample.exe YoStarKR
- name: Run tests - txwy
run: |
.\x64\Debug\Sample.exe txwy
./tools/SmokeTesting/run_tests.zsh
- name: Save cache smoke-testing (only in dev)
if: steps.smoke-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/dev'
uses: actions/cache/save@v4
with:
key: ${{ steps.cache_key.outputs.key }}
path: |
./install/libfastdeploy_ppocr.dylib
./install/libMaaCore.dylib
./install/libonnxruntime.1.19.2.dylib
./install/libopencv_world4.4.11.0.dylib
./install/smoke_test
- name: Upload logs
if: always()
uses: actions/upload-artifact@v4
with:
name: log
path: .\x64\Debug\debug
name: logs
path: ./install/debug

39
.github/workflows/stale.yml vendored Normal file
View File

@@ -0,0 +1,39 @@
name: "Inactive Issues Closer"
on:
schedule:
- cron: "0 0 * * *" # Runs daily at UTC 00:00
workflow_dispatch: # Allows manual triggering
env: # config
daysBeforeStale: 90 # Number of days of inactivity before marking as stale
daysBeforeClose: 7 # Number of days to wait after marking as stale before closing
jobs:
stale:
if: github.repository_owner == 'MaaAssistantArknights'
runs-on: ubuntu-latest
permissions:
actions: write # Workaround for https://github.com/actions/stale/issues/1090
issues: write
# Completely disable stalling for PRs
pull-requests: none
contents: none
steps:
- name: Close inactive issues
uses: actions/stale@v10
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: ${{ env.daysBeforeStale }}
days-before-close: ${{ env.daysBeforeClose }}
stale-issue-label: "stale"
stale-issue-message: |
This issue has been inactive for a prolonged period and will be closed automatically in ${{ env.daysBeforeClose }} days.
该问题已长时间处于闲置状态,${{ env.daysBeforeClose }} 天后将自动关闭。
exempt-issue-labels: "keep-open, MAA Team, enhancement"
days-before-pr-stale: -1 # Completely disable stalling for PRs
days-before-pr-close: -1 # Completely disable closing for PRs
# Temporary to reduce the huge issues number
operations-per-run: 100
debug-only: false

View File

@@ -1,32 +1,33 @@
name: sync-resource
on:
workflow_dispatch:
push:
branches:
- dev
paths:
- "resource/**"
- ".github/workflows/sync-resource.yml"
workflow_dispatch:
jobs:
sync-reource:
sync-resource:
if: github.repository_owner == 'MaaAssistantArknights'
runs-on: ubuntu-latest
steps:
- name: Checkout MaaAssistantArknights
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
show-progress: false
- name: Setup Git
run: |
git config --global user.name "$GITHUB_ACTOR"
git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com"
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
git show -s
- name: Checkout MaaResource
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: MaaAssistantArknights/MaaResource
show-progress: false
@@ -48,9 +49,3 @@ jobs:
git status
git commit -m "$commit_msg" || exit 0
git push
- name: Setup resource update
env:
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
run: |
gh workflow --repo MaaAssistantArknights/MaaRelease run update-resource.yml

72
.github/workflows/website-workflow.yml vendored Normal file
View File

@@ -0,0 +1,72 @@
name: MaaWebsite Workflow
on:
push:
branches:
- "master"
- "dev"
paths:
- ".github/workflows/website-workflow.yml"
- "docs/**"
pull_request:
paths:
- ".github/workflows/website-workflow.yml"
- "docs/**"
workflow_dispatch:
inputs:
deploy-to-prod:
description: "Deploy to prod"
default: false
required: true
type: boolean
concurrency:
group: "pages"
cancel-in-progress: false
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- name: Checkout
uses: actions/checkout@v5
with:
show-progress: false
- name: Setup Pages
uses: actions/configure-pages@v5
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 10
run_install: false
- name: Setup Node.js environment
uses: actions/setup-node@v5
with:
node-version: 24
cache: pnpm
cache-dependency-path: "./docs/pnpm-lock.yaml"
- name: Install dependencies
run: pnpm install --frozen-lockfile
working-directory: "./docs"
- name: Build documentation
run: pnpm run build
working-directory: "./docs"
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: "./docs/.vuepress/dist"
- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v4
if: ${{ inputs.deploy-to-prod == true || github.ref == 'refs/heads/master' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: "./docs/.vuepress/dist"
publish_branch: gh-pages

30
.gitignore vendored
View File

@@ -437,6 +437,9 @@ tools/**/*.png
.vscode
enc_temp_folder/*
# RoguelikeRecruitmentTool 导出的 Excel 文件
tools/RoguelikeRecruitmentTool/output
# Nuke
.nuke/temp/*
@@ -448,3 +451,30 @@ enc_temp_folder/*
# CF 活动关卡(异格夜刀),手动改的地图
/resource/Arknights-Tile-Pos/act24side_09-activities-act24side-level_act24side_09.json
/src/MaaWpfGui/FodyWeavers.xml
*.lnk
# 链接检查缓存
.lycheecache
# MaaDeps
/MaaDeps/*
# ResourceUpdater workflow
/original/*
# Windows Explorer Shits
desktop.ini
Thumbs.db
# macOS Finder Shit
.DS_Store
# MaaSupportExtension config
/config/maa_pi_config.json
# build & install
build
install
# pnpm cache
.pnpm-store

8
.gitmodules vendored
View File

@@ -4,11 +4,9 @@
[submodule "src/MaaMacGui"]
path = src/MaaMacGui
url = https://github.com/MaaAssistantArknights/MaaMacGui.git
[submodule "MaaDeps"]
path = MaaDeps
url = https://github.com/MaaAssistantArknights/MaaDeps
shallow = true
branch = master
[submodule "src/maa-cli"]
path = src/maa-cli
url = https://github.com/MaaAssistantArknights/maa-cli.git
[submodule "3rdparty/EmulatorExtras"]
path = 3rdparty/EmulatorExtras
url = https://github.com/MaaXYZ/EmulatorExtras.git

View File

@@ -1,132 +0,0 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Build Schema",
"$ref": "#/definitions/build",
"definitions": {
"build": {
"type": "object",
"properties": {
"Continue": {
"type": "boolean",
"description": "Indicates to continue a previously failed build attempt"
},
"Help": {
"type": "boolean",
"description": "Shows the help text for this build assembly"
},
"Host": {
"type": "string",
"description": "Host for execution. Default is 'automatic'",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
},
"NoLogo": {
"type": "boolean",
"description": "Disables displaying the NUKE logo"
},
"Partition": {
"type": "string",
"description": "Partition to use on CI"
},
"Plan": {
"type": "boolean",
"description": "Shows the execution plan (HTML)"
},
"Profile": {
"type": "array",
"description": "Defines the profiles to load",
"items": {
"type": "string"
}
},
"Root": {
"type": "string",
"description": "Root directory during build execution"
},
"Skip": {
"type": "array",
"description": "List of targets to be skipped. Empty list skips all dependencies",
"items": {
"type": "string",
"enum": [
"Default",
"DevBuild",
"DevBuildDefault",
"DevBuildReleaseSimulation",
"ReleaseMaa",
"SetMaaChangeLog",
"SetPackageBundled",
"SetVersion",
"UseClean",
"UseCommitVersion",
"UseMaaChangeLog",
"UseMaaDevBundle",
"UseMaaRelease",
"UsePublishArtifact",
"UsePublishRelease",
"UseRsVersion",
"UseTagVersion",
"WithCompileCoreRelease",
"WithCompileWpfRelease",
"WithSyncRes"
]
}
},
"Target": {
"type": "array",
"description": "List of targets to be invoked. Default is '{default_target}'",
"items": {
"type": "string",
"enum": [
"Default",
"DevBuild",
"DevBuildDefault",
"DevBuildReleaseSimulation",
"ReleaseMaa",
"SetMaaChangeLog",
"SetPackageBundled",
"SetVersion",
"UseClean",
"UseCommitVersion",
"UseMaaChangeLog",
"UseMaaDevBundle",
"UseMaaRelease",
"UsePublishArtifact",
"UsePublishRelease",
"UseRsVersion",
"UseTagVersion",
"WithCompileCoreRelease",
"WithCompileWpfRelease",
"WithSyncRes"
]
}
},
"Verbosity": {
"type": "string",
"description": "Logging verbosity during build execution. Default is 'Normal'",
"enum": [
"Minimal",
"Normal",
"Quiet",
"Verbose"
]
}
}
}
}
}

View File

@@ -1,4 +0,0 @@
{
"$schema": "./build.schema.json",
"Solution": "tools/MaaBuilder.sln"
}

39
.pre-commit-config.yaml Normal file
View File

@@ -0,0 +1,39 @@
default_install_hook_types: [pre-commit, prepare-commit-msg]
ci:
autofix_commit_msg: "chore: Auto update by pre-commit hooks [skip changelog]"
autofix_prs: true
repos:
- repo: https://github.com/shssoichiro/oxipng
rev: v9.1.4
hooks:
- id: oxipng
args: ["-q", "-o", "2", "-s", "--ng"]
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v20.1.0
hooks:
- id: clang-format
files: ^src/MaaCore/.*
args: ["--assume-filename", ".clang-format"]
- repo: https://github.com/rbubley/mirrors-prettier
rev: v3.5.3
hooks:
- id: prettier
name: prettier (config files)
files: ^((\.github/ISSUE_TEMPLATE|resource|src|tools)/.*|\.pre-commit-config\.yaml|package-definition\.json)
types_or:
- yaml
- json
- repo: https://github.com/rbubley/mirrors-prettier
rev: v3.5.3
hooks:
- id: prettier
name: prettier (docs)
files: ^docs/.*
- repo: https://github.com/DavidAnson/markdownlint-cli2
rev: v0.17.2
hooks:
- id: markdownlint-cli2
files: ^docs/.*|^README\.md$
types:
- markdown
args: ["--fix", "--config", "docs/.markdownlint.yaml", "#**/node_modules"]

18
.prettierignore Normal file
View File

@@ -0,0 +1,18 @@
**/node_modules/
**/pnpm-lock.yaml
docs/**/*.md
MaaDeps/
3rdparty/
src/maa-cli
src/MaaMacGui
# website/
# docs/
resource/Arknights-Tile-Pos/
tools/OptimizeTemplates/optimize_templates.json
CITATION.cff
CHANGELOG.md
## FUCK FUCK

23
.prettierrc Normal file
View File

@@ -0,0 +1,23 @@
{
"tabWidth": 4,
"printWidth": 120,
"useTabs": false,
"bracketSameLine": true,
"bracketSpacing": true,
"endOfLine": "auto",
"overrides": [
{
"files": [".clang-format", "**/*.yml", "**/*.yaml"],
"options": {
"parser": "yaml",
"tabWidth": 2
}
},
{
"files": ["**/*.md"],
"options": {
"tabWidth": 2
}
}
]
}

View File

@@ -2,7 +2,8 @@
"json.schemas": [
{
"fileMatch": [
"resource/tasks.json"
"resource/tasks/**/*.json",
"resource/global/**/resource/tasks/**/*.json",
],
"url": "./docs/maa_tasks_schema.json"
}
@@ -11,5 +12,8 @@
"MaaDeps/vcpkg/buildtrees": true,
"MaaDeps/vcpkg/packages": true
},
"files.associations": {
"**/resource/tasks/**/*.json": "jsonc"
},
"C_Cpp.exclusionPolicy": "checkFilesAndFolders"
}

1
3rdparty/EmulatorExtras vendored Submodule

Submodule 3rdparty/EmulatorExtras added at 54d3a3ad44

View File

@@ -1,172 +0,0 @@
#pragma once
#include <cmath>
#include <fstream>
#include <iostream>
#include <string>
#include <vector>
#include <meojson/json.hpp>
#include <opencv2/core.hpp>
#include "TileDef.hpp"
namespace Map
{
struct Tile
{
int heightType = 0;
int buildableType = 0;
std::string tileKey;
};
class Level
{
public:
Level(const json::value& data);
int get_width() const { return width; }
int get_height() const { return height; }
Tile get_item(int y, int x) const { return tiles[y][x]; }
std::vector<cv::Point3d> view;
LevelKey key;
private:
int height = 0;
int width = 0;
std::vector<std::vector<Tile>> tiles;
};
class TileCalc
{
public:
TileCalc(int width, int height);
bool run(const Level& level, bool side, std::vector<std::vector<cv::Point2d>>& out_pos,
std::vector<std::vector<Tile>>& out_tiles, double shift_x = 0, double shift_y = 0) const;
private:
bool adapter(double& x, double& y) const;
int width = 0;
int height = 0;
const double degree = atan(1.0) * 4 / 180;
std::vector<Level> levels;
cv::Mat MatrixP = cv::Mat(4, 4, CV_64F);
cv::Mat MatrixX = cv::Mat(4, 4, CV_64F);
cv::Mat MatrixY = cv::Mat(4, 4, CV_64F);
};
inline void InitMat4x4(cv::Mat& m, double (*num)[4])
{
for (int i = 0; i < m.rows; i++)
for (int j = 0; j < m.cols; j++)
m.at<double>(i, j) = num[i][j];
}
inline Level::Level(const json::value& data)
{
key.stageId = data.at("stageId").as_string();
key.code = data.at("code").as_string();
key.levelId = data.at("levelId").as_string();
key.name = data.get("name", "null");
this->height = data.at("height").as_integer();
this->width = data.at("width").as_integer();
for (const json::value& point_data : data.at("view").as_array()) {
cv::Point3d tmp;
auto point_array = point_data.as_array();
tmp.x = point_array[0].as_double();
tmp.y = point_array[1].as_double();
tmp.z = point_array[2].as_double();
this->view.emplace_back(std::move(tmp));
}
for (const json::value& row : data.at("tiles").as_array()) {
std::vector<Tile> tmp;
tmp.reserve(this->width);
for (const json::value& tile : row.as_array()) {
tmp.emplace_back(Tile { tile.at("heightType").as_integer(), tile.at("buildableType").as_integer(),
tile.get("tileKey", std::string()) });
}
tiles.emplace_back(std::move(tmp));
}
}
inline TileCalc::TileCalc(int width, int height)
{
this->width = width;
this->height = height;
double ratio = static_cast<double>(height) / width;
double matrixP[4][4] { { ratio / tan(20 * degree), 0, 0, 0 },
{ 0, 1 / tan(20 * degree), 0, 0 },
{ 0, 0, -(1000 + 0.3) / (1000 - 0.3), -(1000 * 0.3 * 2) / (1000 - 0.3) },
{ 0, 0, -1, 0 } };
InitMat4x4(this->MatrixP, matrixP);
double matrixX[4][4] { { 1, 0, 0, 0 },
{ 0, cos(30 * degree), -sin(30 * degree), 0 },
{ 0, -sin(30 * degree), -cos(30 * degree), 0 },
{ 0, 0, 0, 1 } };
InitMat4x4(this->MatrixX, matrixX);
double matrixY[4][4] { { cos(10 * degree), 0, sin(10 * degree), 0 },
{ 0, 1, 0, 0 },
{ -sin(10 * degree), 0, cos(10 * degree), 0 },
{ 0, 0, 0, 1 } };
InitMat4x4(this->MatrixY, matrixY);
}
inline bool TileCalc::run(const Level& level, bool side, std::vector<std::vector<cv::Point2d>>& out_pos,
std::vector<std::vector<Tile>>& out_tiles, double shift_x, double shift_y) const
{
auto [x, y, z] = level.view[side ? 1 : 0];
double adapter_y = 0, adapter_z = 0;
this->adapter(adapter_y, adapter_z);
double matrix[4][4] {
{ 1, 0, 0, -x }, { 0, 1, 0, -y - adapter_y }, { 0, 0, 1, -z - adapter_z }, { 0, 0, 0, 1 }
};
auto raw = cv::Mat(cv::Size(4, 4), CV_64F);
auto Finall_Matrix = cv::Mat(cv::Size(4, 4), CV_64F);
InitMat4x4(raw, matrix);
if (side) {
Finall_Matrix = this->MatrixP * this->MatrixX * this->MatrixY * raw;
}
else {
Finall_Matrix = this->MatrixP * this->MatrixX * raw;
}
int h = level.get_height();
int w = level.get_width();
auto map_point = cv::Mat(cv::Size(1, 4), CV_64F);
map_point.at<double>(3, 0) = 1;
auto tmp_pos = std::vector<cv::Point2d>(w);
auto tmp_tiles = std::vector<Tile>(w);
for (int i = 0; i < h; i++) {
for (int j = 0; j < w; j++) {
tmp_tiles[j] = level.get_item(i, j);
map_point.at<double>(0, 0) = j - (w - 1) / 2.0 + shift_x;
map_point.at<double>(1, 0) = (h - 1) / 2.0 - i + shift_y;
map_point.at<double>(2, 0) = tmp_tiles[j].heightType * -0.4;
cv::Mat view_point = Finall_Matrix * map_point;
view_point = view_point / view_point.at<double>(3, 0);
view_point = (view_point + 1) / 2;
tmp_pos[j] = cv::Point2d(view_point.at<double>(0, 0) * this->width,
(1 - view_point.at<double>(1, 0)) * this->height);
}
out_pos.emplace_back(tmp_pos);
out_tiles.emplace_back(tmp_tiles);
}
return true;
}
inline bool TileCalc::adapter(double& x, double& y) const
{
const double fromRatio = 9.0 / 16;
const double toRatio = 3.0 / 4;
double ratio = static_cast<double>(height) / width;
if (ratio < fromRatio - 0.00001) {
x = 0;
y = 0;
return false;
}
double t = (ratio - fromRatio) / (toRatio - fromRatio);
x = -1.4 * t;
y = -2.8 * t;
return true;
}
} // namespace Map

View File

@@ -0,0 +1,131 @@
#pragma once
#include <meojson/json.hpp>
#include <numbers>
#include <opencv2/core/matx.hpp>
#include <opencv2/core/types.hpp>
#include "TileDef.hpp"
namespace Map::TileCalc2
{
using vec3d = cv::Vec3d;
using matrix4x4 = cv::Matx44d;
static constexpr double degree = std::numbers::pi / 180;
inline vec3d camera_pos(const Level& level, bool side = false, int width = 1280, int height = 720)
{
const auto [x, y, z] = level.view[side ? 1 : 0];
static constexpr double fromRatio = 9. / 16;
static constexpr double toRatio = 3. / 4;
const double ratio = static_cast<double>(height) / width;
const double t = (fromRatio - ratio) / (fromRatio - toRatio);
const vec3d pos_adj = { -1.4 * t, -2.8 * t, 0 };
return { x + pos_adj[0], y + pos_adj[1], z + pos_adj[2] };
}
inline vec3d camera_euler_angles_yxz(const Level& /*level*/, bool side = false)
{
if (side) {
return { 10 * degree, 30 * degree, 0 };
}
return { 0, 30 * degree, 0 };
}
inline matrix4x4 camera_matrix_from_trans(
const vec3d& pos,
const vec3d& euler,
double ratio,
double fov_2_y = 20 * degree,
double far_c = 1000,
double near_c = 0.3)
{
const double cos_y = std::cos(euler[0]);
const double sin_y = std::sin(euler[0]);
const double cos_x = std::cos(euler[1]);
const double sin_x = std::sin(euler[1]);
const double tan_f = std::tan(fov_2_y);
const matrix4x4 translate = {
1, 0, 0, -pos[0], //
0, 1, 0, -pos[1], //
0, 0, 1, -pos[2], //
0, 0, 0, 1,
};
const matrix4x4 matrixY = {
cos_y, 0, sin_y, 0, //
0, 1, 0, 0, //
-sin_y, 0, cos_y, 0, //
0, 0, 0, 1,
};
const matrix4x4 matrixX = {
1, 0, 0, 0, //
0, cos_x, -sin_x, 0, //
0, -sin_x, -cos_x, 0, //
0, 0, 0, 1,
};
const matrix4x4 proj = matrix4x4 {
// clang-format off
ratio / tan_f, 0, 0, 0,
0, 1 / tan_f, 0, 0,
0, 0, -(far_c + near_c) / (far_c - near_c), -(far_c * near_c * 2) / (far_c - near_c),
0, 0, -1, 0,
// clang-format on
};
return proj * matrixX * matrixY * translate;
}
inline cv::Point world_to_screen(const Level& level, const vec3d& world_pos, bool side, const vec3d& offset = {})
{
static constexpr int width = 1280;
static constexpr int height = 720;
const vec3d pos_cam = camera_pos(level, side, width, height) + offset;
const vec3d euler = camera_euler_angles_yxz(level, side);
const matrix4x4 matrix = camera_matrix_from_trans(pos_cam, euler, static_cast<double>(height) / width);
auto result = matrix * cv::Point3d(world_pos);
result = result / result(3);
result = (result + cv::Vec4d::ones()) / 2.;
return {
static_cast<int>(std::round(result(0) * width)),
static_cast<int>(std::round((1 - result(1)) * height)),
};
}
inline vec3d get_tile_world_pos(const Level& level, int tile_y, int tile_x)
{
const int h = level.get_height();
const int w = level.get_width();
const auto& tile = level.get_item(tile_y, tile_x);
return {
tile_x - (w - 1) / 2.,
(h - 1) / 2. - tile_y,
tile.heightType * -0.4,
};
}
inline auto get_tile_screen_pos(const Level& level, int tile_y, int tile_x, bool side = false, const vec3d& offset = {})
{
return world_to_screen(level, get_tile_world_pos(level, tile_y, tile_x), side, offset);
}
static constexpr double rel_pos_x = 1.3143386840820312;
static constexpr double rel_pos_y = 1.314337134361267;
static constexpr double rel_pos_z = -0.3967874050140381;
inline auto get_retreat_screen_pos(const Level& level)
{
const vec3d relative_pos = { -rel_pos_x, +rel_pos_y, rel_pos_z };
return world_to_screen(level, relative_pos, true);
}
inline auto get_skill_screen_pos(const Level& level)
{
const vec3d relative_pos = { +rel_pos_x, -rel_pos_y, rel_pos_z };
return world_to_screen(level, relative_pos, true);
}
} // namespace Map::TileCalc2

View File

@@ -1,32 +1,94 @@
#pragma once
#include <string>
#include <vector>
#include <meojson/json.hpp>
#include <opencv2/core.hpp>
namespace Map
{
struct LevelKey
{
std::string stageId;
std::string code;
std::string levelId;
std::string name;
struct LevelKey
{
std::string stageId;
std::string code;
std::string levelId;
std::string name;
bool empty_or_equal(const std::string& lhs, const std::string& rhs) const noexcept
{
return (lhs.empty() || rhs.empty()) ? true : lhs == rhs;
bool empty_or_equal(const std::string& lhs, const std::string& rhs) const noexcept
{
return (lhs.empty() || rhs.empty()) ? true : lhs == rhs;
}
bool operator==(const LevelKey& other) const noexcept
{
return empty_or_equal(stageId, other.stageId) && empty_or_equal(code, other.code)
&& empty_or_equal(levelId, other.levelId) && empty_or_equal(name, other.name);
}
bool operator==(const std::string& any_key) const noexcept
{
if (any_key.empty()) {
return false;
}
bool operator==(const LevelKey& other) const noexcept
{
return empty_or_equal(stageId, other.stageId) && empty_or_equal(code, other.code) &&
empty_or_equal(levelId, other.levelId) && empty_or_equal(name, other.name);
return empty_or_equal(stageId, any_key) || empty_or_equal(code, any_key)
|| empty_or_equal(levelId, any_key) || empty_or_equal(name, any_key);
}
};
struct Tile
{
int heightType = 0;
int buildableType = 0;
std::string tileKey;
};
class Level
{
public:
explicit Level(const json::value& data);
Level() = default;
int get_width() const { return width; }
int get_height() const { return height; }
Tile get_item(int y, int x) const { return tiles[y][x]; }
std::vector<cv::Point3d> view {};
LevelKey key {};
private:
int height = 0;
int width = 0;
std::vector<std::vector<Tile>> tiles;
};
inline Level::Level(const json::value& data)
{
key.stageId = data.at("stageId").as_string();
key.code = data.at("code").as_string();
key.levelId = data.at("levelId").as_string();
key.name = data.get("name", "null");
this->height = data.at("height").as_integer();
this->width = data.at("width").as_integer();
for (const json::value& point_data : data.at("view").as_array()) {
cv::Point3d tmp;
auto point_array = point_data.as_array();
tmp.x = point_array[0].as_double();
tmp.y = point_array[1].as_double();
tmp.z = point_array[2].as_double();
this->view.emplace_back(tmp);
}
for (const json::value& row : data.at("tiles").as_array()) {
std::vector<Tile> tmp;
tmp.reserve(this->width);
for (const json::value& tile : row.as_array()) {
tmp.emplace_back(Tile { tile.at("heightType").as_integer(),
tile.at("buildableType").as_integer(),
tile.get("tileKey", std::string()) });
}
bool operator==(const std::string& any_key) const noexcept
{
if (any_key.empty()) {
return false;
}
return empty_or_equal(stageId, any_key) || empty_or_equal(code, any_key) ||
empty_or_equal(levelId, any_key) || empty_or_equal(name, any_key);
}
};
tiles.emplace_back(std::move(tmp));
}
}
} // namespace Map

View File

@@ -1,195 +0,0 @@
Language: Json
ColumnLimit: 1000
IndentWidth: 4
---
Language: Cpp
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AlignArrayOfStructures: None
AlignConsecutiveMacros: None
AlignConsecutiveAssignments: None
AlignConsecutiveBitFields: None
AlignConsecutiveDeclarations: None
AlignEscapedNewlines: Left
AlignOperands: Align
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortEnumsOnASingleLine: false
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true
AttributeMacros:
- __capability
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterCaseLabel: false
AfterClass: true
AfterControlStatement: Never
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: false
AfterExternBlock: true
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
BreakBeforeBinaryOperators: None
BreakBeforeConceptDeclarations: true
BreakBeforeBraces: Custom
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
QualifierAlignment: Leave
CompactNamespaces: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: false
DeriveLineEnding: true
DerivePointerAlignment: false
DisableFormat: false
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: LogicalBlock
ExperimentalAutoDetectBinPacking: false
PackConstructorInitializers: BinPack
BasedOnStyle: ''
ConstructorInitializerAllOnOneLineOrOnePerLine: false
AllowAllConstructorInitializersOnNextLine: true
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IfMacros:
- KJ_IF_MAYBE
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
Priority: 3
SortPriority: 0
CaseSensitive: false
- Regex: '.*'
Priority: 1
SortPriority: 0
CaseSensitive: false
IncludeIsMainRegex: '(Test)?$'
IncludeIsMainSourceRegex: ''
IndentAccessModifiers: false
IndentCaseLabels: false
IndentCaseBlocks: false
IndentGotoLabels: true
IndentPPDirectives: None
IndentExternBlock: AfterExternBlock
IndentRequiresClause: false
IndentWidth: 4
IndentWrappedFunctionNames: false
InsertTrailingCommas: None
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
LambdaBodyIndentation: Signature
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: Inner
ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 2
ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakOpenParenthesis: 0
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 1000
PenaltyIndentedWhitespace: 0
PointerAlignment: Left
PPIndentWidth: -1
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
RequiresClausePosition: OwnLine
SeparateDefinitionBlocks: Leave
ShortNamespaceLines: 50
SortIncludes: CaseSensitive
SortJavaStaticImport: Before
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeParensOptions:
AfterControlStatements: true
AfterForeachMacros: true
AfterFunctionDefinitionName: false
AfterFunctionDeclarationName: false
AfterIfMacros: true
AfterOverloadedOperator: false
AfterRequiresInClause: true
AfterRequiresInExpression: true
BeforeNonEmptyParentheses: false
SpaceAroundPointerQualifiers: Default
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: Never
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInLineCommentPrefix:
Minimum: 1
Maximum: -1
SpacesInParentheses: false
SpacesInSquareBrackets: false
SpaceBeforeSquareBrackets: false
BitFieldColonSpacing: Both
Standard: c++20
StatementAttributeLikeMacros:
- Q_EMIT
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 4
UseCRLF: false
UseTab: Never
WhitespaceSensitiveMacros:
- STRINGIZE
- PP_STRINGIZE
- BOOST_PP_STRINGIZE
- NS_SWIFT_NAME
- CF_SWIFT_NAME

View File

@@ -0,0 +1,688 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <initializer_list>
#include <optional>
#include <ostream>
#include <string>
#include <tuple>
#include <type_traits>
#include <vector>
#include "exception.hpp"
#include "utils.hpp"
namespace json
{
template <typename string_t>
class basic_array
{
friend class basic_value<string_t>;
friend class basic_object<string_t>;
public:
using raw_array = std::vector<basic_value<string_t>>;
using value_type = typename raw_array::value_type;
using iterator = typename raw_array::iterator;
using const_iterator = typename raw_array::const_iterator;
using reverse_iterator = typename raw_array::reverse_iterator;
using const_reverse_iterator = typename raw_array::const_reverse_iterator;
using char_t = typename string_t::value_type;
public:
basic_array() = default;
basic_array(const basic_array<string_t>& rhs) = default;
basic_array(basic_array<string_t>&& rhs) noexcept = default;
basic_array(std::initializer_list<value_type> init_list);
basic_array(typename raw_array::size_type size);
// explicit basic_array(const basic_value<string_t>& val);
// explicit basic_array(basic_value<string_t>&& val);
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_to_json_in_templ_spec<jsonization_t, string_t>::value
&& !_utils::has_to_json_array_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
basic_array(const jsonization_t& value)
: basic_array(ext::jsonization<string_t, jsonization_t>().to_json(value))
{
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_to_json_array_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
basic_array(const jsonization_t& value)
: basic_array(ext::jsonization<string_t, jsonization_t>().to_json_array(value))
{
}
template <
typename jsonization_t,
std::enable_if_t<
std::is_rvalue_reference_v<jsonization_t&&>
&& _utils::has_move_to_json_in_templ_spec<jsonization_t, string_t>::value
&& !_utils::has_move_to_json_array_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
basic_array(jsonization_t&& value)
: basic_array(ext::jsonization<string_t, jsonization_t>().move_to_json(std::move(value)))
{
}
//template <
// typename jsonization_t,
// std::enable_if_t<
// std::is_rvalue_reference_v<jsonization_t&&>
// && _utils::has_move_to_json_array_in_templ_spec<jsonization_t, string_t>::value,
// bool> = true>
//basic_array(jsonization_t&& value)
// : basic_array(
// ext::jsonization<string_t, jsonization_t>().move_to_json_array(std::move(value)))
//{
//}
~basic_array() noexcept = default;
bool empty() const noexcept { return _array_data.empty(); }
size_t size() const noexcept { return _array_data.size(); }
bool contains(size_t pos) const { return pos < _array_data.size(); }
bool exists(size_t pos) const { return contains(pos); }
const basic_value<string_t>& at(size_t pos) const;
string_t dumps(std::optional<size_t> indent = std::nullopt) const
{
return indent ? format(*indent) : to_string();
}
string_t to_string() const;
string_t format(size_t indent = 4) const { return format(indent, 0); }
template <typename value_t>
bool all() const;
template <typename value_t, template <typename...> typename collection_t = std::vector>
collection_t<value_t> as_collection() const;
template <
typename value_t,
size_t Size,
template <typename, size_t> typename fixed_array_t = std::array>
fixed_array_t<value_t, Size> as_fixed_array() const;
template <typename... elem_ts>
std::tuple<elem_ts...> as_tuple() const;
template <typename first_t, typename second_t>
std::pair<first_t, second_t> as_pair() const;
template <
typename value_t,
std::enable_if_t<
_utils::has_from_json_array_in_templ_spec<value_t, string_t>::value,
bool> = true>
value_t as() const&
{
value_t res;
ext::jsonization<string_t, value_t>().from_json_array(*this, res);
return res;
}
template <
typename value_t,
std::enable_if_t<
_utils::has_move_from_json_array_in_templ_spec<value_t, string_t>::value,
bool> = true>
value_t as() &&
{
value_t res;
ext::jsonization<string_t, value_t>().move_from_json_array(std::move(*this), res);
return res;
}
// Usage: get(key_1, key_2, ..., default_value);
template <typename... key_then_default_value_t>
auto get(key_then_default_value_t&&... keys_then_default_value) const;
template <typename value_t = basic_value<string_t>>
std::optional<value_t> find(size_t pos) const;
template <typename... args_t>
decltype(auto) emplace_back(args_t&&... args);
template <typename... args_t>
decltype(auto) push_back(args_t&&... args);
void clear() noexcept;
bool erase(size_t pos);
bool erase(iterator iter);
iterator begin() noexcept;
iterator end() noexcept;
const_iterator begin() const noexcept;
const_iterator end() const noexcept;
const_iterator cbegin() const noexcept;
const_iterator cend() const noexcept;
reverse_iterator rbegin() noexcept;
reverse_iterator rend() noexcept;
const_reverse_iterator rbegin() const noexcept;
const_reverse_iterator rend() const noexcept;
const_reverse_iterator crbegin() const noexcept;
const_reverse_iterator crend() const noexcept;
const basic_value<string_t>& operator[](size_t pos) const;
basic_value<string_t>& operator[](size_t pos);
basic_array<string_t> operator+(const basic_array<string_t>& rhs) const&;
basic_array<string_t> operator+(basic_array<string_t>&& rhs) const&;
basic_array<string_t> operator+(const basic_array<string_t>& rhs) &&;
basic_array<string_t> operator+(basic_array<string_t>&& rhs) &&;
basic_array<string_t>& operator+=(const basic_array<string_t>& rhs);
basic_array<string_t>& operator+=(basic_array<string_t>&& rhs);
basic_array<string_t>& operator=(const basic_array<string_t>&) = default;
basic_array<string_t>& operator=(basic_array<string_t>&&) noexcept = default;
template <
typename value_t,
std::enable_if_t<std::is_convertible_v<value_t, basic_array<string_t>>, bool> = true>
basic_array<string_t>& operator=(value_t rhs)
{
return *this = basic_array<string_t>(std::move(rhs));
}
bool operator==(const basic_array<string_t>& rhs) const;
bool operator!=(const basic_array<string_t>& rhs) const { return !(*this == rhs); }
template <
typename value_t,
template <typename...> typename collection_t = std::vector,
std::enable_if_t<_utils::is_collection<collection_t<value_t>>, bool> = true>
explicit operator collection_t<value_t>() const
{
return as_collection<value_t, collection_t>();
}
template <
typename value_t,
size_t Size,
template <typename, size_t> typename fixed_array_t = std::array,
std::enable_if_t<_utils::is_fixed_array<fixed_array_t<value_t, Size>>, bool> = true>
explicit operator fixed_array_t<value_t, Size>() const
{
return as<fixed_array_t<value_t, Size>>();
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_from_json_in_templ_spec<jsonization_t, string_t>::value
&& !_utils::has_from_json_array_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
explicit operator jsonization_t() const&
{
jsonization_t dst {};
if (!ext::jsonization<string_t, jsonization_t>().from_json(*this, dst)) {
throw exception("Wrong JSON");
}
return dst;
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_from_json_array_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
explicit operator jsonization_t() const&
{
jsonization_t dst {};
if (!ext::jsonization<string_t, jsonization_t>().from_json_array(*this, dst)) {
throw exception("Wrong JSON");
}
return dst;
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_move_from_json_in_templ_spec<jsonization_t, string_t>::value
&& !_utils::has_move_from_json_array_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
explicit operator jsonization_t() &&
{
jsonization_t dst {};
if (!ext::jsonization<string_t, jsonization_t>().from_json(std::move(*this), dst)) {
throw exception("Wrong JSON");
}
return dst;
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_move_from_json_array_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
explicit operator jsonization_t() &&
{
jsonization_t dst {};
if (!ext::jsonization<string_t, jsonization_t>().move_from_json_array(
std::move(*this),
dst)) {
throw exception("Wrong JSON");
}
return dst;
}
private:
template <typename... key_then_default_value_t, size_t... keys_indexes_t>
auto
get(std::tuple<key_then_default_value_t...> keys_then_default_value,
std::index_sequence<keys_indexes_t...>) const;
template <typename value_t, typename... rest_keys_t>
auto get_helper(const value_t& default_value, size_t pos, rest_keys_t&&... rest) const;
template <typename value_t>
auto get_helper(const value_t& default_value, size_t pos) const;
string_t format(size_t indent, size_t indent_times) const;
private:
raw_array _array_data;
};
template <typename string_t>
inline basic_array<string_t>::basic_array(std::initializer_list<value_type> init_list)
: _array_data(init_list)
{
}
template <typename string_t>
inline basic_array<string_t>::basic_array(typename raw_array::size_type size)
: _array_data(size)
{
}
// template <typename string_t>
// inline basic_array<string_t>::basic_array(const basic_value<string_t>& val) :
// basic_array<string_t>(val.as_array())
//{}
//
// template <typename string_t>
// inline basic_array<string_t>::basic_array(basic_value<string_t>&& val)
// : basic_array<string_t>(std::move(val.as_array()))
//{}
template <typename string_t>
inline void basic_array<string_t>::clear() noexcept
{
_array_data.clear();
}
template <typename string_t>
inline bool basic_array<string_t>::erase(size_t pos)
{
return erase(_array_data.begin() + pos);
}
template <typename string_t>
inline bool basic_array<string_t>::erase(iterator iter)
{
return _array_data.erase(iter) != _array_data.end();
}
template <typename string_t>
template <typename... args_t>
inline decltype(auto) basic_array<string_t>::emplace_back(args_t&&... args)
{
static_assert(
std::is_constructible_v<value_type, args_t...>,
"Parameter can't be used to construct a raw_array::value_type");
return _array_data.emplace_back(std::forward<args_t>(args)...);
}
template <typename string_t>
template <typename... args_t>
inline decltype(auto) basic_array<string_t>::push_back(args_t&&... args)
{
return emplace_back(std::forward<args_t>(args)...);
}
template <typename string_t>
inline const basic_value<string_t>& basic_array<string_t>::at(size_t pos) const
{
return _array_data.at(pos);
}
template <typename string_t>
inline string_t basic_array<string_t>::to_string() const
{
string_t str { '[' };
for (auto iter = _array_data.cbegin(); iter != _array_data.cend();) {
str += iter->to_string();
if (++iter != _array_data.cend()) {
str += ',';
}
}
str += char_t(']');
return str;
}
template <typename string_t>
inline string_t basic_array<string_t>::format(size_t indent, size_t indent_times) const
{
const string_t tail_indent(indent * indent_times, ' ');
const string_t body_indent(indent * (indent_times + 1), ' ');
string_t str { '[', '\n' };
for (auto iter = _array_data.cbegin(); iter != _array_data.cend();) {
str += body_indent + iter->format(indent, indent_times + 1);
if (++iter != _array_data.cend()) {
str += ',';
}
str += '\n';
}
str += tail_indent + char_t(']');
return str;
}
template <typename string_t>
template <typename value_t>
inline bool basic_array<string_t>::all() const
{
for (const auto& elem : _array_data) {
if (!elem.template is<value_t>()) {
return false;
}
}
return true;
}
template <typename string_t>
template <typename value_t, template <typename...> typename collection_t>
inline collection_t<value_t> basic_array<string_t>::as_collection() const
{
return as<collection_t<value_t>>();
}
template <typename string_t>
template <typename value_t, size_t Size, template <typename, size_t> typename fixed_array_t>
inline fixed_array_t<value_t, Size> basic_array<string_t>::as_fixed_array() const
{
return as<fixed_array_t<value_t, Size>>();
}
template <typename string_t>
template <typename... elem_ts>
inline std::tuple<elem_ts...> basic_array<string_t>::as_tuple() const
{
return as<std::tuple<elem_ts...>>();
}
template <typename string_t>
template <typename first_t, typename second_t>
inline std::pair<first_t, second_t> basic_array<string_t>::as_pair() const
{
return as<std::pair<first_t, second_t>>();
}
template <typename string_t>
template <typename... key_then_default_value_t>
inline auto basic_array<string_t>::get(key_then_default_value_t&&... keys_then_default_value) const
{
return get(
std::forward_as_tuple(keys_then_default_value...),
std::make_index_sequence<sizeof...(keys_then_default_value) - 1> {});
}
template <typename string_t>
template <typename... key_then_default_value_t, size_t... keys_indexes_t>
inline auto basic_array<string_t>::get(
std::tuple<key_then_default_value_t...> keys_then_default_value,
std::index_sequence<keys_indexes_t...>) const
{
constexpr unsigned long default_value_index = sizeof...(key_then_default_value_t) - 1;
return get_helper(
std::get<default_value_index>(keys_then_default_value),
std::get<keys_indexes_t>(keys_then_default_value)...);
}
template <typename string_t>
template <typename value_t, typename... rest_keys_t>
inline auto basic_array<string_t>::get_helper(
const value_t& default_value,
size_t pos,
rest_keys_t&&... rest) const
{
constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t>
|| std::is_same_v<basic_array<string_t>, value_t>
|| std::is_same_v<basic_object<string_t>, value_t>;
constexpr bool is_string = std::is_constructible_v<string_t, value_t> && !is_json;
if (!contains(pos)) {
if constexpr (is_string) {
return string_t(default_value);
}
else {
return value_t(default_value);
}
}
return at(pos).get_helper(default_value, std::forward<rest_keys_t>(rest)...);
}
template <typename string_t>
template <typename value_t>
inline auto basic_array<string_t>::get_helper(const value_t& default_value, size_t pos) const
{
constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t>
|| std::is_same_v<basic_array<string_t>, value_t>
|| std::is_same_v<basic_object<string_t>, value_t>;
constexpr bool is_string = std::is_constructible_v<string_t, value_t> && !is_json;
if (!contains(pos)) {
if constexpr (is_string) {
return string_t(default_value);
}
else {
return value_t(default_value);
}
}
auto val = _array_data.at(pos);
if (val.template is<value_t>()) {
if constexpr (is_string) {
return val.template as<string_t>();
}
else {
return val.template as<value_t>();
}
}
else {
if constexpr (is_string) {
return string_t(default_value);
}
else {
return value_t(default_value);
}
}
}
template <typename string_t>
template <typename value_t>
inline std::optional<value_t> basic_array<string_t>::find(size_t pos) const
{
if (!contains(pos)) {
return std::nullopt;
}
const auto& val = _array_data.at(pos);
return val.template is<value_t>() ? std::optional<value_t>(val.template as<value_t>())
: std::nullopt;
}
template <typename string_t>
inline typename basic_array<string_t>::iterator basic_array<string_t>::begin() noexcept
{
return _array_data.begin();
}
template <typename string_t>
inline typename basic_array<string_t>::iterator basic_array<string_t>::end() noexcept
{
return _array_data.end();
}
template <typename string_t>
inline typename basic_array<string_t>::const_iterator basic_array<string_t>::begin() const noexcept
{
return _array_data.begin();
}
template <typename string_t>
inline typename basic_array<string_t>::const_iterator basic_array<string_t>::end() const noexcept
{
return _array_data.end();
}
template <typename string_t>
inline typename basic_array<string_t>::const_iterator basic_array<string_t>::cbegin() const noexcept
{
return _array_data.cbegin();
}
template <typename string_t>
inline typename basic_array<string_t>::const_iterator basic_array<string_t>::cend() const noexcept
{
return _array_data.cend();
}
template <typename string_t>
inline typename basic_array<string_t>::reverse_iterator basic_array<string_t>::rbegin() noexcept
{
return _array_data.rbegin();
}
template <typename string_t>
inline typename basic_array<string_t>::reverse_iterator basic_array<string_t>::rend() noexcept
{
return _array_data.rend();
}
template <typename string_t>
inline typename basic_array<string_t>::const_reverse_iterator
basic_array<string_t>::rbegin() const noexcept
{
return _array_data.rbegin();
}
template <typename string_t>
inline typename basic_array<string_t>::const_reverse_iterator
basic_array<string_t>::rend() const noexcept
{
return _array_data.rend();
}
template <typename string_t>
inline typename basic_array<string_t>::const_reverse_iterator
basic_array<string_t>::crbegin() const noexcept
{
return _array_data.crbegin();
}
template <typename string_t>
inline typename basic_array<string_t>::const_reverse_iterator
basic_array<string_t>::crend() const noexcept
{
return _array_data.crend();
}
template <typename string_t>
inline basic_value<string_t>& basic_array<string_t>::operator[](size_t pos)
{
return _array_data[pos];
}
template <typename string_t>
inline const basic_value<string_t>& basic_array<string_t>::operator[](size_t pos) const
{
return _array_data[pos];
}
template <typename string_t>
inline basic_array<string_t>
basic_array<string_t>::operator+(const basic_array<string_t>& rhs) const&
{
basic_array<string_t> temp = *this;
temp._array_data.insert(_array_data.end(), rhs.begin(), rhs.end());
return temp;
}
template <typename string_t>
inline basic_array<string_t> basic_array<string_t>::operator+(basic_array<string_t>&& rhs) const&
{
basic_array<string_t> temp = *this;
temp._array_data.insert(
_array_data.end(),
std::make_move_iterator(rhs.begin()),
std::make_move_iterator(rhs.end()));
return temp;
}
template <typename string_t>
inline basic_array<string_t> basic_array<string_t>::operator+(const basic_array<string_t>& rhs) &&
{
_array_data.insert(_array_data.end(), rhs.begin(), rhs.end());
return std::move(*this);
}
template <typename string_t>
inline basic_array<string_t> basic_array<string_t>::operator+(basic_array<string_t>&& rhs) &&
{
_array_data.insert(
_array_data.end(),
std::make_move_iterator(rhs.begin()),
std::make_move_iterator(rhs.end()));
return std::move(*this);
}
template <typename string_t>
inline basic_array<string_t>& basic_array<string_t>::operator+=(const basic_array<string_t>& rhs)
{
_array_data.insert(_array_data.end(), rhs.begin(), rhs.end());
return *this;
}
template <typename string_t>
inline basic_array<string_t>& basic_array<string_t>::operator+=(basic_array<string_t>&& rhs)
{
_array_data.insert(
_array_data.end(),
std::make_move_iterator(rhs.begin()),
std::make_move_iterator(rhs.end()));
return *this;
}
template <typename string_t>
inline bool basic_array<string_t>::operator==(const basic_array<string_t>& rhs) const
{
return _array_data == rhs._array_data;
}
template <
typename ostream_t,
typename string_t,
typename std_ostream_t = std::basic_ostream<
typename string_t::value_type,
std::char_traits<typename string_t::value_type>>,
typename enable_t = std::enable_if_t<
std::is_same_v<std_ostream_t, ostream_t> || std::is_base_of_v<std_ostream_t, ostream_t>>>
ostream_t& operator<<(ostream_t& out, const basic_array<string_t>& arr)
{
out << arr.format();
return out;
}
} // namespace json

View File

@@ -0,0 +1,35 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <exception>
#include <string>
namespace json
{
class exception : public std::exception
{
public:
exception() = default;
exception(const std::string& msg)
: _what(msg)
{
}
exception(const exception&) = default;
exception& operator=(const exception&) = default;
exception(exception&&) = default;
exception& operator=(exception&&) = default;
virtual ~exception() noexcept override = default;
virtual const char* what() const noexcept override
{
return _what.empty() ? "Unknown exception" : _what.c_str();
}
protected:
std::string _what;
};
}

View File

@@ -0,0 +1,605 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <initializer_list>
#include <map>
#include <optional>
#include <ostream>
#include <string>
#include <tuple>
#include "exception.hpp"
#include "utils.hpp"
namespace json
{
template <typename string_t>
class basic_object
{
friend class basic_value<string_t>;
friend class basic_array<string_t>;
public:
using raw_object = std::map<string_t, basic_value<string_t>>;
using key_type = typename raw_object::key_type;
using mapped_type = typename raw_object::mapped_type;
using value_type = typename raw_object::value_type;
using iterator = typename raw_object::iterator;
using const_iterator = typename raw_object::const_iterator;
using char_t = typename string_t::value_type;
public:
basic_object() = default;
basic_object(const basic_object<string_t>& rhs) = default;
basic_object(basic_object<string_t>&& rhs) noexcept = default;
basic_object(std::initializer_list<value_type> init_list);
// explicit basic_object(const basic_value<string_t>& val);
// explicit basic_object(basic_value<string_t>&& val);
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_to_json_in_templ_spec<jsonization_t, string_t>::value
&& !_utils::has_to_json_object_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
basic_object(const jsonization_t& value)
: basic_object(ext::jsonization<string_t, jsonization_t>().to_json(value))
{
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_to_json_object_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
basic_object(const jsonization_t& value)
: basic_object(ext::jsonization<string_t, jsonization_t>().to_json_object(value))
{
}
template <
typename jsonization_t,
std::enable_if_t<
std::is_rvalue_reference_v<jsonization_t&&>
&& _utils::has_move_to_json_in_templ_spec<jsonization_t, string_t>::value
&& !_utils::has_move_to_json_object_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
basic_object(jsonization_t&& value)
: basic_object(ext::jsonization<string_t, jsonization_t>().move_to_json(std::move(value)))
{
}
//template <
// typename jsonization_t,
// std::enable_if_t<
// std::is_rvalue_reference_v<jsonization_t&&>
// && _utils::has_move_to_json_object_in_templ_spec<jsonization_t, string_t>::value,
// bool> = true>
//basic_object(jsonization_t&& value)
// : basic_object(
// ext::jsonization<string_t, jsonization_t>().move_to_json_object(std::move(value)))
//{
//}
~basic_object() = default;
bool empty() const noexcept { return _object_data.empty(); }
size_t size() const noexcept { return _object_data.size(); }
bool contains(const string_t& key) const;
bool exists(const string_t& key) const { return contains(key); }
const basic_value<string_t>& at(const string_t& key) const;
string_t dumps(std::optional<size_t> indent = std::nullopt) const
{
return indent ? format(*indent) : to_string();
}
string_t to_string() const;
string_t format(size_t indent = 4) const { return format(indent, 0); }
template <typename value_t>
bool all() const;
template <typename value_t, template <typename...> typename map_t = std::map>
map_t<string_t, value_t> as_map() const;
template <
typename value_t,
std::enable_if_t<
_utils::has_from_json_object_in_templ_spec<value_t, string_t>::value,
bool> = true>
value_t as() const&
{
value_t res;
ext::jsonization<string_t, value_t>().from_json_object(*this, res);
return res;
}
template <
typename value_t,
std::enable_if_t<
_utils::has_move_from_json_object_in_templ_spec<value_t, string_t>::value,
bool> = true>
value_t as() &&
{
value_t res;
ext::jsonization<string_t, value_t>().move_from_json_object(std::move(*this), res);
return res;
}
// Usage: get(key_1, key_2, ..., default_value);
template <typename... key_then_default_value_t>
auto get(key_then_default_value_t&&... keys_then_default_value) const;
template <typename value_t = basic_value<string_t>>
std::optional<value_t> find(const string_t& key) const;
template <typename... args_t>
decltype(auto) emplace(args_t&&... args);
template <typename... args_t>
decltype(auto) insert(args_t&&... args);
void clear() noexcept;
bool erase(const string_t& key);
bool erase(iterator iter);
iterator begin() noexcept;
iterator end() noexcept;
const_iterator begin() const noexcept;
const_iterator end() const noexcept;
const_iterator cbegin() const noexcept;
const_iterator cend() const noexcept;
basic_value<string_t>& operator[](const string_t& key);
basic_value<string_t>& operator[](string_t&& key);
basic_object<string_t> operator|(const basic_object<string_t>& rhs) const&;
basic_object<string_t> operator|(basic_object<string_t>&& rhs) const&;
basic_object<string_t> operator|(const basic_object<string_t>& rhs) &&;
basic_object<string_t> operator|(basic_object<string_t>&& rhs) &&;
basic_object<string_t>& operator|=(const basic_object<string_t>& rhs);
basic_object<string_t>& operator|=(basic_object<string_t>&& rhs);
basic_object<string_t>& operator=(const basic_object<string_t>&) = default;
basic_object<string_t>& operator=(basic_object<string_t>&&) = default;
template <
typename value_t,
std::enable_if_t<std::is_convertible_v<value_t, basic_object<string_t>>, bool> = true>
basic_object<string_t>& operator=(value_t rhs)
{
return *this = basic_object<string_t>(std::move(rhs));
}
bool operator==(const basic_object<string_t>& rhs) const;
bool operator!=(const basic_object<string_t>& rhs) const { return !(*this == rhs); }
template <
typename value_t,
template <typename...> typename map_t = std::map,
std::enable_if_t<_utils::is_map<map_t<string_t, value_t>>, bool> = true>
explicit operator map_t<string_t, value_t>() const
{
return as_map<value_t, map_t>();
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_from_json_in_templ_spec<jsonization_t, string_t>::value
&& !_utils::has_from_json_object_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
explicit operator jsonization_t() const&
{
jsonization_t dst {};
if (!ext::jsonization<string_t, jsonization_t>().from_json(*this, dst)) {
throw exception("Wrong JSON");
}
return dst;
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_from_json_object_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
explicit operator jsonization_t() const&
{
jsonization_t dst {};
if (!ext::jsonization<string_t, jsonization_t>().from_json_object(*this, dst)) {
throw exception("Wrong JSON");
}
return dst;
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_move_from_json_in_templ_spec<jsonization_t, string_t>::value
&& !_utils::has_move_from_json_object_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
explicit operator jsonization_t() &&
{
jsonization_t dst {};
if (!ext::jsonization<string_t, jsonization_t>().from_json(std::move(*this), dst)) {
throw exception("Wrong JSON");
}
return dst;
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_move_from_json_object_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
explicit operator jsonization_t() &&
{
jsonization_t dst {};
if (!ext::jsonization<string_t, jsonization_t>().move_from_json_object(
std::move(*this),
dst)) {
throw exception("Wrong JSON");
}
return dst;
}
private:
template <typename... key_then_default_value_t, size_t... keys_indexes_t>
auto
get(std::tuple<key_then_default_value_t...> keys_then_default_value,
std::index_sequence<keys_indexes_t...>) const;
template <typename value_t, typename... rest_keys_t>
auto get_helper(const value_t& default_value, const string_t& key, rest_keys_t&&... rest) const;
template <typename value_t>
auto get_helper(const value_t& default_value, const string_t& key) const;
string_t format(size_t indent, size_t indent_times) const;
private:
raw_object _object_data;
};
template <typename string_t>
inline basic_object<string_t>::basic_object(std::initializer_list<value_type> init_list)
: _object_data(
std::make_move_iterator(init_list.begin()),
std::make_move_iterator(init_list.end()))
{
}
// template <typename string_t>
// inline basic_object<string_t>::basic_object(const basic_value<string_t>& val) :
// basic_object<string_t>(val.as_object())
//{}
//
// template <typename string_t>
// inline basic_object<string_t>::basic_object(basic_value<string_t>&& val)
// : basic_object<string_t>(std::move(val.as_object()))
//{}
template <typename string_t>
inline bool basic_object<string_t>::contains(const string_t& key) const
{
return _object_data.find(key) != _object_data.cend();
}
template <typename string_t>
inline const basic_value<string_t>& basic_object<string_t>::at(const string_t& key) const
{
return _object_data.at(key);
}
template <typename string_t>
inline void basic_object<string_t>::clear() noexcept
{
_object_data.clear();
}
template <typename string_t>
inline bool basic_object<string_t>::erase(const string_t& key)
{
return _object_data.erase(key) > 0 ? true : false;
}
template <typename string_t>
inline bool basic_object<string_t>::erase(iterator iter)
{
return _object_data.erase(iter) != _object_data.end();
}
template <typename string_t>
template <typename... args_t>
inline decltype(auto) basic_object<string_t>::emplace(args_t&&... args)
{
static_assert(
std::is_constructible_v<value_type, args_t...>,
"Parameter can't be used to construct a raw_object::value_type");
return _object_data.insert_or_assign(std::forward<args_t>(args)...);
}
template <typename string_t>
template <typename... args_t>
inline decltype(auto) basic_object<string_t>::insert(args_t&&... args)
{
return emplace(std::forward<args_t>(args)...);
}
template <typename string_t>
inline string_t basic_object<string_t>::to_string() const
{
string_t str { '{' };
for (auto iter = _object_data.cbegin(); iter != _object_data.cend();) {
const auto& [key, val] = *iter;
str +=
char_t('"') + _utils::unescape_string(key) + string_t { '\"', ':' } + val.to_string();
if (++iter != _object_data.cend()) {
str += ',';
}
}
str += char_t('}');
return str;
}
template <typename string_t>
inline string_t basic_object<string_t>::format(size_t indent, size_t indent_times) const
{
const string_t tail_indent(indent * indent_times, ' ');
const string_t body_indent(indent * (indent_times + 1), ' ');
string_t str { '{', '\n' };
for (auto iter = _object_data.cbegin(); iter != _object_data.cend();) {
const auto& [key, val] = *iter;
str += body_indent + char_t('"') + _utils::unescape_string(key)
+ string_t { '\"', ':', ' ' } + val.format(indent, indent_times + 1);
if (++iter != _object_data.cend()) {
str += ',';
}
str += '\n';
}
str += tail_indent + char_t('}');
return str;
}
template <typename string_t>
template <typename value_t>
inline bool basic_object<string_t>::all() const
{
for (const auto& [_, val] : _object_data) {
if (!val.template is<value_t>()) {
return false;
}
}
return true;
}
template <typename string_t>
template <typename value_t, template <typename...> typename map_t>
inline map_t<string_t, value_t> basic_object<string_t>::as_map() const
{
return as<map_t<string_t, value_t>>();
}
template <typename string_t>
template <typename... key_then_default_value_t>
inline auto basic_object<string_t>::get(key_then_default_value_t&&... keys_then_default_value) const
{
return get(
std::forward_as_tuple(keys_then_default_value...),
std::make_index_sequence<sizeof...(keys_then_default_value) - 1> {});
}
template <typename string_t>
template <typename... key_then_default_value_t, size_t... keys_indexes_t>
inline auto basic_object<string_t>::get(
std::tuple<key_then_default_value_t...> keys_then_default_value,
std::index_sequence<keys_indexes_t...>) const
{
constexpr unsigned long default_value_index = sizeof...(key_then_default_value_t) - 1;
return get_helper(
std::get<default_value_index>(keys_then_default_value),
std::get<keys_indexes_t>(keys_then_default_value)...);
}
template <typename string_t>
template <typename value_t, typename... rest_keys_t>
inline auto basic_object<string_t>::get_helper(
const value_t& default_value,
const string_t& key,
rest_keys_t&&... rest) const
{
constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t>
|| std::is_same_v<basic_array<string_t>, value_t>
|| std::is_same_v<basic_object<string_t>, value_t>;
constexpr bool is_string = std::is_constructible_v<string_t, value_t> && !is_json;
if (!contains(key)) {
if constexpr (is_string) {
return string_t(default_value);
}
else {
return value_t(default_value);
}
}
return at(key).get_helper(default_value, std::forward<rest_keys_t>(rest)...);
}
template <typename string_t>
template <typename value_t>
inline auto
basic_object<string_t>::get_helper(const value_t& default_value, const string_t& key) const
{
constexpr bool is_json = std::is_same_v<basic_value<string_t>, value_t>
|| std::is_same_v<basic_array<string_t>, value_t>
|| std::is_same_v<basic_object<string_t>, value_t>;
constexpr bool is_string = std::is_constructible_v<string_t, value_t> && !is_json;
if (!contains(key)) {
if constexpr (is_string) {
return string_t(default_value);
}
else {
return value_t(default_value);
}
}
auto val = _object_data.at(key);
if (val.template is<value_t>()) {
if constexpr (is_string) {
return val.template as<string_t>();
}
else {
return val.template as<value_t>();
}
}
else {
if constexpr (is_string) {
return string_t(default_value);
}
else {
return value_t(default_value);
}
}
}
template <typename string_t>
template <typename value_t>
inline std::optional<value_t> basic_object<string_t>::find(const string_t& key) const
{
auto iter = _object_data.find(key);
if (iter == _object_data.end()) {
return std::nullopt;
}
const auto& val = iter->second;
return val.template is<value_t>() ? std::optional<value_t>(val.template as<value_t>())
: std::nullopt;
}
template <typename string_t>
inline typename basic_object<string_t>::iterator basic_object<string_t>::begin() noexcept
{
return _object_data.begin();
}
template <typename string_t>
inline typename basic_object<string_t>::iterator basic_object<string_t>::end() noexcept
{
return _object_data.end();
}
template <typename string_t>
inline typename basic_object<string_t>::const_iterator
basic_object<string_t>::begin() const noexcept
{
return _object_data.begin();
}
template <typename string_t>
inline typename basic_object<string_t>::const_iterator basic_object<string_t>::end() const noexcept
{
return _object_data.end();
}
template <typename string_t>
inline typename basic_object<string_t>::const_iterator
basic_object<string_t>::cbegin() const noexcept
{
return _object_data.cbegin();
}
template <typename string_t>
inline typename basic_object<string_t>::const_iterator basic_object<string_t>::cend() const noexcept
{
return _object_data.cend();
}
template <typename string_t>
inline basic_value<string_t>& basic_object<string_t>::operator[](const string_t& key)
{
return _object_data[key];
}
template <typename string_t>
inline basic_value<string_t>& basic_object<string_t>::operator[](string_t&& key)
{
return _object_data[std::move(key)];
}
template <typename string_t>
inline basic_object<string_t>
basic_object<string_t>::operator|(const basic_object<string_t>& rhs) const&
{
basic_object<string_t> temp = *this;
temp._object_data.insert(rhs.begin(), rhs.end());
return temp;
}
template <typename string_t>
inline basic_object<string_t> basic_object<string_t>::operator|(basic_object<string_t>&& rhs) const&
{
basic_object<string_t> temp = *this;
// temp._object_data.merge(std::move(rhs._object_data));
temp._object_data.insert(
std::make_move_iterator(rhs.begin()),
std::make_move_iterator(rhs.end()));
return temp;
}
template <typename string_t>
inline basic_object<string_t>
basic_object<string_t>::operator|(const basic_object<string_t>& rhs) &&
{
_object_data.insert(rhs.begin(), rhs.end());
return std::move(*this);
}
template <typename string_t>
inline basic_object<string_t> basic_object<string_t>::operator|(basic_object<string_t>&& rhs) &&
{
//_object_data.merge(std::move(rhs._object_data));
_object_data.insert(std::make_move_iterator(rhs.begin()), std::make_move_iterator(rhs.end()));
return std::move(*this);
}
template <typename string_t>
inline basic_object<string_t>& basic_object<string_t>::operator|=(const basic_object<string_t>& rhs)
{
_object_data.insert(rhs.begin(), rhs.end());
return *this;
}
template <typename string_t>
inline basic_object<string_t>& basic_object<string_t>::operator|=(basic_object<string_t>&& rhs)
{
_object_data.insert(std::make_move_iterator(rhs.begin()), std::make_move_iterator(rhs.end()));
return *this;
}
template <typename string_t>
inline bool basic_object<string_t>::operator==(const basic_object<string_t>& rhs) const
{
return _object_data == rhs._object_data;
}
template <
typename ostream_t,
typename string_t,
typename std_ostream_t = std::basic_ostream<
typename string_t::value_type,
std::char_traits<typename string_t::value_type>>,
typename enable_t = std::enable_if_t<
std::is_same_v<std_ostream_t, ostream_t> || std::is_base_of_v<std_ostream_t, ostream_t>>>
ostream_t& operator<<(ostream_t& out, const basic_object<string_t>& obj)
{
out << obj.format();
return out;
}
} // namespace json

View File

@@ -0,0 +1,207 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <type_traits>
#include "types.hpp"
#include "utils.hpp"
namespace json
{
namespace _serialization_helper
{
template <typename in_t, typename serializer_t>
class is_serializable
{
template <typename U>
static auto test(int)
-> decltype(std::declval<serializer_t>()(std::declval<U>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<in_t>(0))::value;
};
struct empty_serializer
{
// sample:
// json::value operator()(const type_1&) const { return ...; }
// json::value operator()(const type_2&) const { return ...; }
// json::value operator()(const type_3&) const { return ...; }
};
template <typename T>
void unable_to_serialize()
{
static_assert(
!sizeof(T),
"Unable to serialize T. "
#ifdef _MSC_VER
"See T below: " __FUNCSIG__
#else
// "See T below: " __PRETTY_FUNCTION__
#endif
);
}
}
namespace _serialization_helper
{
template <typename out_t, typename deserializer_t, typename string_t = default_string_t>
class is_deserializable
{
template <typename U>
static auto test(int)
-> decltype(std::declval<deserializer_t>()(std::declval<basic_value<string_t>>(), std::declval<U&>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<out_t>(0))::value;
};
struct empty_deserializer
{
// sample:
// bool operator()(const json::value&, type_1&) const { return ...; }
// bool operator()(const json::value&, type_2&) const { return ...; }
// bool operator()(const json::value&, type_3&) const { return ...; }
};
template <typename T>
void unable_to_deserialize()
{
static_assert(
!sizeof(T),
"Unable to deserialize T. "
#ifdef _MSC_VER
"See T below: " __FUNCSIG__
#else
// "See T below: " __PRETTY_FUNCTION__
#endif
);
}
}
template <
typename in_t,
typename serializer_t = _serialization_helper::empty_serializer,
typename string_t = default_string_t>
basic_value<string_t> serialize(in_t&& in, const serializer_t& serializer = {})
{
if constexpr (_serialization_helper::is_serializable<in_t, serializer_t>::value) {
return serializer(std::forward<in_t>(in));
}
else if constexpr (
_utils::is_collection<std::decay_t<in_t>> || _utils::is_fixed_array<std::decay_t<in_t>>) {
basic_array<string_t> arr;
for (auto&& elem : in) {
using elem_t = decltype(elem);
auto j_elem =
serialize<elem_t, serializer_t, string_t>(std::forward<elem_t>(elem), serializer);
arr.emplace_back(std::move(j_elem));
}
return arr;
}
else if constexpr (_utils::is_map<std::decay_t<in_t>>) {
basic_object<string_t> obj;
for (auto&& [key, elem] : in) {
using key_t = decltype(key);
using elem_t = decltype(elem);
auto j_elem =
serialize<elem_t, serializer_t, string_t>(std::forward<elem_t>(elem), serializer);
obj.emplace(std::forward<key_t>(key), std::move(j_elem));
}
return obj;
}
else if constexpr (std::is_constructible_v<basic_value<string_t>, in_t>) {
return basic_value<string_t>(std::forward<in_t>(in));
}
else {
_serialization_helper::unable_to_serialize<in_t>();
}
}
template <
typename out_t,
typename deserializer_t = _serialization_helper::empty_deserializer,
typename string_t = default_string_t>
bool deserialize(
const basic_value<string_t>& in,
out_t& out,
const deserializer_t& deserializer = {})
{
if constexpr (_serialization_helper::is_deserializable<out_t, deserializer_t>::value) {
return deserializer(in, out);
}
else if constexpr (_utils::is_collection<std::decay_t<out_t>>) {
if (!in.is_array()) {
return false;
}
for (auto&& j_elem : in.as_array()) {
using elem_t = typename out_t::value_type;
elem_t elem {};
if (!deserialize<elem_t, deserializer_t, string_t>(j_elem, elem, deserializer)) {
return false;
}
if constexpr (_as_collection_helper::has_emplace_back<out_t>::value) {
out.emplace_back(std::move(elem));
}
else {
out.emplace(std::move(elem));
}
}
return true;
}
else if constexpr (_utils::is_fixed_array<std::decay_t<out_t>>) {
if (!in.is_array()) {
return false;
}
auto&& in_as_arr = in.as_array();
constexpr size_t out_size = _utils::fixed_array_size<out_t>;
if (in_as_arr.size() != out_size) {
return false;
}
for (size_t i = 0; i < out_size; ++i) {
auto&& j_elem = in_as_arr.at(i);
using elem_t = typename out_t::value_type;
elem_t elem {};
if (!deserialize<elem_t, deserializer_t, string_t>(j_elem, elem, deserializer)) {
return false;
}
out.at(i) = std::move(elem);
}
return true;
}
else if constexpr (_utils::is_map<std::decay_t<out_t>>) {
if (!in.is_object()) {
return false;
}
for (auto&& [key, j_elem] : in.as_object()) {
using elem_t = typename out_t::mapped_type;
elem_t elem {};
if (!deserialize<elem_t, deserializer_t, string_t>(j_elem, elem, deserializer)) {
return false;
}
out.emplace(std::forward<decltype(key)>(key), std::move(elem));
}
return true;
}
else if constexpr (std::is_constructible_v<out_t, basic_value<string_t>>) {
out = out_t(in);
return true;
}
else {
_serialization_helper::unable_to_deserialize<out_t>();
}
}
} // namespace json

View File

@@ -0,0 +1,7 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include "array.hpp"
#include "object.hpp"
#include "value.hpp"

View File

@@ -0,0 +1,473 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <iomanip>
#include <limits>
#include <sstream>
#include <string>
#include <type_traits>
#include <utility>
#include <variant>
namespace json
{
template <typename string_t>
class basic_value;
template <typename string_t>
class basic_array;
template <typename string_t>
class basic_object;
using default_string_t = std::string;
using value = basic_value<default_string_t>;
using array = basic_array<default_string_t>;
using object = basic_object<default_string_t>;
using wvalue = basic_value<std::wstring>;
using warray = basic_array<std::wstring>;
using wobject = basic_object<std::wstring>;
}
namespace json::ext
{
template <typename string_t, typename T, typename = void>
class jsonization
{
public:
// json::value to_json(const T&) const;
// bool check_json(const json::value&) const;
// bool from_json(const json::value&, T&) const;
};
}
namespace json::_utils
{
template <typename T>
using iterator_t = decltype(std::declval<T&>().begin());
template <typename T>
using remove_cvref_t = std::remove_cv_t<std::remove_reference_t<T>>;
template <typename T>
using iter_value_t = typename std::iterator_traits<remove_cvref_t<T>>::value_type;
template <typename R>
using range_value_t = iter_value_t<iterator_t<R>>;
template <typename T, typename = void>
constexpr bool is_string = false;
template <typename T>
constexpr bool is_string<T, std::void_t<typename T::traits_type>> =
std::is_same_v<typename T::traits_type, std::char_traits<typename T::value_type>>;
template <typename T, typename = void>
constexpr bool is_container = false;
template <typename T>
constexpr bool is_container<T, std::void_t<typename T::value_type, range_value_t<T>>> =
std::is_same_v<typename T::value_type, range_value_t<T>> && !is_string<T>;
template <typename T, typename = void>
constexpr bool is_map = false;
template <typename T>
constexpr bool is_map<T, std::void_t<typename T::key_type, typename T::mapped_type>> =
is_container<T>;
template <typename T, typename = void>
constexpr bool is_fixed_array = false;
template <template <typename, size_t> typename arr_t, typename value_t, size_t size>
constexpr bool is_fixed_array<arr_t<value_t, size>> = true;
template <typename T, typename = std::enable_if_t<is_fixed_array<T>>>
constexpr size_t fixed_array_size = 0;
template <template <typename, size_t> typename arr_t, typename value_t, size_t size>
constexpr size_t fixed_array_size<arr_t<value_t, size>> = size;
template <typename T, typename = void>
constexpr bool is_collection = false;
template <typename T>
constexpr bool is_collection<T> = is_container<T> && !is_map<T> && !is_fixed_array<T>;
template <typename T>
constexpr bool is_variant = false;
template <typename... args_t>
constexpr bool is_variant<std::variant<args_t...>> = true;
template <typename T>
constexpr bool is_tuple = false;
template <typename... args_t>
constexpr bool is_tuple<std::tuple<args_t...>> = true;
template <typename T>
constexpr bool is_pair = false;
template <typename... args_t>
constexpr bool is_pair<std::pair<args_t...>> = true;
template <typename T, typename = void>
constexpr bool is_tuple_like = false;
template <template <typename...> typename tuple_t, typename... args_t>
constexpr bool is_tuple_like<
tuple_t<args_t...>,
std::void_t<decltype(std::tuple_size<tuple_t<args_t...>>::value)>> =
std::tuple_size<tuple_t<args_t...>>::value == sizeof...(args_t);
template <typename T>
class has_emplace_back
{
template <typename U>
static auto test(int) -> decltype(std::declval<U>().emplace_back(), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T>
class has_to_json_in_member
{
template <typename U>
static auto test(int) -> decltype(std::declval<U>().to_json(), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_check_json_in_member
{
template <typename U>
static auto test(int)
-> decltype(std::declval<U>().check_json(std::declval<json::basic_value<string_t>>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_from_json_in_member
{
template <typename U>
static auto test(int)
-> decltype(std::declval<U>().from_json(std::declval<json::basic_value<string_t>>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_to_json_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().to_json(std::declval<U>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_check_json_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().check_json(std::declval<json::basic_value<string_t>>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_from_json_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().from_json(std::declval<json::basic_value<string_t>>(), std::declval<U&>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_move_to_json_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().move_to_json(std::declval<U>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_move_from_json_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().move_from_json(std::declval<json::basic_value<string_t>>(), std::declval<U&>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_to_json_array_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().to_json_array(std::declval<U>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_check_json_array_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().check_json_array(std::declval<json::basic_array<string_t>>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_from_json_array_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().from_json_array(std::declval<json::basic_array<string_t>>(), std::declval<U&>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_move_to_json_array_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().move_to_json_array(std::declval<U>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_move_from_json_array_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().move_from_json_array(std::declval<json::basic_array<string_t>>(), std::declval<U&>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_to_json_object_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().to_json_object(std::declval<U>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_check_json_object_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().check_json_object(std::declval<json::basic_object<string_t>>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_from_json_object_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().from_json_object(std::declval<json::basic_object<string_t>>(), std::declval<U&>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_move_to_json_object_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().move_to_json_object(std::declval<U>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename T, typename string_t>
class has_move_from_json_object_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<string_t, U>>().move_from_json_object(std::declval<json::basic_object<string_t>>(), std::declval<U&>()), std::true_type());
template <typename U>
static std::false_type test(...);
public:
static constexpr bool value = decltype(test<T>(0))::value;
};
template <typename string_t>
inline constexpr string_t unescape_string(const string_t& str)
{
using char_t = typename string_t::value_type;
string_t result {};
auto cur = str.cbegin();
auto end = str.cend();
auto no_escape_beg = cur;
char_t escape = 0;
for (; cur != end; ++cur) {
switch (*cur) {
case '"':
escape = '"';
break;
case '\\':
escape = '\\';
break;
case '\b':
escape = 'b';
break;
case '\f':
escape = 'f';
break;
case '\n':
escape = 'n';
break;
case '\r':
escape = 'r';
break;
case '\t':
escape = 't';
break;
default:
break;
}
if (escape) {
result += string_t(no_escape_beg, cur) + char_t('\\') + escape;
no_escape_beg = cur + 1;
escape = 0;
}
}
result += string_t(no_escape_beg, cur);
return result;
}
template <typename string_t>
inline constexpr string_t true_string()
{
return { 't', 'r', 'u', 'e' };
}
template <typename string_t>
inline constexpr string_t false_string()
{
return { 'f', 'a', 'l', 's', 'e' };
}
template <typename string_t>
inline constexpr string_t null_string()
{
return { 'n', 'u', 'l', 'l' };
}
template <typename string_t, typename any_t>
inline string_t to_basic_string(any_t&& arg)
{
#ifdef MEOJSON_KEEP_FLOATING_PRECISION
using real_type = std::remove_reference_t<any_t>;
if constexpr (std::is_floating_point_v<real_type>) {
if constexpr (std::is_same_v<string_t, std::string>) {
std::ostringstream oss;
oss << std::setprecision(std::numeric_limits<real_type>::max_digits10) << arg;
return oss.str();
}
else if constexpr (std::is_same_v<string_t, std::wstring>) {
std::wostringstream oss;
oss << std::setprecision(std::numeric_limits<real_type>::max_digits10) << arg;
return oss.str();
}
}
#endif
if constexpr (std::is_same_v<string_t, std::string>) {
return std::to_string(std::forward<any_t>(arg));
}
else if constexpr (std::is_same_v<string_t, std::wstring>) {
return std::to_wstring(std::forward<any_t>(arg));
}
else {
static_assert(!sizeof(any_t), "Unsupported type");
}
}
} // namespace json::_utils
#include "../reflection/extensions.hpp"

1142
3rdparty/include/meojson/common/value.hpp vendored Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,13 +1,17 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#if __cplusplus >= 202002L || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
#include <bit>
namespace json::_bitops
{
using std::countl_one;
using std::countl_zero;
using std::countr_one;
using std::countr_zero;
inline constexpr bool is_little_endian()
{
return std::endian::native == std::endian::little;
@@ -15,25 +19,37 @@ inline constexpr bool is_little_endian()
}
#else
#include <cstdint>
namespace json::_bitops
{
#if defined(__GNUC__) || defined(__clang__)
inline constexpr int countl_zero(uint32_t x)
{
if constexpr (sizeof(uint32_t) == sizeof(unsigned int)) return x == 0 ? 32 : __builtin_clz(x);
if constexpr (sizeof(uint32_t) == sizeof(unsigned long)) return x == 0 ? 32 : __builtin_clzl(x);
if constexpr (sizeof(uint32_t) == sizeof(unsigned int)) {
return x == 0 ? 32 : __builtin_clz(x);
}
if constexpr (sizeof(uint32_t) == sizeof(unsigned long)) {
return x == 0 ? 32 : __builtin_clzl(x);
}
return x == 0 ? 32 : __builtin_clzll(x);
}
inline constexpr int countr_zero(uint32_t x)
{
if constexpr (sizeof(uint32_t) == sizeof(unsigned int)) return x == 0 ? 32 : __builtin_ctz(x);
if constexpr (sizeof(uint32_t) == sizeof(unsigned long)) return x == 0 ? 32 : __builtin_ctzl(x);
if constexpr (sizeof(uint32_t) == sizeof(unsigned int)) {
return x == 0 ? 32 : __builtin_ctz(x);
}
if constexpr (sizeof(uint32_t) == sizeof(unsigned long)) {
return x == 0 ? 32 : __builtin_ctzl(x);
}
return x == 0 ? 32 : __builtin_ctzll(x);
}
inline constexpr int countl_zero(uint64_t x)
{
return x == 0 ? 64 : __builtin_clzll(x);
}
inline constexpr int countr_zero(uint64_t x)
{
return x == 0 ? 64 : __builtin_ctzll(x);
@@ -45,14 +61,17 @@ inline int countl_zero(uint32_t x)
{
return __lzcnt(x);
}
inline int countr_zero(uint32_t x)
{
return _tzcnt_u32(x);
}
inline int countl_zero(uint64_t x)
{
return (int)__lzcnt64(x);
}
inline int countr_zero(uint64_t x)
{
return (int)_tzcnt_u64(x);
@@ -63,16 +82,19 @@ inline constexpr int countl_zero(uint32_t x)
unsigned long index = 0;
return _BitScanReverse(&index, x) ? 31 - index : 32;
}
inline constexpr int countr_zero(uint32_t x)
{
unsigned long index = 0;
return _BitScanForward(&index, x) ? index : 32;
}
inline constexpr int countl_zero(uint64_t x)
{
unsigned long index = 0;
return _BitScanReverse64(&index, x) ? 63 - index : 64;
}
inline constexpr int countr_zero(uint64_t x)
{
unsigned long index = 0;
@@ -86,14 +108,17 @@ inline int countl_one(uint32_t x)
{
return countl_zero(~x);
}
inline int countr_one(uint32_t x)
{
return countr_zero(~x);
}
inline int countl_one(uint64_t x)
{
return countl_zero(~x);
}
inline int countr_one(uint64_t x)
{
return countr_zero(~x);
@@ -102,10 +127,12 @@ inline int countr_one(uint64_t x)
// no constexpr endian awareness before C++20
inline bool is_little_endian()
{
union {
union
{
uint32_t u32;
uint8_t u8;
} u = { 0x01020304 };
return u.u8 == 4;
}
} // namespace json::_bitops

View File

@@ -1,3 +1,5 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <cstdint>
@@ -28,11 +30,13 @@ struct packed_bytes
};
}
#ifndef MEOJSON_DISABLE_PACKED_BYTES
#if defined(__SSE2__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP)
#include "packed_bytes_x86.hpp"
#elif defined(__ARM_NEON) || defined(_M_ARM) || defined(_M_ARM64)
#include "packed_bytes_arm.hpp"
#endif
#endif
namespace json::_packed_bytes
{
@@ -66,14 +70,19 @@ struct packed_bytes_trait_uint64
return is_zero_memberwise((x) ^ (UINT64_C(0x0101010101010101) * (n)));
}
__packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b) { return a | b; }
__packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b)
{
return a | b;
}
__packed_bytes_strong_inline static size_t first_nonzero_byte(value_type x)
{
if (_bitops::is_little_endian())
if (_bitops::is_little_endian()) {
return _bitops::countr_zero(x) / 8;
else
}
else {
return _bitops::countl_zero(x) / 8;
}
}
};
@@ -108,16 +117,22 @@ struct packed_bytes_trait_uint32
return is_zero_memberwise((x) ^ (~UINT32_C(0) / 255 * (n)));
}
__packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b) { return a | b; }
__packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b)
{
return a | b;
}
__packed_bytes_strong_inline static size_t first_nonzero_byte(value_type x)
{
if (_bitops::is_little_endian())
if (_bitops::is_little_endian()) {
return _bitops::countr_zero(x) / 8;
else
}
else {
return _bitops::countl_zero(x) / 8;
}
}
};
template <>
struct packed_bytes<8>
{
@@ -133,10 +148,14 @@ struct packed_bytes<4>
template <size_t N>
using packed_bytes_trait = typename packed_bytes<N>::traits;
using packed_bytes_trait_max =
std::conditional_t<packed_bytes_trait<32>::available, packed_bytes_trait<32>,
std::conditional_t<packed_bytes_trait<16>::available, packed_bytes_trait<16>,
std::conditional_t<packed_bytes_trait<8>::available, packed_bytes_trait<8>,
packed_bytes_trait<4>>>>;
using packed_bytes_trait_max = std::conditional_t<
packed_bytes_trait<32>::available,
packed_bytes_trait<32>,
std::conditional_t<
packed_bytes_trait<16>::available,
packed_bytes_trait<16>,
std::conditional_t<
packed_bytes_trait<8>::available,
packed_bytes_trait<8>,
packed_bytes_trait<4>>>>;
} // namespace json::_packed_bytes

View File

@@ -1,3 +1,5 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
// current NEON implementation doesn't outperform 64-bit scalar implementation
@@ -17,7 +19,10 @@ struct packed_bytes_trait_neon
static constexpr auto step = 16;
using value_type = uint8x16_t;
__packed_bytes_strong_inline static value_type load_unaligned(const void* ptr) { return vld1q_u8((uint8_t*)ptr); }
__packed_bytes_strong_inline static value_type load_unaligned(const void* ptr)
{
return vld1q_u8((uint8_t*)ptr);
}
__packed_bytes_strong_inline static value_type less(value_type x, uint8_t n)
{
@@ -26,19 +31,31 @@ struct packed_bytes_trait_neon
return is_less;
}
__packed_bytes_strong_inline static value_type equal(value_type x, uint8_t n) { return vceqq_u8(x, vdupq_n_u8(n)); }
__packed_bytes_strong_inline static value_type equal(value_type x, uint8_t n)
{
return vceqq_u8(x, vdupq_n_u8(n));
}
__packed_bytes_strong_inline static value_type equal(value_type x, value_type y) { return vceqq_u8(x, y); }
__packed_bytes_strong_inline static value_type equal(value_type x, value_type y)
{
return vceqq_u8(x, y);
}
__packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b) { return vorrq_u8(a, b); }
__packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b)
{
return vorrq_u8(a, b);
}
__packed_bytes_strong_inline static bool is_all_zero(value_type x)
{
#ifdef __packed_bytes_trait_arm64
return vmaxvq_u8(x) == 0;
#else
auto fold64 = vorr_u64(vget_high_u64(vreinterpretq_u8_u64(x), 0), vget_low_u64(vreinterpretq_u8_u64(x), 1));
auto fold32 = vget_lane_u32(vreinterpret_u64_u32(fold64), 0) | vget_lane_u32(vreinterpret_u64_u32(fold64), 1);
auto fold64 = vorr_u64(
vget_high_u64(vreinterpretq_u8_u64(x), 0),
vget_low_u64(vreinterpretq_u8_u64(x), 1));
auto fold32 = vget_lane_u32(vreinterpret_u64_u32(fold64), 0)
| vget_lane_u32(vreinterpret_u64_u32(fold64), 1);
return fold32 == 0;
#endif
}

View File

@@ -1,4 +1,7 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include "packed_bytes.hpp"
#include <emmintrin.h>
@@ -35,9 +38,15 @@ struct packed_bytes_trait_sse
return _mm_cmpeq_epi8(x, _mm_set1_epi8(static_cast<char>(n)));
}
__packed_bytes_strong_inline static value_type equal(value_type x, value_type y) { return _mm_cmpeq_epi8(x, y); }
__packed_bytes_strong_inline static value_type equal(value_type x, value_type y)
{
return _mm_cmpeq_epi8(x, y);
}
__packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b) { return _mm_or_si128(a, b); }
__packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b)
{
return _mm_or_si128(a, b);
}
__packed_bytes_strong_inline static bool is_all_zero(value_type x)
{
@@ -97,14 +106,20 @@ struct packed_bytes_trait_avx2
return _mm256_cmpeq_epi8(x, _mm256_set1_epi8(static_cast<char>(n)));
}
__packed_bytes_strong_inline static value_type equal(value_type x, value_type y) { return _mm256_cmpeq_epi8(x, y); }
__packed_bytes_strong_inline static value_type equal(value_type x, value_type y)
{
return _mm256_cmpeq_epi8(x, y);
}
__packed_bytes_strong_inline static value_type bitwise_or(value_type a, value_type b)
{
return _mm256_or_si256(a, b);
}
__packed_bytes_strong_inline static bool is_all_zero(value_type x) { return (bool)_mm256_testz_si256(x, x); }
__packed_bytes_strong_inline static bool is_all_zero(value_type x)
{
return (bool)_mm256_testz_si256(x, x);
}
__packed_bytes_strong_inline static size_t first_nonzero_byte(value_type x)
{

View File

@@ -0,0 +1,862 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <cctype>
#include <fstream>
#include <optional>
#include <ostream>
#include <string>
#include <tuple>
#include "../common/types.hpp"
#include "packed_bytes.hpp"
namespace json
{
// ****************************
// * parser declare *
// ****************************
template <
bool accept_jsonc = false,
typename string_t = default_string_t,
typename parsing_t = void,
typename accel_traits = _packed_bytes::packed_bytes_trait_max>
class parser
{
public:
using parsing_iter_t = typename parsing_t::const_iterator;
public:
~parser() noexcept = default;
static std::optional<basic_value<string_t>> parse(const parsing_t& content);
private:
parser(parsing_iter_t cbegin, parsing_iter_t cend) noexcept
: _cur(cbegin)
, _end(cend)
{
;
}
std::optional<basic_value<string_t>> parse();
basic_value<string_t> parse_value();
basic_value<string_t> parse_null();
basic_value<string_t> parse_boolean();
basic_value<string_t> parse_number();
// parse and return a basic_value<string_t> whose type is value_type::string
basic_value<string_t> parse_string();
basic_value<string_t> parse_array();
basic_value<string_t> parse_object();
// parse and return a string_t
std::optional<string_t> parse_stdstring();
bool skip_string_literal_with_accel();
bool skip_whitespace() noexcept;
bool skip_comment() noexcept;
bool skip_digit();
bool skip_unicode_escape(uint16_t& pair_high, string_t& result);
private:
parsing_iter_t _cur;
parsing_iter_t _end;
};
// ***************************
// * utils declare *
// ***************************
template <typename parsing_t>
auto parse(const parsing_t& content);
template <typename char_t>
auto parse(char_t* content);
template <typename parsing_t>
auto parsec(const parsing_t& content);
template <typename char_t>
auto parsec(char_t* content);
template <
typename istream_t,
typename = std::enable_if_t<
std::is_base_of_v<std::basic_istream<typename istream_t::char_type>, istream_t>>>
auto parse(istream_t& istream, bool check_bom = false, bool with_commets = false);
template <typename ifstream_t = std::ifstream, typename path_t = void>
auto open(const path_t& path, bool check_bom = false, bool with_commets = false);
namespace literals
{
value operator""_json(const char* str, size_t len);
wvalue operator""_json(const wchar_t* str, size_t len);
value operator""_jvalue(const char* str, size_t len);
wvalue operator""_jvalue(const wchar_t* str, size_t len);
array operator""_jarray(const char* str, size_t len);
warray operator""_jarray(const wchar_t* str, size_t len);
object operator""_jobject(const char* str, size_t len);
wobject operator""_jobject(const wchar_t* str, size_t len);
}
template <typename string_t = default_string_t>
const basic_value<string_t> invalid_value();
// *************************
// * parser impl *
// *************************
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline std::optional<basic_value<string_t>>
parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse(const parsing_t& content)
{
return parser<accept_jsonc, string_t, parsing_t, accel_traits>(content.cbegin(), content.cend())
.parse();
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline std::optional<basic_value<string_t>>
parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse()
{
if (!skip_whitespace()) {
return std::nullopt;
}
basic_value<string_t> result_value;
switch (*_cur) {
case '[':
result_value = parse_array();
break;
case '{':
result_value = parse_object();
break;
default: // A JSON payload should be an basic_object or basic_array
return std::nullopt;
}
if (!result_value.valid()) {
return std::nullopt;
}
// After the parsing is complete, there should be no more content other than spaces behind
if (skip_whitespace()) {
return std::nullopt;
}
return result_value;
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_value()
{
switch (*_cur) {
case 'n':
return parse_null();
case 't':
case 'f':
return parse_boolean();
case '-':
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
return parse_number();
case '"':
return parse_string();
case '[':
return parse_array();
case '{':
return parse_object();
default:
return invalid_value<string_t>();
}
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_null()
{
for (const auto& ch : _utils::null_string<string_t>()) {
if (_cur != _end && *_cur == ch) {
++_cur;
}
else {
return invalid_value<string_t>();
}
}
return basic_value<string_t>();
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t>
parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_boolean()
{
switch (*_cur) {
case 't':
for (const auto& ch : _utils::true_string<string_t>()) {
if (_cur != _end && *_cur == ch) {
++_cur;
}
else {
return invalid_value<string_t>();
}
}
return true;
case 'f':
for (const auto& ch : _utils::false_string<string_t>()) {
if (_cur != _end && *_cur == ch) {
++_cur;
}
else {
return invalid_value<string_t>();
}
}
return false;
default:
return invalid_value<string_t>();
}
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_number()
{
const auto first = _cur;
if (*_cur == '-') {
++_cur;
}
// numbers cannot have leading zeroes
if (_cur != _end && *_cur == '0' && _cur + 1 != _end && std::isdigit(*(_cur + 1))) {
return invalid_value<string_t>();
}
if (!skip_digit()) {
return invalid_value<string_t>();
}
if (*_cur == '.') {
++_cur;
if (!skip_digit()) {
return invalid_value<string_t>();
}
}
if (*_cur == 'e' || *_cur == 'E') {
if (++_cur == _end) {
return invalid_value<string_t>();
}
if (*_cur == '+' || *_cur == '-') {
++_cur;
}
if (!skip_digit()) {
return invalid_value<string_t>();
}
}
return basic_value<string_t>(basic_value<string_t>::value_type::number, string_t(first, _cur));
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_string()
{
auto string_opt = parse_stdstring();
if (!string_opt) {
return invalid_value<string_t>();
}
return basic_value<string_t>(
basic_value<string_t>::value_type::string,
std::move(string_opt).value());
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_array()
{
if (*_cur == '[') {
++_cur;
}
else {
return invalid_value<string_t>();
}
if (!skip_whitespace()) {
return invalid_value<string_t>();
}
else if (*_cur == ']') {
++_cur;
// empty basic_array
return basic_array<string_t>();
}
typename basic_array<string_t>::raw_array result;
while (true) {
if (!skip_whitespace()) {
return invalid_value<string_t>();
}
if constexpr (accept_jsonc) {
if (*_cur == ']') {
break;
}
}
basic_value<string_t> val = parse_value();
if (!val.valid() || !skip_whitespace()) {
return invalid_value<string_t>();
}
result.emplace_back(std::move(val));
if (*_cur == ',') {
++_cur;
}
else {
break;
}
}
if (skip_whitespace() && *_cur == ']') {
++_cur;
}
else {
return invalid_value<string_t>();
}
return basic_array<string_t>(std::move(result));
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_object()
{
if (*_cur == '{') {
++_cur;
}
else {
return invalid_value<string_t>();
}
if (!skip_whitespace()) {
return invalid_value<string_t>();
}
else if (*_cur == '}') {
++_cur;
// empty basic_object
return basic_object<string_t>();
}
typename basic_object<string_t>::raw_object result;
while (true) {
if (!skip_whitespace()) {
return invalid_value<string_t>();
}
if constexpr (accept_jsonc) {
if (*_cur == '}') {
break;
}
}
auto key_opt = parse_stdstring();
if (key_opt && skip_whitespace() && *_cur == ':') {
++_cur;
}
else {
return invalid_value<string_t>();
}
if (!skip_whitespace()) {
return invalid_value<string_t>();
}
basic_value<string_t> val = parse_value();
if (!val.valid() || !skip_whitespace()) {
return invalid_value<string_t>();
}
auto emplaced = result.emplace(std::move(*key_opt), std::move(val)).second;
if (!emplaced) {
return invalid_value<string_t>();
}
if (*_cur == ',') {
++_cur;
}
else {
break;
}
}
if (skip_whitespace() && *_cur == '}') {
++_cur;
}
else {
return invalid_value<string_t>();
}
return basic_object<string_t>(std::move(result));
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline std::optional<string_t>
parser<accept_jsonc, string_t, parsing_t, accel_traits>::parse_stdstring()
{
if (*_cur == '"') {
++_cur;
}
else {
return std::nullopt;
}
string_t result;
auto no_escape_beg = _cur;
uint16_t pair_high = 0;
while (_cur != _end) {
if constexpr (sizeof(*_cur) == 1 && accel_traits::available) {
if (!skip_string_literal_with_accel()) {
return std::nullopt;
}
}
switch (*_cur) {
case '\t':
case '\r':
case '\n':
return std::nullopt;
case '\\': {
result += string_t(no_escape_beg, _cur++);
if (_cur == _end) {
return std::nullopt;
}
if (pair_high && *_cur != 'u') {
return std::nullopt;
}
switch (*_cur) {
case '"':
result.push_back('"');
break;
case '\\':
result.push_back('\\');
break;
case '/':
result.push_back('/');
break;
case 'b':
result.push_back('\b');
break;
case 'f':
result.push_back('\f');
break;
case 'n':
result.push_back('\n');
break;
case 'r':
result.push_back('\r');
break;
case 't':
result.push_back('\t');
break;
case 'u':
if (!skip_unicode_escape(pair_high, result)) {
return std::nullopt;
}
break;
default:
// Illegal backslash escape
return std::nullopt;
}
no_escape_beg = ++_cur;
break;
}
case '"': {
if (pair_high) {
return std::nullopt;
}
result += string_t(no_escape_beg, _cur++);
return result;
}
default:
if (pair_high) {
return std::nullopt;
}
++_cur;
break;
}
}
return std::nullopt;
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline bool parser<accept_jsonc, string_t, parsing_t, accel_traits>::skip_unicode_escape(
uint16_t& pair_high,
string_t& result)
{
uint16_t cp = 0;
for (int i = 0; i < 4; ++i) {
if (++_cur == _end) {
return false;
}
if (!std::isxdigit(static_cast<unsigned char>(*_cur))) {
return false;
}
cp <<= 4;
if ('0' <= *_cur && *_cur <= '9') {
cp |= *_cur - '0';
}
else if ('a' <= *_cur && *_cur <= 'f') {
cp |= *_cur - 'a' + 10;
}
else if ('A' <= *_cur && *_cur <= 'F') {
cp |= *_cur - 'A' + 10;
}
else {
return false;
}
}
uint32_t ext_cp = cp;
uint16_t hi_cp = 0, lo_cp = 0;
if (0xD800 <= cp && cp <= 0xDBFF) {
if (pair_high) {
return false;
}
pair_high = cp;
return true;
}
if (0xDC00 <= cp && cp <= 0xDFFF) {
if (!pair_high) {
return false;
}
ext_cp = (((pair_high - 0xD800) << 10) | (cp - 0xDC00)) + 0x10000;
hi_cp = pair_high;
lo_cp = cp;
pair_high = 0;
}
if constexpr (std::is_same_v<typename string_t::value_type, char>) {
// utf8
if (ext_cp <= 0x7F) {
result.push_back(static_cast<char>(ext_cp));
}
else if (ext_cp <= 0x7FF) {
result.push_back(static_cast<char>(((ext_cp >> 6) & 0b00011111) | 0b11000000u));
result.push_back(static_cast<char>((ext_cp & 0b00111111) | 0b10000000u));
}
else if (ext_cp <= 0xFFFF) {
result.push_back(static_cast<char>(((ext_cp >> 12) & 0b00001111) | 0b11100000u));
result.push_back(static_cast<char>(((ext_cp >> 6) & 0b00111111) | 0b10000000u));
result.push_back(static_cast<char>((ext_cp & 0b00111111) | 0b10000000u));
}
else {
result.push_back(static_cast<char>(((ext_cp >> 18) & 0b00000111) | 0b11110000u));
result.push_back(static_cast<char>(((ext_cp >> 12) & 0b00111111) | 0b10000000u));
result.push_back(static_cast<char>(((ext_cp >> 6) & 0b00111111) | 0b10000000u));
result.push_back(static_cast<char>((ext_cp & 0b00111111) | 0b10000000u));
}
}
else if constexpr (std::is_same_v<typename string_t::value_type, wchar_t>) {
if constexpr (sizeof(wchar_t) == 4) {
result.push_back(static_cast<wchar_t>(ext_cp));
}
else if constexpr (sizeof(wchar_t) == 2) {
if (ext_cp <= 0xFFFF) {
result.push_back(static_cast<wchar_t>(ext_cp));
}
else {
result.push_back(static_cast<wchar_t>(hi_cp));
result.push_back(static_cast<wchar_t>(lo_cp));
}
}
else {
static_assert(!sizeof(typename string_t::value_type), "Unsupported wchar");
}
}
else {
static_assert(!sizeof(typename string_t::value_type), "Unsupported type");
}
return true;
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline bool
parser<accept_jsonc, string_t, parsing_t, accel_traits>::skip_string_literal_with_accel()
{
if constexpr (sizeof(*_cur) != 1) {
return false;
}
while (_end - _cur >= accel_traits::step) {
auto pack = accel_traits::load_unaligned(&(*_cur));
auto result = accel_traits::less(pack, 32);
result =
accel_traits::bitwise_or(result, accel_traits::equal(pack, static_cast<uint8_t>('"')));
result =
accel_traits::bitwise_or(result, accel_traits::equal(pack, static_cast<uint8_t>('\\')));
if (accel_traits::is_all_zero(result)) {
_cur += accel_traits::step;
}
else {
auto index = accel_traits::first_nonzero_byte(result);
_cur += index;
break;
}
}
return _cur != _end;
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline bool parser<accept_jsonc, string_t, parsing_t, accel_traits>::skip_whitespace() noexcept
{
while (_cur != _end) {
switch (*_cur) {
case ' ':
case '\t':
case '\r':
case '\n':
++_cur;
break;
case '/':
if constexpr (accept_jsonc) {
if (!skip_comment()) {
return false;
}
// else continue;
}
else {
return false;
}
break;
case '\0':
return false;
default:
return true;
}
}
return false;
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
bool json::parser<accept_jsonc, string_t, parsing_t, accel_traits>::skip_comment() noexcept
{
if (_cur == _end || *_cur != '/') {
return false;
}
if (++_cur == _end) {
return false;
}
enum class comment_type
{
invalid,
line,
block,
} t = comment_type::invalid;
switch (*_cur++) {
case '/':
t = comment_type::line;
break;
case '*':
t = comment_type::block;
break;
default:
return false;
}
while (_cur != _end) {
switch (*_cur++) {
case '\n':
if (t == comment_type::line) {
return true;
}
break;
case '*':
if (t == comment_type::block && _cur != _end && *_cur == '/') {
++_cur;
return true;
}
break;
default:
break;
}
}
// _cur == _end
return t == comment_type::line;
}
template <bool accept_jsonc, typename string_t, typename parsing_t, typename accel_traits>
inline bool parser<accept_jsonc, string_t, parsing_t, accel_traits>::skip_digit()
{
// At least one digit
if (_cur != _end && std::isdigit(*_cur)) {
++_cur;
}
else {
return false;
}
while (_cur != _end && std::isdigit(*_cur)) {
++_cur;
}
if (_cur != _end) {
return true;
}
else {
return false;
}
}
// *************************
// * utils impl *
// *************************
template <typename parsing_t>
auto parse(const parsing_t& content)
{
using string_t = std::basic_string<typename parsing_t::value_type>;
return parser<false, string_t, parsing_t>::parse(content);
}
template <typename char_t>
auto parse(char_t* content)
{
return parse(std::basic_string_view<std::decay_t<char_t>> { content });
}
template <typename istream_t, typename _>
auto parse(istream_t& ifs, bool check_bom, bool with_commets)
{
using string_t = std::basic_string<typename istream_t::char_type>;
ifs.seekg(0, std::ios::end);
auto file_size = ifs.tellg();
ifs.seekg(0, std::ios::beg);
string_t str(file_size, '\0');
ifs.read(str.data(), file_size);
if (check_bom) {
using uchar = unsigned char;
static constexpr uchar Bom_0 = 0xEF;
static constexpr uchar Bom_1 = 0xBB;
static constexpr uchar Bom_2 = 0xBF;
if (str.size() >= 3 && static_cast<uchar>(str.at(0)) == Bom_0
&& static_cast<uchar>(str.at(1)) == Bom_1 && static_cast<uchar>(str.at(2)) == Bom_2) {
str.assign(str.begin() + 3, str.end());
}
}
return with_commets ? parsec(str) : parse(str);
}
template <typename ifstream_t, typename path_t>
auto open(const path_t& filepath, bool check_bom, bool with_commets)
{
using char_t = typename ifstream_t::char_type;
using string_t = std::basic_string<char_t>;
using json_t = json::basic_value<string_t>;
using return_t = std::optional<json_t>;
ifstream_t ifs(filepath, std::ios::in);
if (!ifs.is_open()) {
return return_t(std::nullopt);
}
auto opt = parse(ifs, check_bom, with_commets);
ifs.close();
return opt;
}
template <typename parsing_t>
auto parsec(const parsing_t& content)
{
using string_t = std::basic_string<typename parsing_t::value_type>;
return parser<true, string_t, parsing_t>::parse(content);
}
template <typename char_t>
auto parsec(char_t* content)
{
return parsec(std::basic_string_view<std::decay_t<char_t>> { content });
}
namespace literals
{
inline value operator""_json(const char* str, size_t len)
{
return operator""_jvalue(str, len);
}
inline wvalue operator""_json(const wchar_t* str, size_t len)
{
return operator""_jvalue(str, len);
}
inline value operator""_jvalue(const char* str, size_t len)
{
return parse(std::string_view(str, len)).value_or(value());
}
inline wvalue operator""_jvalue(const wchar_t* str, size_t len)
{
return parse(std::wstring_view(str, len)).value_or(wvalue());
}
inline array operator""_jarray(const char* str, size_t len)
{
auto val = parse(std::string_view(str, len)).value_or(value());
return val.is_array() ? val.as_array() : array();
}
inline warray operator""_jarray(const wchar_t* str, size_t len)
{
auto val = parse(std::wstring_view(str, len)).value_or(wvalue());
return val.is_array() ? val.as_array() : warray();
}
inline object operator""_jobject(const char* str, size_t len)
{
auto val = parse(std::string_view(str, len)).value_or(value());
return val.is_object() ? val.as_object() : object();
}
inline wobject operator""_jobject(const wchar_t* str, size_t len)
{
auto val = parse(std::wstring_view(str, len)).value_or(wvalue());
return val.is_object() ? val.as_object() : wobject();
}
} // namespace literals
template <typename string_t>
const basic_value<string_t> invalid_value()
{
return basic_value<string_t>(
basic_value<string_t>::value_type::invalid,
typename basic_value<string_t>::var_t());
}
} // namespace json

View File

@@ -0,0 +1,656 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <cstddef>
#include <filesystem>
#include <queue>
#include <tuple>
#include <type_traits>
#include <utility>
#include <variant>
#include "../common/types.hpp"
namespace json::ext
{
template <typename string_t, typename impl_t, typename var_t, size_t len> // (size_t)-1 for no
// restriction
class __jsonization_array
{
public:
json::basic_value<string_t> to_json(const var_t& value) const
{
return static_cast<const impl_t*>(this)->to_json_array(value);
}
bool check_json(const json::basic_value<string_t>& json) const
{
if (!json.is_array()) {
return false;
}
const auto& arr = json.as_array();
if constexpr (len != static_cast<size_t>(-1)) {
if (len != arr.size()) {
return false;
}
}
return static_cast<const impl_t*>(this)->check_json_array(arr);
}
bool from_json(const json::basic_value<string_t>& json, var_t& value) const
{
if (!json.is_array()) {
return false;
}
const auto& arr = json.as_array();
if constexpr (len != static_cast<size_t>(-1)) {
if (len != arr.size()) {
return false;
}
}
return static_cast<const impl_t*>(this)->from_json_array(arr, value);
}
json::basic_value<string_t> move_to_json(var_t value) const
{
return static_cast<const impl_t*>(this)->move_to_json_array(std::move(value));
}
bool move_from_json(json::basic_value<string_t> json, var_t& value) const
{
if (!json.is_array()) {
return false;
}
auto& arr = json.as_array();
if constexpr (len != static_cast<size_t>(-1)) {
if (len != arr.size()) {
return false;
}
}
return static_cast<const impl_t*>(this)->move_from_json_array(std::move(arr), value);
}
};
template <typename string_t, typename impl_t, typename var_t>
class __jsonization_object
{
public:
json::basic_value<string_t> to_json(const var_t& value) const
{
return static_cast<const impl_t*>(this)->to_json_object(value);
}
bool check_json(const json::basic_value<string_t>& json) const
{
if (!json.is_object()) {
return false;
}
const auto& obj = json.as_object();
return static_cast<const impl_t*>(this)->check_json_object(obj);
}
bool from_json(const json::basic_value<string_t>& json, var_t& value) const
{
if (!json.is_object()) {
return false;
}
const auto& obj = json.as_object();
return static_cast<const impl_t*>(this)->from_json_object(obj, value);
}
json::basic_value<string_t> move_to_json(var_t value) const
{
return static_cast<const impl_t*>(this)->move_to_json_object(std::move(value));
}
bool move_from_json(json::basic_value<string_t> json, var_t& value) const
{
if (!json.is_object()) {
return false;
}
auto& obj = json.as_object();
return static_cast<const impl_t*>(this)->move_from_json_object(std::move(obj), value);
}
};
template <typename string_t>
class jsonization<string_t, std::nullptr_t>
{
public:
json::basic_value<string_t> to_json(const std::nullptr_t&) const
{
return json::basic_value<string_t> {};
}
bool check_json(const json::basic_value<string_t>& json) const { return json.is_null(); }
bool from_json(const json::basic_value<string_t>& json, std::nullptr_t&)
{
return check_json(json);
}
};
template <typename string_t>
class jsonization<
string_t,
std::filesystem::path,
std::enable_if_t<
std::is_same_v<string_t, std::filesystem::path::string_type>
|| std::is_same_v<string_t, std::string>>>
{
public:
json::basic_value<string_t> to_json(const std::filesystem::path& path) const
{
if constexpr (std::is_same_v<string_t, std::filesystem::path::string_type>) {
return path.native();
}
else if constexpr (std::is_same_v<string_t, std::string>) {
#if __cplusplus >= 202002L
std::u8string u8str = path.u8string();
return std::string { u8str.begin(), u8str.end() };
#else
return path.u8string();
#endif
}
#if __cplusplus >= 202002L
else if constexpr (std::is_same_v<string_t, std::u8string>) {
return path.u8string();
}
#endif
}
bool check_json(const json::basic_value<string_t>& json) const { return json.is_string(); }
bool from_json(const json::basic_value<string_t>& json, std::filesystem::path& path) const
{
path = json.as_string();
return true;
}
};
template <
typename string_t,
template <typename, size_t> typename arr_t,
typename value_t,
size_t size>
class jsonization<string_t, arr_t<value_t, size>>
: public __jsonization_array<
string_t,
jsonization<string_t, arr_t<value_t, size>>,
arr_t<value_t, size>,
size>
{
public:
json::basic_array<string_t> to_json_array(const arr_t<value_t, size>& value) const
{
json::basic_array<string_t> result;
for (size_t i = 0; i < size; i++) {
result.emplace_back(value.at(i));
}
return result;
}
bool check_json_array(const json::basic_array<string_t>& arr) const
{
return arr.template all<value_t>();
}
bool from_json_array(const json::basic_array<string_t>& arr, arr_t<value_t, size>& value) const
{
if (!check_json_array(arr)) {
return false;
}
for (size_t i = 0; i < size; i++) {
value.at(i) = arr[i].template as<value_t>();
}
return true;
}
json::basic_array<string_t> move_to_json_array(arr_t<value_t, size> value) const
{
json::basic_array<string_t> result;
for (size_t i = 0; i < size; i++) {
result.emplace_back(std::move(value.at(i)));
}
return result;
}
bool move_from_json_array(json::basic_array<string_t> arr, arr_t<value_t, size>& value) const
{
if (!check_json_array(arr)) {
return false;
}
for (size_t i = 0; i < size; i++) {
value.at(i) = std::move(arr[i]).template as<value_t>();
}
return true;
}
};
template <typename string_t, typename collection_t>
class jsonization<string_t, collection_t, std::enable_if_t<_utils::is_collection<collection_t>>>
: public __jsonization_array<
string_t,
jsonization<string_t, collection_t>,
collection_t,
(size_t)-1>
{
public:
json::basic_array<string_t> to_json_array(const collection_t& value) const
{
json::basic_array<string_t> result;
for (const auto& val : value) {
result.emplace_back(val);
}
return result;
}
bool check_json_array(const json::basic_array<string_t>& arr) const
{
return arr.template all<typename collection_t::value_type>();
}
bool from_json_array(const json::basic_array<string_t>& arr, collection_t& value) const
{
if (!check_json_array(arr)) {
return false;
}
value = {};
for (const auto& val : arr) {
if constexpr (_utils::has_emplace_back<collection_t>::value) {
value.emplace_back(val.template as<typename collection_t::value_type>());
}
else {
value.emplace(val.template as<typename collection_t::value_type>());
}
}
return true;
}
json::basic_array<string_t> move_to_json_array(collection_t value) const
{
json::basic_array<string_t> result;
for (auto& val : value) {
result.emplace_back(std::move(val));
}
return result;
}
bool move_from_json_array(json::basic_array<string_t> arr, collection_t& value) const
{
if (!check_json_array(arr)) {
return false;
}
for (auto& val : arr) {
if constexpr (_utils::has_emplace_back<collection_t>::value) {
value.emplace_back(std::move(val).template as<typename collection_t::value_type>());
}
else {
value.emplace(std::move(val).template as<typename collection_t::value_type>());
}
}
return true;
}
};
template <typename string_t, template <typename...> typename tuple_t, typename... args_t>
class jsonization<
string_t,
tuple_t<args_t...>,
std::enable_if_t<_utils::is_tuple_like<tuple_t<args_t...>>>>
: public __jsonization_array<
string_t,
jsonization<string_t, tuple_t<args_t...>>,
tuple_t<args_t...>,
std::tuple_size_v<tuple_t<args_t...>>>
{
public:
constexpr static size_t tuple_size = std::tuple_size_v<tuple_t<args_t...>>;
json::basic_array<string_t> to_json_array(const tuple_t<args_t...>& value) const
{
json::basic_array<string_t> result;
to_json_impl(result, value, std::make_index_sequence<tuple_size>());
return result;
}
template <std::size_t... Is>
void to_json_impl(
json::basic_array<string_t>& arr,
const tuple_t<args_t...>& t,
std::index_sequence<Is...>) const
{
using std::get;
(arr.emplace_back(get<Is>(t)), ...);
}
bool check_json_array(const json::basic_array<string_t>& arr) const
{
return check_json_impl(arr, std::make_index_sequence<tuple_size>());
}
template <std::size_t... Is>
bool check_json_impl(const json::basic_array<string_t>& arr, std::index_sequence<Is...>) const
{
return (arr[Is].template is<std::tuple_element_t<Is, tuple_t<args_t...>>>() && ...);
}
bool from_json_array(const json::basic_array<string_t>& arr, tuple_t<args_t...>& value) const
{
if (!check_json_array(arr)) {
return false;
}
from_json_impl(arr, value, std::make_index_sequence<tuple_size>());
return true;
}
template <std::size_t... Is>
void from_json_impl(
const json::basic_array<string_t>& arr,
tuple_t<args_t...>& t,
std::index_sequence<Is...>) const
{
using std::get;
((get<Is>(t) = arr[Is].template as<std::tuple_element_t<Is, tuple_t<args_t...>>>()), ...);
}
json::basic_array<string_t> move_to_json_array(tuple_t<args_t...> value) const
{
json::basic_array<string_t> result;
move_to_json_impl(result, std::move(value), std::make_index_sequence<tuple_size>());
return result;
}
template <std::size_t... Is>
void move_to_json_impl(
json::basic_array<string_t>& arr,
tuple_t<args_t...> t,
std::index_sequence<Is...>) const
{
using std::get;
(arr.emplace_back(std::move(get<Is>(t))), ...);
}
bool move_from_json_array(json::basic_array<string_t> arr, tuple_t<args_t...>& value) const
{
if (!check_json_array(arr)) {
return false;
}
move_from_json_impl(arr, value, std::make_index_sequence<tuple_size>());
return true;
}
template <std::size_t... Is>
void move_from_json_impl(
json::basic_array<string_t> arr,
tuple_t<args_t...>& t,
std::index_sequence<Is...>) const
{
using std::get;
((get<Is>(t) =
std::move(arr[Is]).template as<std::tuple_element_t<Is, tuple_t<args_t...>>>()),
...);
}
};
template <typename string_t, typename map_t>
class jsonization<
string_t,
map_t,
std::enable_if_t<_utils::is_map<map_t> && std::is_same_v<typename map_t::key_type, string_t>>>
: public __jsonization_object<string_t, jsonization<string_t, map_t>, map_t>
{
public:
json::basic_object<string_t> to_json_object(const map_t& value) const
{
json::basic_object<string_t> result;
for (const auto& [key, val] : value) {
result.emplace(key, val);
}
return result;
}
bool check_json_object(const json::basic_object<string_t>& arr) const
{
for (const auto& [key, val] : arr) {
if (!val.template is<typename map_t::mapped_type>()) {
return false;
}
}
return true;
}
bool from_json_object(const json::basic_object<string_t>& arr, map_t& value) const
{
// TODO: 是不是直接from不check了算了
if (!check_json_object(arr)) {
return false;
}
value = {};
for (const auto& [key, val] : arr) {
value.emplace(key, val.template as<typename map_t::mapped_type>());
}
return true;
}
json::basic_object<string_t> move_to_json_object(map_t value) const
{
json::basic_object<string_t> result;
for (auto& [key, val] : value) {
result.emplace(key, std::move(val));
}
return result;
}
bool move_from_json_object(json::basic_object<string_t> arr, map_t& value) const
{
// TODO: 是不是直接from不check了算了
if (!check_json_object(arr)) {
return false;
}
value = {};
for (auto& [key, val] : arr) {
value.emplace(key, std::move(val).template as<typename map_t::mapped_type>());
}
return true;
}
};
template <typename string_t, typename... args_t>
class jsonization<string_t, std::variant<args_t...>>
{
public:
using variant_t = std::variant<args_t...>;
constexpr static size_t variant_size = std::variant_size_v<variant_t>;
json::basic_value<string_t> to_json(const variant_t& value) const
{
json::basic_value<string_t> result;
to_json_impl(result, value, std::make_index_sequence<variant_size>());
return result;
}
template <std::size_t... Is>
void to_json_impl(
json::basic_value<string_t>& val,
const variant_t& t,
std::index_sequence<Is...>) const
{
using std::get;
std::ignore = ((t.index() == Is ? (val = get<Is>(t), true) : false) || ...);
}
bool check_json(const json::basic_value<string_t>& json) const
{
return check_json_impl(json, std::make_index_sequence<variant_size>());
}
template <std::size_t... Is>
bool check_json_impl(const json::basic_value<string_t>& val, std::index_sequence<Is...>) const
{
return (val.template is<std::variant_alternative_t<Is, variant_t>>() || ...);
}
bool from_json(const json::basic_value<string_t>& json, variant_t& value) const
{
if (!check_json_impl(json, std::make_index_sequence<variant_size>())) {
return false;
}
from_json_impl(json, value, std::make_index_sequence<variant_size>());
return true;
}
template <std::size_t... Is>
void from_json_impl(
const json::basic_value<string_t>& json,
variant_t& t,
std::index_sequence<Is...>) const
{
std::ignore =
((json.template is<std::variant_alternative_t<Is, variant_t>>()
? (t = json.template as<std::variant_alternative_t<Is, variant_t>>(), true)
: false)
|| ...);
}
json::basic_value<string_t> move_to_json(variant_t value) const
{
json::basic_value<string_t> result;
move_to_json_impl(result, std::move(value), std::make_index_sequence<variant_size>());
return result;
}
template <std::size_t... Is>
void
move_to_json_impl(json::basic_value<string_t>& val, variant_t t, std::index_sequence<Is...>)
const
{
using std::get;
std::ignore = ((t.index() == Is ? (val = std::move(get<Is>(t)), true) : false) || ...);
}
bool move_from_json(json::basic_value<string_t> json, variant_t& value) const
{
if (!check_json_impl(json, std::make_index_sequence<variant_size>())) {
return false;
}
move_from_json_impl(std::move(json), value, std::make_index_sequence<variant_size>());
return true;
}
template <std::size_t... Is>
void move_from_json_impl(
json::basic_value<string_t> json,
variant_t& t,
std::index_sequence<Is...>) const
{
std::ignore =
((json.template is<std::variant_alternative_t<Is, variant_t>>()
? (t = std::move(json).template as<std::variant_alternative_t<Is, variant_t>>(),
true)
: false)
|| ...);
}
};
// TODO: check if has move_xxx in member
template <typename string_t, typename var_t>
class jsonization<
string_t,
var_t,
std::enable_if_t<
_utils::has_to_json_in_member<var_t>::value
&& _utils::has_check_json_in_member<var_t, string_t>::value
&& _utils::has_from_json_in_member<var_t, string_t>::value>>
{
public:
json::basic_value<string_t> to_json(const var_t& value) const { return value.to_json(); }
bool check_json(const json::basic_value<string_t>& json) const
{
var_t value;
return value.check_json(json);
}
bool from_json(const json::basic_value<string_t>& json, var_t& value) const
{
return value.from_json(json);
}
json::basic_value<string_t> move_to_json(var_t value) const { return to_json(value); }
bool move_from_json(json::basic_value<string_t> json, var_t& value) const
{
return from_json(json, value);
}
};
// really need this fucking queue?
template <typename string_t, typename value_t>
class jsonization<string_t, std::queue<value_t>>
: public __jsonization_array<
string_t,
jsonization<string_t, std::queue<value_t>>,
std::queue<value_t>,
(size_t)-1>
{
public:
json::basic_array<string_t> to_json_array(const std::queue<value_t>& value) const
{
return move_to_json_array(value);
}
bool check_json_array(const json::basic_array<string_t>& arr) const
{
return arr.template all<value_t>();
}
bool from_json_array(const json::basic_array<string_t>& arr, std::queue<value_t>& value) const
{
if (!check_json_array(arr)) {
return false;
}
value = {};
for (const auto& val : arr) {
value.emplace(val.template as<value_t>());
}
return true;
}
json::basic_array<string_t> move_to_json_array(std::queue<value_t> value) const
{
json::basic_array<string_t> result;
while (!value.empty()) {
result.emplace_back(std::move(value.front()));
value.pop();
}
return result;
}
bool move_from_json_array(json::basic_array<string_t> arr, std::queue<value_t>& value) const
{
if (!check_json_array(arr)) {
return false;
}
for (auto& val : arr) {
value.emplace(std::move(val).template as<value_t>());
}
return true;
}
};
}

View File

@@ -0,0 +1,648 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <string>
#include <type_traits>
#include <utility>
#include "../common/types.hpp"
#include "extensions.hpp"
namespace json::_jsonization_helper
{
template <typename value_t>
struct is_optional_t : public std::false_type
{
};
template <typename value_t>
struct is_optional_t<std::optional<value_t>> : public std::true_type
{
};
template <typename value_t>
inline constexpr bool is_optional_v = is_optional_t<value_t>::value;
struct next_is_optional_t
{
};
struct next_override_key_t
{
const char* key;
};
struct next_state_t
{
bool is_optional = false;
const char* override_key = nullptr;
};
struct va_arg_end
{
};
template <typename tag_t>
struct is_tag_t : public std::false_type
{
};
template <>
struct is_tag_t<next_is_optional_t> : public std::true_type
{
};
template <>
struct is_tag_t<next_override_key_t> : public std::true_type
{
};
struct dumper
{
void _to_json(json::object&, va_arg_end) const {}
template <typename... rest_t>
void _to_json(json::object& result, const char* key, rest_t&&... rest) const
{
_to_json(result, next_state_t {}, key, std::forward<rest_t>(rest)...);
}
template <
typename var_t,
typename... rest_t,
typename _ = std::enable_if_t<!is_tag_t<var_t>::value, void>>
void _to_json(
json::object& result,
next_state_t state,
const char* key,
const var_t& var,
rest_t&&... rest) const
{
if (state.override_key) {
key = state.override_key;
}
if constexpr (is_optional_v<var_t>) {
if (!state.is_optional) {
throw exception("std::optional must be used with MEO_OPT");
}
if (var.has_value()) {
result.emplace(key, var.value());
}
}
else {
result.emplace(key, var);
}
_to_json(result, std::forward<rest_t>(rest)...);
}
template <typename... rest_t>
void _to_json(
json::object& result,
next_state_t state,
const char*,
next_is_optional_t,
rest_t&&... rest) const
{
state.is_optional = true;
_to_json(result, state, std::forward<rest_t>(rest)...);
}
template <typename... rest_t>
void _to_json(
json::object& result,
next_state_t state,
const char*,
next_override_key_t override_key,
rest_t&&... rest) const
{
state.override_key = override_key.key;
_to_json(result, state, std::forward<rest_t>(rest)...);
}
};
struct checker
{
bool _check_json(const json::value&, std::string&, va_arg_end) const { return true; }
template <typename... rest_t>
bool _check_json(
const json::value& in,
std::string& error_key,
const char* key,
rest_t&&... rest) const
{
return _check_json(in, error_key, next_state_t {}, key, std::forward<rest_t>(rest)...);
}
template <
typename var_t,
typename... rest_t,
typename _ = std::enable_if_t<!is_tag_t<var_t>::value, void>>
bool _check_json(
const json::value& in,
std::string& error_key,
next_state_t state,
const char* key,
const var_t&,
rest_t&&... rest) const
{
if (state.override_key) {
key = state.override_key;
}
auto opt = in.find(key);
if constexpr (is_optional_v<var_t>) {
if (!state.is_optional) {
throw exception("std::optional must be used with MEO_OPT");
}
if (opt && !opt->is<typename var_t::value_type>()) {
error_key = key;
return false;
}
}
else {
if (state.is_optional) {
if (opt && !opt->is<var_t>()) {
error_key = key;
return false;
} // is_optional, ignore key not found
}
else if (!opt || !opt->is<var_t>()) {
error_key = key;
return false;
}
}
return _check_json(in, error_key, std::forward<rest_t>(rest)...);
}
template <typename... rest_t>
bool _check_json(
const json::value& in,
std::string& error_key,
next_state_t state,
const char*,
next_is_optional_t,
rest_t&&... rest) const
{
state.is_optional = true;
return _check_json(in, error_key, state, std::forward<rest_t>(rest)...);
}
template <typename... rest_t>
bool _check_json(
const json::value& in,
std::string& error_key,
next_state_t state,
const char*,
next_override_key_t override_key,
rest_t&&... rest) const
{
state.override_key = override_key.key;
return _check_json(in, error_key, state, std::forward<rest_t>(rest)...);
}
};
struct loader
{
bool _from_json(const json::value&, std::string&, va_arg_end) const { return true; }
template <typename... rest_t>
bool
_from_json(const json::value& in, std::string& error_key, const char* key, rest_t&&... rest)
{
return _from_json(in, error_key, next_state_t {}, key, std::forward<rest_t>(rest)...);
}
template <
typename var_t,
typename... rest_t,
typename _ = std::enable_if_t<!is_tag_t<var_t>::value, void>>
bool _from_json(
const json::value& in,
std::string& error_key,
next_state_t state,
const char* key,
var_t& var,
rest_t&&... rest)
{
if (state.override_key) {
key = state.override_key;
}
auto opt = in.find(key);
if constexpr (is_optional_v<var_t>) {
if (!state.is_optional) {
throw exception("std::optional must be used with MEO_OPT");
}
if (opt && !opt->is<typename var_t::value_type>()) {
error_key = key;
return false;
}
if (opt) {
var = std::move(opt)->as<typename var_t::value_type>();
}
else {
var = std::nullopt;
}
}
else {
if (state.is_optional) {
if (opt && !opt->is<var_t>()) {
error_key = key;
return false;
} // is_optional, ignore key not found
}
else if (!opt || !opt->is<var_t>()) {
error_key = key;
return false;
}
if (opt) {
var = std::move(opt)->as<var_t>();
}
}
return _from_json(in, error_key, std::forward<rest_t>(rest)...);
}
template <typename... rest_t>
bool _from_json(
const json::value& in,
std::string& error_key,
next_state_t state,
const char*,
next_is_optional_t,
rest_t&&... rest)
{
state.is_optional = true;
return _from_json(in, error_key, state, std::forward<rest_t>(rest)...);
}
template <typename... rest_t>
bool _from_json(
const json::value& in,
std::string& error_key,
next_state_t state,
const char*,
next_override_key_t override_key,
rest_t&&... rest)
{
state.override_key = override_key.key;
return _from_json(in, error_key, state, std::forward<rest_t>(rest)...);
}
};
} // namespace json::_jsonization_helper
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
#endif
namespace json::_private_macro
{
#define _MEOJSON_STRINGIZE(arg) _MEOJSON_STRINGIZE1(arg)
#define _MEOJSON_STRINGIZE1(arg) _MEOJSON_STRINGIZE2(arg)
#define _MEOJSON_STRINGIZE2(arg) #arg
#define _MEOJSON_CONCATENATE(arg1, arg2) _MEOJSON_CONCATENATE1(arg1, arg2)
#define _MEOJSON_CONCATENATE1(arg1, arg2) _MEOJSON_CONCATENATE2(arg1, arg2)
#define _MEOJSON_CONCATENATE2(arg1, arg2) arg1##arg2
#define _MEOJSON_EXPAND(x) x
#define _MEOJSON_FOR_EACH_1(pred, x) pred(x)
#define _MEOJSON_FOR_EACH_2(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_1(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_3(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_2(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_4(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_3(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_5(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_4(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_6(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_5(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_7(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_6(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_8(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_7(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_9(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_8(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_10(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_9(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_11(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_10(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_12(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_11(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_13(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_12(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_14(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_13(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_15(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_14(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_16(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_15(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_17(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_16(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_18(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_17(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_19(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_18(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_20(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_19(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_21(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_20(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_22(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_21(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_23(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_22(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_24(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_23(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_25(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_24(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_26(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_25(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_27(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_26(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_28(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_27(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_29(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_28(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_30(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_29(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_31(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_30(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_32(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_31(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_33(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_32(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_34(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_33(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_35(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_34(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_36(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_35(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_37(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_36(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_38(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_37(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_39(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_38(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_40(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_39(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_41(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_40(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_42(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_41(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_43(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_42(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_44(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_43(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_45(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_44(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_46(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_45(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_47(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_46(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_48(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_47(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_49(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_48(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_50(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_49(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_51(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_50(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_52(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_51(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_53(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_52(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_54(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_53(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_55(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_54(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_56(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_55(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_57(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_56(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_58(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_57(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_59(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_58(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_60(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_59(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_61(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_60(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_62(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_61(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_63(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_62(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH_64(pred, x, ...) \
pred(x) _MEOJSON_EXPAND(_MEOJSON_FOR_EACH_63(pred, __VA_ARGS__))
#define _MEOJSON_ARG_COUNT(...) \
_MEOJSON_EXPAND(_MEOJSON_ARG_COUNT1( \
0, \
##__VA_ARGS__, \
64, \
63, \
62, \
61, \
60, \
59, \
58, \
57, \
56, \
55, \
54, \
53, \
52, \
51, \
50, \
49, \
48, \
47, \
46, \
45, \
44, \
43, \
42, \
41, \
40, \
39, \
38, \
37, \
36, \
35, \
34, \
33, \
32, \
31, \
30, \
29, \
28, \
27, \
26, \
25, \
24, \
23, \
22, \
21, \
20, \
19, \
18, \
17, \
16, \
15, \
14, \
13, \
12, \
11, \
10, \
9, \
8, \
7, \
6, \
5, \
4, \
3, \
2, \
1, \
0))
#define _MEOJSON_ARG_COUNT1( \
_0, \
_1, \
_2, \
_3, \
_4, \
_5, \
_6, \
_7, \
_8, \
_9, \
_10, \
_11, \
_12, \
_13, \
_14, \
_15, \
_16, \
_17, \
_18, \
_19, \
_20, \
_21, \
_22, \
_23, \
_24, \
_25, \
_26, \
_27, \
_28, \
_29, \
_30, \
_31, \
_32, \
_33, \
_34, \
_35, \
_36, \
_37, \
_38, \
_39, \
_40, \
_41, \
_42, \
_43, \
_44, \
_45, \
_46, \
_47, \
_48, \
_49, \
_50, \
_51, \
_52, \
_53, \
_54, \
_55, \
_56, \
_57, \
_58, \
_59, \
_60, \
_61, \
_62, \
_63, \
_64, \
N, \
...) \
N
#define _MEOJSON_FOR_EACH_(N, pred, ...) \
_MEOJSON_EXPAND(_MEOJSON_CONCATENATE(_MEOJSON_FOR_EACH_, N)(pred, __VA_ARGS__))
#define _MEOJSON_FOR_EACH(pred, ...) \
_MEOJSON_EXPAND( \
_MEOJSON_FOR_EACH_(_MEOJSON_EXPAND(_MEOJSON_ARG_COUNT(__VA_ARGS__)), pred, __VA_ARGS__))
#define _MEOJSON_VARNAME(x) _MEOJSON_CONCATENATE(_meojson_jsonization_, x)
#define _MEOJSON_KEY_VALUE(x) _MEOJSON_STRINGIZE(x), x,
} // namespace json::_private_macro
#define MEO_TOJSON(...) \
json::value to_json() const \
{ \
json::object result; \
json::_jsonization_helper::dumper()._to_json( \
result, \
_MEOJSON_EXPAND(_MEOJSON_FOR_EACH(_MEOJSON_KEY_VALUE, __VA_ARGS__)) \
json::_jsonization_helper::va_arg_end {}); \
return result; \
}
#define MEO_CHECKJSON(...) \
bool check_json(const json::value& _MEOJSON_VARNAME(in)) const \
{ \
std::string _MEOJSON_VARNAME(error_key); \
return check_json(_MEOJSON_VARNAME(in), _MEOJSON_VARNAME(error_key)); \
} \
bool check_json( \
const json::value& _MEOJSON_VARNAME(in), \
std::string& _MEOJSON_VARNAME(error_key)) const \
{ \
return json::_jsonization_helper::checker()._check_json( \
_MEOJSON_VARNAME(in), \
_MEOJSON_VARNAME(error_key), \
_MEOJSON_EXPAND(_MEOJSON_FOR_EACH(_MEOJSON_KEY_VALUE, __VA_ARGS__)) \
json::_jsonization_helper::va_arg_end {}); \
}
#define MEO_FROMJSON(...) \
bool from_json(const json::value& _MEOJSON_VARNAME(in)) \
{ \
std::string _MEOJSON_VARNAME(error_key); \
return from_json(_MEOJSON_VARNAME(in), _MEOJSON_VARNAME(error_key)); \
} \
bool from_json( \
const json::value& _MEOJSON_VARNAME(in), \
std::string& _MEOJSON_VARNAME(error_key)) \
{ \
return json::_jsonization_helper::loader()._from_json( \
_MEOJSON_VARNAME(in), \
_MEOJSON_VARNAME(error_key), \
_MEOJSON_EXPAND(_MEOJSON_FOR_EACH(_MEOJSON_KEY_VALUE, __VA_ARGS__)) \
json::_jsonization_helper::va_arg_end {}); \
}
#define MEO_JSONIZATION(...) \
_MEOJSON_EXPAND(MEO_TOJSON(__VA_ARGS__)) \
_MEOJSON_EXPAND(MEO_CHECKJSON(__VA_ARGS__)) \
_MEOJSON_EXPAND(MEO_FROMJSON(__VA_ARGS__))
#define MEO_OPT json::_jsonization_helper::next_is_optional_t {},
#define MEO_KEY(key) json::_jsonization_helper::next_override_key_t { key },
#if defined(__clang__)
#pragma clang diagnostic pop // -Wgnu-zero-variadic-macro-arguments
#endif

View File

@@ -1,96 +1,228 @@
## v5.1.0
## v5.25.0
### 依\~赖\~大\~更\~新\~ | Highlights
在这个版本,我们大幅更新了项目的依赖库,优化了 MAA 的性能,~~所以老电脑可能要更新运行库了。~~
**我们还为官网和 API 节点优化了网络,大幅优化了访问速度**
#### 自动战斗方面
我们对【自动战斗】功能进行了一些改动,主要包括:
* 牛牛现在会自动识别作业集内各个作业的干员编组情况,如果上一份作业的干员编组与当前作业的一致,牛牛就不再重复进行干员编组了,从而节省时间
* 战斗列表部分,对各个作业的设置按键的鼠标按键逻辑进行了调整:点击左键将可以查看该作业的说明和干员配置需求,点击右键将直接提取该作业并关闭战斗列表功能(即只打该作业)
#### 基建换班方面
我们优化了基建换班中与基建技能有关的功能:
* 我们为所有没有设置效率数据的基建技能都设置了效率数据,这样牛牛在【基建换班】任务中就能更好地为干员不全的玩家选择合适的基建技能了(但还是把 U 酱拿掉了,~~U 酱那么可爱为什么要工作~~
* 如果【基建换班】任务处于「自定义基建配置」模式,且牛牛正在工作中,那么班次将不再随时间切换,避免牛牛工作到一半班次被切了而产生的各种问题
* 如果【基建换班】任务处于「队列轮换」模式,那么牛牛将不再进入未勾选的设施
* 我们调整了会客室技能的排序逻辑,现在会优先选择更容易获得尚未拥有的线索的技能
#### 其他方面
我们增加了一些小的改动,值得注意的有:
* 我们在【自动肉鸽】任务中优化了丰川祥子相关招募策略 ~~saki酱、saki酱、saki酱~~
* 牛牛在【生息演算】任务中将会自动识别当前的存档状态与任务的设置是否一致,如果不一致将会提示你检查存档状态
* 当你设置 Mirror酱的 CDK 后MAA 将会显示 CDK 的剩余有效时间,方便你掌握有效期
----
In this version, we have significantly updated the project's dependency libraries and optimized MAA's performance. ~~So you may need to update their runtime libraries if you use old computers.~~
**We have also optimized the network for the official website and API nodes, greatly improving access speed.**
#### *Copilot* Improvements
We have made some adjustments to the *Copilot* feature, which mainly include:
* MAA will now automatically recognize the operator formation in each job within the job set. If the operator formation of the previous job matches that of the current job, MAA will no longer repeat the operator squading process, thereby saving time.
* In the Battle list section, the mouse button logic for each job's settings button has been adjusted: left-clicking will allow you to view the job's description and operator formation requirements, while right-clicking will directly extract that job and disable the combat list function (i.e., only run that specific operation).
#### *Base* Improvements
We have optimized the base skill-related functions in *Base* task:
* We have set efficiency data for all base skills that previously lacked that data, allowing MAA to better select suitable base skills for doctors with incomplete operator rosters during the *Base* task (though we did remove U-Offcial, ~~U-Offcial is so cute, why should she work~~)
* If the *Base* task is in Custom Base Mode and the MAA is currently running, Base Plan will no longer switch over time to avoid various issues caused by interrupting the MAA's work by switching the Base Plan when MAA is running.
* If the *Base* task is in One-click Rotation Mode, the MAA will no longer enter unchecked facilities.
* We adjusted the sorting logic for reception room skills, now prioritizing skills that are more likely to obtain clues not yet owned.
#### Other Aspects
We've made some minor changes worth noting:
* [CN ONLY] In the *Auto I.S.* task, we've optimized the recruitment strategy related to Togawa Sakiko ~~Saki-chan, Saki-chan, Saki-chan~~
* In the *Reclamation Algorithm* task, MAA will automatically detect whether the current save status matches the mission settings. If they don't match, it will prompt you to check your save status.
* After setting MirrorChyan's CDK, MAA will display the remaining validity period of the CDK, making it easier for you to track its expiration
----
以下是详细内容:
### 新增 | New
- 生息演算2 (#8190) (Mac 版本需点加号手动添加) @SherkeyXD @hguandl @ABA2396
- 开放每日免费单抽功能 (#8185) @SherkeyXD
- 新增只购买折扣信用商品白名单商品除外和少于300信用点停止购物的选项 (#7659) @lpowo @status102
- 基建领取专精功能 (#7754) @broken-paint @Constrat
- 合成玉签到task (#8223) @Sherkey @status102
- 抽卡提示不许勾下次不再提示 @ABA2396
- 运行 ReclamationAlgorithm 时默认运行 Reclamation2 而不是旧演算 (#8229) @horror-proton @ABA2396
- 强制定时启动添加提示对话框并可选是否显示窗口 (#8062) @moomiji
- 在自动编队过程中缺少干员时停止并记录 (#8051) @KevinT3Hu
* CustomTask 增加任务存在检测 @status102
* core 崩溃后下次启动时 ui 输出提示 (#14022) @ABA2396 @momomochi987
* 给自定义任务添加 ScreenshotTaskPlugin 插件 @ABA2396
* 战斗列表点击作业时自动关闭列表, 原逻辑迁移至鼠标右键 @status102
* 添加基建计划 ToolTip 提示 @ABA2396
* 添加信息获取失败时的提示 @ABA2396
* CDK 倒计时显示 @ABA2396
* 成就设置中的图标颜色可以随着主题色动态更新 @ABA2396
* 添加 CDK 到期时间显示 @ABA2396
* 添加 ResourceReferenceHelper允许绑定 前后景色 key @ABA2396
* 自动战斗多作业支持保存干员组内编入的干员 (#14095) @status102
* cli 支持新版战斗列表以及悖论模拟 (#14154) @wangl-cc
* 为官网首页添加多语言支持 (#13943) @lucienshawls @momomochi987 @Manicsteiner @pre-commit-ci[bot] @Constrat
* RunningState 统一状态变更事件 (#14141) @ABA2396
* 生息盐酸任务添加对错误模式 (有/无存档) 的提示 (#14131) @Alan-Charred
* custom clang (#14102) @neko-para
* allow single copilot task execution @status102
* convert ResourceUpdater to ubuntu-latest (#14076) @Constrat
* support build resource updater @neko-para
* use coreml OCR for apple (#14108) @MistEO
### 改进 | Improved
- 更新文档到.net8 @ABA2396
- 移除CopilotTask不必要的传参 @status102
- 更新部分step的版本 @SherkeyXD
- 增加账号切换时登录键点击重试 @status102
- 远程控制对非 https 连接仅提出警告 (#8061) @Sherkey
- 肉鸽适配新干员用法 (#8273) @Lancarus
- 肉鸽投资后结束本次战斗 (#8268) @status102
- 优化肉鸽投资速度及输出 (#8177) @status102
- 调整生息演算任务 @status102
- 增加生稀盐酸跳过等待 @status102
- 全反选排除生息演算 @ABA2396
- Mac 全部启用任务时排除生息演算 @Hao Guan
- 优化可变位置文字识别 @ABA2396
- 部分需重启生效的选项添加重启确认弹窗 @ABA2396
- 缓存待部署区识别减少CPU占用 (#8275) @status102
- ScreenCost截图失败次数为0时不返回fault_times字段 @status102
- 优化基建领取专精 (#8207) @broken-paint
* 更新基建技能效率 @ABA2396
* wpf 自动战斗列表中作业设置按钮左键单击还原为解析指定作业,新增行为修改至右键,解析作业并关闭列表 @status102
* 优化更新设置中的徽标显示和逻辑 @ABA2396
* add --parallel to cmake workflows @Constrat
* 更新 markdownlint 规则 @SherkeyXD
* 依赖大更新 (#13908) @MistEO @status102 @pre-commit-ci[bot]
* 优化干员识别动画显示效果 @ABA2396
* 加个try先 @status102
* remove resource from smoke testing use the default location, do not duplicate @Constrat
### 修复 | Fix
- 未开启吐司通知时仍弹出通知 @ABA2396
- 生息演算开局教程对话有概率卡住 @status102
- 修复无限提示远控地址为空的问题 @Sherkey
- 连续截图出错30次 / 启动时连续截图出错10次 导致MAA崩溃 (#8280) @status102
- 写剪贴板时应该用Unicode而不是ANSI (#8204) @Immueggpain
- 修复肉鸽存款余额ocr错误 @status102
- 修复干员小满概率性识别为`小/满` @status102
- 延长进图等待时间 @ABA2396
- 生息演算卡在主界面 @ABA2396
- 修复没有赠送次数时单抽任务报错的问题 (#8233) @SherkeyXD
- 修复生息演算部分情况下无法跳过开局对话 @status102
- 尝试修复剩余理智连战次数无法选择 @status102
- 干员识别修正: 红集 -> 红隼 @aur3l14no
- 修复更新后弹窗错误 @ABA2396
- 修复生息演算在卡顿情况下无法正常退出关卡 @ABA2396
- 限制连续战斗次数调整失败重试次数 @status102
- 生息演算卡在进入第四日 @ABA2396
- screencap failure with amdgpu on some emulators (even with GeneralWithoutScreencapErr) (#8225) @aur3l14no
- 修复部分分辨率下无法识别删除存档 @ABA2396
- 内测版 wpf tag 错误 @ABA2396
- 内测版修改ui版本号 @ABA2396
- 修复模拟器自动检测失败时可能导致WpfGui崩溃 (#8288) @status102
- gui.log 无法显示完整版本号 @ABA2396
* 修复 cmake copy_and_add_rpath_library 的失败逻辑 (#14097) @litwak913
* 刷开局奖励只选票券时行为异常 @ABA2396
* 自动编队缺少干员输出的额外换行 @status102
* Copilot多任务编队时编队设置残留 @status102
* 自定义基建换班的班次不会随时间切换 @ABA2396
* "统一 WpfGui 工作目录"后,配置为外服无法运行 MAA @ABA2396
* 移除 debug_demo (原Sample) 的对应 resource 额外查找逻辑 (#14081) @status102 @MistEO
* 统一 WpfGui 工作目录 (#14072) @MistEO @pre-commit-ci[bot] @ABA2396 @status102
* 重构依赖后 MaaWpfGui 的 resource 路径丢失 (#14077) @status102
* 停止中或者空闲状态不允许点击停止按钮 @ABA2396
* 鲍勃杂货店拥有四叶草化石且无抗干扰值时卡住 @ABA2396
* 无法收取太鼓达人联动主题会客室信息板信用 @ABA2396
* cdk 过期时间超过 2038 年会爆炸(但 10000 年还是会爆炸 @ABA2396
* maa 变成前文明产物了 @ABA2396
* 糊一下 debug_demo 资源路径读取 @MistEO
* 修复 wpf gui 一些 resource path 读取 @MistEO
* 入暂亭特殊选项 @Saratoga-Official
* 特里蒙旅行社特派团多选项 @Saratoga-Official
* IS5 同心 @Daydreamer114
* 选择技能时可能会点出描述文字 @ABA2396
* 基建使用队列轮换时如果未勾选对应设施则不进入 @ABA2396
* 重构后无法使用刷开局刷仅精二 @ABA2396
* 部分背景下 mujica 主题无法进入对应功能 @ABA2396
* 萨米肉鸽刷源石锭可能卡在预见的密文板 @ABA2396
* 允许生息演算任务反复点击存档位置直到画面改变 (#14005) @Alan-Charred
* 肉鸽助战无法刷新 @Saratoga-Official
* minitouch 触控 wait ms @ABA2396
* 复核自定义干员时等待游戏动画 @ABA2396
* 自动战斗无法读取下拉列表中的作业 @ABA2396
* 成就列表解锁时间显示颜色错误 @ABA2396
* GO 导航 @ABA2396
* 勾选启动后直接运行时无法自动切换基建排班表 @ABA2396
* 网络连接错误的情况下读取了本地缓存也提示了获取热更成功 @ABA2396
* 萨米肉鸽未通关结局时探寻前路卡住 @Saratoga-Official
* 文档站首页在窄屏下的响应式设计 (#14166) @lucienshawls
* 暂时修复无法读取过去的评论的问题 (#14163) @lucienshawls
* 为什么 mujikca 的图黑的不够纯粹 @ABA2396
* 肉鸽在结算界面卡死 (#14145) @Saratoga-Official @pre-commit-ci[bot]
* CopilotTask 参数可选项存在性检查 @status102
* 异格推王的基建加成错误 @Saratoga-Official
* 调低 MacOS PlayCover 下对 InfrastControl 识别的阈值 (#14139) @Alan-Charred
* CurrentConfig 未刷新 @status102
* CurrentConfig 悬空 @status102
* 拥有全干员的情况下重启后进入干员识别界面不会自动选中选项卡 @ABA2396
* 修复 DataGrid 虚拟化下 Tab 导航异常 @ABA2396
* 萨卡兹肉鸽未通关结局时原初异途卡住 @Saratoga-Official
* 肉鸽深入探索无法退出结算界面 (#14123) @Saratoga-Official
* typo @Constrat
* type number for nightly ota @Constrat
* smoke testing upload logs @Constrat
* move smoke testing working dir @Constrat
* add component for install libcxx only @neko-para
* prevent caching in non-dev branches @Constrat
* stuck on max trust EN @Constrat
* pthread linking problem @neko-para
* nightly package zip @MistEO
* global resource path @MistEO
* linux cross compiling (#14048) @neko-para @pre-commit-ci[bot]
* remove opencv highgui again @MistEO
* remove opencv highgui @MistEO
* build error of ASST_DEBUG @MistEO
* Sami floor detection 3 Thanks again @lin4289 on discord @Constrat
* EN Roguelike@ChooseOperConfirm (#14033) @Daydreamer114
* Sami floor detection 2 Thanks again @lin4289 on discord @Constrat
* Sami floor detection Thanks @lin4289 on discord @Constrat
* smoke-testing script @Constrat
* wrong default on type number @Constrat
* Eye For an Eye encounter IS2 EN @Constrat
* SettingsViewModel Idle @ABA2396
* download to v5 with necessary fix (#14122) @Constrat
### 文档 | Docs
* 维护信用作战相关功能及其文档 (#14013) @Alan-Charred
* 修复序号问题 @SherkeyXD
* 更新文档 cmake 配置 @MistEO
* 微调文档 @MistEO
* 完善文档站的代码检查和涉及的文本替换 (#14156) @lucienshawls @pre-commit-ci[bot]
* 完善自动肉鸽和其它文档中的部分内容 (#13924) @lucienshawls @Constrat @Manicsteiner
* 切换文档主题至 vuepress-theme-plume (#13821) @SherkeyXD @lucienshawls @MistEO
* typo @MistEO
* reapply eebe0a9 (#14036) @wangl-cc
* remove weblate @MistEO
### 其他 | Other
- 修复Mac生息演算任务名 @Hao Guan
- ScreencapCost输出失败次数 @status102
- fix typo and undefined behavior of minmax @Horror Proton
- 生息演算高级设置文本框增加换行 @status102
- EasterEggs 前两次点击不生效 @ABA2396
- 抽卡风险提示 @ABA2396
- 生息演算提示文本调整 @status102
- 移除肉鸽结算输出多余空格 @status102
- Update release-nightly-ota.yml @ABA2396
- 更新界面文字 (#8206#8214#8218) @AnnAngela
- fix appimage cross build issue @Horror Proton
- 更新文档 (#8283) @Rbqwow
- 添加等宽字体的备用字体 @SherkeyXD
- added regex for module-reclamation (#8302) @Constrat
- 升级依赖移除package-lock.json @SherkeyXD
- 更新连战文档 (#8308) @Rbqwow
### For Overseas
##### YoStarJP
- YoStarJP ocr fix shamare, ansel, nien (#8194) @Manicsteiner
- YoStarJP ocr fix #8180 (#8184) @Manicsteiner
- YoStarJP 理想都市 navigation (#8263) @Manicsteiner
- YoStarJP ocr fix (#8260) @Manicsteiner
##### YoStarKR
- YoStarKR 理想都市 navigation (#8265) @HX3N
- YoStarKR ocr fix (假日威龙陈/苍苔/青枳/淬羽赫默 etc) (#8246) @HX3N
- YoStarKR update StageAnnihilation.png (#8239) @HX3N
- YoStarKR ocr fix (#8236) @HX3N
- modified ko-kr.xaml (#8235) @HX3N
- YoStarKR add training template image and text (#8295) @HX3N
* 调整 锏 基建技能效率 @ABA2396
* 自定义基建配置时间仍在有效期内时不检查其他时间段 @ABA2396
* 界园萨卡兹肉鸽招募休谟斯优先级 @Saratoga-Official
* 调整 y 存图时间间隔 @ABA2396
* 调整定时器触发逻辑 @ABA2396
* 调整未检测到模拟器的输出 @ABA2396
* 按时间切换基建配置不在任务运行中或任务开始前切换 @ABA2396
* 调整刷新助战日志 @ABA2396
* 调整界面颜色 @ABA2396
* 肉鸽丰川祥子招募策略 (#14035) @Saratoga-Official
* 繁中服「大荒」介面主題 (#14064) @momomochi987 @pre-commit-ci[bot]
* 删除一些遗留文件 @MistEO
* 再糊点注释 @MistEO
* 糊点注释 @MistEO
* 管理员权限启动额外判断是否开启 UAC @ABA2396
* 调整会客室中更容易获得线索板上尚未拥有的线索的技能优先级 @ABA2396
* 基建把 u酱 ban 了 @ABA2396
* 特征匹配过程函数拆入analyze() @status102
* 繁中服「相見歡」活動導航 (#14137) @momomochi987
* remove -DINSTALL_RESOURCES @Constrat
* gitignore @status102
* where and how did this come from? @Constrat
* tweak workflow + remove .sln (#14074) @Constrat @neko-para
* remove ninja from ci.yml @Constrat
* restore older cache utilization for ci.yml (#14068) @Constrat
* update interface.json @neko-para
* update linux tutorial (en) @neko-para
* EN @Constrat
* remove MaaDeps @MistEO
* bump maa-cli to 0.5.8 (#14032) @wangl-cc
* BrightPointAnalyzer -> PixelAnalyzer (#13915) @Alan-Charred
* mujika -> mujica (#14000) @weinibuliu
* remove SyncRes @MistEO
* use std::format instead of sprintf (#14107) @MistEO @pre-commit-ci[bot]
* fix build warning (#14176) @soundofautumn
* rename RecognizerViewModel -> ToolboxViewModel (#14177) @soundofautumn
* YostarJP ocr fix (#14134) @Manicsteiner
* file header @status102
* fix build warning (#14120) @soundofautumn

17
CITATION.cff Normal file
View File

@@ -0,0 +1,17 @@
# This CITATION.cff file was generated with cffinit.
# Visit https://bit.ly/cffinit to generate yours today!
cff-version: 1.2.0
title: MaaAssistantArknights
message: >-
If you use this software, please cite it using the
metadata from this file.
type: software
authors:
- name: Maa Team
website: 'https://maa.plus/'
date-start: '2021-07-10'
repository-code: >-
https://github.com/MaaAssistantArknights/MaaAssistantArknights/
url: 'https://maa.plus/'
license: AGPL-3.0-only

View File

@@ -1,154 +1,61 @@
cmake_minimum_required(VERSION 3.21)
project(MaaAssistantArknights)
cmake_minimum_required(VERSION 3.28)
project(MAA)
if (NOT CMAKE_BUILD_TYPE)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
endif ()
endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
option(BUILD_TEST "build a demo" OFF)
option(BUILD_WPF_GUI "build MaaWpfGui" ${WIN32})
option(BUILD_DEBUG_DEMO "build debug demo" OFF)
option(BUILD_XCFRAMEWORK "build xcframework for macOS app" OFF)
option(BUILD_UNIVERSAL "build both arm64 and x86_64 on macOS" OFF)
option(BUILD_SMOKE_TEST "build smoke_test" OFF)
option(INSTALL_PYTHON "install python ffi" OFF)
option(INSTALL_RESOURCE "install resource" OFF)
option(INSTALL_DEVEL "install development files" OFF)
option(INSTALL_THIRD_LIBS "install third party libraries" ON)
option(USE_MAADEPS "use third-party libraries built by MaaDeps" ON)
option(WITH_THRIFT "build with thrift" OFF)
option(INSTALL_FLATTEN "do not use bin lib include directory" ON)
option(WITH_EMULATOR_EXTRAS "build with emulator extras" ${WIN32})
option(WITH_HASH_VERSION "generate version from git hash" OFF)
include(${PROJECT_SOURCE_DIR}/MaaDeps/maadeps.cmake)
include(${PROJECT_SOURCE_DIR}/cmake/config.cmake)
include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
include(${PROJECT_SOURCE_DIR}/cmake/thrift-gen.cmake)
if(USE_MAADEPS)
include(${PROJECT_SOURCE_DIR}/MaaDeps/maadeps.cmake)
endif()
if (MSVC)
add_compile_options("/utf-8")
add_compile_options("/MP")
add_compile_options("/W4;/WX")
add_compile_options("/wd4127") # conditional expression is constant
add_compile_options("/Wv:19.35.32217") # disable warning introduced after this version
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
else ()
add_compile_options("-Wall;-Werror;-Wextra;-Wpedantic;-Wno-missing-field-initializers")
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
add_compile_options("-Wno-restrict")
endif()
endif ()
add_library(header_only_libraries INTERFACE)
target_include_directories(header_only_libraries INTERFACE 3rdparty/include)
file(GLOB_RECURSE maa_src src/MaaCore/*.cpp)
add_library(MaaCore SHARED ${maa_src})
if (WIN32)
#注意相比VS版本缺少了 -D_CONSOLE -D_WINDLL 两项
target_compile_definitions(MaaCore PRIVATE ASST_DLL_EXPORTS _UNICODE UNICODE)
endif ()
target_include_directories(MaaCore PUBLIC include PRIVATE src/MaaCore)
set(MaaCore_PUBLIC_HEADERS include/AsstCaller.h include/AsstPort.h)
target_sources(MaaCore PUBLIC ${MaaCore_PUBLIC_HEADERS})
set_target_properties(MaaCore PROPERTIES
CXX_STANDARD 20
CXX_STANDARD_REQUIRED ON
PUBLIC_HEADER "${MaaCore_PUBLIC_HEADERS}"
)
include(${PROJECT_SOURCE_DIR}/cmake/version.cmake)
if(APPLE)
set_target_properties(MaaCore PROPERTIES INSTALL_RPATH "@loader_path/")
elseif(UNIX)
set_target_properties(MaaCore PROPERTIES INSTALL_RPATH "$ORIGIN/")
endif()
if (BUILD_TEST)
add_executable(test src/Cpp/main.cpp)
set_target_properties(test PROPERTIES
CXX_STANDARD 20
CXX_STANDARD_REQUIRED ON
)
target_link_libraries(test MaaCore)
endif (BUILD_TEST)
find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs videoio)
find_package(ZLIB REQUIRED)
find_package(MaaDerpLearning REQUIRED)
find_package(asio REQUIRED)
find_package(ONNXRuntime)
find_package(cpr CONFIG REQUIRED)
if(WITH_THRIFT)
find_package(Thrift CONFIG REQUIRED)
endif(WITH_THRIFT)
target_link_libraries(MaaCore ${OpenCV_LIBS} MaaDerpLearning asio::asio ZLIB::ZLIB ONNXRuntime::ONNXRuntime cpr::cpr header_only_libraries)
if(WITH_THRIFT)
add_subdirectory(src/MaaThriftController)
target_link_libraries(MaaCore MaaThriftController)
endif(WITH_THRIFT)
if(WIN32)
target_link_libraries(MaaCore ws2_32)
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
find_package(range-v3 REQUIRED)
target_link_libraries(MaaCore range-v3::range-v3)
endif ()
if(INSTALL_DEVEL)
set(MaaCore_install_extra_args PUBLIC_HEADER DESTINATION devel/include ARCHIVE DESTINATION devel/lib)
endif()
install(TARGETS MaaCore
RUNTIME DESTINATION .
LIBRARY DESTINATION .
PUBLIC_HEADER DESTINATION .
${MaaCore_install_extra_args}
)
if(INSTALL_THIRD_LIBS AND USE_MAADEPS)
maadeps_install()
endif()
if (INSTALL_PYTHON)
install(DIRECTORY src/Python DESTINATION .)
endif (INSTALL_PYTHON)
if (INSTALL_RESOURCE)
install(DIRECTORY resource DESTINATION .)
endif (INSTALL_RESOURCE)
if (APPLE)
include(${PROJECT_SOURCE_DIR}/cmake/macos.cmake)
endif (APPLE)
endif()
# define MAA_VERSION from git
if (NOT DEFINED MAA_VERSION)
find_package(Git)
endif ()
if (NOT DEFINED MAA_VERSION AND GIT_FOUND)
execute_process(
COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
RESULT_VARIABLE result
OUTPUT_VARIABLE output
ERROR_VARIABLE err
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if (result EQUAL 0)
set(MAA_VERSION "${output}")
else ()
message(WARNING "git rev-parse returning ${result}, output:\n${err}")
endif ()
endif ()
if (NOT MAA_VERSION)
set(MAA_VERSION "DEBUG VERSION")
endif ()
message(STATUS "MAA_VERSION=${MAA_VERSION}")
add_compile_definitions(MAA_VERSION="${MAA_VERSION}")
if(INSTALL_FLATTEN)
set(MaaCore_install_flatten_args RUNTIME DESTINATION . LIBRARY DESTINATION . PUBLIC_HEADER DESTINATION .)
endif()
add_library(HeaderOnlyLibraries INTERFACE)
target_include_directories(HeaderOnlyLibraries INTERFACE 3rdparty/include)
find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs)
find_package(Boost REQUIRED CONFIG COMPONENTS system)
find_package(ZLIB REQUIRED)
find_package(fastdeploy_ppocr REQUIRED)
find_package(ONNXRuntime REQUIRED)
add_subdirectory(src/MaaCore)
if(BUILD_WPF_GUI)
include_external_msproject(MaaWpfGui ${PROJECT_SOURCE_DIR}/src/MaaWpfGui/MaaWpfGui.csproj)
add_dependencies(MaaWpfGui MaaCore)
endif()
if(INSTALL_PYTHON)
install(DIRECTORY src/Python DESTINATION .)
endif()
if(INSTALL_RESOURCE)
install(DIRECTORY resource DESTINATION .)
endif()
if(BUILD_DEBUG_DEMO OR BUILD_SMOKE_TEST)
add_subdirectory(src/Cpp)
endif()

6
LICENSE.spdx Normal file
View File

@@ -0,0 +1,6 @@
SPDXVersion: SPDX-2.3
DataLicense: CC0-1.0
PackageName: MaaAssistantArknights
PackageOriginator: Maa Team and all contributors
PackageHomePage: https://github.com/MaaAssistantArknights/MaaAssistantArknights
PackageLicenseDeclared: AGPL-3.0-only

View File

@@ -1,15 +0,0 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/UserDictionary/Words/=Arknights/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Bilibili/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Infrast/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=oper/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=opers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Pallas/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Pormpt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Rougelike/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=templ/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=thres/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Todays/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=txwy/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=vuvm/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=XYAZ/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

106
MAA.sln
View File

@@ -1,106 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32616.157
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaaWpfGui", "src\MaaWpfGui\MaaWpfGui.csproj", "{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}"
ProjectSection(ProjectDependencies) = postProject
{362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300}
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC} = {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}
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}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SyncRes", "src\SyncRes\SyncRes.csproj", "{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sample", "src\Cpp\MaaSample.vcxproj", "{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}"
ProjectSection(ProjectDependencies) = postProject
{362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300}
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC} = {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
RelWithDebInfo|ARM64 = RelWithDebInfo|ARM64
RelWithDebInfo|x64 = RelWithDebInfo|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|ARM64.ActiveCfg = Debug|ARM64
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|ARM64.Build.0 = Debug|ARM64
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|x64.ActiveCfg = Debug|x64
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|x64.Build.0 = Debug|x64
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|ARM64.ActiveCfg = Release|ARM64
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|ARM64.Build.0 = Release|ARM64
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.ActiveCfg = Release|x64
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.Build.0 = Release|x64
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|ARM64.ActiveCfg = Debug|ARM64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|ARM64.Build.0 = Debug|ARM64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|x64.ActiveCfg = Debug|x64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|x64.Build.0 = Debug|x64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|ARM64.ActiveCfg = Release|ARM64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|ARM64.Build.0 = Release|ARM64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.ActiveCfg = Release|x64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.Build.0 = Release|x64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Debug|ARM64.ActiveCfg = Debug|ARM64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Debug|ARM64.Build.0 = Debug|ARM64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Debug|x64.ActiveCfg = Debug|x64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Debug|x64.Build.0 = Debug|x64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Release|ARM64.ActiveCfg = Release|ARM64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Release|ARM64.Build.0 = Release|ARM64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Release|x64.ActiveCfg = Release|x64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.Release|x64.Build.0 = Release|x64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{8238EDB1-19BF-4E3B-AF5B-016120D59D7B}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|ARM64.ActiveCfg = Debug|ARM64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|ARM64.Build.0 = Debug|ARM64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|x64.ActiveCfg = Debug|x64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|x64.Build.0 = Debug|x64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|ARM64.ActiveCfg = Release|ARM64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|ARM64.Build.0 = Release|ARM64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|x64.ActiveCfg = Release|x64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|x64.Build.0 = Release|x64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|ARM64.ActiveCfg = Debug|ARM64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|ARM64.Build.0 = Debug|ARM64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|x64.ActiveCfg = Debug|x64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|x64.Build.0 = Debug|x64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|ARM64.ActiveCfg = Release|ARM64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|ARM64.Build.0 = Release|ARM64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.ActiveCfg = Release|x64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.Build.0 = Release|x64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4F2C0E4B-4FE9-47C6-A878-6BD2FAD8B9B2}
EndGlobalSection
EndGlobal

View File

@@ -1,117 +0,0 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GUI/@EntryIndexedValue">GUI</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SWMINIMIZE/@EntryIndexedValue">SWMINIMIZE</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=AP/@EntryIndexedValue">AP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=AP_002D/@EntryIndexedValue">AP-</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=CA/@EntryIndexedValue">CA</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=CA_002D/@EntryIndexedValue">CA-</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=CE/@EntryIndexedValue">CE</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=CE_002D/@EntryIndexedValue">CE-</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=EN/@EntryIndexedValue">EN</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=IS/@EntryIndexedValue">IS</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=JP/@EntryIndexedValue">JP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=KR/@EntryIndexedValue">KR</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=LD/@EntryIndexedValue">LD</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=LS/@EntryIndexedValue">LS</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=LS_002D/@EntryIndexedValue">LS-</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DA/@EntryIndexedValue">PR-A</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DA_002D/@EntryIndexedValue">PR-A-</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DB/@EntryIndexedValue">PR-B</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DB_002D/@EntryIndexedValue">PR-B-</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DC/@EntryIndexedValue">PR-C</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DC_002D/@EntryIndexedValue">PR-C-</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DD/@EntryIndexedValue">PR-D</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=PR_002DD_002D/@EntryIndexedValue">PR-D-</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=SK/@EntryIndexedValue">SK</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=SK_002D/@EntryIndexedValue">SK-</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=SSS/@EntryIndexedValue">SSS</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=WSA/@EntryIndexedValue">WSA</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=XYAZ/@EntryIndexedValue">XYAZ</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=acast/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Aero/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=aguard/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=amedic/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=amiya/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=apionr/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=arget/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Arknights/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=arkplanner/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=asnipe/@EntryIndexedValue">True</s:Boolean>
<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>
<s:Boolean x:Key="/Default/UserDictionary/Words/=esource/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Favourite/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=findstr/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=FLASHW/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=FLASHWINFO/@EntryIndexedValue">True</s:Boolean>
<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>
<s:Boolean x:Key="/Default/UserDictionary/Words/=netstat/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Nonfriend/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=notstationed/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=oper/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=opers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Originite/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Originium/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=originiums/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Orundum/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Orundums/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=o_FF9Fv_FF9F/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Pallas/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=pidl/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Pormpt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ppidl/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Prts/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=pwfi/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=qodana/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=rcast/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=rdfend/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=rguard/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=rmean/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=rmedic/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Roguelike/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=rsnipe/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Sami/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Screencap/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=serilog/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Showminimized/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Shownormal/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=SSS/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=STGM/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=strlen/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Stylet/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=subtask/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Suppressions/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=SWMINIMIZE/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=taskchain/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Todays/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=txwy/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ucrtbase/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=XYAZ/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Yahei/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=yituliu/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=_0020_0020_0020wp_002ELength_0020/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=_0020_003D_0020stri/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Submodule MaaDeps deleted from 1297324ea7

187
README.md
View File

@@ -1,8 +1,10 @@
<!-- markdownlint-disable -->
<div align="center">
<img alt="LOGO" src="https://cdn.jsdelivr.net/gh/MaaAssistantArknights/design@main/logo/maa-logo_512x512.png" width="256" height="256" />
<img alt="LOGO" src="./docs/.vuepress/public/images/maa-logo_512x512.png" width="256" height="256" />
# MaaAssistantArknights
# MAA
<br>
<div>
@@ -21,7 +23,9 @@
</div>
<br>
[简体中文](https://maa.plus/docs/) | [繁體中文](https://maa.plus/docs/zh-tw/) | [English](https://maa.plus/docs/en-us/) | [日本語](https://maa.plus/docs/ja-jp/) | [한국어](https://maa.plus/docs/ko-kr/)
<!-- markdownlint-restore -->
[简体中文](https://docs.maa.plus/zh-cn/) | [繁體中文](https://docs.maa.plus/zh-tw/) | [English](https://docs.maa.plus/en-us/) | [日本語](https://docs.maa.plus/ja-jp/) | [한국어](https://docs.maa.plus/ko-kr/)
MAA 的意思是 MAA Assistant Arknights
@@ -29,67 +33,66 @@ MAA 的意思是 MAA Assistant Arknights
基于图像识别技术,一键完成全部日常任务!
绝赞更新中 ✿✿ヽ(°▽°)ノ✿<br>
绝赞更新中 ✿✿ヽ(°▽°)ノ✿
</div>
## 下载与安装
请阅读 [文档](https://docs.maa.plus/zh-cn/manual/newbie.html) 后前往 [官网](https://maa.plus) 或 [Releases](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases) 下载,并参考 [新手上路](https://docs.maa.plus/zh-cn/manual/newbie.html) 进行安装。
## 亮点功能
- 刷理智,掉落识别及上传 [企鹅物流](https://penguin-stats.cn/)
- 智能基建换班,自动计算干员效率,单设施内最优解;同时也支持 [自定义排班](https://maa.plus/docs/协议文档/基建排班协议.html)
- 自动公招,可选使用加急许可,一次全部刷完!公招数据上传 [企鹅物流](https://penguin-stats.cn/result/stage/recruit/recruit)[一图流](https://yituliu.site/maarecruitdata)
- 支持手动识别公招界面,方便对高星公招做出选择 ~~(你的这个高姿回费出的是推王呢还是推王呢)~~
- 支持识别干员列表,统计已有和未有干员(还能为手动识别公招界面提供已有潜能数据提示);
- 支持识别养成材料,并导出至 [企鹅物流刷图规划](https://penguin-stats.cn/planner)[明日方舟工具箱](https://arkn.lolicon.app/#/material) 计算缺少的养成材料;
- 访问好友、收取信用及购物、领取日常奖励等,一键全日常自动长草
- 肉鸽全自动刷源石锭和蜡烛,自动识别干员及练度
- 选择作业 JSON 文件,自动抄作业, [视频演示](https://www.bilibili.com/video/BV1H841177Fk/)
- 仓库识别并支持导出至 [企鹅物流刷图规划器](https://penguin-stats.cn/planner), [明日方舟工具箱](https://arkn.lolicon.app/#/material), [ARK-NIGHTS 干员培养表](https://ark-nights.com/settings)
- 刷理智,掉落识别及上传 [企鹅物流](https://penguin-stats.cn/)[一图流](https://ark.yituliu.cn/)
- 智能基建换班,自动计算干员效率,单设施内最优解;同时也支持 [自定义排班](https://docs.maa.plus/zh-cn/protocol/base-scheduling-schema.html)
- 自动公招,可选使用加急许可,一次全部刷完!公招数据自动上传 [企鹅物流](https://penguin-stats.cn/result/stage/recruit/recruit)[一图流](https://ark.yituliu.cn/survey/maarecruitdata)
- 支持手动识别公招界面,方便对高星公招做出选择 ~~(你的这个高回费出的是推王呢还是推王呢)~~
- 支持识别干员列表,统计已有和未有干员及潜能,并在公招识别显示
- 支持识别养成材料,并导出至 [企鹅物流刷图规划](https://penguin-stats.cn/planner)[明日方舟工具箱](https://arkntools.app/#/material)、[ARK-NIGHTS 干员培养表](https://ark-nights.com/settings)
- 访问好友、收取信用及购物、领取日常奖励等,一键全日常自动长草
- 肉鸽全自动刷源石锭和等级,自动烧水和凹直升,智能识别干员及练度
- 选择作业 JSON 文件,自动抄作业, [视频演示](https://www.bilibili.com/video/BV1H841177Fk/)
- 支持 C, Python, Java, Rust, Golang, Java HTTP, Rust HTTP 等多种接口,方便集成调用,自定义你的 MAA
话不多说,看图!<br>
<!-- markdownlint-disable -->
![zh1](https://user-images.githubusercontent.com/9762652/259595058-1529207a-ef3d-4eca-a016-4759eb534c6e.png)
![zh2](https://user-images.githubusercontent.com/9762652/259594965-882b61e6-bf31-40c1-8c03-3f51f82a0d42.png)
![zh3](https://user-images.githubusercontent.com/9762652/259594874-07abdd9f-33f0-4446-8da3-799849bf7328.png)
![zh4](https://user-images.githubusercontent.com/9762652/259594649-c08b6558-7d17-45a8-9ba0-3ebc9a6f5589.png)
<details><summary>话不多说,看图!</summary>
## 下载地址
<picture>
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/images/zh-cn/readme/1-dark.png">
<img alt="zh1" src="./docs/.vuepress/public/images/zh-cn/readme/1-light.png">
</picture>
<picture>
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/images/zh-cn/readme/2-dark.png">
<img alt="zh2" src="./docs/.vuepress/public/images/zh-cn/readme/2-light.png">
</picture>
<picture>
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/images/zh-cn/readme/3-dark.png">
<img alt="zh3" src="./docs/.vuepress/public/images/zh-cn/readme/3-light.png">
</picture>
<picture>
<source media="(prefers-color-scheme: dark)" srcset="./docs/.vuepress/public/images/zh-cn/readme/4-dark.png">
<img alt="zh4" src="./docs/.vuepress/public/images/zh-cn/readme/4-light.png">
</picture>
- [稳定版/公测版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases)
- [内测版](https://github.com/MaaAssistantArknights/MaaRelease/releases)
</details>
<!-- markdownlint-restore -->
## 使用说明
### 基本说明
### 功能介绍
1. 请根据 [模拟器和设备支持情况](https://maa.plus/docs/用户手册/模拟器和设备支持),进行对应的操作;
2. 修改模拟器分辨率为 `16:9` 比例,最低 `1280 * 720`,最高 `2K`<br>
对于国际服(美服)玩家,由于界面布局、字号等问题,我们则建议您将分辨率修改为 `1920 * 1080`
3. 开始使用吧!
更多使用说明请参考 [详细介绍](https://maa.plus/docs/用户手册/详细介绍.html)
### 常见问题
- 软件一打开就闪退;
- 连接错误、不知道 adb 路径怎么填写;
- 连接成功了,但没反应;
- 如何连接自定义端口;
- 下载速度慢,且镜像站无法打开网页;
- 下载到一半提示“登陆”/“鉴权”;
- 连接正常,任务开始了,但是没反应。
请参考 [常见问题](https://maa.plus/docs/用户手册/常见问题.html)
请参阅 [用户手册](https://docs.maa.plus/zh-cn/manual/)。
### 外服支持
目前国际服(美服)、日服、韩服、繁中服的绝大部分功能均已支持。但由于外服用户较少及项目人手不足,很多功能并没有进行全面的测试,所以请自行体验。<br>
若您遇到了 Bug或对某个功能有强需求欢迎在 [Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues) 和 [讨论区](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更;或加入我们一起建设 MAA请参 [外服适配教程](#外服适配)
目前国际服(美服)、日服、韩服、繁中服的绝大部分功能均已支持。但由于外服用户较少及项目人手不足,很多功能并没有进行全面的测试,所以请自行体验。
若您遇到了 Bug或对某个功能有强需求欢迎在 [Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues) 和 [讨论区](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更;或加入我们一起建设 MAA请参 [外服适配教程](https://docs.maa.plus/zh-cn/develop/overseas-client-adaptation.html)
### CLI支持
### CLI 支持
MAA 支持命令行界面CLI操作支持 LinuxmacOS 和 Windows可用于自动化脚本或在无图形界面的服务器上使用。请参 [CLI 使用指南](https://maa.plus/docs/用户手册/CLI使用指南.html)
MAA 支持命令行界面CLI操作支持 LinuxmacOS 和 Windows可用于自动化脚本或在无图形界面的服务器上使用。请参 [CLI 使用指南](https://docs.maa.plus/zh-cn/manual/cli/)
## 加入我们
@@ -97,8 +100,7 @@ MAA 支持命令行界面CLI操作支持 LinuxmacOS 和 Windows
**目前项目组非常缺前端大佬,若您有相关经验,欢迎加入我们!**
- 全新框架:[MaaFramework](https://github.com/MaaAssistantArknights/MaaFramework)
- 全新 GUI[MaaX](https://github.com/MaaAssistantArknights/MaaX)
- 全新框架:[MaaFramework](https://github.com/MaaXYZ/MaaFramework)
- [作业站](https://prts.plus) 前端:[maa-copilot-frontend](https://github.com/MaaAssistantArknights/maa-copilot-frontend)
- [作业站](https://prts.plus) 后端:[MaaBackendCenter](https://github.com/MaaAssistantArknights/MaaBackendCenter)
- [官网](https://maa.plus)[前端](https://github.com/MaaAssistantArknights/maa-website)
@@ -106,56 +108,45 @@ MAA 支持命令行界面CLI操作支持 LinuxmacOS 和 Windows
### 多语言 (i18n)
MAA 支持多国语言,并使用 Weblate 进行本地化管理。如果您通晓多门语言,欢迎前往 [MAA Weblate](https://weblate.maa-org.net) 帮助我们进行翻译。
MAA 以中文(简体)为第一语言,翻译词条均以中文(简体)为准。
[![Weblate](https://weblate.maa-org.net/widgets/maa-assistant-arknights/zh_Hans/maa-wpf-gui/multi-auto.svg)](https://weblate.maa-org.net/engage/maa-assistant-arknights/zh_Hans/)
### 参与开发
### Windows
#### Windows
1. 下载预构建的第三方库
请参阅 [开始开发](https://docs.maa.plus/zh-cn/develop/development.html)。
```cmd
python maadeps-download.py
```
#### Linux | macOS
2. 使用 Visual Studio 2022 打开 `MAA.sln`,右键 `MaaWpfGui`,设为启动项目
3. VS 上方配置选择 `RelWithDebInfo` `x64` (如果编译 Release 包 或 ARM 平台,请忽略这步)
4. 右键 `MaaWpfGui` - 属性 - 调试 - 启用本地调试(这样就能把断点挂到 C++ Core 那边了)
5. (可选)若准备提交 PR建议启用 [clang-format 支持](https://maa.plus/docs/开发文档/开始开发.html#在-visual-studio-中启用-clang-format)
请参阅 [Linux 编译教程](https://docs.maa.plus/zh-cn/develop/linux-tutorial.html)。
### Linux | macOS
请参考 [Linux 编译教程](https://maa.plus/docs/开发文档/Linux编译教程.html)
### API
#### API
- [C 接口](include/AsstCaller.h)[集成示例](src/Cpp/main.cpp)
- [Python 接口](src/Python/asst/asst.py)[集成示例](src/Python/sample.py)
- [Golang 接口](src/Golang/)[集成示例](src/Golang/maa/maa.go)
- [Dart 接口](src/Dart/)
- [Golang 接口](src/Golang)[集成示例](src/Golang/maa/maa.go)
- [Dart 接口](src/Dart)
- [Java 接口](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)[集成示例](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java)
- [Java HTTP 接口](src/Java/Readme.md)
- [Rust 接口](src/Rust/src/maa_sys/)[HTTP 接口](src/Rust)
- [TypeScript 接口](https://github.com/MaaAssistantArknights/MaaAsstElectronUI/tree/main/packages/main/coreLoader)
- [Woolang 接口](src/Woolang/maa.wo)[集成示例](src/Woolang/main.wo)
- [集成文档](https://maa.plus/docs/协议文档/集成文档.html)
- [回调消息协议](https://maa.plus/docs/协议文档/回调消息协议.html)
- [任务流程协议](https://maa.plus/docs/协议文档/任务流程协议.html)
- [自动抄作业协议](https://maa.plus/docs/协议文档/战斗流程协议.html)
- [Rust 接口](src/Rust/src/maa_sys)[HTTP 接口](src/Rust)
- [TypeScript 接口](https://github.com/MaaAssistantArknights/MaaX/tree/main/packages/main/coreLoader)
- [Woolang 接口](src/Woolang/maa.wo)[集成示例](src/Woolang/demo.wo)
- [集成文档](https://docs.maa.plus/zh-cn/protocol/integration.html)
- [回调消息协议](https://docs.maa.plus/zh-cn/protocol/callback-schema.html)
- [任务流程协议](https://docs.maa.plus/zh-cn/protocol/task-schema.html)
- [自动抄作业协议](https://docs.maa.plus/zh-cn/protocol/copilot-schema.html)
### 外服适配
#### 外服适配
请参 [外服适配教程](https://maa.plus/docs/开发文档/外服适配教程.html),对于国服已支持的功能,绝大部分的外服适配工作仅需要截图 + 简单的 JSON 修改即可。
请参 [外服适配教程](https://docs.maa.plus/zh-cn/develop/overseas-client-adaptation.html),对于国服已支持的功能,绝大部分的外服适配工作仅需要截图 + 简单的 JSON 修改即可。
### 想参与开发,但不太会用 GitHub?
#### 想参与开发,但不太会用 GitHub?
[GitHub Pull Request 流程简述](https://maa.plus/docs/开发文档/开始开发.html#github-pull-request-流程简述)
[GitHub Pull Request 流程简述](https://docs.maa.plus/zh-cn/develop/development.html#github-pull-request-流程简述)
### Issue bot
#### Issue bot
请参 [Issue bot 使用方法](https://maa.plus/docs/开发文档/IssueBot使用方法.html)
请参 [Issue Bot 使用方法](https://docs.maa.plus/zh-cn/develop/issue-bot-usage.html)
## 致谢
@@ -168,46 +159,52 @@ MAA 以中文(简体)为第一语言,翻译词条均以中文(简体)
- 机器学习加速器:[onnxruntime](https://github.com/microsoft/onnxruntime)
- ~~关卡掉落识别:[企鹅物流识别](https://github.com/penguin-statistics/recognizer)~~
- 地图格子识别:[Arknights-Tile-Pos](https://github.com/yuanyan3060/Arknights-Tile-Pos)
- C++ JSON库[meojson](https://github.com/MistEO/meojson.git)
- C++ JSON 库:[meojson](https://github.com/MistEO/meojson.git)
- C++ 运算符解析器:[calculator](https://github.com/kimwalisch/calculator)
- ~~C++ base64编解码[cpp-base64](https://github.com/ReneNyffenegger/cpp-base64)~~
- ~~C++ base64 编解码:[cpp-base64](https://github.com/ReneNyffenegger/cpp-base64)~~
- C++ 解压压缩库:[zlib](https://github.com/madler/zlib)
- C++ Gzip封装[gzip-hpp](https://github.com/mapbox/gzip-hpp)
- 安卓触控事件器:[minitouch](https://github.com/openstf/minitouch)
- C++ Gzip 封装:[gzip-hpp](https://github.com/mapbox/gzip-hpp)
- 安卓触控事件器:[Minitouch](https://github.com/DeviceFarmer/minitouch)
- 安卓触控事件器:[MaaTouch](https://github.com/MaaAssistantArknights/MaaTouch)
- WPF MVVM框架[Stylet](https://github.com/canton7/Stylet)
- WPF控件库[HandyControl](https://github.com/HandyOrg/HandyControl) -> [HandyControls](https://github.com/ghost1372/HandyControls)
- WPF MVVM 框架:[Stylet](https://github.com/canton7/Stylet)
- WPF 控件库:[HandyControl](https://github.com/HandyOrg/HandyControl) -> [HandyControls](https://github.com/ghost1372/HandyControls)
- C# 日志:[Serilog](https://github.com/serilog/serilog)
- C# JSON库[Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) & [System.Text.Json](https://github.com/dotnet/runtime)
- C# JSON 库:[Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) & [System.Text.Json](https://github.com/dotnet/runtime)
- ~~下载器:[aria2](https://github.com/aria2/aria2)~~
### 数据源
- ~~公开招募数据:[明日方舟工具箱](https://www.bigfun.cn/tools/aktools/hr)~~
- ~~干员及基建数据:[PRTS明日方舟中文WIKI](http://prts.wiki/)~~
- ~~干员及基建数据:[PRTS Wiki](http://prts.wiki/)~~
- 关卡数据:[企鹅物流数据统计](https://penguin-stats.cn/)
- 游戏数据及资源:[明日方舟客户端素材](https://github.com/yuanyan3060/ArknightsGameResource)
- ~~游戏数据:[《明日方舟》游戏数据](https://github.com/Kengxxiao/ArknightsGameData)~~
- 游戏数据:[《明日方舟》Yostar游戏数据](https://github.com/ArknightsAssets/ArknightsGamedata)
### 贡献/参与者
感谢所有参与到开发/测试中的朋友们,是大家的帮助让 MAA 越来越好! (\*´▽`)
[![Contributors](https://contributors-img.web.app/image?repo=MaaAssistantArknights/MaaAssistantArknights&max=114514&columns=15)](https://github.com/MaaAssistantArknights/MaaAssistantArknights/graphs/contributors)
[![Contributors](https://contributors-img.web.app/image?repo=MaaAssistantArknights/MaaAssistantArknights&max=105&columns=15)](https://github.com/MaaAssistantArknights/MaaAssistantArknights/graphs/contributors)
## 声明
- 本软件使用 [GNU Affero General Public License v3.0 only](https://spdx.org/licenses/AGPL-3.0-only.html) 开源,并附带额外 [用户协议](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/terms-of-service.md)。
- 本软件 logo 并非使用 AGPL 3.0 协议开源,[耗毛](https://weibo.com/u/3251357314)、vie 两位画师及软件全体开发者保留所有权利。不得以 AGPL 3.0 协议已授权为由在未经授权的情况下使用本软件 logo不得在未经授权的情况下将本软件 logo 用于任何商业用途。
- 本软件开源、免费,仅供学习交流使用。若您遇到商家使用本软件进行代练并收费,可能是设备与时间等费用,产生的问题及后果与本软件无关。
### DirectML 支持说明
本软件支持 GPU 加速功能,其在 Windows 平台上依赖于 Microsoft 提供的独立组件 [DirectML](https://learn.microsoft.com/en-us/windows/ai/directml/)。DirectML 并非本项目的开源部分,也不受 AGPL 3.0 的约束。为方便用户,我们随安装包附带了一个未经修改的 DirectML.dll 文件。如果您无需 GPU 加速功能,可安全删除该 DLL 文件,软件的核心功能仍可正常运行。
## 广告
用户交流 QQ 群:[MAA 使用 & 粥游交流 QQ 群](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html)<br>
用户交流 TG 群:[Telegram 群](https://t.me/+Mgc2Zngr-hs3ZjU1)<br>
自动战斗 JSON 作业分享:[prts.plus](https://prts.plus) 或 [抄作业.com](http://抄作业.com)<br>
Bilibili 直播间:[直播间](https://live.bilibili.com/2808861) 每晚直播敲代码,近期很长一段时间应该都是在写本软件~<br>
用户交流 QQ 群:[MAA 使用 & 粥游交流 QQ 群](https://api.maa.plus/MaaAssistantArknights/api/qqgroup/index.html)
Discord 服务器: [邀请链接](https://discord.gg/23DfZ9uA4V)
用户交流 TG 群:[Telegram 群](https://t.me/+Mgc2Zngr-hs3ZjU1)
自动战斗 JSON 作业分享:[prts.plus](https://prts.plus)
Bilibili 直播间:[MrEO 直播间](https://live.bilibili.com/2808861) 直播敲代码 & [MAA-Official 直播间](https://live.bilibili.com/27548877) 游戏/杂谈
技术群(舟无关、禁水):[内卷地狱!(QQ 群)](https://jq.qq.com/?_wv=1027&k=ypbzXcA2)<br>
开发者群:[QQ 群](https://jq.qq.com/?_wv=1027&k=JM9oCk3C)<br>
技术群(舟无关、禁水):[内卷地狱!(QQ 群)](https://jq.qq.com/?_wv=1027&k=ypbzXcA2)
开发者群:[QQ 群](https://jq.qq.com/?_wv=1027&k=JM9oCk3C)
如果觉得软件对你有帮助,帮忙点个 Star 吧!~(网页最上方右上角的小星星),这就是对我们最大的支持了!

View File

@@ -1,7 +0,0 @@
:; set -eo pipefail
:; SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
:; ${SCRIPT_DIR}/build.sh "$@"
:; exit $?
@ECHO OFF
powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0build.ps1" %*

View File

@@ -1,69 +0,0 @@
[CmdletBinding()]
Param(
[Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
[string[]]$BuildArguments
)
Write-Output "PowerShell $($PSVersionTable.PSEdition) version $($PSVersionTable.PSVersion)"
Set-StrictMode -Version 2.0; $ErrorActionPreference = "Stop"; $ConfirmPreference = "None"; trap { Write-Error $_ -ErrorAction Continue; exit 1 }
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
###########################################################################
# CONFIGURATION
###########################################################################
$BuildProjectFile = "$PSScriptRoot\tools\MaaBuilder\MaaBuilder.csproj"
$TempDirectory = "$PSScriptRoot\\.nuke\temp"
$DotNetGlobalFile = "$PSScriptRoot\\global.json"
$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
$DotNetChannel = "Current"
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
$env:DOTNET_MULTILEVEL_LOOKUP = 0
###########################################################################
# EXECUTION
###########################################################################
function ExecSafe([scriptblock] $cmd) {
& $cmd
if ($LASTEXITCODE) { exit $LASTEXITCODE }
}
# If dotnet CLI is installed globally and it matches requested version, use for execution
if ($null -ne (Get-Command "dotnet" -ErrorAction SilentlyContinue) -and `
$(dotnet --version) -and $LASTEXITCODE -eq 0) {
$env:DOTNET_EXE = (Get-Command "dotnet").Path
}
else {
# Download install script
$DotNetInstallFile = "$TempDirectory\dotnet-install.ps1"
New-Item -ItemType Directory -Path $TempDirectory -Force | Out-Null
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
(New-Object System.Net.WebClient).DownloadFile($DotNetInstallUrl, $DotNetInstallFile)
# If global.json exists, load expected version
if (Test-Path $DotNetGlobalFile) {
$DotNetGlobal = $(Get-Content $DotNetGlobalFile | Out-String | ConvertFrom-Json)
if ($DotNetGlobal.PSObject.Properties["sdk"] -and $DotNetGlobal.sdk.PSObject.Properties["version"]) {
$DotNetVersion = $DotNetGlobal.sdk.version
}
}
# Install by channel or version
$DotNetDirectory = "$TempDirectory\dotnet-win"
if (!(Test-Path variable:DotNetVersion)) {
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
} else {
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
}
$env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
}
Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)"
ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet }
ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }

View File

@@ -1,62 +0,0 @@
#!/usr/bin/env bash
bash --version 2>&1 | head -n 1
set -eo pipefail
SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
###########################################################################
# CONFIGURATION
###########################################################################
BUILD_PROJECT_FILE="$SCRIPT_DIR/tools/MaaBuilder/MaaBuilder.csproj"
TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp"
DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
DOTNET_CHANNEL="Current"
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
export DOTNET_MULTILEVEL_LOOKUP=0
###########################################################################
# EXECUTION
###########################################################################
function FirstJsonValue {
perl -nle 'print $1 if m{"'"$1"'": "([^"]+)",?}' <<< "${@:2}"
}
# If dotnet CLI is installed globally and it matches requested version, use for execution
if [ -x "$(command -v dotnet)" ] && dotnet --version &>/dev/null; then
export DOTNET_EXE="$(command -v dotnet)"
else
# Download install script
DOTNET_INSTALL_FILE="$TEMP_DIRECTORY/dotnet-install.sh"
mkdir -p "$TEMP_DIRECTORY"
curl -Lsfo "$DOTNET_INSTALL_FILE" "$DOTNET_INSTALL_URL"
chmod +x "$DOTNET_INSTALL_FILE"
# If global.json exists, load expected version
if [[ -f "$DOTNET_GLOBAL_FILE" ]]; then
DOTNET_VERSION=$(FirstJsonValue "version" "$(cat "$DOTNET_GLOBAL_FILE")")
if [[ "$DOTNET_VERSION" == "" ]]; then
unset DOTNET_VERSION
fi
fi
# Install by channel or version
DOTNET_DIRECTORY="$TEMP_DIRECTORY/dotnet-unix"
if [[ -z ${DOTNET_VERSION+x} ]]; then
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --channel "$DOTNET_CHANNEL" --no-path
else
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "$DOTNET_VERSION" --no-path
fi
export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
fi
echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)"
"$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet
"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"

View File

@@ -1,22 +0,0 @@
# TODO: replace with cmake-generated interface file
find_path(FastDeploy_INCLUDE_DIR NAMES fastdeploy/fastdeploy_model.h)
find_library(FastDeploy_LIBRARY NAMES fastdeploy)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
FastDeploy
REQUIRED_VARS FastDeploy_LIBRARY FastDeploy_INCLUDE_DIR
)
if(FastDeploy_FOUND)
set(FastDeploy_INCLUDE_DIRS ${FastDeploy_INCLUDE_DIR})
if(NOT TARGET FastDeploy::FastDeploy)
add_library(FastDeploy::FastDeploy UNKNOWN IMPORTED)
set_target_properties(FastDeploy::FastDeploy PROPERTIES
IMPORTED_LOCATION "${FastDeploy_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${FastDeploy_INCLUDE_DIR}"
)
endif()
endif()

View File

@@ -1,20 +0,0 @@
find_path(ONNXRuntime_INCLUDE_DIR NAMES onnxruntime/core/session/onnxruntime_c_api.h)
find_library(ONNXRuntime_LIBRARY NAMES onnxruntime)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
ONNXRuntime
REQUIRED_VARS ONNXRuntime_LIBRARY ONNXRuntime_INCLUDE_DIR
)
if(ONNXRuntime_FOUND)
set(ONNXRuntime_INCLUDE_DIRS ${ONNXRuntime_INCLUDE_DIR})
if(NOT TARGET ONNXRuntime::ONNXRuntime)
add_library(ONNXRuntime::ONNXRuntime UNKNOWN IMPORTED)
set_target_properties(ONNXRuntime::ONNXRuntime PROPERTIES
IMPORTED_LOCATION "${ONNXRuntime_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${ONNXRuntime_INCLUDE_DIR}"
)
endif()
endif()

83
cmake/config.cmake Normal file
View File

@@ -0,0 +1,83 @@
set(debug_comp_defs "_DEBUG;ASST_DEBUG")
add_compile_definitions("$<$<CONFIG:Debug>:${debug_comp_defs}>")
if(APPLE)
set(CMAKE_INSTALL_RPATH "@loader_path;@executable_path")
set(CMAKE_BUILD_RPATH "@loader_path;@executable_path")
elseif(UNIX)
set(CMAKE_INSTALL_RPATH "$ORIGIN")
set(CMAKE_BUILD_RPATH "$ORIGIN")
endif()
if(MSVC)
add_compile_options("/utf-8")
add_compile_options("/MP")
add_compile_options("/W4;/WX;/Gy;/permissive-;/sdl")
add_compile_options("/wd4127") # conditional expression is constant
add_compile_options("/wd4251") # export dll with templates
add_compile_options("/DWINVER=0x0A00")
add_compile_options("/D_WIN32_WINNT=0x0A00")
# https://github.com/actions/runner-images/issues/10004 https://github.com/microsoft/STL/releases/tag/vs-2022-17.10
add_compile_definitions("_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
set(release_link_options "/OPT:REF;/OPT:ICF")
add_link_options("$<$<CONFIG:Release>:${release_link_options}>")
SET(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;")
SET(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL "MinSizeRel;Release;")
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
else()
add_compile_options("-Wall;-Werror;-Wextra;-Wpedantic;-Wno-missing-field-initializers")
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
add_compile_options("-Wno-restrict")
endif()
endif()
if(LINUX)
function(copy_and_add_rpath_library LIBNAME)
execute_process(
COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=${LIBNAME}.so.1 -target ${CMAKE_CXX_COMPILER_TARGET} --sysroot=${CMAKE_SYSROOT}
OUTPUT_VARIABLE LIB_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if("${LIB_PATH}" STREQUAL "${LIBNAME}.so.1")
message(FATAL_ERROR "Could not locate ${LIBNAME}.so.1 using compiler")
endif()
file(READ_SYMLINK "${LIB_PATH}" LINK_TARGET)
if(NOT LINK_TARGET)
set(LIB_PATH_REAL "${LIB_PATH}")
elseif(NOT IS_ABSOLUTE "${LINK_TARGET}")
get_filename_component(LIB_PATH_DIR "${LIB_PATH}" DIRECTORY)
file(REAL_PATH "${LIB_PATH_DIR}/${LINK_TARGET}" LIB_PATH_REAL)
else()
set(LIB_PATH_REAL "${LINK_TARGET}")
endif()
if(NOT EXISTS "${LIB_PATH_REAL}")
message(FATAL_ERROR "File not found: ${LIB_PATH_REAL}")
endif()
message(STATUS "${LIBNAME}.so.1 path: ${LIB_PATH_REAL}")
install(FILES "${LIB_PATH_REAL}" DESTINATION . RENAME "${LIBNAME}.so.1" COMPONENT libcxx)
get_filename_component(LIB_PATH_DIR "${LIB_PATH_REAL}" DIRECTORY)
list(APPEND CMAKE_BUILD_RPATH "${LIB_PATH_DIR}")
set(CMAKE_BUILD_RPATH "${CMAKE_BUILD_RPATH}" PARENT_SCOPE)
endfunction()
copy_and_add_rpath_library(libc++)
copy_and_add_rpath_library(libc++abi)
copy_and_add_rpath_library(libunwind)
endif()
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

View File

@@ -1,50 +0,0 @@
set(FASTDEPLOY_URL_PREFIX "https://github.com/MaaAssistantArknights/build-fastdeploy/releases/download")
set(FASTDEPLOY_TAG "gac255b8a")
set(COMPRESSED_SUFFIX ".tar.gz")
if(WIN32)
set(FASTDEPLOY_FILENAME "FastDeploy-Windows")
set(FASTDEPLOY_CHECKSUM "0a0700d4e8923bcd4c387a658e5e9a689ed9e0d114c260b11d082a2176c233d4")
elseif(APPLE)
if (CURRENT_OSX_ARCH STREQUAL "arm64")
set(FASTDEPLOY_FILENAME "FastDeploy-macOS-arm64")
set(FASTDEPLOY_CHECKSUM "28a771814d197ba8056f1fcb7cc0671facec90a8733a0dac2cf0b68a8cc36d24")
else()
set(FASTDEPLOY_FILENAME "FastDeploy-macOS-x86_64")
set(FASTDEPLOY_CHECKSUM "76e97c7e944a18eb160646fa32ac0a7e24c87751b2b127dc33454f993f6d4b97")
endif()
else()
set(FASTDEPLOY_FILENAME "FastDeploy-Linux")
set(FASTDEPLOY_CHECKSUM "4d106e5499e9b5b29426667617215ac7e4e70d2353af10caccdfdf6c1f1534a7")
endif(WIN32)
set(FASTDEPLOY_URL ${FASTDEPLOY_URL_PREFIX}/${FASTDEPLOY_TAG}/${FASTDEPLOY_FILENAME}${COMPRESSED_SUFFIX})
if (FASTDEPLOY_DIRECTORY)
set(FastDeploy_DIR ${FASTDEPLOY_DIRECTORY})
find_package(FastDeploy REQUIRED PATHS ${FastDeploy_DIR})
include_directories(${FastDeploy_INCLUDE_DIRS})
list(APPEND DEPEND_LIBS ${FastDeploy_LIBS})
else ()
download_and_decompress(${FASTDEPLOY_URL}
${CMAKE_CURRENT_BINARY_DIR}/${FASTDEPLOY_FILENAME}${COMPRESSED_SUFFIX}
${FASTDEPLOY_CHECKSUM}
${THIRD_PARTY_PATH}/install/)
set(FASTDEPLOY_FILENAME fastdeploy)
set(FastDeploy_DIR ${THIRD_PARTY_PATH}/install/${FASTDEPLOY_FILENAME})
find_package(FastDeploy REQUIRED PATHS ${FastDeploy_DIR} NO_DEFAULT_PATH)
include_directories(${FastDeploy_INCLUDE_DIRS})
list(APPEND DEPEND_LIBS ${FastDeploy_LIBS})
endif (FASTDEPLOY_DIRECTORY)
if (INSTALL_THIRD_LIBS)
install(DIRECTORY ${FastDeploy_DIR}/lib/ DESTINATION . USE_SOURCE_PERMISSIONS)
install(DIRECTORY ${ORT_LIB_PATH}/ DESTINATION . USE_SOURCE_PERMISSIONS)
install(DIRECTORY ${FastDeploy_DIR}/third_libs/install/paddle2onnx/lib/
DESTINATION . USE_SOURCE_PERMISSIONS)
endif (INSTALL_THIRD_LIBS)

View File

@@ -7,24 +7,21 @@ if (BUILD_XCFRAMEWORK)
add_custom_command(OUTPUT OpenCV.xcframework
COMMAND rm -rf OpenCV.xcframework
COMMAND xcodebuild -create-xcframework -library "${PROJECT_SOURCE_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/libopencv_world4.407.dylib" -output OpenCV.xcframework
COMMAND xcodebuild -create-xcframework -library "${PROJECT_SOURCE_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/libopencv_world4.408.dylib" -output OpenCV.xcframework
)
add_custom_command(OUTPUT ONNXRuntime.xcframework
COMMAND rm -rf ONNXRuntime.xcframework
COMMAND xcodebuild -create-xcframework -library "${PROJECT_SOURCE_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/libonnxruntime.1.14.1.dylib" -output ONNXRuntime.xcframework
COMMAND xcodebuild -create-xcframework -library "${PROJECT_SOURCE_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/libonnxruntime.1.18.0.dylib" -output ONNXRuntime.xcframework
)
add_custom_command(OUTPUT MaaDerpLearning.xcframework
COMMAND rm -rf MaaDerpLearning.xcframework
COMMAND xcodebuild -create-xcframework -library "${PROJECT_SOURCE_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/libMaaDerpLearning.dylib" -output MaaDerpLearning.xcframework
add_custom_command(OUTPUT fastdeploy_ppocr.xcframework
COMMAND rm -rf fastdeploy_ppocr.xcframework
COMMAND xcodebuild -create-xcframework -library "${PROJECT_SOURCE_DIR}/MaaDeps/runtime/${MAADEPS_TRIPLET}/libfastdeploy_ppocr.dylib" -output fastdeploy_ppocr.xcframework
)
add_custom_target(MaaXCFramework ALL
DEPENDS MaaCore MaaCore.xcframework OpenCV.xcframework ONNXRuntime.xcframework MaaDerpLearning.xcframework
DEPENDS MaaCore MaaCore.xcframework OpenCV.xcframework ONNXRuntime.xcframework fastdeploy_ppocr.xcframework
)
endif (BUILD_XCFRAMEWORK)
target_compile_options(MaaCore PRIVATE
-Wno-deprecated-declarations
-Wno-gnu-zero-variadic-macro-arguments)

View File

@@ -0,0 +1,41 @@
find_path(ONNXRuntime_INCLUDE_DIR NAMES onnxruntime/onnxruntime_c_api.h)
find_library(ONNXRuntime_LIBRARY_IMP NAMES onnxruntime)
if (WIN32)
get_filename_component(ONNXRuntime_PATH_LIB ${ONNXRuntime_LIBRARY_IMP} DIRECTORY)
find_file(ONNXRuntime_LIBRARY NAMES onnxruntime_maa.dll PATHS "${ONNXRuntime_PATH_LIB}/../bin")
find_file(ONNXRuntime_LIBRARY_IMP_DEBUG NAMES onnxruntime.lib PATHS "${ONNXRuntime_PATH_LIB}/../debug/lib")
find_file(ONNXRuntime_LIBRARY_DEBUG NAMES onnxruntime_maa.dll PATHS "${ONNXRuntime_PATH_LIB}/../debug/bin")
else ()
set(ONNXRuntime_LIBRARY ${ONNXRuntime_LIBRARY_IMP})
endif (WIN32)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
ONNXRuntime
REQUIRED_VARS ONNXRuntime_LIBRARY_IMP ONNXRuntime_INCLUDE_DIR
)
if(ONNXRuntime_FOUND)
set(ONNXRuntime_INCLUDE_DIRS ${ONNXRuntime_INCLUDE_DIR})
if(NOT TARGET ONNXRuntime::ONNXRuntime)
add_library(ONNXRuntime::ONNXRuntime SHARED IMPORTED)
set_property(TARGET ONNXRuntime::ONNXRuntime APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
if (WIN32)
set_property(TARGET ONNXRuntime::ONNXRuntime APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties(ONNXRuntime::ONNXRuntime PROPERTIES
IMPORTED_IMPLIB_RELEASE "${ONNXRuntime_LIBRARY_IMP}"
)
set_target_properties(ONNXRuntime::ONNXRuntime PROPERTIES
IMPORTED_IMPLIB_DEBUG "${ONNXRuntime_LIBRARY_IMP_DEBUG}"
IMPORTED_LOCATION_DEBUG "${ONNXRuntime_LIBRARY_DEBUG}"
)
endif (WIN32)
set_target_properties(ONNXRuntime::ONNXRuntime PROPERTIES
IMPORTED_LOCATION_RELEASE "${ONNXRuntime_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${ONNXRuntime_INCLUDE_DIR}"
)
endif()
endif()

View File

@@ -1,54 +0,0 @@
set(OPENCV_URL_PREFIX "https://github.com/MaaAssistantArknights/build-opencv/releases/download")
set(OPENCV_TAG "4.5.3")
set(COMPRESSED_SUFFIX ".tar.gz")
if(WIN32)
set(OPENCV_FILENAME "OpenCV-Windows")
set(OPENCV_CHECKSUM "bf736b243bbdaa020f139e4dfa1e4f15633f4ce7a8ad885524645e660de47a8b")
elseif(APPLE)
if (CURRENT_OSX_ARCH STREQUAL "arm64")
set(OPENCV_FILENAME "OpenCV-macOS-arm64")
set(OPENCV_CHECKSUM "31beb633c033dd4ee789ffa50911c29c9580860f9a91f334f03d8aa9c85e9700")
else()
set(OPENCV_FILENAME "OpenCV-macOS-x86_64")
set(OPENCV_CHECKSUM "249c5c97cc52257b68d35acf499b1cf1037f5e6f3b40752f82ad5abe7884bea9")
endif()
else(UNIX)
set(OPENCV_FILENAME "OpenCV-Linux")
set(OPENCV_CHECKSUM "edc4138456189c9e8bdf29114ad2be8ec152e8e31087d98e633f6cda59b141ea")
endif(WIN32)
set(OPENCV_URL ${OPENCV_URL_PREFIX}/${OPENCV_TAG}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX})
if(OPENCV_DIRECTORY)
set(OpenCV_DIR ${OPENCV_DIRECTORY})
find_package(OpenCV REQUIRED PATHS ${OpenCV_DIR})
include_directories(${OpenCV_INCLUDE_DIRS})
list(APPEND DEPEND_LIBS ${OpenCV_LIBS})
else()
download_and_decompress(${OPENCV_URL}
${CMAKE_CURRENT_BINARY_DIR}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX}
${OPENCV_CHECKSUM}
${THIRD_PARTY_PATH}/install/)
set(OPENCV_FILENAME opencv)
set(OpenCV_DIR ${THIRD_PARTY_PATH}/install/${OPENCV_FILENAME})
set(OPENCV_DIRECTORY ${OpenCV_DIR})
if (WIN32)
set(OpenCV_DIR ${OpenCV_DIR}/lib)
endif()
find_package(OpenCV REQUIRED PATHS ${OpenCV_DIR} NO_DEFAULT_PATH)
include_directories(${OpenCV_INCLUDE_DIRS})
list(APPEND DEPEND_LIBS ${OpenCV_LIBS})
endif(OPENCV_DIRECTORY)
if (INSTALL_THIRD_LIBS)
if (OpenCV_SHARED)
install(DIRECTORY ${OpenCV_INSTALL_PATH}/lib/
DESTINATION .
USE_SOURCE_PERMISSIONS PATTERN "cmake" EXCLUDE)
endif (OpenCV_SHARED)
endif (INSTALL_THIRD_LIBS)

View File

@@ -1,44 +0,0 @@
macro(GENERATE_THRIFT_LIB LIB_NAME FILENAME OUTPUTDIR SOURCES)
file(MAKE_DIRECTORY ${OUTPUTDIR})
detect_host_triplet(HOST_TRIPLET)
if (CMAKE_CROSSCOMPILING)
if (CMAKE_HOST_WIN32)
set(_host_executable_suffix ".exe")
else()
set(_host_executable_suffix "")
endif()
else()
set(_host_executable_suffix ${CMAKE_EXECUTABLE_SUFFIX})
endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/MaaDeps/vcpkg/installed/maa-${HOST_TRIPLET}/tools/thrift/thrift${_host_executable_suffix})
set(THRIFT_COMPILER ${PROJECT_SOURCE_DIR}/MaaDeps/vcpkg/installed/maa-${HOST_TRIPLET}/tools/thrift/thrift${_host_executable_suffix})
else()
find_program(THRIFT_COMPILER thrift)
endif()
if(NOT THRIFT_COMPILER)
message(FATAL_ERROR "Thrift compiler not found")
endif()
get_filename_component(THRIFT_IDL_NAME ${FILENAME} NAME_WE)
set(THRIFT_IDL_TARGET "${LIB_NAME}_${THRIFT_IDL_NAME}_idl")
set("${THRIFT_IDL_NAME}-gen-cpp"
${OUTPUTDIR}/${THRIFT_IDL_NAME}.cpp
${OUTPUTDIR}/${THRIFT_IDL_NAME}.h
${OUTPUTDIR}/${THRIFT_IDL_NAME}_types.cpp
${OUTPUTDIR}/${THRIFT_IDL_NAME}_types.h)
add_custom_command(OUTPUT ${${THRIFT_IDL_NAME}-gen-cpp}
DEPENDS ${FILENAME}
COMMAND ${THRIFT_COMPILER} --gen cpp:no_skeleton -out ${OUTPUTDIR} ${FILENAME}
VERBATIM)
add_custom_target(${THRIFT_IDL_TARGET} DEPENDS ${${THRIFT_IDL_NAME}-gen-cpp})
add_library(${LIB_NAME} STATIC ${${THRIFT_IDL_NAME}-gen-cpp})
add_dependencies(${LIB_NAME} ${THRIFT_IDL_TARGET})
set_target_properties(${LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_link_libraries(${LIB_NAME} PUBLIC thrift::thrift)
target_include_directories(${LIB_NAME} PUBLIC ${OUTPUTDIR})
set(${SOURCES} ${${SOURCES}} ${GENERATED_SOURCES} PARENT_SCOPE)
endmacro(GENERATE_THRIFT_LIB)
if (WITH_THRIFT)
add_compile_definitions(WITH_THRIFT)
endif (WITH_THRIFT)

View File

@@ -1,50 +1,73 @@
function(download_and_decompress url filename sha256_checksum decompress_dir)
if(EXISTS ${filename})
file(SHA256 ${filename} CHECKSUM_VARIABLE)
endif()
if(NOT EXISTS ${filename} OR NOT CHECKSUM_VARIABLE STREQUAL sha256_checksum)
message("Downloading file from ${url} to ${filename} ...")
file(DOWNLOAD ${url} "${filename}.tmp" SHOW_PROGRESS EXPECTED_HASH SHA256=${sha256_checksum})
file(RENAME "${filename}.tmp" ${filename})
endif()
if(NOT EXISTS ${decompress_dir})
file(MAKE_DIRECTORY ${decompress_dir})
endif()
message("Decompress file ${filename} ...")
execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf ${filename} WORKING_DIRECTORY ${decompress_dir})
if(EXISTS ${filename})
file(SHA256 ${filename} CHECKSUM_VARIABLE)
endif()
if(NOT EXISTS ${filename} OR NOT CHECKSUM_VARIABLE STREQUAL sha256_checksum)
message("Downloading file from ${url} to ${filename} ...")
file(
DOWNLOAD ${url} "${filename}.tmp"
SHOW_PROGRESS
EXPECTED_HASH SHA256=${sha256_checksum})
file(RENAME "${filename}.tmp" ${filename})
endif()
if(NOT EXISTS ${decompress_dir})
file(MAKE_DIRECTORY ${decompress_dir})
endif()
message("Decompress file ${filename} ...")
execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf ${filename} WORKING_DIRECTORY ${decompress_dir})
endfunction()
function(get_osx_architecture)
if (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
set(CURRENT_OSX_ARCH "arm64" PARENT_SCOPE)
elseif(CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
set(CURRENT_OSX_ARCH "x86_64" PARENT_SCOPE)
else()
set(CURRENT_OSX_ARCH ${CMAKE_HOST_SYSTEM_PROCESSOR} PARENT_SCOPE)
endif()
if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
set(CURRENT_OSX_ARCH
"arm64"
PARENT_SCOPE)
elseif(CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
set(CURRENT_OSX_ARCH
"x86_64"
PARENT_SCOPE)
else()
set(CURRENT_OSX_ARCH
${CMAKE_HOST_SYSTEM_PROCESSOR}
PARENT_SCOPE)
endif()
endfunction()
function(detect_host_triplet outvar)
string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" host_triplet_system)
string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" host_triplet_arch)
if(host_triplet_system STREQUAL "darwin")
set(host_triplet_system "osx")
endif()
message("host_triplet_system: ${host_triplet_system}")
message("host_triplet_arch: ${host_triplet_arch}")
if(host_triplet_arch MATCHES "(amd64|x86_64)")
set(host_triplet_arch "x64")
elseif(host_triplet_arch MATCHES "i[3456]86")
set(host_triplet_arch "x86")
elseif(host_triplet_arch MATCHES "(aarch64|armv8l|arm64)")
set(host_triplet_arch "arm64")
else()
message(FATAL_ERROR "Unrecognized CMAKE_HOST_SYSTEM_PROCESSOR: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
endif()
set(${outvar} "${host_triplet_arch}-${host_triplet_system}" PARENT_SCOPE)
endfunction()
if(APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET 13.3) # for to_chars
get_osx_architecture()
endif(APPLE)
if (APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0)
get_osx_architecture()
endif (APPLE)
if(NOT DEFINED MAADEPS_TRIPLET)
detect_maadeps_triplet(MAADEPS_TRIPLET)
endif()
# 创建资源目录链接的函数
function(create_resource_link TARGET_NAME OUTPUT_DIR)
if(WIN32)
# Windows 使用 mklink /J 创建目录链接(不需要管理员权限)
add_custom_command(
TARGET ${TARGET_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E echo "Creating resource directory link for ${TARGET_NAME}..."
COMMAND ${CMAKE_COMMAND} -E remove_directory "${OUTPUT_DIR}/resource"
COMMAND cmd /c "mklink /J \"${OUTPUT_DIR}/resource\" \"${PROJECT_SOURCE_DIR}/resource\""
COMMAND ${CMAKE_COMMAND} -E echo "Resource directory link created successfully"
COMMENT "Creating junction for resource directory for ${TARGET_NAME}"
)
else()
# Unix/Linux/macOS 使用符号链接
add_custom_command(
TARGET ${TARGET_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E echo "Creating resource directory link for ${TARGET_NAME}..."
COMMAND ${CMAKE_COMMAND} -E remove "${OUTPUT_DIR}/resource"
COMMAND ${CMAKE_COMMAND} -E create_symlink "${PROJECT_SOURCE_DIR}/resource" "${OUTPUT_DIR}/resource"
COMMAND ${CMAKE_COMMAND} -E echo "Resource directory link created successfully"
COMMENT "Creating symlink for resource directory for ${TARGET_NAME}"
)
endif()
endfunction()

27
cmake/version.cmake Normal file
View File

@@ -0,0 +1,27 @@
# define MAA_HASH_VERSION from git
set(MAA_HASH_VERSION
"DEBUG_VERSION"
CACHE STRING "maa version")
if(WITH_HASH_VERSION AND MAA_HASH_VERSION STREQUAL "DEBUG_VERSION")
find_package(Git)
if(GIT_FOUND)
execute_process(
COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
RESULT_VARIABLE result
OUTPUT_VARIABLE output
ERROR_VARIABLE err
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(result EQUAL 0)
set(MAA_HASH_VERSION "${output}")
else()
message(WARNING "git rev-parse returning ${result}, output:\n${err}")
endif()
endif()
endif()
message(STATUS "MAA_HASH_VERSION=${MAA_HASH_VERSION}")
add_compile_definitions(MAA_VERSION="${MAA_HASH_VERSION}")

View File

@@ -223,6 +223,39 @@ MD052: true
# MD053/link-image-reference-definitions - Link and image reference definitions should be needed
MD053:
# Ignored definitions
ignored_definitions: [
"//"
]
ignored_definitions: ["//"]
# MD054/link-image-style - Link and image style
MD054:
# Allow autolinks
autolink: true
# Allow collapsed reference links and images
collapsed: true
# Allow full reference links and images
full: true
# Allow inline links and images
inline: true
# Allow shortcut reference links and images
shortcut: true
# Allow URLs as inline links
url_inline: true
# MD055/table-pipe-style - Table pipe style
MD055:
# Table pipe style
style: "consistent"
# MD056/table-column-count - Table column count
MD056: true
# MD057 - Table column count inconsistencies with table header column count
# (Not documented in official rules list - MD057 appears to be missing or deprecated)
# MD058/blanks-around-tables - Tables should be surrounded by blank lines
MD058: true
# MD059/descriptive-link-text - Link text should be descriptive
MD059:
false
# Prohibited link texts
#prohibited_texts: ["click here", "here", "link", "more"]

2
docs/.prettierignore Normal file
View File

@@ -0,0 +1,2 @@
**/pnpm-lock.yaml
**/*.md

40
docs/.prettierrc.js Normal file
View File

@@ -0,0 +1,40 @@
module.exports = {
printWidth: 120,
tabWidth: 2,
useTabs: false,
bracketSpacing: true,
bracketSameLine: false,
endOfLine: 'auto',
semi: false,
singleQuote: true,
trailingComma: 'all',
arrowParens: 'always',
overrides: [
{
files: ['**/*.ts'],
options: {
semi: true,
},
},
{
files: ['**/*.*css'],
options: {
singleQuote: false,
},
},
{
files: ['**/*.yml', '**/*.yaml'],
options: {
parser: 'yaml',
singleQuote: false,
},
},
{
files: ['**/*.json'],
options: {
tabWidth: 4,
},
},
],
}

Some files were not shown because too many files have changed in this diff Show More