Compare commits

..

7368 Commits

Author SHA1 Message Date
pre-commit-ci[bot]
8d434fb84c chore: Auto update by pre-commit hooks [skip changelog] 2025-05-19 14:38:02 +00:00
status102
8681039067 chore: 点剧情
bug好多,再想想
2025-05-19 22:36:33 +08:00
status102
dd36585b16 fix: 逻辑取反 2025-05-19 20:59:56 +08:00
pre-commit-ci[bot]
b58917c74b chore: Auto update by pre-commit hooks [skip changelog] 2025-05-19 06:55:01 +00:00
status102
633fe73993 feat: 自动战斗自动点击剧情 2025-05-19 14:52:16 +08:00
status102
aa46d668d1 fix: 关卡内教程降低暂停按钮亮度,导致无法识别 2025-05-19 12:45:38 +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
Constrat
4b004340c7 fix: Temporary Rhodes Island Employee regex YostarEN 2024-02-13 15:13:28 +01:00
Rbqwow
eead8b8b86 chore: 移除bot中多余的生息演算关键词 (#8323) 2024-02-13 14:30:35 +01:00
HX3N
65a0b3f91b chore: YoStarKR modified BattleStageOcr for 引航者试炼#03 (#8325)
chore: YoStarKR added ocrReplace for 引航者试炼3
2024-02-13 14:28:39 +01:00
status102
91b0b8e4f4 fix: 修复投资系统出错时,余额ocr可能出错 (#8326)
fix: 修复投资系统出错时,余额ocr可能出错
2024-02-13 20:09:18 +08:00
status102
793c7b115e fix: 修复投资系统出错时,余额ocr可能出错 2024-02-13 19:41:32 +08:00
status102
f84ac3ce1b perf(WpfGui): 设置肉鸽投资上限为999 2024-02-13 19:25:57 +08:00
David
101474d036 ci: removed reclamation from module others 2024-02-12 22:19:28 +01:00
Constrat
4e73b07b52 chore: Auto Update Game Resources - 2024-02-12
[skip changelog]
2024-02-12 17:03:27 +00:00
SherkeyXD
1b0e74ad20 ci: 修正发版时触发的文档部署workflow 2024-02-12 23:56:03 +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
uye
4a216ddd59 Release v5.1.0 (#8313) 2024-02-12 21:38:44 +08:00
github-actions[bot]
d362e97d43 docs: Auto Update Changelogs of v5.1.0 (#8314)
* docs: Auto Generate Changelog of Release v5.1.0

* doc: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-02-12 21:01:02 +08:00
youqii
41b5d81f37 perf: 优化基建领取专精 (#8207)
* fix: 将输出训练进度改为剩余时间

* fix: 删除重复代码

* fix: 修改任务roi
2024-02-12 20:22:01 +08:00
Constrat
5529c9bb3a chore: Auto Update Game Resources - 2024-02-12
[skip changelog]
2024-02-12 07:03:03 +00:00
Rbqwow
7a6542b37c docs: 更新连战文档 (#8308)
* doc: 删除遗漏的mumu6内容

* doc: 更新连战文档
2024-02-11 18:20:26 +08:00
SherkeyXD
17ac702c8f docs: 升级依赖,移除package-lock.json 2024-02-11 00:19:46 +08:00
uye
8dca4d31d0 fix: gui.log 无法显示完整版本号 2024-02-10 23:32:16 +08:00
David
efae540915 ci: added regex for module-reclamation (#8302) 2024-02-10 23:22:09 +08:00
HX3N
0d9b6294ab chore: YoStarKR add training template image and text (#8295) 2024-02-09 13:17:04 +01:00
Constrat
9b193c6f45 chore: Auto Update Game Resources - 2024-02-09
[skip changelog]
2024-02-09 05:43:26 +00:00
status102
ebbde85b85 perf(MaaCore): ScreenCost截图失败次数为0时,不返回fault_times字段 2024-02-08 17:04:13 +08:00
status102
4fcfa56b18 fix: 修复自动检测失败时可能导致WpfGui崩溃 (#8288)
fix #8287
2024-02-08 16:21:13 +08:00
status102
de9fdccde1 perf: 缓存待部署区识别,减少CPU占用 (#8275)
perf: 优化待部署区识别,减少CPU占用
2024-02-08 15:57:23 +08:00
SherkeyXD
40292de864 docs: 添加等宽字体的备用字体 2024-02-08 13:10:38 +08:00
uye
4682d427e0 Release v5.1.0-beta.2 (#8227) 2024-02-08 13:04:10 +08:00
uye
5cb73e630a doc: Update CHANGELOG.md 2024-02-08 13:03:37 +08:00
uye
d0c96b4b84 style: 格式化代码 2024-02-08 11:53:35 +08:00
SmilingPie
2a7f0db5e8 feat: stop and log when missing operators during formarion (#8051)
* feat: stop and log when missing operators during formarion

* format: update format

* style: remove tab
2024-02-08 11:50:20 +08:00
枫雨
d6f7a0ecea feat: 强制定时启动添加提示对话框并可选是否显示窗口 (#8062)
* feat: 强制定时启动添加提示对话框

* feat: 强制定时启动前显示窗口
2024-02-08 11:44:26 +08:00
uye
238d886f0e fix: fix typo 2024-02-08 11:39:14 +08:00
github-actions[bot]
a937afa06f docs: Auto Update Changelogs of v5.1.0-beta.2 (#8267)
* docs: Auto Generate Changelog of Release v5.1.0-beta.2

* docs: cahngelog

* docs: changelog

* docs: changelog

截止369b57e

* docs: cahngelog

* 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-02-08 11:30:43 +08:00
Horror Proton
7ef36afaf9 feat: 运行 ReclamationAlgorithm 时默认运行 Reclamation2 而不是旧演算 (#8229)
* feat: run `Reclamation2` from `ReclamationTask`

* feat: add param to choose Reclamation theme

* chore: c# 生息演算2入口改为ReclamationAlgorithm

* chore: UI生息演算添加"theme"参数

* chore: 漏掉的参数

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-02-08 11:26:15 +08:00
Rbqwow
68ddca7f6c docs: 更新文档 (#8283)
* docs: 更新文档

* doc: 添加转义

* doc: 仅支持16:9

* doc: 加速器问题未必要重启电脑

* doc: 再改加速器说明

* doc: 再改
2024-02-08 10:54:57 +08:00
Constrat
c7ab89c307 chore: Auto Update Game Resources - 2024-02-07
[skip changelog]
2024-02-07 20:02:58 +00:00
Rbqwow
1746417a78 chore: 移除mumu6 (#8284) 2024-02-08 03:17:06 +08:00
Sherkey
bab14c12bd docs: 升级依赖,调整视觉效果 (#8202)
docs: 升级依赖,调整视觉效果
2024-02-07 23:27:38 +08:00
status102
369b57ec38 fix: 生息演算开局教程对话有概率卡住 2024-02-07 20:06:33 +08:00
status102
b8a30971fe perf(MaaCore): ScreencapCost输出失败次数 2024-02-07 19:54:29 +08:00
Horror Proton
6949ba9d14 fix: fix typo and undefined behavior of minmax 2024-02-07 19:09:56 +08:00
SherkeyXD
1d39b0fbdc fix: 修复无限提示远控地址为空的问题 2024-02-07 18:40:19 +08:00
status102
3cd26fa7db fix: 启动时连续截图出错10次导致MAA崩溃 (#8280)
fix: 启动时连续截图出错10次导致MAA崩溃
2024-02-07 18:13:15 +08:00
status102
13d8f74704 fix: 启动时连续截图出错10次导致MAA崩溃 2024-02-07 18:09:27 +08:00
Sherkey
86b4e710fd feat: 合成玉签到task (#8223)
feat: 合成玉签到task
2024-02-07 13:25:41 +08:00
status102
aef2fc0d14 perf: 优化待部署区识别,减少CPU占用 2024-02-07 10:35:25 +08:00
Sherkey
438e59ee47 feat: 远程控制对非 https 连接仅提出警告 (#8061)
feat: 远程控制对非 https 连接仅提出警告
2024-02-07 10:16:57 +08:00
Constrat
d3e3ecd423 chore: added ICChapterToIC template for EN
[skip changelog]
2024-02-06 19:22:36 +01:00
Hao Guan
6edfb842e0 fix: 修复Mac生息演算任务名 2024-02-07 02:15:20 +08:00
Hao Guan
858238c5e9 fix: Mac 全部启用任务时排除生息演算 2024-02-07 02:06:07 +08:00
Lancarus
95f5c5569e perf: 肉鸽适配新干员用法 (#8273)
* perf: 肉鸽适配新干员用法
2024-02-07 01:35:21 +08:00
Constrat
02f12795b5 chore: Auto Update Game Resources - 2024-02-06
[skip changelog]
2024-02-06 17:25:04 +00:00
Horror Proton
f1270fcd3c fix: fix appimage cross build issue
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8216
2024-02-07 00:10:47 +08:00
Constrat
b5a1030f73 i18n(chore): tweaked spacing EN
[skip changelog]
2024-02-06 16:45:13 +01:00
SherkeyXD
b22edbb92b feat: 远程控制对非 https 连接仅提出警告 2024-02-06 21:30:58 +08:00
Constrat
0df376426c chore(tools): missing json regex
[skip changelog]
2024-02-06 14:14:30 +01:00
Constrat
a1c31a47c6 chore(tools): added more ignored templates
[skip changelog]
2024-02-06 14:12:36 +01:00
SherkeyXD
77886acce0 i18n: 修正日语翻译 2024-02-06 20:52:11 +08:00
SherkeyXD
7c3a760cc2 fix: 修复幸运墙重复点击同一标签的问题 2024-02-06 20:51:49 +08:00
SherkeyXD
8a2732fa02 fix: 修正幸运墙ocr的roi范围,并移除可能误判的部分 2024-02-06 20:51:49 +08:00
SherkeyXD
f8e7a755a4 feat: wpf 添加对幸运墙任务的支持 2024-02-06 20:51:45 +08:00
SherkeyXD
32875b8bd9 refactor: 重构幸运墙任务链,添加入口检查 2024-02-06 20:50:41 +08:00
status102
54d612f42b perf: 优化Task及模板 2024-02-06 20:50:41 +08:00
status102
c7f6b42bc3 feat: 合成玉签到task 2024-02-06 20:50:41 +08:00
Constrat
e7668275c8 chore: changed EN IC text
[skip changelog]
2024-02-06 13:18:14 +01:00
Constrat
11f1c1fba7 rft(warnings): fixed task json schema warnings
[skip changelog]
2024-02-06 12:59:32 +01:00
Constrat
d0701a95b7 chore: Auto Update Game Resources - 2024-02-06
[skip changelog]
2024-02-06 11:03:14 +00:00
Constrat
2eb5e0c3ae chore: Auto Update Game Resources - 2024-02-06
[skip changelog]
2024-02-06 10:43:34 +00:00
status102
44431b865d fix: 补充肉鸽投资系统出错时余额识别替换 2024-02-06 18:31:30 +08:00
status102
c790e5cfc6 perf: 肉鸽投资后结束本次战斗 (#8268)
perf: 肉鸽投资后结束本次战斗
2024-02-06 17:39:38 +08:00
Constrat
461c638897 i18n: tweaked english translation c25c29d7dd
[skip changelog]
2024-02-06 10:35:21 +01:00
status102
56ca855f7f fix: 增加延迟以避免肉鸽放弃探索时错误匹配到开始肉鸽按钮 2024-02-06 17:34:58 +08:00
Immueggpain
b490f27b49 fix: 写剪贴板时应该用Unicode而不是ANSI (#8204) 2024-02-06 17:33:36 +08:00
status102
b60ee2d925 perf: 肉鸽投资后结束本次战斗 2024-02-06 17:32:54 +08:00
Manicsteiner
19d7705cbb chore: YoStarJP ocr fix (#8260) 2024-02-06 10:14:24 +01:00
HX3N
700e820570 chore: YoStarKR 理想都市 navigation (#8265) 2024-02-06 10:13:30 +01:00
status102
a218b3deb4 fix: 修复肉鸽存款余额ocr错误
fix #8261
2024-02-06 17:09:39 +08:00
status102
9c472f8fc7 fix: 修复干员小满概率性识别为小/满
fix #8250, fix #8264
2024-02-06 16:00:09 +08:00
status102
2691fd7130 perf: 生息演算开局教程点击加速 2024-02-06 15:53:13 +08:00
Manicsteiner
e23b5abcbe chore: YoStarJP 理想都市 navigation (#8263) 2024-02-06 15:28:24 +08:00
Constrat
8f79e405b8 chore: Auto Update Game Resources - 2024-02-06
[skip changelog]
2024-02-06 07:22:55 +00:00
uye
576af93eb2 fix: 延长进图等待时间 2024-02-06 14:26:24 +08:00
uye
730b4842b3 chore: EasterEggs 前两次点击不生效 2024-02-06 14:04:15 +08:00
uye
8b0ecb3ea1 ci: Update release-nightly-ota.yml 2024-02-06 13:49:22 +08:00
Constrat
8efdc52772 chore: Auto Update Game Resources - 2024-02-06
[skip changelog]
2024-02-06 05:42:51 +00:00
uye
7e3782433b ci: 内测版 wpf tag 错误 2024-02-06 13:33:17 +08:00
uye
1302f0885e fix: 生息演算卡在主界面
fix #8254
2024-02-06 13:28:46 +08:00
uye
504067d9c4 ci: 内测版修改ui版本号 2024-02-06 11:03:26 +08:00
uye
c25c29d7dd chore: 部分需重启生效的选项添加重启确认弹窗
fix #8259
2024-02-06 10:48:19 +08:00
HX3N
655c0c059a chore: YoStarKR ocr fix (假日威龙陈/苍苔/青枳/淬羽赫默 etc) (#8246)
chore: YoStarKR ocr fix

Due to the changes in #8070, the recognition issue with 假日威龙陈's ocr has been corrected.
also fixed the ocr that was not recognizing when changing the resolution (苍苔/青枳/淬羽赫默/琳琅诗怀雅/纯烬艾雅法拉)
2024-02-05 17:26:50 +01:00
uye
a1a182776f style: 修改变量名 2024-02-05 23:45:14 +08:00
uye
1de3b6dced feat: 抽卡提示不许不看 2024-02-05 23:39:58 +08:00
uye
7cf9c32013 chore: 抽卡风险提示 2024-02-05 23:33:18 +08:00
Sherkey
3b7fff780b fix: 修复没有赠送次数时单抽任务报错的问题 (#8233) 2024-02-05 23:26:08 +08:00
status102
b01ddac697 fix: 修复生息演算部分情况下无法跳过开局对话
Author: uye
2024-02-05 22:54:07 +08:00
uye
6c5786a672 chore: 添加注释 2024-02-05 18:34:50 +08:00
uye
99b9ee37ee chore: 抽卡提示不许勾下次不再提示 2024-02-05 18:31:06 +08:00
status102
7a25ccfcb9 fix: 尝试修复剩余理智连战次数无法选择 2024-02-05 17:29:09 +08:00
Constrat
a4fab00981 chore: Auto Update Game Resources - 2024-02-05
[skip changelog]
2024-02-05 08:42:50 +00:00
status102
b69a66ecfd perf: 优化肉鸽投资速度 (#8177)
perf: 优化肉鸽投资速度
2024-02-05 16:34:50 +08:00
aur3l14no
2d21ba3a6e fix(ocr): 干员识别修正: 红集 -> 红隼 2024-02-05 16:04:49 +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
uye
d9c55f4dcf fix: 修复更新后弹窗错误 2024-02-05 15:56:21 +08:00
uye
74a06fc732 chore: 删除多余内容 2024-02-05 15:27:30 +08:00
uye
16f0963de3 fix: 修复生息演算在卡顿情况下无法正常退出关卡
fix #8243
2024-02-05 14:29:32 +08:00
HX3N
2defbbc7ca docs: modified ko-kr.xaml (#8235)
* docs: modified ko-kr.xaml

Update ko-kr.xaml

Update ko-kr.xaml

* docs: modified (*) expression
2024-02-05 12:25:27 +08:00
status102
b12216c0ea fix: 限制连续战斗次数调整失败重试次数 2024-02-05 11:20:56 +08:00
status102
035a1b6368 fix: 修复投资结束后无法退出投资页面 2024-02-05 10:21:28 +08:00
HX3N
ede9b458c6 chore: YoStarKR update StageAnnihilation.png (#8239)
chore: update StageAnnihilation.png
2024-02-05 09:39:24 +08:00
HX3N
305a5ad973 chore: YoStarKR ocr fix (#8236)
corrected some parts where recognition was not working
2024-02-04 18:50:23 +01:00
uye
324e9e26b5 fix: 生息演算卡在进入第四日
fix #8231
2024-02-05 00:49:17 +08:00
status102
930dc26d51 fix: 修复投资超出设定上限 2024-02-04 22:45:14 +08:00
status102
fc30703cb8 perf: 优化WpfGui输出 2024-02-04 22:45:14 +08:00
status102
03d0776bd0 fix: 修复投资出错时和达到上限时的退出流程 2024-02-04 22:44:41 +08:00
status102
abe6badce2 fix: 移除WpfGui的重复输出 2024-02-04 22:44:40 +08:00
status102
5ebcb70fac fix: 修复退出投资系统条件判断 2024-02-04 22:44:40 +08:00
status102
4e0c1d0f6c perf: 优化肉鸽投资操作速度 2024-02-04 22:44:35 +08:00
status102
11689cc861 chore(WpfGui): 生息演算提示文本调整 2024-02-04 22:00:28 +08:00
aur3l14no
6277eb3a5a fix: screencap failure with amdgpu on some emulators (even with GeneralWithoutScreencapErr) (#8225)
Make `GeneralWithoutScreencapErr` write error to `/dev/null`
2024-02-04 13:59:31 +00:00
uye
60b9d671d2 fix: 修复部分分辨率下无法识别删除存档
fix #8213
2024-02-04 19:48:51 +08:00
status102
0765a0be35 perf: 生息演算高级设置文本框增加换行
link to #8218
2024-02-04 19:28:36 +08:00
uye
3ae0e78066 fix: 优化可变位置文字识别
fix #8220
2024-02-04 19:24:19 +08:00
uye
64b418c1cc chore: 全反选排除生息演算 2024-02-04 19:11:50 +08:00
status102
0ba66601d5 perf: 调整生息演算任务
Author: uye
2024-02-04 16:50:44 +08:00
status102
d299d66ff6 chore(WpfGui): 移除肉鸽结算输出多余空格 2024-02-04 16:33:26 +08:00
AnnAngela
d7fc112987 chore: Update zh-cn.xaml (#8218) 2024-02-04 07:30:08 +00:00
AnnAngela
b1d49b5643 chore: Update zh-cn.xaml (#8214) 2024-02-04 06:27:22 +00:00
status102
c17c7e5ac5 perf: 增加生稀盐酸跳过等待
Author: uye
2024-02-04 11:39:45 +08:00
AnnAngela
c4a80426d3 chore: 更新界面文字 (#8206) 2024-02-04 01:30:21 +00:00
SherkeyXD
e22aa3a217 docs: 升级依赖,调整视觉效果 2024-02-03 19:24:24 +00:00
uye
6bf368ad8f Release v5.1.0-beta.1 (#8198) 2024-02-04 02:51:47 +08:00
github-actions[bot]
36757e87d2 docs: Auto Update Changelogs of v5.1.0-beta.1 (#8199)
* docs: Auto Generate Changelog of Release v5.1.0-beta.1

* doc: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-02-04 02:50:26 +08:00
Constrat
fb6e870b7d chore: Auto Update Game Resources - 2024-02-03
[skip changelog]
2024-02-03 17:43:45 +00:00
uye
c477381edf docs: 更新文档到.net8 2024-02-04 01:40:59 +08:00
uye
db10b40170 feat: 生息演算2 (#8190)
用的custom任务,现在只会跑一遍,看看多次的逻辑加在哪里

外服的入口需要隐藏
2024-02-04 01:33:35 +08:00
SherkeyXD
3746eab179 feat: wpf添加生息演算使用提示
别急
2024-02-04 01:28:11 +08:00
SherkeyXD
bcb0a1970b feat: wpf添加生息演算的ui 2024-02-04 01:24:32 +08:00
Hao Guan
b9e47a05fb feat: Mac GUI生息演算2入口 2024-02-04 00:57:55 +08:00
uye
309793c58e fix: 消磨时间偶尔点不上 2024-02-04 00:41:02 +08:00
uye
89c5788325 fix: 未开启吐司通知时仍弹出通知 2024-02-04 00:15:22 +08:00
uye
32356773dd fix: 卡删除存档 2024-02-03 23:45:17 +08:00
uye
ff177dae6e fix: 多余的逗号 2024-02-03 23:36:06 +08:00
uye
829de5ef67 fix: 资源区识别错误 2024-02-03 23:33:58 +08:00
uye
e30ea1dac7 fix: 入口错误 2024-02-03 23:26:40 +08:00
Constrat
f2c7a8c92e chore: Auto Update Game Resources - 2024-02-03
[skip changelog]
2024-02-03 15:23:10 +00:00
uye
23d1326e6b chore: 外服排除生息演算入口 2024-02-03 23:17:43 +08:00
uye
5fc90291d9 feat: 开放每日免费单抽功能 (#8185) 2024-02-03 23:08:23 +08:00
Manicsteiner
746b5f5489 chore: YoStarJP ocr fix shamare, ansel, nien (#8194) 2024-02-03 23:04:51 +08:00
uye
413e3ee860 feat: 新增只购买折扣信用商品(白名单商品除外)的选项和少于300信用点停止购物的选项 (#7659)
* close #7466
2024-02-03 23:01:28 +08:00
uye
82c7028c74 feat: 基建领取专精功能 (#7754)
close #503
link to #7164 

@status102
2024-02-03 23:00:51 +08:00
uye
fe643754a7 perf: 优化重试逻辑 2024-02-03 22:54:16 +08:00
SherkeyXD
de865ef60e feat: 添加每日单抽功能警告 2024-02-03 22:32:02 +08:00
SherkeyXD
b81bb50ad9 feat: 添加RecruitingActivities的ui适配 2024-02-03 22:32:02 +08:00
SherkeyXD
e7371f7311 feat: MaaCore部分添加RecruitingActivities支持 2024-02-03 22:32:02 +08:00
SherkeyXD
3babfdd954 feat: 为RecruitingActivities添加返回主页的验证 2024-02-03 22:32:02 +08:00
uye
d299a50ccd perf: 优化识别位置 2024-02-03 22:31:03 +08:00
uye
1b7850fe3f feat: 无限循环 2024-02-03 21:12:43 +08:00
uye
ae4c46914f chore: 翻译 2024-02-03 20:56:30 +08:00
uye
22dcb001c9 feat: 生息演算2 2024-02-03 20:52:31 +08:00
Manicsteiner
6331e92d42 chore: YoStarJP ocr fix #8180 (#8184) 2024-02-03 13:28:33 +01:00
status102
8de092f8a6 perf(WpfGui): 移除CopilotTask不必要的传参 2024-02-03 19:23:27 +08:00
SherkeyXD
83f0610d9b ci: 更新部分step的版本 2024-02-03 17:44:59 +08:00
status102
0a67e99692 perf: 增加账号切换时登录键点击重试 2024-02-03 10:45:15 +08:00
uye
6ff39b8597 Release v5.0.0 (#8153) 2024-02-03 00:45:21 +08:00
github-actions[bot]
1deaa51123 docs: Auto Update Changelogs of v5.0.0 (#8157)
* docs: Auto Generate Changelog of Release v5.0.0

* docs: changelog

* docs: changelog overseas

* 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-02-03 00:39:20 +08:00
uye
79b1d9da42 feat: 连战次数选择 (#8159)
* feat: 连战次数选择

* fix: plugin初始化错误

* fix: 参数错误

* chore: set_params时检查series取值范围

* chore: 修改 series 取值范围

* chore: 剩余理智关卡连战次数设置为1
2024-02-03 00:36:13 +08:00
uye
cf828efbee fix: set_stage_name 回调信息错误 2024-02-03 00:29:13 +08:00
uye
d945c21d71 fix: custom base plan selection.
fix #8125
2024-02-02 18:48:41 +08:00
uye
434f1797f5 perf: 优化ConfigurationHelper 2024-02-02 12:05:59 +08:00
uye
f44dae1b78 feat: 资源更新完毕后添加自动重启(需勾选 设置-软件更新-自动安装更新包)
fix #7449
2024-02-02 12:05:59 +08:00
uye
9158528030 chore: 更新导航格式 2024-02-02 01:41:59 +08:00
Sherkey
5292c4fb98 fix: 修复OCR识别干员黍错误的问题 2024-02-02 00:23:00 +08:00
uye
d520dad86c fix: 点击 复制错误信息 报错 2024-02-02 00:18:20 +08:00
uye
f6ffd5ea87 fix: 更新吐司通知报错 2024-02-01 23:22:02 +08:00
status102
1bc32ff062 fix(MaaCore): 修正CopilotTask参数名is_adverse -> is_raid (#8126)
fix(MaaCore): 修正CopilotTask参数名`is_adverse` -> `is_raid`
2024-02-01 22:25:10 +08:00
status102
6bdc0fcef3 fix: 修正CopilotTask参数名is_adverse -->> is_raid 2024-02-01 19:13:24 +08:00
status102
5b622f7082 fix: 更正任务名 2024-02-01 19:02:56 +08:00
AnnAngela
2e9a53ea59 feat: SideStory「怀黍离」导航 (#8124) 2024-02-01 17:38:02 +08:00
Constrat
b54446b26f chore: Auto Update Game Resources - 2024-02-01
[skip changelog]
2024-02-01 08:03:10 +00:00
uye
b56eaa9481 fix: 修复更新重启后热键失效
fix #8006
2024-02-01 13:02:14 +08:00
Constrat
8a72b2add0 chore: Auto Update Game Resources - 2024-02-01
[skip changelog]
2024-02-01 04:03:24 +00:00
uye
dd97c6e1d6 ci: Update qodana.yaml 2024-02-01 11:44:29 +08:00
uye
3e2297db9f fix: 尝试修复更新重启后热键失效 2024-02-01 11:30:07 +08:00
uye
3ebe8d2cc3 fix: 尝试修复更新重启后热键失效 2024-02-01 10:42:31 +08:00
Constrat
a24e0e4bdc chore: Auto Update Game Resources - 2024-02-01
[skip changelog]
2024-02-01 02:29:34 +00:00
David
89be919ee6 docs: moved version requirement for faster triaging (#8121)
* docs: moved version requirement for faster triaging

* docs: Update cn-bug-report.yaml

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-01-31 20:08:55 +08:00
Loong
e8dae39ba2 feat: CLI 支持多天排班 2024-01-31 19:23:35 +08:00
broken_paint
6648498d7e chore: 增加TODO 2024-01-30 10:35:03 +08:00
Constrat
f2b30c363b chore: 30.1 pre stage change update SL - Open
[skip changelog]
2024-01-29 19:17:38 +01:00
uye
55fc88403e fix: vs设计器无法正常显示窗体 2024-01-29 17:09:00 +08:00
uye
1455bf01a8 feat: 允许直接复制干员识别的结果
fix #8097
2024-01-28 14:56:21 +08:00
Constrat
712308a465 chore: Auto Update Game Resources - 2024-01-27
[skip changelog]
2024-01-27 20:03:09 +00:00
liupei
e6bf27185f rft: discard constant discount roi and discount rio will be generated by shifting commodity roi 2024-01-27 02:31:20 +08:00
uye
d63f6d7b90 docs: Update cn-bug-report.yaml 2024-01-26 10:38:11 +08:00
uye
09d594442e docs: Update en-bug-report.yaml 2024-01-26 10:37:48 +08:00
Manicsteiner
f36f6dc41c chore: YoStarJP ocr fix (#8086) 2024-01-25 16:11:05 +01:00
Constrat
752c0d42e0 fix: Eyja Alter regex YostarEN
[skip changelog]
2024-01-24 21:48:07 +01:00
Manicsteiner
5d4e9c1bfc fix: YoStarJP ocr fix Chestnut, Bena (#8077) 2024-01-24 09:37:04 +01:00
David
ab58229e96 fix: new SL stages opened
[skip changelog]
2024-01-24 09:35:57 +01:00
HX3N
2497c708b2 chore: YoStarKR fixed ocr '紧急调遣' and '龙腾.(A/F/L)' (#8074)
* chore: fixed ocr '紧急调遣' and '龙腾.(A/F/L)

* chore: add 紧急调遣 ocrtext for readability
2024-01-23 23:45:40 +01:00
HX3N
4d5b6a7afd chore: YoStarKR ocrReplace modification (Infrast, Recruit, Roguelike) (#8072) 2024-01-23 17:47:31 +01:00
Constrat
f9f9c4ee13 fix: SL-8 not recognized
thanks to @Pogogo007 for pointing it out
2024-01-23 15:47:18 +01:00
HY
cf6a607a51 chore: 繁中服「吾導先路」復刻活動導航 (#8071) 2024-01-23 15:09:59 +01:00
Constrat
b303f7b847 chore: Auto Update Game Resources - 2024-01-23
[skip changelog]
2024-01-23 14:03:29 +00:00
HX3N
2f5f498f43 chore: YoStarKR "CharsNameOcrReplace" modification (#8070)
* chore: ocrReplace modification and skin error resolution

* chore: some change
2024-01-23 14:58:24 +01:00
Lancarus
d5fb81aa57 perf: 优化萨米事不过四策略 (#8059)
perf: 优化事不过四策略
2024-01-23 20:58:23 +08:00
HX3N
9a96158563 chore: YoStarKR added some missing task (#8069)
chore: add some missing tasks
2024-01-23 13:24:39 +01:00
status102
6032d0d1c8 fix: 修复刷开局模式下强制启用投资造成与UI显示不一致的错误
fix #8066
2024-01-23 17:08:49 +08:00
uye
ad3e816155 Release v5.0.0-beta.2 (#8057) 2024-01-23 16:47:56 +08:00
github-actions[bot]
f7872bb2ca docs: Auto Update Changelogs of v5.0.0-beta.2 (#8063)
* docs: Auto Generate Changelog of Release v5.0.0-beta.2

* docs: changelog

---------

Co-authored-by: status102 <status102@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-01-23 16:47:26 +08:00
Constrat
ce7f5f3f6b chore: Auto Update Game Resources - 2024-01-23
[skip changelog]
2024-01-23 07:42:55 +00:00
status102
1688884091 perf: 合并判断范围 2024-01-22 08:50:46 +08:00
status102
27ffe05aaa style: format 2024-01-22 08:39:25 +08:00
liupei
637db34306 rft: using algorithm OcrDetect instread of baseTask NumberOcrReplace to put char replacement in tasks.json and using utils::chars_to_number for str to int 2024-01-22 01:14:38 +08:00
liupei
a37a126105 docs: add missing '{' in ko-kr and ja-jp integration 2024-01-21 23:00:58 +08:00
uye
8e90f981fb feat: 肉鸽开局干员支持输入任意客户端对应名称 (#7726) 2024-01-21 16:17:46 +08:00
uye
af15c56ed5 style: 优化代码 2024-01-21 16:16:33 +08:00
uye
19b0f518aa chore: 修改StartingCoreCharTip描述 2024-01-21 16:05:44 +08:00
uye
a57d644c0e chore: 增加输入提示,修改显示内容 2024-01-21 16:05:44 +08:00
uye
64c9c41349 feat: 肉鸽开局干员支持输入任意客户端对应名称 2024-01-21 16:00:31 +08:00
uye
ea21a787b3 perf: 优化自动战斗部署栏识别条件,保全增加节能模式 (#8044)
* perf: 优化保全部署栏识别条件,增加节能模式

* fix: equal error

* chore: 跳过update改为sleep

* perf: 优化保全逻辑

* chore: 仅在开局识别干员部署费用
2024-01-21 15:30:37 +08:00
Wallsman
642014a35b [Doc]Operator JP name add for Adele 2024-01-21 09:41:46 +09:00
uye
c1082feef4 fix: 不存在tmp时不保存version 2024-01-20 15:26:40 +08:00
uye
6ca3c14b4e fix: 剩余理智关卡在限定了关卡选择刷取条件(如次数)时会吃临期理智药 2024-01-20 13:31:47 +08:00
HX3N
d1701f51d7 docs: YoStarKR translation modify (#8047)
* doc: YoStarKR translation modify

* doc: YoStarKR translation modify
2024-01-19 23:23:48 +01:00
Manicsteiner
4c6d01a96a chore: YoStarJP ocr fix Swire & Eyjafjalla Alter (#8038) 2024-01-18 16:01:39 +01:00
Constrat
be5e145c16 chore: Auto Update Game Resources - 2024-01-18
[skip changelog]
2024-01-18 09:03:02 +00:00
uye
8cd39559e4 docs: 基建排班工具链接更新
fix #8036
2024-01-18 13:58:14 +08:00
Manicsteiner
2d5f991a7c chore: YoStarJP operator name ocr fix (#7968)
* chore: YoStarJP operator name ocr fix

* chore: YoStarJP operator name ocr fixes

* chore: YoStarJP operator name ocr fix part3
2024-01-18 11:20:10 +08:00
Constrat
ce9a285f05 chore: Auto Update Game Resources - 2024-01-18
[skip changelog]
2024-01-18 01:01:10 +00:00
status102
1b53164fb5 perf: 优化wpf肉鸽结算输出格式 for i18n (#8011)
perf: 优化wpf肉鸽结算输出格式 for i18n
2024-01-18 08:42:24 +08:00
status102
f0e81a141f perf: 优化ZH输出 2024-01-18 08:41:14 +08:00
Lancarus
0b5017d689 perf: 萨米肉鸽适配新干员用法 (#8033) 2024-01-17 21:32:31 +08:00
Constrat
2f22380d96 perf: more scalable solution to 7bbb5f3
thanks to @ABA2396
2024-01-17 12:25:33 +01:00
Constrat
c20cd33fb9 chore: removed YostarJP recruit data skip 2024-01-16 23:18:45 +01:00
Constrat
7bbb5f3122 fix: Replacing strange space characters in ResourceUpdater for JP Recruit
fix #8027
2024-01-16 23:16:18 +01:00
Constrat
5ec4a6f71e style: reformatted CharsNameOcr for YostarEN (removed duplicate + moved)
[skip changelo]
2024-01-16 22:16:33 +01:00
Constrat
e61a8eebaf fix: Eyjafjalla Alter regex
[skip ci]
2024-01-16 22:03:41 +01:00
Constrat
90a6c36b17 chore: Manual run Resource Update (skipping JP recruitment)
[skip changelog]
2024-01-16 18:42:56 +00:00
David
68d20b0efc fix(temp): skipping recruit YostarJP, until further fix (#8028) 2024-01-16 19:39:46 +01:00
Constrat
0edfc3a347 fix: So Long Adele navigation 2024-01-16 18:40:00 +01:00
HX3N
b82bcfa10c chore: YoStarKR ocr text update for SO LONG ADELE (#8024)
* chore: YoStarKR improve ocr text

replaced some duplicate items using regular expressions and removed space.
"ocrReplace" transforms words after removing spaces. Therefore, if there are spaces after that, it will not be recognized.

* chore: fixed the skin recognition

* chore: YoStarKR response SO LONG ADELE

add SL STAGE navigation
add new character

* chore: add 水汽汽水瓶 for copilot

* chore: sort tasks

* chore: LE Stage revert
2024-01-16 17:10:53 +01:00
Horror Proton
a83cc24db0 docs: update build tutorial 2024-01-16 20:19:52 +08:00
Constrat
327a7ce4bb fix: So Long Adele ROI change (pre Trials for Navigator)
check #8023
2024-01-16 11:25:07 +01:00
Constrat
f47abe6a91 chore: Auto Update Game Resources - 2024-01-15
[skip changelog]
2024-01-15 20:07:11 +00:00
Constrat
46871e98c1 chore: Auto Update Game Resources - 2024-01-15
[skip changelog]
2024-01-15 15:45:47 +00:00
HX3N
391ed39211 chore: YoStarKR modifiy tasks.json (#8014)
* chore: YoStarKR modifiy ocr text for Mizuki Roguelike

remove StageEncounterOptionFree as it is no longer used
Added Mizuki@Roguelike@DataTraceback to fix screen stuck issue on DataTraceback screen.

* chore: Compliance with grammar rules and additional explanations
2024-01-15 16:33:04 +01:00
Constrat
027ae716a4 chore: Auto Update Game Resources - 2024-01-15
[skip changelog]
2024-01-15 12:33:52 +00:00
Constrat
39bc9878d6 chore: YostarEN So Long Adele event navigation 2024-01-15 13:17:20 +01:00
Manicsteiner
cf7e9e1c8e chore: YoStarJP 火山と雲と夢色の旅路 navigation (#8015) 2024-01-15 13:17:05 +01:00
Constrat
624ed939c8 chore: Auto Update Game Resources - 2024-01-15
[skip changelog]
2024-01-15 11:07:25 +00:00
Loong
f8e6b0e982 chore: bump maa-cli to v0.4.0 (#7996)
* chore: bump `maa-cli` to `v0.4.0`

* docs: 更新 CLI 使用指南

* ci: build cli for appimage only with git2 feature

* ci: build CLI with vendored openssl on aarch64
2024-01-15 10:31:16 +00:00
status102
bf9981054d perf: EN结算输出
Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
2024-01-14 22:33:20 +08:00
status102
80237630ab perf: fix regex 2024-01-14 16:22:37 +08:00
status102
2e4e61c155 perf: 移除难度输出的非数字前缀 2024-01-14 14:41:31 +08:00
status102
e9810d5ed8 perf: 调整输出格式 2024-01-14 10:34:28 +08:00
HX3N
f083059e0b chore: YoStarKR add ReceiveMail.png (#8009) 2024-01-13 19:42:49 +01:00
HX3N
3d7b0d2a69 docs: add korean operator name for so long adele (#8008)
docs: add korean operator for so long adele
[skip changelog]
2024-01-13 18:16:11 +01:00
Manicsteiner
4658f05532 chore: YoStarJP ReceiveMail.png (#8004) 2024-01-13 12:27:26 +01:00
status102
70104e7e82 perf: 限制理智识别重试次数
fix #7998
2024-01-13 12:04:37 +08:00
Constrat
dc97305494 fix: Executor the Ex Foedere regex OCR
fix #7995
2024-01-12 18:53:25 +01:00
uye
d8b0121938 fix: 测试版显示错误的ui版本号 2024-01-11 22:40:19 +08:00
status102
db73e2f56e perf: Logger析构时不滚动日志 (#7975) 2024-01-11 21:36:25 +08:00
uye
1e36e9ba48 Release v5.0.0-beta.1 (#7951) 2024-01-11 17:14:54 +08:00
uye
b723b83b0e docs: Update CHANGELOG.md 2024-01-10 18:12:31 +08:00
uye
6afb0526e8 fix: 自动战斗群组中多名干员在编组中时不会选择
fix #7977
2024-01-10 18:05:27 +08:00
status102
c4e44c784f perf: 优化连续战斗次数列表展开图片 2024-01-10 15:05:24 +08:00
status102
feea4f1ac8 fix: 修复#7733文件路径错误 (#7980) 2024-01-10 13:16:34 +08:00
github-actions[bot]
03e6615423 docs: Auto Update Changelogs of v5.0.0-beta.1 (#7953)
* docs: Auto Generate Changelog of Release v5.0.0-beta.1

* chore: 调整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-01-10 10:02:44 +08:00
HX3N
b1f74fcd6d chore: YoStarKR added template image (#7974)
chore: YoStarKR add template image

add missing template image

AnnihilationReturnFlag.png
InfrastProcessing.png
InfrastProcessingMini.png
2024-01-09 18:50:25 +01:00
status102
dfc95b40b3 chore: 移除Sample本地运行时重复加载外服资源,避免产生潜在的错误 (#7930)
chore: 移除Sample本地运行时重复加载外服资源,避免产生潜在的错误
2024-01-09 20:47:55 +08:00
Constrat
ab4fa44f5c chore: Auto Update Game Resources - 2024-01-09
[skip changelog]
2024-01-09 08:29:08 +00:00
Loong
fcd5dfb861 chore: 修复基建排班的 JSON schema (#7788)
docs: fix infrastructure schema
2024-01-09 13:31:12 +08:00
status102
c1bdea35e8 feat: 允许插件停用ProcessTask (#7954) 2024-01-09 13:30:43 +08:00
zzyyyl
d36acc417c fix: 修复肉鸽烧水选择难度可能不对的问题 (#7946) 2024-01-09 13:29:07 +08:00
zzyyyl
81c1958992 feat: 减少重复截图 (#7945)
* feat: 减少重复截图

* feat: 截图间隔阈值改为 2min

* style: 更新注释
2024-01-09 13:28:03 +08:00
status102
8c6db4c514 style: 简化部分初始化 2024-01-09 09:27:01 +08:00
Alisa
ae9b55e493 i18n: Translations update from MAA Weblate (#7949)
fix: 解决冲突 (#7948)

* feat: 萨米肉鸽新板子

fix #7865

* fix: typo
[skip ci] [skip changelog]

* fix: ClickedCorrectStage more ocrReplace regex

* chore: YostarEN I.S. trader store ocrreplace
[skip ci] [skip changelog]

* fix: 修复部分情况下,关卡掉落识别关卡名出错

* chore: YoStarKR ocr text replacement (#7845)

* chore: YoStarKR translation replacement

ko-kr translation replacement
add line break for readability

* fix: YoStarKR ocr text

fix ocr text for infrast
add Mizuki@Rouguelike@StageEncounterOptionUnknown

* chore: Auto Update Game Resources - 2023-12-31

[skip changelog]

* chore: Auto Update Game Resources - 2023-12-31

[skip changelog]

* feat: ui 和 core 版本不一致时开始任务添加 waring 提示

* fix: typo in task
[skip ci] [skip changelog]

* fix: subprocess handle leak

* chore: fix SyncRes build error

* docs: 修改readme中最大分辨率为2k

* chore: net8后不进行MAA_win7.exe备份

* fix: 版本兼容

* fix: 提供打不开MAA_win7.exe的处理方法

* fix: EN服 无法自动吃大理智药

fix #7793

* chore: 博朗台模式识别理智回复时间大于6分钟则返回失败

* chore: YostarEN I.S. Trader regex
[skip changelog]

(cherry picked from commit 2bc2763f3f)

* chore: more YostarEN I.S. collectibles regex
[skip changelog]

(cherry picked from commit 311fc34378)

* fix: 修复SSS_自走机械搏斗场_浊蒂重岳塞雷娅泥岩_速冷脚本没有文件名后缀的错误 (#7879)

* chore: YoStarJP roguelike nextlevel ocr (#7859)

* chore: YoStarJP roguelike nextlevel ocr

* chore: using text instead of ocrreplace like other clients

---------


(cherry picked from commit 54fa1af24b)

* perf: 删除没有用到的 task

(cherry picked from commit c997bbea4c)

* fix: 修复肉鸽刷源石锭模式卡住的问题 (#7882)

fix #7858

(cherry picked from commit ad32918fc3)

* fix: changed template YostarEN I.S. enter

fix #7766 fix #7886

Revert 7b4d175678 & fix

(cherry picked from commit 182a0fd182)

* fix: 移除 StageEncounterClickToLeave 任务 (#7887)

作为 JustReturn 任务还有自己作为 next 也太危险了(
看了一下,应该所有任务都会通过 CloseEvent 退出,剩下的就是直接进下一层了,接上 NextLevel

fix #7884

(cherry picked from commit 6e4e6cee4e)

* docs: update instruction for waydroid

fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7701
(cherry picked from commit 08b6469aad)

* chore: YoStarJP 塵影に交わる残響 復刻 navigation (#7888)

(cherry picked from commit beed3fdc43)

* chore: YosrarEN Lingering Echoes stage navigation

(cherry picked from commit b2dbaab771)

* chore: Auto Update Game Resources - 2024-01-03

[skip changelog]

(cherry picked from commit 4f817e93fa)

* chore: YoStarKR template image replacement (#7895)

(cherry picked from commit ee9d576401)

* chore: YoStarKR LE stage navigation (#7896)

* chore: YoStarKR LE Stage navigation

* chore: YoStarKR LE stage navigation

revised regex

* chore: YoStarKR LE Stage navigation

remove duplicate regex

(cherry picked from commit 11c099da2f)

* chore: Auto Update Game Resources - 2024-01-03

[skip changelog]

(cherry picked from commit 1ebdecaa10)

* chore: YoStarKR ocrReplace text replacement (#7897)

fix some unrecognized ocrReplace text

* doc: 修复README的一处链接错误 (#7905)

doc: 修复了一个链接错误

* chore: Auto Update Game Resources - 2024-01-04

[skip changelog]

* chore: YoStarKR ocrReplace regex fix (#7901)

YoStarKR ocrReplace regex fix

* chore: 更新繁中服生息演算最後一天的日期 (#7903)

* fix: 清剩余理智时卡在选择次数

fix #7909

(cherry picked from commit 5e4002b058)
(cherry picked from commit d4bceb1c16)



* chore: gitignore FodyWeavers.xsd

* chore: 修改公招多选tag选项描述

* fix: 使用启动旧版.cmd启动后下次更新报错

* fix: 下调检测阈值以尝试修复刷理智卡在次数选择
fix #7919

* perf: 初步适配萨米肉鸽dlc关卡等 (#7924)

* perf: 优化萨米肉鸽部分关卡逻辑 (#7925)

* perf:初步适配萨米dlc内容

* perf:优化萨米肉鸽部分关卡逻辑

* fix: 勾选启动后直接最小化时无法使用右键强制显示

* fix: 兼容旧版本语言特性

* chore: 修改 前行的林地 默认选择

* fix: 修复刷理智调整战斗次数时可能错误点击关卡报酬

fix: 调整模板图

Revert "fix: 下调检测阈值以尝试修复刷理智卡在次数选择"

This reverts commit 6a8d38d8a6.

* docs: Auto Update Changelogs of v4.28.8 (#7932)

* docs: Auto Generate Changelog of Release v4.28.8

* chore: 调整changelog

---------




* fix: reduced Mizuki@Roguelike@MissionFailedFlag threshold for iOS
fix #7864 temporary fix as #7872 exists

* feat: 捕获启动模拟器时产生的权限不足异常 (#7908)

* feat: 捕获启动模拟器时产生的权限不足异常

* chore: 优化代码

* feat: 捕获所有启动模拟器时可能出现的异常并输出异常到日志

* docs: changelog.md

* perf: 优化萨米锏精二优先度 (#7939)

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: Constrat <Constrat@users.noreply.github.com>
Co-authored-by: dantmnf <dantmnf@users.noreply.github.com>
Co-authored-by: DL_君逸寒 <84064064+junyihan233@users.noreply.github.com>
Co-authored-by: Manicsteiner <63437036+Manicsteiner@users.noreply.github.com>
Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
Co-authored-by: zzyyyl <74587068+zzyyyl@users.noreply.github.com>
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
Co-authored-by: Chiichen <2531693734@qq.com>
Co-authored-by: HY <45387477+momomochi987@users.noreply.github.com>
Co-authored-by: youqii <youqii0522@gmail.com>
Co-authored-by: Lancarus <34369130+Lancarus@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: Chiichen <chiichen@qq.com>
2024-01-09 00:01:23 +08:00
uye
9c0eff49f0 style: 添加词典
[skip ci]
2024-01-08 23:59:55 +08:00
uye
d0043a65e5 style: 简化集合
[skip ci]
2024-01-08 23:59:55 +08:00
Manicsteiner
41aa25a4b2 chore: YoStarJP AnnihilationReturnFlag.png (#7964) 2024-01-08 16:56:07 +01:00
Constrat
ec0e42d9db chore: added AnnihilationReturnFlag.png for YostarEN
[skip changelog]
2024-01-08 16:37:47 +01:00
status102
54e723b541 typo: 修改插件名以符合项目格式 2024-01-08 22:18:45 +08:00
status102
eacd15bee8 typo: 修改插件名以符合项目格式 2024-01-08 21:20:48 +08:00
status102
e5ffec18a2 docs: 调整剩余理智关卡的说明 2024-01-08 21:04:03 +08:00
HX3N
4acb69d02f chore: YoStarKR modified ocr text (#7960)
modified and improved some ocr texts that were not recognized on copilot
2024-01-08 13:33:47 +01:00
David
e969c61d0a i18n: translated some infrast log lines (#7889)
* i18n: translated some infrast log lines
---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-01-08 12:31:51 +00:00
status102
4707807c93 style: 优化RoguelikeSetting格式 2024-01-08 20:01:38 +08:00
status102
e9bba419b2 fix: 一键长草期间锁定自动肉鸽设置以符合执行逻辑 2024-01-08 19:59:58 +08:00
status102
27d779b3ca perf: 优化部分插件判断 2024-01-08 19:50:01 +08:00
status102
3e5b4bb3be docs: 肉鸽设置追加部分注释 2024-01-08 18:14:21 +08:00
zzyyyl
8ade314b27 perf: const getter
[skip changelog]
2024-01-08 14:05:56 +08:00
zzyyyl
337d4d8acd perf: 增加一个暂时用不到的枚举值避免 C26813 警告
[skip changelog]
2024-01-08 14:05:09 +08:00
uye
578e2b1479 fix: 开机自启功能异常
.net 8 的 string.GetHashCode() 重启之后不一样了)

fix: #7956
2024-01-08 01:21:44 +08:00
Sherkey
4c2ecfd31a feat: 增加肉鸽刷开局模式下只凹精二选项 (#7705)
feat: 增加肉鸽刷开局模式下只凹精二选项
2024-01-08 00:26:32 +08:00
violetc
fcea4750f8 feat: 更改肉鸽模式介绍 2024-01-07 23:39:04 +08:00
violetc
a9535f6f80 fix: 增加遗漏的判定 2024-01-07 23:39:04 +08:00
violetc
2db2923e94 fix: 加入了遗漏的判定 2024-01-07 23:39:04 +08:00
violetc
919989f1b7 fix: 改了下韩语翻译 2024-01-07 23:39:04 +08:00
violetc
ab947189a2 feat: 将只凹直升改为一个选项 2024-01-07 23:39:04 +08:00
violetc
5b484e3ebd fix: 修复了愚蠢的日语翻译 2024-01-07 23:39:04 +08:00
violetc
5073104f1d feat: 增加肉鸽单独凹精二模式 2024-01-07 23:39:04 +08:00
uye
f7e990b253 fix: 解决冲突 2024-01-07 18:25:06 +08:00
uye
6cf257179b docs: changelog.md 2024-01-07 18:21:31 +08:00
uye
892bbf18dc Release v4.28.8 (#7866)
fix #7865
2024-01-07 18:05:37 +08:00
Lancarus
c0c4e2bcee perf: 优化萨米锏精二优先度 (#7939) 2024-01-07 17:56:11 +08:00
uye
aead81e796 docs: changelog.md 2024-01-07 17:24:12 +08:00
Chiichen
577d11317a feat: 捕获启动模拟器时产生的权限不足异常 (#7908)
* feat: 捕获启动模拟器时产生的权限不足异常

* chore: 优化代码

* feat: 捕获所有启动模拟器时可能出现的异常并输出异常到日志
2024-01-07 17:04:20 +08:00
Constrat
77b2ee89a4 fix: reduced Mizuki@Roguelike@MissionFailedFlag threshold for iOS
fix #7864 temporary fix as #7872 exists
2024-01-07 17:04:01 +08:00
github-actions[bot]
6345b0dd2a docs: Auto Update Changelogs of v4.28.8 (#7932)
* docs: Auto Generate Changelog of Release v4.28.8

* chore: 调整changelog

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-01-07 17:00:34 +08:00
github-actions[bot]
6e4de53eb3 docs: Auto Update Changelogs of v4.28.8 (#7932)
* docs: Auto Generate Changelog of Release v4.28.8

* chore: 调整changelog

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2024-01-07 16:54:12 +08:00
broken_paint
b17fcce49f feat: 识别专精等级,干员职业,修改技能名识别范围 2024-01-07 12:02:29 +08:00
broken_paint
931251a49f fix: 修复部分错用模型 2024-01-07 12:02:28 +08:00
youqii
b9f39111bc chore: 修改部分基建设施模板图片蒙版 2024-01-07 12:02:28 +08:00
youqii
22d59dafdb fix: 修复错误引用的参数名 2024-01-07 12:02:28 +08:00
youqii
5aba3664bc fix: 修复自动基建时跳过训练室的问题 2024-01-07 12:02:27 +08:00
youqii
e2b8257174 feat: 新增训练室空闲中的提示,修复错误键名 2024-01-07 12:02:27 +08:00
youqii
d725bc6326 feat: 新增选项 2024-01-07 12:02:27 +08:00
youqii
29c1ca4a49 feat: 新增连续专精功能 2024-01-07 12:02:26 +08:00
youqii
b112f5dc24 i18n: 添加多语言翻译 2024-01-07 12:02:26 +08:00
youqii
a741bfe633 feat: 更改领取专精task 2024-01-07 12:02:26 +08:00
youqii
98b679867a feat: 增加回调消息输出 2024-01-07 12:02:26 +08:00
youqii
f239fd86dc feat: YostarEN tasks.json 2024-01-07 12:02:25 +08:00
youqii
edb02e1f6a fix: remove unused YoStarEN InfrastTrainingCompleted 2024-01-07 12:02:25 +08:00
youqii
37bd5b5e07 fix: 移除不必要的变量 2024-01-07 12:02:25 +08:00
youqii
3a0fb0d53b feat: 获取干员名,技能名及训练进度 2024-01-07 12:02:24 +08:00
youqii
0ad336263b feat: 修改训练完成模板匹配为OCR 2024-01-07 12:02:24 +08:00
David
2a5802c253 feat: YostarEN InfrastTrainingCompleted
I stole an account and got it :)
2024-01-07 12:02:24 +08:00
David
a29154dd38 feat: YostarEN png 2024-01-07 12:02:24 +08:00
youqii
fd9577dcf1 fix: 修复变量初始化顺序 2024-01-07 12:02:23 +08:00
youqii
59e08285d0 feat: GUI新增选项 2024-01-07 12:02:23 +08:00
youqii
4fc2a16628 feat: 基建自动领取专精 2024-01-07 12:02:23 +08:00
status102
6fcc266125 fix: 修复刷理智调整战斗次数时可能错误点击关卡报酬
fix: 调整模板图

Revert "fix: 下调检测阈值以尝试修复刷理智卡在次数选择"

This reverts commit 6a8d38d8a6.
2024-01-07 09:47:40 +08:00
status102
6718137086 fix: 修复刷理智调整战斗次数时可能错误点击关卡报酬 (#7942)
fix: 修复刷理智调整战斗次数时可能错误点击关卡报酬
2024-01-07 09:42:23 +08:00
status102
8df9f475d9 fix: 调整模板图 2024-01-07 09:29:49 +08:00
status102
1924bf45bc Revert "fix: 下调检测阈值以尝试修复刷理智卡在次数选择"
This reverts commit 6a8d38d8a6.
2024-01-07 09:29:48 +08:00
Lancarus
77df630a6d perf: 优化萨米锏精二优先度 (#7939) 2024-01-06 22:55:18 +08:00
Lancarus
2a8ef187e6 perf: 优化萨米肉鸽部分关卡逻辑 (#7936) 2024-01-06 20:24:33 +08:00
MistEO
654ad3cc6f perf: update skill_ready_cls model (#7733) 2024-01-06 19:12:51 +08:00
Lancarus
5d50c8a5d4 perf: 优化萨米肉鸽部分关卡逻辑 (#7935) 2024-01-06 18:50:13 +08:00
Lancarus
67a33423ba perf: 优化肉鸽作战逻辑,使不能空放的干员技能不影响后续部署指令的执行 (#7934) 2024-01-06 18:48:28 +08:00
uye
a013ca3275 chore: 修改 前行的林地 默认选择 2024-01-06 17:05:14 +08:00
uye
5b3389fced chore: 修改 前行的林地 默认选择 2024-01-06 17:04:57 +08:00
status102
d569e23a0e chore: 移除Sample本地运行时重复加载外服资源,避免产生潜在的错误 2024-01-06 16:08:44 +08:00
uye
e440e023d0 fix: 兼容旧版本语言特性 2024-01-06 15:19:38 +08:00
uye
d0ad287eac fix: 兼容旧版本语言特性 2024-01-06 15:19:02 +08:00
uye
241a264b9e fix: 勾选启动后直接最小化时无法使用右键强制显示 2024-01-06 15:13:28 +08:00
uye
ea47301e14 fix: 勾选启动后直接最小化时无法使用右键强制显示 2024-01-06 15:13:12 +08:00
Lancarus
12767f62f3 perf: 优化萨米肉鸽部分关卡逻辑 (#7925)
* perf:初步适配萨米dlc内容

* perf:优化萨米肉鸽部分关卡逻辑
2024-01-06 14:35:40 +08:00
Lancarus
39c394b556 perf: 初步适配萨米肉鸽dlc关卡等 (#7924) 2024-01-06 14:35:32 +08:00
status102
cb4bd7aace fix: 下调检测阈值以尝试修复刷理智卡在次数选择
fix #7919
2024-01-06 14:33:03 +08:00
uye
7c9d88cdbf fix: 使用启动旧版.cmd启动后下次更新报错 2024-01-06 14:33:03 +08:00
youqii
8d33f507ca chore: 修改公招多选tag选项描述 2024-01-06 14:33:03 +08:00
uye
7a2562549a chore: gitignore FodyWeavers.xsd 2024-01-06 14:33:03 +08:00
uye
0178ace830 fix: 使用启动旧版.cmd启动后下次更新报错 2024-01-06 14:31:07 +08:00
uye
0b90c1ea0d chore: gitignore FodyWeavers.xsd 2024-01-06 14:28:12 +08:00
youqii
a7e129b665 chore: 修改公招多选tag选项描述 2024-01-06 10:56:00 +08:00
status102
6a8d38d8a6 fix: 下调检测阈值以尝试修复刷理智卡在次数选择
fix #7919
2024-01-06 08:35:44 +08:00
Lancarus
08f0198ea6 perf: 优化萨米肉鸽部分关卡逻辑 (#7925)
* perf:初步适配萨米dlc内容

* perf:优化萨米肉鸽部分关卡逻辑
2024-01-06 03:54:51 +08:00
Constrat
611178a123 chore: Auto Update Game Resources - 2024-01-05
[skip changelog]
2024-01-05 19:25:24 +00:00
Constrat
24890f878b fix: ocrReplace for LE navigation
[skip changelog]
2024-01-05 18:38:59 +01:00
Constrat
a659ec31c4 fix: letter caps lingering echoes navigation
[skip changelog]
2024-01-05 18:34:03 +01:00
Lancarus
d988c096d6 perf: 初步适配萨米肉鸽dlc关卡等 (#7924) 2024-01-06 01:29:20 +08:00
Constrat
7dd4c6e6ab chore: Auto Update Game Resources - 2024-01-05
[skip changelog]
2024-01-05 17:07:21 +00:00
Constrat
257f37ef0e fix: reduced Mizuki@Roguelike@MissionFailedFlag threshold for iOS
fix #7864 temporary fix as #7872 exists
2024-01-05 14:58:49 +01:00
Constrat
8484823c64 chore: added ps1 for cloning ResourceUpdater repo for local developing 2024-01-05 13:34:35 +01:00
status102
c051f20958 fix: 修复部分情况下肉鸽结算点击错误 2024-01-05 20:10:27 +08:00
uye
072472a143 fix: 未在字典中的连接配置在使用自动检测时报错
fix #7915
2024-01-05 15:35:23 +08:00
Constrat
fc15ef31a2 chore: Auto Update Game Resources - 2024-01-05
[skip changelog]
2024-01-05 07:06:57 +00:00
status102
7c930c6030 fix: 修复肉鸽-刷钱模式下仍然会在商店进行招募、购物的错误 (#7863)
fix: 修复肉鸽-刷钱模式下仍然会在商店进行招募、购物的错误
2024-01-05 11:13:42 +08:00
uye
1067cd8309 fix: 配置修改后无法保存 2024-01-05 11:09:44 +08:00
Cryolitia
b624bbce53 fix: 谁把我fody删了 2024-01-05 11:09:31 +08:00
status102
87789c74a7 fix: 移除不必要的参数 2024-01-05 11:05:59 +08:00
status102
a9b4044f8b fix: 移除随机购物 2024-01-05 10:52:28 +08:00
Chiichen
13d4bb7c7f feat: 捕获启动模拟器时产生的权限不足异常 (#7908)
* feat: 捕获启动模拟器时产生的权限不足异常

* chore: 优化代码

* feat: 捕获所有启动模拟器时可能出现的异常并输出异常到日志
2024-01-05 09:44:10 +08:00
zzyyyl
1891e8861b fix: 清剩余理智时卡在选择次数
fix #7909

(cherry picked from commit 5e4002b058)
(cherry picked from commit d4bceb1c16)

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2024-01-05 09:03:23 +08:00
zzyyyl
d4bceb1c16 perf: optimize template in 5e4002b058 2024-01-05 09:00:08 +08:00
status102
98ba616c02 fix: 修复刷理智结束时理智输出错误 2024-01-05 08:47:08 +08:00
HY
9e9a5b0859 chore: 更新繁中服生息演算最後一天的日期 (#7903) 2024-01-04 22:47:59 +08:00
HX3N
240e0d8dd5 chore: YoStarKR ocrReplace regex fix (#7901)
YoStarKR ocrReplace regex fix
2024-01-04 22:47:56 +08:00
Constrat
2ef010278f chore: Auto Update Game Resources - 2024-01-04
[skip changelog]
2024-01-04 22:47:52 +08:00
Chiichen
f2aa29a0f8 doc: 修复README的一处链接错误 (#7905)
doc: 修复了一个链接错误
2024-01-04 22:47:46 +08:00
HX3N
58b9b0fd75 chore: YoStarKR ocrReplace text replacement (#7897)
fix some unrecognized ocrReplace text
2024-01-04 22:47:04 +08:00
uye
5e4002b058 fix: 清剩余理智时卡在选择次数
fix #7909
2024-01-04 22:43:20 +08:00
Chiichen
ceb6544367 doc: 修复README的一处链接错误 (#7905)
doc: 修复了一个链接错误
2024-01-04 19:56:36 +08:00
Constrat
3be6348194 chore: Auto Update Game Resources - 2024-01-04
[skip changelog]
2024-01-04 11:06:52 +00:00
HX3N
9053b8a372 chore: YoStarKR ocrReplace regex fix (#7901)
YoStarKR ocrReplace regex fix
2024-01-04 18:31:30 +08:00
HY
f385070640 chore: 更新繁中服生息演算最後一天的日期 (#7903) 2024-01-04 18:30:16 +08:00
zzyyyl
33a484071c perf: 修复并无损压缩模板图片 (#7831)
使用 optipng 无损压缩模板图片
删除所有 png 文件的辅助数据块以缩小文件大小
新增优化图片工具 tools/OptimizeTemplates
2024-01-04 13:38:09 +08:00
Constrat
1ba86f2554 chore: Auto Update Game Resources - 2024-01-03
[skip changelog]

(cherry picked from commit 1ebdecaa10)
2024-01-04 13:16:11 +08:00
HX3N
37c8f95489 chore: YoStarKR LE stage navigation (#7896)
* chore: YoStarKR LE Stage navigation

* chore: YoStarKR LE stage navigation

revised regex

* chore: YoStarKR LE Stage navigation

remove duplicate regex

(cherry picked from commit 11c099da2f)
2024-01-04 13:15:27 +08:00
HX3N
f3ba5c47b0 chore: YoStarKR template image replacement (#7895)
(cherry picked from commit ee9d576401)
2024-01-04 13:15:10 +08:00
Constrat
263a90c244 chore: Auto Update Game Resources - 2024-01-03
[skip changelog]

(cherry picked from commit 4f817e93fa)
2024-01-04 13:12:40 +08:00
Constrat
6c67fcb32c chore: YosrarEN Lingering Echoes stage navigation
(cherry picked from commit b2dbaab771)
2024-01-04 13:12:32 +08:00
Manicsteiner
67413cf0e6 chore: YoStarJP 塵影に交わる残響 復刻 navigation (#7888)
(cherry picked from commit beed3fdc43)
2024-01-04 13:12:23 +08:00
Horror Proton
b66e297b5d docs: update instruction for waydroid
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7701
(cherry picked from commit 08b6469aad)
2024-01-04 13:12:15 +08:00
zzyyyl
0af135a8e4 fix: 移除 StageEncounterClickToLeave 任务 (#7887)
作为 JustReturn 任务还有自己作为 next 也太危险了(
看了一下,应该所有任务都会通过 CloseEvent 退出,剩下的就是直接进下一层了,接上 NextLevel

fix #7884

(cherry picked from commit 6e4e6cee4e)
2024-01-04 13:12:04 +08:00
zzyyyl
99090f302e fix: changed template YostarEN I.S. enter
fix #7766 fix #7886

Revert 7b4d175678 & fix

(cherry picked from commit 182a0fd182)
2024-01-04 13:11:26 +08:00
zzyyyl
fce45d9656 fix: 修复肉鸽刷源石锭模式卡住的问题 (#7882)
fix #7858

(cherry picked from commit ad32918fc3)
2024-01-04 13:10:49 +08:00
zzyyyl
622d2e81a2 perf: 删除没有用到的 task
(cherry picked from commit c997bbea4c)
2024-01-04 13:10:49 +08:00
Manicsteiner
2d5366bf44 chore: YoStarJP roguelike nextlevel ocr (#7859)
* chore: YoStarJP roguelike nextlevel ocr

* chore: using text instead of ocrreplace like other clients

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
(cherry picked from commit 54fa1af24b)
2024-01-04 13:10:49 +08:00
DL_君逸寒
6701054fd5 fix: 修复SSS_自走机械搏斗场_浊蒂重岳塞雷娅泥岩_速冷脚本没有文件名后缀的错误 (#7879) 2024-01-04 13:10:49 +08:00
Constrat
7f6d9e36d3 chore: more YostarEN I.S. collectibles regex
[skip changelog]

(cherry picked from commit 311fc34378)
2024-01-04 13:10:49 +08:00
Constrat
7d46677fa3 chore: YostarEN I.S. Trader regex
[skip changelog]

(cherry picked from commit 2bc2763f3f)
2024-01-04 13:10:40 +08:00
HX3N
e67b1e7c07 chore: YoStarKR ocrReplace text replacement (#7897)
fix some unrecognized ocrReplace text
2024-01-04 09:38:33 +08:00
Constrat
1ebdecaa10 chore: Auto Update Game Resources - 2024-01-03
[skip changelog]
2024-01-03 21:45:19 +00:00
HX3N
11c099da2f chore: YoStarKR LE stage navigation (#7896)
* chore: YoStarKR LE Stage navigation

* chore: YoStarKR LE stage navigation

revised regex

* chore: YoStarKR LE Stage navigation

remove duplicate regex
2024-01-03 22:35:13 +01:00
Constrat
72c01d39eb revert 3ca51cb548 2024-01-03 21:55:29 +01:00
Constrat
4f118af87c chore: Auto Update Game Resources - 2024-01-03
[skip changelog]
2024-01-03 20:44:59 +00:00
HX3N
ee9d576401 chore: YoStarKR template image replacement (#7895) 2024-01-03 21:38:49 +01:00
HX3N
3ca51cb548 chore: YoStarKR LE Stage navigation (#7894) 2024-01-03 21:37:43 +01:00
Constrat
4f817e93fa chore: Auto Update Game Resources - 2024-01-03
[skip changelog]
2024-01-03 18:29:15 +00:00
Constrat
b2dbaab771 chore: YosrarEN Lingering Echoes stage navigation 2024-01-03 19:07:46 +01:00
Manicsteiner
beed3fdc43 chore: YoStarJP 塵影に交わる残響 復刻 navigation (#7888) 2024-01-03 18:47:00 +01:00
Horror Proton
08b6469aad docs: update instruction for waydroid
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7701
2024-01-03 23:33:11 +08:00
zzyyyl
182a0fd182 fix: changed template YostarEN I.S. enter
fix #7766 fix #7886

Revert 7b4d175678 & fix
2024-01-03 22:38:00 +08:00
zzyyyl
6e4e6cee4e fix: 移除 StageEncounterClickToLeave 任务 (#7887)
作为 JustReturn 任务还有自己作为 next 也太危险了(
看了一下,应该所有任务都会通过 CloseEvent 退出,剩下的就是直接进下一层了,接上 NextLevel

fix #7884
2024-01-03 22:34:25 +08:00
Constrat
7b4d175678 fix: changed template YostarEN I.S. enter
fix #7766 fix #7886
2024-01-03 15:31:52 +01:00
zzyyyl
ad32918fc3 fix: 修复肉鸽刷源石锭模式卡住的问题 (#7882)
fix #7858
2024-01-03 20:59:26 +08:00
zzyyyl
e00024ea65 fix: 修复肉鸽刷源石锭模式卡住的问题 2024-01-03 19:59:20 +08:00
zzyyyl
c997bbea4c perf: 删除没有用到的 task 2024-01-03 19:59:14 +08:00
Manicsteiner
54fa1af24b chore: YoStarJP roguelike nextlevel ocr (#7859)
* chore: YoStarJP roguelike nextlevel ocr

* chore: using text instead of ocrreplace like other clients

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2024-01-03 12:26:44 +01:00
DL_君逸寒
bf49c82580 fix: 修复SSS_自走机械搏斗场_浊蒂重岳塞雷娅泥岩_速冷脚本没有文件名后缀的错误 (#7879) 2024-01-03 11:39:35 +01:00
uye
3314b3034a chore: 博朗台模式识别理智回复时间大于6分钟则返回失败 2024-01-03 16:57:13 +08:00
uye
c8df13455b chore: 博朗台模式识别理智回复时间大于6分钟则返回失败 2024-01-03 16:56:27 +08:00
uye
c21d3280c7 fix: EN服 无法自动吃大理智药
fix #7793
2024-01-03 16:41:47 +08:00
uye
c43b757f1b fix: EN服 无法自动吃大理智药
fix #7793
2024-01-03 16:40:53 +08:00
uye
b950958bce fix: 提供打不开MAA_win7.exe的处理方法 2024-01-03 14:15:32 +08:00
uye
d5e65fbb5d fix: 版本兼容 2024-01-03 14:15:29 +08:00
uye
b845dc8c46 fix: 提供打不开MAA_win7.exe的处理方法 2024-01-03 14:12:55 +08:00
Constrat
311fc34378 chore: more YostarEN I.S. collectibles regex
[skip changelog]
2024-01-02 18:00:57 +01:00
Constrat
2bc2763f3f chore: YostarEN I.S. Trader regex
[skip changelog]
2024-01-02 17:52:44 +01:00
status102
8b9ad4a28b perf: 优化刷理智-已开始战斗x次时临期理智药使用输出以增加可读性 (#7846)
perf: 优化刷理智-已开始战斗x次时临期理智药使用输出以增加可读性
2024-01-02 23:01:16 +08:00
status102
cb9256dec0 perf: 优化截图耗时额外提示文本触发条件,改为由平均耗时触发 (#7868)
perf: 优化截图耗时额外提示文本触发条件,改为由平均耗时触发
2024-01-02 22:58:51 +08:00
uye
82d809da21 fix: 版本兼容 2024-01-02 16:59:00 +08:00
uye
514c712628 chore: net8后不进行MAA_win7.exe备份 2024-01-02 15:35:02 +08:00
status102
553a5b641a docs: 修改readme中最大分辨率为2k 2024-01-02 15:34:37 +08:00
dantmnf
6cb046d65c chore: fix SyncRes build error 2024-01-02 15:34:33 +08:00
dantmnf
53cc2c2572 fix: subprocess handle leak 2024-01-02 15:34:28 +08:00
Constrat
9fdd3d7742 fix: typo in task
[skip ci] [skip changelog]
2024-01-02 15:34:22 +08:00
uye
f85cdebec7 feat: ui 和 core 版本不一致时开始任务添加 waring 提示 2024-01-02 15:33:44 +08:00
Constrat
e7451c2430 chore: Auto Update Game Resources - 2023-12-31
[skip changelog]
2024-01-02 15:33:31 +08:00
Constrat
3c984195af chore: Auto Update Game Resources - 2023-12-31
[skip changelog]
2024-01-02 15:33:26 +08:00
HX3N
62400452cd chore: YoStarKR ocr text replacement (#7845)
* chore: YoStarKR translation replacement

ko-kr translation replacement
add line break for readability

* fix: YoStarKR ocr text

fix ocr text for infrast
add Mizuki@Rouguelike@StageEncounterOptionUnknown
2024-01-02 15:33:17 +08:00
status102
949fdfb408 fix: 修复部分情况下,关卡掉落识别关卡名出错 2024-01-02 15:33:07 +08:00
Constrat
8a4ecd0263 chore: YostarEN I.S. trader store ocrreplace
[skip ci] [skip changelog]
2024-01-02 15:33:00 +08:00
Constrat
69fe734e30 fix: ClickedCorrectStage more ocrReplace regex 2024-01-02 15:31:08 +08:00
Constrat
4ba0d7e6b9 fix: typo
[skip ci] [skip changelog]
2024-01-02 15:30:40 +08:00
status102
90e40e13ff perf: 截图耗时过长提示改为由平均截图耗时触发 2024-01-02 15:07:49 +08:00
status102
b8d7c67495 perf: 截图耗时计算最值、均值排除截图失败的耗时 2024-01-02 15:05:07 +08:00
status102
fafdb3b641 perf: 移除连接模拟器测试最快截图耗时的额外提示文本
该数据存在一定偶然性,不再输出警告信息
2024-01-02 14:42:07 +08:00
uye
333e2c6704 feat: 萨米肉鸽新板子
fix #7865
2024-01-02 14:25:26 +08:00
uye
e2b56f6401 feat: 萨米肉鸽新板子
fix #7865
2024-01-02 14:18:29 +08:00
uye
dbef8075be fix: 干员识别报错 2024-01-02 13:42:14 +08:00
uye
0f48e53445 chore: net8后不进行MAA_win7.exe备份 2024-01-02 13:20:50 +08:00
status102
70bc90504c docs: 修改readme中最大分辨率为2k 2024-01-02 12:23:13 +08:00
status102
6b503bfa49 fix: 修改输出 2024-01-02 12:06:17 +08:00
status102
d168d46c60 perf: 优化刷理智-已开始战斗x次时,临期理智药使用输出以增加可读性 2024-01-02 12:03:39 +08:00
dantmnf
04274bf260 chore: fix SyncRes build error 2024-01-02 11:04:39 +08:00
dantmnf
e759a50d89 fix: subprocess handle leak 2024-01-02 11:04:39 +08:00
status102
3aaf554bf9 fix: 修复肉鸽-刷钱模式下仍然会在商店进行招募的错误 2024-01-02 09:44:15 +08:00
Constrat
122c76b542 fix: typo in task
[skip ci] [skip changelog]
2024-01-01 16:27:36 +01:00
uye
c4d7548bce feat: ui 和 core 版本不一致时开始任务添加 waring 提示 2024-01-01 20:00:27 +08:00
uye
984ba72b94 rft: dotnet8.0 (#7554) 2024-01-01 18:12:01 +08:00
Infko
fa613f1a44 chore: 更新 qodana 配置,忽略部分报错
Co-authored-by: SherkeyXD <253294679@qq.com>
2024-01-01 18:10:47 +08:00
SherkeyXD
df357ca0c0 style: 根据warning修改代码格式,并禁用部分警告 2024-01-01 18:10:47 +08:00
SherkeyXD
344a461f53 chore: 添加 RID 来修复 CI 问题 2024-01-01 18:10:47 +08:00
SherkeyXD
7120bbd488 chore: 在 ci 中为 MaaBuilder 添加日志折叠 2024-01-01 18:10:47 +08:00
alisa
3db0964f2c fix: wpf build process 2024-01-01 18:10:47 +08:00
alisa
98935e4a59 chore: able to publish as single file and NUKE Fody 2024-01-01 18:10:47 +08:00
uye
7364d9a517 ci: release-nightly-ota.yml 2024-01-01 18:10:47 +08:00
uye
16020e6637 fix: smoke-testing.yml乱码 2024-01-01 18:10:47 +08:00
SherkeyXD
68289b8111 ci: 使用的sdk更改为dotnet8.0正式版 2024-01-01 18:10:47 +08:00
SherkeyXD
4a077b2697 ci: 修复ci版本检测错误的问题 2024-01-01 18:10:47 +08:00
SherkeyXD
472fea4463 feat: 升级至C#12.0并解决smoke-testing问题 2024-01-01 18:10:47 +08:00
SherkeyXD
f4119ab3b8 chore: 不再生成runtimes文件夹,且Release模式下不生成Maa.pdb文件 2024-01-01 18:10:47 +08:00
SherkeyXD
c36a077bc2 chore: 不再生成maa.deps.json文件 2024-01-01 18:10:47 +08:00
SherkeyXD
ae6c6f7b5b chore: 调整csproj文件结构并删除旧的dotsettings文件 2024-01-01 18:10:47 +08:00
SherkeyXD
e6f7f2054a chore: 对于GlobalHotKey包忽略框架版本不兼容警告 2024-01-01 18:10:47 +08:00
SherkeyXD
823aa332c2 fix: 移除过时的安全性方法 2024-01-01 18:10:47 +08:00
SherkeyXD
dd1166887c ci: 修复windows ci运行错误的问题 2024-01-01 18:10:47 +08:00
uye
ec9c4f9a62 ci: Update smoke-testing.yml 2024-01-01 18:10:47 +08:00
uye
e68f93be6e ci: Update smoke-testing.yml 2024-01-01 18:10:47 +08:00
枫雨
0a9efad6a1 fix: 超链接点击报错 2024-01-01 18:10:47 +08:00
枫雨
7e19caa2f6 feat: 在托盘图标右键前往 Release 页 2024-01-01 18:10:47 +08:00
uye
240cd9069a fix: 开始前后脚本添加UseShellExecute = true, 2024-01-01 18:10:47 +08:00
uye
35ac89616d fix: 超链接点击报错 2024-01-01 18:10:47 +08:00
枫雨
bfb5ebd81b fix: 尝试显示 Toast 2024-01-01 18:10:47 +08:00
枫雨
456bcbaf66 feat: 使用 HandyControl 的 NotifyIcon 2024-01-01 18:10:47 +08:00
uye
01cd21d25a chore: 更新至 .net 8
真搞不懂这个吐司)
2024-01-01 18:10:47 +08:00
Constrat
ad0d2528e7 chore: Auto Update Game Resources - 2023-12-31
[skip changelog]
2023-12-31 20:06:55 +00:00
Constrat
221860adbd chore: Auto Update Game Resources - 2023-12-31
[skip changelog]
2023-12-31 16:06:39 +00:00
HX3N
4a20069a60 chore: YoStarKR ocr text replacement (#7845)
* chore: YoStarKR translation replacement

ko-kr translation replacement
add line break for readability

* fix: YoStarKR ocr text

fix ocr text for infrast
add Mizuki@Rouguelike@StageEncounterOptionUnknown
2023-12-31 11:23:43 +01:00
status102
ce39a7ffbb fix: 修复部分情况下,关卡掉落识别关卡名出错 2023-12-31 16:51:03 +08:00
Constrat
7c4b52a2a0 chore: YostarEN I.S. trader store ocrreplace
[skip ci] [skip changelog]
2023-12-30 18:34:57 +01:00
Constrat
ad067e812a fix: ClickedCorrectStage more ocrReplace regex 2023-12-30 16:08:06 +01:00
Constrat
af1b5af4b8 fix: typo
[skip ci] [skip changelog]
2023-12-30 16:02:32 +01:00
Constrat
27ff5a11b7 fix: EN Challenge mode battle list 2023-12-30 15:35:36 +01:00
uye
cc2e426ea6 Release v4.28.7 (#7829) 2023-12-30 15:07:50 +08:00
github-actions[bot]
d38b614659 docs: Auto Update Changelogs of v4.28.7 (#7834)
* docs: Auto Generate Changelog of Release v4.28.7

* docs: 移除changelog空标题

* docs: Update CHANGELOG.md

---------

Co-authored-by: SherkeyXD <SherkeyXD@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2023-12-30 15:04:35 +08:00
uye
1e024c9b2b chore: 移除无用翻译 2023-12-30 14:42:52 +08:00
uye
b21756de26 chore: 修改文档中的基建排班制作器链接 2023-12-30 14:40:32 +08:00
uye
b4ac8ba647 chore: 将基建排班制作器链接改为文档链接 2023-12-30 14:26:30 +08:00
uye
694640d8a1 chore: 添加 未能加载文件或程序集 System.Net.Http 的报错解决方案 2023-12-30 12:13:01 +08:00
uye
886bdfe486 chore: 4.x版本解压时备份当前exe为MAA_win7.exe 2023-12-29 23:18:25 +08:00
Constrat
9c0f6cfc0f fix: Hortus de Escapismo EX navigation 2023-12-29 10:26:22 +01:00
Constrat
75ebd56616 chore: new equal templates
[skip changelog] [skip ci]
2023-12-29 10:18:44 +01:00
Manicsteiner
cddf553e35 chore: Remove YoStarJP Annihilation template (#7819)
移除旧版的剿灭模式导航贴图。直接使用国服的贴图即可。
2023-12-29 17:03:07 +08:00
zzyyyl
18550385b7 fix: 修复萨米肉鸽主界面“推开门扉之人”无法放弃探索的问题
fix #7809
2023-12-29 16:21:23 +08:00
status102
ad9238ab63 chore: 更新肉鸽地图 (#7824)
[skip changelog]
2023-12-29 15:55:11 +08:00
uye
67a025c846 Release v4.28.6 (#7816)
外服打不开了)
2023-12-29 01:47:31 +08:00
github-actions[bot]
aeb84b3d8f docs: Auto Update Changelogs of v4.28.6 (#7817)
* docs: Auto Generate Changelog of Release v4.28.6

* docs: Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2023-12-29 01:44:17 +08:00
uye
8c6bd1a4ba fix: 外服FC活动导航问题 2023-12-29 01:31:48 +08:00
uye
86aea12398 Release v4.28.5 (#7814) 2023-12-29 01:15:41 +08:00
github-actions[bot]
4e487cf0ba docs: Auto Update Changelogs of v4.28.5 (#7815)
* docs: Auto Generate Changelog of Release v4.28.5

* Update CHANGELOG.md

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2023-12-29 01:13:34 +08:00
Constrat
64188cbec5 chore: Auto Update Game Resources - 2023-12-28
[skip changelog]
2023-12-28 17:06:27 +00:00
HX3N
477ef3d7dc chore: YoStarKR ocr text (#7804)
* chore: YoStartKR missing itemd added
2023-12-29 01:01:32 +08:00
uye
fbd9b1e20a chore: 提取活动导航重复流程 2023-12-29 00:57:41 +08:00
uye
6b35a9ced0 fix: 修复肉鸽开放后活动FC导航失效 2023-12-29 00:57:41 +08:00
Constrat
9014a8c93e chore: Auto Update Game Resources - 2023-12-28
[skip changelog]
2023-12-28 16:45:23 +00:00
Manicsteiner
aa0f2b8d9b chore: YoStarJP 空想の花庭 EX Update (#7810)
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2023-12-28 23:28:19 +08:00
status102
c01883b723 fix: 修复 自动战斗-自动编队 当干员过于接近屏幕边缘时,编入操作可能被UI遮挡的问题 (#7781)
fix #7395

从点干员名改成点左上角的职业标(感觉是从一坨变成另一坨(
2023-12-28 23:25:54 +08:00
DL_君逸寒
1818359763 perf: 优化搏斗场保全音响元件脚本打法及修改脚本名称 (#7806) 2023-12-28 10:48:28 +01:00
Constrat
e54a6373fa chore: Auto Update Game Resources - 2023-12-28
[skip changelog]
2023-12-28 08:07:45 +00:00
DL_君逸寒
e440fb521b feat: 新增 自走机械搏斗场_浊蒂重岳塞雷娅泥岩_速冷 保全作业 (#7798)
feat: 新增 自走机械搏斗场_浊蒂重岳塞雷娅泥岩_速冷 保全作业
2023-12-27 17:55:42 +08:00
MistEO
ea6c249ec6 chore: update meojson to v3.4.1 2023-12-27 17:34:16 +08:00
Constrat
7d89e1d2e8 chore: Auto Update Game Resources - 2023-12-26
[skip changelog]
2023-12-26 08:07:57 +00:00
status102
a5aa750913 fix: 移除自动肉鸽刷钱模式下非预期的肉鸽结算输出 2023-12-26 11:01:00 +08:00
David
4f0a3920c4 style: fix typo proced-proceed (#7771) 2023-12-26 10:30:00 +08:00
uye
2867484aa8 style: 受不了这个格式了,还是依vs罢 2023-12-25 14:18:47 +08:00
uye
d270d0a032 chore: 添加勾选尝试启动模拟器的提示 2023-12-25 14:15:51 +08:00
Horror Proton
8eee0f7486 perf: update PosixIO::call_command (#7748)
* perf: block busyloop with epoll, do not reuse pipe

* perf: do not call getpid() on each line of log

* perf: epoll -> poll, do not waitpid on EAGAIN

* perf: remove poll
2023-12-25 05:38:31 +00:00
HX3N
6d3b875820 chore: YoStarKR missing item modfied (#7764)
* fix: BattleStageName and Encounter Modified

* Update ko-kr.xaml

* Update ko-kr.xaml

* chore: modified ko-kr.xaml

fixed incorrect or strange translations

---------

Co-authored-by: HX3N <128385247+GGGGGGASD@users.noreply.github.com>
2023-12-25 13:25:20 +08:00
Manicsteiner
df950c593d fix: YoStarJP ocr text (#7776) 2023-12-24 17:48:07 +01:00
David
f1767d661d feat: custom ocr range detection for JP (#7773)
feat: custom ocr range detection
2023-12-24 17:09:13 +01:00
status102
48263ab49c fix: 修复 自动战斗-战斗列表 部分情况下无法绕过代理检查的错误 2023-12-24 20:53:48 +08:00
Constrat
5c3a07445b fix: DormConfirm.png for YostarEN 2023-12-24 12:49:23 +01:00
Constrat
81f9cf79d3 chore: Auto Update Game Resources - 2023-12-24
[skip changelog]
2023-12-24 10:45:58 +00:00
uye
786cbe44c5 fix: EN服 无法自动吃1天后过期理智药
fix #7765
2023-12-24 14:04:34 +08:00
uye
324feac0f7 chore: 修改选错adb程序后的弹窗提示 2023-12-24 13:37:20 +08:00
uye
8cf235ccb6 Release v4.28.4 (#7756)
公告发不出去,得更新一下才能看到公告)
2023-12-24 13:01:50 +08:00
github-actions[bot]
1b75b22851 docs: Auto Update Changelogs of v4.28.4 (#7760)
* docs: Auto Generate Changelog of Release v4.28.4

* docs: 调整changelog

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
2023-12-24 13:00:30 +08:00
Wallsman
bc2905c987 Update operators.md 2023-12-24 13:18:53 +09:00
Wallsman
dce36cdf51 [JP] Add Operator name
Update 空想の花庭
2023-12-24 13:18:34 +09:00
Constrat
40cbe52c00 fix: check current time for activity_table.json and gacha_table.json
fix #7747
2023-12-23 16:20:23 +01:00
Constrat
812138fda5 perf: checking out only needed files
ref: https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/7259#issuecomment-1807086415
2023-12-23 14:34:24 +01:00
status102
2d35708fb4 fix: 修复刷理智-SS复刻模式下无法使用理智药 2023-12-23 20:59:21 +08:00
status102
e72da87514 fix: 修复刷理智-活动复刻模式错误地在非预期状况下重试 2023-12-23 20:49:32 +08:00
status102
e22b75ef96 Revert "fix: 修复刷理智-SS复刻模式下无法使用理智药"
This reverts commit 607d0f9d72.
2023-12-23 20:43:35 +08:00
status102
cebd997fcc docs: 调整自动战斗-战斗列表提示文本中关于批量导入突袭关的说明 2023-12-23 17:00:57 +08:00
uye
727282110b chore: 勾选碎石时,如未勾选的理智液则也设为单次生效
fix #7751
2023-12-23 14:52:40 +08:00
uye
0f05a82e89 fix: GUI窗口较小时,关卡信息提示滚动显示不完全
fix #7750
2023-12-23 14:42:21 +08:00
status102
e95f02eabc perf: 账号切换 取消B服客户端检测流程 (#7657) 2023-12-23 09:18:10 +08:00
status102
607d0f9d72 fix: 修复刷理智-SS复刻模式下无法使用理智药 2023-12-22 21:50:12 +08:00
Constrat
a8031dec6b chore: Auto Update Game Resources - 2023-12-22
[skip changelog]
2023-12-22 10:45:45 +00:00
uye
1fb4eb0355 fix: 无法检测公告更新 2023-12-22 18:36:20 +08:00
Constrat
7c264fa1e4 chore: Auto Update Game Resources - 2023-12-22
[skip changelog]
2023-12-22 08:45:55 +00:00
status102
ea97f8f3bc style: 修改保全作业缩进 2023-12-22 14:14:49 +08:00
status102
021bcba05a fix: 修复部分情况下错误替换肉鸽结算中难度识别的文本 (#7691) 2023-12-22 13:32:58 +08:00
status102
13bb38c6f2 perf: 优化CopilotTask参数设置 (#7631)
* perf: 优化CopilotTask参数设置逻辑

* perf: 调整参数顺序

* perf: format
2023-12-22 13:12:23 +08:00
Saratoga
a9f961ed94 feat: 添加一份保全作业 (#7730)
* Create SSS_塔山农业实验平台_兼容应急_澄闪提丰核

添加一份自己写的保全作业

* 添加一份保全作业
2023-12-22 11:14:10 +08:00
Constrat
29f3c67c9d fix: Friston-3 Iris regex
[skip ci]
2023-12-21 21:27:37 +01:00
Constrat
4d9edf7c46 chore: Auto Update Game Resources - 2023-12-21
[skip changelog]
2023-12-21 20:07:14 +00:00
David
a190e95559 feat: Hortus de Escapismo navigation 2023-12-21 20:51:48 +01:00
uye
2afee109dc Release v4.28.3 (#7706) 2023-12-21 23:17:19 +08:00
github-actions[bot]
481cc6eb71 docs: Auto Update Changelogs of v4.28.3 (#7731)
* docs: Auto Generate Changelog of Release v4.28.3

* chore: 调整changelog

* docs: 调整 changelog

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: status102 <status102@outlook.com>
Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
2023-12-21 23:14:00 +08:00
zzyyyl
62ce372a20 fix: 修复肉鸽烧水逻辑错误、肉鸽卡在第三层 boss 等策略相关问题 (#7724) 2023-12-21 22:38:37 +08:00
Constrat
e09942d2b0 chore: Auto Update Game Resources - 2023-12-21
[skip changelog]
2023-12-21 11:25:29 +00:00
status102
f102f498b7 chore: 移动旧保全作业 2023-12-21 16:29:56 +08:00
status102
cea20154ec fix: 修复国服保全作业命名错误 2023-12-21 16:22:11 +08:00
Constrat
9ffcfab62a chore: Auto Update Game Resources - 2023-12-21
[skip changelog]
2023-12-21 08:07:53 +00:00
zzyyyl
e769dfd316 feat: 提交 issue 时要求检查置顶议题 (#7717) 2023-12-20 16:24:11 +08:00
zzyyyl
9d65675a90 fix: 修复肉鸽商店投资退出过快卡在 StageTraderInvestSystemLeave 的问题 (#7720)
fix #7718
2023-12-20 08:23:25 +00:00
北雁 Cryolitia
de31d16528 wpfGui: 增加ScrollView触屏支持 (#7340)
* Fix #7320

* Add `PanningMode`
2023-12-19 22:29:38 +08:00
Constrat
983b13dd7d chore: Auto Update Game Resources - 2023-12-19
[skip changelog]
2023-12-19 14:27:40 +00:00
zzyyyl
d5f9e5470b fix(roguelike): 修复水月肉鸽策略未随层数改变的问题 (#7597)
- fix #7596
- fix #7652
2023-12-19 22:20:21 +08:00
Constrat
64c925610c chore: Auto Update test after skip changelog fix
[skip changelog]
2023-12-19 10:44:01 +00:00
David
37697eb39f fix: Error: Process completed with exit code 1. in github actions 2023-12-19 11:40:55 +01:00
zzyyyl
a363ff43ea fix(roguelike): StrategyChange 插件利用回调直接获取识别结果;NextLevel 区域也进行层名识别;水月肉鸽在 DiceConfirm 之后也进行层名识别
可能把 NextLevel 的识别和点击分开然后把 StrategyChangeAtNextLevel 插进去才比较好,大概
2023-12-19 17:23:52 +08:00
zzyyyl
d46976b794 feat(task): SubTaskStart 等回调增加识别结果
插件现在可以获取识别结果
2023-12-19 17:18:57 +08:00
zzyyyl
7468357c9c fix(roguelike): 修复肉鸽 OptionUnknown 引起的卡住的问题 (#7675)
统一降低 StageEncounterOptionUnknown 的优先级

fix #7658
2023-12-19 16:36:32 +08:00
Hao Guan
cd564d6005 fix: Mac GUI 修复作业文件路径错误 2023-12-19 18:01:07 +10:00
Hao Guan
25922ac246 chore: Mac GUI 改为沙盒内控制客户端并移除 XPC 2023-12-19 18:00:42 +10:00
Hao Guan
550811a7a3 fix: Mac GUI 修复指针warning 2023-12-19 18:00:37 +10:00
Hao Guan
eb2979320f chore: Mac GUI 改进设置布局 2023-12-19 18:00:28 +10:00
DL_君逸寒
af8f665017 feat: 新增 自走机械搏斗场、塔山农业实验平台 保全作业 (#7696)
* Create SSS_自走机械搏斗场_浊蒂重岳重岳星熊+塞雷娅棘刺(伪核).json

新增 自走机械搏斗场_浊蒂重岳重岳星熊+塞雷娅棘刺(伪核).json 保全脚本

* Create SSS_塔山农业实验平台_浊蒂纯艾澄闪银灰+能天使.json

新增 SSS_塔山农业实验平台_浊蒂纯艾澄闪银灰+能天使.json 保全脚本

* Create SSS_塔山农业实验平台_浊蒂纯艾澄闪银灰+提丰.json

新增 SSS_塔山农业实验平台_浊蒂纯艾澄闪银灰+提丰.json 保全脚本
2023-12-19 14:01:44 +08:00
liupei
54e7ab71ef rft: 调整 discount_ocr() log位置 2023-12-18 11:46:22 +08:00
liupei
456183937a perf: discount_ocr() 识别位置变更为信用商店界面每个商品的左上角 2023-12-18 01:17:23 +08:00
zzyyyl
bb530ad098 fix(roguelike): 修复肉鸽 OptionUnknown 引起的卡住的问题
统一降低 StageEncounterOptionUnknown 的优先级

fix #7658
2023-12-17 19:58:41 +08:00
Lancarus
8bf2a17603 perf: 优化萨米boss关打法 (#7662) 2023-12-17 16:30:33 +08:00
liupei
5da189deeb i18n: translation 2023-12-17 01:51:21 +08:00
liupei
c2a77fbf82 docs: add docs for only_buy_discount and reserve_max_credit 2023-12-17 01:51:21 +08:00
liupei
8f1fc01bbb rft: 调整 discount_ocr() log位置 2023-12-17 01:51:21 +08:00
liupei
153fb6198e feat: 增加GUI界面鼠标悬停时的信用溢出预警和白名单不受影响的Tips 2023-12-17 01:51:21 +08:00
liupei
30ab80f6f0 feat: 添加折扣购买导致信用点数溢出的通知 2023-12-17 01:51:21 +08:00
liupei
c715a1bc0c fix: 修复折扣识别bug 2023-12-17 01:51:20 +08:00
liupei
e40d26b83e feat: 新增只购买折扣信用商品的选项与少于300信用点停止购物的选项 2023-12-17 01:50:53 +08:00
status102
e033ce0aac fix: 修复部分情况下连续战斗次数无法正确调为1并导致卡在该流程的错误 (#7646) 2023-12-16 15:21:26 +08:00
status102
5deac04d38 Revert 基建新增领取专精功能 (#7624)
* Revert "fix: 基建换班-继续专精 参数字段名格式不一致"

This reverts commit 6ce6b2d10a.

* Revert "chore: 部分客户端未支持的功能添加注释"

This reverts commit d2cede4a21.

* Revert "fix: 修复基建训练室-继续训练字符串键值冲突"

This reverts commit e0d5d1bf1d.

* Revert "feat: 基建新增领取专精功能 (#7164)"

This reverts commit 8b72ff9941.
2023-12-15 16:23:11 +08:00
zzyyyl
ff3a8f4301 fix: 修复傀影肉鸽识别到灰色节点的问题
fix #7623
fix #7620
2023-12-15 15:39:02 +08:00
status102
6ce6b2d10a fix: 基建换班-继续专精 参数字段名格式不一致 2023-12-15 10:34:12 +08:00
uye
8ecfcd2cd7 Release v4.28.2 (#7612)
fix#7599
2023-12-15 09:55:02 +08:00
uye
d2cede4a21 chore: 部分客户端未支持的功能添加注释 2023-12-15 09:50:44 +08:00
uye
ef41816422 docs: Update CHANGELOG.md 2023-12-15 09:40:39 +08:00
status102
e0d5d1bf1d fix: 修复基建训练室-继续训练字符串键值冲突
fix#7599
2023-12-15 07:58:15 +08:00
uye
1729244938 Release v4.28.1 (#7595) 2023-12-15 01:06:38 +08:00
github-actions[bot]
2338a23c4b docs: Auto Update Changelogs of v4.28.1 (#7598)
Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2023-12-15 01:01:58 +08:00
uye
1184aad1e0 docs: Create KeepDrinking.md 2023-12-15 00:55:41 +08:00
uye
76b61ff3a2 fix: 肉鸽宣告成功后闪退 2023-12-15 00:26:26 +08:00
Sherkey
8c016ff854 chore: 更改changelog生成时检查coauthor的逻辑 (#7589) 2023-12-15 00:13:04 +08:00
uye
4e50f9e402 style: qodana 2023-12-15 00:11:52 +08:00
zzyyyl
0811eb3e00 Revert "fix(roguelike): 尝试修复肉鸽策略未随层数改变的问题"
This reverts commit ea420f4b51.
2023-12-15 00:07:21 +08:00
zzyyyl
ea420f4b51 fix(roguelike): 尝试修复肉鸽策略未随层数改变的问题
fix #7596
2023-12-14 23:22:26 +08:00
Rbqwow
d03f41d059 doc: 修复readme文档链接 (#7594) 2023-12-14 21:05:46 +08:00
uye
fa9c441b5f fix: 肉鸽宣告成功后闪退
fix #7592
2023-12-14 20:57:33 +08:00
SherkeyXD
ed6334750e ci: 补全pr-checker所需要的权限 2023-12-14 18:38:30 +08:00
uye
1c8ec725d8 fix: 日服 火龙S黑角 识别 2023-12-14 17:18:17 +08:00
uye
033c0d22d8 fix: 日服 火龙S黑角 识别
fix #7586
2023-12-14 16:58:06 +08:00
zzyyyl
82f9f84d26 chore(issue-checker): 增加部分关键词
[skip changelog]
2023-12-14 15:32:38 +08:00
uye
389bbfd24a fix: 修改特别关注干员的正则 2023-12-14 15:25:45 +08:00
zzyyyl
c2f194ffb7 fix(roguelike): 尝试修复肉鸽 OptionUnknown 引起的卡住的问题 (#7581)
- fix #7570
- fix #7428
- fix #6459
- fix #6275
- fix #5956
2023-12-14 14:23:11 +08:00
zzyyyl
b21da5f269 fix(roguelike): 尝试修复肉鸽策略未随层数改变的问题 (#7582)
fix #7578
2023-12-14 14:22:57 +08:00
status102
14d3b003c2 perf: 当战斗列表中添加多次相同作业时,只有都通过才会点赞 (#7571)
perf: 当战斗列表中添加多次相同作业时,只有都通过才会点赞
2023-12-14 14:16:27 +08:00
zzyyyl
249e499a0a chore(issue-checker): 增加 “Integrated Stategy”、“I.S.”
[skip changelog]
2023-12-14 13:57:22 +08:00
zzyyyl
bf55d58d68 fix(roguelike): 尝试修复肉鸽策略未随层数改变的问题 2023-12-14 13:51:31 +08:00
status102
3c535cdf7e perf: 优化遍历 2023-12-14 13:47:44 +08:00
status102
71d4a86fc6 fix: 修复战斗列表id记录可能未清空的错误 2023-12-14 13:42:05 +08:00
zzyyyl
717d397a91 fix(roguelike): 尝试修复肉鸽 OptionUnknown 引起的卡住的问题 2023-12-14 13:30:13 +08:00
uye
619e0b9944 feat: 添加牛牛网页链接 2023-12-14 12:54:50 +08:00
uye
5735b9d91d fix: 修改文档后maa本体中的链接错误 2023-12-14 12:52:20 +08:00
uye
ea16dbab0e fix: 修改文档后maa本体中的链接错误 2023-12-14 12:46:23 +08:00
youqii
8b72ff9941 feat: 基建新增领取专精功能 (#7164)
close #503

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Sherkey <57581480+SherkeyXD@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2023-12-14 10:29:41 +08:00
zzyyyl
287c469e2c fix: 编队选择三技能的滑动整体上移,避免误触导航栏(#7550) 2023-12-14 10:25:19 +08:00
David
82509b069a perf: removed unused templates (#7485) 2023-12-14 10:23:22 +08:00
status102
5c8a0f3d89 perf: 优化自动战斗-战斗列表启动逻辑 2023-12-14 09:05:02 +08:00
status102
a3608fe817 perf: 当战斗列表中添加多次相同作业时,只有都通过才会点赞 2023-12-14 09:04:54 +08:00
uye
25daebd3be Release v4.28.0 (#7557) 2023-12-14 01:21:14 +08:00
github-actions[bot]
9fdc438267 docs: Auto Update Changelogs of v4.28.0 (#7567)
Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: status102 <status102@outlook.com>
2023-12-14 01:18:10 +08:00
status102
68c3312f64 feat: wpf设置-连接设置新增近期截图耗时 (#7473)
feat: wpf设置-连接设置新增近期截图耗时
2023-12-13 23:57:56 +08:00
status102
41d42e65f8 perf: 优化战斗列表部分逻辑 (#7565)
perf: 优化战斗列表部分逻辑
2023-12-13 23:51:38 +08:00
status102
bac1a63114 perf: 截图不成功时,耗时将记录为INT_MAX 2023-12-13 23:40:52 +08:00
status102
c36e583228 fix: 修复 自动战斗-战斗列表-批量导入 导入突袭关作业时潜在的关卡名导入错误 2023-12-13 23:36:31 +08:00
status102
813763865b feat: wpf设置-连接设置新增近期截图耗时 2023-12-13 22:41:18 +08:00
status102
762185219c perf: 优化战斗列表自动识别关卡名参数的优先级
当加载在线作业时,不匹配作业代码
2023-12-13 22:26:44 +08:00
status102
6f6226814a fix: 移除不必要的引用 2023-12-13 22:26:44 +08:00
status102
9ae0ea9399 feat: 当战斗列表执行作业站作业且三星结算时,自动点赞 2023-12-13 22:26:43 +08:00
status102
8653a2edfc perf: 优化战斗列表反激活任务逻辑,仅三星结算时才会反激活任务,移除不必要的插件 2023-12-13 22:26:43 +08:00
status102
8a549466cd fix: 修复在战斗列表展开时,部分情形下无法正确关闭战斗列表 (#7563)
fix: 修复在战斗列表展开时,部分情形下无法正确关闭战斗列表
2023-12-13 20:38:52 +08:00
HY
1c8e5f73db feat: 繁中服生息演算 & 落葉逐火活動導航 (#7559)
落葉逐火的活動導航是 ok 的,但不知道為什麼辨識總是跑出 "工池" 跟 "工地",所以另外加上。

然後最重要的是
生息演算的部分還沒測試,只是先把我看起來該加的圖片跟 task 先補上而已。

也許可以先更新後,再看生息演算有啥問題一次修 (?
~~不然就要等我把 visual studio 那一部分用好才能知道了嗚嗚~~
2023-12-13 13:10:15 +01:00
status102
b838e26686 fix: 修复在战斗列表展开时,部分情形下无法正确关闭战斗列表 2023-12-13 20:08:32 +08:00
David
21ced64d21 Revert "chore: added reclamation algorithm task to view"
This reverts commit 3ebf790840.
[skpi ci]
2023-12-13 13:04:33 +01:00
David
3ebf790840 chore: added reclamation algorithm task to view 2023-12-13 13:03:43 +01:00
David
db6a9bbb3c chore: locked txwy reclamation algorithm.
waiting for adaptation (to reduce issues number)
2023-12-13 11:01:04 +01:00
David
5fc4605586 chore: Reclamation Algorithm task for txwy
(probably doesn't work as it will need adaptation)
fix: #7555
2023-12-13 10:52:03 +01:00
lpowo
677bc8dabf feat: 增加公招多选策略 (#7463)
* fix #7452   

按照 #7452 的想法,在 #6900  的基础上增加了只选尽可能多选且只选高星tag的功能选项,并将选项策略合并
默认策略:只选一个高星tag组合
#6900 策略:选满三个tag为止

新增策略:尽可能多选高星tag,且额外的tag组合要么完整选入,要么舍弃;且若当前出现更高星tag组合,则不会考虑较低星,只会尽可能选高星tag组合(例如出现五星tag时,将尽力多选五星tag,不会考虑四星tag)
(result_vec的排序规则暂时未更改)
在GUI中增加了选择公招策略的功能,如图:

<details>


![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/113409320/4b0d4f7d-5156-4144-b411-b96b604e49c7)

![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/113409320/18167d72-741a-4bcd-95c8-6f916dec008d)

</details>

最后用模拟器在自己账号上进行了一些自动公招测试。

---------

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2023-12-13 16:22:59 +08:00
zzyyyl
75ebe8aa96 chore: 更新日志跳过资源更新 (#7536)
f8169983e9
2023-12-13 14:29:50 +08:00
uye
7418d3f8c1 feat: 可以通过右键选择仅运行一次任务
fix #7528
2023-12-13 11:14:14 +08:00
Sherkey
30f654bb0c ci: 优化pr-checker的评论及日志格式,并自动删除先前的评论 (#7535) 2023-12-12 21:35:04 +08:00
github-actions[bot]
6eb0f76bbc docs: Auto Update Changelogs of v4.28.0-beta.2 (#7530)
Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: status102 <status102@outlook.com>
2023-12-12 20:28:22 +08:00
uye
033caa20ee Release v4.28.0-beta.2 (#7529) 2023-12-12 20:18:06 +08:00
uye
a13e044f12 fix: 修复地图资源特殊文件名下载失败 2023-12-12 20:15:53 +08:00
status102
a82b754fa6 perf: 移除CheckBox右键额外调用 (#7537)
perf: 移除CheckBox右键额外调用
2023-12-12 19:45:46 +08:00
status102
d041485252 perf: 移除CheckBox右键额外调用 2023-12-12 19:12:16 +08:00
uye
0f8cbf0f1a feat: 提取勾选框左右键点击单次执行逻辑 2023-12-12 18:04:11 +08:00
AnnAngela
c92d4a6db6 ci: 移除重复 2023-12-12 17:56:33 +08:00
AnnAngela
df88f82fdd ci: 发版 pr 自动添加 reviewer 2023-12-12 17:55:52 +08:00
AnnAngela
eed8a560b8 ci: Create release_reviewers.yaml 2023-12-12 17:53:20 +08:00
Constrat
3e73c1f53f chore: Auto Update Game Resources - 2023-12-12 2023-12-12 09:06:39 +00:00
uye
52939bb2a4 fix: 错误提交的测试内容 2023-12-12 15:47:36 +08:00
uye
e0f9bddd1d fix: 通过通知栏图标重复退出时报错
fix #7154
2023-12-12 15:45:56 +08:00
Constrat
cfa92f367c chore: Auto Update Game Resources - 2023-12-12 2023-12-12 06:29:33 +00:00
SherkeyXD
a2ce0ed523 ci: 单次最多检查commit数从30扩大到100 2023-12-12 14:16:34 +08:00
SherkeyXD
db50dce5f5 ci: pr-checker自动清除之前的评论 2023-12-12 13:59:53 +08:00
SherkeyXD
1cc63bb76a ci: pr-checker优化评论格式及日志输出 2023-12-12 13:58:52 +08:00
zzyyyl
f6412f5a7f chore: pr-checker 在发版时不运行 2023-12-12 13:32:21 +08:00
zzyyyl
8c4ff46431 chore: pr-checker 在发版时不运行 2023-12-12 13:30:36 +08:00
zzyyyl
8f812c570a chore: pr-checker 在发版时不运行 2023-12-12 13:25:37 +08:00
status102
96305fbd98 ci: 修复smoke-testing重复加载外服和国服资源导致潜在的非预期TaskData字段问题 (#7511)
ci: 修复smoke-testing重复加载外服和国服资源导致潜在的非预期TaskData字段问题
2023-12-12 12:25:07 +08:00
uye
35e8afb466 perf: 遇到问题时提前结束选取密文板 (#7501)
Co-authored-by: status102 <status102@outlook.com>
2023-12-11 18:13:13 +08:00
status102
d22b59b497 perf: SSS Stage Name revision to LT-n (#7527)
- link to #7523 
- close #7522 

这样就不用修改过往的作业了,未测试外服roi
2023-12-11 09:45:49 +01:00
status102
6d3a5d3749 fix: 修复最快截图用时输出数字未能添加千分位分隔符 2023-12-11 11:09:33 +08:00
status102
f4abb5da32 fix: 修复在截图最快方式检测不成功时,不输出数值 2023-12-11 11:07:45 +08:00
David
10d1a1a772 fix: corrected ReceiveAward txwy template
fix #7389
2023-12-10 14:14:25 +01:00
Sherkey
8561cfef61 ci: 规范化ci文件格式及step命名,优化pr-checker的触发逻辑及表现形式 (#7512)
+ 给所有 ci 文件的每一个 step 都添加了名字,并且做了格式化
+ 修复 pr-checker 的触发机制
+ 给 pr-checker 添加了 issue 评论,现在不合规的 commit 将会由 github-action bot 做出评论
2023-12-10 10:12:53 +08:00
uye
0f603e55dd feat: 日服支持加工站换班
#7508
2023-12-09 19:36:04 +08:00
status102
e166216457 ci: 增加smoke-testing单独对国服资源加载并检测,以判断是否为国服资源出错 2023-12-09 19:29:57 +08:00
David
5c2aab7065 style: verbose logging 2023-12-09 10:49:51 +01:00
Horror Proton
5b39c8ebcf feat: add nodiscard on minitouch input functions [skip changelog] 2023-12-09 13:04:06 +08:00
status102
ba4511aa85 ci: 修复smoke-testing重复加载外服和国服资源导致潜在的TaskData字段问题 2023-12-08 21:59:28 +08:00
uye
25302f1bb0 fix: 日服识别 斥罪->贝娜
#7508
2023-12-08 20:06:15 +08:00
David
5caa2bea30 revert db4171b684 SN changes 2023-12-08 12:48:53 +01:00
Constrat
f4085a107e chore: Auto Update Game Resources - 2023-12-08 2023-12-08 11:06:39 +00:00
uye
43c66a101f fix: 日服识别错误 麒麟->林
fix #7508
2023-12-08 17:43:07 +08:00
uye
b4fc7adcb5 rft: 重构 SettingsViewModel Init 2023-12-08 14:16:47 +08:00
Horror Proton
b7b215072d fix: fix coredump when minitouch failed to restart 2023-12-08 13:56:51 +08:00
Lancarus
086db045f4 perf: 肉鸽适配新干员用法 (#7500) 2023-12-08 13:08:18 +08:00
uye
e5fd1874eb ci: Update ci.yml 2023-12-07 19:36:33 +08:00
uye
dbe689f619 ci: smoke-testing.yml 2023-12-07 19:36:01 +08:00
uye
1f703b75a8 fix: 修复除version.json外无文件更新时不保存version 2023-12-07 19:26:53 +08:00
Sherkey
745c88393e docs: 文档目录结构大重构 (#7423)
close #7416 
+ 拆分安卓实体设备部分文档
+ 修改目录结构,文件名不再带序号
+ 规范了文档内的链接引用
+ 添加肉鸽烧水模式文档
+ 格式化文档

---------

Co-authored-by: AnnAngela <naganjue@vip.qq.com>
2023-12-07 17:22:55 +08:00
Yuang Xia
4c2a8ec87b fix: sample.py 获取地址从相对路径改为绝对路径 (#7483)
#7420 
待测试,我的环境是 Ubuntu 20.04,只能测了下在这么改了以后我的电脑上获取的路径是正常的了,但因为环境没有符合要求 glibc
的那些东西,所以不确定这么改以后到底能不能正常运行。
以及不确定会不会影响到 Win 环境下的正常运行。
2023-12-07 10:51:47 +08:00
zzyyyl
0d51398a4a fix: wrong task SN-Open (#7498) 2023-12-06 16:44:52 +01:00
zzyyyl
3999ed4561 fix: typo in task name (#7478) 2023-12-06 22:44:55 +08:00
status102
2c9a7a3b7d perf: 修改 截图测试耗时最快截图耗时 (#7496) 2023-12-06 19:29:48 +08:00
status102
dbfeff96d8 perf: 修改 最快截图截图测试耗时 (#7494) 2023-12-06 15:26:56 +08:00
status102
d082f62487 feat: 最快截图耗时超出阈值后,输出额外提示文本 (#7489)
feat: 最快截图耗时超出阈值后,输出额外提示文本
2023-12-06 09:55:24 +08:00
status102
ccf66a5c65 perf: Copilot页面增加延迟信息输出 2023-12-06 09:40:18 +08:00
Alisa
82f75bfb1c [skip ci] i18n: Translations update from MAA Weblate (#7480)
Translations update from [MAA Weblate](https://weblate.maa-org.net) for
[MaaAssistantArknights/MAA WPF
Gui](https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/).



Current translation status:

![Weblate translation
status](https://weblate.maa-org.net/widget/maa-assistant-arknights/maa-wpf-gui/horizontal-auto.svg)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: uye <2396806385@qq.com>
2023-12-06 09:19:25 +08:00
Constrat
86a049b2f9 chore: Auto Update Game Resources - 2023-12-05 2023-12-05 21:27:00 +00:00
Manicsteiner
1d63fbd398 feat: YoStarJP 狂人号 navigation change (#7488)
尖灭测试作战开启后,活动导航移至中部。
2023-12-05 22:13:26 +01:00
Constrat
c3589e6f09 chore: Auto Update Game Resources - 2023-12-05 2023-12-05 21:09:31 +00:00
David
890537822b typo: duplicate field
[skip ci] [skip changelog]
2023-12-05 21:56:28 +01:00
David
02911638ce fix: SN navigation template change 2023-12-05 21:54:44 +01:00
Constrat
e98ae16b39 chore: Auto Update Game Resources - 2023-12-05 2023-12-05 17:06:39 +00:00
Constrat
0e5cc0f550 chore: Auto Update Game Resources - 2023-12-05 2023-12-05 16:46:36 +00:00
status102
edbb9ae5e0 feat: 最快截图耗时超出阈值后,输出额外提示文本 2023-12-05 22:41:17 +08:00
uye
028c98a9a8 feat: SideStory「银心湖列车」活动导航 2023-12-05 21:02:36 +08:00
uye
40f38b8db7 chore: 修改NoStone图片模板 2023-12-05 20:46:15 +08:00
Constrat
14a8aab0f3 chore: Auto Update Game Resources - 2023-12-05 2023-12-05 08:08:29 +00:00
Constrat
59d6a56343 chore: Auto Update Game Resources - 2023-12-05 2023-12-05 07:26:06 +00:00
Constrat
1790d3359f chore: Auto Update Game Resources - 2023-12-05 2023-12-05 07:07:15 +00:00
uye
17c3911626 fix: 外服刷理智任务没有源石库存时卡死
fix #7481
2023-12-05 11:49:44 +08:00
uye
f89fd33994 fix: 多种模拟器多开时关闭错误模拟器
fix #7469
2023-12-05 11:37:14 +08:00
Constrat
7fbcaa0e06 chore: Auto Update Game Resources - 2023-12-05 2023-12-05 02:18:48 +00:00
uye
01cca6e0e8 KillEmulator记录地址和端口 2023-12-05 09:58:10 +08:00
David
2c4f502bb3 style: wrong task name 2023-12-04 21:18:48 +01:00
David
c743681818 perf: reduced screencap timeout (#7476)
refs:
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/7473#issuecomment-1838440548
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/7473#issuecomment-1838446255
2023-12-04 19:46:00 +01:00
David
502acd6450 feat: YostarEN I.S. trader regex
[skip changelog]
2023-12-04 14:38:14 +01:00
北雁 Cryolitia
23c0c27a87 Update sync-resource.yml 2023-12-04 20:43:47 +08:00
status102
6d1e50cc01 ci: PR Checker增加对提交父项数量的检查以避免通过改名应对 2023-12-04 09:48:23 +08:00
uye
e3060bec4d fix: 反斜杠处理错误
fix #7470
2023-12-04 00:06:30 +08:00
uye
954043d857 chore: furni忽略拼写检测 2023-12-04 00:03:35 +08:00
github-actions[bot]
eb90fa0a9f docs: Auto Update Changelogs of v4.28.0-beta.1 (#7456)
Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: status102 <status102@outlook.com>
Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
2023-12-03 17:30:12 +08:00
uye
35c9a47bcf Release v4.28.0-beta.1 (#7448) 2023-12-03 17:28:53 +08:00
Manicsteiner
e3c504168f fix: YoStarJP furniture drop (#7467) 2023-12-03 16:08:38 +08:00
zzyyyl
9c90038205 chore: 更新 issue-checker,调整 labels (#7460)
`module: GUI` -> `client: WpfGui`
`macOS` -> `client: MacGui`
`module: core` 合并到 `module: others`
2023-12-02 23:16:45 +08:00
zzyyyl
868a6a7f5f ci: PR Checker 忽略从 dev 发起合并的拉取请求 (#7462) 2023-12-02 23:01:07 +08:00
status102
7b7db6b3e6 Revert "ci: PR Checker在Merge之后不再运行" (#7461)
Reverts MaaAssistantArknights/MaaAssistantArknights#7451
2023-12-02 22:20:48 +08:00
status102
2c0390ec4d Revert "ci: PR Checker增加合并检查,合并后不再检查commit message" (#7459)
Reverts MaaAssistantArknights/MaaAssistantArknights#7457
2023-12-02 21:47:49 +08:00
status102
a903171be5 ci: PR Checker增加合并检查,合并后不再检查commit message (#7457) 2023-12-02 21:44:31 +08:00
AnnAngela
f5243ce8bb ci: 添加log 2023-12-02 21:28:19 +08:00
status102
4bd0a05013 ci: PR Checker增加i18n匹配 2023-12-02 19:17:52 +08:00
zzyyyl
f75ea14839 ci: PR Checker在Merge之后不再运行 (#7451) 2023-12-02 18:49:35 +08:00
David
a83444e55d feat: YostarEN Stultifera Navis navigation 2023-12-02 11:39:36 +01:00
status102
93e7489bb5 perf: 自动战斗部分操作增加时间输出并输出至gui.log (#7453) 2023-12-02 16:40:09 +08:00
Horror Proton
658ef97c4b fix: fix crashing after minitouch fails to restart 2023-12-02 16:22:28 +08:00
zzyyyl
e90a397a4e fix: 修复重岳等干员带三技能时点错的问题 (#7450)
选择三技能前先进行一次滑动

close #4977 
fix #7349
2023-12-01 23:52:23 +08:00
SherkeyXD
6090f311bc ci: PR Checker在Merge之后不再运行 2023-12-01 20:33:43 +08:00
Sherkey
f5dec98883 chore: 更新 Qodana 版本到 2023.3 EAP (#7424)
close #7177
顺带更改了平台为 x64
2023-12-01 18:06:50 +08:00
status102
e02f987471 feat: 新增检测最快截图方式后输出截图方法和截图测试耗时 (#7441)
feat: 新增检测最快截图方式后输出截图方法和截图测试耗时
2023-12-01 15:15:40 +08:00
uye
c988788b19 feat: 完成后选项 模拟器返回桌面 (#7185) 2023-12-01 14:37:53 +08:00
status102
ec455d1e58 perf: 非预期值输出???
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2023-12-01 14:28:30 +08:00
status102
c58d5c95fe refactor: 重构BattleHelper的m_cur_deployment_opers为vector (#7412)
refactor: 重构BattleHelper的m_cur_deployment_opers为vector
2023-12-01 14:03:44 +08:00
status102
f05fd6bc13 perf: 调整输出格式 2023-12-01 13:46:56 +08:00
status102
45a8cad1ea ci: PR Checker增加edited触发 2023-12-01 13:46:23 +08:00
status102
731d75a627 perf: 为不同耗时的输出配置不同颜色,阈值400/800 2023-12-01 12:13:13 +08:00
status102
1a31f72da5 perf: 优化中文输出 2023-11-30 19:47:15 +08:00
status102
bdda9b1e8e feat: 新增检测最快截图方式后输出截图方法和耗时 2023-11-30 19:43:24 +08:00
Constrat
509a448d70 chore: Auto Update Game Resources - 2023-11-30 2023-11-30 10:07:28 +00:00
status102
759cc5e440 ci: 对PR提交的commit名进行检查 (#7414)
合并后在rule里面添加这个检查就能达成效果

- link to #7296
2023-11-30 17:51:24 +08:00
Horror Proton
a1c4adf32c fix: fix unable to stop in ReportDataTask 2023-11-30 16:20:37 +08:00
Horror Proton
4f0c11d079 fix: pointer assignment in StageDropsTaskPlugin 2023-11-30 13:06:09 +08:00
zzyyyl
09c48d672c feat: 重构 TaskData (#7426)
相比 #7410 

- 修复了 Release 下模板图片加载失败的问题
- 修复 TaskData 部分 next 生成不完全的问题
- 优化了部分 `get.* = .*`
2023-11-29 22:26:04 +08:00
zzyyyl
c1f245c4cd fix: 修复肉鸽编队时选择干员重复点击导致未选中的问题 (#7393)
fix #7379
2023-11-29 22:12:09 +08:00
zzyyyl
46ae1e0505 fix: workaround for get.* = .* 2023-11-29 21:57:21 +08:00
zzyyyl
7fa2ba4978 fix: linux & mac compile error 2023-11-29 19:48:56 +08:00
zzyyyl
afaad13d6a fix: 修复 Release 下模板图片加载失败的问题
(cherry picked from commit 7d77e7f6df)
2023-11-29 19:42:57 +08:00
zzyyyl
48d4105a36 fix: 修复 TaskData 解析 A@B@LoadingText 失败的问题 2023-11-29 19:03:05 +08:00
zzyyyl
c9b10d08ea fix: 修复 TaskData 部分 next 生成不完全的问题
有新问题: `A@B@LoadingText` 没有 B 任务的时候无法生成,会在解析 B@LoadingText->next 的 #next 时出问题
2023-11-29 19:02:52 +08:00
zzyyyl
e4dbdb9017 refactor: 优化与 TaskData 的 get_raw 和 get 相关部分
fix: 使用 std::erase & std::erase_if, 避免使用具有不同定义的 ranges::remove & ranges::remove_if

现在 get_raw 只能获取任务的继承信息,其它详细信息会在 get 的时候解析。

另:
- 增加 TaskDerivedType 表示任务的继承类型
- 增加 TaskPipelineInfo 表示任务的流程信息(name + 5个TaskList的任务列表)
- 增加 TaskDerivedInfo 表示任务的继承信息,包含 base & prefix & TaskDerivedType
- 给各个任务类型的 shared_ptr 增加了别名;

(cherry picked from commit 6b5b0d5ec2)
2023-11-29 19:02:42 +08:00
zzyyyl
d86e5dc770 refactor: 从 TaskData 中分离 TaskDataSymbol, TaskDataSymbolStream;增加 TaskDataTypes
fix: 用 to_string 和 string 加法取代 std::format 以通过非 win 平台编译

asst::ResultOrError 是 std::expected 的下位替代(同时又类似于 std::optional)
(cherry picked from commit 55875a2eb5)
2023-11-29 19:02:24 +08:00
Constrat
8f145041d0 chore: Auto Update Game Resources - 2023-11-29 2023-11-29 08:08:05 +00:00
David
db4171b684 ci: line overwrite bypass in res-update (#7418) + SN GUI changes
ref:
-
e5be6a64f7 (commitcomment-133674922)
-
e5be6a64f7 (commitcomment-133704379)
-
e5be6a64f7 (commitcomment-133707192)
2023-11-29 08:52:33 +01:00
status102
71ce07d5e1 fix: 对理智药识别结果排序 2023-11-29 12:36:38 +08:00
status102
319452a7cd fix: 移除不必要的引用 2023-11-29 12:36:38 +08:00
David
51da43f196 chore: Manual YostarEN Auto Update Game Resources 2023-11-28 20:55:13 +01:00
Manicsteiner
31da83059f feat: YoStarJP 狂人号 navigation (#7417)
添加了导航。此外,此次活动的关卡UI界面还修改了理智和行动开始按钮的位置,确认同时存在于720p和1440p,所以调大了roi,但愿这个修改不会影响其他关卡。
2023-11-28 19:36:26 +01:00
zzyyyl
3ccc0107d7 Revert "feat: 重构 TaskData (#7410)"
This reverts commit 782e71d4aa, reversing
changes made to 940008b448.
2023-11-29 00:09:10 +08:00
zzyyyl
7d77e7f6df fix: 修复 #7410 导致的 Release 下模板图片加载失败的问题 2023-11-28 23:09:06 +08:00
Constrat
e5be6a64f7 chore: Auto Update Game Resources - 2023-11-28 2023-11-28 11:07:42 +00:00
status102
e76643ed47 perf: 优化识别干员姓名后的数据插入 2023-11-28 17:19:11 +08:00
zzyyyl
782e71d4aa feat: 重构 TaskData (#7410)
#### 主要修改

- 从 TaskData 中分离 TaskDataSymbol, TaskDataSymbolStream
- 优化与 TaskData 的 get_raw 和 get 相关部分
   现在 get_raw 只能获取任务的继承信息,其它详细信息会在 get 的时候解析。

#### 其它修改

- 增加 TaskDerivedType 表示任务的继承类型
- 增加 TaskPipelineInfo 表示任务的流程信息(name + 5 个 TaskList 的任务列表)
- 增加 TaskDerivedInfo 表示任务的继承信息,包含 base & prefix & TaskDerivedType
- 给各个任务类型的 shared_ptr 增加了别名;
- 增加 ResultOrError(是 std::expected 的下位替代,同时又类似于 std::optional)

close #7129
2023-11-28 15:55:50 +08:00
hmydgz
940008b448 docs: 补全战斗流程协议 actions 的 skill_times 参数 (#7413) 2023-11-27 23:18:39 +08:00
status102
a70a1ed6cb perf: 优化保全开局换牌 2023-11-27 16:26:16 +08:00
status102
cc3ac7ef1b refactor: 重构BattleHelper的m_cur_deployment_opers为vector 2023-11-27 16:22:44 +08:00
zzyyyl
6b5b0d5ec2 refactor: 优化与 TaskData 的 get_raw 和 get 相关部分
fix: 使用 std::erase & std::erase_if, 避免使用具有不同定义的 ranges::remove & ranges::remove_if

现在 get_raw 只能获取任务的继承信息,其它详细信息会在 get 的时候解析。

另:
- 增加 TaskDerivedType 表示任务的继承类型
- 增加 TaskPipelineInfo 表示任务的流程信息(name + 5个TaskList的任务列表)
- 增加 TaskDerivedInfo 表示任务的继承信息,包含 base & prefix & TaskDerivedType
- 给各个任务类型的 shared_ptr 增加了别名;
2023-11-27 14:59:12 +08:00
zzyyyl
55875a2eb5 refactor: 从 TaskData 中分离 TaskDataSymbol, TaskDataSymbolStream;增加 TaskDataTypes
fix: 用 to_string 和 string 加法取代 std::format 以通过非 win 平台编译

asst::ResultOrError 是 std::expected 的下位替代(同时又类似于 std::optional)
2023-11-27 14:59:12 +08:00
zzyyyl
060e07e23d fix: 修复剿灭退出时卡在情报汇总的问题 (#7409)
fix #3617 
fix #7408
2023-11-27 14:56:59 +08:00
zzyyyl
4faefe3eda fix: 修复剿灭退出时卡在情报汇总的问题 2023-11-27 14:42:12 +08:00
David
cc63deefc0 fix: YostarJP regex for alter and common error operators
fix #7402
2023-11-26 15:00:44 +01:00
AnnAngela
781e808658 ci: 修正 gh_token 2023-11-26 19:16:14 +08:00
AnnAngela
4f5bfbf01b ci: 资源更新时发起资源同步 2023-11-26 19:13:12 +08:00
status102
b4c6e1fe4a chore: Auto Update Game Resources - 2023-11-26 2023-11-26 17:02:24 +08:00
status102
3732d4b2ee refactor: 迁移剩下的肉鸽数据,移除Status相关逻辑 (#7331)
refactor: 迁移剩下的肉鸽数据,移除Status相关逻辑
2023-11-26 14:15:45 +08:00
status102
eaa7fcebed chore: Auto Update Game Resources - 2023-11-26
补上 `e289003fb8dd9b75d77e72255947aa978b5248eb` 中遗漏的修改
2023-11-26 14:08:46 +08:00
status102
5ad3b29c33 perf: 优化不必要的拷贝 2023-11-26 13:54:25 +08:00
status102
d0a5171442 resource: 更新新版危机合约地图 (#7399)
resource: 更新新版危机合约地图
2023-11-26 13:00:49 +08:00
status102
e289003fb8 resource: 更新新版危机合约地图 2023-11-26 12:24:57 +08:00
status102
83cec5b339 perf: 优化肉鸽主题校验 2023-11-26 10:25:06 +08:00
status102
193b636c0e perf: 移除Status相关逻辑,调整注释 2023-11-26 10:24:43 +08:00
status102
4d9e0895a8 fix: 修复傀影肉鸽结算识别可能导致崩溃的错误 2023-11-25 18:30:57 +08:00
zzyyyl
0e68e74b8a fix: 修复肉鸽编队时选择干员重复点击导致未选中的问题
另外加了点日志

fix #7379
2023-11-24 20:44:03 +08:00
status102
6e5f333bd8 fix: 修复使用临期理智药设置无法在任务中修改的错误 (#7383) 2023-11-24 16:48:21 +08:00
uye
21168a4fc9 fix: 信用商店购物时如有干员合同无法购物
fix #5953
2023-11-24 16:39:30 +08:00
David
b2d88de507 style: c -> C, total downloas 2023-11-23 19:13:08 +01:00
David
e4035c390a style: c -> C + total downloads 2023-11-23 19:10:59 +01:00
status102
496e990ae1 fix: 修正命名大小写 (#7384) 2023-11-23 23:09:53 +08:00
status102
ed0125f968 feat: 保全支持开局替换部分满足条件的非核心干员 (#7347)
feat: 保全支持开局替换部分满足条件的非核心干员
2023-11-23 19:05:14 +08:00
AnnAngela
c9ee2ada73 ci: 优化更新日志生成逻辑 (#7374) 2023-11-23 16:38:15 +08:00
zzyyyl
d6cfea8433 fix: ranges::count_if 的返回类型问题 2023-11-23 16:34:00 +08:00
status102
26ae1bd52a perf: 使用ranges::count_if替换数量统计
Co-authored-by: zzyyyl <74587068+zzyyyl@users.noreply.github.com>
2023-11-23 11:43:38 +08:00
AnnAngela
960afe2435 fix: 添加-i -o 2023-11-23 10:28:48 +08:00
AnnAngela
25ecae2120 fix: 繁中服“退出明日方舟”无效的问题
close #7363
2023-11-23 10:23:26 +08:00
uye
d8a828e3aa docs: Update CHANGELOG.md 2023-11-22 14:34:23 +08:00
AnnAngela
981ddedaf4 Release v4.27.0 (#7369) 2023-11-22 10:44:25 +08:00
status102
98094bb7a7 feat: 保全支持开局替换部分满足条件的非核心干员 2023-11-22 09:42:36 +08:00
status102
671faaa7b3 fix: 修复待部署区干员费用不识别的错误 2023-11-22 09:36:34 +08:00
github-actions[bot]
73e9629250 docs: Auto Update Changelogs of v4.27.0 (#7371)
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/7369

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
2023-11-22 09:29:30 +08:00
Constrat
db24383501 chore: Auto Update Game Resources - 2023-11-21 2023-11-21 20:07:29 +00:00
HY
835f59edf2 chore: 繁中服「登臨意」活動導航 (#7367) 2023-11-22 00:17:10 +08:00
Lancarus
cb2b058785 perf:优化傀影肉鸽部分逻辑 (#7368) 2023-11-21 23:04:02 +08:00
Horror Proton
95e67bf291 perf: do not rotate logs that are symbolic links 2023-11-21 22:22:25 +08:00
Constrat
c769ae74e6 chore: Auto Update Game Resources - 2023-11-21 2023-11-21 09:07:43 +00:00
Constrat
23949600dc chore: Auto Update Game Resources - 2023-11-21 2023-11-21 07:45:17 +00:00
Manicsteiner
89a9fc2730 docs: update glossary (#7361) 2023-11-21 09:25:56 +08:00
uye
36f7875c88 fix: 自动战斗一直点击查看折光
fix #7353
2023-11-20 10:50:54 +08:00
status102
03db17d8e5 docs: 增加Wpf自动战斗-战斗列表关于批量导入的提示 (#7338)
docs: 增加Wpf自动战斗-战斗列表关于批量导入的提示
2023-11-19 09:09:31 +08:00
David
5dfa38eb54 chore: move back old copilot SSS json
[skip changelog] [skip ci]
2023-11-19 00:28:39 +01:00
David
da96efb756 feat: SSS#2 YostarEN implementation (#7346) 2023-11-19 00:27:19 +01:00
Manicsteiner
ded49dc1db feat: YoStarJP SSS#2 (#7322)
保全派驻二期
约翰老妈新建地块 整完了,大概能用,我觉得是作业不行
雷神工业测试平台 下午继续
发现在ocr里 ‘り’ ‘リ’ 会识别错误
自动资源更新的 CharsNameOcrReplace 会给三次
[定向导能元件](https://prts.wiki/w/%E4%BF%9D%E5%85%A8%E6%B4%BE%E9%A9%BB#%E5%AE%9A%E5%90%91%E5%AF%BC%E8%83%BD%E5%85%83%E4%BB%B6)
的名称,应该有两次是其对应的 定向导能配件 ,可能需要修改相应功能。
2023-11-19 00:11:14 +01:00
status102
3a37a0e58f revert: 还原 630c453de54ea19ece3e4554b9792767d28b484b 中涉及连续战斗的部分以符合当前逻辑 (#7339)
revert: 还原 `630c453de54ea19ece3e4554b9792767d28b484b` 中涉及连续战斗的部分以符合当前逻辑
2023-11-18 21:00:21 +08:00
uye
0d25ef8e33 fix: 自定义基建计划找不到 THRM-EX
fix #7344
2023-11-18 20:09:16 +08:00
status102
ed7435c1fb fix: 优化部分情况下肉鸽技结算时技能增长未完全显示导致识别不正确 (#7332)
fix: 优化部分情况下肉鸽技结算时技能增长未完全显示导致识别不正确
2023-11-18 15:43:27 +08:00
Lancarus
5d70dc6219 docs:update萨米肉鸽密文板文档 (#7341) 2023-11-18 15:25:39 +08:00
status102
23c851d08c revert: 还原 630c453de54ea19ece3e4554b9792767d28b484b 中涉及连续战斗的部分以符合当前逻辑 2023-11-18 12:07:08 +08:00
status102
dc55375790 docs: 增加Wpf自动战斗-战斗列表关于批量导入的提示 2023-11-18 12:00:43 +08:00
status102
1c3bf74541 perf: 减少不必要的判断 2023-11-18 09:47:55 +08:00
status102
c9232ffa54 fix: 优化部分情况下肉鸽技结算时技能增长未完全显示导致识别不正确 2023-11-17 22:05:56 +08:00
status102
8b308865f3 perf: 迁移肉鸽干员 2023-11-17 21:33:41 +08:00
status102
22ac8be103 perf: 迁移肉鸽UseNonfriendSupport 2023-11-17 21:08:26 +08:00
status102
854e17f4ec perf: 迁移肉鸽UseSupport 2023-11-17 21:08:20 +08:00
status102
5356ad9439 refactor: 迁移肉鸽密文板 (#7310)
refactor: 迁移肉鸽密文板
2023-11-17 21:00:56 +08:00
status102
1e78ddd87b perf: 重命名函数名称 2023-11-17 19:58:14 +08:00
uye
0287b713a5 fix: 游戏资源下载失败 (#7329) 2023-11-17 18:04:18 +08:00
status102
4dd1530b66 fix: 修复战斗列表关卡名匹配正则无法匹配S关、TR关的错误 2023-11-17 15:35:29 +08:00
uye
51b0a4949e fix: 游戏资源下载失败
Enhanced Resource Retrieval with 'using' and Retry

fix #7261
fix #7321
2023-11-17 14:58:12 +08:00
status102
fce5c8cc93 fix: 移除Status中的变量 2023-11-16 21:53:44 +08:00
status102
a1b03d0468 refactor: 重构肉鸽密文板存储 2023-11-16 21:29:43 +08:00
status102
47210b33ac refactor: 重构肉鸽每一层的预见密文板获取 2023-11-16 20:16:57 +08:00
AnnAngela
1f8fd5e87f docs: 更新MUMU12后台保活相关 2023-11-16 17:16:27 +08:00
uye
eab2704fd6 fix: 干员识别错漏
fix #7317
2023-11-16 13:54:37 +08:00
David
38266f5b9e tools: all client templates
[ski changelog]
2023-11-15 22:43:58 +01:00
uye
ee4b509413 chore: 新增一些开机自启设置的日志 2023-11-15 23:57:17 +08:00
uye
ec6cdecb1e fix: 在启动时错误显示开机自启的状态(实际功能不受影响) 2023-11-15 23:57:17 +08:00
zzyyyl
c5cb491dbd fix: 修复Wpf自动战斗-作业代码直接读取剪贴板会带入换行的错误 (#7313)
fix #7283
2023-11-15 21:18:42 +08:00
David
82a9d8a382 fix: Lone Trail YostarEN navigation
[skip changelog]
2023-11-15 12:27:06 +01:00
status102
cf10929df6 fix: 修复Wpf自动战斗-作业代码直接读取剪贴板会带入换行的错误
fix #7283
2023-11-15 18:25:48 +08:00
uye
e37b0bad45 Release v4.27.0-beta.1 (#7298) 2023-11-15 17:23:54 +08:00
uye
eccd82846b docs: Update CHANGELOG.md 2023-11-15 17:20:54 +08:00
Constrat
792062e31d chore: Auto Update Game Resources - 2023-11-15 2023-11-15 09:08:10 +00:00
uye
bed6106185 fix: 修复地图资源特殊文件名下载失败
fix #7257
2023-11-15 17:05:53 +08:00
github-actions[bot]
98ae45e848 docs: Auto Update Changelogs of v4.27.0-beta.1 (#7309)
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/7298

---------

Co-authored-by: ABA2396 <ABA2396@users.noreply.github.com>
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
2023-11-15 15:55:04 +08:00
AnnAngela
2fd0cc26a4 chore: Update SECURITY.md 2023-11-15 15:10:30 +08:00
AnnAngela
65b20b6a8f chore: Update SECURITY.md 2023-11-15 15:10:18 +08:00
AnnAngela
0fdbddafe1 chore: Create SECURITY.md 2023-11-15 15:07:25 +08:00
status102
e584c7901f fix: 修复肉鸽主题迁移导致的错误 (#7308)
fix: 修复肉鸽主题迁移导致的错误
2023-11-15 14:53:55 +08:00
status102
960fe3d379 fix: 修复肉鸽主题迁移导致的错误 2023-11-15 14:35:05 +08:00
status102
f2789940d6 feat: 肉鸽刷等级模式新增结算输出并保存截图至achievement文件夹 (#7276)
feat: 肉鸽刷等级模式新增结算输出并保存截图至achievement文件夹
2023-11-15 11:27:12 +08:00
status102
d1ac6ed8ed perf: 增加重试次数限制 2023-11-15 09:27:17 +08:00
status102
5de56c13eb refactor: 迁移肉鸽主题,迁移肉鸽主题和模式检查 (#7304)
refactor: 迁移肉鸽主题,迁移肉鸽主题和模式检查
2023-11-15 08:32:34 +08:00
David
2f1af211d6 fix: YostarEN Trader Shopping I.S. regex
[skip changelog]
2023-11-14 20:43:24 +01:00
uye
3829dbd8e7 feat: 关卡掉落汇报至一图流 (#7235)
糊个屎先)
之后再在ui里加个企鹅和一图流的上报开关
2023-11-15 00:44:46 +08:00
Manicsteiner
889149d756 fix: YoStarJP 孤星 sidestory navigation update (#7305) 2023-11-15 00:15:40 +08:00
zzyyyl
fceb17a999 fix: 修复 刷理智-指定材料 选项取消无效的问题 (#7303)
fix #7302
2023-11-14 21:55:02 +08:00
status102
c89048818e perf: 替换肉鸽主题字符串 2023-11-14 21:51:07 +08:00
status102
079aeeea93 fix: 修复肉鸽结算技能条未完全走完导致识别错误 2023-11-14 21:34:31 +08:00
status102
72812bd646 perf: 未通关时不保存结算截图 2023-11-14 21:34:30 +08:00
status102
6a0f3a70ae fix: 移除注释,修改结算图保存路径至achievement/roguelike 2023-11-14 21:34:30 +08:00
status102
ecfd5ea8de fix: 修复水月、傀影肉鸽无法正确识别结算内容 2023-11-14 21:34:30 +08:00
status102
b1c3f3a2ff feat: 新增肉鸽结算输出并保存截图至debug文件夹 2023-11-14 21:34:29 +08:00
zzyyyl
5dc4fefff9 fix: 修复 刷理智-指定材料 选项取消无效的问题
fix #7302
2023-11-14 21:20:09 +08:00
status102
921d303465 perf: 迁移肉鸽模式检查 2023-11-14 21:00:39 +08:00
status102
a9b00f77f3 perf: 迁移肉鸽主题、肉鸽主题检查 2023-11-14 21:00:05 +08:00
zzyyyl
9e6ceab9a6 fix: 修复肉鸽修改参数后不生效的问题 (#7289)
重构肉鸽 `set_params` 相关内容

fix #7267
2023-11-14 20:51:08 +08:00
zzyyyl
befc3703c0 fix: vcxproj & filters 2023-11-14 20:22:28 +08:00
ChingCdesu
e752e03bda style: comment align of localizations 2023-11-14 18:42:55 +08:00
MistEO
061d98d626 Update ReportDataTask.cpp 2023-11-14 18:23:45 +08:00
uye
aee0d9a17c Merge branch 'dev' into upload_to_yituliu 2023-11-14 16:40:41 +08:00
uye
51a9abfc4f chore: 添加不上报时的日志 2023-11-14 16:28:18 +08:00
uye
17f8cf7a96 chore: 添加两个上报的界面翻译 2023-11-14 16:27:54 +08:00
status102
eb7439b4f4 fix: 修复外服未实装连续战斗导致多次尝试 (#7294)
fix: 修复外服未实装连续战斗导致多次尝试
2023-11-14 09:16:09 +08:00
status102
fd0d99263f fix: 修复外服未实装连续战斗导致多次尝试 2023-11-14 09:04:34 +08:00
David
6cc29db35d fix: YostarEN Trader Shopping I.S. regex
[skip changelog]
2023-11-13 18:57:14 +01:00
uye
38c0e82b50 style: 调整变量位置,修改注释 2023-11-14 01:14:28 +08:00
uye
2ed9555c9e feat: core支持修改是否开启一图流上报,ui支持修改是否开启一图流和企鹅物流上报 2023-11-14 01:10:12 +08:00
David
01c67e87ee Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-11-13 17:49:29 +01:00
David
ee76259283 fix: YostarEN I.S. Trader Shopping regex
[skip changelog]
2023-11-13 17:49:26 +01:00
uye
d330fe6dbe fix: 修复错误的变量名 2023-11-14 00:11:23 +08:00
uye
8347768ea6 refactor: 重构 StageDropsTaskPlugin 上传函数,实现代码重用 2023-11-14 00:00:27 +08:00
uye
7448c6a188 chore: 修改一图流的dropUrl 2023-11-13 23:29:13 +08:00
status102
f817944d8d perf: 自动在刷理智第一次执行时调整连战次数为1 (#7210)
perf: 自动在刷理智第一次执行时调整连战次数为1
2023-11-13 18:28:26 +08:00
status102
bb9c2609e9 Merge branch 'dev' into feat/fight_series 2023-11-13 17:19:52 +08:00
David
c86cfc70b8 fix: YostarEN "Ines" infrastructure regex
[skip changelog]
2023-11-13 10:05:00 +01:00
MistEO
e4a6245c62 doc: 修改adb pair部分 (#7286) 2023-11-13 15:40:49 +08:00
status102
1bf4d5f33d fix: 修复在部分情况下,自动战斗-自动编队时干员页面最边缘干员名字未露出,导致编队时表现错误 (#7253)
fix: 修复在部分情况下,自动战斗-自动编队时干员页面最边缘干员名字未露出,导致编队时表现错误
2023-11-13 11:44:46 +08:00
Horror Proton
3d80b118ee fix: update threshold for StageDropsImageAnalyzer
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7282
2023-11-13 10:59:44 +08:00
Rbqwow
d3dca1d025 doc: 修改adb pair部分 2023-11-13 00:01:03 +08:00
status102
adb6d2b5bc fix: 修复部署时补偿距离过大,导致部署朝向滑动起始点超出范围 (#7284)
- link to #7215 
旋转角度被去掉了,看了下似乎不同坐标的角度有差别
2023-11-12 23:12:16 +08:00
status102
5b03fa97e2 fix 2023-11-12 22:58:21 +08:00
status102
a41a3ea009 fix: 修复部署时补偿距离过大,导致部署朝向滑动起始点超出范围 2023-11-12 22:52:59 +08:00
status102
d5a68bf277 perf: 移除未使用的变量 (#7281) 2023-11-12 20:42:41 +08:00
status102
186223c88a i18n: 修改肉鸽事件输出(移除肉鸽二字) 2023-11-12 20:19:12 +08:00
uye
a0475da1e3 fix: 修复错误的下载提示,在某个文件下载错误后直接返回 2023-11-12 18:18:46 +08:00
status102
64c6e44e2c perf: 移除未使用的变量 2023-11-12 16:59:27 +08:00
status102
df7a8ae212 perf: 优化理智识别模块,取消预处理,取消内部重试 (#7280) 2023-11-12 16:48:37 +08:00
status102
5d8526abd1 perf: 优化理智识别模块,取消预处理,取消内部重试 2023-11-12 14:52:54 +08:00
status102
cdc809bea9 revert: 回调部署干员朝向滑动距离为400,回调滑动duration为100,增加补偿距离上限 (#7277) 2023-11-12 14:23:47 +08:00
status102
d8312b672b fix 2023-11-12 13:20:37 +08:00
status102
dda9c9d017 revert: 回调部署干员朝向滑动距离为400,回调滑动duration为100,增加补偿距离上限 2023-11-12 12:50:33 +08:00
uye
a17f156d78 fix: 修复因为触底反弹选中的错误的干员 2023-11-12 00:18:15 +08:00
uye
bf13e41a4e chore: 基建少滑几次 2023-11-12 00:03:04 +08:00
MistEO
98b7475671 feat: 自动战斗-战斗列表新增无限吃理智药选项 (#7240) 2023-11-11 23:54:17 +08:00
uye
6d645cd071 fix: 修复滑动次数过少导致加工站放入错误的干员
fix #7264
2023-11-11 23:29:18 +08:00
Constrat
b2f9f030eb chore: Resource Update - TXWY data fix 2023-11-11 14:05:02 +00:00
David
8343d7a5c5 fix: TXWY resource updater FINAL fix
ref: #7259
Huge thanks to @Tsuk1ko and @AnnAngela for their invaluable help
2023-11-11 15:01:20 +01:00
David
64fbe3052d Update main.cpp 2023-11-11 08:49:20 +01:00
David
50b2f35528 Update main.cpp 2023-11-11 08:41:18 +01:00
status102
9ce9139cee fix: 移动cpp文件的位置 (#7269) 2023-11-11 13:49:36 +08:00
status102
e35fff1516 fix: 移动cpp文件的位置 2023-11-11 13:47:13 +08:00
Constrat
abc7ed66f3 chore: Auto Update Game Resources - 2023-11-10 2023-11-10 20:37:22 +00:00
David
bfe24efbf3 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-11-10 21:32:18 +01:00
David
1f7187926b TEMP FIX for res-update-game.yml
[skip changelog]
2023-11-10 21:32:16 +01:00
David
26799c5fca ci: env resource updater
[skip changelog]
2023-11-10 21:07:35 +01:00
David
8e51978c00 fix: resource updater clone token 2023-11-10 21:01:20 +01:00
David
d03833910f feat: txwy resource updater (#7259)
Co-authored-by: AnnAngela <naganjue@vip.qq.com>
Co-authored-by: David <david.pezzot@alice.it>
2023-11-10 20:42:01 +01:00
uye
e7ea339925 fix: 修改错误的回调 2023-11-11 02:37:43 +08:00
status102
93b5f31add refactor: 迁移肉鸽部分数据 (#7184) 2023-11-10 21:47:12 +08:00
status102
ecbe271601 perf: 移除未使用的tag 2023-11-10 21:22:32 +08:00
uye
ac2d9d4d78 chore: 修改游戏资源更新后的显示内容 2023-11-10 15:15:34 +08:00
MistEO
ffdbb98ea2 feat: 支持识别长于一页的掉落列表 (#7202) 2023-11-10 14:20:23 +08:00
uye
6a96642778 chore: 修改游戏资源更新后的显示内容 2023-11-10 14:07:25 +08:00
David
046cf75d76 feat: updated txwy resources
with #7259
2023-11-09 21:32:19 +01:00
status102
8d8c9814af perf: 迁移肉鸽TeamFullWithoutRookie 2023-11-09 22:47:07 +08:00
status102
3755db095e perf: 迁移肉鸽开局精二 2023-11-09 22:36:40 +08:00
status102
7d73c44519 perf: 迁移肉鸽核心干员 2023-11-09 22:32:19 +08:00
status102
2549be766f perf: 迁移肉鸽难度 2023-11-09 22:25:30 +08:00
status102
5aec014b52 perf: 迁移肉鸽不再购物 2023-11-09 22:09:49 +08:00
status102
7b0e1b4867 perf: 迁移肉鸽阵容是否完备 2023-11-09 22:04:31 +08:00
status102
0d535f9592 perf: 迁移肉鸽开局干员是否已招募 2023-11-09 22:01:34 +08:00
status102
652a49f47c perf: 迁移肉鸽招募次数 2023-11-09 21:23:00 +08:00
status102
c3bc6ae6ff refactor: 迁移肉鸽模式 2023-11-09 19:46:29 +08:00
Lancarus
ce4995d5f5 perf: 优化萨米肉鸽部分关卡逻辑 (#7255)
fix #7238
2023-11-09 18:08:13 +08:00
Lancarus
a1e5bb60c1 perf: 优化萨米肉鸽部分关卡 2023-11-09 17:35:10 +08:00
uye
b5fee2a67b feat: 游戏资源热更进度显示
#6666
2023-11-09 17:27:08 +08:00
zzyyyl
5fa3d8ab5c refactor: 重构肉鸽数据存储,迁移肉鸽主题 (#7138) 2023-11-09 16:55:43 +08:00
status102
2075a88d7b fix: 修复在部分情况下,编队时干员页面最边缘干员名字显示不完整 2023-11-09 16:39:03 +08:00
uye
508ef08f69 feat: 添加游戏资源更新失败提示 2023-11-09 11:12:04 +08:00
Horror Proton
0a19f1db07 style: format devcontainer.json 2023-11-08 22:07:57 +08:00
Horror Proton
abea80b101 docs: add GitHub codespace to dev instructions 2023-11-08 22:07:57 +08:00
Horror Proton
c2f7e659d4 chore: add devcontainer.json for GitHub codespace 2023-11-08 22:07:57 +08:00
status102
0ae92d0de5 docs: 补充使用BattleUseOper->preDelay的注释 2023-11-08 19:28:57 +08:00
Horror Proton
cae0f2227a chore: move image merging to StageDrop analyzer 2023-11-08 18:47:05 +08:00
status102
a14883ada2 fix: 尝试修复部署时滑动超出范围 (#7215)
fix: 尝试修复部署时滑动超出范围
2023-11-08 18:45:44 +08:00
status102
38fac9db46 perf: 增大干员部署朝向duration 2023-11-08 18:44:07 +08:00
MistEO
7b13b39e62 chore: Auto Update Game Resources - 2023-11-08 2023-11-08 09:05:53 +00:00
uye
3983509636 feat: 一图流汇报区分公招和掉落识别 2023-11-08 16:13:35 +08:00
MistEO
aff9318a5d feat: 外部通知设置显示移至UI判断 (#7244) 2023-11-08 15:09:59 +08:00
MistEO
19f086931f feat: 支持运行任务时阻止休眠 (#7218) 2023-11-08 15:08:47 +08:00
MistEO
2a45d9fd75 feat: YoStarJP 孤星 sidestory navigation (#7242) 2023-11-08 15:04:44 +08:00
MistEO
6b010d3d14 fix: Exit Arknights of YoStar servers (#7243) 2023-11-08 15:04:30 +08:00
SherkeyXD
644ab57825 feat: 外部通知设置显示移至UI判断 2023-11-08 12:20:01 +08:00
uye
e5a27d5b62 feat: adb路径填写错误时弹窗提醒 2023-11-08 11:31:55 +08:00
ManicSteiner
ea7bb2fd12 fix: Exit Arknights of YoStar servers 2023-11-08 09:49:49 +08:00
ManicSteiner
a833fc123a feat: YoStarJP 孤星 sidestory navigation 2023-11-08 09:44:54 +08:00
David
91805cb7f5 feat: adapted MiningActivityDigging YostarEN
@ABA2396was this algorithm removed? (Like Reclamation Algorithm, how to implement?)
2023-11-07 20:21:12 +01:00
David
c68bd1d8d4 tools: ignore_templates.txt
[skip ci] [skip changelog]
2023-11-07 19:20:56 +01:00
David
60e517e654 fix: WordOcr for navigation 2023-11-07 18:52:51 +01:00
David
3c504e5fd8 feat: YostarEN Sidestory Lone Trail navigation 2023-11-07 18:45:29 +01:00
MistEO
2611e15fa3 chore: Auto Update Game Resources - 2023-11-07 2023-11-07 17:06:24 +00:00
status102
5fb4d0d3c0 fix: 修复吃理智药在网络波动时可能产生重复使用的错误 (#7190)
close #7187

---------

Co-authored-by: zzyyyl <74587068+zzyyyl@users.noreply.github.com>
2023-11-07 23:55:10 +08:00
status102
6b79953956 perf: 优化部分参数 2023-11-07 22:18:03 +08:00
status102
c61f523a7a feat: 自动战斗-战斗列表新增无限吃理智药选项 2023-11-07 22:03:03 +08:00
status102
9a66a05e73 perf: 战斗列表输入关卡名的文本框新增提示文本 (#7239) 2023-11-07 21:47:06 +08:00
status102
e852b6ad84 perf: 上调低信赖干员输入框最小宽度 2023-11-07 20:29:28 +08:00
status102
320dac2328 perf: 战斗列表输入关卡名的文本框新增提示文本 2023-11-07 20:25:37 +08:00
MistEO
081687d993 chore: Auto Update Game Resources - 2023-11-07 2023-11-07 11:06:09 +00:00
uye
3cd3f1d90e Update JP/LONETRAIL 孤星 (#7236) 2023-11-07 17:58:37 +08:00
Wallsman
e3d51cd85f Update operators.md 2023-11-07 18:54:39 +09:00
Wallsman
314b314ce5 Update JP/LONETRAIL 孤星
Add メラナイト/ホルハイヤ/ミュルジス
2023-11-07 18:40:13 +09:00
uye
4d91c5e173 feat: 关卡掉落汇报至一图流 2023-11-07 17:37:23 +08:00
uye
140b1b8c9c fix: 153_3换加工站异常 2023-11-07 15:51:47 +08:00
MistEO
3d5f92e46c chore: Auto Update Game Resources - 2023-11-07 2023-11-07 07:26:36 +00:00
MistEO
e71380ead9 chore: Auto Update Game Resources - 2023-11-07 2023-11-07 07:05:35 +00:00
David
b49125f979 fix: Missing Text OCR when Limited + Expire monthly (#7229)
fix #7175
fix #7226
2023-11-06 13:06:01 +01:00
Horror Proton
3cff6bebc9 chore: update variable name remove dead code, etc 2023-11-06 19:31:29 +08:00
David
2797827d17 fix: text Ocr for Mall Task
fix #7175
2023-11-06 11:44:02 +01:00
David
85f574b438 chore: removed unused templates
Mall task uses OcrDetect in every client
2023-11-06 11:14:35 +01:00
David
125ee73764 feat: Furniture Drop localization (#7203)
---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2023-11-06 09:39:18 +01:00
status102
7222735f08 fix: 修正旋转函数 2023-11-06 15:02:54 +08:00
status102
3091689079 fix: 移除屏幕尺寸的const 2023-11-06 14:34:58 +08:00
MistEO
6525b68662 feat: GetImageFromRoi小工具支持直接上mask (#7223) 2023-11-06 13:59:30 +08:00
Yanstime
630c453de5 docs: 详细介绍:抄作业:优化 + 刷理智:自动重复代理相关 (#7180) 2023-11-06 13:58:22 +08:00
SherkeyXD
5040e0aeb3 feat: GetImageFromRoi小工具支持直接上mask 2023-11-06 13:27:22 +08:00
ManicSteiner
338df73601 移除返回桌面 2023-11-06 10:20:56 +08:00
ManicSteiner
f5d9e3ec69 add korean translate 2023-11-06 09:53:58 +08:00
status102
5d6de2bc56 fix: 统一 views::range
473a1b8 被覆盖丢失
2023-11-06 09:17:05 +08:00
David
19bfaf8986 style: name 2023-11-05 20:42:07 +01:00
SherkeyXD
c0d170dbf3 feat: 支持运行任务时阻止休眠 2023-11-05 23:56:35 +08:00
status102
b6ec9bffe2 fix: 修正错字 2023-11-05 23:11:30 +08:00
Horror Proton
69c6439d4c chore: revert some changes on analyze_baseline 2023-11-05 23:08:34 +08:00
Horror Proton
f26c4bc3b6 feat: ability to recognize long drop list 2023-11-05 23:08:34 +08:00
status102
5665eef1cc fix: 尝试修复部署时滑动超出范围 2023-11-05 22:57:37 +08:00
status102
d2f1628faf fix: 修复移除超额理智药后,如果没有使用任何药品会导致反复识别的错误 (#7195) 2023-11-05 19:33:53 +08:00
status102
5eb7c4d0c3 fix: 修改部分变量名称 2023-11-05 18:13:04 +08:00
status102
715556cca1 fix: 修复移除超额理智药后,如果没有使用任何药品会导致反复识别的错误 2023-11-05 18:12:09 +08:00
status102
f15e812df2 perf: 自动在刷理智第一次执行时调整连战次数为1 2023-11-05 15:46:44 +08:00
zzyyyl
a30e7b39e7 chore: 调整GetImageFromROI对未声明template任务截图时,直接使用任务名命名输出图片 (#7207) 2023-11-05 12:44:04 +08:00
status102
d04bf219af chore: 调整GetImageFromROI对未声明template任务截图时,直接使用任务名命名输出图片 2023-11-05 10:29:26 +08:00
北雁 Cryolitia
c8bfb011a5 Update sync-resource.yml 2023-11-05 02:39:01 +08:00
北雁 Cryolitia
cdf828fa57 Update sync-resource.yml 2023-11-05 02:23:44 +08:00
北雁 Cryolitia
ed9bc3dca2 Update sync-resource.yml 2023-11-05 02:09:12 +08:00
uye
398b65e8c1 fix: 设置为管理员权限启动的 MAA 无法开机自启 2023-11-05 00:50:22 +08:00
zzyyyl
473a1b81ba perf: 统一 views::reverse 2023-11-04 20:53:21 +08:00
Horror Proton
435b18115c fix: fix recruit regression [skip changelog]
ref: 724428eab
2023-11-04 19:33:55 +08:00
uye
dad98c901a fix: 移除游戏资源更新中提示信息的请勿关闭MAA说明 (#7191)
- link to #6666
2023-11-04 12:11:28 +08:00
status102
efc99b4279 fix: 移除游戏资源更新中提示信息的请勿关闭MAA说明 2023-11-04 10:56:27 +08:00
北雁 Cryolitia
3859fe7425 Update sync-resource.yml 2023-11-04 04:08:07 +08:00
北雁 Cryolitia
96a832d318 Update sync-resource.yml 2023-11-04 04:05:44 +08:00
北雁 Cryolitia
b6329cccd4 Add Sync-Resource-CI (#7186) 2023-11-04 03:55:46 +08:00
ManicSteiner
38e0a05c5b feat: 返回桌面&模拟器返回桌面 2023-11-03 23:37:43 +08:00
Lancarus
57c7651d09 perf: 肉鸽适配新干员默认技能 (#7181)
4.5周年干员默认技能
2023-11-03 22:19:52 +08:00
uye
793bd00cef choreUpdate 153_layout_3_times_a_day.json 2023-11-03 21:34:15 +08:00
status102
acc3077a53 perf: m_roguelike_config -> m_config 2023-11-03 21:09:17 +08:00
Lancarus
2f963d58f0 perf: 肉鸽适配新干员默认技能 2023-11-03 18:28:39 +08:00
zzyyyl
0287bb2a05 perf: 使用 std::erase 取代 erase-remove 惯用法 (#7179) 2023-11-03 17:17:27 +08:00
zzyyyl
e0d77819c9 perf: 使用 std::erase & std::erase_if 取代 remove-erase 2023-11-03 16:46:04 +08:00
zzyyyl
74e96ffa89 fix: 修复干员识别没有收起职业栏导致最后一列干员可能识别错误的问题
fix #7172
2023-11-03 14:13:50 +08:00
zzyyyl
ab15a24108 perf: 优化账号切换日志输出
link to #7171
2023-11-03 14:00:02 +08:00
Horror Proton
724428eab0 fix: update recruit m_slot_fail
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7159
2023-11-03 11:37:44 +08:00
David
8ce8b21290 fix: minimum 0 for Recruit Time, Invest and Roguelike Start times 2023-11-02 21:43:17 +01:00
MistEO
56acb34848 Release v4.26.1 (#7166) 2023-11-03 00:25:20 +08:00
MistEO
dbcf53b280 docs: Update CHANGELOG.md 2023-11-03 00:23:09 +08:00
uye
cca6464d54 fix: 连战界面显示问题 2023-11-03 00:14:49 +08:00
zzyyyl
337eb8f2eb fix: 修复连续作战中间黑屏时间长会导致判定断线重连的问题 2023-11-03 00:13:18 +08:00
uye
b2e6214bbc Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-11-03 00:02:37 +08:00
uye
94bcd01134 feat: 连战界面显示当前次数 2023-11-03 00:02:30 +08:00
github-actions[bot]
e084877a94 docs: Auto Update Changelogs of v4.26.1 (#7167)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-11-02 23:50:44 +08:00
MistEO
e2f307b16e chore: Auto Update Game Resources - 2023-11-02 2023-11-02 15:48:28 +00:00
uye
9f060afb1b Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-11-02 23:37:14 +08:00
uye
5963e9fef1 feat: ZT 关卡导航 2023-11-02 23:37:07 +08:00
MistEO
6e0f3067af chore: 掉落times字段修改 2023-11-02 23:36:23 +08:00
MistEO
1ca4f7228c feat: 支持掉落次数识别+上传 2023-11-02 23:23:17 +08:00
MistEO
838c0f548d Revert "chore: 試試更新 version.json 內的東西"
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7165
This reverts commit 2e35efa58d.
2023-11-02 21:37:17 +08:00
uye
60d2e11e13 chore: 繁中服「將進酒」復刻活動導航 (#7158) 2023-11-02 17:21:55 +08:00
momomochi987
2e35efa58d chore: 試試更新 version.json 內的東西 2023-11-02 16:33:29 +08:00
momomochi987
0f1346d81f chore: 繁中服「將進酒」復刻活動導航 2023-11-02 16:30:52 +08:00
MistEO
f671be1223 chore: Auto Update Game Resources - 2023-11-02 2023-11-02 05:05:56 +00:00
status102
e9bc1aeae2 fix: 修复理智药插件中变量名错误;调整文档中理智药相关说明 (#7147)
fix: 修复理智药插件中变量名错误;调整文档中理智药相关说明
2023-11-02 12:43:49 +08:00
zzyyyl
33de231182 style: format
[skip changelog]
2023-11-02 12:09:43 +08:00
Hao Guan
17d80c3e22 fix: Mac GUI 兼容旧版设置 2023-11-02 12:16:33 +10:00
Lancarus
15ebc4f717 fix:战斗列表崔林特尔梅之金第十关ocr错误 2023-11-02 02:47:44 +08:00
David
ec8c373d44 fix: Skadi Alter EN ocrreplace regex
[skip ci] [skip changelog]
2023-11-01 17:38:03 +01:00
status102
d767629fdc docs: 翻译更正
Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
2023-11-02 00:33:04 +08:00
MistEO
7cc9c8d292 chore: Auto Update Game Resources - 2023-11-01 2023-11-01 15:06:19 +00:00
status102
8870ee68de fix: 变量名拼写错误 2023-11-01 21:51:34 +08:00
status102
9a90a21059 docs: 更正文档中的使用理智药相关说明 2023-11-01 21:50:56 +08:00
David
16417e32a6 feat: DepotEnter适配界面主题 (#7145) 2023-11-01 14:26:55 +01:00
Zhao Zuohong
113f3235b3 feat: DepotEnter适配界面主题 2023-11-01 19:36:32 +08:00
MistEO
a5d908eba2 chore: Auto Update Game Resources - 2023-11-01 2023-11-01 08:07:25 +00:00
Hao Guan
0767551756 fix: 修复CI编译Mac GUI失败 2023-11-01 14:53:33 +10:00
Hao Guan
bc9bf1db32 feat: Mac GUI 领取邮件 2023-11-01 14:23:46 +10:00
uye
2246cc07ec fix: 修复刷理智误吃非临期理智药 2023-11-01 11:01:55 +08:00
MistEO
d779ffdb2d chore: Auto Update Game Resources - 2023-11-01 2023-11-01 02:32:03 +00:00
MistEO
1148357a23 chore: Auto Update Game Resources - 2023-10-31 2023-10-31 20:06:16 +00:00
Lancarus
2c6f9fc9d0 fix: 修复密文板roi过小 (#7140)
会导致最下面一个板子识别不到,加了点高度
2023-11-01 02:49:03 +08:00
Lancarus
db989e2fb4 Eyjafjalla 艾雅法拉 korean OcrReplace (#7139)
Eyjafjalla 艾雅法拉 korean OcrReplace
2023-11-01 02:48:37 +08:00
Lancarus
65b32b13f4 fix: 修复密文板roi过小 2023-11-01 02:40:27 +08:00
David
85f802fbaa Update resource/global/YoStarKR/resource/tasks.json 2023-10-31 19:17:17 +01:00
status102
81621fdd68 perf: set_roguelike_theme -> set_theme 2023-10-31 22:50:06 +08:00
status102
04241b42d6 fix: 全局替换遗漏 2023-10-31 22:04:31 +08:00
Large-Japchae
46287e2621 Update tasks.json
Eyjafjalla 艾雅法拉 korean OcrReplace
2023-10-31 22:59:51 +09:00
status102
8ca6ec3208 refactor: 不再继承RoguelikeConfig,使用AbstractRoguelikeTaskPlugin统一共享RoguelikeConfig 2023-10-31 21:55:44 +08:00
MistEO
72513562e4 Release v4.26.0 (#7123) 2023-10-31 18:01:15 +08:00
status102
f5583a14c0 perf: 理智识别模块优化:对识别区域预处理;增加失败后重试;优化log输出 (#7084) 2023-10-31 13:34:18 +08:00
MistEO
1fa26b4ee1 docs: Update CHANGELOG.md 2023-10-31 13:31:37 +08:00
Hao Guan
a9cb610dde feat: Mac Gui 自动关闭游戏 2023-10-31 14:53:55 +10:00
github-actions[bot]
54d5d89b6c docs: Auto Update Changelogs of v4.26.0 (#7134)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-31 10:19:24 +08:00
David
7e91237296 繁中服 訪問好友修正 (#7133)
有時只會訪問一人
Fix #6041 , Fix #7013 , Fix #7107
2023-10-30 18:55:28 +01:00
vonnoq
4295f875c7 繁中服 訪問好友修正
有時只會訪問一人
2023-10-31 00:55:21 +08:00
David
a2672f3d9e fix: EN Phantom I.S. Encounter Ocr regex
link to EN傀影不期而遇遇上鸭爵,会选择战斗可是不会进入战斗 #6975
2023-10-30 15:28:40 +01:00
zzyyyl
814a254c7a fix: 修复美服傀影肉鸽不期而遇 "Adventurer Commission"(委托冒险者)的问题
fix #7128
2023-10-30 17:30:00 +08:00
北雁 Cryolitia
0152f8f03a 在 AppImage 中添加 Terminal=true (#7126)
https://github.com/AppImage/appimage.github.io/pull/3270#issuecomment-1783756048
2023-10-30 17:18:28 +08:00
zzyyyl
96bfea4d75 fix: 删除多余(且导致水月肉鸽卡住)的 StartExploreConfirm
link to #6094
fix #7114
2023-10-30 17:13:08 +08:00
北雁 Cryolitia
258f9ec6ba 在 AppImage 中添加 Terminal=true
https://github.com/AppImage/appimage.github.io/pull/3270#issuecomment-1783756048
2023-10-30 17:03:17 +08:00
uye
8897280586 docs: Update 2.4-PURE_WEB_PR_TUTORIAL.md 2023-10-30 16:30:53 +08:00
status102
c1f399b48c feat: register_plugin允许更多传参 (#7122)
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-30 14:56:31 +08:00
MistEO
5e919096ce docs: Enlarge contributors' avatars 2023-10-30 14:39:07 +08:00
MistEO
1417895436 docs: show avatar for all contributors 2023-10-30 14:29:47 +08:00
David
160643ac4b Revert "fix: Il Siracusano enter screen change"
This reverts commit 4e792626a5.
@MistEO@ABA2396 this is the correct rev
[skip ci]
2023-10-29 20:10:02 +01:00
MistEO
3502ac4e1a Release v4.26.0-beta.3 (#7115) 2023-10-30 00:03:36 +08:00
status102
7ae4812ab6 fix: qodana (#7119) 2023-10-29 23:21:08 +08:00
status102
7e00abcd59 fix: qodana 2023-10-29 23:19:27 +08:00
zzyyyl
0d0ab1f9d8 feat: 开启 ASST_DEBUG 时在日志中用连线表示 LoggerAux (#7092) 2023-10-29 22:51:39 +08:00
github-actions[bot]
5069f9258c docs: Auto Update Changelogs of v4.26.0-beta.3 (#7118)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-29 22:31:51 +08:00
MistEO
5c684b8a19 fix: c# warnings
https://qodana.cloud/projects/3P0oy/reports/bgQrn#b72d583de51429269e5fa72095c5bda51487aaf6e865d8dee7b9ca4b63fca88d
2023-10-29 22:27:44 +08:00
MistEO
ecdccbcc08 perf: add some mirror for resource updates 2023-10-29 22:12:20 +08:00
MistEO
f862cdee2a feat: 肉鸽增加不期而遇事件名输出 (#7112) 2023-10-29 21:37:36 +08:00
status102
a604866737 fix: 格式更正 2023-10-29 21:09:27 +08:00
MistEO
72136751f1 Revert "perf: unused template removal" (#7116) 2023-10-29 19:54:58 +08:00
MistEO
a337b6487f Revert "perf: unused template removal" 2023-10-29 19:52:13 +08:00
MistEO
975108aba6 perf: 优化部分情况下,单个刷理智任务在多次执行时等待时间过长 (#7108) 2023-10-29 19:51:48 +08:00
status102
cb52337710 fix: 移除投资后不必要的点击 2023-10-29 19:45:19 +08:00
status102
a248036d09 feat: 肉鸽增加不期而遇事件名输出 2023-10-29 19:45:19 +08:00
MistEO
e97de2c4db fix: 修复Wpf无法复制版本号至剪贴板 (#7109) 2023-10-29 19:36:43 +08:00
MistEO
686ccc05df feat: 调整理智药使用为按瓶计数,移除了博朗台在使用理智药不溢出情况下的额外等待,调整Wpf理智药使用输出 (#7022) 2023-10-29 19:36:29 +08:00
MistEO
d3949197f8 fix: 优化设置引导界面的视觉效果,并给 UI Theme 添加翻译 (#7047) 2023-10-29 19:36:08 +08:00
MistEO
decb1b1aee perf: 优化Wpf关卡数据更新提示,改为Growl.Info (#7103) 2023-10-29 19:34:05 +08:00
MistEO
18ddd36061 perf: unused template removal (#7113) 2023-10-29 19:33:47 +08:00
MistEO
77d0757ca1 feat: 新增获取信用-借助战时使用指定编队 (#7061) 2023-10-29 19:33:35 +08:00
Wallsman
34e716db07 Add Operator JP/12章
Add Operator JP/12章
2023-10-29 18:58:46 +09:00
David
85f6bd648c fix: Mizuki I.S. encouter regex
[skip ci]
2023-10-29 10:48:57 +01:00
David
232c9762e7 fix: Terra Research Commission EN regex
[skip ci]
2023-10-29 10:03:52 +01:00
David
27b691ab44 perf: unused template removal 2023-10-29 09:42:01 +01:00
uye
fedd09ea18 chore: 多划几次 2023-10-29 14:45:14 +08:00
uye
b401a1472b fix: 叙拉古人活动导航 2023-10-29 13:08:50 +08:00
status102
2340005427 fix: 修复Wpf无法复制版本号至剪贴板 2023-10-29 12:24:51 +08:00
status102
d503df0a64 perf: 优化部分情况下,单个刷理智任务在多次执行时等待时间过长 2023-10-29 12:04:26 +08:00
David
4e792626a5 fix: Il Siracusano enter screen change
[skip ci]
2023-10-28 23:10:54 +02:00
status102
b99dd803ae perf: 优化Wpf关卡数据更新提示,改为Growl.Info 2023-10-28 23:20:20 +08:00
Lancarus
7b69018c7d perf: 优化萨米肉鸽部分关卡策略 (#7099) 2023-10-28 18:48:06 +08:00
Lancarus
12789302a2 perf: 优化萨米肉鸽部分关卡策略 2023-10-28 17:19:14 +08:00
zzyyyl
b7a34aa4dd style: format 2023-10-28 14:24:32 +08:00
MistEO
e024cc953e chore: Auto Update Game Resources - 2023-10-28 2023-10-28 00:36:11 +00:00
Horror Proton
a3b53fc59f feat: graph to indicate LoggerAux in debug mode 2023-10-27 23:01:55 +08:00
Sherkey
fcdab4eb39 docs: 修复日文文档中顿号导致的渲染问题 2023-10-27 17:11:46 +08:00
zzyyyl
4c82f4dafd feat: 萨米肉鸽使用密文板 (#7086) 2023-10-27 15:40:07 +08:00
Horror Proton
aecd16c4c5 fix: coredump after failing to restart minitouch 2023-10-27 14:41:38 +08:00
Lancarus
a5fe0b6ab8 perf: 将CiphertextBoard更换为foldartal 2023-10-27 13:32:43 +08:00
zzyyyl
4f63c89dc4 fix: 修复肉鸽编队会漏选干员的问题(比如>=3页) (#7038)
fix #6985
fix #7059
2023-10-27 13:23:59 +08:00
Lancarus
8e14ab7e49 fix:萨米肉鸽层名ocr错误 2023-10-27 12:27:29 +08:00
MistEO
5b3d774f04 docs: 更新QQ群描述 2023-10-27 09:34:33 +08:00
Lancarus
dc455860f3 feat:获得每一层预见的密文板 2023-10-27 03:46:02 +08:00
Constrat
cb8be68a32 manual after res-update fix 2023-10-26 19:41:23 +00:00
David
65afb6bae4 fix: resource updater + updated data (#7079)
fix: #7074
2023-10-26 21:36:24 +02:00
Zhe Weng
5b4b444109 feat: 肉鸽编队时最后选择预备干员 2023-10-27 00:24:33 +08:00
Zhe Weng
52a2dba3b5 fix: 修复肉鸽中遇到的长干员名识别问题 2023-10-27 00:24:33 +08:00
zzyyyl
4bc874942b chore: 調整繁中服「照我以火」導航任務、替換水月肉鴿 "繼續探索" 圖片 (#7085)
fix #6889
2023-10-27 00:12:44 +08:00
Lancarus
cab61ecd1f fix: 修复使用密文板卡住的问题 2023-10-26 23:46:12 +08:00
momomochi987
34a0361f95 chore: 移除不再需要的圖片 2023-10-26 23:09:21 +08:00
momomochi987
c817988844 chore: 調整繁中服「照我以火」導航任務 2023-10-26 22:55:13 +08:00
status102
9bf95ecb3f fix: 修改字符串id 2023-10-26 22:09:31 +08:00
Lancarus
755a3a4314 fix: 按review加回!need_exit() 2023-10-26 17:32:14 +08:00
zzyyyl
3d26f97a30 fix: 修复在点击停止后下一次开始任务时可能操作延时很高的问题 (#7052) 2023-10-26 14:17:38 +08:00
status102
41c4bccc10 fix: 移除inline 2023-10-26 13:45:48 +08:00
youqii
73ca80f183 fix: 初始化变量 2023-10-26 10:32:56 +08:00
status102
cf924869b5 fix: 修正变量名 2023-10-26 10:11:30 +08:00
status102
2763aa279f fix: 使用static vector代替数组
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-26 10:09:28 +08:00
momomochi987
579acdc979 fix: 更換台服水月肉鴿 "繼續探索" 截圖 2023-10-26 10:01:17 +08:00
youqii
bbfdd572d7 pref: 删除include不必要的头文件 2023-10-26 08:25:03 +08:00
youqii
4dd014341d i18n: 下拉框选项适配多语言 2023-10-26 08:19:21 +08:00
youqii
ef2acdf042 pref: 移除不必要的成员变量 2023-10-26 07:48:09 +08:00
status102
665d2fc16d perf: 移动m_battle_select_formation_task_name到函数内部 2023-10-26 07:48:09 +08:00
status102
7616ac7ee0 perf: 修改使用当前编队文本 Default -> Current 2023-10-26 07:48:09 +08:00
status102
e8730f5d81 fix: 移除formation_index_from_rect函数 2023-10-26 07:48:09 +08:00
status102
8be86f9eb8 perf: 移除图像识别,点击固定位置切换编队 2023-10-26 07:48:09 +08:00
status102
e5b7b9f8f5 perf: 修改Wpf为下拉框,增加不切换所选编队的选项 2023-10-26 07:48:09 +08:00
youqii
f434a9a262 feat: GUI中添加选项 2023-10-26 07:48:08 +08:00
youqii
abb703418e feat: 自动编队时使用指定编队 2023-10-26 07:48:08 +08:00
David
2c5ee4977c feat: Morgan 摩根 ocrreplace
[skip ci]
2023-10-25 22:25:59 +02:00
David
f82eb0b612 fix: duplicate update in stage.json
(my mistake from 8598020711)
2023-10-25 20:19:43 +02:00
Lancarus
dd69ff6808 perf: 按照review意见修改,尝试修改运行时逻辑防止死循环 2023-10-26 02:17:49 +08:00
Lancarus
5f9a1dcddb fix: 修改密文板ocr阈值,防止要使用的板子在最下面时识别不到 2023-10-26 02:16:21 +08:00
Lancarus
4b02e246ba perf: 优化部分萨米肉鸽关卡策略 (#7075) 2023-10-26 01:03:56 +08:00
Lancarus
e6e0c42a41 perf: 优化部分萨米肉鸽关卡策略 2023-10-25 22:56:48 +08:00
status102
a011708bc5 fix: 移除tasks.json中部分遗漏的字段 2023-10-25 22:04:47 +08:00
status102
f330f502aa perf: 合并数字ocr replace部分,继承NumberOcrReplacetask 2023-10-25 21:42:42 +08:00
zzyyyl
a9f9424c4f fix: 修复日服基建换班卡在宿舍 (#7068)
fix #7063
2023-10-25 19:26:54 +08:00
MejiroSilence
9464c6c845 fix: 修复日服基建换班卡在宿舍 2023-10-25 15:25:05 +08:00
status102
d65a2892e8 fix: 修改std::ranges为asst::ranges,以保持一致 2023-10-25 15:22:18 +08:00
status102
b4f9410a5d fix: 增加初始化,修复使用临期药时可能重复点击移除按钮 2023-10-25 15:16:32 +08:00
SherkeyXD
ca0189d858 feat: UI Theme添加翻译 2023-10-25 14:45:18 +08:00
zzyyyl
2397bd1576 revert: 恢复萨米肉鸽使用密文板
Revert "Revert "feat: 萨米肉鸽使用密文板 (#6949)" (#7054)"

This reverts commit c12f35a099.
2023-10-25 14:41:22 +08:00
zzyyyl
0dd4441683 feat: 增加雷电模拟器 nc 截图方式 (#7062)
使用 `busybox nc`

用户可能需要在模拟器中开启 adb 远程调试
2023-10-25 14:00:57 +08:00
zzyyyl
6150ce58b1 fix: 修复 #7016 可能影响的部分任务 (#7066) 2023-10-25 13:56:36 +08:00
status102
79e76ffe96 fix: remove annotation 2023-10-25 11:59:24 +08:00
status102
fb4dea5bb5 fix: name and qodana 2023-10-25 11:59:23 +08:00
status102
c1bd5e4ae0 fix: 修复移除过量理智药时识别错误 2023-10-25 11:59:23 +08:00
status102
22d5c1975c fix: 修复临期理智药无法使用 2023-10-25 11:59:23 +08:00
status102
5591bf144c fix: format 2023-10-25 11:59:22 +08:00
status102
930145378b fix: 增加理智药使用时的操作延迟以避免重复吃药 2023-10-25 11:59:22 +08:00
status102
a7e6d497cf fix: 移除多余任务 2023-10-25 11:59:22 +08:00
status102
9b87703780 feat: 调整理智药使用为按瓶计数,优化掉了博朗台在使用理智药不溢出情况下的额外等待 2023-10-25 11:59:21 +08:00
David
4390232dfe fix: SkipThePreBattlePlot lowered threshold
@MistEO this task is intended for IN-BATTLE plot, not the one before the battle correct?
2023-10-24 21:47:32 +02:00
David
65907c34ac feat: As in my Adumbration operator implementation 2023-10-24 19:33:24 +02:00
MistEO
dfe5aa6b06 refactor: Wpf迁移MaaCore引用,统一合并至MaaService (#6945) 2023-10-25 00:50:22 +08:00
status102
5cf9710b38 Merge branch 'dev' into feat/service 2023-10-24 23:51:20 +08:00
MistEO
680b284729 fix: 修复公招多选 Tags 选项不保存的问题 (#7065) 2023-10-24 22:21:50 +08:00
zzyyyl
d7584515b3 fix: 修复 #7016 可能影响的部分任务 2023-10-24 20:03:35 +08:00
youqii
d5637550da fix: 公招多选 Tags 保存至配置文件 2023-10-24 19:07:05 +08:00
zzyyyl
e49b646056 docs: fix code block in user guide for CLI (#7060) 2023-10-24 16:51:25 +08:00
zzyyyl
35d3af099f fix: call_command 外部中断时中止进程 2023-10-24 16:21:53 +08:00
zzyyyl
db4e97e0b5 fix: 尝试修复 RawByNc 截图方式在点击停止后下一次继续时有概率操作延时很高的问题 2023-10-24 16:21:53 +08:00
zzyyyl
642744bfa4 perf: call_command() 在 wait_time < 0 时允许最后一次重试(以便输出调试信息) 2023-10-24 16:21:45 +08:00
zzyyyl
578d47096d feat: 增加雷电模拟器 nc 截图方式 2023-10-24 14:04:30 +08:00
Loong
9a86334d8a docs: fix code block 2023-10-24 13:38:43 +08:00
MistEO
33c67e550a Release v4.26.0-beta.2 (#6999) 2023-10-24 01:00:56 +08:00
github-actions[bot]
dd62d7c453 docs: Auto Update Changelogs of v4.26.0-beta.2 (#7055)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-24 01:00:23 +08:00
MistEO
c12f35a099 Revert "feat: 萨米肉鸽使用密文板 (#6949)" (#7054) 2023-10-24 01:00:09 +08:00
zzyyyl
a21d709f95 Revert "feat: 萨米肉鸽使用密文板 (#6949)"
This reverts commit 78b4fbd4d9.
2023-10-24 00:24:26 +08:00
zzyyyl
8e5fd998d3 fix: update MaaCore.vcxproj.filters 2023-10-23 22:40:27 +08:00
MistEO
fc5707fc03 feat: 公招出高星干员时选中多个tag (#6900) 2023-10-23 21:13:04 +08:00
MistEO
17f75f41be chore: bump maa-cli and update documents (#7050) 2023-10-23 21:12:34 +08:00
MistEO
8d49bc5206 chore: add 1 sec delay for resource OTA 2023-10-23 21:11:49 +08:00
Loong
0b0cfdba82 docs: update CLI document for latest version 2023-10-23 21:08:13 +08:00
Loong
92633142db chore: bump maa-cli to v0.3.12 2023-10-23 17:59:16 +08:00
MistEO
7b18382b01 fix: fix some warnings from visual studio (#7031) 2023-10-23 17:38:21 +08:00
youqii
d20c9709e1 feat: GUI新增选项 2023-10-23 17:27:08 +08:00
zzyyyl
0219faab38 chore: 增加 TaskSorter 脚本对 tasks.json 进行排序 (#7046) 2023-10-23 16:51:45 +08:00
SherkeyXD
f4704be5a3 fix: 优化设置引导界面的视觉效果 2023-10-23 16:33:03 +08:00
zzyyyl
b71b5c72bc chore: Remove "tools/ResourceUpdater/Tasks_Sorter.py" 2023-10-23 16:24:54 +08:00
zzyyyl
e794ac066e style: 对 tasks.json 进行排序 2023-10-23 16:22:41 +08:00
zzyyyl
52ff1821e8 ci: 更新 TaskSorter 脚本 2023-10-23 16:22:33 +08:00
zzyyyl
6e5731fed3 chore: 增加 TaskSorter 脚本对 tasks.json 进行排序
外服任务内字段顺序也依照国服
2023-10-23 16:22:25 +08:00
youqii
5e1b97b393 pref: 将代码段拆进函数 2023-10-23 16:12:20 +08:00
youqii
c45ae6aaed feat: 公招出高星干员时选中多个tag 2023-10-23 16:12:19 +08:00
Lancarus
984a30cb26 perf 优化萨米肉鸽部分关卡策略 2023-10-23 13:46:07 +08:00
zzyyyl
05a4bd3e5f fix: 修复“迷城”界面公开招募有时出错的问题 2023-10-23 13:38:05 +08:00
Zhe Weng
67e34bbf90 fix: 修复肉鸽编队会漏选干员的问题 2023-10-23 12:33:36 +08:00
zzyyyl
9c7fd49e5b fix: 修复肉鸽探索失败后卡在每月委托/解锁收藏品等界面
fix #7033
2023-10-23 11:30:09 +08:00
zzyyyl
95536c0854 style: format
[skip changelog]
2023-10-23 11:09:42 +08:00
zzyyyl
b603618d40 perf: 优化水月肉鸽策略 (#7043) 2023-10-23 11:06:43 +08:00
北雁 Cryolitia
783a2bb0ab Change to Appimage Package on Linux (#7030)
build:
https://github.com/Cryolitia/MaaAssistantArknights/actions/runs/6601833217

test:

![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/23723294/fcf66055-fb11-42a5-95fe-6271437d6a6d)

PS: 浏览器里写的所以历史有点乱,建议 squash merge
2023-10-23 10:30:22 +08:00
羽弥Tian_Yumi
20761f9f26 优化水月肉鸽部署策略 2023-10-23 09:28:45 +08:00
羽弥Tian_Yumi
e5717117a1 增加一些分组 2023-10-23 09:26:19 +08:00
David
33a41c5b19 fix: 繁中服 保全派駐識別修正 (#7041) 2023-10-22 21:30:51 +02:00
uye
4d5f7e56b2 style: 删除多余引用 2023-10-23 00:45:55 +08:00
uye
f594a134df fix: 剪切板错误
fix #7040
2023-10-23 00:40:56 +08:00
vonnoq
05ad1ccb2c 繁中服 保全派駐識別修正 2023-10-23 00:19:25 +08:00
David
82aa482475 fix #7027 (#7039)
fix #7027
2023-10-22 17:58:07 +02:00
zzyyyl
41fddb8d70 feat: 声明 baseTask 的任务直接覆盖同名任务 (#7016) 2023-10-22 23:49:31 +08:00
Cryolitia
b12c35d844 fix #7027 2023-10-22 23:37:05 +08:00
MistEO
dcf203187e chore: Auto Update Game Resources - 2023-10-22 2023-10-22 11:07:43 +00:00
David
5489c71458 perf & typo: removed redundant variable & variable typo (#7032) 2023-10-22 12:41:12 +02:00
David
fbfc4a6ca1 perf & typo: removed redundant variable & variable typo 2023-10-22 12:37:56 +02:00
uye
94baa44792 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-10-22 17:52:29 +08:00
uye
bc01704446 feat: IS 关卡复刻 2023-10-22 17:49:01 +08:00
status102
a467a7091f fix: qodana 2023-10-22 16:59:41 +08:00
MistEO
0bf80bdebe chore: Auto Update Game Resources - 2023-10-22 2023-10-22 08:28:38 +00:00
status102
1738a6ee6a fix 2023-10-22 16:25:22 +08:00
status102
7ce3428b85 fix: fix some warning from visual studio 2023-10-22 16:13:23 +08:00
quyansiyuanwang
490cfbf033 perf & refactor: 重构 tools/AutoLocalization (#6995)
其中包含部分更优化和跟规范的算法或结构

---------

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
2023-10-21 16:17:34 +02:00
David
776f27ccc5 feat: 繁中服 保全派駐 (#7021) 2023-10-21 10:19:08 +02:00
vonnoq
948305208d 繁中服 保全派駐 2023-10-21 02:07:50 +08:00
zzyyyl
83eb18565f style: sort tasks
[skip changelog]
2023-10-21 00:13:54 +08:00
zzyyyl
d0c9d20ce9 fix: 修复繁中服「照我以火」活動導航
[skip changelog]
2023-10-21 00:13:29 +08:00
zzyyyl
7be34191b9 docs: 更新任务流程协议相关文档 2023-10-20 19:28:59 +08:00
HY
ecd6baf11d feat: 繁中服「照我以火」活動導航 (#7002)
台服不知道為什麼左側變成顯示水月肉鴿的東西了,像這樣


![Screenshot_20231019-162333](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/45387477/c948e74f-2b69-4eb6-b4a0-9c7f15105fe6)

~~不能只偷懶改字就好 QQ~~

只好參考其他以圖片當辨識目標的 SideStory 寫法,寫一個照我以火的導航

如果還有需要調整的地方,再麻煩各位大佬了 ( ´•̥̥̥ω•̥̥̥` )

---------

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: zzyyyl <74587068+zzyyyl@users.noreply.github.com>
2023-10-20 13:24:58 +02:00
zzyyyl
5706d122c8 feat: 多文件任务中直接声明 baseTask 的任务不继承同名任务参数而是直接覆盖 2023-10-20 19:06:09 +08:00
David
6894cfdbd3 feat: 日服保全派驻 (#7012)
添加日服保全派驻的task。测试基本能用。似乎不会选择“无需增调干员”。
2023-10-20 12:52:39 +02:00
uye
8950d2ceaf feat: 开始任务后强制锁定当前基建配置,强制定时启动时强制刷新基建配置 2023-10-20 17:32:31 +08:00
ManicSteiner
6c02ae50fc fix: 日服保全派驻两处选项 2023-10-20 16:30:38 +08:00
ManicSteiner
1c45ff9a82 feat: 日服保全派驻 2023-10-20 15:32:08 +08:00
Horror Proton
18817c18b7 chore: fix typos [skip changelog] 2023-10-20 11:36:22 +08:00
zzyyyl
86601f4fac fix: 修复肉鸽打完退出的问题 2023-10-19 23:50:14 +08:00
Lancarus
06c92f6b1b perf: 优化部分肉鸽逻辑 (#7004) 2023-10-19 21:26:46 +08:00
Lancarus
fd7feeb9a9 perf: 优化部分肉鸽逻辑 2023-10-19 21:03:01 +08:00
zzyyyl
fb13a0f943 style: format [skip changelog]
python tools\ClangFormatter\clang-formatter.py --input=src\MaaCore --ignore="[\"src/MaaCore/x64\"]"
python tools\ClangFormatter\clang-formatter.py --input=resource\ --ignore="[\"resource/Arknights-Tile-Pos\", \"resource/infrast.json\"]"
2023-10-19 14:35:06 +08:00
MistEO
7776d151a0 chore: Auto Update Game Resources - 2023-10-19 2023-10-19 06:07:53 +00:00
zzyyyl
4beb733fcf Revert "feat: 删除无用的 Roguelike@Continue 相关任务"
This reverts commit bd40f03422.
2023-10-19 12:31:31 +08:00
MistEO
03aa96619c fix: 修复Wpf自动战斗-战斗列表-批量导入时,缓存文件夹未存在导致报错的bug;调整关卡名匹配规则 (#6988) 2023-10-19 11:09:16 +08:00
status102
cb8ea19825 perf: 当清空自动战斗-战斗列表中的所有任务时,移除缓存中的战斗列表文件夹 (#6994) 2023-10-19 11:08:32 +08:00
Lancarus
78b4fbd4d9 feat: 萨米肉鸽使用密文板 (#6949)
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-19 10:57:33 +08:00
status102
df8d7b7a7b docs: 补充基建排班协议中period字段不存在时的计划切换动作 (#6998) 2023-10-19 10:56:37 +08:00
status102
4835b00dac perf: 拆分赋值 2023-10-19 01:00:14 +08:00
status102
9fffc04428 fix: 移除无用的null check 2023-10-19 00:47:57 +08:00
David
95940c2aa0 fix: YostarEN Mizuki I.S. Trader + encouter regex (#6993)
ref:
- #6992
2023-10-18 18:29:12 +02:00
status102
ee0128667e fix: 加点null check 2023-10-18 23:51:50 +08:00
zzyyyl
ed0060703f perf: TaskData 优化 (#6844)
1. 调整 TaskData 的部分内部函数,增加注释
2. 从 TaskData 中拆出 JsonMisc
3. 增加一个任务 MainThemes,表示任务链入口
2023-10-18 23:48:03 +08:00
zzyyyl
c520a03a7f fix: 修复部分模板图片
close #6889
2023-10-18 21:52:41 +08:00
zzyyyl
7c01a3a147 feat: 增加任务截图插件 (#6973)
close #6966 
link to #6975
2023-10-18 21:15:00 +08:00
status102
85e040668b perf: wpf自动战斗-战斗列表,当文件名 / title由字母、数字、-组成时,直接作为关卡名使用 2023-10-18 21:11:26 +08:00
zzyyyl
10c442ca21 rft: 增加一个任务 MainThemes,表示任务链入口 2023-10-18 20:57:27 +08:00
zzyyyl
59eac9529d rft: 从 TaskData 中拆出 JsonMisc 2023-10-18 20:57:19 +08:00
zzyyyl
066a4b3315 rft: 调整 TaskData 的部分内部函数,增加注释 2023-10-18 20:57:07 +08:00
status102
00a09ac8a7 perf: 自动战斗-战斗列表-批量导入时使用正则提取文件名中的关卡名 2023-10-18 20:27:05 +08:00
status102
d945a99655 perf: 提取关卡名匹配函数 2023-10-18 20:26:01 +08:00
zzyyyl
2f75d4b0a9 feat: 给肉鸽任务增加截图插件 2023-10-18 20:12:39 +08:00
zzyyyl
6dadc7cc6c feat: 增加任务截图插件 2023-10-18 20:12:31 +08:00
status102
a40ec5f31b fix: 移除对_isVideoTask的错误赋值,以及对文件的拓展名、大小校验 2023-10-18 20:06:07 +08:00
status102
0f2eb8e5b3 fix: 修复缓存文件夹未存在时,批量添加作业导致的错误 2023-10-18 20:04:32 +08:00
zzyyyl
1f297e652a perf: m_plugins 使用 vector 而非 set 2023-10-18 17:56:12 +08:00
zzyyyl
3d6b4e1b97 fix: 修复美服 “A Cold Separation”(寒渊惜别)关卡识别错误 2023-10-18 17:31:23 +08:00
zzyyyl
e30d872bb1 fix: 修复 maatouch 滑动 2023-10-18 16:55:00 +08:00
quyansiyuanwang
5287e60a58 chore: re-write changelog_generator in algorithm (#6972)
更高效的匹配commit type
2023-10-18 14:42:14 +08:00
MistEO
73fbc24990 fix: 調整繁中服某些不期而遇的 ocrReplace (#6977) 2023-10-18 11:15:33 +08:00
HY
c06c6768c3 fix: "緊急調遣" -> "緊急調.*"
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-18 10:32:03 +08:00
momomochi
8c5c77d327 fix: 調整某些不期而遇關卡 OCR 2023-10-18 09:38:30 +08:00
MistEO
e769f3dc88 Release v4.26.0-beta.1 (#6911) 2023-10-18 00:56:46 +08:00
zzyyyl
9a44746cb1 chore: 在 commit message 中写上 [skip changelog] 可以在生成更新日志时跳过 2023-10-18 00:25:04 +08:00
zzyyyl
d7033a2298 chore: 默认不输出带信息 merge commit 的 commits tree 2023-10-17 23:51:35 +08:00
zzyyyl
ffab1a3c2c chore: 优化 changelog_generator
- 增加 co-author 处理
- 忽略不带信息的 merge commit
2023-10-17 23:39:11 +08:00
github-actions[bot]
aef28b93b7 docs: Auto Update Changelogs of v4.26.0-beta.1 (#6971)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-17 23:31:02 +08:00
status102
6463b358a4 perf: 修改刷理智每次开始战斗时输出:不再显示理智药、碎石的设定上限值,增加临期理智药使用次数 (#6962) 2023-10-17 22:53:34 +08:00
zzyyyl
28f45f7929 fix: 修复待选干员在列表末尾时点击错位的问题 (#6960) 2023-10-17 22:52:57 +08:00
lanhao34
48b1eac9ea fix: 降低iOS平台中部分模板匹配的阈值 (#6963) 2023-10-17 22:51:32 +08:00
MistEO
d2374beb4b fix: 修复干员头像保存错误 (#6967) 2023-10-17 22:48:27 +08:00
status102
11a0dee15f fix: qodana 2023-10-17 22:22:34 +08:00
zzyyyl
b53d425696 refactor: 重构 changelog_generator.py 部分内容 (#6957) 2023-10-17 21:43:18 +08:00
status102
ab51cf72dd refactor: 迁移使用了MaaCore的方法,统一合并至MaaService 2023-10-17 21:05:38 +08:00
quyansiyuanwang
6b8ac3a720 deleted extra indent 2023-10-17 19:53:53 +08:00
quyansiyuanwang
ddaed3ef4a renamed functions
使用蛇形命名法
2023-10-17 18:46:15 +08:00
zzyyyl
df5a9fe8ab chore: ClangFormatter 的 ignore 参数也忽略所有子文件夹内容 2023-10-17 14:08:03 +08:00
zzyyyl
b527258c42 fix:台服肉鸽模式无法招募某些好友干员 (#6965) 2023-10-17 12:00:05 +08:00
quyansiyuanwang
34aa0167e8 Update changelog_generator.py
经讨论决定修改代码逻辑:
    以开头为优先标记
    其次中文(隐)包含标记
2023-10-17 10:30:49 +08:00
quyansiyuanwang
c979cb31ec fix and correct
修正比对顺序
修改函数入口(调整函数名)
2023-10-17 07:44:37 +08:00
lirao
931e3ec9a9 fix:台服肉鸽模式无法招募某些好友
see issue #6952
2023-10-16 12:01:04 -07:00
David
8829252d1f fix: YostarEN Mizuki I.S. get recruit selection 2023-10-16 20:04:48 +02:00
quyansiyuanwang
3d20189496 restructed the func print_commits
注意:暂未测试
2023-10-17 00:43:14 +08:00
uye
2591a99d6b feat: 显示 ui 版本号 (#6944) 2023-10-16 22:59:32 +08:00
zzyyyl
5614d8a7a5 perf: 优化部分基建日志输出 2023-10-16 21:16:24 +08:00
quyansiyuanwang
5e42641f8f Update changelog_generator.py
deleted XXX label
编辑器里忘了删了导致再次出现这个label
2023-10-16 19:35:44 +08:00
quyansiyuanwang
1772df381b fixed err 2023-10-16 19:12:18 +08:00
quyansiyuanwang
a63a789fed Update changelog_generator.py
deleted XXX label
2023-10-16 19:01:01 +08:00
quyansiyuanwang
e0c5927f3f restructed some code
一些重复性代码被重构
  其中一部分使用列表推导
2023-10-16 18:54:28 +08:00
Loong
be52330fd5 ci: use submodule for maa-cli and build it from source 2023-10-16 18:36:58 +08:00
MistEO
ccae9e8ca4 feat: update meojson to v3.1.1 (#6956) 2023-10-16 18:20:49 +08:00
MistEO
8964afb728 feat: 使用MdXaml来提升Markdown渲染表现 (#6828) 2023-10-16 18:20:29 +08:00
status102
6fc9f13ea2 feat: 新增 WpfGui选项-自动战斗-战斗列表-批量导入 (#6917) 2023-10-16 18:18:12 +08:00
status102
83d8583c07 fix: 修复自动战斗-保全ver在开始行动时第二次点击可能过早导致无法正常开始的bug (#6934) 2023-10-16 18:17:56 +08:00
Lancarus
d9df951500 feat: 肉鸽适配新干员默认技能 (#6948) 2023-10-16 18:17:26 +08:00
MistEO
d7bcd6ac81 fix: 修复账号切换时可能卡在选择账号之后的错误 (#6933) 2023-10-16 18:15:23 +08:00
uye
74091e98be fix: ci 2023-10-16 17:53:13 +08:00
uye
38f36bf907 feat: 显示资源版本 2023-10-16 16:51:09 +08:00
zzyyyl
cafa961145 feat: 肉鸽投资不进入第二层则不买东西 (#6946) 2023-10-16 10:07:44 +08:00
zzyyyl
f124c9acad fix: 日服水月Rogue选择难度功能 (#6950)
添加文字OCR所需任务,并初步测试能够正常选择“风平浪静”难度。
2023-10-16 10:04:10 +08:00
ManicSteiner
d117d5a905 fix: 日服水月Rogue选择难度功能 2023-10-16 09:32:51 +08:00
zzyyyl
030c7eb709 fix: 修正日服“选择难度”按钮图片
link to #6889

修正“选择难度”按钮图片ChooseDifficulty.png,添加ChooseDifficulty0.png
2023-10-15 23:43:25 +08:00
ManicSteiner
79021d2a9e fix: issues #6889 JP part 2023-10-15 23:35:37 +08:00
uye
e04769ea7c style: 格式化代码 2023-10-15 23:31:22 +08:00
zzyyyl
25fc06f8e0 perf: 删除用不到的配置 2023-10-15 23:29:20 +08:00
zzyyyl
95f26f7a8b feat: 投资不进入第二层则不买东西 2023-10-15 23:28:43 +08:00
uye
34e57714a5 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-10-15 21:35:13 +08:00
uye
5139240933 chore: 更新延迟延长到60分钟 2023-10-15 21:34:42 +08:00
MistEO
c541f23d35 ci: 使用 token 下载 CLI (#6941) 2023-10-15 20:05:06 +08:00
uye
cc35a78c73 fix: 修改错误的绑定逻辑 && 格式化代码 2023-10-15 19:30:38 +08:00
zzyyyl
79659d4871 fix: 修复干员 Lancet-2 的识别问题
fix #6936
2023-10-15 18:53:11 +08:00
David
0f261a097c chore: removed UnexpectedType error 2023-10-15 11:56:39 +02:00
Loong
d2df732899 ci: trigger CI on changes to the CI workflow 2023-10-15 17:12:00 +08:00
Loong
ca8714e17e ci: download CLI with token 2023-10-15 16:38:20 +08:00
uye
0bb3a39e42 chore: 删除多余检查 2023-10-15 15:20:27 +08:00
uye
2ca89e614c Merge remote-tracking branch 'origin/dev' into dev 2023-10-15 15:19:04 +08:00
uye
52b08207ed style: 减少点rider的报错 2023-10-15 14:58:25 +08:00
uye
8dbbb66a42 test: test ci 2023-10-15 12:54:47 +08:00
zzyyyl
7a1ceb1bc8 fix: 修复美服肉鸽卡在放弃行动弹窗界面的问题
fix #6931
2023-10-15 12:50:42 +08:00
uye
eff4b259ba test: test ci 2023-10-15 12:50:17 +08:00
status102
a089b064aa fix: 移除无用变量 2023-10-15 12:40:21 +08:00
MistEO
48cd09d9dd chore: Auto Update Game Resources - 2023-10-15 2023-10-15 04:30:19 +00:00
MistEO
dee5fbdc8b chore: Auto Update Game Resources - 2023-10-15 2023-10-15 04:07:09 +00:00
status102
a43f627786 fix: 补充丢失的任务 2023-10-15 11:53:51 +08:00
status102
5622b7ed78 fix: 账号切换时登录按钮调整为允许重试识别 2023-10-15 11:53:51 +08:00
MistEO
0d84fc7412 chore: Auto Update Game Resources - 2023-10-15 2023-10-15 03:47:03 +00:00
uye
922c9ff014 test: test ci 2023-10-15 04:10:02 +08:00
uye
d921477f8d ci: 输出内容
怎么又炸了.jpg
2023-10-15 04:08:16 +08:00
uye
40f39fe102 ci: test ci 2023-10-15 04:05:03 +08:00
uye
dbaab91d86 chore: 删除多余的.gitignore 2023-10-15 04:01:49 +08:00
uye
1ffe83bc0c ci: 修复错误的Version格式 2023-10-15 03:56:07 +08:00
uye
aa982aec7f chore: 版本号为0.0.1时显示DEBUG VERSION 2023-10-15 03:43:15 +08:00
Rbqwow
50842697a9 doc: 添加 Google Play 游戏 支持说明 (#6920) 2023-10-15 03:41:20 +08:00
uye
d8bc0c3c48 fix: 修复错误版本号 2023-10-15 03:39:38 +08:00
uye
d5acf3d183 ci: smoke testing同步修改 2023-10-15 03:36:21 +08:00
uye
fefa67dab0 ci: fix 元素修改 2023-10-15 03:25:51 +08:00
uye
54a3e86bd2 chore: 移除多余参数 2023-10-15 01:56:58 +08:00
uye
c266e22f5d ci: 修改错误类型 2023-10-15 01:55:02 +08:00
uye
252c354977 chore: 修改注释 2023-10-15 01:49:43 +08:00
uye
9cbfff055a ci: 修改错误路径名 2023-10-15 01:42:38 +08:00
uye
e47e38afba ci: 修改错误的路径名 2023-10-15 01:39:03 +08:00
uye
ddf665f3a4 feat: 显示 ui 版本号 2023-10-15 01:34:28 +08:00
MistEO
4993d32c41 chore: fix c# warnings 2023-10-14 23:13:35 +08:00
zzyyyl
fcbecb3102 feat: 减少肉鸽单次操作截图次数 2023-10-14 22:56:22 +08:00
uye
b9741df8cb Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-10-14 22:31:28 +08:00
uye
e2ca6dbdf8 feat: 支持13章关卡导航
fix #6927
2023-10-14 22:30:20 +08:00
zzyyyl
17b2abeea7 feat: 延长 StartUp 失败判定时长
close #6854
2023-10-14 22:24:35 +08:00
uye
5fec6097e1 wpfGui: Taggify Version (#6894) 2023-10-14 22:16:39 +08:00
zzyyyl
432bc70fc1 fix: 修复手滑导致的日服资源加载失败的问题 2023-10-14 22:06:21 +08:00
zzyyyl
9e56a8bd29 fix: 修复战斗中费用识别错误的问题
fix #4291
2023-10-14 22:04:43 +08:00
zzyyyl
68a4a4041f fix: 修复日服肉鸽部分不期而遇的识别
fix #6742
2023-10-14 21:55:36 +08:00
zzyyyl
09728df29f feat: 修改日文 OCR 等价集 2023-10-14 21:54:14 +08:00
zzyyyl
19fd7c3023 fix: 修复日服傀影肉鸽部分不期而遇的识别
fix #6905
2023-10-14 21:29:23 +08:00
MistEO
d7b4a65a22 docs: Fix README.md (#6928) 2023-10-14 21:01:47 +08:00
Yizhen Wang
8218492af7 Fix README.md
fix #6925
2023-10-14 12:54:15 +01:00
zzyyyl
0237af9b06 feat: 修复日服傀影肉鸽卡在不期而遇 「血には血を」(以血还血)的问题
fix #6369
2023-10-14 19:22:01 +08:00
zzyyyl
bd40f03422 feat: 删除无用的 Roguelike@Continue 相关任务 2023-10-14 18:43:05 +08:00
zzyyyl
c2ce9e1a69 fix: 修复肉鸽卡在招募券界面的问题
link to #6602
fix #6907
2023-10-14 18:42:54 +08:00
uye
a0a55e4eb5 fix: 台服无法识别缄默德克萨斯
fix #6916
2023-10-14 14:40:51 +08:00
uye
b64142496c chore: 优化资源更新相关代码 2023-10-14 02:46:04 +08:00
MistEO
b5588d57b3 perf: 进一步优化资源更新逻辑,修复一些问题 2023-10-14 01:58:44 +08:00
MistEO
1a65210e89 chore: Auto Update Game Resources - 2023-10-13 2023-10-13 14:30:37 +00:00
Cryolitia
fe57a5cfd5 update 2023-10-13 22:25:39 +08:00
MistEO
f49c5e963e feat: support GPU OCR (#6872) 2023-10-13 22:16:52 +08:00
MistEO
209abd8911 feat: Only check version.json for Resource OTA (#6901) 2023-10-13 22:15:20 +08:00
MistEO
5111343ecb fix: 在CharsNameOcrReplace添加一条规则,将“^一”替换为空 (#6908) 2023-10-13 22:14:43 +08:00
Cryolitia
1340381912 update 2023-10-13 22:05:49 +08:00
Cryolitia
46ae69d599 update 2023-10-13 22:03:03 +08:00
lanhao34
8ce8e5414f fix: 只匹配开头的字符串“^一”
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-13 09:57:22 -04:00
MistEO
0cde898a26 fix: 回滚资源更新多文件逻辑 2023-10-13 21:18:08 +08:00
Songyang.Huo
7cd13475f9 fix: 注释掉一行代码,消除一个Warning (#6904) 2023-10-13 20:55:53 +08:00
MistEO
7588492891 chore: 改改log 2023-10-13 20:50:08 +08:00
MistEO
a2a50c9f48 fix: 当minitouch断开时自动重连 2023-10-13 20:48:42 +08:00
MistEO
32e78ae359 chore: 调整日志 2023-10-13 20:38:26 +08:00
筱竹聽雨
edc872aba0 feat: 更新内置243一天四换极限效率 (#6883) 2023-10-13 20:20:59 +08:00
MistEO
7f08865a6a Merge branch 'dev' into perf/resource_ota 2023-10-13 20:20:14 +08:00
lanhao34
0efd44da9b fix: 在CharsNameOcrReplace添加一条规则,将“^一”替换为空
煌和陈在OCR识别中有时候前面会多识别出两个字符“^一”,替换为空即可解决。
2023-10-13 19:42:15 +08:00
zzyyyl
e03fee55f5 perf: 使用多模板重写 StartButton2;优化 PRTS#next
btw, 代码里只有 StartButton2 的次数限制,没有 StartButton2Adverse 的次数限制(
2023-10-13 18:29:20 +08:00
zzyyyl
c0e5aa674f fix: 修复理智不足时反复点击开始行动而不吃药的问题
fix #6902
2023-10-13 18:29:12 +08:00
uye
36270f0c2f Revert "ci: Update smoke-testing.yml -> .NET8"
This reverts commit d8a4d9b762.
2023-10-13 18:00:46 +08:00
MistEO
5c7db8b71f rft: 重构 ResourceUpdater (#6884) 2023-10-13 17:44:15 +08:00
uye
084a5c7750 chore: Merge into pattern 2023-10-13 16:54:28 +08:00
uye
e033e220b6 chore: 添加枚举注释 2023-10-13 16:50:57 +08:00
uye
69b93fbeee Merge remote-tracking branch 'origin/perf/resource_ota' into rft/ResourceUpdater
# Conflicts:
#	src/MaaWpfGui/Models/ResourceUpdater.cs
#	src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
2023-10-13 16:47:32 +08:00
uye
d8a4d9b762 ci: Update smoke-testing.yml -> .NET8 2023-10-13 16:25:06 +08:00
MistEO
709534a7f6 fix: 修复资源更新返回值 2023-10-13 16:13:22 +08:00
MistEO
bed32f6b51 feat: 用于快速适配新页面主题的小工具 (#6846) 2023-10-13 16:10:26 +08:00
MistEO
999061bbf1 feat: Only check version.json for Resource OTA
close #6881
2023-10-13 15:59:49 +08:00
MistEO
51e25eb78b fix: 修复WpfGui肉鸽 等待&停止 重复调用AsstStop的错误 (#6878) 2023-10-13 15:26:30 +08:00
MistEO
243e8cb708 feat: WpfGui 刷理智开始行动输出新增 每次开始行动时输出理智药和碎石次数(不记录临期药品使用次数) (#6857) 2023-10-13 15:26:18 +08:00
MistEO
f1720c99ec feat: 远程控制更多功能 (#6896) 2023-10-13 15:10:12 +08:00
Songyang.Huo
631957f522 Merge branch 'MaaAssistantArknights:dev' into dev 2023-10-13 08:11:53 +08:00
Songyang.Huo
ae974561de 提交新的改动 2023-10-13 08:11:16 +08:00
MistEO
c8510a9a07 chore: Auto Update Game Resources - 2023-10-12 2023-10-12 23:28:29 +00:00
Cryolitia
bca3fb0747 Tagged Version 2023-10-13 06:53:46 +08:00
David
abddc02fb2 tools: overseas duplicates + new themes 2023-10-12 19:58:19 +02:00
David
77bc815bcc fix: EN InfrastDormDoubleConfirmButton not recognized
[no ci]
2023-10-12 19:46:32 +02:00
zzyyyl
e4507d7d6f perf: 重写理智识别 (#6885) 2023-10-12 20:53:02 +08:00
zzyyyl
3e9713767d fix: 修复因 ocr_replace 与 m_eq_classes 冲突导致的 ocr 识别失效的问题 (#6867)
fix #6629
2023-10-12 19:59:44 +08:00
zzyyyl
cd7bf16f26 fix: 修复部分模板图片名错误的问题;删除多余模板图 2023-10-12 16:59:58 +08:00
zzyyyl
8e0ac02cb9 fix: 修复台服获取信用及购物出错的问题
fix #6865
2023-10-12 15:37:55 +08:00
zzyyyl
d52ade109e perf: 重写理智识别 2023-10-12 15:27:04 +08:00
zzyyyl
2e841c782e feat: 在 StringMisc 中增加 chars_to_number 2023-10-12 15:19:50 +08:00
zzyyyl
9eda4d9e68 perf: 优化 OperBox 相关代码 2023-10-12 15:19:41 +08:00
uye
cc68694daf chore: 消除警告 2023-10-12 15:09:09 +08:00
uye
712539b041 fix: 修改错误的返回值 2023-10-12 15:05:05 +08:00
uye
8e16230944 rft: 重构 ResourceUpdater 2023-10-12 14:54:56 +08:00
zzyyyl
43c308350d style: format 2023-10-12 13:25:53 +08:00
uye
b05360b8c5 fix: zh-tw 变量名错误 (#6882)
又锅了 QAQ
改了但没完全改
@ABA2396
2023-10-12 11:34:47 +08:00
youqii
51da33ae29 fix: zh-tw 变量名错误 2023-10-12 11:08:40 +08:00
uye
66c482da90 chore: 修改 Stop 返回值,增加文档注释 2023-10-12 10:13:53 +08:00
uye
f18cbd6b39 style: 更正变量名 (#6880) 2023-10-12 09:45:00 +08:00
youqii
ccde2d0c7a style: 更正变量名 2023-10-12 09:25:48 +08:00
zzyyyl
8ce5529bee fix: 修复傀影肉鸽卡在战斗失败界面的问题
这都快两年了,怎么 roi 还有问题的(是不是外服界面跟国服不太一样啊
link to ae94759d78

fix #6835
2023-10-12 00:46:19 +08:00
zzyyyl
c64e161df3 fix: 修复肉鸽烧到水不停的问题
link to 8c64dc58f2
fix #6876
2023-10-12 00:14:03 +08:00
zzyyyl
734cb199eb fix: Allow BattleQuickFormation to retry 3 times
link to #6584
2023-10-11 23:52:12 +08:00
zzyyyl
3674f0cf77 debug: save_img 默认使用缓存的图片 2023-10-11 23:21:56 +08:00
status102
2e71598bc8 fix: 修复肉鸽等待&停止重复调用AsstStop的错误
fix #6870
2023-10-11 21:08:57 +08:00
zzyyyl
a3f04669db debug: 增加一些非法情况的截图 2023-10-11 19:02:57 +08:00
zzyyyl
b1ee495101 fix: 修复因 ocr_replace 与 m_eq_classes 冲突导致的 ocr 识别失效的问题 2023-10-11 18:10:41 +08:00
MistEO
a1a2b2625e feat: support GPU OCR 2023-10-11 17:44:18 +08:00
uye
504475cd85 feat: 点击版本号后复制到剪贴板
fix #6659
2023-10-11 17:28:18 +08:00
uye
fa5930a443 fix: 定时执行强制启动无法切换基建计划
fix #6757
2023-10-11 16:28:11 +08:00
uye
c011dbe075 feat: 自动战斗地图链接指向PRTS.Map对应的地图
close #6227
2023-10-11 11:09:12 +08:00
status102
447942811c fix: qodana 2023-10-11 07:53:11 +08:00
David
cfa9975baa fix: changed EN OCR formation parameter
[skip ci]
2023-10-10 22:28:24 +02:00
status102
b6f11efda7 feat: 刷理智开始行动输出新增 每次开始行动时输出理智药和碎石次数(不记录临期药品使用次数) 2023-10-10 23:45:30 +08:00
zzyyyl
15536b40ec perf: 优化 AllTasksCompleted 相关 WPF 代码 (#6845) 2023-10-10 18:46:36 +08:00
SherkeyXD
7708dd387b feat: tasks.json中新增roi_crop_doc作为自动裁切的依据 2023-10-10 18:44:47 +08:00
SherkeyXD
4805a4e4ae feat: 添加用于快速适配新主界面主题的小工具 2023-10-10 18:44:41 +08:00
SherkeyXD
a07a39a0b2 perf: CropRoi小工具用pathlib处理路径 2023-10-10 18:44:41 +08:00
MistEO
860b9788a5 feat: 适配"迷城"界面主题 (#6847) 2023-10-10 18:18:51 +08:00
SherkeyXD
b61fd65ba5 feat: 适配"迷城"界面主题 2023-10-10 17:18:59 +08:00
zzyyyl
4d200bdcc9 perf: 优化 AllTasksCompleted 相关 WPF 代码 2023-10-10 16:37:20 +08:00
MistEO
13464db189 Release v4.25.0 (#6840) 2023-10-10 15:13:09 +08:00
MistEO
e5c8787535 docs: Update CHANGELOG.md 2023-10-10 13:18:17 +08:00
github-actions[bot]
a8cf0e617d docs: Auto Update Changelogs of v4.25.0 (#6841)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-10 13:16:15 +08:00
MistEO
44d0800fbf docs: 优化文档视觉效果,防止出现横向显示不全的情况 (#6839) 2023-10-10 13:09:34 +08:00
SherkeyXD
6edf93324c docs: 优化文档视觉效果,防止出现横向显示不全的情况 2023-10-10 13:06:09 +08:00
Horror Proton
bc2bf38118 perf: update action on recruit confirm failure 2023-10-10 11:32:05 +08:00
David
bc99faee6f style: VS22 solution explorer i18n 2023-10-09 19:19:20 +02:00
David
938d533fbb style: VS22 solution explorer i18n 2023-10-09 19:18:05 +02:00
zzyyyl
ec0d56cbc9 fix: 修复干员维荻的识别问题
fix #6832
2023-10-10 00:15:37 +08:00
MistEO
eb9e4adb17 Release v4.25.0-beta.3 (#6829) 2023-10-09 23:43:04 +08:00
MistEO
7a9c226af9 fix: check null for resource api testing 2023-10-09 23:08:55 +08:00
MistEO
3cb5cdf851 fix: test API before resource update
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/6829#issuecomment-1753154731
2023-10-09 23:06:14 +08:00
MistEO
cb1782bb6a docs: Update CHANGELOG.md 2023-10-09 22:57:01 +08:00
MistEO
6eb3b554d9 perf: 调整资源OTA的顺序 2023-10-09 22:51:48 +08:00
status102
1700f0a414 perf: 调整部分log输出为仅供ASST_DEBUG (#6824) 2023-10-09 22:44:20 +08:00
MistEO
efa3f83bf1 fix: 修复战斗列表中跳过剧情确认识别问题 (#6827) 2023-10-09 22:43:29 +08:00
MistEO
2eb30e2e63 feat: Add a mirror for resource OTA
Thanks for annangela
2023-10-09 22:41:39 +08:00
SherkeyXD
4cf8de9b5a chore: 移除无用的OpenHyperlink函数 2023-10-09 22:38:39 +08:00
SherkeyXD
f6fffda0b8 perf: MdXaml自定义样式迁移至单独文件内 2023-10-09 22:38:26 +08:00
SherkeyXD
f5f8d3ae59 fix: 完全移除Markdig残留 2023-10-09 22:38:17 +08:00
SherkeyXD
05ba680154 Recover "feat: 使用MdXaml来提升Markdown渲染表现"
This reverts commit 4cfb02ce3e.
2023-10-09 22:34:32 +08:00
Lancarus
803900e383 fix: 修复战斗列表中跳过剧情确认识别问题 2023-10-09 22:22:57 +08:00
MistEO
50d527fde1 feat: 添加了淬羽赫墨与多萝西的基建技能联动 (#6820) 2023-10-09 20:17:51 +08:00
xyxyx718
535ffb94eb Update infrast.json
添加了淬羽赫墨与多萝西的基建技能联动
2023-10-09 18:07:35 +08:00
MistEO
fbeb79403f Release v4.25.0-beta.2 (#6805) 2023-10-09 17:19:05 +08:00
uye
926c22290b perf: 优化代码 2023-10-09 15:44:38 +08:00
github-actions[bot]
679bf46d1f docs: Auto Update Changelogs of v4.25.0-beta.2 (#6813)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-09 15:22:14 +08:00
MistEO
5f222c34dc feat: 输出“使用 48 小时内过期的理智药”消息 (#6800) 2023-10-09 15:16:15 +08:00
uye
40160da2ea perf: 优化代码,消除警告 2023-10-09 14:44:29 +08:00
zzyyyl
54b9bc1277 fix: BlackReturn -> ReturnButton [skip ci] (#6806)
fix #6795
2023-10-09 12:33:21 +08:00
MistEO
d1b17b51be perf: 优化资源动态更新 2023-10-09 11:26:54 +08:00
youqii
3ba33c05a2 docs: 更新回调消息协议 2023-10-09 10:25:53 +08:00
youqii
47fd3fda0a style: 修复KR回调消息协议格式 2023-10-09 10:25:52 +08:00
youqii
c8af5f459d fix: 增加使用将要过期理智药消息 2023-10-09 10:25:52 +08:00
MistEO
af51ed6496 fix: 修复在无法导航至指定关卡并通过初见剧情关后,无法进入指定关卡的错误 (#6792) 2023-10-09 08:55:35 +08:00
MistEO
32e6f4aa4c perf: WpfGui关卡掉落输出增加千分位分隔符 (#6793) 2023-10-09 08:55:23 +08:00
Songyang.Huo
13dd6a0533 fix: 修复当"远程控制"没有填入任何内容时的界面问题 (#6787) 2023-10-09 08:54:55 +08:00
David
df9ea96ca2 style: strategies -> strategy 2023-10-08 22:25:50 +02:00
David
335a1b372a tools: more adaptation ignored templates 2023-10-08 22:21:23 +02:00
David
5e320d7096 fix: trying to fix fight with support
ref: 1f9f48128f
[skip ci]
2023-10-08 22:09:12 +02:00
David
a4b6fa515f Revert EN's Version.json
This reverts commit 669801ed77.
[skip ci]
2023-10-08 21:58:10 +02:00
David
cf42563ea3 docs: schema for templThreshold array or number 2023-10-08 21:18:35 +02:00
status102
b49e3d082c perf: WpfGui关卡掉落输出增加千分位分隔符 2023-10-09 00:36:02 +08:00
status102
b3bea7ef99 fix: 修复在无法导航至指定关卡并通过初见剧情关后,无法进入指定关卡的错误 2023-10-08 23:57:50 +08:00
David
651b76c2c9 Fix #6752 & Fix #6776 (#6783)
link #6752 
link #6776 

caused by
42e9542cd1 (diff-8f68e6988b089efca72b7954862a47442ec7eb08b37bde5a0c0f072cf4488dd3L9)
2023-10-08 16:48:55 +02:00
Cryolitia
3659d74227 Fix #6752 & Fix #6776
caused by 42e9542cd1 (diff-8f68e6988b089efca72b7954862a47442ec7eb08b37bde5a0c0f072cf4488dd3L9)
2023-10-08 22:38:56 +08:00
Lancarus
ce11ed2415 fix: 修复作战列表跳过剧情关后不重新寻找关卡 (#6772) 2023-10-08 21:34:54 +08:00
Lancarus
74b19209d3 fix: 修复作战列表跳过剧情关后不重新寻找关卡 2023-10-08 21:23:01 +08:00
MistEO
e779a3ed2b Revert "feat: 使用MdXaml来提升Markdown渲染表现" (#6770) 2023-10-08 21:17:03 +08:00
MistEO
4cfb02ce3e Revert "feat: 使用MdXaml来提升Markdown渲染表现" 2023-10-08 21:12:53 +08:00
MistEO
d2bfd50ba4 perf: OTA时先更新动态文件,再更新其他的 2023-10-08 20:27:17 +08:00
MistEO
669801ed77 chore: Auto Update Game Resources - 2023-10-08 2023-10-08 10:29:25 +00:00
MistEO
15cc058360 fix(ResUpdater): 修复模板尺寸不同时的崩溃问题 2023-10-08 18:22:52 +08:00
zewoosJ
a72ac972bc docs: added KR operators up to Kirin R Yato
In KR, There was a problem that certain separation operators were not
recognized by OCR, so we modified it to work by not recognizing existing
operators again. like the last episode of "knight (나이트)".
The following operators are not recognizing anymore. Yato, Noir Corne.
Because alternative operators are more likely to be used in the R.I.I.C

---------

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
2023-10-08 11:50:24 +02:00
David
8598020711 feat: operbox operator names localization (#6726)
fix #6664
2023-10-08 11:17:59 +02:00
uye
1c0fc24e4a feat: 使用MdXaml来提升Markdown渲染表现 (#6723) 2023-10-08 15:54:02 +08:00
zzyyyl
b9b21ab8db rft: 优化 TaskData 的 json 解析 (#6739) 2023-10-08 15:38:58 +08:00
MistEO
c8d97f58ac feat: 为MaaWpfGui加入一个远程控制功能。 (#6717) 2023-10-08 15:19:55 +08:00
MistEO
a7804ccc6c perf: 优化StartUp速度,首页展开理智窗口时StartUp会关上 (#6730) 2023-10-08 15:16:12 +08:00
MistEO
de299190a7 rft: 使用多模板匹配重构 ReturnButtons (#6741) 2023-10-08 15:15:30 +08:00
MistEO
909205970a fix: update UnlockClues for EN (#6749) 2023-10-08 15:14:52 +08:00
MistEO
48133da317 feat: 抄作业自动跳过战斗中剧情 (#6721) 2023-10-08 15:14:23 +08:00
MistEO
e16a980ae9 Apply suggestions from code review 2023-10-08 15:14:05 +08:00
MistEO
c90fa7412e feat: 新增关卡导航在未找到设定关卡时,移动至最右侧、自动通关未通过的剧情关,再尝试查找关卡 (#6729) 2023-10-08 15:11:08 +08:00
MistEO
c4a992840e feat: 公招无招聘许可时继续尝试刷新 (#6569) 2023-10-08 15:09:49 +08:00
MistEO
21182a3997 perf: 对DEBUG VERSION禁用版本更新及资源更新检查 (#6751) 2023-10-08 15:09:13 +08:00
status102
80d7ee415e perf: 对DEBUG VERSION禁用版本更新及资源更新检查 2023-10-08 13:35:18 +08:00
uye
dcd6abdf2a Release v4.25.0-beta.1 (#6718) 2023-10-08 10:53:58 +08:00
uye
8ee107a773 docs: Update CHANGELOG.md 2023-10-08 10:42:45 +08:00
uye
4a9c3d79b1 feat: 识别工具添加 idle 绑定 2023-10-08 10:35:28 +08:00
MistEO
c6594de45c fix: 修复CloseDown任务导致的不执行完成后操作 (#6748) 2023-10-08 09:57:26 +08:00
Enochen
005fbea4e0 lower UnlockClues ocr threshold for EN 2023-10-07 21:49:00 -04:00
status102
b9c8679e20 fix: 修复CloseDown任务导致的不执行完成后操作 2023-10-08 09:23:47 +08:00
David
58594cb25b fix: Skadi Alter EN OCR missed identification
[skip ci]
2023-10-07 22:01:55 +02:00
David
e34b46723e Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-10-07 18:39:59 +02:00
David
8dddd1e80a docs: json codeblock tweak 2023-10-07 18:39:58 +02:00
David
0b26686b1e docs: EN I.S. translation 2023-10-07 18:39:45 +02:00
zzyyyl
c483d09e94 fix: 战斗连续失败三次后 Fight 任务报错
fix #6734
2023-10-07 22:11:35 +08:00
Lancarus
4b3f1300b8 doc: Update 3.5-肉鸽辅助协议.md 2023-10-07 22:05:30 +08:00
zzyyyl
d312d6d041 perf: 来点 std::invoke_result_t 2023-10-07 21:37:34 +08:00
youqii
0b660f7cc7 Merge branch 'dev' into feature 2023-10-07 20:23:17 +08:00
zzyyyl
e05f95668b fix: macOS compile error 2023-10-07 20:21:10 +08:00
status102
c86fcfd4ea perf: 减小延迟 2023-10-07 19:58:21 +08:00
status102
41669e9de4 fix: 优化task 2023-10-07 19:56:27 +08:00
Songyang.Huo
8f35ce2155 修复了一处汇报不了任务的bug 2023-10-07 19:54:06 +08:00
zzyyyl
25df6f1d56 rft: 优化 TaskData 的 json 解析 2023-10-07 19:23:09 +08:00
status102
c05bc25734 perf: 调整剧情关按钮截图 2023-10-07 19:21:52 +08:00
zzyyyl
083c7134c4 rft: 使用多模板匹配重构 ReturnButtons 2023-10-07 19:03:57 +08:00
Lancarus
dcbe55e44c feat: 按照review修改 2023-10-07 18:40:25 +08:00
uye
2d03e9ac5b perf: 根据 qodana 优化代码 (#6736) 2023-10-07 18:13:27 +08:00
uye
b1c2e75567 perf: 根据 qodana 优化代码 2023-10-07 18:05:53 +08:00
uye
61ceb3788a perf: 根据 qodana 优化代码 2023-10-07 17:49:01 +08:00
status102
274d275f4f feat: 增加了一个二次检测进行保底 2023-10-07 16:57:29 +08:00
uye
c55187afa7 perf: 根据 qodana 优化代码 2023-10-07 16:47:57 +08:00
uye
1204abf6be docs: Update CHANGELOG.md 2023-10-07 14:55:01 +08:00
uye
42e9542cd1 perf: 根据 qodana 优化代码 2023-10-07 14:09:17 +08:00
status102
06eae3e06a perf: 优化剧情跳过检测频率,修改暂停时返回值为true 2023-10-07 14:01:38 +08:00
zzyyyl
34307c6618 fix: 修复 Award 任务无法正常结束的问题
fix #6703
2023-10-07 13:22:17 +08:00
status102
e36f266f6e perf: 优化StartUp速度,首页展开理智页时StartUp会关上 2023-10-07 12:21:53 +08:00
Lancarus
5eee5098c0 feat: 按照review修改 2023-10-07 11:24:57 +08:00
uye
e40527cc3f refactor: 使用 IShellLink 和 IPersistFile 接口创建快捷方式 2023-10-07 10:59:49 +08:00
Horror Proton
790f41188f fix: 修复 POSIX 平台上在一些情况下子进程不结束而使 MAA 永久性挂起的问题 (#6727)
在满足 `recv_by_socket = true` 时的一些特殊情况下,POSIX 平台上执行 ADB 命令的子进程可能无法及时退出:

1. **子进程在 `nc`
后未退出。**[这篇博文](https://billauer.co.il/blog/2018/07/netcat-nc-stop-quit-disconnect/)提及
FreeBSD、GNU 和其他 Netcat 实现,在以下情况是否会退出**是未定义的**:
    1. gets an EOF on its standard input;
    2. receives a FIN packet.
   
    如果模拟器的 `nc` 是一个不良的实现,可能会在不传递 `-q` 参数时完全不退出,在 MAA 对不同截屏命令进行测速时卡死;
2. **子进程有任何标准输出或错误输出。** 因为未将 `m_pipe_out[PIPE_WRITE]` 设置
`O_NONBLOCKING`,也未读取管道内容,子进程将在管道缓冲区满时挂起。

该 PR 对于第一种情况添加了超时 Killing,对第二种情况排空了管道。

Fix #6688.
2023-10-07 10:39:45 +08:00
status102
794531c274 feat: 新增 自动战斗-战斗列表 在未找到设定关卡时,移动至最右侧并自动通关未通过的剧情关 2023-10-07 10:34:40 +08:00
AnnAngela
87c08af867 doc: Update readme.md 2023-10-07 09:52:59 +08:00
AnnAngela
a76e8614c4 chore: Update README.md 2023-10-07 09:52:49 +08:00
AnnAngela
b4409dc96f doc: Update readme.md 2023-10-07 09:42:11 +08:00
w568w
0c80162256 fix: subprocess hangs up if not draining the pipe when reading with recv_by_socket 2023-10-07 08:33:47 +08:00
Lancarus
70b6317d70 feat: 根据review将check_skip_plot_button移动到BattleProcess里面 2023-10-07 02:14:45 +08:00
Lancarus
6f3401528b fix: 战斗列表ocr替换 2023-10-07 02:06:43 +08:00
David
bb09167413 style: VS22 ResourceUpdater.sln explorer name change
#6599
[skip ci]
2023-10-06 19:34:28 +02:00
David
7af4c6e44b chore: Jessica Alter new opers 2023-10-06 16:27:06 +02:00
status102
6d5f3971a4 fix: remove duplicate of std::move 2023-10-06 20:58:07 +08:00
Lancarus
c01cafd08d 使用导航名判断是否为教学关 2023-10-06 19:57:38 +08:00
SherkeyXD
5764044b9d chore: 删除无用的包 2023-10-06 19:40:18 +08:00
SherkeyXD
0e3d3c4c03 perf: 优化公告和CHANGELOG的视觉效果 2023-10-06 19:36:46 +08:00
SherkeyXD
243716666c feat: CHANGELOG也使用MdXaml渲染 2023-10-06 19:06:13 +08:00
SherkeyXD
308a70e0eb chore: 移除无用的using 2023-10-06 19:05:49 +08:00
SherkeyXD
45da058793 feat: 优化公告的渲染表现 2023-10-06 19:02:14 +08:00
Lancarus
27c1364da8 feat: 在战斗列表中将教学关取消自动编队 2023-10-06 18:44:49 +08:00
Songyang.Huo
d4beb302cf 修复了检测网络的相关问题 2023-10-06 18:34:13 +08:00
Lancarus
08eeae14b9 格式化代码 2023-10-06 18:24:37 +08:00
Lancarus
2fa541860d feat: 抄作业自动跳过战斗中剧情 2023-10-06 18:23:22 +08:00
github-actions[bot]
51bf2f8fa6 docs: Auto Update Changelogs of v4.25.0-beta.1 (#6719)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-10-06 18:16:43 +08:00
Songyang.Huo
19d89dd935 Merge branch 'dev' of https://github.com/hsyhhssyy/MaaAssistantArknights into dev 2023-10-06 18:02:03 +08:00
Songyang.Huo
05d0c02ad4 将所有字符串l18n内容移动到一起,补全所有l18n并据其调整了一点界面格式. 2023-10-06 18:01:46 +08:00
MistEO
d61ed3a3c0 fix: 修复无法对后续加载的图片资源进行存在检测的错误,跳过宿舍技能检查 (#6686) 2023-10-06 17:56:20 +08:00
MistEO
f1f77e626a chore: 改改注释 2023-10-06 17:56:01 +08:00
MistEO
5c28e6ec4b feat: OCR manipulation params for QuickFormation (#6697) 2023-10-06 17:54:13 +08:00
SherkeyXD
a26e901b29 docs: 添加远程控制部分的文档
Co-authored-by: Songyang.Huo <hsyhhssyy@gmail.com>
2023-10-06 17:45:44 +08:00
Songyang.Huo
c1b5199f4c 删除意外添加的没用的内容 2023-10-06 16:39:06 +08:00
Songyang.Huo
b2438153a9 删掉意外添加的没用的内容 2023-10-06 16:37:58 +08:00
Songyang.Huo
7ebce50f2f 修复一处提示文本格式化错误。 2023-10-06 16:31:01 +08:00
Songyang.Huo
d5233af8da 增加了对Https的校验 2023-10-06 16:15:17 +08:00
shxyke
e6b0d58a8e chore: add ability to download specific maadeps (#6700) 2023-10-06 09:31:16 +08:00
David
5f2b003630 chroe: cn default values 2023-10-05 21:32:34 +02:00
youqii
b1257356f1 docs: 更新回调消息协议 2023-10-05 21:48:19 +08:00
youqii
f0fabfb4b4 pref: 根据 qodana 优化代码 2023-10-05 20:59:42 +08:00
youqii
b535f1ef80 feat: 增加回调消息,增加多语言界面适配 2023-10-05 20:01:29 +08:00
youqii
470d3c712d feat: 优化任务逻辑 2023-10-05 20:01:28 +08:00
youqii
bdb8f777b6 feat: 在GUI中加入选项 2023-10-05 20:01:28 +08:00
youqii
fa132665ef feat: 公招用完招募许可后继续刷新 2023-10-05 20:01:28 +08:00
shxyke
9dd1315170 fix: fix host executable suffix error 2023-10-05 17:26:10 +08:00
zzyyyl
cf348d7a19 feat: 支持不同界面公招 2023-10-05 17:07:35 +08:00
status102
7a0c10864e perf: 移除m_loaded 2023-10-05 09:25:22 +08:00
status102
40d092b11b fix: 修复无法对后续加载的图片资源进行存在检测的错误,跳过宿舍技能检查 2023-10-05 09:20:58 +08:00
Songyang.Huo
0aeef53151 Merge branch 'MaaAssistantArknights-dev' into dev 2023-10-05 08:51:38 +08:00
Songyang.Huo
231b61d55a ResolveConflict 2023-10-05 08:51:20 +08:00
Songyang.Huo
22f3323517 远程控制功能 2023-10-05 08:45:07 +08:00
David
877d4dd4be chore: specialParams implementation 2023-10-04 22:23:13 +02:00
David
414256d2a4 feat: OCR manipulation for QuickFormation 2023-10-04 22:22:56 +02:00
David
0f444ac923 fix: 泰拉大陆调查团 EN regex
[skip ci]
2023-10-04 21:11:31 +02:00
zzyyyl
a6d557e11d debug: 删除一些日志 2023-10-05 02:41:38 +08:00
zzyyyl
81bdc4425f fix: 修复肉鸽获取 Sami@Roguelike@StrategyChange 等任务时的闪退问题
憨憨 zzyyyl 不会用 string_view
2023-10-05 02:36:23 +08:00
MistEO
f4da503520 feat: 新增av号、bv号对分p的支持 (#6670) 2023-10-04 22:50:01 +08:00
MistEO
d498217bbc docs: 优化文档视觉效果,添加文档编写指南 (#6611) 2023-10-04 22:49:44 +08:00
MistEO
37b5925b75 feat: Add ThriftController (#6573) 2023-10-04 22:49:26 +08:00
MistEO
7db3936e1c feat: WpfGui新增 肉鸽设置-中止行为等待至本次战斗结束后 (#6591) 2023-10-04 22:47:06 +08:00
MistEO
238509170f feat: 自动战斗-战斗列表-关卡名允许在作业标题未匹配到关卡名时,对文件名进行匹配。若还无法匹配到,则置空 (#6694) 2023-10-04 22:45:17 +08:00
status102
fcca77c9c9 feat: 自动战斗-战斗列表-关卡名允许在作业标题未匹配到关卡名时,对文件名进行匹配。若还无法匹配到,则置空 2023-10-04 21:12:27 +08:00
status102
1eadcde4b0 fix: remove test code 2023-10-04 13:59:39 +08:00
shxyke
a077e58719 feat: Add ThriftController 2023-10-04 09:53:16 +08:00
北雁 Cryolitia
2a2c137d82 fix: Sync with OS not working (#6672)
fix #6663 

sync with
6c5265022c (diff-36c75f83140bc44df90233c9c18fa86d157ce94b19f15290a13b72dff0fa5e03R446)

sync with
686f88631f

fix a stupid enum type convert problem that caused #6663
0833cc1019 (diff-36c75f83140bc44df90233c9c18fa86d157ce94b19f15290a13b72dff0fa5e03L3260)
2023-10-03 20:57:58 +02:00
David
1f9f48128f fix: Combat with Support templ error
fix lazy load template error Fight with Support #6584
[skip ci]
2023-10-03 20:47:06 +02:00
Lancarus
7b354505be feat: 优化萨米肉鸽逻辑 (#6679) 2023-10-04 02:39:36 +08:00
Sherkey
7cc1139ad9 fix: 修复错误条件下UI显示"投资后进入第二层"按钮的问题 (#6676)
之前铸币了(
2023-10-04 02:21:45 +08:00
Lancarus
acad862075 feat: 优化萨米肉鸽逻辑 2023-10-04 02:09:00 +08:00
Infko
0ae8591edb ci: 移除 qodana 的插件来恢复工作流 (#6675)
加载插件时 eap 有效期变为 30 天
不加载能有 60 天
2023-10-04 01:37:22 +08:00
zzyyyl
5858a61967 debug: 增加一项检查和一些日志 2023-10-04 00:44:02 +08:00
zzyyyl
2bf60de8c7 fix: 修复抄作业网络连接失败的问题
学姐改的什么玩意(

link to 919cc79e68
2023-10-03 18:42:02 +08:00
MiaoYan JY
587ec35c6b feat: 优化正则 2023-10-03 17:00:16 +08:00
Lancarus
7ef39b00e1 feat: 肉鸽不同层数逻辑 (#6508) 2023-10-03 15:57:57 +08:00
David
000459dd34 style: hidden "Manual switch" button (#6665)
YostarEN, KR and JP do not allow multi-accounting. The "Manual Switch" button
is not needed
2023-10-03 09:56:22 +02:00
zzyyyl
2ce48e5bcf fix: 修复基建换班后刷理智失败的问题 2023-10-03 14:52:14 +08:00
zzyyyl
d14f7482f2 fix: 修复肉鸽层数逻辑的小问题
Co-authored-by: Lancarus <duzhen92@qq.com>
2023-10-03 14:20:47 +08:00
MiaoYan JY
d1d88759f2 feat: 新增匹配av号、bv号以及分p的支持 2023-10-03 14:04:15 +08:00
David
4c4cdcb280 style: hidden "Manual switch" button 2023-10-02 21:49:56 +02:00
zzyyyl
6256dc111d feat: 肉鸽烧水时低难度有热水无效,高难度烧到水才停止
主要针对第一次进入肉鸽
2023-10-03 03:49:01 +08:00
zzyyyl
576155f545 feat: 重写烧水 2023-10-03 03:13:56 +08:00
zzyyyl
2272578cc0 perf: 一些简单的代码优化&重写 2023-10-03 02:54:01 +08:00
zzyyyl
611d292a12 feat: 使用 ocrReplace 重写肉鸽选点策略 2023-10-03 02:54:00 +08:00
zzyyyl
952bb8a539 feat: 按照 review 意见修改
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/6508#discussion_r1342628042

Co-authored-by: Lancarus <duzhen92@qq.com>
2023-10-03 02:54:00 +08:00
zzyyyl
25fbc4cf5c feat: 增加刷经验模式根据层数改变选点策略
Co-authored-by: Lancarus <duzhen92@qq.com>
2023-10-03 02:54:00 +08:00
Lancarus
a47a313a61 feat: 增加不同层数的stages策略 [skip ci] 2023-10-03 02:53:52 +08:00
MistEO
915aa0f53b fix: 修复模拟器连接错误的问题 (#6661) 2023-10-03 01:56:56 +08:00
SherkeyXD
44f5ae0f4b refactor: 修改变量名使其更直观 2023-10-03 01:53:02 +08:00
SherkeyXD
df4219da8f fix: 修正在连接地址为空时蓝叠模拟器HyperV版本无法连接的问题 2023-10-03 01:27:40 +08:00
SherkeyXD
ce982ebdab fix: 修正tcp连接检测部分的错误变量名 2023-10-03 01:26:30 +08:00
Horror Proton
5f106ab0a5 fix: fix crash caused by Matcher::set_task_info
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/6654
2023-10-02 21:01:02 +08:00
zzyyyl
c8c45cf6d8 style: format 2023-10-02 20:55:51 +08:00
Lancarus
ec6afec1dd feat: 优化萨米肉鸽部关卡策略 (#6656) 2023-10-02 20:45:32 +08:00
zzyyyl
bf4134efb2 fix: 尝试修复掉落识别闪退的问题 2023-10-02 20:27:38 +08:00
Lancarus
e8baa79e73 feat: 优化萨米肉鸽部关卡策略 2023-10-02 20:24:06 +08:00
status102
bd72f57f38 feat: 肉鸽新增 WpfGui选项-中止行为等待至本次战斗结束后 2023-10-02 19:58:48 +08:00
zzyyyl
d437a64480 chore: 源文件 -> Source
link to #6646
2023-10-02 19:25:06 +08:00
zzyyyl
efd19d2a0b fix: 修复肉鸽自动撤退字段引发闪退的问题 (#6650)
fix #6641
2023-10-02 18:28:39 +08:00
zzyyyl
aaafed51a1 feat: 支持多图单阈值的写法 2023-10-02 18:02:37 +08:00
MiaoYan JY
4b866fb93e fix: 修复肉鸽自动撤退字段引发闪退的问题 2023-10-02 17:52:14 +08:00
zzyyyl
1f9ef990e2 fix: templThreshold 2023-10-02 17:46:38 +08:00
zzyyyl
b949868455 fix: smoking test 2023-10-02 17:40:34 +08:00
MistEO
a5f8569528 perf: 肉鸽主题从Status分离 (#6646) 2023-10-02 17:20:37 +08:00
zzyyyl
209c906b56 fix: 修复模板匹配阈值解析错误的问题 2023-10-02 17:20:00 +08:00
status102
e8cc326a68 perf: 肉鸽主题从Status分离 2023-10-02 16:55:14 +08:00
MistEO
7a80079015 fix: 尝试修复基建的模板匹配错误 2023-10-02 16:44:34 +08:00
David
c6c9a37a13 chore: updated event schedule 2023-10-02 10:38:35 +02:00
David
183a9a5f29 fix: disabled cache for multi template recognition
ref:
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/6608#issuecomment-1742462512
2023-10-02 09:38:37 +02:00
zzyyyl
466be7766d fix: 修复 templ size is too large 时闪退的问题
fix #6639
2023-10-02 15:11:04 +08:00
David
48116037ac fix: typo in StartToWakeUpOCR EN 2023-10-02 08:57:26 +02:00
MistEO
37332ee0d5 perf: WpfGui自动战斗解析作业后,提示文本移动至最顶端 (#6625) 2023-10-02 11:40:05 +08:00
MistEO
6fd642b01d fix: 修复Costura未正常启用的问题 (#6632) 2023-10-02 11:39:34 +08:00
MistEO
436dcd1d11 feat: 支持多模板匹配,任一达到阈值即视为命中 (#6608) 2023-10-02 11:37:40 +08:00
David
ff88092e0a fix: LoopTimes no longer negative
fix #6634
2023-10-01 23:48:18 +02:00
David
e1253dec1e chore: added new ignored templates
[skip ci]
2023-10-01 22:35:04 +02:00
David
aa1c17baa3 perf: BattleQuickFormationRole cleared templates
[skip ci]
2023-10-01 22:34:39 +02:00
SherkeyXD
9e5c999f23 fix: 修复Costura未正常启用的问题 2023-10-02 02:24:10 +08:00
Lancarus
853af70ac1 fix: 修复肉鸽助战招募卡住放弃的问题 (#6630)
fix #6556
2023-10-02 01:48:52 +08:00
Horror Proton
1d2b06f8de fix: improve ocr roi in DepotImageAnalyzer
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/6598
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/5586
2023-10-02 01:19:41 +08:00
zzyyyl
161cd8da9b feat: 修改凹直升时放弃当前肉鸽的实现方式 2023-10-02 01:04:47 +08:00
David
ecf46374dc docs: support of multi_template in schema 2023-10-01 18:42:01 +02:00
David
43c41bd287 feat: support of new GUIs
(multi template experimental)
2023-10-01 18:41:41 +02:00
David
5042d3b729 perf: new template for default GUI 2023-10-01 18:41:08 +02:00
David
30e448b620 feat: templates for new GUI (dark | sami) 2023-10-01 18:38:44 +02:00
David
974905a7c2 chore: removed useless template 2023-10-01 18:37:54 +02:00
zzyyyl
e8dac63266 fix: 修复肉鸽助战招募卡住放弃的问题
fix #6556
2023-10-01 22:24:38 +08:00
MistEO
12f6a43c28 chore: Auto Update Game Resources - 2023-10-01 2023-10-01 12:34:41 +00:00
status102
26f72292f5 perf: 自动战斗解析作业后,提示文本移动至最顶端 2023-10-01 20:30:21 +08:00
SherkeyXD
efcc05751b docs: 添加文档编写指南 2023-10-01 17:00:13 +08:00
SherkeyXD
227e7e73b6 docs: 修正多语言字体配置 2023-10-01 16:49:09 +08:00
SherkeyXD
53661f64e9 docs: 增加文章内容的宽度 2023-10-01 16:12:54 +08:00
MistEO
03bb1b1b0f fix: template filepath error 2023-10-01 15:49:26 +08:00
zzyyyl
45edba1134 feat: 运行期修改任务内容 (#6583) 2023-10-01 15:36:24 +08:00
Lancarus
c53ebdc736 doc: Update 3.5-肉鸽辅助协议.md 2023-10-01 14:22:54 +08:00
MistEO
9f02515729 fix: 修复连接错误 (#6607) 2023-10-01 14:10:31 +08:00
MistEO
b88df053cf style: VS22 Solution Explorer name change (#6599) 2023-10-01 14:08:49 +08:00
MistEO
7e7c6b0d07 fix: 模板匹配任务,父类与子类模板数不相同时,使用最后一个阈值填充子类 2023-10-01 14:02:17 +08:00
MistEO
42762bfbb7 feat: 支持多模板匹配,任一达到阈值即视为命中
MultiMatcher 暂不支持,仅使用第一个模板
2023-10-01 13:54:56 +08:00
Lancarus
418edbea4a doc: Update 1.2-常见问题.md 2023-10-01 13:47:15 +08:00
zzyyyl
18e14e2620 fix: 修复连接错误
fix #6606
2023-10-01 13:39:16 +08:00
uye
cba20939a8 fix: 修复任务链结束后操作会在错误情况下被触发的错误 (#6574)
- close #6567 

1. 自动战斗-战斗列表结束时
2. 自动战斗发生错误时
2023-10-01 11:07:56 +08:00
David
b54ea1360d chore: missing texts EN 2023-09-30 22:59:51 +02:00
David
27737f8806 chore: missing GA navigation in local 2023-09-30 22:05:10 +02:00
zzyyyl
de330a4cb8 feat: 将LevelNameStages里面移出来,仅在进入新一层时触发
Co-authored-by: Lancarus <duzhen92@qq.com>
2023-10-01 04:04:46 +08:00
zzyyyl
e42d4e601d fix: 移除韩服的 "Roguelike@LevelName" 2023-10-01 04:04:46 +08:00
zzyyyl
c04deefd89 refactor: 重写 肉鸽运行时修改任务内容 的代码
refactor: 重写 肉鸽烧水
2023-10-01 04:04:46 +08:00
zzyyyl
d7971fdf71 docs: 关于运行时修改任务的一点解释 2023-10-01 04:04:46 +08:00
zzyyyl
ba1a62511b feat: 新增三个函数
clear_tasks() 用于清除已生成的任务(一般不需要外部调用)
lazy_parse() 用于在没有新增模板图片时的惰性加载
set_task_base() 用于切换任务
2023-10-01 04:04:46 +08:00
zzyyyl
688e6bfeb3 fix: 本来重构之后完全支持惰性加载,但是发现模板图片不支持 2023-10-01 04:04:46 +08:00
zzyyyl
ad59d59d5d feat: 延迟生成 raw_task (提升加载速度,不影响逻辑) 2023-10-01 04:04:38 +08:00
zzyyyl
965fa1e02e chore: clang-formatter.py 支持忽略指定路径 2023-10-01 03:45:13 +08:00
zzyyyl
f43501b3ed style: format (#6601) 2023-10-01 03:20:23 +08:00
zzyyyl
57237ee23e chore: update .git-blame-ignore-revs
[skip ci]
2023-10-01 03:19:23 +08:00
Lancarus
ea256c4cf9 feat:优化肉鸽失败后,开始下一次探索的速度 (#6602) 2023-10-01 02:34:20 +08:00
Lancarus
a28012b6d9 feat:优化肉鸽失败后,开始下一次探索的速度 2023-10-01 02:16:25 +08:00
uye
2477014f3e feat: 在UI中隐藏不可用的选项 (#6536) 2023-10-01 00:24:27 +08:00
zzyyyl
a5daac889a style: code format 2023-09-30 23:44:34 +08:00
zzyyyl
db9afdc77e style: resource format 2023-09-30 23:44:34 +08:00
zzyyyl
c3430da64f docs: update clang-format 2023-09-30 23:44:26 +08:00
zzyyyl
b89efd2edd refactor: 修改肉鸽开始行动和商店投资达到上限时退出的实现方式 (#6597) 2023-09-30 22:42:47 +08:00
zzyyyl
85e3ed7a22 feat: 肉鸽商店达到上限后退出不放弃肉鸽 2023-09-30 22:33:06 +08:00
Lancarus
107dc3d1c3 feat: 优化部分肉鸽关卡策略 (#6590) 2023-09-30 21:29:14 +08:00
zzyyyl
af5419a26f feat: 增加接口 get_json(), 运行时可以使用 Task.get_json() 获取任务配置的原生 json 内容 2023-09-30 21:16:36 +08:00
SherkeyXD
a99c27682d feat: 是否进入第二层也在不启用投资时隐藏 2023-09-30 21:06:28 +08:00
David
26981ecd38 style: translation for VS22 Solution Explorer 2023-09-30 14:58:01 +02:00
Sherkey
0d7ee3d275 Merge branch 'MaaAssistantArknights:dev' into dev 2023-09-30 20:56:34 +08:00
zzyyyl
8c64dc58f2 refactor: 修改肉鸽开始行动和商店投资达到上限时退出的实现方式 2023-09-30 20:53:52 +08:00
zzyyyl
0847576940 perf: 肉鸽相关 tasks.json 优化 (#6596) 2023-09-30 20:49:17 +08:00
Lancarus
205858cef0 fix: 修复需要凹直升开局的值判断错误
(cherry picked from commit afcfa67376)
2023-09-30 20:47:34 +08:00
zzyyyl
6b0e5eac22 perf: 删除冗余的 "Sami@Roguelike@NextLevel" 2023-09-30 20:27:16 +08:00
zzyyyl
b18f5369e4 perf: 优化 Sami@Roguelike@NextLevelThenExit 2023-09-30 20:27:06 +08:00
zzyyyl
96d8403321 perf: 将 Roguelike@NextLevel 的 next 抽出为 Roguelike@Stages 2023-09-30 20:23:34 +08:00
zzyyyl
3decae267c feat: 移除之前弃用的肉鸽模式 "2" 2023-09-30 20:00:22 +08:00
zzyyyl
2809cff43e fix: 修复非刷源石锭时遇到商店直接退出的问题 2023-09-30 19:53:04 +08:00
zzyyyl
2fc3adf8d8 perf: 优化 刷源石锭模式是否进入第二层 的实现方式 (#6593)
link to #6578
2023-09-30 19:51:08 +08:00
zzyyyl
c28519131f fix: 修复日服傀影肉鸽大盗当头识别错误 (#6592) 2023-09-30 19:14:01 +08:00
mejiro silence
8e2045eb00 Merge branch 'MaaAssistantArknights:dev' into dev 2023-09-30 18:46:59 +08:00
David
d19d21a317 i18n: small correction in en-us
[skip ci]
2023-09-30 12:16:22 +02:00
uye
c57eb8314a chore: 调整 copilot 小提示内容 2023-09-30 18:05:04 +08:00
zzyyyl
d70a2fbf16 perf: 优化 刷源石锭模式是否进入第二层 的实现方式 2023-09-30 17:54:21 +08:00
mejiro silence
595aa0cd61 fix: 修复日服傀影肉鸽大盗当头识别错误
天翔ける怪盗・劇団篇
有时会识别成: 天翔ける怪盗・劇団窟, 天翔ける怪盗・劇団篤
2023-09-30 17:50:44 +08:00
status102
0536b9e7a7 fix: 在自动战斗-战斗列表错误中断时,不再清理_latestTaskId 2023-09-30 16:24:13 +08:00
Lancarus
5ab83de96f feat: 肉鸽刷源石锭增加不去第二层的选项 (#6578) 2023-09-30 15:57:15 +08:00
Lancarus
1c7d608b75 feat: 优化萨米肉鸽部分策略 2023-09-30 13:57:48 +08:00
Lancarus
f09adb62e6 Merge branch 'MaaAssistantArknights:dev' into sami 2023-09-30 10:52:43 +08:00
Lancarus
67fc5199de feat: 优化部分策略 2023-09-30 00:47:14 +08:00
uye
9daf46443c style: 删除多余空格 2023-09-29 23:18:46 +08:00
uye
0dc2f394ab Merge branch 'dev' into dev 2023-09-29 23:15:26 +08:00
zzyyyl
b8f62f3069 feat: 多文件任务从 json 层面合并后再重新解析 (#6478)
现在如果有 CN 任务
```json
"base": { "text": [ "CN" ], "next": [ "aaa" ] },
"A": { "baseTask": "base", "next": [ "bbb" ] }
"B": { "baseTask": "base", "next": [ "ccc" ] }
```
只需要在 EN 文件中重新定义 base:
```json
"base": { "text": [ "EN" ] }
```
就等价于
```json
"base": { "text": [ "EN" ], "next": [ "aaa" ] },
"A": { "text": [ "EN" ], "next": [ "bbb" ] }
"B": { "text": [ "EN" ], "next": [ "ccc" ] }
```
不必再 copy 重复文件内容。外服适配不再是难题!

close #6313
2023-09-29 23:13:39 +08:00
zzyyyl
c14e1e5dbc perf: tasks.json 大修改 (#6563)
1. 删除已有 `CloseAnnos#next` 时冗余的 `TodaysSupplies`
2. `ReturnTo` -> `BlackReturn`, `Return-White` -> `WhiteReturn`,
`ReturnToConfirm` -> `ReturnConfirm`
3. 把 黑返回键 `BlackReturn`、白返回键 `WhiteReturn`、`FromStageSN` 组合成 返回键组
`ReturnButtons`(类似 `CloseAnnos`)
4. 给 黑白返回键 的 _next_ 增加 _Loading_ 套餐(跳过领取奖励时匹配得分低也许是因为这个)
5. 由于 _Infrast_, _Roguelike_, _Reclamation_ 之前特化了
`ReturnTo`,现在重新特化黑白返回键;_Reclamation_ 之前特化了 `PopupConfirm` 作为
`ReturnConfirm` (好奇怪,但我应该没理解错吧),现在重新特化 `ReturnConfirm`,修改了名称和相关内容
2023-09-29 23:13:04 +08:00
uye
71feaef680 fix: 修复自动战斗-战斗列表拖拽导致崩溃 (#6555) 2023-09-29 23:01:10 +08:00
Lancarus
0b7371c7c8 feat: 优化肉鸽招募策略 (#6579)
fix #6068
2023-09-29 21:31:02 +08:00
Lancarus
11c430d151 Merge branch 'Phantom' of https://github.com/Lancarus/MaaAssistantArknights into Phantom 2023-09-29 19:45:26 +08:00
Lancarus
a5524159c4 Merge branch 'MaaAssistantArknights:dev' into Phantom 2023-09-29 19:45:51 +08:00
Lancarus
7ff11684f7 降低热水壶和演讲稿template阈值 2023-09-29 19:45:21 +08:00
Lancarus
5acbaff1d6 fix: 修改肉鸽模式一些ocr参数 (#6580) 2023-09-29 19:39:07 +08:00
status102
f92dd9f774 fix: 修复自动战斗单一战斗错误结束时触发 任务链结束后操作 的错误 2023-09-29 17:56:32 +08:00
Annoying Flower
b0cf9a87fb fix: 修改肉鸽选技能时识别干员名的二值化下限值
上次改错值了...这次改回来(
2023-09-29 15:58:13 +08:00
Annoying Flower
46d1de5208 feat: 优化肉鸽再进入关卡的点击范围
根据三种肉鸽绝大部分地图的紧急和普通版本的可点区域,缩小点击范围,这次应该不会卡在关卡外面了
2023-09-29 15:45:37 +08:00
Lancarus
36629f6ff4 fix: 傀影肉鸽骑士对决ocr替换 2023-09-29 15:44:51 +08:00
Lancarus
e7f5b6257e 加了个控制条件 2023-09-29 14:49:47 +08:00
Lancarus
c074ac5b17 feat: 优化肉鸽招募策略 fix #6068 2023-09-29 14:35:05 +08:00
Lancarus
1b0ae5f75f fix: 尝试修复#6552导致的死循环 (#6577)
#6552 重命名任务,缩小了点击范围(只测了下萨米的,其他的不知道位置变化大不大),逻辑改成直到进入肉鸽开始战斗界面前一直点
2023-09-29 13:42:11 +08:00
Lancarus
1c1d1ac511 外服ui适配 2023-09-29 02:40:18 +08:00
Lancarus
a22be93678 fix:尝试修复#6552导致的死循环 2023-09-29 02:21:52 +08:00
Lancarus
d493829d25 格式化代码 2023-09-29 02:16:49 +08:00
Lancarus
d92677675e feat:肉鸽刷源石锭模式添加是否去第二层的选项 2023-09-29 02:16:05 +08:00
Lancarus
da7c19c98b Revert "feat: 肉鸽刷源石锭增加不去第二层的选项"
This reverts commit e7ea7219c1.
2023-09-29 02:12:51 +08:00
Lancarus
e7ea7219c1 feat: 肉鸽刷源石锭增加不去第二层的选项 2023-09-29 02:10:06 +08:00
zzyyyl
3e89b4a35e perf: use std::string_view 2023-09-29 00:33:28 +08:00
zzyyyl
6e3a80efcb feat: 每次 parse 都先清空已生成的任务信息 2023-09-29 00:33:28 +08:00
zzyyyl
2af330cb4b refactor: remove useless fields 2023-09-29 00:33:28 +08:00
zzyyyl
12aebc6612 fix: 修复 "baseTask": "#none",以及相关文档 2023-09-29 00:33:28 +08:00
David
7a1a476c09 refactor: useless objects 2 2023-09-29 00:33:28 +08:00
zzyyyl
1bfba5180d refactor: removing useless objects
Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
2023-09-29 00:33:28 +08:00
zzyyyl
7fd753f8a2 feat: 多文件任务从 json 层面合并后再重新解析
现在如果有 CN 任务
```
"base": { "text": [ "CN" ], "next": [ "yyy" ] },
"A": { "baseTask": "base", "next": [ "xxx" ] }
```
只需要在 EN 文件中重新定义 base:
```
"base": { "text": [ "EN" ] }
```
就等价于
```
"base": { "text": [ "EN" ], "next": [ "yyy" ] },
"A": { "text": [ "EN" ], "next": [ "xxx" ] }
```

外服适配不再是难题!
Multi-language adaptation is no longer a problem!
2023-09-29 00:33:20 +08:00
zzyyyl
20dfd8b3d0 fix: 修复超出生成任务上限时访问越界的问题,增加生成任务上限至 10000
是半年前的憨憨 zzyyyl 写的!
link to 9ff4c30b08
2023-09-28 21:14:54 +08:00
status102
7467584209 fix: 修复任务链结束finished_tasks为空时,错误触发任务链结束后操作 2023-09-28 20:23:03 +08:00
status102
eb4ba950dc fix: 修复 自动战斗-战斗列表 在结束时会触发主界面完成后操作的问题 2023-09-28 19:50:27 +08:00
MistEO
512f045677 doc: 补充 Hyper-V 说明 (#6572) 2023-09-28 15:54:46 +08:00
Rbqwow
00796be0b2 update docs/1.3-模拟器支持.md 2023-09-28 15:16:24 +08:00
uye
b9c4ec15e2 style: 格式化 xaml 2023-09-28 13:57:19 +08:00
uye
afd9849f8d chore: 修改公告页面格式,允许复制,修改弹出逻辑 2023-09-28 13:57:19 +08:00
zzyyyl
630ed9da8d fix: 代码中修改 ReturnTo -> BlackReturn 2023-09-28 12:37:40 +08:00
zzyyyl
04f3118294 perf: 简化 Infrast 相关任务 2023-09-28 12:37:39 +08:00
zzyyyl
7d44278884 perf: tasks.json 大修改
1. 删除已有 "CloseAnnos#next" 时冗余的 "TodaysSupplies"
2. "ReturnTo" -> "BlackReturn", "Return-White" -> "WhiteReturn", "ReturnToConfirm" -> "ReturnConfirm"
3. 把 `黑返回键`(原 "ReturnTo")、`白返回键`、"FromStageSN" 组合成 `返回键组` "ReturnButtons"
4. 给 黑白返回键 的 next 增加 Loading 套餐(跳过领取奖励时匹配得分低也许是因为这个)
5. 由于 Infrast, Roguelike, Reclamation 之前特化了 ReturnTo,现在重新特化黑白返回键;Reclamation 之前特化了 PopupConfirm 作为 ReturnConfirm (好奇怪,但我应该没理解错吧),现在重新特化 ReturnConfirm,修改了名称和相关内容
2023-09-28 12:37:29 +08:00
uye
88d1ce50fd refactor: 提取 FetchResponseWithEtag 函数 2023-09-28 10:39:34 +08:00
MistEO
12ff33d7a3 docs: Linux编译教程中增加NUR (#6566) 2023-09-28 09:24:58 +08:00
uye
dcded46c6b feat: 公告弹窗 (#6557) 2023-09-28 09:24:29 +08:00
David
ad5c2d9dd9 i18n: small en adjustment
[skip ci]
2023-09-27 21:28:41 +02:00
北雁 Cryolitia
9b46afa19c docs: Linux编译教程中增加NUR 2023-09-27 23:46:34 +08:00
uye
723968efd7 sytle: 简化 using 2023-09-27 23:29:06 +08:00
uye
79b41c5457 fix: 避免响应数据流意外关闭或为空 2023-09-27 23:18:34 +08:00
zzyyyl
ebe548bda5 i18n: 修复日服肉鸽导航问题 (#6559)
对日服肉鸽的导航进行的适配

fix #6489
2023-09-27 22:56:57 +08:00
MistEO
8e8cfe037d fix: 修复资源更新时的崩溃问题
fix #6561
fix #6562
2023-09-27 22:53:44 +08:00
uye
78a0baacaf 重构:WPF 配置部分 (#6549)
别再用大Map啦,快来用点更现代的配置系统实践。

本 PR 仅供评估,未完全迁移全部配置项,若通过我将完成剩余部分的迁移。
2023-09-27 20:29:02 +08:00
MejiroSilence
8dc9e6f5a9 i18n: 修复日服肉鸽导航问题 2023-09-27 19:40:18 +08:00
Cryolitia
02f1e5672d Merge remote-tracking branch 'upstream/dev' into config-refector
# Conflicts:
#	src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
2023-09-27 18:47:16 +08:00
uye
a91c5be3d4 style: 消除 Notice 2023-09-27 17:31:15 +08:00
uye
d5ca0377a0 feat: 公告弹窗 2023-09-27 17:12:05 +08:00
MistEO
32a86569a0 chore: Auto Update Game Resources - 2023-09-27 2023-09-27 09:08:28 +00:00
MistEO
01bd8ebf03 fix: 修复肉鸽编队时识别不到最下面一个干员名以及不能正确选技能的问题 (#6552) 2023-09-27 16:43:02 +08:00
MistEO
1649b12050 chore: Auto Update Game Resources - 2023-09-27 2023-09-27 08:33:14 +00:00
status102
df747d32e3 fix: qodana 2023-09-27 15:06:17 +08:00
status102
1b32b76e68 docs: 加一点注释 2023-09-27 13:42:37 +08:00
status102
bba79cf2a9 fix: 修复自动战斗-战斗列表拖拽导致崩溃 #6550 2023-09-27 13:41:40 +08:00
uye
919cc79e68 chore: 统一 URL 存放位置 2023-09-27 13:28:41 +08:00
zzyyyl
963e0a9f1b fix: 修复跳过领取日常奖励的问题
link to 589fb9d1b3
fix #6286
2023-09-27 12:55:51 +08:00
MiaoYan JY
000a9fdceb fix: 增大前后延迟,适配低端电脑配置 2023-09-27 11:57:25 +08:00
MiaoYan JY
28c2487d7b fix: 修复肉鸽编队时不选技能的问题 2023-09-27 11:12:06 +08:00
MiaoYan JY
95b1c95ced fix: 修复肉鸽编队时识别不到最下面一个干员名的问题 2023-09-27 11:07:00 +08:00
Cryolitia
d6d163d9d0 refactor: config
Signed-off-by: Cryolitia <cryolitia@gmail.com>
2023-09-27 03:37:51 +08:00
David
d07840974a style: en SanityReport formatting
[skip ci]
2023-09-26 21:28:50 +02:00
uye
0f63d4a5c0 perf: 根据 qodana 优化代码 (#6542) 2023-09-27 01:20:34 +08:00
uye
de2ac9a4d6 fix: 修复错误变量名 2023-09-26 22:47:56 +08:00
uye
624aa9c31e merge: 合并 dev 分支修改 2023-09-26 22:42:34 +08:00
uye
0386cfb672 fix: 修复外服错误文件名 2023-09-26 22:26:29 +08:00
uye
02cfb4e994 fix: 修复模板文件名错误 2023-09-26 22:16:42 +08:00
MistEO
2ed4d76b1f Release v4.24.0 (#6520) 2023-09-26 21:46:13 +08:00
MistEO
a0b7114b1b perf: Core不再缓存理智结果,Gui缓存理智读取结果,刷理智合并理智输出和战斗次数输出 (#6544)
顺带修了一下
- close #6540 

船新输出(假装
![%
DEF1A(I%M7Y@DQ_1VWDHO](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/102887808/cfaa1613-2a42-4b95-975d-b7f06cd5cbf5)
2023-09-26 21:45:29 +08:00
status102
7f4146147d fix: qodana 2023-09-26 21:45:05 +08:00
status102
906f3b6952 perf: Core不再缓存理智结果,Gui缓存理智读取结果,刷理智合并理智输出和战斗次数输出 2023-09-26 21:35:38 +08:00
status102
ff9d10b628 fix: 修复外部通知 时区错误 #6540 2023-09-26 20:45:51 +08:00
SherkeyXD
19784b10f7 chore: 删除不必要的name属性 2023-09-26 20:33:34 +08:00
SherkeyXD
e93ccfa38a feat: 源石锭达到上限结束选项现在在不可用时隐藏 2023-09-26 20:29:22 +08:00
SherkeyXD
11c9d87ffd Revert "feat: 烧开水模式不再默认启用投资,同时源石锭模式隐藏投资选项"
This reverts commit 1fadee338f.
2023-09-26 20:24:52 +08:00
SherkeyXD
80ce00e46f Revert "refactor: 迁移部分设置判断到SettingsViewModel"
This reverts commit 6c4d0e8fb0.
2023-09-26 20:11:18 +08:00
uye
afe3641f92 fix: 关卡选择为剿灭时刷理智任务会尝试所有备选关卡 #6524 2023-09-26 19:52:46 +08:00
uye
d8b6b700c2 chore: Convert into constant 2023-09-26 17:56:44 +08:00
uye
16033ae9ed style: Convert into constant,统一注释 2023-09-26 17:47:58 +08:00
uye
05b4f65b28 fix: 修复错误的 XML comment 2023-09-26 17:32:59 +08:00
uye
884b7287a6 style: 修正错误单词,修改示例 2023-09-26 16:33:56 +08:00
SherkeyXD
26f49cfbf9 feat: 傀影肉鸽也不显示精二直升选项 2023-09-26 16:09:32 +08:00
uye
6c5265022c style: 规范变量命名,修正错误变量名,修正错误注释 2023-09-26 16:03:05 +08:00
SherkeyXD
710c34eb25 refactor: 是否显示精二干员开局由binding判断 2023-09-26 15:50:35 +08:00
SherkeyXD
6c4d0e8fb0 refactor: 迁移部分设置判断到SettingsViewModel 2023-09-26 15:45:15 +08:00
SherkeyXD
1fadee338f feat: 烧开水模式不再默认启用投资,同时源石锭模式隐藏投资选项 2023-09-26 15:44:27 +08:00
SherkeyXD
45157f5909 chore: 移除无用的using 2023-09-26 14:24:21 +08:00
SherkeyXD
73ab4ffc29 fix: 根据review做出修改 2023-09-26 14:07:16 +08:00
MistEO
8f1454311b docs: Update CHANGELOG.md 2023-09-26 10:50:45 +08:00
uye
bb16493bea perf: 减少不必要的 try-catch 2023-09-26 10:10:50 +08:00
github-actions[bot]
83b0206f8a docs: Auto Update Changelogs of v4.24.0-rc.2 (#6538)
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/6520

---------

Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-09-26 09:48:50 +08:00
MistEO
586ec6838f fix: 修复肉鸽招募卡住的问题 (#6528)
~~头大,不同模拟器的不同分辨率和dpi对这个星居然有的识别不出来~~
回滚`Roguelike@RecruitWithoutButton`至单纯点击任务
2023-09-26 09:43:22 +08:00
MistEO
1023c4fd95 fix: 自动战斗-战斗列表启用时,对所有作业追加摆完挂机选项操作 (#6533)
- close #6507
2023-09-26 09:42:43 +08:00
SherkeyXD
5766fe9a2b feat: 非水月肉鸽不显示刷新商店获取指路鳞选项 2023-09-25 23:43:53 +08:00
SherkeyXD
8765b681f4 fix: 加上遗漏的设置 2023-09-25 23:20:25 +08:00
SherkeyXD
f089973c96 feat: 烧开水模式也禁止修改投资源石锭选项 2023-09-25 23:18:07 +08:00
Lancarus
090e09cf49 凹直升模式 2023-09-25 23:01:38 +08:00
SherkeyXD
c1d9226382 feat: 刷源石锭模式禁止更改投资源石锭选项 2023-09-25 23:00:17 +08:00
Lancarus
9e0c707830 Merge branch 'sami' of https://github.com/Lancarus/MaaAssistantArknights into sami 2023-09-25 22:50:50 +08:00
Lancarus
01356c7f05 回滚招募点击任务 2023-09-25 22:50:39 +08:00
Lancarus
8608eeef55 fix: 回滚l RecruitWithOutButton 任务 2023-09-25 22:50:01 +08:00
Lancarus
1cc03fbdca Merge branch 'MaaAssistantArknights:dev' into sami 2023-09-25 22:49:07 +08:00
MistEO
ae7dbadb55 fix: 修复ProcessTask停不掉的问题 2023-09-25 22:47:42 +08:00
status102
9ec19516ad docs: 修改文档中关于账号切换容易产生误解的地方 #6500 2023-09-25 22:18:27 +08:00
status102
1f14ebf0e8 perf: 修改输入框Enabled以优化输入作业号时的表现 2023-09-25 22:14:52 +08:00
status102
0dd1405061 fix: 自动战斗-战斗列表启用时,自动追加摆完挂机选项
close #6507
2023-09-25 22:14:46 +08:00
MistEO
07b793204e docs: 添加对账号切换的说明 (#6500) 2023-09-25 21:59:08 +08:00
MistEO
8ab2cbb45c fix: 修改理智数据格式 (#6525) 2023-09-25 21:58:19 +08:00
zzyyyl
39168ee6c0 feat: 将理智数据用 object 而不是 array 存储 2023-09-25 19:18:51 +08:00
MistEO
1c53e66081 fix: 修复理智预测时间格式 (#6514)
修了一下格式问题(日期丢失,导致难以判断第一个时间是具体时间)
设计格式:

![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/102887808/1ab78272-4257-4d50-9ac9-ae8f63468860)
当前格式:

![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/102887808/b94e10c3-6af3-45dd-b1ab-90fba71eb428)

顺带修改了一下时间间隔的格式

- close #6506
2023-09-25 16:03:00 +08:00
zzyyyl
cde0946d2c perf: use from_chars instead of stoi to avoid exception 2023-09-25 15:20:03 +08:00
zzyyyl
de9ffbc625 fix: 修复理智数据的一系列问题 2023-09-25 15:19:50 +08:00
status102
eae6c5f6e8 fix: 在Core检查理智获取数据合法性
fix #6519
2023-09-25 14:47:38 +08:00
Lancarus
a5d103f21d 脑子坏了,多擦掉一些边缘就行了应该 2023-09-25 14:35:15 +08:00
Lancarus
5e3f9c8a92 再适配一下截图 2023-09-25 14:10:57 +08:00
Lancarus
77d7e4399e 进一步降低匹配度阈值,增加前任务的延时 2023-09-25 13:29:16 +08:00
Lancarus
f8ec5cba04 fix: 尝试修复肉鸽招募卡主的问题 2023-09-25 13:05:38 +08:00
Lancarus
055abcfefd fix: 继续尝试修复肉鸽卡在招募界面 (#6521)
回滚截图并降低匹配度阈值
2023-09-25 08:43:20 +08:00
Lancarus
c37d85bd0d fix: 继续尝试修复肉鸽卡在招募界面 2023-09-25 05:03:15 +08:00
MistEO
76aac71141 fix: 修复 理智获取数据格式错误 导致的崩溃 (#6519) 2023-09-25 01:46:42 +08:00
status102
e965b367af fix: 修复 理智获取数据格式错误 导致的崩溃 2023-09-24 23:12:00 +08:00
status102
c2347cf521 perf: 移除小时、分钟数内部的空格以保持紧凑 2023-09-24 22:02:50 +08:00
MistEO
d175c26c4b Release v4.24.0-rc.1 (#6498) 2023-09-24 21:37:10 +08:00
github-actions[bot]
112ae88418 docs: Auto Update Changelogs of v4.24.0-rc.1 (#6518)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-09-24 21:36:46 +08:00
MistEO
8d72c086f0 fix: 自动战斗-自动编队-补充低信赖干员: 修正补充顺序,避免在极端情况下补充错误 (#6499) 2023-09-24 21:34:21 +08:00
status102
1b1e0eaa04 fix: 自动战斗-自动编队-补充低信赖干员: 修正补充顺序,避免在极端情况下补充错误 2023-09-24 21:12:45 +08:00
status102
47da23311b perf: 修改理智预测时间格式 2023-09-24 20:53:28 +08:00
Lancarus
541bbb9cec fix: 尝试修复肉鸽卡在招募界面 (#6516) 2023-09-24 20:15:53 +08:00
Lancarus
33a6570c92 lager the roi of task "Roguelike@RecruitWithoutButton" 2023-09-24 19:28:49 +08:00
Lancarus
8c8c8a755b fix: 尝试修复肉鸽卡在招募界面 2023-09-24 18:41:56 +08:00
David
20e7d429c1 i18n: at on in date time 2023-09-24 10:48:40 +02:00
MistEO
840c633d4e perf: optimize time diff format in sanity report (#6512) 2023-09-24 15:30:03 +08:00
KevinT3Hu
bc8b659ee5 perf: optimize time diff format in sanity report 2023-09-24 15:23:50 +08:00
uye
8bbf240408 perf: 优化部分 WPF 代码 (#6510) 2023-09-24 14:05:15 +08:00
uye
4a40f81334 perf: 优化部分 WPF 代码 2023-09-24 13:50:38 +08:00
uye
b30d129a11 fix: 开机自启失败/多实例自启
fix #6474
fix #5721
fix #6291
2023-09-24 13:50:37 +08:00
zzyyyl
c44b876a19 debug: debug 模式下增加一项可省略模板任务名的检查 2023-09-24 12:05:02 +08:00
zzyyyl
b2f9f258f1 perf: 优化部分 WPF 代码 2023-09-24 11:57:34 +08:00
MistEO
66d4c33935 perf: 优化 wpf 代码 (#6504) 2023-09-24 05:07:47 +08:00
MistEO
125782f1eb fix: 自动战斗-战斗列表,补充突袭结算图,修复从缓存文件夹添加作业时报错 (#6497) 2023-09-24 05:04:47 +08:00
Lancarus
d71ede8cb1 fix: 修复凹直升功能造成的卡在招募立绘等bug (#6502) 2023-09-24 01:48:39 +08:00
zzyyyl
10d286c8ee perf: 优化部分 WPF 代码 2023-09-24 00:00:24 +08:00
zzyyyl
ac8c51ccc4 perf: 优化 WPF 显示理智回满时间的代码 2023-09-24 00:00:11 +08:00
Lancarus
5a2aa5d872 优化凹直升按钮的ui逻辑 2023-09-23 23:30:22 +08:00
A-JiuA
0d7226c51c docs: 添加对账号切换的说明 2023-09-23 23:23:14 +08:00
Lancarus
e0f27aef6b fix: 修复凹直升模式造成的bug 2023-09-23 23:21:29 +08:00
Lancarus
31e01eacf7 fix: 修复凹直升模式造成的bug
feat:优化凹直升的ui显示
2023-09-23 23:19:03 +08:00
status102
547d69d1be fix: 自动战斗-战斗列表 从缓存文件夹里添加作业时,无法拷贝导致报错 2023-09-23 19:34:22 +08:00
status102
8399ab418b fix: 补充突袭结算图 2023-09-23 18:50:58 +08:00
zzyyyl
dcca78944f fix: 删掉多余的模板图片 2023-09-23 17:57:32 +08:00
MistEO
7369f5dce0 🐞 fix(Java-HTTP): 修复Java-HTTP api的编译问题 (#6490) 2023-09-23 17:56:31 +08:00
MistEO
b738231c77 feat: 在非烧水模式,取消刷直升按钮 (#6484) 2023-09-23 17:55:31 +08:00
MistEO
6c1da94b3c feat: 自动战斗跳过“以下干员出战后将被禁用,是否继续?”对话框 #4917 #4694 #5351 (#6492) 2023-09-23 17:54:21 +08:00
Rbqwow
2e21fa0d00 docs: 文档杂项修改 (#6485) 2023-09-23 17:53:56 +08:00
youqii
774355c3a7 feat: 新增领取邮件功能 (#6438)
close #6186 

---------

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
2023-09-23 17:52:30 +08:00
Hydrogina
64e9726d66 feat: 自动战斗跳过“以下干员出战后将被禁用,是否继续?”对话框 #4917 #4694 #5351 2023-09-23 12:20:14 +08:00
gylove1994
fbb0f1a34c 🐞 fix(Java-HTTP): 修复Java-HTTP api的编译问题 2023-09-23 10:09:34 +08:00
Lancarus
24d712c0c4 docs: Update 3.5-肉鸽辅助协议.md 2023-09-23 01:08:55 +08:00
mole828
4a60759843 #fix 隐藏与否弄反了 2023-09-23 00:32:50 +08:00
MistEO
fa2b0e8eab Release v4.24.0-beta.5 (#6480) 2023-09-23 00:04:59 +08:00
github-actions[bot]
756c789c71 docs: Auto Update Changelogs of v4.24.0-beta.5 (#6481)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-09-23 00:04:41 +08:00
mole828
2717ca0ec6 feat: 在非烧水模式,取消刷直升按钮 2023-09-22 23:06:55 +08:00
uye
43651b1b44 feat: 开始唤醒-账号切换新增手动切换,可单独执行开始唤醒流程 (#6433)
- close #6431
2023-09-22 22:55:08 +08:00
zzyyyl
1c2c970086 fix: 修复 sanity_report == null 的问题
link to #6456
2023-09-22 22:39:12 +08:00
MistEO
c9a1bac6af fix: 加工站不设置干员时,直接报错并返回
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/6400
2023-09-22 21:12:09 +08:00
MistEO
9362956541 feat: 如果任务流程中勾选了刷理智,则在任务链结束时提供一个理智回满的预测时间 (#6456) 2023-09-22 20:50:49 +08:00
MistEO
5c77622db3 chore: 在Python脚本中添加活动关导航下载与加载的示例 (#3916) (#6451) 2023-09-22 20:50:14 +08:00
zzyyyl
83fda39b54 style: 删除多余的空任务 2023-09-22 20:48:33 +08:00
zzyyyl
9c653dba81 debug: 增加一项多余空任务的检查 2023-09-22 20:48:26 +08:00
zzyyyl
49fbcd1f5d fix: 修复 EN 任务 BattleQuickFormationFilter-Cost
link to ffbdef1637
2023-09-22 20:48:20 +08:00
zzyyyl
c89e711aec fix: 修复 EN 生息演算任务 Reclamation@ManufactureStatus roi 越界的问题
link to 71ea085544
link to #6267
2023-09-22 20:47:39 +08:00
Zhao Zuohong
4284b47940 chore: 改进Python脚本中incremental_path参数说明 2023-09-22 17:23:30 +08:00
status102
caef5c411d fix: Simulator -> Emulator 2023-09-22 17:13:00 +08:00
MistEO
5b4834f51a feat:优化傀影招募策略 (#6476) 2023-09-22 16:35:14 +08:00
MistEO
16e4a024cc ci: 更新qodana配置 (#6465) 2023-09-22 16:31:19 +08:00
status102
89aaf14cd6 perf: 追加时间间隔 2023-09-22 15:42:45 +08:00
Lancarus
7798c2dcf8 feat:优化傀影招募策略 2023-09-22 15:41:51 +08:00
David
cc24ced60d feat: EN SSReopen-XX adaptation 2023-09-21 21:36:59 +02:00
David
bde1ef8475 feat: EN Guide Ahead navigation 2023-09-21 21:12:16 +02:00
MistEO
c17227c210 chore: Auto Update Game Resources - 2023-09-21 2023-09-21 11:07:47 +00:00
MistEO
340ff17d51 chore: Auto Update Game Resources - 2023-09-21 2023-09-21 09:52:16 +00:00
MistEO
3ca1a369f1 chore: Auto Update Game Resources - 2023-09-21 2023-09-21 07:27:57 +00:00
MistEO
292ee8cc10 chore: Auto Update Game Resources - 2023-09-21 2023-09-21 06:32:56 +00:00
Lancarus
0b74c0309c fix: 修复水月肉鸽卡在藏品 (#6464)
当藏品超过5个时,点击Mizuki@Roguelike@CloseEvent会有概率点到藏品导致展开藏品界面并卡主
fix #5892 
fix #6148 
fix #6090 
fix #5530 
fix #6452 
fix #6366 
fix #5831 
fix #5709 
fix #5041 
fix #4759 
fix #4499 
fix #4175
2023-09-21 10:44:27 +08:00
Infko
d05f3d295e 更新qodana配置 2023-09-21 02:19:16 +00:00
mole828
bf2a60d25a fix: 修复水月肉鸽藏品卡在藏品 2023-09-21 09:58:36 +08:00
status102
6e7650ea73 perf: 时间格式修改为HH:mm:ss 2023-09-21 08:38:53 +08:00
David
72b2348f5f chore: fix algorithm error warning 2023-09-20 20:32:58 +02:00
status102
77e6bfa466 feat: 如果任务流程中勾选了刷理智,则在任务链结束时提供一个理智回满的预测时间 2023-09-20 17:18:19 +08:00
uye
4f5343aa41 chore: 通过进程名关闭蓝叠时如果模拟器个数超过1个则放弃关闭 2023-09-20 15:36:33 +08:00
status102
1ce4843662 docs: 更正格式 2023-09-20 14:27:52 +08:00
MistEO
9100a00411 feat: 肉鸽烧开水模式增加凹开局直升 (#6443)
fix #4791 fix #4833 fix #5539 fix #6203
2023-09-20 12:52:38 +08:00
MistEO
bf16adacf1 perf: 激活自动战斗-战斗列表时将同时激活自动编队,调整自动战斗UI (#6448) 2023-09-20 12:50:54 +08:00
Zhao Zuohong
16d8ae1ec5 chore: 在Python脚本中添加活动关导航下载与加载的示例 (#3916) 2023-09-20 11:44:48 +08:00
Lancarus
94efc941dc feat: 优化傀影肉鸽招募和商店逻辑 (#6447) 2023-09-20 10:24:18 +08:00
status102
29354159f6 perf: 激活自动战斗-战斗列表时将同时激活自动编队,调整自动战斗UI 2023-09-20 10:08:26 +08:00
Lancarus
88bb4b27d3 feat: 优化傀影肉鸽招募和商店逻辑 2023-09-20 01:37:40 +08:00
Lancarus
8ed8449a45 feat: 适配其他服,格式化代码 2023-09-19 20:34:41 +08:00
zzyyyl
d4c1f4e7de fix: 修复 debug 模式下 tasks.json 检查未通过时的访问越界问题 2023-09-19 20:34:38 +08:00
MistEO
41f55c6997 chore: Auto Update Game Resources - 2023-09-19 2023-09-19 09:07:29 +00:00
Lancarus
643c751406 Merge branch 'MaaAssistantArknights:dev' into sami 2023-09-19 16:38:09 +08:00
Lancarus
ac0be48b1f feat: 增加肉鸽凹开局直升 2023-09-19 16:29:16 +08:00
MistEO
c24e6badff chore: Auto Update Game Resources - 2023-09-18 2023-09-18 20:08:33 +00:00
zzyyyl
2b1df44ed5 feat: 投资达到上限后退出到肉鸽主界面 (#6435)
fix #6201
2023-09-19 00:22:30 +08:00
Lancarus
3ff6b37fcd feat: 适配高规格分队开局 (#6436) 2023-09-18 22:00:16 +08:00
Lancarus
d7bc8fcea3 feat: 适配高规格分队开局 2023-09-18 21:28:21 +08:00
枫雨
874ae757ba chore: 稍微优化下自动战斗界面 ui 2023-09-18 20:10:02 +08:00
zzyyyl
e48f79b921 feat: 投资达到上限后退出到肉鸽主界面
fix #6201
2023-09-18 20:02:16 +08:00
David
b486890d45 style: reordered objects, following zh-cn 2023-09-18 12:43:15 +02:00
David
4d15306f2e refactor: removed duplicate operator
[skip ci]
2023-09-18 11:43:15 +02:00
David
a12bfd2a9e chore: Alter Operators ^$ regex
fix Yato alter, Noir alter, Terra Research ident.
2023-09-18 11:35:20 +02:00
status102
bfff060987 feat: 开始唤醒-账号切换新增手动切换,可单独执行开始唤醒流程 2023-09-18 16:58:04 +08:00
zzyyyl
fc6ef285e7 fix: 修复网络波动造成的使用理智药不清理智问题
fix #6384
link to c2ae19df25
2023-09-18 15:57:19 +08:00
MistEO
9edd7f341b perf: 优化 自动战斗-战斗列表 跳过战斗后剧情的逻辑 (#6430) 2023-09-18 15:20:52 +08:00
status102
f20583d268 perf: 调整部分UI与Idle的绑定 2023-09-18 15:03:28 +08:00
status102
eb852d0029 perf: 优化 自动战斗-战斗列表 跳过战斗后剧情的逻辑 2023-09-18 14:39:54 +08:00
Hao Guan
4102f9727e chore: macOS 国际服允许添加生息演算任务 2023-09-18 14:01:53 +10:00
MistEO
b5aa604f6f fix: 修复自动战斗-战斗列表的导航失效问题 (#6413)
- #6407
2023-09-18 10:39:08 +08:00
MistEO
34fd6c3579 fix: 修复Status缓存跨任务清理在任务链正常完成情况下失效的错误 (#6428)
- close #6417
2023-09-18 10:38:20 +08:00
status102
9e8adf0cb6 fix: 修复Status缓存跨任务清理在任务链正常完成情况下失效的错误 2023-09-18 10:09:56 +08:00
status102
64f04b648a docs: 修改""为「」 2023-09-18 10:01:56 +08:00
Lancarus
336860768d feat: 优化萨米招募逻辑 (#6422) 2023-09-18 03:22:35 +08:00
Lancarus
72a79dc01d feat: 优化萨米招募逻辑 2023-09-18 01:29:50 +08:00
Lancarus
b88cb4e237 Merge branch 'sami' of https://github.com/Lancarus/MaaAssistantArknights into sami 2023-09-18 01:29:08 +08:00
uye
3ae4d298ba chore: 稍微优化下自动战斗界面 ui 2023-09-17 21:57:33 +08:00
status102
163b519c81 fix: 修复自动战斗-战斗列表的导航失效问题 2023-09-17 18:26:21 +08:00
Alisa
9de22604bb fix: 修复外部通知错误 (#6414)
fix: #6349 
fix: #6411
2023-09-17 04:41:28 -05:00
Liam Sho
a358d1d9cf fix: catch error from external notifications 2023-09-17 16:48:39 +08:00
uye
2a5479b8c8 feat: gui.log 在启动时记录当前版本 2023-09-17 16:11:25 +08:00
Liam Sho
752858c442 fix: #6349 put external notification job in dedicated async task context 2023-09-17 16:11:02 +08:00
uye
6aaf750169 chore: 无配置字段时储存默认值 2023-09-17 15:59:57 +08:00
uye
b63c05d66f fix: 修复资源读取错误,修复错误的界面提示
fix #6410
2023-09-17 15:47:57 +08:00
uye
4fd41b26f9 chore: 全局选项设置减少嵌套,增加日志 2023-09-17 15:47:57 +08:00
MistEO
9e7c08edf8 perf: 水月肉鸽:增加支援道具,新干员分组,优化大君遗脉策略 (#6372) 2023-09-17 15:38:31 +08:00
MistEO
d2967091f6 fix: 修复资源更新toast笔误 2023-09-17 15:38:16 +08:00
MistEO
ee89b787e1 perf: 增加延迟以提高刷理智-当前理智识别成功率 (#6402) 2023-09-17 12:05:12 +08:00
MistEO
770db3d22d fix: 基建换班-编组缓存 使用value_or替代empty检查 (#6404) 2023-09-17 12:04:38 +08:00
status102
484225beae perf: 微调自动战斗-战斗列表Margin 2023-09-17 11:25:26 +08:00
status102
4bcfdab180 fix: 使用value_or替代empty检查 2023-09-17 11:24:59 +08:00
status102
f1bb491902 perf: 增加延迟以提高当前理智识别成功率 2023-09-17 10:50:08 +08:00
MistEO
ee904ce60a Release v4.24.0-beta.4 (#6379) 2023-09-17 03:17:02 +08:00
github-actions[bot]
2839fceb86 docs: Auto Update Changelogs of v4.24.0-beta.4 (#6380)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-09-17 02:44:36 +08:00
MistEO
5596ad5469 feat: 适配萨米肉鸽生活至上分队,优化部分逻辑 (#6385) 2023-09-17 02:12:51 +08:00
MistEO
ff147aed81 feat: 自动战斗新增战斗列表选项(异形UI不支持) (#6350) 2023-09-17 01:59:51 +08:00
Lancarus
9e70b7b8cf Merge branch 'MaaAssistantArknights:dev' into sami 2023-09-17 01:56:10 +08:00
Lancarus
4e4008f0e6 feat: 更新萨米纵向不期而遇截图 2023-09-17 01:54:12 +08:00
status102
b691078283 docs: 添加战斗列表相关说明 2023-09-16 23:48:21 +08:00
MistEO
1888770eea fix: 将基建换班编组匹配的可用干员缓存移动至Status,以免多实例时发生冲突 (#6391) 2023-09-16 23:33:49 +08:00
status102
c4e9c0c5dd feat: 自动战斗-战斗队列 新增 未三星结束时中止流程 2023-09-16 18:47:23 +08:00
status102
08ed5304c6 perf: 调整自动战斗UI 2023-09-16 15:20:13 +08:00
status102
cd4fd07891 fix: 将基建换班编组匹配的可用干员缓存移动至Status,以免多实例时发生冲突 2023-09-16 11:09:46 +08:00
David
92dde9f441 chore: ignore template 2023-09-15 23:37:54 +02:00
Lancarus
70387a918e feat: 适配萨米肉鸽生活至上分队 2023-09-16 04:27:18 +08:00
Yumi0606
4f8990a078 再次提交 2023-09-16 00:28:58 +08:00
Alisa
8fa95e4c0c [skip ci] i18n: Translations update from MAA Weblate (#6348)
Translations update from [MAA Weblate](https://weblate.maa-org.net) for
[MaaAssistantArknights/MAA WPF
Gui](https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/).



Current translation status:

![Weblate translation
status](https://weblate.maa-org.net/widget/maa-assistant-arknights/maa-wpf-gui/horizontal-auto.svg)
2023-09-15 07:43:36 -05:00
Weblate
40b3652a85 Translated using Weblate (Korean)
Currently translated at 94.8% (558 of 588 strings)

Translated using Weblate (Japanese)

Currently translated at 99.8% (587 of 588 strings)

Translated using Weblate (English (United States))

Currently translated at 99.1% (583 of 588 strings)

Translated using Weblate (English (United States))

Currently translated at 99.1% (583 of 588 strings)

Co-authored-by: Alisa <alisa@alisaqaq.moe>
Co-authored-by: Constrat <david.pezzot@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
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/
Translation: MaaAssistantArknights/MAA WPF Gui
2023-09-15 20:43:15 +08:00
MistEO
403f57fb2d fix: 修复task.png阈值
fix #6286
2023-09-15 19:48:21 +08:00
MistEO
9291ff6e1f perf: 基建换班-干员编组增加可用干员缓存,同时在单次换班任务中避免重复匹配已匹配的干员 (#6376) 2023-09-15 19:15:57 +08:00
status102
6616e6a08c fix: Apply suggestions from code review
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-09-15 19:15:08 +08:00
MistEO
171329994d fix: 修复SettingsView的Idle不生效,将开始唤醒-账号切换在非Idle情况下锁定 (#6364) 2023-09-15 19:13:33 +08:00
MistEO
518f826f89 perf: 再改改优化资源下载的写法 2023-09-15 19:03:27 +08:00
MistEO
ecc3dc2f37 perf: 优化资源下载的写法 2023-09-15 19:02:11 +08:00
MistEO
cc3e7f5810 fix: 下载更新资源先使用临时文件缓存 2023-09-15 18:58:28 +08:00
David
4cf609bbc9 fix: Gadget long name reduction for EN 2023-09-15 11:49:00 +02:00
status102
d9918c998c docs: 加点注释 2023-09-15 17:29:33 +08:00
status102
4fd4a2744b perf: 基建换班-干员编组增加可用干员缓存,同时在单次换班任务中避免重复匹配已匹配的干员 2023-09-15 17:02:09 +08:00
羽弥Tian_Yumi
52cd712576 优化大君遗脉部署策略 2023-09-15 13:48:26 +08:00
羽弥Tian_Yumi
a0bc318c4e 添加支援道具,说明及干员分组 2023-09-15 13:28:03 +08:00
羽弥Tian_Yumi
000683713d 添加支援道具信息和备注 2023-09-15 13:21:43 +08:00
羽弥Tian_Yumi
edb50eea85 Add files via upload 2023-09-15 13:17:53 +08:00
uye
9f66fd1039 chore: 优化定时任务 2023-09-15 12:57:58 +08:00
uye
f2d37627f1 fix: etag 解析报错
fix #6368
fix #6365
fix #6345
2023-09-15 12:20:05 +08:00
uye
f215305a0e feat: WPF自动战斗对于作业描述的视频自动跳转增加av号支持 (#6363) 2023-09-15 10:52:48 +08:00
status102
7a3b402cfe perf: 开始唤醒-账号切换在WpfGui增加Trim 2023-09-15 09:30:36 +08:00
Lancarus
7bc861e412 feat: 优化萨米肉鸽策略 2023-09-15 03:04:08 +08:00
status102
757c0a4551 fix: 修复SettingsView的Idle不生效,将自动唤醒-账号切换在非Idle情况下锁定 2023-09-14 21:51:08 +08:00
status102
4c1499de79 feat: 自动战斗-战斗列表清空按钮增加右键清除 未激活 / 已完成 项目 2023-09-14 19:28:09 +08:00
status102
c923792a45 fix: 修复在重新启动MAA后使用本地保存的战斗列表无法直接使用自动战斗 2023-09-14 19:07:07 +08:00
status102
22b50709a4 feat: WPF自动战斗对于作业描述的视频自动跳转增加av号支持 2023-09-14 17:36:43 +08:00
status102
cca287dbb7 feat: 自动战斗新增战斗列表选项 2023-09-14 14:58:52 +08:00
MistEO
8de6799bdd fix: 将账号切换输出文本中的目标账号由输入文本改为OCR结果,尝试修复账号切换出错 (#6353)
尝试修复#6346
2023-09-14 14:29:42 +08:00
status102
b5e6f21c1a fix: 将账号切换输出文本中的目标账号由输入文本改为OCR结果,尝试修复账号切换出错 2023-09-13 23:03:02 +08:00
David
2102fd1e69 revert: EN version.json
[skip ci]
2023-09-13 12:12:48 +02:00
枫雨
36c5bca88a fix: 给关卡选择为 null 时打个补丁
#5742
2023-09-13 16:01:47 +08:00
枫雨
2b55f982c4 Revert "chore: 兼容旧配置"
This reverts commit 8e044b9bdc.
2023-09-13 16:01:47 +08:00
MistEO
886a15f318 chore: Auto Update Game Resources - 2023-09-13 2023-09-13 07:46:42 +00:00
David
05c7776f1a docs: YostarEN recommended resolution (#6303)
1920*1080 recommendation for YostarEN clients
2023-09-13 09:34:27 +02:00
enVineLab
2ca8d8c10c feat: 添加日服生息演算翻译 | Reclamation Algorithm JP (#6340)
Co-authored-by: Manicsteiner <63437036+Manicsteiner@users.noreply.github.com>
Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
2023-09-13 09:28:25 +02:00
Alisa
771077cde1 [skip ci] i18n: Translations update from MAA Weblate (#6334)
Translations update from [MAA Weblate](https://weblate.maa-org.net) for
[MaaAssistantArknights/MAA WPF
Gui](https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/).



Current translation status:

![Weblate translation
status](https://weblate.maa-org.net/widget/maa-assistant-arknights/maa-wpf-gui/horizontal-auto.svg)
2023-09-12 21:35:50 -05:00
Weblate
0577f4b980 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (588 of 588 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (588 of 588 strings)

Translated using Weblate (Japanese)

Currently translated at 95.7% (563 of 588 strings)

Translated using Weblate (English (United States))

Currently translated at 99.1% (582 of 587 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (587 of 587 strings)

Translated using Weblate (English (United States))

Currently translated at 96.7% (568 of 587 strings)

Co-authored-by: Alisa <alisa@alisaqaq.moe>
Co-authored-by: Weblate <noreply@weblate.org>
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
2023-09-13 04:44:55 +08:00
David
98d64be44c chore: EN infrast workshop and i18n 2023-09-12 22:44:44 +02:00
David
16f0c49098 tools: ignore templates 2023-09-12 22:33:35 +02:00
MistEO
a502330d8b feat: 更新游戏资源时弹窗提示 2023-09-12 22:39:28 +08:00
MistEO
32d402b53c Release v4.24.0-beta.3 (#6318) 2023-09-12 22:19:41 +08:00
MistEO
9c36e4d90d docs: Update CHANGELOG.md 2023-09-12 22:19:31 +08:00
MistEO
4be35069e6 fix: warnings 2023-09-12 22:16:54 +08:00
MistEO
4a7b5cca9c fix: 优化异常情况下etag一直不存的问题 2023-09-12 22:10:25 +08:00
MistEO
83aed90ffd fix: 修复检查更新按钮过早亮起的问题 2023-09-12 22:09:14 +08:00
MistEO
669ff378f8 fix: 修复OTA资源下载错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/6329
2023-09-12 22:00:21 +08:00
Alisa
dc11119e8b feat: 外部通知 (ServerChan 和 SMTP) (#6332)
fix #6257

接入外部通知,SMTP 和 ServerChan

~~还没有做哪些通知会往外部通知发。~~
仅所有任务完成后会发送通知。

发通知:`public static async Task
ExternalNotificationService.SendAsync(string title, string content);`
2023-09-12 08:49:53 -05:00
Liam Sho
9bc5a35557 fix: send test button status wont change 2023-09-12 21:48:07 +08:00
Liam Sho
4e5e17e241 feat: add external notification tips 2023-09-12 21:46:04 +08:00
Liam Sho
258a5243ec feat: send external notification when all tasks are finished 2023-09-12 21:37:48 +08:00
MistEO
843a599bc1 feat: 繁中服「敘拉古人」活動導航 (#6330) 2023-09-12 21:22:27 +08:00
MistEO
6a38be7280 fix: 修复肉鸽某些开局干员精二后首次进入关卡时不选三技能的问题 (#6333) 2023-09-12 21:22:10 +08:00
MiaoYan JY
677bd72012 fix: 修复肉鸽某些开局干员精二后首次进入关卡时不选三技能的问题 2023-09-12 20:49:29 +08:00
Liam Sho
1243a6e6be feat: add external notification 2023-09-12 20:23:16 +08:00
momomochi987
4a169f32e7 敘拉古人活動導航 2023-09-12 20:04:28 +08:00
momomochi987
0747a6a8df 補充 "暫不下載" 圖片 2023-09-12 20:02:15 +08:00
David
aae06a4812 fix: auto update correction 2023-09-12 12:14:30 +02:00
MistEO
662498ffe8 chore: Auto Update Game Resources - 2023-09-12 2023-09-12 09:07:44 +00:00
github-actions[bot]
fa2ecdbc37 docs: Auto Update Changelogs of v4.24.0-beta.3 (#6324)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-09-12 17:06:43 +08:00
David
075ca891a1 revert: EN version.json d810df9bf0 2023-09-12 10:16:47 +02:00
Liam Sho
11fde1b76a Merge branch 'dev' into feat/notifications 2023-09-12 16:13:05 +08:00
MistEO
d810df9bf0 chore: Auto Update Game Resources - 2023-09-12 2023-09-12 07:34:29 +00:00
Alisa
596831fde2 i18n: Translations update from MAA Weblate (#6323)
Translations update from [MAA Weblate](https://weblate.maa-org.net) for
[MaaAssistantArknights/MAA WPF
Gui](https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/).



Current translation status:

![Weblate translation
status](https://weblate.maa-org.net/widgets/maa-assistant-arknights/-/maa-wpf-gui/horizontal-auto.svg)
2023-09-12 02:12:00 -05:00
Weblate
f8a713c31e Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (English (United States))

Currently translated at 99.1% (558 of 563 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (563 of 563 strings)

Co-authored-by: Alisa <alisa@alisaqaq.moe>
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/zh_Hans/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/zh_Hant/
Translation: MaaAssistantArknights/MAA WPF Gui
2023-09-12 15:04:43 +08:00
MistEO
f69d70b1e1 doc: fix error (#6300)
https://t.me/c/1657785089/46924
找到之前改了一半的pr了
解决问题的最好办法就是删掉问题√
2023-09-12 15:04:37 +08:00
MistEO
4824f1c10a perf: 优化自动战斗-自动编队-追加自定干员选项UI,当选项禁用时,居中CheckBox (#6322)
忘了居中,丑了吧唧的

![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/102887808/469faad6-2b3f-4d7e-97d2-3d3665c3298a)
2023-09-12 15:04:02 +08:00
status102
4878f62f68 perf: 优化自动战斗-自动编队-追加自定干员选项UI,当选项禁用时,居中CheckBox 2023-09-12 10:32:55 +08:00
Rbqwow
2ab0c688c7 Merge branch 'dev' into dev 2023-09-12 09:52:18 +08:00
Lancarus
53402df68c feat: 优化萨米肉鸽策略 (#6321)
尝试修复连续两次商店节点,在第二次退出的bug(第二次进商店直接是确认离开界面)
优化招募策略
优化藏品优先度
2023-09-12 09:29:46 +08:00
Lancarus
5332afc134 feat: 修改先行一步策略,不拿路网 2023-09-12 02:56:53 +08:00
Lancarus
d82f9e53e8 feat: 优化萨米肉鸽策略 2023-09-12 01:56:15 +08:00
松坂砂糖浆
856ce1d800 doc: 修复404的链接 (#6317) 2023-09-12 01:14:26 +08:00
Rbqwow
2d72cb09d6 doc: resolve conflicts 2023-09-11 22:57:21 +08:00
MistEO
e7fd011cc0 feat: 基建 制造站、贸易站、控制中枢 新增支持干员编组配置 (#6249) 2023-09-11 22:47:06 +08:00
MistEO
c8ea39f883 feat: 新增开始唤醒时账号切换功能 (官服、B服 only) (#6268) 2023-09-11 22:46:13 +08:00
MistEO
5bfb033426 Merge branch 'dev' into dev_account_switch 2023-09-11 22:46:05 +08:00
MistEO
9ab6598d05 feat: 自动战斗-自动编队,新增自动补充低信赖干员、追加自定干员选项 (#6282) 2023-09-11 22:43:18 +08:00
MistEO
fd19b92501 feat: 基建支持加工站 2023-09-11 22:40:34 +08:00
筱竹聽雨
e15d6d63a9 Update 1.1-详细介绍.md
更改基建编辑器网址链接
2023-09-11 19:48:21 +08:00
筱竹聽雨
cc2e56ebee Update 3.6-基建排班协议.md
更改基建编辑器网址链接
2023-09-11 19:45:25 +08:00
筱竹聽雨
a6374e48d2 Update MaaUrls.cs
更改基建编辑器网址链接
2023-09-11 19:42:54 +08:00
zzyyyl
4fdf09f4df fix: 修复因部分皮肤造成的关卡难度识别问题 (#6309)
fix #5837 #6306
2023-09-11 14:30:08 +08:00
zzyyyl
1521b03750 fix: 修复因部分皮肤造成的关卡难度识别问题 2023-09-11 13:58:31 +08:00
MistEO
9159695f1b feat: 增加未通过企鹅检查的掉落截图,增加 UnknownStage 时的难度回调 (#6308) 2023-09-11 13:46:21 +08:00
zzyyyl
183294f04a feat: 增加未通过企鹅检查的掉落截图,增加 UnknownStage 时的难度回调 2023-09-11 12:05:05 +08:00
松坂砂糖浆
ab651ca606 把多镜像下载器应用于Python接口 (#6247) 2023-09-11 09:54:31 +08:00
uye
71ea085544 feat: YostarEN Reclamation Algorithm implementation (#6267)
Full Reclamation Algorithm implementation for YostarEN
Early-Implementation for YostarJP (missing texts)

---------
Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: ManicSteiner <bjjtgszc@163.com>
2023-09-10 23:01:30 +02:00
status102
80e56ff9b4 perf: 调整自动战斗-追加自定干员文本框长度 2023-09-10 20:16:34 +08:00
status102
db4bc83a1e docs: 修改注释 2023-09-10 19:49:58 +08:00
status102
4ae5053e74 feat: 自动战斗-自动编队 增加自动追加自定干员设置 2023-09-10 19:29:07 +08:00
David
57a4641021 fix: new EN Roguelike@ChooseOperConfirm.png
fix #6297 #6281
2023-09-10 12:54:22 +02:00
Rbqwow
c986723646 doc: fix error 2023-09-10 17:47:57 +08:00
MistEO
fd7f98b0d7 Release v4.24.0-beta.2 (#6294) 2023-09-10 13:22:08 +08:00
MistEO
6ab4e83189 docs: Update CHANGELOG.md 2023-09-10 13:21:48 +08:00
MistEO
7f73f55ca7 fix: 修复开多个模拟器时地址判断逻辑错误 2023-09-10 13:20:29 +08:00
MistEO
8895a30554 fix: 修复本地设备无法连接的问题 2023-09-10 13:13:40 +08:00
MistEO
78632aa14b fix: 修复gui 地址分割越界的问题
fix #6290
2023-09-10 13:08:40 +08:00
github-actions[bot]
dc11a8c40c docs: Auto Update Changelogs of v4.24.0-beta.2 (#6295)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-09-10 13:04:23 +08:00
MistEO
c15ef1cc22 fix: 简单修复一下异步Load导致的错误
fix #6250
2023-09-10 12:43:32 +08:00
status102
056a7f5c32 feat: 增加 控制中枢 支持干员编组配置,以及编组选择输出 2023-09-10 12:42:21 +08:00
status102
905d7da2fd feat: 基建制造站和贸易站新增支持干员编组配置 2023-09-10 12:41:02 +08:00
status102
5ddbb6fc54 perf: 调整自动编队与补充信赖选项的间距 2023-09-10 11:10:35 +08:00
status102
682b485837 perf: 在未激活自动编队时,将补充低信赖干员设置为不可见 2023-09-10 11:05:09 +08:00
status102
968c4de2b8 feat: 新增自动编队时,自动补充低信赖干员选项 2023-09-10 10:47:17 +08:00
Lancarus
5e3601a433 feat: 优化萨米肉鸽策略 (#6288) 2023-09-10 08:21:16 +08:00
David
b137479f11 revert: 1095f9cf00
Auto update has wrong time and event
[skip ci]
2023-09-09 23:23:08 +02:00
MistEO
1095f9cf00 chore: Auto Update Game Resources - 2023-09-09 2023-09-09 20:06:59 +00:00
MistEO
3f626608c4 docs: 将其他语言的SSReopen说明修改为注释,目前仅支持国服/B服 (#6271) 2023-09-10 00:55:52 +08:00
MistEO
ae85719a83 perf: 优化刷理智的SSReopen导航逻辑,允许从普通关页面启动时短路开始于主页的导航逻辑 (#6287) 2023-09-10 00:52:11 +08:00
MistEO
ab7beaac6e feat: update local resource by etag (#6283) 2023-09-09 23:33:45 +08:00
Lancarus
7f8669b37b feat: 优化萨米肉鸽策略 2023-09-09 22:43:50 +08:00
status102
908e840229 perf: 优化SSReopen导航逻辑,允许从普通关页面启动时短路开始于主页的导航逻辑 2023-09-09 22:14:08 +08:00
David
c31705f74b fix: Missing templates in EN
fix #6281
2023-09-09 12:21:56 +02:00
status102
9283928652 feat: 新增 官服、B服 账号切换功能 2023-09-09 14:47:30 +08:00
David
27dee653dd chore: I.S. missing EN translations. 2023-09-08 17:30:41 +02:00
Lancarus
f13bd18ff2 feat: 优化萨米肉鸽部分关卡策略 (#6276) 2023-09-08 20:25:19 +08:00
Lancarus
500cfb5744 格式化json 2023-09-08 20:05:28 +08:00
Lancarus
65173deee9 feat:格式化json 2023-09-08 20:00:47 +08:00
status102
0fd9f0725d docs: 将其他语言的SSReopen说明修改为注释,目前仅支持国服/B服 2023-09-08 19:59:44 +08:00
Lancarus
8530125edb feat: 优化萨米肉鸽部分关卡策略 2023-09-08 19:41:57 +08:00
uye
83f0a1f64c feat: 可自选日志日期显示格式 2023-09-08 18:21:47 +08:00
MistEO
6174d62929 Release v4.24.0-beta.1 (#6246) 2023-09-08 18:18:25 +08:00
github-actions[bot]
cc008d9360 docs: Auto Update Changelogs of v4.24.0-beta.1 (#6248)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-09-08 18:18:14 +08:00
Lancarus
27a2294e2b feat: 优化萨米肉鸽策略 (#6266) 2023-09-08 17:33:07 +08:00
Lancarus
9e372bdf06 feat: 优化萨米肉鸽策略 2023-09-08 02:39:28 +08:00
David
b02de11ada chore: A Flurry to the Flame event navigation 2023-09-07 19:33:22 +02:00
Lancarus
3bcc822996 feat: 优化萨米肉鸽部分作战逻辑 (#6263) 2023-09-07 23:06:11 +08:00
Lancarus
8d04e872e4 feat: 优化萨米肉鸽部分作战逻辑 2023-09-07 22:39:06 +08:00
Liam Sho
8fd7c40228 feat: add serverchan config ui 2023-09-07 21:43:54 +08:00
David
2296c73112 chore: corrected a44dc12 time and event naming 2023-09-07 15:41:11 +02:00
Liam Sho
8451ef0866 Merge branch 'dev' into feat/notifications 2023-09-07 21:16:53 +08:00
Lancarus
f948604f07 fix: 修复萨米肉鸽关卡json“生人勿进”->"生人勿近" (#6262) 2023-09-07 19:17:44 +08:00
MistEO
a44dc12050 chore: Auto Update Game Resources - 2023-09-07 2023-09-07 11:07:22 +00:00
Lancarus
df96a00a02 fix: 修复萨米肉鸽关卡json“生人勿进”->"生人勿近" 2023-09-07 18:55:07 +08:00
Wallsman
a29edc27ef (JP) Fix autoupdate change typo 2023-09-07 19:44:48 +09:00
Annoying Flower
5f72e09060 feat: 新增肉鸽干员自动撤退字段 (#6241) 2023-09-07 17:16:38 +08:00
MistEO
03c6edc332 docs: 繁中文件大更新 (#6226)
因為不知道繁中文件到底缺少了哪些內容,我就~~直接簡單粗暴的~~把目前簡中的內容轉成繁體,再一個一個微調。

所以目前簡中有的內容,繁中也有了 。:.゚ヽ(*´∀`)ノ゚.:。

除了文件內容以外,也一起修改了 .vuepress 裡的 config.ts, search.ts, sidebar 跟 navbar
的繁中內容。


再麻煩各位大佬看看有沒有地方還需要調整了 🙏🙏🙏
2023-09-07 17:14:40 +08:00
Liam Sho
a6d15544d5 feat: add notification providers 2023-09-07 16:31:10 +08:00
MistEO
c7ce9e46a5 chore: Auto Update Game Resources - 2023-09-07 2023-09-07 08:09:09 +00:00
Wallsman
19088e972e (JP)紅炎遣らう落葉 Update 2023-09-07 11:50:42 +09:00
momomochi
78d03d7436 docs: 更新連結、再微調一些小地方 2023-09-07 10:02:05 +08:00
MistEO
a87095e8d1 chore: Auto Update Game Resources - 2023-09-07 2023-09-07 01:06:39 +00:00
momomochi
e4fd35c456 Merge branch 'dev' into zh-tw_newdocs 2023-09-07 00:10:02 +08:00
momomochi987
17fb4930ed docs: 移除不再需要的檔案、微調一些小東西 (? 2023-09-07 00:08:47 +08:00
MistEO
be83faf31e docs: [JP] readme Update test / Japanese font readability (#6228) 2023-09-06 23:42:50 +08:00
MistEO
74656d2418 fix: 尝试修复网络波动造成的碎石不用问题 (#6220) 2023-09-06 23:40:03 +08:00
MistEO
3e060886b3 feat: 新增复刻活动时,连续刷普通1-9关 (异形UI暂不支持,例如愚人号),支持上报至企鹅物流 (#6230) 2023-09-06 23:36:27 +08:00
Lancarus
c63d99cd2e feat: 优化萨米肉鸽部分关卡逻辑,优化招募逻辑 (#6240) 2023-09-06 19:42:47 +08:00
Lancarus
95b695ecff feat: 优化萨米肉鸽部分关卡逻辑,优化招募逻辑 2023-09-06 18:17:07 +08:00
status102
489ab4f2e3 perf: 移除SSReopen中掉落物品集的指针 2023-09-06 17:10:07 +08:00
Wallsman
7c1e145fc8 Fix Comment typo 2023-09-06 15:38:26 +09:00
status102
ea69c374a6 docs: 在悬浮提示中追加SSReopen说明 2023-09-06 13:00:59 +08:00
status102
60fa30e02b docs: 在中日英文档中追加SSReopen的说明 2023-09-06 11:35:43 +08:00
Lancarus
b7ee09f4f9 fix:修复萨米肉鸽作战关卡逻辑错误 (#6235) 2023-09-06 11:22:17 +08:00
mole828
69e866234d fix:修复萨米肉鸽作战关卡逻辑错误 2023-09-06 11:01:02 +08:00
Lancarus
cac2b61054 fix: 萨米商店不识别第二排商品 (#6232) 2023-09-06 09:26:28 +08:00
Lancarus
474340cc94 fix: 萨米商店不识别第二排商品 2023-09-05 23:15:27 +08:00
uye
b82802d767 feat: 支持 SideStory「不义之财」活动导航 & 添加 "SideStoryStage" 模板 roi 2023-09-05 21:52:24 +08:00
uye
8423eddfcc style: 修正格式 2023-09-05 21:52:24 +08:00
status102
1e4eb67470 feat: 新增复刻活动时,连续刷普通1-9关 (异形UI暂不支持,例如愚人号),支持上报至企鹅物流 2023-09-05 21:41:46 +08:00
MistEO
4006a39e2b fix: 修复肉鸽道中抓取干员 山 或 林 后重复开启技能的问题 (#6221) 2023-09-05 20:07:41 +08:00
Wallsman
ecd3053862 Use Japanese font readability
The current default font specified is a Chinese-based font, which is very difficult to read, so a Japanese-based font was mandatorily specified.

現在デフォルトで指定されているフォントが中国語ベースのフォントで非常に読みづらくなっているので、日本語ベースフォントを強制指定した。
2023-09-05 18:04:05 +09:00
MistEO
645748ea06 chore: Auto Update Game Resources - 2023-09-05 2023-09-05 08:47:43 +00:00
momomochi
81e2792d47 docs: 修正 '抄作业.com' 的超連結 2023-09-05 14:28:16 +08:00
momomochi
915156beec 穩定的→穩定地,字段→欄位 2023-09-05 13:19:28 +08:00
momomochi
9a2025c253 docs: 再檢查一遍,補上漏改的地方 2023-09-05 11:58:49 +08:00
momomochi
f2a101b207 docs: 微調 3.1~3.7 的內容 2023-09-05 11:11:26 +08:00
momomochi
ccc35e841d docs: 微調 2.2~2.5 的內容 2023-09-05 11:04:13 +08:00
MistEO
f82e49bb13 chore: Auto Update Game Resources - 2023-09-05 2023-09-05 02:30:05 +00:00
momomochi
b310e281f2 docs: 微調 1.4~1.6 的內容 2023-09-05 10:29:51 +08:00
momomochi
1e3402a681 docs: 整理檔案 2023-09-05 10:28:23 +08:00
MistEO
0afbdadb79 fix: 修复在部分情况下,刷理智的当前理智识别结果丢失分隔符 (#6208)
![C1WT`{R)Z2T$IP52%{P44A1](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/102887808/5ed7bae3-b8f9-41fa-b3f0-5ba53eda630c)
2023-09-05 01:20:48 +08:00
Lancarus
2c7246f1c3 feat: 优化萨米肉鸽部分逻辑 (#6222) 2023-09-05 00:09:27 +08:00
Lancarus
355b9a82b2 优化部分萨米肉鸽关卡逻辑 2023-09-04 23:45:19 +08:00
momomochi987
26fe41d5de docs: 微調 1.3-模擬器支援的內容 2023-09-04 23:38:04 +08:00
momomochi987
f525e1cd97 docs: 微調 1.2-常見問題的內容 2023-09-04 23:10:27 +08:00
momomochi987
e678f733ba docs: 微調 1.1-詳細介紹的內容 2023-09-04 22:41:11 +08:00
Lancarus
ae87ce9f93 fix: 修复咫尺天涯朝向错误 2023-09-04 22:32:50 +08:00
Lancarus
1af99601c0 feat: 优化萨米肉鸽不期而遇选项 2023-09-04 21:49:51 +08:00
MiaoYan JY
6af9afbbe7 fix: 修复肉鸽道中抓取干员 山 或 林 后重复开启技能的问题 2023-09-04 21:45:43 +08:00
Lancarus
07aa723f51 feat: 优化萨米肉鸽部分关卡逻辑 2023-09-04 21:37:33 +08:00
David
7419796525 fix: regex for trader shopping in I.S. 2023-09-04 14:35:07 +02:00
zzyyyl
c2ae19df25 fix: 修复网络波动造成的碎石不用问题
fix #6162
2023-09-04 20:20:35 +08:00
status102
a17cfda455 fix: 增加倒数第二位>='0'判断,移除OCRer引用 2023-09-04 19:48:47 +08:00
momomochi987
339d85d31a docs: 更新繁中相關內容 2023-09-04 19:20:38 +08:00
momomochi987
6ad956f006 docs: 更進陸服內容先 2023-09-04 19:17:53 +08:00
status102
5d08ac6857 perf: 从OCRer改为RegionOCRer 2023-09-04 16:22:40 +08:00
status102
1bb121d393 fix: 修复可能存在的下标越界以及识别结果分块情况 2023-09-04 12:00:40 +08:00
status102
4813ed08aa fix: 修复在部分情况下,识别结果丢失分隔符 2023-09-04 11:40:30 +08:00
MistEO
ad668195ff 麒麟X夜刀->麒麟R夜刀,以及对CLI文档的侧边栏支持 (#6199) 2023-09-04 10:13:25 +08:00
MistEO
3c6aa4a9be feat: 更新萨米肉鸽作战策略 (#6213) 2023-09-04 10:09:16 +08:00
MistEO
5851f5a0a4 chore: 對照陸服,整理與補充繁中服的 template 跟 tasks (#6196)
因為看到 EN 服跟韓服的 update commit,所以...... ~~(後略~~

除了補充繁中服缺少的部分以外,也重製了一些我覺得看起來很模糊的截圖。


之後比較有空的話再來找時間補充繁中文檔,感覺繁中的文檔好像也有不少要補 (?)  ∠( ᐛ 」∠)_
2023-09-04 10:07:45 +08:00
Lancarus
eefc33e7a7 feat: 更新萨米肉鸽作战策略 2023-09-04 01:35:37 +08:00
uye
9084568a7d fix: 萨米boss关正则替换错误 (#6211) 2023-09-03 21:39:26 +08:00
Lancarus
1dc6b21dee fix: 萨米boss关正则替换错误 2023-09-03 20:51:01 +08:00
Lancarus
e35e234b30 feat: 优化萨米肉鸽部分关卡逻辑 (#6198) 2023-09-03 13:57:37 +08:00
Lancarus
359ece7ae7 fix: 修复关卡名跳出错误 2023-09-03 13:44:45 +08:00
uye
0ec8a8224a 尽可能稳定的打更多层数 -> 尽可能稳定地打更多层数 (#6200)
的 -> 地
2023-09-03 08:46:05 +08:00
Wallsman
35afe9a688 Untrastrated fix
翻訳漏れ対応
2023-09-03 06:18:18 +09:00
Govizlora
98b703c304 fix typo 2023-09-02 13:05:56 -07:00
momomochi987
6130fc4d46 docs: 更進陸服文件內容、微調部分用詞 2023-09-03 00:48:12 +08:00
SherkeyXD
9c0e61f43c docs: 为cli文档添加侧边栏及图标配置 2023-09-03 00:33:38 +08:00
SherkeyXD
94d3cf341e docs: 修正文档中的麒麟X夜刀为R 2023-09-03 00:26:47 +08:00
SherkeyXD
7920ce617d fix: 将自带作业中的麒麟X夜刀也替换为麒麟R夜刀 2023-09-03 00:24:06 +08:00
MistEO
ca45e4fef3 feat:优化刷源石锭模式的逻辑,跳过战斗后招募,增加进入纵向节点的逻辑 (#6140) 2023-09-03 00:09:35 +08:00
Lancarus
1d188ddcb6 feat: 优化萨米肉鸽部分关卡逻辑 2023-09-03 00:05:33 +08:00
Lancarus
959b262a07 更改焰影苇草优先度 2023-09-02 22:37:55 +08:00
David
8b45512b3b Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-09-02 16:04:43 +02:00
David
cea3467512 fix: Kirin X Yato => Kirin R Yato
fix #6195
2023-09-02 16:04:26 +02:00
momomochi987
d38bad19d0 chore: 對照陸服,補充繁中服缺少的 tasks 2023-09-02 21:40:40 +08:00
momomochi987
3daf72fbe0 chore: 整理、更新繁中服部分截圖 2023-09-02 21:10:48 +08:00
uye
bba0727bbd fix: 修复仓库识别无法在表格框内滚动
fix #5797
2023-09-02 21:07:21 +08:00
Lancarus
7ee6944a94 调整部分干员的招募优先度 2023-09-02 20:40:51 +08:00
Lancarus
7dd691f0cc fix: 修复一些不期而遇的选项 2023-09-02 17:29:53 +08:00
David
db8e6ac333 chore: updated templates for EN (#6094) 2023-09-02 11:23:01 +02:00
Clock
80fb7821b7 chore: update resources for YoStarKR 2023-09-02 17:50:00 +09:00
Clock
c4d8237bf5 fix: fix failing to choose rewards from the last run 2023-09-02 17:31:50 +09:00
Lancarus
988f28311f fix: 萨米肉鸽boss关名称错误 2023-09-02 13:54:44 +08:00
MistEO
c488c71dd6 Merge tag 'v4.23.3' into dev
v4.23.3
2023-09-02 05:46:30 +00:00
MistEO
a17922f815 Release v4.23.3 (#6189)
fix #6188
2023-09-02 13:45:58 +08:00
MistEO
8fd6fdfb5a fix: 规避crt死锁问题
fix #6188
2023-09-02 13:43:29 +08:00
MistEO
7ef3597de3 fix: 规避crt死锁问题
fix #6188
2023-09-02 13:40:30 +08:00
Lancarus
d1a0b96750 fix: #6183 2023-09-02 13:20:33 +08:00
Lancarus
50f49d4094 更新纵向节点截图 2023-09-02 11:15:01 +08:00
Lancarus
d96381b02c 适配纵向节点 2023-09-02 10:59:25 +08:00
Lancarus
2d5f168efa 适配纵向进点 2023-09-02 09:38:09 +08:00
MistEO
587ed732f0 Merge tag 'v4.23.2' into dev
v4.23.2
2023-09-01 17:27:28 +00:00
MistEO
1dcaf756fc Release v4.23.2 (#6184)
fix #6006
2023-09-02 01:24:05 +08:00
MistEO
c5fb01b9b9 docs: Update CHANGELOG.md 2023-09-02 01:23:45 +08:00
uye
65d1703093 chore: 取消连接时加载资源 2023-09-02 01:21:17 +08:00
MistEO
b1facee543 fix: 尝试修复LoadResource卡死的问题 2023-09-02 01:18:38 +08:00
MistEO
100738567d fix: 尝试修复LoadResource卡死的问题 2023-09-02 01:16:40 +08:00
Clock
9d17b39b7e chore: Update localization for YoStarKR 2023-09-02 01:31:46 +09:00
Lancarus
9263a9f69b 更新纵向节点截图 2023-09-02 00:24:40 +08:00
Clock
3e0207b12e chore: Update ocrReplaces for YoStarKR 2023-09-02 00:56:58 +09:00
Lancarus
2326c677fc 适配纵向进点 2023-09-01 22:53:35 +08:00
Lancarus
52af9e1046 增加进入纵向节点,适配麒麟R夜刀 2023-09-01 20:12:31 +08:00
Lancarus
a81b0cd825 更新部分纵向节点截图 2023-09-01 19:17:00 +08:00
MistEO
889c07459c docs: 跟进蓝叠Hyper-V的连接指导 (#6083) (#6137) 2023-09-01 15:59:56 +08:00
MistEO
5b32654617 docs: add space 2023-09-01 15:59:42 +08:00
MistEO
36ab489fc8 feat: 添加CLI支持 (#6144) 2023-09-01 15:58:31 +08:00
MistEO
f6ba9bee67 docs: add spaces 2023-09-01 15:57:45 +08:00
MistEO
60f4a2698e docs: add space 2023-09-01 15:55:40 +08:00
uye
20802de448 chore: 取消连接时加载资源 2023-09-01 14:19:47 +08:00
Long Wang
ab19387791 docs: fix install dir and less line break 2023-09-01 13:47:26 +08:00
uye
d197b02d04 fix: 修复理智识别在部分情况下会"/"识别为"|" (#6170) 2023-09-01 13:29:46 +08:00
uye
f9a6f3290b chore: 加点加载资源和连接模拟器的日志 2023-09-01 13:23:24 +08:00
status102
fa0c1128be fix: remove test code 2023-09-01 11:06:13 +08:00
status102
157a884488 fix: 修复理智识别在部分情况下会"/"识别为"|" 2023-09-01 10:58:16 +08:00
ABA2396
93138980b4 Merge tag 'v4.23.1' into dev
v4.23.1
2023-09-01 02:21:20 +00:00
uye
a80694b570 Release v4.23.1 (#6168) 2023-09-01 10:20:28 +08:00
uye
1795ddce4d Update CHANGELOG.md 2023-09-01 10:15:05 +08:00
MistEO
b76f859a8c feat: 支持woolang绑定 (#6142) 2023-09-01 09:58:52 +08:00
MistEO
f0081e788d chore: Auto Update Game Resources - 2023-08-31 2023-09-01 09:51:11 +08:00
MistEO
ad1c49c7be chore: Auto Update Game Resources - 2023-08-31 2023-09-01 09:50:58 +08:00
MistEO
e812bad5a4 feat: shutdown/hibernate after all other MAAs have exited, or just ex… (#6147) 2023-09-01 09:47:23 +08:00
MistEO
e3c455d2d8 chore: Auto Update Game Resources - 2023-08-31 2023-08-31 15:08:29 +00:00
uye
6325628b67 i18n: Translations update from MAA Weblate (#6151) 2023-08-31 23:00:53 +08:00
Long Wang
949a9c50eb docs: revert remove trailing whitespace 2023-08-31 22:33:14 +08:00
Weblate
12ccb3acdb Translated using Weblate (Japanese)
Currently translated at 100.0% (544 of 544 strings)

Co-authored-by: half-yutou <3369726918@qq.com>
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/ja/
Translation: MaaAssistantArknights/MAA WPF Gui
2023-08-31 22:14:32 +08:00
MistEO
616d8b6646 feat: 支持woolang绑定 (#6142) 2023-08-31 22:14:23 +08:00
mr_cino
bdf8405c89 * docs: 补充Woolang-api的说明 2023-08-31 22:10:09 +08:00
MistEO
9d6bad5d63 feat: 注册表查询bluestacks hyper-v的conf位置 (#6083) 2023-08-31 22:00:03 +08:00
MistEO
a1c0a6575a feat: 增加刷理智每次打关卡之前时的理智剩余量输出 (#6146) 2023-08-31 21:56:18 +08:00
status102
5d3a07e030 fix: 修复在部分情况下只会输出一次当前理智情况 2023-08-31 17:54:20 +08:00
status102
ee21631850 fix: 补上丢失的空格 2023-08-31 17:54:19 +08:00
status102
ff976586cb fix: 移除无用内容 2023-08-31 17:54:19 +08:00
status102
7d026ee556 feat: 增加刷理智每次打关卡之前时理智剩余量输出 2023-08-31 17:54:10 +08:00
Long Wang
02e45e6d5c docs: format 2023-08-31 17:45:40 +08:00
Long Wang
d916d9e679 ci: remove unrelevant changes 2023-08-31 17:16:17 +08:00
Long Wang
e135e024c5 ci: fix download cli 2023-08-31 17:14:27 +08:00
AnnAngela
ff7f0c09d0 ci: add log 2023-08-31 17:12:17 +08:00
MistEO
a17930123d chore: Auto Update Game Resources - 2023-08-31 2023-08-31 09:07:07 +00:00
MistEO
4d9cc3c781 Merge branch 'master' into dev 2023-08-31 16:16:10 +08:00
laffey
02deeeea75 日文localization写反了 2023-08-31 15:42:21 +08:00
Long Wang
8fc60710c1 docs: space between ZH and EN 2023-08-31 15:25:16 +08:00
uye
72f7b380d2 chore: 什么时候更新 .net8 什么时候加.jpg 2023-08-31 15:14:06 +08:00
uye
c5552ec5d1 chore: 更新提醒 2023-08-31 14:52:42 +08:00
MistEO
8a7a39e997 Release v4.23.0 (#6135) 2023-08-31 14:52:15 +08:00
laffey
6ef5b03d8d feat: shutdown/hibernate after all other MAAs have exited, or just exit itself 2023-08-31 14:26:43 +08:00
Long Wang
d5a6508f73 docs: more details about CLI installation 2023-08-31 14:13:20 +08:00
SherkeyXD
a85d5972dc docs: 跟进蓝叠Hyper-V的连接指导 2023-08-31 12:54:11 +08:00
Long Wang
06f16352ef ci: ship CLI in Linux release 2023-08-31 12:49:13 +08:00
Long Wang
2ea24b9558 docs: add CLI doc 2023-08-31 12:48:31 +08:00
github-actions[bot]
c04674eb3f docs: Auto Update Changelogs of v4.23.0 (#6143)
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/6135

---------

Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-08-31 10:06:13 +08:00
Lancarus
1694dde79a Merge branch 'MaaAssistantArknights:dev' into sami 2023-08-31 02:33:19 +08:00
Lancarus
6ee7ec2026 feat:优化刷源石锭模式的逻辑,跳过战斗后招募 2023-08-31 02:30:55 +08:00
mr_cino
0210e03c20 * feat: 支持woolang绑定,嘻嘻嘻 2023-08-30 21:45:07 +08:00
Clock
111a812870 fix: nbsp character from OCR (YoStarKR) 2023-08-30 22:07:16 +09:00
uye
54fb8caa37 chore: SideStory「理想城:长夏狂欢季」复刻 2023-08-30 16:44:58 +08:00
David
e7c8d5b7d5 繁中服 快捷編隊 部署費用 (#6131) 2023-08-29 17:57:19 +02:00
vonnoq
c4334f6a1a 繁中服 快捷編隊 部署費用 2023-08-29 22:28:31 +08:00
MistEO
fa6ce28a19 fix: ocr replace for YostarJP (#6093) 2023-08-29 21:28:05 +08:00
uye
5954e22a3a feat: 繁中服風雪過境復刻導航 (#6130) 2023-08-29 21:25:47 +08:00
Jie Lu
6d04ff697f fix: ocr replace for YostarJP 2023-08-29 21:42:18 +09:00
Horror Proton
2eb099c7ae chore: fix rpath for macos 2023-08-29 20:42:14 +08:00
momomochi987
976dc4ad35 繁中服風雪過境導航 2023-08-29 20:40:01 +08:00
Gliese129
80de6496b2 optimized the way of testing adb port 2023-08-29 20:35:16 +09:00
MistEO
d9eb3ace1c chore: Auto Update Game Resources - 2023-08-29 2023-08-29 11:08:38 +00:00
MistEO
d7843a7583 Release v4.23.0-beta.2 (#6108) 2023-08-29 14:07:27 +08:00
github-actions[bot]
f6ce389cb6 docs: Auto Update Changelogs of v4.23.0-beta.2 (#6109)
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/6108

Co-authored-by: MistEO <MistEO@users.noreply.github.com>
2023-08-29 10:13:45 +08:00
MistEO
189b448bed docs: LDPlayer is full compatible. 2023-08-29 09:59:07 +08:00
David
c21746c3f7 docs: refactor in en-us emulator-supports.md 2023-08-28 19:45:36 +02:00
David
a3be359a3d docs: update en-us readme.md 2023-08-28 19:40:58 +02:00
MistEO
6ef6789819 fix: build error on ubuntu 2023-08-28 23:37:00 +08:00
MistEO
27124c65be fix: 不再对资源进行并行加载 2023-08-28 23:00:00 +08:00
uye
9bb3c878f8 fix: 修复算术溢出
fix #6115
fix #6114
fix #6113
fix #6112
fix #6111
fix #6110
2023-08-28 21:18:34 +08:00
MistEO
de01df6af6 fix: try to fix #6006 2023-08-28 20:05:44 +08:00
MistEO
1939319312 chore: add log for #6006 2023-08-28 19:45:46 +08:00
羽弥Tian_Yumi
4a6316c76a roguelike: 适配刷源石锭模式不期而遇选择策略 (#6102) 2023-08-28 19:20:43 +08:00
Lancarus
54f6ca91c0 feat: 优化烧开水逻辑,现在能在低难度烧水,高难度开始 (#6094) 2023-08-28 19:18:55 +08:00
status102
9743a1137a fix: 尝试修复TN-4地图view错误 (#6097) 2023-08-28 09:05:44 +08:00
David
07d8138315 fix: txwy stage navigation, similar to 4c2c644
fix #6095
2023-08-27 13:38:25 +02:00
uye
e9b22da266 chore: 启动时检测是否为管理员启动 2023-08-27 12:33:31 +08:00
uye
0207013518 chore: 添加报错信息 #6089 2023-08-26 23:28:40 +08:00
uye
dae738a248 fix: 更新保全阿尔斯特甜品制造平台,不兼容应急 (#6088) 2023-08-26 17:43:17 +08:00
uye
8c32f402bf docs: 更新3.4任务流程协议文档 2023-08-26 17:10:26 +08:00
Annoying Flower
17fb892306 fix: 更新保全阿尔斯特甜品制造平台,不兼容应急
有傻逼去原作者哪里问为什么maa刷不了应急,我真是吐了
2023-08-26 16:17:50 +08:00
uye
e5d50b1c2f chore: 修改格式为适配更多启动参数 2023-08-26 13:43:35 +08:00
uye
94d6eb00ff feat: 支持带参数启动切换配置 2023-08-26 13:22:54 +08:00
uye
797e4d8c75 chore: 合并关闭+重启方法 2023-08-26 13:22:54 +08:00
Gliese129
db2a7298ea update 2023-08-25 23:31:20 +09:00
Gliese
07dbb54e1e Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-25 22:55:36 +09:00
uye
8b75aaeb58 Release v4.23.0-beta.1 (#6077) 2023-08-25 21:08:27 +08:00
uye
dc31e6b5e3 docs: Update CHANGELOG.md 2023-08-25 21:07:59 +08:00
MistEO
4b6b80d884 perf: fix #6034 2023-08-25 17:49:38 +08:00
uye
7858de1c45 style: 删除空行 2023-08-25 17:43:50 +08:00
uye
2d23e2da6f chore: 消除 CopilotViewModel qodana 警告 2023-08-25 17:08:07 +08:00
uye
5a2d3783f7 refactor: 重构 RecognizerViewModel.cs 2023-08-25 16:29:49 +08:00
uye
a13ce2f389 refactor: 重构剩余 ViewModel(Settings 除外),添加字典 2023-08-25 15:59:33 +08:00
uye
6a34b4e255 docs: 更新蓝叠配置说明文档
fix #5302
2023-08-25 14:35:25 +08:00
github-actions[bot]
840216e7c0 docs: Auto Update Changelogs of v4.23.0-beta.1 (#6078)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-08-25 14:27:04 +08:00
Lancarus
d7fb47714b feat: 增加烧开水功能,优化萨米肉鸽策略 (#6053) 2023-08-25 14:00:44 +08:00
uye
7093a820c4 docs: [JP] Docs Update (#6070) 2023-08-25 10:15:03 +08:00
Wallsman
b1392ff51b [JP] Update Documents (#6057)
Update for CN base

[Update
1.1-詳細説明.md](dabaa51f7f)

[1.2-よくある質問.md](5d4da7ed0b)

[エミュレータのサポート.md](eb58f574fa)
2023-08-24 18:20:16 +09:00
David
0acb6c7cf5 fix: battlequickformationocr modified roi for EN 2023-08-22 23:12:27 +02:00
Wallsman
eb58f574fa Update 1.3-エミュレータのサポート.md 2023-08-23 03:58:44 +09:00
David
137caf662b feat: Events and Banners displayed according to timetable (#6050)
Thanks @ABA2396 for the Method heads up.
2023-08-22 19:38:56 +02:00
Wallsman
9f46d65b01 Merge pull request #7 from wallsman/wallsman-patch-3
Update 1.1-詳細説明.md
2023-08-23 02:29:01 +09:00
Wallsman
f304dd5af2 Merge pull request #6 from wallsman/wallsman-patch-4
Update 1.2-よくある質問.md
2023-08-23 02:23:46 +09:00
Wallsman
5d4da7ed0b Update 1.2-よくある質問.md 2023-08-23 02:22:13 +09:00
David
6d2b62bde9 docs: tweaked english tasks json schema 2023-08-22 18:41:24 +02:00
Lancarus
cbe6bbbf28 Update 覆水难收.json 2023-08-23 00:24:49 +08:00
Wallsman
dabaa51f7f Update 1.1-詳細説明.md 2023-08-23 01:02:56 +09:00
Wallsman
2817f5fa31 Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-23 00:58:10 +09:00
Wallsman
fedc66a812 Update 1.1-詳細説明.md 2023-08-23 00:52:38 +09:00
David
e280cefced Update src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
Very clean! Thank you for the heads up

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2023-08-22 17:04:39 +02:00
Clock
1cb0fe8dba chore: update tasks.json (YoStarKR) 2023-08-22 23:30:17 +09:00
MistEO
3029e6d9b9 Revert "fix: 尝试修复日志被占用的问题"
This reverts commit a655c2bf14.
2023-08-22 20:32:04 +08:00
David
3fa182d735 feat: event/pool display follows current time 2023-08-22 13:23:51 +02:00
MistEO
9c1a3f64e5 chore: Auto Update Game Resources - 2023-08-22 2023-08-22 09:27:24 +00:00
MistEO
92ca091a5d chore: Auto Update Game Resources - 2023-08-22 2023-08-22 07:08:58 +00:00
Hao Guan
cf7ab4dd40 chore: reload resource when controller changes 2023-08-22 17:04:08 +10:00
MistEO
663400f034 chore: Auto Update Game Resources - 2023-08-22 2023-08-22 06:32:21 +00:00
MistEO
cd23ffe994 chore: Auto Update Game Resources - 2023-08-22 2023-08-22 06:10:52 +00:00
MistEO
6ae5453933 chore: rename platform resource for iOS 2023-08-22 10:11:31 +08:00
MistEO
763aa60990 docs: 3.1-Integration.md (#6039)
Update descriptions.
2023-08-22 09:54:55 +08:00
DL_君逸寒
aa6ba11f75 perf: 保全派驻 阿尔斯特6 开局小优化 (#6037)
阿尔斯特6 开局小优化
2023-08-22 09:53:02 +08:00
MistEO
6490396ae5 fix: 修复肉鸽中干员 山 2 技能反复释放的问题 (#6033)
之前实现的开x次技能忘了改肉鸽部分,这次补上
2023-08-22 09:52:36 +08:00
Ntkskwk
1294a1ded9 Update(docs): 3.1-Integration.md 2023-08-22 06:26:12 +08:00
MistEO
490bcc9078 chore: Auto Update Game Resources - 2023-08-21 2023-08-21 20:07:24 +00:00
David
4b0f84a1e7 Update 3.1-集成文档.md (#6036)
在集成文档的Roguelike项目中添加萨米肉鸽的描述
2023-08-21 21:30:31 +02:00
HZXJY
838035341d Update 3.1-集成文档.md
在集成文档的Roguelike项目中添加萨米肉鸽的描述
2023-08-22 01:22:33 +08:00
MiaoYan JY
a19df2e24e fix: 修复肉鸽中干员 山 2 技能反复释放的问题 2023-08-21 23:40:40 +08:00
Annoying Flower
bd989df3d7 docs: 修改 "skill_usage" 、 "skill_times" 等字段说明 2023-08-21 23:34:39 +08:00
DL_君逸寒
29ef60e1b4 chore: 小作文加上最后一句话 (#6032) 2023-08-21 23:03:43 +08:00
David
64dff48960 fix: Senior Operator tag EN 2023-08-21 16:42:40 +02:00
David
ac430180e5 Adapted EN regex for new AutoSquad algorithm (#6028)
Huge thanks to Anthon @biscuit_lmao for giving me access to his AK account
2023-08-21 16:35:46 +02:00
David
8a64d347f8 fix: Skadi Alter and Greyy Alter Squads regex for 1080 2023-08-21 16:31:16 +02:00
Gliese
25bdc39b58 Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-21 22:46:27 +09:00
Gliese129
3e04ef90e0 use register key to detect bs config 2023-08-21 22:45:55 +09:00
MistEO
24a7a47d9a Merge branch 'dev' into David/NewENRegex 2023-08-21 21:37:09 +08:00
David
1720966320 revert: wrong branch my bad 2023-08-21 15:16:42 +02:00
David
17d2674188 fix: senior tag detection
fix #6012
2023-08-21 15:04:39 +02:00
MistEO
f391614827 styles: format 2023-08-21 20:41:19 +08:00
MistEO
5a4298e404 fix: build error of logger 2023-08-21 20:31:41 +08:00
MistEO
9edee9013c fix: build error 2023-08-21 20:15:04 +08:00
MistEO
f5a700b804 chore: 删除小作文! (#6029)
@junyihan233
2023-08-21 20:13:20 +08:00
DL_君逸寒
43500be3a6 Create SSS_荒废灯塔_浊蒂纯艾版.json (#6026)
Create SSS_荒废灯塔_浊蒂纯艾版.json
2023-08-21 19:45:43 +08:00
DL_君逸寒
179365c5ef Create SSS_阿尔斯特甜品制作平台_浊蒂版.json (#6027)
Create SSS_阿尔斯特甜品制作平台_浊蒂版.json
2023-08-21 19:45:33 +08:00
Annoying Flower
828f2e45d0 feat: 内置国服现版本两个保全作业 (#6025) 2023-08-21 19:45:18 +08:00
MistEO
a655c2bf14 fix: 尝试修复日志被占用的问题 2023-08-21 19:44:57 +08:00
MistEO
7430884e3b chore: Auto Update Game Resources - 2023-08-21 2023-08-21 11:07:52 +00:00
David
1411e84333 fix: W wrong detection in TW and EN 2023-08-21 12:46:59 +02:00
David
c4523d9cbe fix: optmized ROI and regex for EN quickformation 2023-08-21 12:45:43 +02:00
筱竹聽雨
c1672500d4 fix: 修复干员识别错误 (#6022) 2023-08-21 14:14:37 +08:00
uye
778d5be2ab fix: remake StageSK & StagePR-C picture for txwy (#5999) (#6018) 2023-08-21 13:34:16 +08:00
MistEO
5dc587e92e fix: 尝试修复mac上阈值差异
fix #5958
fix #5599
fix #5884
2023-08-21 13:23:25 +08:00
cenfusheng
3495c12eac fix: 修复自动编队部分干员文字识别错误 (#6020) 2023-08-21 12:01:41 +08:00
cenfusheng
aad908d219 fix: 修复干员文字识别错误 2023-08-21 12:00:53 +08:00
momomochi
56afccb0d7 重製碳素與先輔晶片關卡截圖 2023-08-21 10:16:52 +08:00
Hao Guan
4895edc928 chore: macOS GUI load platform resource 2023-08-21 03:58:07 +10:00
MistEO
2f7b7622a0 chore: pre-support macOS diff resource 2023-08-21 01:45:32 +08:00
javilak
0d5d32f442 perf(Golang): 从io/ioutil包更新为os包 (#5988) 2023-08-21 01:05:11 +08:00
MistEO
8ca76de6f8 fix: 重写自动战斗编队干员检测
fix #5934
2023-08-20 22:30:47 +08:00
MistEO
2c8c9121df fix: all operators are marked as new for overseas clients (Toolbox-Recruitment) (#6009) 2023-08-20 21:48:51 +08:00
Annoying Flower
a61d8fd631 feat: 添加对 "skill_times" 字段的支持,再也不会狂点重岳辣 (#6007) 2023-08-20 21:38:40 +08:00
Clock
c33ae3c275 Update tasks.json 2023-08-20 22:37:36 +09:00
MistEO
2d64d49a8e fix: 修复SSS技能用法判断错误的问题
fix #5991
2023-08-20 21:32:23 +08:00
MistEO
66a9bac83c fix: 修复编队时“全部”识别错误
fix #5962
2023-08-20 21:02:08 +08:00
Clock
bdd74f74d9 chore: Update ocrReplaces for YoStarKR 2023-08-20 20:39:50 +09:00
Fryze
e873a98ba6 fix: all operators are marked as new for overseas clients (Toolbox-Recruitment) 2023-08-20 20:34:46 +09:00
David
774a0a750b chore: DepotAllTab for EN from 1126db9 2023-08-20 12:41:29 +02:00
Clock
c603a674aa chore: add templates for YoStarKR 2023-08-20 18:38:44 +09:00
MistEO
5a66e7873f [Roguelike] 优化刷源石锭模式的逻辑 (#5987) 2023-08-20 16:26:17 +08:00
MistEO
1126db9f23 fix: 仓库识别界面未在最左侧时,识别不全的问题 (#6000) 2023-08-20 16:25:22 +08:00
MistEO
677bfc893f 修正偶尔OCR错误造成的吃48小时理智药失效问题 (#6004) 2023-08-20 16:24:26 +08:00
Qiao
afb007641a 修正偶尔OCR错误造成的吃48小时理智药失效问题 2023-08-20 15:18:58 +08:00
uye
038253b750 refactor: 重构 CopilotViewModel.cs (#6003) 2023-08-20 13:39:38 +08:00
uye
585af49f37 chore: inline 临时变量 2023-08-20 13:23:24 +08:00
uye
3881dd4d1a feat: 添加用户词典,减少拼写错误提示 2023-08-20 13:21:25 +08:00
uye
909a489a69 refactor: 重构 CopilotViewModel.cs 2023-08-20 13:20:59 +08:00
uye
131e6a3870 feat: 添加用户词典,减少拼写错误提示 2023-08-20 13:17:38 +08:00
Lancarus
4959fbd4d8 feat: 优化萨米肉鸽策略 (#5990) 2023-08-20 12:11:52 +08:00
Clock
f48275af26 fix: Prevents possible forced retreat (Amiya S3) 2023-08-20 12:55:09 +09:00
H1MSK
dac1be6dcc fix: 界面未在最左侧时,仓库识别不全的问题 2023-08-20 11:45:16 +08:00
uye
7bcc12a7fc chore: gui.log 启动时记录目录 2023-08-20 11:10:03 +08:00
Gliese
bb71ef33d7 Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-20 11:03:59 +09:00
David
f3de06a8a3 style: tweaked SSS copilot descriptions for EN 2023-08-19 19:50:21 +02:00
David
e0b57a1abb docs: ML translation 2023-08-19 17:43:08 +02:00
cenfusheng
bb9380852c fix: 修复一些文字识别问题(txwy) (#5993) 2023-08-19 23:18:12 +08:00
cenfusheng
e00d9fd43b fix: 修改干员文字识别问题的修复方式(txwy) 2023-08-19 23:16:32 +08:00
cenfusheng
3437c299dd fix: 修复另一些文字识别问题(txwy)
漏了一个
2023-08-19 22:40:12 +08:00
cenfusheng
99a6007175 fix: 修复一些文字识别问题(txwy)
issues#5865 与国服一点经验
2023-08-19 22:37:04 +08:00
cenfusheng
c58e660b8f fix: 修复年的识别问题 (#5992)
顺便给我之前修的排个序
2023-08-19 21:54:58 +08:00
cenfusheng
3d57bc4847 fix: 修复年的识别问题
顺便给我之前修的排个序
2023-08-19 21:54:20 +08:00
Lancarus
fbca49c17f Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-19 21:06:52 +08:00
Lancarus
41c370ebee Merge branch 'dev' of https://github.com/Lancarus/MaaAssistantArknights into dev 2023-08-19 21:05:46 +08:00
Lancarus
b23972844d 优化萨米肉鸽策略 2023-08-19 21:05:31 +08:00
lhhxxxxx
68730d1c15 fix: 紧急修复 dlx 算法工具类的越界问题 2023-08-19 18:02:56 +08:00
David
53deee8777 fix: Mizuki IS DropBox recog. and Shopping regex 2023-08-19 10:55:24 +02:00
uye
b676bcb564 feat: 添加刷理智任务报错提示 2023-08-19 16:33:33 +08:00
lassnuttun
5154d0d970 chore: 在肉鸽辅助协议文档中追加了刷源石锭模式下不期而遇逻辑的相关解释 2023-08-19 15:31:26 +08:00
uye
a9995e7b9b feat: 肉鸽开局干员支持点选 is_start 中的干员 2023-08-19 15:24:32 +08:00
lassnuttun
743ab1bb61 chore: 修改了刷源石锭的不期而遇逻辑的变量名、文件名 2023-08-19 15:22:03 +08:00
Lancarus
9cdfe7e0cc 优化了萨米肉鸽第三层的部分关卡打法,更新了肉鸽文档 (#5986) 2023-08-19 13:33:21 +08:00
lassnuttun
6f8a98a9f2 Merge branch 'mybranch' into dev 2023-08-19 12:28:01 +08:00
lassnuttun
58d24beb59 feat: 优化刷源石锭模式的逻辑,保留原先不期而遇选择方案的同时增加了针对刷钱的不期而遇选择方案,根据肉鸽模式使用不同方案 2023-08-19 12:13:24 +08:00
Lancarus
0153801c1d Update 3.5-肉鸽辅助协议.md 2023-08-19 12:07:05 +08:00
Lancarus
18c10f9297 Update 3.5-肉鸽辅助协议.md 2023-08-19 11:57:10 +08:00
Lancarus
9068c4a8b7 feat:优化第三层作战逻辑 2023-08-19 03:41:19 +08:00
Lancarus
c8a2664b8e feat:优化第三层作战逻辑 2023-08-19 03:33:23 +08:00
David
0b2fc76148 fix: SL event navigation
fix: #5982
2023-08-18 18:16:39 +02:00
Lancarus
75a550af6d feat:优化萨米肉鸽招募逻辑,优化前两层作战逻辑 (#5966)
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2023-08-18 22:12:10 +08:00
Lancarus
d33f68133d Merge branch 'dev' of https://github.com/Lancarus/MaaAssistantArknights into dev 2023-08-18 22:05:41 +08:00
Lancarus
4a56845b1c 更新第二层 2023-08-18 22:05:29 +08:00
uye
6a52cbbf9f refactor: 重构 VersionUpdateViewModel.cs (#5981) 2023-08-18 21:02:57 +08:00
Lancarus
f7e053f1a3 删掉多余文件 2023-08-18 20:49:18 +08:00
Lancarus
570bc3cb2c Merge branch 'dev' of https://github.com/Lancarus/MaaAssistantArknights into dev 2023-08-18 20:46:26 +08:00
Lancarus
e79da19ce9 优化萨米肉鸽部分关卡作战逻辑 2023-08-18 20:46:16 +08:00
uye
65d420d1f1 feat: 增加关卡数据获取成功提示 2023-08-18 18:43:29 +08:00
Clock
1457b9cba6 chore: Update operators.md 2023-08-18 19:35:47 +09:00
Wallsman
1abd99fe3c Update operators.md
fix
2023-08-18 13:26:59 +09:00
Wallsman
21797c494b Update operators.md 2023-08-18 13:22:07 +09:00
uye
200c561043 chore: Put local function 'CheckUpdateInner' after 'return' 2023-08-18 11:22:49 +08:00
uye
ae8fb94f7c style: Property 'OsArchitecture' can be made private && Put local function 'CheckUpdateInner' after 'return' 2023-08-18 11:04:11 +08:00
uye
6ed5a04d50 fix: 文件带相对路径时的转移问题 2023-08-18 10:59:35 +08:00
uye
aa69ecc909 refactor: 重构 VersionUpdateViewModel.cs 2023-08-18 10:48:48 +08:00
uye
12ee590bd5 style: 格式化 RunningState,添加注释 2023-08-18 10:45:41 +08:00
uye
185f29293b style: 格式化代码 2023-08-18 10:10:50 +08:00
uye
bc32eb6a98 fix: 定时执行逻辑错误
fix #5971
2023-08-18 09:40:29 +08:00
David
de55d911e1 fix: add ocr replace for YostarJP (#5977)
OCR 识别错误导致进不了商店
2023-08-17 19:26:39 +02:00
David
a1639bde8f fix: "Gummy" with skin undetected with new ROI
asst::WordOcr [{ Gummy OCUCK: [ 0, 0, 293, 35 ], score: 0.631317 }] 
asst::WordOcr [{ Gumm: [ 6, 2, 62, 28 ], score: 0.995575 }] by OCR 
name is empty
2023-08-17 19:25:22 +02:00
David
67dc46444d fix: increased ROI in fight task
fix #5745
2023-08-17 18:45:38 +02:00
Jie Lu
19067f21a9 fix: add ocr replace for YostarJP 2023-08-17 23:52:18 +09:00
David
7689895468 fix: changed award ROI and template EN 2023-08-17 15:18:46 +02:00
David
c4a1fda99c refactory: typo 2023-08-17 14:17:03 +02:00
cenfusheng
8e5aa434f6 fix: 修复关卡“干酪封锁”与装置““甜蜜狂搅””的识别 (#5975) 2023-08-17 16:12:19 +08:00
cenfusheng
87f1700104 fix: 修复关卡“干酪封锁”与装置““甜蜜狂搅””的识别 2023-08-17 16:11:51 +08:00
Lancarus
88b3a3c6b3 Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-17 04:09:23 +08:00
Lancarus
0394206d01 Merge branch 'dev' of https://github.com/Lancarus/MaaAssistantArknights into dev 2023-08-17 04:08:16 +08:00
Lancarus
29e22ec875 优化招募逻辑 2023-08-17 04:08:02 +08:00
Lancarus
ccf27dadb3 Merge branch 'dev' of https://github.com/Lancarus/MaaAssistantArknights into dev 2023-08-17 03:48:58 +08:00
Lancarus
8cd9b0baac 优化萨米肉鸽逻辑 2023-08-17 03:48:41 +08:00
David
d4776da391 perf: optimized ROI for EPISODE navigation 2023-08-16 18:40:04 +02:00
David
1ca477b8e3 chore: PRTS3 and LevelOFDifficulty i18n EN 2023-08-16 17:41:58 +02:00
David
a729d0d35d tools: global content update 2023-08-16 17:04:44 +02:00
David
830ccf28e7 chore: ormatting + output log cleanup / clearup 2023-08-16 09:55:18 +02:00
MistEO
681704032b fix: link in mac-runtime release (#5954)
在macOS上`ln`产生的符号链接会直接沿用输入的路径,而不会进行变换,因此在现在的情况下产生的符号链接是这样的:
```
libonnxruntime.1.14.1.dylib
libMaaDerpLearning.dylib
libMaaCore.dylib
libopencv_world4.407.dylib
libonnxruntime.dylib@ -> macos-runtime-temp/libonnxruntime.1.14.1.dylib
libopencv_world4.dylib@ -> macos-runtime-temp/libopencv_world4.407.dylib
```
为了生成正确的符号符号链接,我们需要输入的是目标相对链接文件的路径,由于目标和符号链接位于同一文件夹,所以应该是目标的文件名:
```bash
bash-3.2$ libonnxruntime_file=$(basename macos-runtime-temp/libonnxruntime*.dylib)
bash-3.2$ ln -vs $libonnxruntime_file macos-runtime-temp/libonnxruntime.dylib
macos-runtime-temp/libonnxruntime.dylib -> libonnxruntime.1.14.1.dylib
bash-3.2$ libopencv_world_file=$(basename macos-runtime-temp/libopencv_world*.dylib)
bash-3.2$ ln -vs $libopencv_world_file macos-runtime-temp/libopencv_world4.dylib
macos-runtime-temp/libopencv_world4.dylib -> libopencv_world4.407.dylib
```
这样才可以产生正常的符号链接:
```
libMaaCore.dylib
libMaaDerpLearning.dylib
libonnxruntime.1.14.1.dylib
libonnxruntime.dylib -> libonnxruntime.1.14.1.dylib
libopencv_world4.407.dylib
libopencv_world4.dylib -> libopencv_world4.407.dylib
```
2023-08-16 11:02:19 +08:00
MistEO
a9a631fd8f chore: Auto Update Game Resources - 2023-08-15 2023-08-15 18:07:55 +00:00
David
bc6d689339 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-08-15 19:57:07 +02:00
David
d7c17fa693 Feat: Auto Update now orders Global tasks.json like Official
Tasks_Sorter.py now orders the Global servers tasks with the same order of the official server

For EN: removed Award task + I.S. trader shopping regex
For KR: removed deprecated I.S. tasks

Co-authored-by: 178619 <snoo91919@gmail.com>
2023-08-15 19:53:44 +02:00
David
4e3f48c4a1 Feat: Auto Update now orders Global tasks.json like Official
Tasks_Sorter.py now orders the Global servers tasks with the same order of the official server

For EN: removed Award task + I.S. trader shopping regex
For KR: removed deprecated I.S. tasks


Co-authored-by: 178619 snoo91919@gmail.com
2023-08-15 19:50:41 +02:00
Clock
471ee56187 chore: localization update 2023-08-16 01:05:30 +09:00
Loong
bea8b11c6b fix: link in mac-runtime release 2023-08-15 17:59:37 +08:00
Lancarus
b01090ea49 Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-15 17:48:41 +08:00
Lancarus
6932303311 fix:肉鸽在招募逻辑内可以将同一干员纳入多个群组,修复由于拆分文件造成的bug (#5946)
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2023-08-15 17:44:11 +08:00
Yumi0606
fd9a269dba fix: 新版萨米肉鸽商店文件&水月肉鸽商店文件提交 (#5936)
录入商品效果信息,增加所有商品,小调了商品优先级

---------

Co-authored-by: MistEO <mistereo@hotmail.com>
2023-08-15 17:43:27 +08:00
MistEO
f241b30f30 chore: Auto Update Game Resources - 2023-08-15 2023-08-15 09:06:20 +00:00
Lancarus
c46be788d1 Merge branch 'dev' of https://github.com/Lancarus/MaaAssistantArknights into dev 2023-08-15 01:07:11 +08:00
Lancarus
363b987408 fix:修复肉鸽的一些bug,将一些log信息的等级提到log.trace方便写作业 2023-08-15 01:05:48 +08:00
Lancarus
001959f408 Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-14 21:37:41 +08:00
MistEO
1ab27717ae feat: merge and re-structure stage.json (#5944)
fix #5881
2023-08-14 18:20:41 +08:00
Lancarus
2f99fe736c Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-14 17:42:09 +08:00
MistEO
8ff71bfac7 feat: add config CompatPOSIXShell (#5945)
在POSIX shell标准中,双引号内的`$`内的内容将被提前展开,这将导致`CloseDown`任务失效。大多数*nix
shell的实现都遵守这一标准,所以这里添加了一个配置`CompatPOSIXShell`,将`Stop`字段相应的双引号换成单引号,以防止CloseDown在使用符合上述标准shell的系统上失效。

另见: #5920,因为那个PR已经合并了,所以我新提了一个PR。
2023-08-14 15:56:38 +08:00
Lancarus
f71d5f0255 Merge branch 'dev' of https://github.com/Lancarus/MaaAssistantArknights into dev 2023-08-14 15:43:22 +08:00
uye
70b48f7111 fix:肉鸽在招募逻辑中使用重复干员,后面会覆盖前面的,现在改为比较后更新 2023-08-14 15:38:46 +08:00
MistEO
aff90a749a feat: merge and re-structure stage.json
fix #5881
2023-08-14 15:21:00 +08:00
Long Wang
054f5a6ee5 feat: add config CompatPOSIXShell 2023-08-14 15:18:11 +08:00
uye
8079ca2bf6 fix: 错误的类型转换
fix #5940
2023-08-13 22:44:42 +08:00
Clock
13822618b4 fix: make the option to not recruit selectable in SSS for YoStarKR 2023-08-13 23:25:03 +09:00
uye
fcc8f84290 fix: 修复模拟器关闭逻辑错误,增加模拟器退出错误日志 2023-08-13 22:13:07 +08:00
Clock
b832d3f1a7 feat: SSS copilot support for YostarKR 2023-08-13 22:34:46 +09:00
David
2882878392 fix: Infrast Task stuck Max Trust notification EN 2023-08-13 13:25:00 +02:00
uye
72bc76aa24 chore: 调整肉鸽商品识别roi范围 2023-08-13 19:11:47 +08:00
David
7a9ec26241 fix: #5931 2023-08-13 11:18:39 +02:00
MistEO
0fc5374c3d chore: Auto Update Game Resources - 2023-08-13 2023-08-13 08:07:35 +00:00
MistEO
4586e536c3 Revert "添加繁中服对于鸿雪的OCR等价规则 #5931" (#5935) 2023-08-13 15:57:35 +08:00
MistEO
0b6a07bdfa fix: CloseDown not works on macOS (#5920) 2023-08-13 15:54:15 +08:00
uye
9032220b10 fix: 关闭模拟器时索引超出了数组界限
fix #5930
2023-08-13 15:50:14 +08:00
David
404ac43cc5 fix: 添加繁中服对于鸿雪的OCR等价规则 #5931 #5933 2023-08-13 09:50:04 +02:00
MistEO
3e1a7a17a5 Revert "添加繁中服对于鸿雪的OCR等价规则 #5931" 2023-08-13 15:41:19 +08:00
uye
c75de28019 fix: 肉鸽打折商品识别错误
fix #5919
2023-08-13 15:29:32 +08:00
David
8cc9bc6ab9 添加繁中服对于鸿雪的OCR等价规则 #5931 (#5933) 2023-08-13 08:52:44 +02:00
David
1ac79248df Revert "Useless png in roguelike JP"
This reverts commit 8b08e10aa3.

My bad, I've removed the wrong image.
2023-08-13 08:45:20 +02:00
Roland125
4336c1b789 添加繁中服对于鸿雪的OCR等价规则 #5931 2023-08-13 13:30:48 +08:00
David
37e26c6ea3 Removed useless .png from JP I.S. 2023-08-13 00:09:06 +02:00
David
8b08e10aa3 Useless png in roguelike JP
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/4921#issuecomment-1562944784
2023-08-13 00:00:16 +02:00
David
44c51044ea feat: Invitation to Wine rerun implemen. for JP 2023-08-12 20:43:22 +02:00
David
f5c61a30ac feat: 適配繁中服保全派駐 (#5926)
~~坐牢~~ 坐到很煩,所以動手更新一下保全派駐的東西。

有試過加上自己寫到一半的蘿蔔礦場作業可以正常開刷,應該是....沒有什麼問題 (?
2023-08-12 18:20:28 +02:00
momomochi987
c37b889cf2 增加 "鋼鐵蘿蔔礦場" 的關卡 text 2023-08-12 23:41:14 +08:00
momomochi987
5e1cefa539 補充保全派駐圖片 2023-08-12 23:34:09 +08:00
momomochi987
0eb9e68993 重製 "放棄行動" 圖片 2023-08-12 23:32:27 +08:00
momomochi987
d77a542f95 更新保全派駐相關 text 2023-08-12 23:29:47 +08:00
cenfusheng
c2a9fabd8d fix: 修复特别关注干员的识别问题 (#5924)
先把膏药糊上,模型修了再删(
2023-08-12 23:01:37 +08:00
cenfusheng
0b6f34dbaa fix: 修复特别关注干员的识别问题
先把膏药糊上,模型修了再删(
2023-08-12 23:00:36 +08:00
David
117ddb84ae optimized: regex for I.S. trader shopping in EN 2023-08-12 16:51:23 +02:00
David
9747ac6f62 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-08-12 12:23:54 +02:00
David
06703048c4 fix: wrong template for reception room detection 2023-08-12 12:23:52 +02:00
MistEO
ff1668e6f0 fix: 修复自动编队时不重试的问题 2023-08-12 16:36:46 +08:00
MistEO
60644902a5 feat: 抄作业自动编队支持含有不同职业的组 2023-08-12 15:17:10 +08:00
MistEO
ac9e7a414e fix: build error 2023-08-12 15:13:00 +08:00
MistEO
5142a63201 chore: 删除目前用不上了的肉鸽代码 2023-08-12 15:06:48 +08:00
Loong
9b3f0c995f Merge branch 'MaaAssistantArknights:dev' into fix/closedown 2023-08-12 14:28:22 +08:00
MistEO
d5ea735124 chore: Auto Update Game Resources - 2023-08-11 2023-08-11 21:26:59 +00:00
Long Wang
efb2447680 Only apply to CompatMac 2023-08-12 01:48:58 +08:00
David
afdd57c9d5 typo: 1646e76704 2023-08-11 19:48:49 +02:00
David
1646e76704 chore: Invitation to Wine rerun implementation for EN 2023-08-11 19:44:29 +02:00
David
35487f87fe chore: Oper Regex Tweaked for EN (BattleMatcher) 2023-08-11 19:28:08 +02:00
Long Wang
5c6378f836 fix: CloseDown not works on macOS 2023-08-12 01:05:50 +08:00
cenfusheng
71e0b876f3 fix: 修复干员煌的文字识别问题 (#5910) 2023-08-11 11:40:37 +08:00
cenfusheng
2f22697bf9 fix: 修复干员煌的文字识别问题 2023-08-11 11:39:23 +08:00
David
282dcfe90a chore: Paradox Simulation for YostarEN + BattleMatcher regex 2023-08-10 21:49:14 +02:00
cenfusheng
3853e2e385 fix: 修复临光的文字识别错误 (#5906) 2023-08-10 21:54:15 +08:00
cenfusheng
2bb41066e0 fix: 修复临光的文字识别错误 2023-08-10 21:53:21 +08:00
MistEO
653a59778f chore: Auto Update Game Resources - 2023-08-10 2023-08-10 09:29:27 +00:00
MistEO
acf72e6079 refactor: 重构TaskQueueViewModel (#5753) 2023-08-10 17:06:26 +08:00
David
58fd37d877 feat: add roguelike encounter ocrReplace for JP and EN (#5903)
After I added the "Roguelike@StageEncounterOcr" for txwy server (#5790),
I noticed that task.json for JP and EN server also don't have
"Roguelike@StageEncounterOcr",
so I checked out wiki and added them. 
 
Except for "深蓝仪式" and "升华", I couldn't find translations of these two
stage name.

Phantom & Crimson Solitaire : [JP
wiki](https://arknights.wikiru.jp/?%E7%B5%B1%E5%90%88%E6%88%A6%E7%95%A5%E3%80%8C%E3%83%95%E3%82%A1%E3%83%B3%E3%83%88%E3%83%A0%E3%81%A8%E7%B7%8B%E3%81%8D%E8%B2%B4%E7%9F%B3%E3%80%8D#eac89207)
/ [EN
wiki](https://arknights.fandom.com/wiki/Phantom_%26_Crimson_Solitaire/Nodes)
Mizuki & Caerula Arbor : [JP
wiki](https://arknights.wikiru.jp/?%E7%B5%B1%E5%90%88%E6%88%A6%E7%95%A5%E3%80%8C%E3%83%9F%E3%83%85%E3%82%AD%E3%81%A8%E7%B4%BA%E7%A2%A7%E3%81%AE%E6%A8%B9%E3%80%8D#eac89207)
/ [EN
wiki](https://arknights.fandom.com/wiki/Mizuki_%26_Caerula_Arbor/Nodes#Encounters)

If there are any other problems, please feel free to adjust them,
because I don't have JP or EN account to continue testing. ☹️☹️☹️

Sorry for poor Engilsh... ( ´•̥̥ω•̥̥` )
2023-08-10 11:02:25 +02:00
David
069041fdc2 chore: Adapted EndOfActionAnnihilation for EN 2023-08-10 10:57:09 +02:00
momomochi
d3d9378088 add encounter ocrReplace for EN 2023-08-10 15:45:03 +08:00
momomochi
38c80dff1a add encounter ocrReplace for JP 2023-08-10 15:40:32 +08:00
MistEO
66dd06a4ac chore: Auto Update Game Resources - 2023-08-10 2023-08-10 07:28:00 +00:00
uye
a4ecff2b4c Merge branch 'dev' into refactor/TaskQueueViewModel 2023-08-10 15:09:37 +08:00
MistEO
32290f4315 chore: 更新简中OCR识别模型 | Re-training OCR rec model of CN client (#5895)
使用Arknights Ver2.0.61客户端的数据重新Fine-tune了OCR rec 模型
2023-08-10 10:56:25 +08:00
AnnAngela
1b85511539 feat(docs): 更新文档内容 (#5901) 2023-08-10 10:05:00 +08:00
Sherkey
073bedb3db feat(docs): 文档大升级 (#5885)
+ 迁移到[vuepress-hope](https://theme-hope.vuejs.press/zh/)主题
该主题有很多好用的特性,包括但不限于mermaid流程图,charts/echarts图表,更美观的提示卡片等
  + 优化的侧边栏和导航栏
  + 内置图标支持
  + 使用卡片来优化阅读体验
+ 修复了jsonc和cpp的高亮问题
2023-08-10 09:53:28 +08:00
MistEO
1827b6cd47 chore: Auto Update Game Resources - 2023-08-09 2023-08-09 17:06:06 +00:00
David
0cbc1165c8 fix: Reception sends clue when full in YostarEN 2023-08-09 19:01:40 +02:00
David
cbd39e9ab6 tools: added impossible to translate task 2023-08-09 18:25:25 +02:00
Plumess
d8a4b4e07d chore: 更新简中OCR识别模型 | Re-training OCR rec model of CN client 2023-08-09 22:24:07 +08:00
MistEO
a727fc6037 Release v4.22.0-beta.1 (#5889) 2023-08-09 22:09:38 +08:00
github-actions[bot]
495b6bce2b docs: Auto Update Changelogs of v4.22.0-beta.1 (#5894)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-08-09 22:09:14 +08:00
Lancarus
56554d2ff7 修改了肉鸽文档的一些格式错误 (#5893) 2023-08-09 22:04:04 +08:00
MistEO
09db2e5751 feat: 更新繁中服肉鴿不期而遇 ocrReplace (#5882)
補上傀影肉鴿的不期而遇 & 調整一些水月肉鴿自己有遇到被辨識成其他文字的關卡名稱。

然後不知道前一個 PR 衝突到底有沒有成功解決,還是重開一個 PR 比較保險 🙈🙈🙈
2023-08-09 17:07:40 +08:00
momomochi
8033b0f200 調整縮排為 4 空白 2023-08-09 16:28:44 +08:00
cenfusheng
247f1ed357 feat: 萨米不再进入部分不期而遇战斗 (#5890)
完全打不过,润!
2023-08-09 15:52:34 +08:00
cenfusheng
b4b6a99b07 feat: 萨米不再进入三个不期而遇战斗
完全打不过,润!
2023-08-09 15:50:36 +08:00
MistEO
b0889e26cf fix#根据反馈调整Qodana 忽略特定的警告 (#5867)
忽略的警告类型是额外的逗号,如下:
```csharp
              "zh-tw" => new[] { "zh-cn", _culture, },
                "en-us" => new[] { "zh-cn", _culture, },
                _ => new[] { "zh-cn", "en-us", _culture, }, //<- 尾部的逗号
            };
```

```csharp
           { "en-us", "YoStarEN" },
            { "ja-jp", "YoStarJP" },
            { "ko-kr", "YoStarKR" }, // <- 尾部的逗号
        };
```
2023-08-09 15:26:17 +08:00
David
a50547f85f fix: d0dc294 auto update version issue 2023-08-08 13:53:53 +02:00
momomochi
23bcb0fa92 調整縮排 2023-08-08 18:07:59 +08:00
momomochi
292a25625b 更新不期而遇的 ocrReplace 2023-08-08 17:57:43 +08:00
MistEO
d0dc2946dc chore: Auto Update Game Resources - 2023-08-08 2023-08-08 08:31:55 +00:00
David
b86affd4ce fix: more long names regex for OperBox 2023-08-07 22:57:44 +02:00
David
a7a990546a Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-08-07 22:37:35 +02:00
David
1545b064e3 fix: ROI for BattleStartOCR, new IMG+ROI for Oper 2023-08-07 22:37:32 +02:00
David
46a69fb960 fix: OperBox regex, BattleMatcher regex, longname and IS 2023-08-07 22:31:26 +02:00
Lancarus
deeddc4826 doc: 按照竹雨佬的意见修改了部分肉鸽文档 (#5873) 2023-08-07 22:29:40 +08:00
Lancarus
86bc107c69 doc: Update 3.5-肉鸽辅助协议.md 2023-08-07 22:23:51 +08:00
Lancarus
48360063a7 Update 3.5-肉鸽辅助协议.md 2023-08-07 22:21:08 +08:00
Lancarus
b7b72d42e4 Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-07 21:37:47 +08:00
Gliese
25687bd210 add default bluestacks.conf 2023-08-07 18:12:44 +08:00
Gliese
444efa2325 Merge branch 'dev' of github.com:Gliese129/MaaAssistantArknights into dev 2023-08-07 17:40:18 +08:00
Gliese
f38b13efea fix: 多个模拟器可能导致连接不上 2023-08-07 17:36:47 +08:00
uye
629f17ad74 chore: ReSharper disable InconsistentNaming 2023-08-07 15:57:32 +08:00
Infko
bb1617112a add single line ignore 2023-08-07 15:28:02 +08:00
Infko
fb71ebb0bf fix#根据反馈调整Qodana 忽略特定的警告 2023-08-07 15:25:31 +08:00
Lancarus
cc25d5ec43 feat: 修复了傀影肉鸽的一些错误,更新了肉鸽协议 (#5859) 2023-08-07 13:38:51 +08:00
Lancarus
d2b980454c doc: Update 3.5-肉鸽辅助协议.md 2023-08-07 13:18:55 +08:00
uye
6586b6d5e3 refactor: 重构基线前的 TaskQueueViewModel 2023-08-07 11:43:22 +08:00
uye
47f64d6307 chore: Accessor 'TaskItemViewModels.set' can be made private 2023-08-07 11:43:22 +08:00
uye
636dc392ba refactor: 重构基线前的 TaskQueueViewModel 2023-08-07 11:10:40 +08:00
Lancarus
19539d8d83 doc:update 3.5-肉鸽辅助协议.md 2023-08-07 10:58:53 +08:00
Lancarus
81dadc452d Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-07 10:18:09 +08:00
uye
358566f784 fix: 修正 zh-cn.xaml 文本错误 (#5861) 2023-08-07 08:37:54 +08:00
javilak
a90a2ee2b2 Update zh-cn.xaml
修正文本错误
2023-08-07 02:21:12 +08:00
Lancarus
f63ee0c5c0 Update 3.5-肉鸽辅助协议.md 2023-08-07 01:12:58 +08:00
uye
53e5c2de84 chore: Add explicit 'return' or 'continue' before local functions 2023-08-07 01:07:55 +08:00
uye
d85eba38d8 chore: Put local function after 'return' or 'continue' 2023-08-07 00:58:42 +08:00
uye
489d987d45 fix: problems were found by Qodana 2023-08-07 00:30:49 +08:00
Lancarus
58a6e5a22e Update 3.5-肉鸽辅助协议.md 2023-08-07 00:23:27 +08:00
uye
ce27219c83 fix: problems were found by Qodana 2023-08-07 00:12:25 +08:00
Lancarus
21315ad7ad Update 3.5-肉鸽辅助协议.md 2023-08-07 00:04:53 +08:00
Lancarus
98b71292c2 Update 3.5-肉鸽辅助协议.md 2023-08-06 23:26:49 +08:00
Lancarus
c35020a39b Update 3.5-肉鸽辅助协议.md 2023-08-06 23:25:20 +08:00
Lancarus
2c584fd1eb Update 3.5-肉鸽辅助协议.md 2023-08-06 22:56:21 +08:00
Lancarus
627e549951 Update 3.5-肉鸽辅助协议.md 2023-08-06 22:42:23 +08:00
Lancarus
265190d7fc Update 3.5-肉鸽辅助协议.md 2023-08-06 22:31:14 +08:00
Lancarus
d46b920e0c feat:3.5-肉鸽辅助协议.md 2023-08-06 21:21:24 +08:00
Lancarus
33d277246e feat:根据文档设置最后两个分组 2023-08-06 20:40:51 +08:00
Lancarus
9c074e6058 fix:修复傀影肉鸽中百家不选2技能 2023-08-06 20:28:18 +08:00
MistEO
04ef9cf673 Merge branch 'dev' into refactor/TaskQueueViewModel 2023-08-06 20:08:19 +08:00
MistEO
cefb9c03f5 refactor: 拆分所有肉鸽资源文件 (#5856) 2023-08-06 20:07:41 +08:00
Large-Japchae
87d2ac691c fix(YoStarKR): Goldenglow(澄闪) & Surtr(史尔特尔) ocrReplace (#5852) 2023-08-06 18:49:44 +08:00
David
7d8213ef7e chore: modified text for EX stages (WB event) 2023-08-06 08:00:02 +02:00
uye
511063658b 未勾选"强制定时启动"时就不必重启了 (#5844)
这里提前两分钟切换配置,如果未勾选强制定时启动,是否可以豁免重启?

并且增加校验,如果没有切换到目标配置,跳过启动。
2023-08-06 10:53:50 +08:00
MistEO
7d3e7a4437 feat: 肉鸽开局助战or自选干员后不再要求选用start属性干员 (#5824) 2023-08-05 22:18:04 +08:00
MistEO
ec92605ed2 feat(docs): 为文档添加docsearch和sitemap支持 (#5785) 2023-08-05 22:17:11 +08:00
MistEO
b6fe3c1c15 feat: 增加强制替换adb的信息提示,增加异常处理 (#5838) 2023-08-05 22:16:32 +08:00
MistEO
6ade96968b CI-在静态分析中增加基线 (#5757) 2023-08-05 22:15:30 +08:00
DaysGone233
6346ad483c fix: 未勾选"强制定时启动"时就不必重启了 2023-08-05 21:51:04 +08:00
DaysGone233
a423409ca1 fix: fix: 未勾选"强制定时启动"时就不必重启了 2023-08-05 21:49:26 +08:00
DaysGone233
b181fec3cb fix: 未勾选"强制定时启动"时就不必重启了 2023-08-05 21:43:11 +08:00
uye
2a11921ae4 feat: 增加强制替换adb的信息提示,增加异常处理 2023-08-05 12:17:45 +08:00
David
adae413e0d typo: 2.2-DEVELOPMENT.md 2023-08-04 21:36:23 +02:00
MistEO
97a174aa9f Revert "feat:自动检测特定目录下的bluestacks.conf" (#5794) 2023-08-04 23:02:29 +08:00
DuKong
6c01f18fcb feat: 肉鸽开局助战or自选干员后不再要求选用start属性干员 2023-08-04 20:01:55 +08:00
uye
c96b379810 fix: 强制替换adb报错
之后再加个吐司通知弹一下
2023-08-04 16:49:51 +08:00
cenfusheng
57fceebf79 feat: 傀影肉鸽适配更多干员 (#5817)
e佬主谋(指),我对部分干员进行了优先度微调。
2023-08-04 14:39:37 +08:00
cenfusheng
ee023a77f8 feat: 增加傀影肉鸽干员适配
感谢e佬,此处锂微调。
2023-08-04 14:23:36 +08:00
cenfusheng
e58e20d9ab feat: 增加傀影肉鸽对不同干员的适配
e佬的奉献
2023-08-04 14:03:57 +08:00
Sherkey
91a19e6b2c fix: 恢复本地构建时删除的tsconfig内容 2023-08-03 21:09:07 +08:00
MistEO
e929279cb1 docs: typo of 1.3-模拟器支持.md (#5802) 2023-08-03 17:17:36 +08:00
BlueandwhiteXD
14a66b2f17 Update 1.3-模拟器支持.md 2023-08-03 17:12:37 +08:00
cenfusheng
3d324d4720 feat:适配萨米肉鸽关卡“豪华车队” (#5798)
增加对该关卡的适配
2023-08-03 13:12:59 +08:00
cenfusheng
9701f190bb feat:适配萨米肉鸽关卡“豪华车队”
增加对该关卡的适配
2023-08-03 12:47:33 +08:00
MistEO
2a694d50e5 Revert "feat:自动检测特定目录下的bluestacks.conf" 2023-08-03 10:38:52 +08:00
MistEO
81ab4b2109 feat:自动检测特定目录下的bluestacks.conf (#5751)
好吧就是我懒得编辑json了(
2023-08-03 09:41:00 +08:00
筱竹聽雨
400f7a340a fix: 修复纯烬艾雅法拉识别 (#5791)
修复纯烬艾雅法拉识别
2023-08-03 09:39:50 +08:00
MistEO
f33e9c4fbb fix: 修正繁中服水月肉鴿會卡在 "緊急運輸" 的問題 (#5790)
終於能解決這個問題了 🎉🎉🎉

爬 log 發現 "緊急調遣" 都會被識別到敘述裡的 "安全屋",其他不期而遇則是有 "Unknown Event" 的問題。
試了一下才發現,原來是不期而遇關卡名一直沒有加上 ocrReplace  _ (´ཀ`」 ∠) _

本來可以再早一點發 PR 的,結果改完後一直遇不到緊急運輸沒辦法測 :(

相關 issue 與討論:
#5690 #5700 #5746 #5789
2023-08-03 09:39:35 +08:00
momomochi
d0eaf84200 新增水月肉鴿不期而遇關卡名稱的 ocrReplace 2023-08-03 09:14:06 +08:00
David
4f8424eaf4 chore: same as 0b03b68 2023-08-02 18:57:06 +02:00
David
0b03b68b18 chore: SSS Identification issue with NON-1080 emulators 2023-08-02 18:49:45 +02:00
Sherkey
8c363f0d0a Merge branch 'MaaAssistantArknights:dev' into feat/DocSearch 2023-08-02 22:12:25 +08:00
MistEO
6155e3d42b Release v4.21.0 (#5780) 2023-08-02 21:46:19 +08:00
MistEO
1a0fcf9167 docs: Update CHANGELOG.md 2023-08-02 21:45:57 +08:00
SherkeyXD
73f05342a2 docs: 添加sitemap支持 2023-08-02 21:38:35 +08:00
SherkeyXD
f54cdcc063 chore: 优化文档的gitignore 2023-08-02 20:57:58 +08:00
MistEO
6737b38a41 chore: revert "version" of YostarEN 2023-08-02 20:53:27 +08:00
SherkeyXD
3a3c803029 docs: 使用docsearch作为文档搜索插件
需要跟进日语/繁体/韩语翻译
2023-08-02 20:36:14 +08:00
Sherkey
af7ef9d89c docs: 添加对于mumu12后台保活功能的设置的说明 (#5781)
#5767

---------

Co-authored-by: AnnAngela <naganjue@vip.qq.com>
2023-08-02 19:51:58 +08:00
MistEO
25d2fd9636 chore: Auto Update Game Resources - 2023-08-02 2023-08-02 09:47:38 +00:00
David
4c2c644bfa refactor: from ba75736 Manual Stage navigation EN
The reason I had to do the first commit is because the "baseTask"
wasn't working properly, so I copied the inheritor,
and now it's working as intended.
2023-08-02 11:26:34 +02:00
uye
f1dd6e3fe0 修复干员青枳识别 (#5775) 2023-08-02 14:58:09 +08:00
筱竹聽雨
2ddb2d1e15 Update tasks.json
修复干员识别
2023-08-02 13:44:09 +08:00
MistEO
99ee00fbee 繁中服水月肉鴿「委託完成」卡住 (#5766)
報錯卡住
換一張
2023-08-02 11:16:44 +08:00
David
d789736e91 fix: Wrong event in display
@MistEO Please change the auto update resources as it's the third time it changes the event name because it has a wrong event schedule. There is no Ling event rerun right now.
It's Chongyue and Lin event time.
2023-08-01 23:20:59 +02:00
MistEO
561d75ba44 chore: Auto Update Game Resources - 2023-08-01 2023-08-01 18:47:29 +00:00
vonnoq
1cb55c48a8 水月肉鴿圖檔
報錯卡住
換一張
2023-08-02 02:24:06 +08:00
Infko
8c2d20b06d move qodana baseline to .github directory 2023-08-01 16:18:32 +00:00
MistEO
71525158c2 Release v4.21.0-beta.1 (#5755) 2023-08-01 20:20:02 +08:00
github-actions[bot]
5be50e9e1d docs: Auto Update Changelogs of v4.21.0-beta.1 (#5758)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-08-01 20:19:47 +08:00
uye
670a8df844 feat: 支持活动导航 2023-08-01 19:57:16 +08:00
Infko
6cd69e0cf7 add baseline analyze 2023-08-01 11:22:40 +00:00
Alisa
80c2e8e6e1 fix: 更新的逻辑小错误 (#5752) 2023-08-01 19:18:47 +08:00
tangge233
5c5632df1d fix: 这次绝对没问题了 2023-08-01 18:33:49 +08:00
uye
cba148fc84 Merge branch 'dev' into refactor/TaskQueueViewModel 2023-08-01 18:28:33 +08:00
MistEO
70210447c0 Ci: qodana (#5754)
#5662

cc @hxdnshx @AnnAngela
2023-08-01 18:05:57 +08:00
tangge233
e3a8f19ba2 fix: 修复可能会由 double 类型引发的错误 2023-08-01 18:05:09 +08:00
MistEO
9bbca043e2 ci(qodana): fix branch 2023-08-01 17:59:57 +08:00
Infko
b3e17de782 增加 Qodana 静态扫描 (#5662)
用于 MAA 主项目的话,建议去 https://qodana.cloud/ 申请一个对应 MAA 主项目的
Token(因为要配置SECRET)。开源项目应该可以免费申请 Ultimate/Ultimate Plus 的授权。

目前还不确定这个静态扫描需要在哪些流程触发,目前是放在main了,感觉可以根据pr流程等进行变更。


[https://qodana.cloud/projects/3j1Pv/reports/g4BmP](https://qodana.cloud/projects/3j1Pv/reports/g4BmP)
这个是在自己fork的项目里面跑的结果,可以品一品(

追记:https://qodana.cloud/projects/3j1Pv/reports/5vRNG 这个是去除了C++和
xaml部分的(已配置基线,需要到baseline栏看)。
2023-08-01 17:57:27 +08:00
tangge233
1e868aacc1 fix: 修改检查镜像源逻辑 2023-08-01 17:45:04 +08:00
MistEO
3668aa1f0a feat: 新增萨米肉鸽4~5层部署策略 (#5725) 2023-08-01 17:34:13 +08:00
MistEO
506afe1d56 fix:日服水月肉鸽事件选项确认页面 (#5749)
日服水月肉鸽 不期而遇 等节点选项曾无法自动选择,修改roi后正常。
2023-08-01 17:34:02 +08:00
MistEO
3b5e892932 fix: 重製繁中服部分截圖 (#5748)
主要是解決 #5691 下面提到的資源收集關卡截圖問題。

順便把基建的各設施截圖也一起重製,
應該可以解決 #5150 #5642 #5326 這幾個 issue 裡提到的設施略過問題 (?)
2023-08-01 17:31:46 +08:00
MistEO
55f0729bd9 chore: Auto Update Game Resources - 2023-08-01 2023-08-01 08:07:09 +00:00
uye
ef51fa1ff8 refactor: 重构TaskQueueViewModel 2023-08-01 16:00:14 +08:00
David
637f2ca9e3 Rename SSS_Dossoles_BROKEN_,waitforfix.json to SSS_Under-ConstructionDossolesPlate.json 2023-08-01 09:32:10 +02:00
David
5da2919382 Rename SSS_AcahuallanJungle_WORKING.json to SSS_AcahuallanJungle.json 2023-08-01 09:31:33 +02:00
tangge233
ce5a2e579c fix: 更新的逻辑小错误 2023-08-01 15:27:34 +08:00
Gliese
2de6ec3e51 fix:自动检测特定目录下的bluestacks.conf 2023-08-01 15:12:55 +08:00
MistEO
5b368301a7 chore: Auto Update Game Resources - 2023-08-01 2023-08-01 03:27:47 +00:00
MistEO
d9a76967ca chore: Auto Update Game Resources - 2023-08-01 2023-08-01 02:36:32 +00:00
ManicSteiner
035c750d82 fix:日服水月肉鸽事件选项确认页面 2023-08-01 10:27:54 +08:00
momomochi
df52ca361b 重製肉鴿 SKIP 與數據回溯截圖 2023-08-01 09:22:27 +08:00
momomochi
35bbd89142 重製資源關卡截圖_第二部分 2023-08-01 09:19:17 +08:00
MistEO
389357d301 chore: Auto Update Game Resources - 2023-07-31 2023-07-31 21:47:44 +00:00
David
aed571b6d2 fix: missing name-component for SSS + tweaked regex 2023-07-31 23:45:28 +02:00
David
ac230a68e9 fix: Dossoles ROI and Stage name fixes + temp OCR rep for long names 2023-07-31 23:27:16 +02:00
momomochi987
d80f14db88 重製資源關卡截圖_第一部分 2023-07-31 21:43:02 +08:00
momomochi987
800b03edbf 重製基建各設施截圖 2023-07-31 21:41:16 +08:00
uye
4e15ae3077 fix: 修正繁中服水月肉鴿 "漩渦" 的關卡辨識問題 (#5731) 2023-07-31 19:39:07 +08:00
uye
7dc204014e feat: 主目录存在 DEBUG.txt 时每次开始任务都重新解析tasks.json (#5736) 2023-07-31 19:33:14 +08:00
uye
1efb690e4f fix: 关闭模拟器权限不够时失败报错
fix #5739
2023-07-31 19:04:36 +08:00
uye
49a8393e6e feat: debug版本/release版本加DEBUG.txt load时重新加载tasks.json 2023-07-31 18:47:54 +08:00
uye
205694959b fix: 连接失败后自动重启模拟器功能失效
fix #5732
2023-07-31 12:45:35 +08:00
uye
0b1bb2f6c7 feat: 主目录存在 DEBUG.txt 时每次开始任务都重新解析tasks.json 2023-07-31 11:32:30 +08:00
momomochi
4eaf0dd5f0 修正 "漩渦" 的辨識問題 2023-07-31 09:23:25 +08:00
DuKong
5ddf590b7c feat: 新增萨米肉鸽4~5层部署策略 2023-07-31 08:06:02 +08:00
David
67538b8c0e Rename SSS_AcahuallanJungle.json to SSS_AcahuallanJungle_WORKING.json 2023-07-30 23:23:07 +02:00
David
27d3922302 Rename SSS_Under-ConstructionDossolesPlate.json to SSS_Dossoles_BROKEN_,waitforfix.json 2023-07-30 23:22:37 +02:00
MistEO
111082f118 chore: Auto Update Game Resources - 2023-07-30 2023-07-30 20:46:29 +00:00
David
129f9a2a5b feat: SSS Implementation for YostarEN 2023-07-30 22:35:29 +02:00
David
f668b5aece duplicate: same as 5f0f2f8610 2023-07-30 17:20:56 +02:00
David
5aad921076 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-30 16:47:05 +02:00
David
10c5f832a1 i18n: 5ec976c919 moved changes to new file to allow future edits 2023-07-30 16:47:00 +02:00
MistEO
a7b7241d32 繁中服肉鴿 (#5717) 2023-07-30 22:23:35 +08:00
MistEO
60604a6934 fix:修复了傀影肉鸽部分关卡的部署逻辑 (#5712) 2023-07-30 22:23:19 +08:00
David
5f0f2f8610 duplicate: same as 1aebcee468 2023-07-30 14:45:09 +02:00
David
1aebcee468 duplicate: repeats in Ocr replace EN tasks.json 2023-07-30 14:44:15 +02:00
Lancarus
1034c980fa fix:修复了傀影肉鸽部分关卡的作战逻辑 2023-07-30 19:50:25 +08:00
Lancarus
77eadc2e25 fix:配合作战逻辑更改了部分傀影肉鸽不期而遇事件的选项 2023-07-30 19:47:45 +08:00
Lancarus
2246bdbc73 fix:修复了傀影肉鸽的商品与顺序
增加了"effect"和“no”字段方便查看效果和prts比对
2023-07-30 19:45:41 +08:00
DuKong
602d08c96c feat: 新增萨米肉鸽4~5层部署策略 2023-07-30 19:41:29 +08:00
Lancarus
1bdd36bbb4 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-30 19:39:41 +08:00
uye
09113ef6ca Implement ADB hard restart. (#5666) 2023-07-30 19:32:44 +08:00
AsterNighT
5d8eb72e74 Fix: Wrap Process.Kill in try/catch 2023-07-30 19:04:35 +08:00
David
e1ea9a6299 chore: SSS available in global, removed from regex 2023-07-30 12:59:36 +02:00
vonnoq
5ea526dcd7 繁中服水月肉鴿過關圖 2023-07-30 18:30:36 +08:00
vonnoq
4611279bfd Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-30 18:28:33 +08:00
David
5ec976c919 i18n: Added EN translation to SSS files 2023-07-30 12:11:34 +02:00
uye
f1fcf1190e typo: fix typo 2023-07-30 17:29:31 +08:00
uye
36aa9bae3c feat: 繁中服支持牛牛抽卡
fix #5652
2023-07-30 17:29:03 +08:00
uye
3dd14b373c fix: 主线导航识别问题 2023-07-30 17:12:08 +08:00
uye
d425389372 feat: 给牛牛抽卡提示增加阴间特效 (#5694) 2023-07-30 15:37:35 +08:00
vonnoq
1c0ce607e9 繁中服肉鴿 2023-07-30 15:31:08 +08:00
uye
845a26ace5 fix: mumu模拟器在游戏未启动时关闭游戏报错,增加关闭游戏日志和判断 2023-07-30 14:36:00 +08:00
Lancarus
993c114e5d fix:修复了傀影肉鸽部分关卡的部署逻辑
删掉了"blacklist_location"里和"deploy_plan"冲突的坐标
2023-07-30 12:20:18 +08:00
MistEO
1292313bb9 Fix:一些文字识别问题与死囚之夜部分高台站位 (#5710) 2023-07-30 10:07:46 +08:00
MistEO
07256ed138 优化傀影肉鸽招募逻辑和棘刺队作战逻辑 (#5707) 2023-07-30 10:07:00 +08:00
cenfusheng
3c6961d74b Fix: 修复归溟幽灵鲨的识别问题 2023-07-30 09:40:30 +08:00
cenfusheng
568dee5a10 Fix: 修复繁中服部分带标点的文字识别内容(TXWY)
万恶的引号
2023-07-30 09:34:30 +08:00
cenfusheng
f2e03ba03a Fix: 优化死囚之夜高台斩味 2023-07-30 09:24:39 +08:00
cenfusheng
c45fb68aad Fix: 修复部分异格干员的文字识别问题(TXWY)
不给异格本体加^是吧(
2023-07-30 09:04:42 +08:00
Lancarus
e52877a2bf 优化傀影肉鸽部分关卡作战逻辑 2023-07-30 05:48:15 +08:00
Lancarus
6e788c8f6f 优化傀影肉鸽选人逻辑 2023-07-30 05:43:59 +08:00
Lancarus
70db734a98 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-30 05:39:41 +08:00
David
19a28e9239 chore: from 88ed4008e4 switched to WordOcr from ImageOcr
I'll leave the WBChapterToWB.png just in case something breaks
2023-07-29 23:23:07 +02:00
David
fddec13161 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-29 22:53:12 +02:00
David
d1d6aab0d2 fix: ulterior changes / fixes from 9f2c7488b3 2023-07-29 22:52:41 +02:00
SherkeyXD
92d7e72abc fix: 修正对其他模块的误操作 2023-07-30 01:20:21 +08:00
SherkeyXD
6618aa7889 fix: 更改阴影效果并优化颜色动画使其连贯 2023-07-30 01:18:09 +08:00
SherkeyXD
ca60dbc1c8 fix: 添加多语言本地化键值对
翻译需要优化
2023-07-30 01:04:18 +08:00
cenfusheng
45e9d341a9 修正繁中服無法正確選擇 "物盡其用分隊" 的問題 (#5701)
修正原修复与 "心勝於物分隊" 的冲突
2023-07-29 21:45:29 +08:00
Lancarus
bc1da1717e 优化傀影肉鸽的选人逻辑 2023-07-29 21:29:07 +08:00
Lancarus
ddd49c8312 优化傀影肉鸽部分关卡部署策略 2023-07-29 21:23:40 +08:00
HyunYeon
2d0d6db187 修正物盡其用分隊無法正確選擇的問題 2023-07-29 19:33:13 +08:00
MistEO
ad51d94e29 補充繁中服截圖、水月肉鴿新分隊名 & 嘗試修復一些問題 (#5691) 2023-07-29 15:00:47 +08:00
MistEO
d03b8df79f TW水月肉鴿圖檔 (#5684) 2023-07-29 15:00:19 +08:00
MistEO
f92d28abd8 重製_tw服水月肉鴿 Mizuki@Roguelike@GetDropRecruit 圖像清晰化 (#5678) 2023-07-29 14:59:56 +08:00
momomochi987
22c5a05b02 新增水月肉鴿委託任務已完成截圖 2023-07-29 14:55:17 +08:00
AsterNighT
b1239bb81d chore: Merge from dev 2023-07-29 13:03:10 +08:00
AsterNighT
9c66e103ad Fix: Localizations for other languages and fix a bug that crashes maa in jp 2023-07-29 12:57:02 +08:00
momomochi987
20edddc5c1 更新一些水月肉鴿截圖 2023-07-29 11:25:09 +08:00
David
4a695d687d fix: Auto Update Wrong order, rerun before limited 2023-07-28 23:07:57 +02:00
MistEO
c4d0486e3e chore: Auto Update Game Resources - 2023-07-28 2023-07-28 21:06:52 +00:00
David
88ed4008e4 feat: WB event navigation for EN 2023-07-28 22:51:21 +02:00
SherkeyXD
daeb6b8dfe feat: 这个劲大.gif 2023-07-29 02:42:50 +08:00
SherkeyXD
d552f4f568 feat: 牛牛抽卡提示添加彩虹特效 2023-07-29 02:42:39 +08:00
momomochi987
050c2ed012 增加水月肉鴿三個新分隊名稱 2023-07-29 01:47:22 +08:00
momomochi987
10cb6190b8 嘗試修復令的召喚物與鴻雪的打字機部屬問題 2023-07-28 22:38:37 +08:00
momomochi987
b13fa984ae 補充圖片 2023-07-28 22:33:41 +08:00
momomochi987
89610a9140 更新資源收集關卡截圖 2023-07-28 21:59:51 +08:00
momomochi987
77240318bf 更新、替換一些圖片 2023-07-28 21:26:06 +08:00
vonnoq
d9a89e0a01 TW 水月 2023-07-28 20:24:31 +08:00
vonnoq
89d51f401b Add files via upload 2023-07-28 19:59:34 +08:00
vonnoq
b2838104f7 TW 水月肉鴿圖檔 2023-07-28 19:35:43 +08:00
vonnoq
132ac9c5a4 TW水月肉鴿圖檔
修正檔名&新增
2023-07-28 18:00:15 +08:00
MistEO
c155c15185 chore: 不知道是个什么东西 2023-07-28 16:57:13 +08:00
MistEO
eac287308b feat: 使用 version summary api 检查更新 2023-07-28 16:56:35 +08:00
MistEO
68f3f46e01 chore: Auto Update Game Resources - 2023-07-28 2023-07-28 07:08:03 +00:00
MistEO
f8b3c228a1 chore: Auto Update Game Resources - 2023-07-28 2023-07-28 06:09:31 +00:00
uye
0703928814 docs: 修复一处因 MarkdownIt 引入导致的404链接 (#5680) 2023-07-28 12:52:55 +08:00
abc1763613206
1c64b3e419 docs: fix a link 2023-07-28 11:09:19 +08:00
MayPure
32717817c5 重製_tw服水月肉鴿 Mizuki@Roguelike@GetDropRecruit 圖像清晰化 2023-07-28 05:36:09 +08:00
MistEO
5db17af0c9 chore: Auto Update Game Resources - 2023-07-27 2023-07-27 20:28:55 +00:00
MistEO
60a78f5ff6 feat: 補充繁中服水月肉鴿截圖 (#5673) 2023-07-28 00:09:24 +08:00
MistEO
8eb94e7c2b feat: 貢獻台服水月三張小截圖 (#5670) 2023-07-28 00:09:12 +08:00
momomochi
6b685d7fe2 補充水月肉鴿截圖 2023-07-27 23:48:32 +08:00
Arcelibs
28c5ff6160 Delete Mizuki@Roguelike@StageEncounter.png 2023-07-27 23:29:13 +08:00
Arcelibs
91c746ce62 Delete Mizuki@Roguelike@StageCambatDps.png 2023-07-27 23:28:50 +08:00
Arcelibs
dd9359bc9f Delete Mizuki@Roguelike@StageEncounterOptionLeave.png 2023-07-27 23:28:17 +08:00
Arcelibs
883e285d22 Delete Mizuki@Roguelike@GetDropCompleted.png 2023-07-27 23:27:54 +08:00
Arcelibs
c3b5b85102 Delete Mizuki@Roguelike@Abandon.png 2023-07-27 23:27:34 +08:00
Arcelibs
b8cb6023e6 3出擊1刷新 2023-07-27 22:05:59 +08:00
Arcelibs
f102a27ec5 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-27 21:57:52 +08:00
Arcelibs
cd7ef88bfa 再更新一些
好像睡(?
2023-07-27 21:57:43 +08:00
Arcelibs
0e984e04de Add files via upload 2023-07-27 21:48:36 +08:00
Yumi0606
c9addf2791 perf: 进一步优化水月肉鸽部分关卡作战逻辑 (#5663)
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-07-27 20:46:48 +08:00
MistEO
5f5e1f296a chore: 界面选项改为 mumu 6 2023-07-27 20:07:46 +08:00
AsterNighT
8961a42945 Fix: Move logs back to TaskQueueViewModel.cs 2023-07-27 20:03:20 +08:00
uye
0a58b23d76 fix: 本地化文件错误/localization file error
fix #5671
2023-07-27 19:32:01 +08:00
Arcelibs
9771128fab Add files via upload
又補充2張
2023-07-27 18:39:50 +08:00
Arcelibs
8ea7df73f6 繁中服截圖
再來四張 下班了
2023-07-27 18:35:55 +08:00
Arcelibs
0c88105a6f 貢獻台服水月三張小截圖
太菜了第一關就躺了
2023-07-27 18:21:22 +08:00
AsterNighT
03c3614b16 Fix: Remove redundant logs in TaskQueueViewModel.cs 2023-07-27 17:11:48 +08:00
AsterNighT
a56c156299 Feat: Implement ADB hard restart. 2023-07-27 16:47:43 +08:00
MistEO
a6a741ce10 docs: MaaFramework! 2023-07-27 14:34:15 +08:00
MistEO
fe1f59997c docs: 添加关联项目 MaaFramework 2023-07-27 14:32:30 +08:00
MistEO
cd886320d0 chore: Auto Update Game Resources - 2023-07-27 2023-07-27 05:48:17 +00:00
MistEO
4f01f3a7ca feat: 选择刷源石锭策略时强制启用投资选项 (#5625) 2023-07-26 10:03:01 +08:00
MistEO
3ea44dd134 JP : add Operators 登臨意 (#5636) 2023-07-26 10:02:52 +08:00
Sherkey
d6124fd37c fix: 优化肉鸽招募逻辑 (#5621)
+ 不知道为什么波登可被标记为关键干员,导致出现 #5379 #4675 提到的问题
+ MAA 现在还不会用罗比菈塔的召唤物,于是先 ban 了
+ 根据 #5607 的建议,焰苇打法优先抓泡普卡
2023-07-26 01:58:07 +08:00
AnnAngela
4db54a10d4 ci: macos-runtime-universal.zip 生成过程自适应版本号 2023-07-25 16:42:17 +08:00
AnnAngela
63d711e1a9 ci: 改进 macos-runtime-universal.zip 生成 2023-07-25 08:08:00 +00:00
_ChingC
364f04517a ci: 添加macos-runtime的resource文件夹和dylib的symlink 2023-07-25 14:20:24 +08:00
Wallsman
bcf559de9b JP : add Operators 登臨意
OCR be OK ? 
リン / リィン / リー
2023-07-25 15:17:34 +09:00
MistEO
8d39f95919 fix: gui.log 在自重启后有几率无法正常写入 (#5624) 2023-07-25 02:15:22 +08:00
SherkeyXD
b3967331b2 feat: 选择刷源石锭策略时强制启用投资选项 2023-07-24 16:19:16 +08:00
TiSpH
f405f6f22c fix: gui.log 在自重启后有几率无法正常写入 2023-07-24 01:27:07 -05:00
Alisa
5a60cb1e89 i18n: Translations update from MAA Weblate (#5620)
Translations update from [MAA Weblate](https://weblate.maa-org.net) for
[MaaAssistantArknights/MAA WPF
Gui](https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/).



Current translation status:

![Weblate translation
status](https://weblate.maa-org.net/widgets/maa-assistant-arknights/-/maa-wpf-gui/horizontal-auto.svg)
2023-07-24 12:58:54 +08:00
Weblate
449d7ccce8 Translated using Weblate (Chinese (Traditional))
Currently translated at 99.0% (530 of 535 strings)

Translated using Weblate (Korean)

Currently translated at 99.0% (530 of 535 strings)

Translated using Weblate (Japanese)

Currently translated at 99.0% (530 of 535 strings)

Translated using Weblate (English (United States))

Currently translated at 99.0% (530 of 535 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (535 of 535 strings)

Co-authored-by: Alisa <alisa@alisaqaq.moe>
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
2023-07-24 11:24:56 +08:00
David
7d266e8c4e Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-23 23:18:39 +02:00
David
ba7573635a fix: Manual stage navigation for EN (fix #4874)
I have no clue why having the StartButton1 in the two files
(official and YostarEN) does not work.
I've tried everything from Ascii, fullMatch, copying the entire task,
but nothing worked.
This was the only solution I found.
Also inverting "Start" with "开始行动"
won't make it work in one of the two servers.
I've tested in both and it seems to work properly.
2023-07-23 23:18:35 +02:00
David
160305728c chore: better StartButton1.png
Without sanity logo and with higher clarity
2023-07-23 22:14:13 +02:00
MistEO
09ae8fb76c Release v4.20.0 (#5605) 2023-07-23 16:04:31 +08:00
github-actions[bot]
30128df17d docs: Auto Update Changelogs of v4.20.0 (#5606)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-07-23 16:02:10 +08:00
AnnAngela
dc6f1e33f2 ci: 修复路径错误 2023-07-23 15:18:24 +08:00
David
574d7380cf fix: OperBox not retrieving Oper Class bar in EN 2023-07-22 22:50:30 +02:00
lhhxxxxx
ed6000a17b perf: 优化了互斥规划问题的 dlx 算法实现在一定情况下的速度 2023-07-23 04:36:56 +08:00
MistEO
f27a203690 chore: 更新deps下载脚本,使用固定版本的deps 2023-07-23 02:40:57 +08:00
MistEO
bd728000fa Release v4.20.0-rc.1 (#5581) 2023-07-22 21:32:59 +08:00
github-actions[bot]
11c1d3de48 docs: Auto Update Changelogs of v4.20.0-rc.1 (#5589)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-07-22 21:32:48 +08:00
zewoosJ
be70cfb07d docs: add tutorial docs for kr (#5590)
Co-authored-by: Clock <snoo91919@gmail.com>
2023-07-22 21:26:51 +08:00
AnnAngela
6677fe7969 ci: 打包 macos dylib 2023-07-22 08:37:35 +00:00
Yumi0606
af6f08c396 优化水月部分地图部署逻辑 (#5576)
互助 饥渴 铳与秩序 射手部队 征兆 漩涡 溟痕乐园 狩猎场
2023-07-22 02:24:38 +08:00
MistEO
1264862024 fix: 0时的定时任务无法提前重启 (#5571) 2023-07-21 22:23:29 +08:00
MistEO
1f1924a9e7 Update tasks.json (#5580) 2023-07-21 15:29:12 +08:00
Arcelibs
3eeea3f0ae Update tasks.json
台版 凱爾希 42 銀灰 辨識修正
抄作業時看LOG發現的
2023-07-21 14:14:25 +08:00
Sherkey
ef1b170530 修改第一层提丰放置顺序以及站位 (#5567)
1、将第一层除兽群外所有关卡的提丰首下
2、修改”死囚之夜“提丰位置为[ 7, 4 ]
3、修改”度假村冤魂”提丰位置为[ 1, 2 ]
4、修改“苔手”提丰位置为[ 2, 2 ]
2023-07-21 11:14:35 +08:00
TiSpH
cb1de611c4 chore: 调整窗口标题 2023-07-20 20:54:00 -05:00
樹冠
90c229a150 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-20 20:47:54 -05:00
uye
fc91de1e6b feat: 全局配置不存在时会优先使用当前配置的字段,并赋值给全局配置 2023-07-21 08:54:39 +08:00
David
ffbdef1637 feat: added missing strings form missing_translate-YostarEN 2023-07-20 23:00:17 +02:00
TiSpH
069c1e9dbb fix: 0时的定时任务无法提前重启 2023-07-20 14:03:45 -05:00
MistEO
6125f5d912 chore: Auto Update Game Resources - 2023-07-20 2023-07-20 17:08:01 +00:00
David
6436df1860 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-20 19:00:29 +02:00
David
9ec20fda64 feat: FC event stages implementation for KR 2023-07-20 19:00:24 +02:00
David
446cbd3fda feat: FC event stages implementation for JP 2023-07-20 18:59:15 +02:00
David
0a58bc16dd feat: FC event stages implementation for EN 2023-07-20 18:58:16 +02:00
MistEO
4441c32b16 fix: 修复初次使用多出来一个Global配置的问题 2023-07-20 23:35:54 +08:00
David
9171bee9e6 docs: added new ignored Sami IS4 images 2023-07-20 17:33:36 +02:00
David
1c6ae6e3e9 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-20 17:09:25 +02:00
David
9f2c7488b3 fix: Workaround for EN infrastracture oper regex (#5549) 2023-07-20 17:08:58 +02:00
uye
f7a10e6b5f feat: 未配置全局变量时也进行储存 2023-07-20 23:06:04 +08:00
uye
bef4366bf3 fix: 修复定时器配置从未选择时的逻辑错误 2023-07-20 22:41:20 +08:00
uye
3a15aa386c fix: 定时器保存问题
fix #5524
2023-07-20 22:16:06 +08:00
MistEO
72c58536c6 chore: Auto Update Game Resources - 2023-07-20 2023-07-20 12:08:53 +00:00
MistEO
88740dc1bb Improved operator awareness in infrastructure (#5564) 2023-07-20 19:55:40 +08:00
MistEO
83a8bf29e1 fix: 修复对ranges支持检测的判断条件 (#5548) 2023-07-20 19:55:10 +08:00
zewoosJ
c04720c6ab 개발 뉴비 영업용 2023-07-20 20:26:25 +09:00
uye
00a41456ea fix: 修复输入非法时间时,输入框会重置但却存储错误数据的问题 2023-07-20 18:33:27 +08:00
salenth
5091f0b3c3 修改第一层提丰放置顺序以及站位
1、将第一层除兽群外所有关卡的提丰首下
2、修改”死囚之夜“提丰位置为[ 7, 4 ]
3、修改”度假村冤魂”提丰位置为[ 1, 2 ]
4、修改“苔手”提丰位置为[ 2, 2 ]
2023-07-20 18:30:49 +08:00
zewoosJ
222e796cc6 Improved operator awareness in infrastructure 2023-07-20 16:28:11 +09:00
MistEO
992a3bed58 Release v4.20.0-beta.3 (#5551) 2023-07-20 11:01:39 +08:00
MistEO
f302cfba09 docs: Update CHANGELOG.md 2023-07-20 11:01:17 +08:00
HauKuen
d57a408298 新增萨米肉鸽公司纠葛和自然之怒 (#5553)
1.修改了部分代码的缩进,~~莫非上一位用记事本写的怎么是制表符缩进~~

![18a97d0adea824dc9172549e7d7b9904](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/75826243/8310e489-bd02-4a66-841b-e957c5980e25)

2.新增了两个关卡,肉鸽没法卡轴自然之怒最后一波六虎将可能压力有点大
2023-07-20 11:00:44 +08:00
MistEO
ffc7b8b0b7 docs: CHANGELOG 2023-07-20 10:00:55 +08:00
Hao Guan
2a07a4848a fix: macOS 修复萨米肉鸽集成参数 2023-07-20 04:56:06 +10:00
Hao Guan
a0e977ffe4 fix: 修复对ranges支持检测的判断条件 2023-07-20 04:52:15 +10:00
DavidWang19
ef909a0e2f 根据MAA作业5群意见优化了死囚之夜、度假村冤魂、待宰的兽群、苔手的提丰放置方法 (#5546)
如图所示:
<img width="573" alt="Snipaste_2023-07-20_00-37-36"
src="https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/80f4bca2-7df4-41c5-b58e-57d2900682fb">

![图片1](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/207347c1-908f-47fa-9f41-4e9ac981bab6)

![图片2](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/0493aa62-8563-42a1-84bf-38d46d78410f)

![图片3](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/62516ec2-4fa7-498e-afde-bf2c4f410db0)

![图片4](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/87982268-9ab3-418f-9b2e-c60a5db94813)

![图片5](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/93087330/ec2fbff5-7785-447d-a00b-41f95e3d9c81)
希望有帮助,辛苦!
2023-07-19 18:24:00 +01:00
vic233333
6573ba051f Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-20 00:33:08 +08:00
vic233333
f017fedfe4 根据MAA作业5群意见优化了死囚之夜、度假村冤魂、待宰的兽群、苔手的提丰放置方法 2023-07-20 00:26:06 +08:00
MistEO
03288fad9d Release v4.20.0-beta.2 (#5541) 2023-07-19 23:01:48 +08:00
MistEO
964b8c4ff8 docs: update changelog 2023-07-19 22:24:57 +08:00
MistEO
90cf38b490 fix: 繁中服干员名识别错误 (#5543) 2023-07-19 22:23:05 +08:00
github-actions[bot]
0bdad521db docs: Auto Update Changelogs of v4.20.0-beta.2 (#5542)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-07-19 22:22:40 +08:00
Arcelibs
f3fe5552ee Update tasks.json
支援煌跟令
2023-07-19 22:16:23 +08:00
APHu19
89dc501958 perf: 增加萨米肉鸽 焰苇,修改增加一些地图 (#5534) 2023-07-19 20:57:48 +08:00
Hao Guan
abc00d131e chore: 添加一键编译macOS Core的脚本 2023-07-19 22:40:23 +10:00
_ChingC
12317de2cd fix: delete wrong submodule 2023-07-19 16:59:55 +08:00
_ChingC
850fcaef40 pref: 在用户有代理的情况下,提升国外镜像的优先级 (s3限速上行50Mbps) 2023-07-19 16:53:43 +08:00
uye
8f8a26af33 fix: 定时功能设置无法更新
fix #5524
2023-07-19 16:19:57 +08:00
uye
73ad014681 fix: 强制定时启动无法保存; 配置名称过长显示问题 (#5532) 2023-07-19 16:07:42 +08:00
TiSpH
9b2a334f2a fix: 强制定时启动无法保存; 配置名称过长显示问题 2023-07-19 00:48:56 -05:00
MistEO
cb1147aa59 AsstConf.h 对 clang-tidy 不友好的问题 (#5510)
See
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/5509
2023-07-19 09:33:42 +08:00
MistEO
1e77c1ca96 ci: 规范化step name (#5517)
强迫症发作.jpg
2023-07-19 09:33:20 +08:00
SherkeyXD
7b754942bd ci: 规范化step name 2023-07-19 00:37:52 +08:00
DavidWang19
52ef4c57c8 优化萨米肉鸽部分关卡战斗逻辑 (#5516)
修改了一些关卡的摆放,主要优化了**饥渴祭坛**和**狡兽九窟**这两个漏成筛子的图,今天没时间测试了不知道效果如何(~~我手写的应该比牛牛自由发挥好吧~~)
2023-07-18 17:36:57 +01:00
HauKuen
3751205230 Merge branch 'dev' of https://github.com/HauKuen/MaaAssistantArknights into dev 2023-07-19 00:21:22 +08:00
HauKuen
47225838d6 再改一下 2023-07-19 00:20:54 +08:00
HauKuen
e57bbc02b8 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-19 00:08:22 +08:00
Sherkey
f246c184b1 ci: 删除export后面多余的空格 (#5515)
修复 release-ota 卡在构建文档的问题
2023-07-19 00:04:49 +08:00
HauKuen
27e5637879 优化萨米肉鸽部分关卡战斗逻辑 2023-07-19 00:03:30 +08:00
HauKuen
ec8d40ed0e typo:术士 -> 术师 2023-07-19 00:02:52 +08:00
SherkeyXD
e77a6866c7 ci: 删除export后面多余的空格 2023-07-18 23:49:56 +08:00
HauKuen
0e1c5fcd82 typo:rigit -> right 2023-07-18 23:15:48 +08:00
Infko
3acb002ad4 fix# clang-tidy compatibility 2023-07-18 15:11:20 +00:00
uye
ae4ac52670 chore: 自动检测更新的随机延迟改为一小时 2023-07-18 22:00:38 +08:00
MistEO
5f7bad3e15 Release v4.20.0-beta.1 (#5505) 2023-07-18 21:55:43 +08:00
github-actions[bot]
284cdb887b docs: Auto Update Changelogs of v4.20.0-beta.1 (#5506)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-07-18 20:40:03 +08:00
MistEO
e745f03ad5 chore: Auto Update Game Resources - 2023-07-18 2023-07-18 09:07:45 +00:00
DavidWang19
af5fff1201 修改萨米肉鸽关卡低空机动摆放 (#5498)
只要弧光突击队处于攻击状态降低移速就不会起飞,自己就会走进黑洞摔死。所以我优先把奶位放在了(4,3)来吃攻击,原json这个位置几乎吃不到奶然后白给,非常容易把下方的怪放跑。

顺便把(3, 2)的朝向改了一下吃吹风机的攻速。
2023-07-18 09:52:38 +01:00
DavidWang19
45a0671874 feat: 适配了抗干扰指数为6时的节点进入 (#5500) 2023-07-18 09:51:36 +01:00
DavidWang19
2ac1df4b69 feat: 适配了抗干扰指数为6时的节点进入 2023-07-18 09:50:19 +01:00
MistEO
e112f3d5e7 chore: Auto Update Game Resources - 2023-07-18 2023-07-18 08:31:14 +00:00
DavidWang19
a080169617 fix: 修复不期而遇节点部分选项无法选中的问题 2023-07-18 09:04:56 +01:00
HauKuen
b0b26e5d61 修改萨米肉鸽关卡低空机动摆放 2023-07-18 15:29:26 +08:00
DavidWang19
6a91010537 fix: 修复了肉鸽掉线重连后死循环的问题 (#5494) 2023-07-18 05:13:09 +01:00
DavidWang19
d23f5eab8e fix: 修复了肉鸽掉线重连后死循环的问题 2023-07-18 05:10:53 +01:00
DavidWang19
5f5145d8a7 修改萨米肉鸽关卡“饥渴祭坛”摆放 (#5486)
禁止部署干员到蓝门左下方的三个格子
(因为可能会出现以下情况)
![屏幕截图 2023-07-17
225958](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/92996760/6d506ae3-dbce-4787-bf60-32ddc5933bf0)
2023-07-17 16:04:32 +01:00
yc.exe
d771702297 修改萨米肉鸽关卡“饥渴祭坛”摆放
禁止部署干员到蓝门左下方的三个格子
2023-07-17 23:01:29 +08:00
David
9866e72dac fix: raised threshold for StageAnnihilation.png (#5234) 2023-07-17 16:16:45 +02:00
David
95527c7802 fix: Added correct StageAnnihilation.png after update 2023-07-17 16:15:12 +02:00
mathlover
6e00f57a40 fix: 絮雨在肉鸽中想使用3技能的bug (#5480)
絮雨为5星干员,只拥有2个技能,不存在第3技能
2023-07-17 19:38:42 +08:00
DavidWang19
de153887a9 feat: 新增抗干扰指数为0时的运行逻辑 2023-07-17 11:40:50 +01:00
DavidWang19
737e66f012 feat: 修复在先行一步节点卡住的问题 2023-07-17 08:11:26 +01:00
MistEO
8395887245 chore: 更新裁图小工具 2023-07-17 15:01:36 +08:00
DavidWang19
a810467fe4 feat: 修复萨米肉鸽部分问题,重构不期而遇插件识别部分 (#5471) 2023-07-17 05:55:52 +01:00
DavidWang19
5e57c21cdb feat: 修复萨米肉鸽部分问题,重构不期而遇插件识别部分 2023-07-17 05:53:51 +01:00
DavidWang19
d56a562e6d 优化萨米肉鸽死囚之夜战斗逻辑 (#5466)
![2c819255f8eb1332cd6e7cba2ae73483](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/75826243/ef64320f-b16f-41c5-96c8-c79b92de95e6)


现在的打法是百嘉朝左,打不到开局的几个小怪,并且医疗和狙击放置位置是如上图所示的(5,3)朝下,相当于浪费掉了医疗干员,突袭就很容易死并且开局几个小怪会把石头打穿。所以我改成了百嘉朝右,医狙(6,4)朝左,个人认为(6,4)的覆盖范围应该是完全优于(5,3)的。
tips:实测15难度普通死囚之夜百嘉这个位置朝右就能单刷(~~不过要卡轴~~


![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/75826243/7f767524-84d7-4ea2-9c40-956eb0a42132)
2023-07-17 05:25:19 +01:00
HauKuen
dae50f507f 优化萨米肉鸽死囚之夜战斗逻辑 2023-07-17 10:57:33 +08:00
DavidWang19
c4e200a5e0 Missing .png for YostarEN and modified tools/ignore_list_of_templates.txt (lack of Chinese characters) (#5458)
I'm sorry for the first two merge branches. I honestly have no idea what
GitHub is doing at this point. I just wanted to sync my fork, sometimes
it does these dumb things.
Anyway, title is pretty self explanatory.
2023-07-16 22:39:20 +01:00
David
16b1e5b53c Lowered score for Shard in base detection YostarEN 2023-07-16 22:27:32 +02:00
David
9eb06ef622 Images without Chinese characters added to file 2023-07-16 22:01:59 +02:00
David
036db735de Added missing .png to YostarEN 2023-07-16 21:59:52 +02:00
David
ef876c5001 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-16 21:26:38 +02:00
DavidWang19
f1a9f63119 feat: 提高树篱之途节点的识别阈值 2023-07-16 20:20:13 +01:00
DavidWang19
29cb707172 feat: 修复萨米肉鸽部分bug 2023-07-16 17:27:49 +01:00
Sherkey
e780a63493 尝试修复萨米肉鸽卡杂货铺的问题 (#5450)
之前的图片和藏品的图标位置有部分重叠了, 可能是导致识别不出来的原因

在1280*720的MUMU12模拟器上测试能过杂货铺, 
可能还是有部分两个选项的关卡识别不了, 但调低了阈值之后就一直没刷出来了
北地巫师竞技这个选项特别长的可能也不行
2023-07-16 22:00:15 +08:00
SilverFox
0ef1cdfa06 尝试修复萨米肉鸽卡杂货铺的问题 2023-07-16 20:15:11 +08:00
MistEO
765a5eb4b2 合并萨米肉鸽中相同关卡的自动战斗逻辑 (#5444) 2023-07-16 20:12:00 +08:00
SherkeyXD
f3e5c03bba fix: 修正被误改为中文的role_order与role 2023-07-16 18:26:02 +08:00
SherkeyXD
d76c56f536 style: 更改copilot.json的缩进逻辑使其更可读 2023-07-16 16:48:40 +08:00
SherkeyXD
317cc0c207 fix: 合并萨米肉鸽中相同关卡的自动战斗逻辑 2023-07-16 16:45:44 +08:00
MistEO
23b23ef17b 增加萨米肉鸽战斗关卡作业 (#5433) 2023-07-16 15:39:33 +08:00
uye
af2670ca5e chore: fix typo in AsstCaller.h (#5435) 2023-07-16 13:55:55 +08:00
LingXii
b637f7b2b8 feat: Sami rogue recruitment and copilot (#5430) 2023-07-16 13:54:04 +08:00
yc.exe
d92e6992e3 再次优化 2023-07-16 12:44:45 +08:00
Ikko Eltociear Ashimine
451389e110 refactor: fix typo in AsstCaller.h
Aysnc -> Async
2023-07-16 13:10:15 +09:00
yc.exe
6747f98dd1 增加萨米肉鸽战斗关卡作业
目前一共写了前15关(不含第三层boos关卡)
2023-07-16 11:55:15 +08:00
yc.exe
326e477812 增加萨米肉鸽战斗关卡作业
目前一共写了前15关(不含第三层boos关卡)
2023-07-16 11:43:31 +08:00
uye
19e2061b8a fix: 添加定时器缺少的判断 2023-07-16 11:29:21 +08:00
MistEO
29936c3cc0 fix: Visiting only 1 Friend Clue Exchange in YostarEN (#5424) 2023-07-16 03:48:31 +08:00
David
78e4722b22 Changed to EN only 2023-07-15 21:46:38 +02:00
MistEO
cbb6e2c00f fix: 修复Python更新器中重试次数的问题 (#5402) 2023-07-16 03:38:07 +08:00
MistEO
e90f8b15b6 Python api 更新 同时请求多个url下载 (#5390) 2023-07-16 03:37:30 +08:00
David
3438d6517b Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-15 20:50:28 +02:00
uye
2cb4989c57 chore: 删除多余判断 2023-07-16 01:15:41 +08:00
uye
40116ba67e fix: 定时设置不全为全局设置问题 2023-07-16 00:57:04 +08:00
uye
3233774df6 fix: 定时逻辑错误 2023-07-16 00:49:14 +08:00
David
0656242a3f Added templThreshold 0.85 to VisitNextBlack 2023-07-15 18:43:40 +02:00
David
963818db1e aa 2023-07-15 18:42:10 +02:00
David
b4a37ba2f9 fix: Mall - VisitNextBlack templThreshold issue 2023-07-15 18:41:18 +02:00
uye
cdc2624142 fix: 修复定时设置不保存 2023-07-16 00:28:35 +08:00
lhhxxxxx
46b9799c27 扩充不期而遇选项标记 (#5421)
#5416 的跟进

choice_require:

|       key         |      意思        |
| -------------- | ------------ |
| ChaosLevel     | 坍缩等级     |
| LivePoint      | 目标生命     |
| LivePointCap   | 目标生命上限 |
| OriginiumIngot | 源石锭       |
| Relic          | 收藏品       |
| Vision         | 抗干扰指数   |


命名均来自于 Gamedata 或是 Arknights Fandom
2023-07-15 22:38:56 +08:00
SherkeyXD
2a6a7e1932 fix: 消除名称歧义 2023-07-15 20:20:20 +08:00
SherkeyXD
b586293489 feat: 标记更多选项需求 2023-07-15 20:12:52 +08:00
MistEO
76f4ed3df7 chore: Auto Update Game Resources - 2023-07-15 2023-07-15 10:45:57 +00:00
lhhxxxxx
9072b2b6a8 完成对不期而遇选项所需抗干扰指数的标记 (#5416)
同时把新肉鸽的设置放最前面了
2023-07-15 16:29:36 +08:00
SherkeyXD
6c9a7a9527 feat: 标记抗干扰指数要求 2023-07-15 16:15:54 +08:00
SherkeyXD
358e85a5b9 style: 把当前肉鸽主题放最前面 2023-07-15 16:15:24 +08:00
AnnAngela
2ce8ac9ef7 docs: 在文档的导航栏里加上前往官网的链接 2023-07-15 07:18:00 +00:00
lhhxxxxx
f6ff5d7b72 Stage encounter update (#5408)
更新不期而遇选项与默认选项,其中部分选项数量可能发生变化,可能需要更新点击逻辑
2023-07-15 14:54:44 +08:00
Ziqing19
81f7461f5e update: data type 2023-07-14 17:56:48 -07:00
Ziqing19
342809d41f update: stage_encounter.json 2023-07-14 17:52:14 -07:00
DavidWang19
6f73aaef03 chore: 更新当前活动 2023-07-14 15:39:55 +01:00
DavidWang19
d8743528dd feat: 适配萨米肉鸽 (#5393) 2023-07-14 15:24:44 +01:00
DavidWang19
00da3056cd feat: 初步完成对诡异行商商品的标记 (#5401)
promotion/roles 标记完成
2023-07-14 14:41:49 +01:00
Q-ModifiedJ
9ccaf6d6b2 fix: 修复Python更新器中重试次数的问题
原代码中重试次数超过2后失效
修改后,重试次数将在所有备用下载站间均匀分配
2023-07-14 21:37:55 +08:00
DavidWang19
0e8607c8e2 feat: 结束肉鸽初步适配 2023-07-14 14:34:48 +01:00
SherkeyXD
76b8caac21 feat: 初步完成对商品的标记 2023-07-14 21:34:33 +08:00
DavidWang19
480c044525 update tasks.json 2023-07-14 14:23:36 +01:00
DavidWang19
c4156144bb update tasks.json 2023-07-14 14:16:07 +01:00
DavidWang19
d56537aefd update tasks.json 2023-07-14 13:53:13 +01:00
DavidWang19
0b4872baad update tasks.json 2023-07-14 13:51:42 +01:00
DavidWang19
03b64806a8 feat: 初步完成肉鸽适配 2023-07-14 13:46:05 +01:00
DavidWang19
4f524745ae 【UPD】:更新肉鸽3shopping json (#5400)
把 shopping 文件更新了下,但相应权重没有加
2023-07-14 13:22:04 +01:00
DavidWang19
08e8a043fb feat: 更新tasks.json 2023-07-14 13:21:15 +01:00
MistEO
15a5f0f93d feat: 肉鸽选项默认值改为萨米 2023-07-14 19:23:23 +08:00
qihongrui
1220a92b96 【UPD】:更新肉鸽3shopping json 2023-07-14 19:15:38 +08:00
MistEO
189c1d655b feat: 自动关闭“检测到有未下载的语音资源”窗口 (#5396) 2023-07-14 18:52:53 +08:00
DavidWang19
583a9363fd feat: 录入不期而遇配置 2023-07-14 11:27:08 +01:00
DavidWang19
2b4e100f1d feat: 适配萨米肉鸽 2023-07-14 09:29:17 +01:00
希斯亚托莉
dcbcfecc07 修改 __name__ == '__main__' 的任务 2023-07-14 12:19:21 +08:00
ChingCdesu
bf24f2d101 style: 优化HttpClient构建过程 (#5357) 2023-07-14 10:27:02 +08:00
ChingCdesu
3a9fa75b3f style: 删除不必要的代码,优化HttpClient构建过程 2023-07-14 10:24:07 +08:00
希斯亚托莉
2f9f70a0cc 更新建立缓存目录的方式 2023-07-14 09:21:17 +08:00
Hydrogina
bd0cef81ee feat: 自动关闭“检测到有未下载的语音资源”窗口 2023-07-14 09:12:38 +08:00
DavidWang19
3ef5f9f21b feat: 更新了肉鸽GUI 2023-07-13 23:07:10 +01:00
希斯亚托莉
e91bc17882 Merge pull request #1 from HisAtri/HisAtri-commit-1
同时请求多个镜像url
2023-07-13 23:28:46 +08:00
希斯亚托莉
833753a729 同时请求多个镜像url
*不适合有API请求限制的服务器=。=*
2023-07-13 23:28:09 +08:00
希斯亚托莉
b67272d661 多镜像下载请求,避免缓慢下载 2023-07-13 19:42:05 +08:00
MistEO
3e13084e25 chore: Auto Update Game Resources - 2023-07-13 2023-07-13 11:08:21 +00:00
MistEO
943491b9f7 Update operators.md (#5385) 2023-07-13 17:20:01 +08:00
MistEO
30a56fc5a2 chore: Auto Update Game Resources - 2023-07-13 2023-07-13 08:34:27 +00:00
MistEO
e78ac7ab91 chore: Auto Update Game Resources - 2023-07-13 2023-07-13 07:29:58 +00:00
Wallsman
d560cf80a0 Update operators.md
update:この炎が照らす先+Skill Data include
2023-07-13 14:20:48 +09:00
MistEO
917a6c05ba chore: Auto Update Game Resources - 2023-07-13 2023-07-13 01:08:31 +00:00
uye
5014aad480 docs: 修改关卡重连描述 2023-07-13 08:45:42 +08:00
MistEO
a031d42c10 chore: Auto Update Game Resources - 2023-07-12 2023-07-12 20:07:19 +00:00
MistEO
e72da0587d 使用字典推导式 (#5381) 2023-07-12 21:14:08 +08:00
希斯亚托莉
bfaceada9e 使用高效明了的字典推导式 2023-07-12 16:49:55 +08:00
uye
cb9e96e7d2 feat: 定时任务可切换配置 (#5323) 2023-07-12 16:22:18 +08:00
uye
b5dca9cc27 feat: 添加提示 2023-07-12 15:50:01 +08:00
Kangjing "Chaser" Huang
c1ed782e6b fix: 点击技能启动按钮时,验证按钮已消失,防止卡死在子弹时间中 (#5374)
相关issue: #5373


为点击技能启动按钮的任务添加了检查启动按钮已消失的后续任务,这样在技能启动失败,界面仍处于选中干员的状态下时,可以重新尝试点击按钮。这一逻辑与其他类似确认操作已完成的逻辑一致,例如
[OFToOF-Chapter](https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/dev/resource/tasks.json#L1684)

此PR部分修复 #5373 以及其关联 issue,
可以防止该bug的触发将游戏状态卡死在子弹时间状态下,并通过反复尝试点击来让技能释放最终成功。但无法解决错误点击导致干员选择取消,从而跳过copolit设定的手动技能释放的情况。该bug仍需对识别和点击坐标的进一步调试。
2023-07-12 09:49:21 +08:00
MistEO
50dc1364d2 fix: 添加山的干员名字纠错规则 (#5372)
山的名字在肉鸽的技能选择页面有时会被OCR成 `山_` 导致技能选择失败,添加纠错规则后不再出现
2023-07-12 09:48:59 +08:00
uye
ecfa8de4b5 chore: 调整en切换配置翻译 2023-07-11 23:50:50 +08:00
uye
86a223fa6e chore: 增加界面全局配置提示 2023-07-11 23:47:14 +08:00
uye
8bc54d8952 chore: 定时设置改为全局设置 2023-07-11 23:47:13 +08:00
MistEO
ef5937f1e0 feat: 新增c#全局配置读写接口 2023-07-11 22:17:34 +08:00
KangJing Huang (Chaserhkj)
c0b48ea372 fix: 添加山的干员名字纠错规则 2023-07-11 10:08:42 -04:00
MistEO
6c97d5456a fix: add CloseEvent task for Phantom Roguelike (#5358) 2023-07-11 21:51:12 +08:00
MistEO
5c1108e752 适配pythonAPI到最新版 (#5347) 2023-07-11 21:50:48 +08:00
MistEO
abd33efc95 Update asst.py 2023-07-11 21:50:17 +08:00
KangJing Huang (Chaserhkj)
d44ef758f4 fix: add CloseEvent task for Phantom Roguelike 2023-07-10 08:59:47 -04:00
希斯亚托莉
9147290737 合并重复代码 2023-07-10 17:38:02 +08:00
希斯亚托莉
5bb376b45e 合并重复代码 2023-07-10 12:58:36 +08:00
DoyoDia
69c5e3048b beta后面的数忘了不能舍了() 2023-07-09 21:22:42 +08:00
DoyoDia
355fe410cb 更新pythonAPI使其适配现版本 2023-07-09 21:10:40 +08:00
uye
3213c38c78 fix: 强制启动定时任务未在运行时不关闭方舟 #5346 2023-07-09 19:41:37 +08:00
uye
93ee28d574 chore: 删除无用的函数 2023-07-09 19:35:05 +08:00
uye
8af952353d chore: 更改更新弹窗格式 2023-07-09 19:35:04 +08:00
uye
8adc288110 style: 格式化代码 2023-07-09 19:35:04 +08:00
MistEO
79db7447ff feat: 肉鸽debug日志写入图片前限制文件夹内图片数量 (#5325) 2023-07-08 18:44:35 +08:00
uye
3dbb7a5747 style: 代码清理 2023-07-08 12:16:16 +08:00
uye
87f0e5e96a fix: 尝试修复运行时下载完成更新包后卡死 (#5327) 2023-07-08 12:15:30 +08:00
uye
c67334828b chore: 提取UntilIdleAsync函数 2023-07-08 12:14:27 +08:00
MistEO
725a4e4b41 Release v4.19.3 (#5333) 2023-07-08 00:44:14 +08:00
BladeHiker
9918463f9a feat: save_img接口添加自动清理参数 2023-07-07 23:36:58 +08:00
MistEO
0922026e49 docs: typo 2023-07-07 23:20:30 +08:00
MistEO
57715de777 docs: Update CHANGELOG.md 2023-07-07 23:20:06 +08:00
BladeHiker
dab8b61506 fix: 去掉异步执行,添加可配置项 2023-07-07 22:31:17 +08:00
MistEO
4be3263781 Release v4.19.3-rc.1 (#5321) 2023-07-07 16:21:06 +08:00
github-actions[bot]
ce762ceba8 docs: Auto Update Changelogs of v4.19.3-rc.1 (#5322)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-07-07 16:20:54 +08:00
MistEO
7e007dac69 chore: 更新地图资源 2023-07-07 11:58:02 +08:00
uye
db488569f1 chore: 吃理智药选中时勾选吃源石不改变理智药选中状态 2023-07-07 11:36:14 +08:00
uye
ec2d31ac32 fix: 修复指定材料刷取数量显示状况不及时响应 2023-07-07 11:32:14 +08:00
uye
9a18278c32 feat: 指定材料也支持右键单次执行 2023-07-07 11:29:27 +08:00
uye
a47f46453e feat: 定时任务可选配置,并提前两分钟重启切换 2023-07-07 10:14:13 +08:00
uye
aa5ddc94c4 fix: 尝试修复运行时下载完成更新包后卡死 2023-07-07 09:22:07 +08:00
uye
a009568031 chore: NewConfigurationName为空字符串也自动改为当前时间 2023-07-07 08:48:09 +08:00
MistEO
fee13e1e0b chore: Auto Update Game Resources - 2023-07-07 2023-07-07 00:14:37 +00:00
BladeHiker
da7710ccb1 FEAT: 日志写入图片前检查文件夹内图片数量
解决肉鸽debug写入图片过多的问题
2023-07-07 00:33:09 +08:00
uye
71eaa195af fix: 关卡选择检测未将对象引用设置到对象的实例
fix #5305
2023-07-06 22:30:02 +08:00
uye
b2343cc96a chore: NewConfigurationName为空字符串也自动改为当前时间 2023-07-06 19:08:35 +08:00
枫雨
ed9b48ca29 feat: 添加内置作业下拉框 2023-07-06 17:23:29 +08:00
枫雨
31e0a0c299 feat: 从剪贴板中复制作业路径 2023-07-06 17:23:29 +08:00
MistEO
96eb8b8d0a chore: Auto Update Game Resources - 2023-07-06 2023-07-06 08:08:17 +00:00
MistEO
be01e4b975 chore: Auto Update Game Resources - 2023-07-06 2023-07-06 06:33:21 +00:00
MistEO
94f98d2cf6 chore: Auto Update Game Resources - 2023-07-06 2023-07-06 02:40:07 +00:00
MistEO
ef2a9de13b fix: 回滚访问好友相关阈值
This reverts commit f88c052bdf.
2023-07-06 09:59:10 +08:00
uye
f88c052bdf chore: VisitNextOcr 添加最大执行次数 2023-07-05 15:21:07 +08:00
uye
94218114a6 feat: 对镜像进行延迟测试,并选择最优镜像 (#5311) 2023-07-05 10:14:22 +08:00
Liam Sho
81694e38fb fix: typo 2023-07-04 20:53:18 +08:00
ChingCdesu
6cc67d30f5 feat: 对镜像进行延迟测试,并选择最优镜像 2023-07-04 17:56:37 +08:00
AnnAngela
02e33d3023 feat: 不再需要负载均衡 2023-07-03 09:36:28 +00:00
MistEO
099c1ea75c fix: 修复start后 running 状态不变的问题 2023-07-02 23:43:29 +08:00
uye
2026f54287 fix: 尝试修复手动输入关卡名时偶现主选关卡变为空
fix #5300
2023-07-02 19:53:07 +08:00
AnnAngela
fdd0210b1f ci: 修复docs变动检测逻辑 2023-07-02 07:41:53 +00:00
uye
d7ce84bf02 refactor: 在RunningState类中用状态机替换idle处理 (#5293) 2023-07-02 14:23:38 +08:00
uye
cdb7cbb685 docs: Update CHANGELOG.md 2023-07-02 13:28:26 +08:00
MistEO
b5935e4c04 Release v4.19.3-beta.2 (#5295) 2023-07-02 13:24:51 +08:00
github-actions[bot]
14c8a64fe8 docs: Auto Update Changelogs of v4.19.3-beta.2 (#5296)
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
2023-07-02 13:24:38 +08:00
MistEO
5de1d75fe3 Revert "feat: 添加连接超时"
This reverts commit 8f1ac2023c.

fix: #5294
fix: #5291
2023-07-02 13:19:38 +08:00
uye
31242df558 refactor: 在RunningState类中用状态机替换idle处理 2023-07-02 01:44:56 +08:00
uye
ae2f829954 feat: 添加自动安装更新包
fix #5290
fix #5134
2023-07-01 23:20:39 +08:00
uye
4744af42c5 chore: 错误信息解决方案高亮显示 2023-07-01 22:38:46 +08:00
uye
1222083865 fix: ArkItems在反序列化失败时可能引发 未将对象引用设置到对象的实例 2023-07-01 22:12:22 +08:00
Clock
263e60b3b4 chore: add CrisisPopup.png for YoStarKR 2023-07-01 15:04:56 +09:00
MistEO
4fa8469bda docs: Update CHANGELOG.md 2023-07-01 03:02:28 +08:00
uye
e72f3c8ee6 Release v4.19.3-beta.1 (#5281) 2023-07-01 01:53:33 +08:00
uye
1171eceb28 docs: Update CHANGELOG.md 2023-07-01 01:53:26 +08:00
uye
77bcc9fb77 台服 引航者试炼 (#5283) 2023-07-01 01:49:25 +08:00
uye
30b3ee208f docs: Auto Update Changelogs of v4.19.3-beta.1 (#5282) 2023-07-01 01:49:09 +08:00
uye
32884e62dc fix: 活动结束后活动关卡被误判成常驻关卡 2023-07-01 00:26:07 +08:00
MistEO
3933543e14 chore: Auto Update Game Resources - 2023-06-29 2023-06-29 20:07:08 +00:00
vonnoq
f850122e10 台服 肉鴿助戰 2023-06-30 02:48:40 +08:00
vonnoq
dfe7005fbb 台服 開始模擬 2023-06-30 02:34:48 +08:00
vonnoq
f09fab4c1e 台服 引航者试炼 2023-06-30 01:24:45 +08:00
vonnoq
e7efc37d1d 台服 引航者试炼 2023-06-30 01:24:13 +08:00
MistEO
3d391ba5db docs: Auto Generate Changelog of Release v4.19.3-beta.1 2023-06-29 16:08:04 +00:00
MistEO
340bdcdf33 Merge branch 'master' into dev 2023-06-30 00:07:10 +08:00
uye
61da32c627 feat: 定时任务强制启动 (#5280) 2023-06-29 23:51:11 +08:00
uye
d446c9250e chore: 强制启动时重置刷理智不保存的参数 2023-06-29 23:42:00 +08:00
MistEO
805688f06f fix: 修复多次调用AsstStart的问题 2023-06-29 23:22:23 +08:00
MistEO
0a0bbb5d97 fix: 修复running不准确的问题 2023-06-29 23:17:14 +08:00
MistEO
0b4c57abe8 Revert "fix: 修复 stop 停止时机"
This reverts commit ef2b60dd43.
2023-06-29 23:15:26 +08:00
MistEO
ef2b60dd43 fix: 修复 stop 停止时机 2023-06-29 22:45:39 +08:00
MistEO
891ee3fa23 fix: 修复强制执行 2023-06-29 22:42:41 +08:00
uye
96ea8fcf03 feat: 添加强制启动定时任务 2023-06-29 20:42:14 +08:00
uye
18b63b5798 chore: "" -> 「」 2023-06-29 18:18:57 +08:00
uye
40d6357b22 chore: 右键选中改为生效一次,改变吃源石勾选状态显示 2023-06-29 17:00:43 +08:00
MistEO
0453f31709 fix: 将 OCR replace 改为有序 2023-06-29 10:11:26 +08:00
uye
7266dd6f67 fix: 未设置时剩余理智勾选状态错误显示 2023-06-28 13:12:02 +08:00
uye
ec6dd7167f fix: 通过窗口关闭模拟器的日志错误
fix #5254
2023-06-27 13:24:37 +08:00
MistEO
8d745ea2d6 台服 基建識別 (#5256) 2023-06-27 09:47:43 +08:00
Horror Proton
ee8204c51a fix: workaround for destruction order issue
which creates empty files with random name on Linux

fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/5255
2023-06-26 23:49:32 +08:00
vonnoq
52b53baeea 台服 基建識別 2023-06-26 21:01:17 +08:00
MistEO
cae4070997 chore: Auto Update Game Resources - 2023-06-26 2023-06-26 07:07:14 +00:00
MistEO
18e48b2987 chore: Auto Update Game Resources - 2023-06-26 2023-06-26 06:51:14 +00:00
MistEO
6e1f27bc7c chore: Auto Update Game Resources - 2023-06-26 2023-06-26 06:33:26 +00:00
AnnAngela
9839e9cb04 docs: 实时显示贡献者 2023-06-26 10:30:52 +08:00
AnnAngela
9b1b1c3098 docs: 更新 Linux 编译 workflow 链接 (#5252) 2023-06-26 10:23:55 +08:00
AnnAngela
cdda78a22b docs: 更新 Linux 编译 workflow 链接 (#5252) 2023-06-26 10:20:54 +08:00
uye
ef60643d0c fix: 集合已修改;可能无法执行枚举操作
fix #2984
fix #5048
fix #5076
fix #5222
2023-06-26 01:36:01 +08:00
bakashigure
33e07e5f1e fix: Modified operators regex for Auto Squad and role button (#5249)
From  #5235 
Most of the operators get detected, i'm noticing some issues with Ch'En
the Holungday and Hibiscus the Purifier that don't get detected.
Asst.log doesn't show anything of those two operators. Sometimes both
Ch'en Alter and Hibiscus get detected, sometimes not. ~~I think I'm
noticing a pattern: if they are on the top row of operators they
detected, otherwise they don't.~~
Tried it again and it doesn't pick up Hibiscus alter even if it's on the
top row

In this screen I tried getting the bot to pick Bagpipe first and then
Ch'En alter
![Screenshot_2023 06 25_14 45 13
534](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/56174894/c121c63a-a77d-407d-8aaf-ce5145970186)

14:44:56.994 timestamp for Ch'en undetected (BattleQuickFor

[asst.log](https://github.com/MaaAssistantArknights/MaaAssistantArknights/files/11859750/asst.log)
mation-OperNameFlag.png gets detected correctly)


Question:
in the EN tasks.json with some opeators I can use this syntax
            [
                ".*arl the Radiant Knight",
                "Nearl the Radiant Knight"
            ],
            [
                "Nearl the Radiant Knight",
                "耀骑士临光"
            ],

and it works as expected replacing the Word at every step.
But sometimes it doesn't work like here:
            [
                ".*cter the Unchained",
                "归溟幽灵鲨"
            ],
            [
                "Specter the Unchained",
                "归溟幽灵鲨"
            ],
I have to manually place the chinese characters on the first call of the
operator.
Having the second ocrReplace is now useless because they always pass on
the first one. Is this intended or am I missing something?
2023-06-25 22:57:19 +08:00
David
5516b6b347 ocrReplace not replacing correctly ch'en alter 2023-06-25 15:05:24 +02:00
David
234df5e97e fix: Modified operators regex for Auto Squad and role button 2023-06-25 14:31:26 +02:00
uye
0113de5a09 chore: Update en-us.xaml 2023-06-25 18:07:50 +08:00
uye
57777e8f33 i18n: Translations update from MAA Weblate (#5248) 2023-06-25 18:02:44 +08:00
Weblate
52506ecf3d Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (523 of 523 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (523 of 523 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (523 of 523 strings)

Translated using Weblate (English (United States))

Currently translated at 100.0% (523 of 523 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (523 of 523 strings)

Co-authored-by: uye <2396806385@qq.com>
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
2023-06-25 17:53:24 +08:00
uye
e27c3cb319 feat: 添加 吃理智药 指定次数 右键选中功能,通过右键选中时重启后不保存
fix #4960
fix #5244
2023-06-25 17:15:55 +08:00
uye
3de539bedf i18n: Translations update from MAA Weblate (#5240) 2023-06-24 12:46:52 +08:00
Weblate
66e336d8b2 Translated using Weblate (Japanese)
Currently translated at 100.0% (522 of 522 strings)

Co-authored-by: Yifan <cnjsnjlyf@gmail.com>
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/ja/
Translation: MaaAssistantArknights/MAA WPF Gui
2023-06-24 12:34:15 +08:00
uye
96842f68b0 fix: 修复配置名为null时添加配置报错,留空时以当前时间作为配置名 2023-06-24 12:34:01 +08:00
uye
6d6b7f9b47 typo: useless \n in EN GUI (#5236) 2023-06-24 11:56:24 +08:00
David
21289b87b8 typo: useless \n
In video recognition message there is a \n that is not needed.
2023-06-23 22:56:07 +02:00
uye
84da59b264 feat: 关闭模拟器后重置连接状态,减少无意义重连尝试 2023-06-23 18:31:43 +08:00
uye
8f1ac2023c feat: 添加连接超时 2023-06-22 13:50:08 +08:00
uye
94e8012a4b chore: 在连接前提示替换adb 2023-06-22 13:50:08 +08:00
MistEO
6c4c53301e chore: Auto Update Game Resources - 2023-06-21 2023-06-21 20:06:52 +00:00
MistEO
14d325c57a chore: Auto Update Game Resources - 2023-06-21 2023-06-21 07:09:04 +00:00
MistEO
44a9e4be14 chore: Auto Update Game Resources - 2023-06-21 2023-06-21 06:33:13 +00:00
uye
47eed6f93f 台服 理想城活動導航 (#5212) 2023-06-21 14:16:14 +08:00
vonnoq
187dfa2f02 台服 基建識別 2023-06-21 01:37:33 +08:00
vonnoq
59874866f4 台服 理想城導航 2023-06-20 22:43:41 +08:00
vonnoq
3b0f4e7ea5 台服 理想城活動導航 2023-06-20 22:42:35 +08:00
Wallsman
8f996e039d Merge branch 'MaaAssistantArknights:dev' into dev 2023-06-06 02:08:38 +09:00
Wallsman
04fe5e41e8 Merge branch 'MaaAssistantArknights:dev' into dev 2023-06-05 16:47:53 +09:00
Wallsman
d51bf89747 Merge branch 'MaaAssistantArknights:dev' into dev 2023-06-05 09:12:45 +09:00
Wallsman
69060aa50d Merge branch 'MaaAssistantArknights:dev' into dev 2023-03-30 09:55:52 +09:00
Wallsman
88d97988bd Update operators.md 2023-03-11 07:11:20 +09:00
Wallsman
9c2b330fdb Doc : Update JP 翠玉の夢 and add Operators
Add JP 翠玉の夢 / Chinese Up to the current event
2023-03-11 07:08:26 +09:00
6442 changed files with 1443577 additions and 188158 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

View File

@@ -0,0 +1,13 @@
{
"image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04",
"features": {
"ghcr.io/devcontainers/features/python:1": {},
"ghcr.io/devcontainers/features/sshd:1": {}
},
"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'",
"customizations": {
"vscode": {
"extensions": ["llvm-vs-code-extensions.vscode-clangd", "DavidAnson.vscode-markdownlint"]
}
}
}

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

@@ -11,6 +11,9 @@
# style: clang format
98f949346e93e5a1adaade22cda9841e01b98c0b
290cc30f153a0206bd870a0a58cb6338aa16ea34
db9afdc77e85d5fc462d923fca5318be021656cd
a5daac889a55baf8895918d4964f20dad1938470
9ed30c5658c88edf1ef839771a53c7d599183b8b
# incorrect format of 3rdparty/resource/Arknights-Tile-Pos/levels.json
65d654e54b9d04d1902c9ee9f9fb2679520adafd
@@ -20,6 +23,7 @@
206df466fd5e3d8ef80387049b0c5011fb58cada
c9b5aa638a97397ab8666031ea646904527afc09
559c913fca0dd0966896396e251be13f76ea3e52
# Re-structure again.
4b3b84df8f487be0ac86506c28dbebc4635f1282
91abbb7f175b93a58368a136acf3799666f770d2
@@ -27,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,43 +1,74 @@
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: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
required: true
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: true
- label: 使用的是当前更新版本的最新版,且已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) 和 [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容,并未提及该 Bug 已被修复的情况
required: true
- label: 我已检查了[常见问题](https://maa.plus/docs/zh-cn/manual/faq.html)、[公告](/MaaAssistantArknights/MaaAssistantArknights/issues/7732)、[活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues)、[已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed),确认我的问题未被提及
required: true
- type: textarea
id: describe
attributes:
label: 问题描述
description: 尽可能详细描述你的问题
description: 描述问题时请尽可能详细
validations:
required: true
- type: textarea
id: version
attributes:
label: Version
description: |
请提供 MAA 版本。可在 MAA -> 设置 -> 软件更新中找到。点击图标可复制。
请分别点击 `资源版本` 和 `MAA 版本` 并粘贴,最终应有 5 行版本信息。
placeholder: |
Resource 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 12 或雷电 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
@@ -45,7 +76,6 @@ body:
attributes:
label: 还有别的吗?
description: |
使用的模拟器?操作系统?相关的配置?链接?参考资料?
任何能让我们对你所遇到的问题有更多了解的东西
validations:
required: false

View File

@@ -1,16 +1,20 @@
name: 需求建议(使用中文)
description: 新功能、建议等
labels: ['enhancement']
labels: ["enhancement"]
body:
- type: checkboxes
id: checks
attributes:
label: 在提问之前...
options:
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: true
- label: 我基本确定这是一个新功能/建议,而不是遇到了 bug不确定的话请附上日志
required: true
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: true
- label: 我基本确定这是一个新功能/建议,而不是遇到了 Bug不确定的话请附上日志
required: true
- label: 我使用的是当前更新版本的最新版,且已查看版本发布至今的 [更新内容](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) 和 [Pull Requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls) 中尚未发布的更新内容,确认我的建议未被提及
required: true
- label: 我已检查了 [公告](/MaaAssistantArknights/MaaAssistantArknights/issues/7732)、[活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues)、[已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed),确认我的建议未被提及
required: true
- type: textarea
id: describe
attributes:

View File

@@ -0,0 +1,83 @@
name: 雷电截图增强反馈(使用中文)
description: 有关雷电 9 截图增强功能的集中反馈
labels: ["LD9 API"]
body:
- type: checkboxes
id: checks
attributes:
label: 在提问之前...
options:
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
required: true
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: true
- label: 我已检查了[公告](/MaaAssistantArknights/MaaAssistantArknights/issues/7732)、[活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues)、[已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed),确认我的问题未被提及
required: true
- label: 我正在使用最新的 MAA 公测版本和最新的官版雷电 9 模拟器
required: true
- label: 我已参考文档确定安装路径、实例编号填写正确,并确认在关闭截图增强模式后问题消失
required: true
- 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,84 @@
name: MuMu 截图增强反馈(使用中文)
description: 有关 MuMu 截图增强功能的集中反馈
labels: ["MuMu API"]
body:
- type: checkboxes
id: checks
attributes:
label: 在提问之前...
options:
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
required: true
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: true
- label: 我已检查了[公告](/MaaAssistantArknights/MaaAssistantArknights/issues/7732)、[活跃议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues)、[已关闭议题](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed),确认我的问题未被提及
required: true
- label: 我正在使用最新的 MAA 公测版本和最新的官版或方舟专版 MuMu 模拟器
required: true
- label: 我已参考文档确定安装路径、实例编号、屏幕编号填写正确,并确认在关闭截图增强模式后问题消失
required: true
- 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

@@ -2,53 +2,77 @@ name: Bug Report (in English)
description: >-
Recognition errors, operation abnormalities,
connection errors, etc.
labels: ['bug']
labels: ["bug"]
body:
- type: checkboxes
id: checks
attributes:
label: Before raising the issue...
description: |
Please ensure that you have completed the requirements before checking the box.
Issues with the checkbox checked but not completed will be directly closed.
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 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 both the [Unreleased changes](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) and there is no mention of the bug being fixed.
required: true
- label: I have reviewed the [FAQs](https://maa.plus/docs/en-us/manual/faq.html), [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issue](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issue](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues?q=is%3Aissue%20state%3Aclosed) to ensure that my issue/bug has not been mentioned.
required: true
- type: textarea
id: describe
attributes:
label: Description
description: Describe your problem in as much detail as possible.
description: Please provide a detailed description of your issue.
validations:
required: true
- type: textarea
id: version
attributes:
label: Version
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:
MAA Version:
validations:
required: true
- type: textarea
id: logs
attributes:
label: Log files
label: Log and config 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.**
**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 12 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
label: Screenshots or recordings
description: >-
If available, add screenshots to help explain your problem,
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.
@@ -56,11 +80,11 @@ 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.
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.
The `debug` folder has some automatic screenshots of the error images,
if you have any,
please upload them together.
If the file siz is too large, you may compress it before uploading.
validations:
required: false
@@ -68,11 +92,7 @@ body:
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.
description: |
Anything that will give us more insight into the problem you are having.
validations:
required: false

View File

@@ -1,16 +1,26 @@
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...
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 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 am using the latest version of the current update version and have reviewed both the [Unreleased changes](https://github.com/MaaAssistantArknights/MaaAssistantArknights/commits/dev/) and the [Pull requests](https://github.com/MaaAssistantArknights/MaaAssistantArknights/pulls),
but there is no mention of this feature/suggestion being added.
required: true
- label: |
I have reviewed the [Announcement](/MaaAssistantArknights/MaaAssistantArknights/issues/7732), [Open Issue](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues), [Closed Issue](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:
- constrat
- AnnAngela
groups:
github-actions:
patterns:
- "*"
ignore:
- dependency-name: "Nerixyz/actionsx-prettier"
versions: ["3.0.0"]

File diff suppressed because it is too large Load Diff

16
.github/release_reviewers.yaml vendored Normal file
View File

@@ -0,0 +1,16 @@
# Set to true to add reviewers to pull requests
addReviewers: true
# Set to true to add assignees to pull requests
addAssignees: false
# A list of reviewers to be added to pull requests (GitHub user name)
reviewers:
- AnnAngela
# 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

38
.github/stale_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"

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@v4
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

@@ -3,39 +3,53 @@ name: ci
on:
push:
tags:
- 'v*'
- "v*"
branches-ignore:
- 'master'
- "master"
paths:
- '3rdparty/include/**'
- 'include/**'
- 'src/**'
- 'cmake/**'
- 'CMakeLists.txt'
- 'MAA.sln'
- "3rdparty/include/**"
- "include/**"
- "src/**"
- "cmake/**"
- "CMakeLists.txt"
- "MAA.sln"
- ".github/workflows/ci.yml"
- "!**/*.md"
pull_request:
branches:
- 'dev'
- "dev"
paths:
- '3rdparty/include/**'
- 'include/**'
- 'src/**'
- 'cmake/**'
- 'CMakeLists.txt'
- 'MAA.sln'
- "3rdparty/include/**"
- "include/**"
- "src/**"
- "cmake/**"
- "CMakeLists.txt"
- "MAA.sln"
- "!**/*.md"
workflow_dispatch:
jobs:
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:
- uses: actions/checkout@v3
- name: Checkout code
uses: actions/checkout@v4
with:
path: temp
show-progress: false
- name: Fetch history
if: ${{ !startsWith(github.ref, 'refs/pull/') }}
run: |
@@ -47,13 +61,15 @@ jobs:
git reset --hard origin/$(git branch --show-current) || true
git checkout ${{ github.ref_name }}
- id: set_tag
- name: Set tag
id: set_tag
run: |
${{ startsWith(github.ref, 'refs/pull/') && 'cd temp' || '' }}
echo tag=$(git describe --tags --match "v*" ${{ github.ref }} || git rev-parse --short HEAD) | tee -a $GITHUB_OUTPUT
exit ${PIPESTATUS[0]}
- id: set_pre
- name: Judge pre-release
id: set_pre
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
run: |
if [[ '${{ steps.set_tag.outputs.tag }}' =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
@@ -61,7 +77,9 @@ jobs:
else
echo prerelease=true | tee -a $GITHUB_OUTPUT
fi
- if: ${{ startsWith(github.ref, 'refs/tags/v') }}
- name: Generate changelog
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
run: |
this_tag=${{ steps.set_tag.outputs.tag }}
if [[ '${{ steps.set_pre.outputs.prerelease }}' != 'false' ]]; then
@@ -71,13 +89,22 @@ jobs:
fi
echo >> CHANGELOG.md
echo "**Full Changelog**: [$last_tag -> $this_tag](https://github.com/MaaAssistantArknights/MaaAssistantArknights/compare/${last_tag}...${this_tag})" >> CHANGELOG.md
- uses: actions/upload-artifact@v3
echo >> CHANGELOG.md
echo "[已有 Mirror酱 CDK前往 Mirror酱 高速下载](https://mirrorchyan.com/zh/projects?rid=MAA)" >> CHANGELOG.md
- name: Upload changelog to Github
uses: actions/upload-artifact@v4
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
with:
name: changelog
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:
@@ -91,17 +118,38 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Checkout code
uses: actions/checkout@v4
with:
show-progress: false
- name: Fetch submodules
run: |
git submodule update --init --depth 1 3rdparty/EmulatorExtras
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v3
id: cache-nuget
uses: actions/cache@v4
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ matrix.msbuild_target }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Restore dependencies
if: steps.cache-nuget.outputs.cache-hit != 'true'
run: dotnet restore
- name: Cache MaaDeps
id: cache-maadeps
uses: actions/cache@v4
with:
path: |
./MaaDeps
key: ${{ runner.os }}-${{ matrix.lowercase_target }}-maadeps-${{ hashFiles('./maadeps-download.py') }}
- name: Bootstrap MaaDeps
if: steps.cache-maadeps.outputs.cache-hit != 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
@@ -110,10 +158,33 @@ jobs:
- name: Create fake event file
shell: bash
run: cp -v "$GITHUB_EVENT_PATH" ./event.json
- if: startsWith(github.ref, 'refs/tags/v')
- 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
run: |
$csprojPath = "src/MaaWpfGui/MaaWpfGui.csproj"
$csprojPath = Resolve-Path -Path $csprojPath
$tag = '${{ needs.meta.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)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Build
run: |
$env:GITHUB_WORKFLOW = 'dev-build-win' # pretend this is a dev-build-win workflow
@@ -123,22 +194,41 @@ jobs:
./build.cmd DevBuild
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: |
- name: Cleanup checksum file
run: |
rm -vf ./artifacts/checksum.json
shell: bash
- uses: actions/upload-artifact@v3
- name: Upload MAA to Github
uses: actions/upload-artifact@v4
with:
name: MAA-win-${{ matrix.lowercase_target }}
path: artifacts
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
runs-on: ubuntu-22.04
strategy:
matrix:
arch: [aarch64, x86_64]
permissions:
actions: write
steps:
- uses: actions/checkout@v3
- name: Checkout code
uses: actions/checkout@v4
with:
show-progress: false
- name: Fetch submodules
run: |
git submodule update --init --depth 1 3rdparty/EmulatorExtras
git submodule update --init --depth 1 src/maa-cli
- name: Install cross compile toolchains
if: ${{ matrix.arch != 'x86_64' }}
@@ -146,11 +236,7 @@ jobs:
sudo apt-get update
sudo apt-get install g++-12-aarch64-linux-gnu g++-12-aarch64-linux-gnu
- name: Setup ccache
uses: Chocobo1/setup-ccache-action@v1
with:
remove_stale_cache: false
# Caching not necessary on ubuntu runner
- name: Bootstrap MaaDeps
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -158,12 +244,10 @@ jobs:
python3 maadeps-download.py ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux
- name: Build MAA
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' }}
run: |
mkdir -p build
cmake -B build \
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
-DMAADEPS_TRIPLET='maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux' \
-DINSTALL_THIRD_LIBS=ON \
-DINSTALL_RESOURCE=ON \
@@ -173,109 +257,247 @@ jobs:
mkdir -p install
cmake --install build --prefix install
env:
CC: ${{ matrix.arch == 'x86_64' && 'gcc-12' || 'aarch64-linux-gnu-gcc-12' }}
CXX: ${{ matrix.arch == 'x86_64' && 'g++-12' || 'aarch64-linux-gnu-g++-12' }}
CMAKE_COLOR_DIAGNOSTICS: ON
CLICOLOR_FORCE: 1
CXXFLAGS: | # workaround for gcc bugs
-Wno-error=restrict -Wno-error=array-bounds -Wno-error=stringop-overread -Wno-error=missing-field-initializers
- name: tar files
- name: Setup Cross Compile Toolchains for CLI
uses: ./src/maa-cli/.github/actions/setup
with:
os: ubuntu-latest
target_arch: ${{ matrix.arch }}
- name: Build CLI
run: |
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 git2,vendored-openssl
cp -v target/$CARGO_BUILD_TARGET/release/maa $GITHUB_WORKSPACE/appimage-maa
working-directory: src/maa-cli
- name: Build Appimage
run: |
sudo add-apt-repository universe
sudo apt update
sudo apt install libfuse2
mkdir -pv release
mkdir -pv Maa.AppDir/usr/share/maa
cp -r install/* Maa.AppDir/usr/share/maa/
wget -c https://raw.githubusercontent.com/MaaAssistantArknights/design/main/logo/maa-logo_512x512.png -O Maa.AppDir/maa.png
mkdir -pv Maa.AppDir/usr/share/icons/hicolor/512x512/apps/
cp -v Maa.AppDir/maa.png Maa.AppDir/usr/share/icons/hicolor/512x512/apps/
cp -v appimage-maa Maa.AppDir/usr/share/maa/maa
chmod a+x Maa.AppDir/usr/share/maa/maa
cat > Maa.AppDir/maa.desktop <<EOF
[Desktop Entry]
Type=Application
Name=MaaAssistantArknights
Icon=maa
Exec=AppRun
Terminal=true
Categories=Game;StrategyGame;
Comment=An Arknights assistant
EOF
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"
# appimagetool with embedded runtime does not support cross build, till AppImage/appimagetool 7a10b8
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-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
- name: Tar files
run: |
mkdir -p release
cd install
tar czvf $GITHUB_WORKSPACE/release/MAA-${{ needs.meta.outputs.tag }}-linux-${{ matrix.arch }}.tar.gz .
- uses: actions/upload-artifact@v3
- name: Upload MAA to Github
uses: actions/upload-artifact@v4
with:
name: MAA-linux-${{ matrix.arch }}
path: 'release/*.tar.gz'
path: |
release/*.AppImage
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-14
strategy:
matrix:
arch: [arm64, x86_64]
steps:
- uses: actions/checkout@v3
- name: Checkout code
uses: actions/checkout@v4
with:
show-progress: false
- name: Install Dependencies
run: brew install ninja
run: |
brew install ninja
# Caching not necessary on macOS runner
- name: Bootstrap MaaDeps
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
[[ ${{ matrix.arch }} = "arm64" ]] && triplet="arm64-osx" || triplet="x64-osx"
python3 maadeps-download.py ${triplet}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Configure MaaCore
run: |
cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES='${{ matrix.arch }}' -DMAA_VERSION='${{ needs.meta.outputs.tag }}'
- name: Build MaaCore
run: |
cmake --build build
cmake --install build --prefix install
- uses: actions/upload-artifact@v3
- name: Upload MAA to Github
uses: actions/upload-artifact@v4
with:
name: MAACore-macos-${{ matrix.arch }}
path: 'install/*.dylib'
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-14
steps:
- uses: actions/checkout@v3
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/download-artifact@v3
show-progress: false
- 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
with:
name: MAACore-macos-arm64
path: install-arm64
- uses: actions/download-artifact@v3
- name: Download x64 MAA from Github
uses: actions/download-artifact@v4
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
for LIB_NAME in $(ls install-arm64); do
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
working-directory: build
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
- name: Setup GUI Version
run: |
RELEASE_COUNT=$(git ls-remote --tags origin | grep refs/tags/v | awk 'END{print NR}')
echo 'MARKETING_VERSION = ${{ needs.meta.outputs.tag }}' | tee src/MaaMacGui/Version.xcconfig
echo 'CURRENT_PROJECT_VERSION = '"${RELEASE_COUNT}" | tee -a src/MaaMacGui/Version.xcconfig
- name: Build MAA
working-directory: src/MaaMacGui
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
- name: Export MAA
if: startsWith(github.ref, 'refs/tags/v')
run: |
xcodebuild -exportArchive -archivePath MAA.xcarchive -exportOptionsPlist ExportOptions.plist -exportPath Export
working-directory: src/MaaMacGui
run: xcodebuild -exportArchive -archivePath MAA.xcarchive -exportOptionsPlist ExportOptions.plist -exportPath Export
- name: Create Disk Image
if: startsWith(github.ref, 'refs/tags/v')
working-directory: src/MaaMacGui
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
if: startsWith(github.ref, 'refs/tags/v')
run: |
ditto -c -k --keepParent MAA.app.dSYM MAA.app.dSYM.zip
working-directory: src/MaaMacGui/MAA.xcarchive/dSYMs
run: ditto -c -k --keepParent MAA.app.dSYM MAA.app.dSYM.zip
- name: Place Packages
if: startsWith(github.ref, 'refs/tags/v')
run: |
@@ -285,46 +507,75 @@ jobs:
mkdir -p release
mv src/MaaMacGui/MAA.dmg release/${APP_DMG}
mv src/MaaMacGui/MAA.xcarchive/dSYMs/MAA.app.dSYM.zip release/${APP_SYM}
- name: Notarize Image
if: startsWith(github.ref, 'refs/tags/v')
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 }}
working-directory: release
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: |
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: actions/upload-artifact@v3
dmg="MAA-${{ needs.meta.outputs.tag }}-macos-universal.dmg"
xcrun stapler staple ${dmg}
working-directory: release
- name: Upload MAA to Github
uses: actions/upload-artifact@v4
with:
name: MAA-macos-universal
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:
- uses: actions/download-artifact@v3
- name: Download MAA from Github
uses: actions/download-artifact@v4
with:
path: assets
- run: |
- name: Cleanup files
run: |
mv -vf assets/changelog/* .
rm -rf assets/MAACore-macos-*
cd assets
# find . -type f | xargs mv -fvt .
find . -type f | while read f; do mv -fvt . $f; done
- uses: softprops/action-gh-release@v1
- name: Release to Github
uses: softprops/action-gh-release@v2
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 }}
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}

View File

@@ -2,38 +2,75 @@ 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(github.event.pull_request.title, 'release v'))
# startsWith 表达式不区分大小写
if: github.event.pull_request.draft == false && startsWith(github.event.pull_request.title, 'Release v')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
show-progress: false
- name: Extract Tag Name
- 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
pr_title="docs: Auto Update Changelogs of "$tag_name
echo "pr_title=$pr_title" >> $GITHUB_OUTPUT
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" >> $GITHUB_OUTPUT
echo "newest_tag=$newest_tag" >> $GITHUB_OUTPUT
if [[ $tag_name == *-* ]]; then # 判断新版本是否为 beta 版本
latest=$newest_tag # 若是,则将 latest 参数设置为最新版本
else
latest=$latest_stable_tag # 若否,则设置为上一个 stable 版本
fi
echo "latest=$latest" >> $GITHUB_OUTPUT
cat $GITHUB_OUTPUT
echo '======='
echo 'Target RP: ${{ 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
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git switch dev
python3 tools/ChangelogGenerator/changelog_generator.py --tag "${{ steps.extract_tag.outputs.tag_name }}"
python3 tools/ChangelogGenerator/changelog_generator.py --tag "${{ steps.extract_tag.outputs.tag_name }}" --latest "${{ steps.extract_tag.outputs.latest }}"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Add files to git
run: |
git status
git config user.name "$GITHUB_ACTOR"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
git add .
@@ -42,11 +79,21 @@ 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 }}
base: 'dev'
branch: 'changelog'
body-path: ${{ format('{0}/{1}', runner.temp, 'output' ) }}
base: "dev"
branch: "changelog"
delete-branch: true
reviewers: |
AnnAngela
assignees: |
AnnAngela
- name: Add reviewers to release PR
uses: kentaro-m/auto-assign-action@v2.0.0
with:
configuration-path: ".github/release_reviewers.yaml"

View File

@@ -1,4 +1,5 @@
name: "Issue Checker"
on:
issues:
types: [opened, edited]
@@ -16,9 +17,9 @@ jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: zzyyyl/issue-checker@v1.7
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/issue-checker.yml
not-before: 2022-08-05T00:00:00Z
include-title: 1
- uses: MaaAssistantArknights/issue-checker@v1.14
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/issue-checker.yml
not-before: 2022-08-05T00:00:00Z
include-title: 1

64
.github/workflows/markdown-checker.yml vendored Normal file
View File

@@ -0,0 +1,64 @@
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@v4
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'
--exclude 'files/MAA_Runtime_Fix_Pwsh.ps1$'
-- './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@v4
with:
show-progress: false
persist-credentials: false
- name: Setup python
if: steps.check_push.outputs.is_pr != 'True'
uses: actions/setup-python@v5
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'
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.MAA_RESOURCE_SYNC }}
branch: ${{ github.ref }}

View File

@@ -18,16 +18,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.MAARELEASE_RELEASE }}
- name: Git config
run: |
git config user.name "$GITHUB_ACTOR"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
- name: Extract Tag Name
- name: Extract tag name
id: extract_tag
run: |
if ${{ github.event_name != 'workflow_dispatch' }}; then
@@ -37,7 +39,7 @@ jobs:
echo "tag_name=${{ inputs.tag }}" >> $GITHUB_OUTPUT
fi
- name: Create Release Tag and push
- name: Create release tag and push
run: |
git tag -a "${{ steps.extract_tag.outputs.tag_name }}" -m "${{ steps.extract_tag.outputs.tag_name }}" -f
git push origin "${{ steps.extract_tag.outputs.tag_name }}"

58
.github/workflows/pr-checker.yml vendored Normal file
View File

@@ -0,0 +1,58 @@
name: PR Checker
on:
pull_request_target:
types: [opened, edited, ready_for_review, reopened, synchronize]
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
with:
script: |
const { data: comments } = await github.rest.issues.listComments({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.pull_request.number
});
const previousComment = comments.find(comment => comment.user.login === 'github-actions[bot]' && comment.body.includes('invalid commit(s)'));
if (previousComment) {
await github.rest.issues.deleteComment({
owner: context.repo.owner,
repo: context.repo.repo,
comment_id: previousComment.id
});
}
- name: Check Commits
uses: actions/github-script@v7
with:
script: |
const { data: commits } = await github.rest.pulls.listCommits({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number,
per_page: 100
});
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)`);
if (invalidCommits.length > 0) {
const invalidCommitNames = invalidCommits.map(commit => commit.commit.message);
const invalidCommitInfoList = invalidCommits.map(commit => `- ${commit.commit.message.split("\n")[0]} [\`${commit.sha.substring(0, 7)}\`](${commit.html_url})`).join("\n");
github.rest.issues.createComment({
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, 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,35 +1,36 @@
name: release-nightly-ota
on:
schedule:
- cron: "0 22 * * *" # Runs daily at 22:00 UTC
workflow_dispatch:
inputs:
release_body:
description: 'Release note'
description: "Release note"
type: string
required: false
ref:
description: 'Commit to build (git checkout)'
description: "Commit to build (git checkout)"
type: string
required: false
limit:
description: 'Number of releases to fetch from MaaAssistantArknights'
limit_maa:
description: "Number of releases to fetch from MaaAssistantArknights"
required: true
default: 30
default: "10"
type: number
limit_2:
description: 'Number of releases to fetch from MaaRelease'
limit_mr:
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
msbuild_target: [x64]
fail-fast: false
env:
MAABUILDER_TARGET_PLATFORM: ${{ matrix.msbuild_target }}
@@ -37,67 +38,186 @@ jobs:
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@v3
- uses: actions/checkout@v4
with:
# repository: 'MaaAssistantArknights/MaaAssistantArknights'
submodules: recursive
#ref: ${{ inputs.ref }}
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout ref
run: |
if ("${{ inputs.ref }}" -ne "") {
git checkout --progress --recurse-submodules ${{ inputs.ref || 'dev' }}
}
- run: |
npm install --global --progress semver
fetch-depth: 250
- name: Set tag
- name: Fetch tags
run: |
git fetch --depth=250 --tags
- name: Fetch submodules
run: |
git submodule update --init --depth 1 3rdparty/EmulatorExtras
- 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: Push tag to main repo
id: push_main_tag
- name: Stop if no changes
if: env.cancel_run == 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'
$main_tag_name=$(echo "alpha/${{ steps.set_tag.outputs.tag }}")
git tag $main_tag_name -f
git push --tags origin HEAD:refs/tags/$main_tag_name -f
echo "main_tag_name=$main_tag_name" >> $env:GITHUB_OUTPUT
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 .nuke/temp, ~/.nuget/packages
uses: actions/cache@v3
id: cache-nuget
uses: actions/cache@v4
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
key: ${{ runner.os }}-${{ matrix.msbuild_target }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Restore dependencies
if: steps.cache-nuget.outputs.cache-hit != 'true'
run: dotnet restore
- name: Cache MaaDeps
id: cache-maadeps
uses: actions/cache@v4
with:
path: |
./MaaDeps
key: ${{ runner.os }}-${{ matrix.msbuild_target }}-maadeps-${{ hashFiles('./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.lowercase_target }}-windows
python3 maadeps-download.py ${{ matrix.msbuild_target }}-windows
- 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
@@ -106,24 +226,39 @@ jobs:
./build.cmd DevBuild
env:
Reason: 'Build nightly version'
Reason: "Build nightly version"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v3
- name: Upload MAA to Github
uses: actions/upload-artifact@v4
with:
name: MAA-win-${{ matrix.lowercase_target }}
name: MAA-win-${{ matrix.msbuild_target }}
path: artifacts
- name: Push tag to main repo
id: push_main_tag
run: |
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'
$main_tag_name=$(echo "alpha/${{ steps.set_tag.outputs.tag }}")
git tag $main_tag_name -f
git push --tags origin HEAD:refs/tags/$main_tag_name -f
echo "main_tag_name=$main_tag_name" >> $env:GITHUB_OUTPUT
push-tag:
if: github.repository_owner == 'MaaAssistantArknights'
needs: build-win-nightly
runs-on: ubuntu-latest
steps:
- name: "Fetch MaaRelease"
uses: actions/checkout@v3
- name: Fetch MaaRelease
uses: actions/checkout@v4
with:
repository: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
fetch-depth: 0
token: ${{ secrets.MAARELEASE_RELEASE }}
show-progress: false
- name: Commit and setup tag
run: |
git config user.name 'github-actions[bot]'
@@ -135,30 +270,45 @@ 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:
target: [x64]
runs-on: ubuntu-latest
steps:
- run: echo ${{ needs.build-win-nightly.outputs.tag }}
- uses: actions/checkout@v3
- name: Echo tag version
run: |
echo ${{ needs.build-win-nightly.outputs.tag }}
- name: Checkout code
uses: actions/checkout@v4
with:
path: MaaAssistantArknights
token: ${{ secrets.MAARELEASE_RELEASE }}
- uses: actions/download-artifact@v3
show-progress: false
- name: Download MAA from Github
uses: actions/download-artifact@v4
with:
name: MAA-win-${{ matrix.target }}
path: ${{ format('{0}/{1}', 'build-ota', needs.build-win-nightly.outputs.tag) }}
- name: "Fetch release info"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Fetch release info
run: |
mkdir -pv build-ota && cd build-ota
# Convert inputs to integers
limit_maa=${{ inputs.limit_maa || 10 }}
limit_maa=${limit_maa%.*}
echo "Parsed limit_maa: $limit_maa"
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
limit_mr=${{ inputs.limit_mr || 10 }}
limit_mr=${limit_mr%.*}
echo "Parsed limit_mr: $limit_mr"
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit $limit_maa | tee ./release_maa.txt
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit $limit_mr | tee ./release_mr.txt
echo ${{ needs.build-win-nightly.outputs.tag }} > ./config
cat ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
@@ -170,9 +320,10 @@ jobs:
cat ./config
echo "release_tag=$(head -n 1 ./config)" >> $GITHUB_ENV
- name: "Build OTA"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Build OTA
run: |
cd build-ota
@@ -183,24 +334,10 @@ jobs:
$GITHUB_WORKSPACE/MaaAssistantArknights/tools/OTAPacker/build.sh 'MaaAssistantArknights/MaaAssistantArknights' ./config ${{ matrix.target }} "${{ github.repository_owner }}/MaaRelease"
mv -v ${{ needs.build-win-nightly.outputs.tag }}/*.zip ./MAA-${{ env.release_tag }}-win-${{ matrix.target }}.zip
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"
- name: Upload to MaaRelease
uses: svenstaro/upload-release-action@v2
with:
repo_name: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
@@ -210,10 +347,17 @@ jobs:
tag: ${{ env.release_tag }}
prerelease: true
overwrite: true
body: ${{ steps.make_release_body.outputs.full_release_body }}
body: |
${{ inputs.release_body || '' }}
- name: Deploy the release
${{ 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 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 }}
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}

View File

@@ -2,19 +2,19 @@ name: release-ota
on:
release:
types:
types:
- published
workflow_dispatch:
inputs:
limit:
description: Number of releases to fetch from MaaAssistantArknights, 2 at least
required: false
default: 31
default: "31"
type: number
limit_2:
description: Number of releases to fetch from MaaRelease
required: false
default: 30
default: "30"
type: number
env:
@@ -24,19 +24,31 @@ jobs:
create-tag:
runs-on: ubuntu-latest
steps:
- name: "Fetch MaaRelease"
uses: actions/checkout@v3
- name: Fetch MaaRelease
uses: actions/checkout@v4
with:
show-progress: false
repository: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
path: MaaRelease
fetch-depth: 0
token: ${{ secrets.MAARELEASE_RELEASE }}
- name: Fetch release info
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
@@ -49,6 +61,7 @@ jobs:
echo "prerelease=$([ $(head -n 1 release_maa.txt | awk '{ print $2}') = 'Pre-release' ] && echo true || echo false)" >> $GITHUB_OUTPUT
echo "release_tag=$(head -n 1 ./config)" >> $GITHUB_OUTPUT
- name: Commit and setup tag
run: |
cd MaaRelease
@@ -61,10 +74,13 @@ jobs:
git push --tags
env:
PUSH_REMOTE: https://github-actions[bot]:${{ secrets.MAARELEASE_RELEASE }}@github.com/${{ github.repository_owner }}/MaaRelease
- uses: actions/upload-artifact@v3
- name: Upload release config to GitHub
uses: actions/upload-artifact@v4
with:
name: MaaReleaseConfig
path: ./build-ota/config
outputs:
prerelease: ${{ steps.fetchReleaseInfo.outputs.prerelease }}
release_tag: ${{ steps.fetchReleaseInfo.outputs.release_tag }}
@@ -73,31 +89,40 @@ jobs:
needs: create-tag
runs-on: ubuntu-latest
strategy:
matrix:
target:
matrix:
target:
- x64
steps:
- uses: actions/download-artifact@v3
- name: Download release config
uses: actions/download-artifact@v4
- name: Fetch MaaRelease
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false
repository: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
path: MaaRelease
fetch-depth: 0
token: ${{ secrets.MAARELEASE_RELEASE }}
- uses: actions/checkout@v3
- name: Checkout code
uses: actions/checkout@v4
with:
show-progress: false
path: MaaAssistantArknights
- name: Download latest version for server
run: |
mkdir -pv build-ota/${{ needs.create-tag.outputs.release_tag }}
cd build-ota/${{ needs.create-tag.outputs.release_tag }}
gh release download ${{ needs.create-tag.outputs.release_tag }} --repo 'MaaAssistantArknights/MaaAssistantArknights' --pattern "MAA-${{ needs.create-tag.outputs.release_tag }}-win-${{ matrix.target }}.zip" --clobber
cp *.zip ..
- name: Build OTA
run: |
cd build-ota
$GITHUB_WORKSPACE/MaaAssistantArknights/tools/OTAPacker/build.sh 'MaaAssistantArknights/MaaAssistantArknights' ../MaaReleaseConfig/config ${{ matrix.target }} 'MaaAssistantArknights/MaaRelease'
- name: Upload to MaaRelease
uses: svenstaro/upload-release-action@v2
with:
@@ -111,11 +136,12 @@ jobs:
make-ota-mac:
needs: create-tag
runs-on: macos-13
runs-on: macos-14
steps:
- name: Fetch Release Information
- name: Fetch release info
run: gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 31 }} | tee ./release_maa.txt
- name: Download Release Packages
- name: Download release packages
run: |
cat ./release_maa.txt | awk '{ print $1 }' | while read tag; do
gh release download "$tag" --repo 'MaaAssistantArknights/MaaAssistantArknights' --clobber -D packages -p 'MAA-*-macos-universal.dmg' || true
@@ -123,8 +149,11 @@ jobs:
gh api /markdown -f text="$RELEASE_NOTES" | tee ./packages/MAA-"$tag"-macos-universal.html
done
curl -fsSL -o packages/appcast.xml https://maa-release.hguandl.com/macos/appcast.xml
- name: Setup Sparkle
run: gh release download --repo 'sparkle-project/Sparkle' --clobber -O - -p 'Sparkle-*.tar.xz' | tar xf -
run: |
gh release download --repo 'sparkle-project/Sparkle' --clobber -O - -p 'Sparkle-*.tar.xz' | tar xf -
- name: Generate Update Packages
run: |
if [ $(head -n 1 release_maa.txt | awk '{ print $2 }') = 'Pre-release' ]; then
@@ -132,8 +161,11 @@ jobs:
else
echo ${{ secrets.SPARKLE_PRIV_KEY }} | ./bin/generate_appcast --ed-key-file - ./packages
fi
- name: Clean unneed files
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: Cleanup files
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: Upload to MaaRelease
uses: svenstaro/upload-release-action@v2
with:
@@ -146,38 +178,13 @@ jobs:
overwrite: true
release:
needs:
needs:
- make-ota
- make-ota-mac
runs-on: ubuntu-latest
env:
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
steps:
- name: Deploy the release
- name: Setup release mirror
run: |
gh workflow --repo MaaAssistantArknights/MaaRelease run release-mirrors.yml
env:
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
- name: "Fetch MaaAssistantArknights"
uses: actions/checkout@v3
- name: Deploy the docs
env:
GH_TOKEN: ${{ secrets.MISTEOWORKFLOW }}
run: |
git tag --list 'v*' --sort=-creatordate | head -n 2 > ${{ 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"
git diff --name-only "$NEW_VERSION" "$OLD_VERSION" > ${{ runner.temp }}/diff
export DOCS_CHANGED=false
while IFS= read -r file; do
file=$(echo "$file" | sed 's/"//g')
if [[ $file == "docs/"* ]]; then
echo "Found docs changed: $file"
export DOCS_CHANGED=true
fi
done < ${{ runner.temp }}/diff
echo "DOCS_CHANGED: $DOCS_CHANGED"
if [ "$variable" = "true" ]; then
gh workflow --repo MaaAssistantArknights/maa-website run azure-deploy.yaml
echo "Deploying the docs."
fi

View File

@@ -2,106 +2,339 @@ name: res-update-game
on:
schedule:
- cron: "*/20 * * * *"
- cron: "*/20 * * * *" # Runs every 20 minutes
workflow_dispatch:
inputs:
commit_message:
description: 'Commit Message'
description: "Commit Message"
type: string
required: false
jobs:
clone-resources-official:
if: github.repository_owner == 'MaaAssistantArknights'
runs-on: ubuntu-latest
steps:
- name: Clone ArknightsGameResource for Official
uses: actions/checkout@v4
with:
show-progress: false
repository: yuanyan3060/ArknightsGameResource
ref: main
path: ./Official
sparse-checkout-cone-mode: false
sparse-checkout: |
/levels.json
/item
/building_skill
/gamedata/excel/item_table.json
/gamedata/excel/building_data.json
/gamedata/excel/range_table.json
/gamedata/excel/character_table.json
/gamedata/excel/gacha_table.json
/gamedata/excel/roguelike_topic_table.json
/gamedata/excel/activity_table.json
- 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
with:
show-progress: false
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
with:
show-progress: false
repository: arkntools/arknights-toolbox-update
ref: data-tw
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: windows-latest
steps:
- uses: actions/checkout@v3
- name: Checkout MAA
uses: actions/checkout@v4
with:
token: ${{ secrets.MISTEOWORKFLOW }}
# 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.exe from cache
id: cache-resupd
uses: actions/cache/restore@v4
with:
key: Resource-updater-${{ hashFiles('./tools/ResourceUpdater/main.cpp') }}
path: |
./tools/ResourceUpdater/x64/Release/opencv_world4_maa.dll
./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
- name: Cache MaaDeps
if: steps.cache-resupd.outputs.cache-hit != 'true'
id: cache-maadeps
uses: actions/cache@v4
with:
path: |
./MaaDeps
key: ${{ runner.os }}-x64-maadeps-${{ hashFiles('./maadeps-download.py') }}
- name: Bootstrap MaaDeps
if: steps.cache-resupd.outputs.cache-hit != 'true' && steps.cache-maadeps.outputs.cache-hit != 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
python3 maadeps-download.py x64-windows
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1
if: steps.cache-resupd.outputs.cache-hit != 'true'
uses: microsoft/setup-msbuild@v2
- name: Build Resource Updater
if: steps.cache-resupd.outputs.cache-hit != 'true'
run: |
MSBUILD tools/ResourceUpdater/ResourceUpdater.vcxproj /t:rebuild /p:Configuration="Release" /p:Platform="x64" /p:BuildProjectReferences=false /m
- name: Save ResourceUpdater.exe to cache
if: always() && steps.cache-resupd.outputs.cache-hit != 'true'
uses: actions/cache/save@v4
with:
key: Resource-updater-${{ hashFiles('./tools/ResourceUpdater/main.cpp') }}
path: |
./tools/ResourceUpdater/x64/Release/opencv_world4_maa.dll
./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
- name: Download txwy
id: download-txwy
uses: actions/download-artifact@v4.1.8
continue-on-error: true
with:
name: txwy
path: ./tools/ResourceUpdater/x64/Release/Overseas/tw/gamedata/excel
- name: Delay txwy
if: steps.download-txwy.outcome == 'failure'
run: |
Start-Sleep -s 20
- name: Re-download txwy
if: steps.download-txwy.outcome == 'failure'
uses: actions/download-artifact@v4.1.8
with:
name: txwy
path: ./tools/ResourceUpdater/x64/Release/Overseas/tw/gamedata/excel
- name: Download Overseas
id: download-overseas
uses: actions/download-artifact@v4.1.8
continue-on-error: true
with:
name: overseas
path: ./tools/ResourceUpdater/x64/Release/Overseas
- name: Delay Overseas
if: steps.download-overseas.outcome == 'failure'
run: |
Start-Sleep -s 20
- name: Re-download Overseas
if: steps.download-overseas.outcome == 'failure'
uses: actions/download-artifact@v4.1.8
with:
name: overseas
path: ./tools/ResourceUpdater/x64/Release/Overseas
- name: Download Official
id: download-official
uses: actions/download-artifact@v4.1.8
continue-on-error: true
with:
name: official
path: ./tools/ResourceUpdater/x64/Release/Official
- name: Delay Official
if: steps.download-official.outcome == 'failure'
run: |
Start-Sleep -s 20
- name: Re-download Official
if: steps.download-official.outcome == 'failure'
uses: actions/download-artifact@v4.1.8
with:
name: official
path: ./tools/ResourceUpdater/x64/Release/Official
- name: Run Resource Updater
run: |
.\tools\ResourceUpdater\x64\Release\ResourceUpdater.exe
./tools/ResourceUpdater/x64/Release/ResourceUpdater.exe
- name: Check if only sorted
id: check_only_sorted
- name: Task Sorting
id: task_sorting
run: |
git status
python3 tools/TaskSorter/TaskSorter.py
Write-Output "gitdiff=$(git diff --name-only --diff-filter=ACM 2>$null | Select-String -Pattern '\.json$' -List)" >> $env:GITHUB_OUTPUT
$diff = $(git diff --numstat HEAD | findstr -i resource)
if ($LASTEXITCODE -ne 0) {
echo "no diff"
exit 0
}
echo "diff: "$diff
$sp = $($diff -split "\s+")
$numbers = $($sp | Where-Object { $_ -match "^\d+$" })
echo "numbers: "$numbers
- name: Run prettier
uses: Nerixyz/actionsx-prettier@v3-adj
with:
args: -w ${{ steps.task_sorting.outputs.gitdiff }}
$length = $numbers.Length
$isAllEqual = $true
for ($i = 0; $i -lt $length; $i += 2) {
$firstNumber = $numbers[$i]
$secondNumber = $numbers[$i+1]
if ($firstNumber -ne $secondNumber) {
$isAllEqual = $false
break
}
}
echo "isAllEqual: "$isAllEqual
echo "only_sorted=$isAllEqual" >> $env:GITHUB_OUTPUT
- name: Cancelling
if: steps.check_only_sorted.outputs.only_sorted == 'True'
uses: andymckay/cancel-action@0.3
- name: Update version.json date if necessary
id: update_version
run: pwsh tools/ResourceUpdater/version.ps1
- name: Setup python
if: steps.update_version.outputs.contains_png == 'True'
uses: actions/setup-python@v5
with:
python-version: "3.11"
- 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') }}
- 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
- name: Setup oxipng
if: steps.update_version.outputs.contains_png == 'True'
uses: baptiste0928/cargo-install@v3
with:
crate: oxipng
- 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 {
if ([string]::IsNullOrWhiteSpace($commit_msg)) {
$commit_msg = "chore: Auto Update Game Resources - $(Get-Date -Format 'yyyy-MM-dd')"
} else {
$commit_msg = $commit_msg.Trim()
}
git commit -m "$commit_msg"
$run_url = "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
git commit -m "$commit_msg" -m "$run_url" -m "[skip changelog]"
if ($LASTEXITCODE -eq 0) {
echo "have_commits=True" >> $env:GITHUB_OUTPUT
Write-Output "have_commits=True" >> $env:GITHUB_OUTPUT
}
git pull origin $(git rev-parse --abbrev-ref HEAD) --unshallow --rebase
git pull origin ${{ github.ref_name }} --rebase
- name: Cancelling
if: steps.add_files.outputs.have_commits != 'True'
uses: andymckay/cancel-action@0.3
- name: Push changes # push the output folder to your repo
- 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: 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: 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: 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,59 +1,121 @@
name: test
name: smoke-testing
on:
push:
paths:
- '3rdparty/include/**'
- 'include/**'
- 'src/**'
- 'cmake/**'
- 'CMakeLists.txt'
- 'MAA.sln'
- 'resource/**'
- 'MaaDeps/**'
- "3rdparty/include/**"
- "include/**"
- "src/Cpp/**"
- "src/MaaCore/**"
- "src/SyncRes/**"
- "MAA.sln"
- "resource/**"
- "!**/*.md"
pull_request:
paths:
- '3rdparty/include/**'
- 'include/**'
- 'src/**'
- 'cmake/**'
- 'CMakeLists.txt'
- 'MAA.sln'
- 'resource/**'
- 'MaaDeps/**'
- "3rdparty/include/**"
- "include/**"
- "src/Cpp/**"
- "src/MaaCore/**"
- "src/SyncRes/**"
- "MAA.sln"
- "resource/**"
- "!**/*.md"
workflow_dispatch:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
smoke-testing:
# 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: windows-latest
steps:
- uses: actions/checkout@v3
- uses: NuGet/setup-nuget@v1.2.0
- run: |
nuget restore MAA.sln
if ($LASTEXITCODE) { nuget restore MAA.sln }
if ($LASTEXITCODE) { nuget restore MAA.sln }
- name: Checkout code
uses: actions/checkout@v4
with:
show-progress: false
- name: Generate cache key
id: cache_key
run: |
Write-Output "key=Smoke-testing-${{ hashFiles('src/Cpp/**', 'src/MaaCore/**', 'src/SyncRes/**', '3rdparty/include/**', 'include/**', 'MAA.sln') }}" >> $env:GITHUB_OUTPUT
- name: Restore cache smoke-testing
id: cache-exe
uses: actions/cache/restore@v4
with:
key: ${{ steps.cache_key.outputs.key }}
path: |
./x64/Debug/Sample.exe
./x64/Debug/fastdeploy_ppocr.dll
./x64/Debug/MaaCore.dll
./x64/Debug/onnxruntime_maa.dll
./x64/Debug/opencv_world4d_maa.dll
- name: Fetch submodules
if: steps.cache-exe.outputs.cache-hit != 'true'
run: |
git submodule update --init --depth 1 3rdparty/EmulatorExtras
- name: Cache MaaDeps
if: steps.cache-exe.outputs.cache-hit != 'true'
id: cache-maadeps
uses: actions/cache@v4
with:
path: |
./MaaDeps
key: ${{ runner.os }}-x64-maadeps-${{ hashFiles('./maadeps-download.py') }}
- name: Bootstrap MaaDeps
if: steps.cache-exe.outputs.cache-hit != 'true' && steps.cache-maadeps.outputs.cache-hit != 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
python3 maadeps-download.py x64-windows
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1
- name: Build MaaSample
run: |
MSBUILD src/Cpp/MaaSample.slnf /t:rebuild /p:Configuration="Debug" /p:Platform="x64" /m
- name: Run Testing
run: |
.\x64\Debug\Sample.exe
- name: Upload Logs
if: always()
uses: actions/upload-artifact@v3
if: steps.cache-exe.outputs.cache-hit != 'true'
uses: microsoft/setup-msbuild@v2
with:
name: log
path: .\x64\Debug\debug
msbuild-architecture: x64
- name: Build MaaSample
if: steps.cache-exe.outputs.cache-hit != 'true'
run: |
MSBUILD src/Cpp/MaaSample.slnf -t:restore,build -p:Configuration="Debug" -p:Platform="x64" -m
- name: Copy resource to build directory
if: steps.cache-exe.outputs.cache-hit == 'true'
run: |
(robocopy "resource" "x64/Debug/resource" /E /XD "Arknights-Tile-Pos" /MT:4 > $null);
if ($LASTEXITCODE -lt 2) { $global:LASTEXITCODE = $null }
(robocopy "resource/Arknights-Tile-Pos" "x64/Debug/resource/Arknights-Tile-Pos" "overview.json" > $null);
if ($LASTEXITCODE -lt 2) { $global:LASTEXITCODE= $null }
- name: Run tests
run: |
pwsh tools/SmokeTesting/run_tests.ps1
- name: Save cache smoke-testing (only in dev)
if: steps.cache-exe.outputs.cache-hit != 'true' && github.ref == 'refs/heads/dev'
uses: actions/cache/save@v4
with:
key: ${{ steps.cache_key.outputs.key }}
path: |
./x64/Debug/Sample.exe
./x64/Debug/fastdeploy_ppocr.dll
./x64/Debug/MaaCore.dll
./x64/Debug/onnxruntime_maa.dll
./x64/Debug/opencv_world4d_maa.dll
- name: Upload logs
if: always()
uses: actions/upload-artifact@v4
with:
name: logs
path: ./x64/Debug/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@v9
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

51
.github/workflows/sync-resource.yml vendored Normal file
View File

@@ -0,0 +1,51 @@
name: sync-resource
on:
push:
branches:
- dev
paths:
- "resource/**"
- ".github/workflows/sync-resource.yml"
workflow_dispatch:
jobs:
sync-resource:
if: github.repository_owner == 'MaaAssistantArknights'
runs-on: ubuntu-latest
steps:
- name: Checkout MaaAssistantArknights
uses: actions/checkout@v4
with:
show-progress: false
- name: Setup Git
run: |
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
with:
repository: MaaAssistantArknights/MaaResource
show-progress: false
ssh-key: ${{secrets.MAA_RESOURCE_DEPLOY}}
path: MaaResource
- name: Update MaaResource
run: |
export commit_msg=$(git show -s --format=%s)
cd MaaResource
shopt -s extglob
cd resource
rm -rf !(".gitignore")
cp -rf ../../resource/* .
cd ..
git add .
git status
git commit -m "$commit_msg" || exit 0
git push

107
.github/workflows/website-workflow.yml vendored Normal file
View File

@@ -0,0 +1,107 @@
name: MaaWebsite Workflow
on:
push:
branches:
- "master"
- "dev"
paths:
- ".github/workflows/website-workflow.yml"
- "docs/**"
- "website/**"
pull_request:
paths:
- ".github/workflows/website-workflow.yml"
- "docs/**"
- "website/**"
workflow_dispatch:
inputs:
deploy-to-prod-env:
description: "Deploy to production environment"
default: false
required: true
type: boolean
jobs:
build:
timeout-minutes: 20
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v4
with:
show-progress: false
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9
run_install: false
- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: 22
- name: Install dependencies
run: pnpm install --frozen-lockfile
working-directory: "./website"
- name: Build
run: pnpm run build
working-directory: "./website"
- name: Upload artifact to GitHub
uses: actions/upload-artifact@v4
with:
name: dist
path: "./website/dist"
publish:
runs-on: ubuntu-latest
needs: build
if: github.event_name != 'pull_request'
steps:
- name: Download website artifacts
uses: actions/download-artifact@v4
with:
name: dist
- name: Set deployment environment
id: set-deployment-env
run: |
if [[ "${{ github.event_name }}" != "workflow_dispatch" && "${{ github.ref }}" == "refs/heads/master" ]] || [[ "${{ github.event.inputs.deploy-to-prod-env }}" == "true" ]]; then
echo "AZURE_TARGET_ENV=prod" >> $GITHUB_ENV
else
echo "AZURE_TARGET_ENV=dev" >> $GITHUB_ENV
fi
- name: Show environment
run: echo ${{ env.AZURE_TARGET_ENV }}
- name: Deploy to Azure (prod)
id: deploy-prod
uses: Azure/static-web-apps-deploy@v1
if: env.AZURE_TARGET_ENV == 'prod'
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_MAA_WEBSITE }}
repo_token: ${{ secrets.GITHUB_TOKEN }}
action: "upload"
app_location: "."
api_location: ""
skip_app_build: true
skip_api_build: true
- name: Deploy to Azure (dev)
id: deploy-dev
uses: Azure/static-web-apps-deploy@v1
if: env.AZURE_TARGET_ENV == 'dev'
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_MAA_WEBSITE }}
repo_token: ${{ secrets.GITHUB_TOKEN }}
action: "upload"
deployment_environment: dev
app_location: "."
api_location: ""
skip_app_build: true
skip_api_build: true

23
.gitignore vendored
View File

@@ -1,6 +1,3 @@
# docs
docs/node_modules
docs/.vuepress/.temp
# Prerequisites
*.d
@@ -440,6 +437,9 @@ tools/**/*.png
.vscode
enc_temp_folder/*
# RoguelikeRecruitmentTool 导出的 Excel 文件
tools/RoguelikeRecruitmentTool/output
# Nuke
.nuke/temp/*
@@ -450,3 +450,20 @@ enc_temp_folder/*
/resource/Arknights-Tile-Pos/act2bossrush_04-activities-act2bossrush-level_bossrush2_04.json
# CF 活动关卡(异格夜刀),手动改的地图
/resource/Arknights-Tile-Pos/act24side_09-activities-act24side-level_act24side_09.json
/src/MaaWpfGui/FodyWeavers.xml
# 链接检查缓存
.lycheecache
# MaaDeps
/MaaDeps/*
# ResourceUpdater workflow
/original/*
# Windows Explorer Shits
desktop.ini
Thumbs.db
# macOS Finder Shit
.DS_Store

11
.gitmodules vendored
View File

@@ -4,8 +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 +1,127 @@
{
"$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"
]
"$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 +1,4 @@
{
"$schema": "./build.schema.json",
"Solution": "tools/MaaBuilder.sln"
"$schema": "./build.schema.json",
"Solution": "tools/MaaBuilder.sln"
}

32
.pre-commit-config.yaml Normal file
View File

@@ -0,0 +1,32 @@
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
files: ^((\.github/ISSUE_TEMPLATE|docs|resource|src|tools|website)/.*|\.pre-commit-config\.yaml|package-definition\.json)
types_or:
- yaml
- json
- 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"]

15
.prettierignore Normal file
View File

@@ -0,0 +1,15 @@
**/node_modules/
MaaDeps/
3rdparty/
src/maa-cli
src/MaaMacGui
website/
docs/
resource/Arknights-Tile-Pos/
tools/OptimizeTemplates/optimize_templates.json
CITATION.cff
CHANGELOG.md

17
.prettierrc Normal file
View File

@@ -0,0 +1,17 @@
{
"tabWidth": 4,
"printWidth": 120,
"useTabs": false,
"bracketSameLine": true,
"bracketSpacing": true,
"endOfLine": "auto",
"overrides": [
{
"files": [".clang-format", "**/*.yml", "**/*.yaml"],
"options": {
"parser": "yaml",
"tabWidth": 2
}
}
]
}

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,717 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <initializer_list>
#include <optional>
#include <ostream>
#include <string>
#include <tuple>
#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 collection_t,
std::enable_if_t<
_utils::is_collection<collection_t>
&& std::is_constructible_v<value_type, _utils::range_value_t<collection_t>>,
bool> = true>
basic_array(collection_t arr)
: _array_data(std::make_move_iterator(arr.begin()), std::make_move_iterator(arr.end()))
{
}
template <
typename fixed_array_t,
std::enable_if_t<_utils::is_fixed_array<fixed_array_t>, bool> = true>
basic_array(const fixed_array_t& arr)
: _array_data(arr.begin(), arr.end())
{
}
template <
typename jsonization_t,
std::enable_if_t<_utils::has_to_json_in_member<jsonization_t>::value, bool> = true>
basic_array(const jsonization_t& value)
: basic_array(value.to_json())
{
}
template <
typename jsonization_t,
std::enable_if_t<_utils::has_to_json_in_templ_spec<jsonization_t>::value, bool> = true>
basic_array(const jsonization_t& value)
: basic_array(ext::jsonization<jsonization_t>().to_json(value))
{
}
template <typename... elem_ts>
basic_array(const std::tuple<elem_ts...>& tup)
{
foreach_tuple(tup, std::make_index_sequence<std::tuple_size_v<std::tuple<elem_ts...>>>());
}
template <typename first_t, typename second_t>
basic_array(std::pair<first_t, second_t> pair)
: _array_data({ std::move(pair.first), std::move(pair.second) })
{
}
~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;
// 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<value_t, Size, fixed_array_t>();
}
template <typename... elem_ts>
explicit operator std::tuple<elem_ts...>() const
{
return as_tuple<elem_ts...>();
}
template <typename elem1_t, typename elem2_t>
explicit operator std::pair<elem1_t, elem2_t>() const
{
return as_pair<elem1_t, elem2_t>();
}
template <
typename jsonization_t,
std::enable_if_t<_utils::has_from_json_in_member<jsonization_t, string_t>::value, bool> =
true>
explicit operator jsonization_t() const
{
jsonization_t dst {};
if (!dst.from_json(*this)) {
throw exception("Wrong JSON");
}
return dst;
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_from_json_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
explicit operator jsonization_t() const
{
jsonization_t dst {};
if (!ext::jsonization<jsonization_t>().from_json(*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;
template <typename tuple_t>
tuple_t as_tuple_templ() const;
template <size_t index, typename tuple_t>
void set_tuple(tuple_t& tup) const;
template <typename Tuple, std::size_t... Is>
void foreach_tuple(const Tuple& t, std::index_sequence<Is...>)
{
(_array_data.emplace_back(std::get<Is>(t)), ...);
}
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;
}
namespace _as_collection_helper
{
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 string_t>
template <typename value_t, template <typename...> typename collection_t>
inline collection_t<value_t> basic_array<string_t>::as_collection() const
{
collection_t<value_t> result;
if constexpr (_as_collection_helper::has_emplace_back<collection_t<value_t>>::value) {
for (const auto& elem : _array_data) {
result.emplace_back(elem.template as<value_t>());
}
}
else {
for (const auto& elem : _array_data) {
result.emplace(elem.template as<value_t>());
}
}
return result;
}
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
{
if (size() != Size) {
throw exception("Wrong array size");
}
fixed_array_t<value_t, Size> result;
for (size_t i = 0; i < Size; ++i) {
result.at(i) = _array_data.at(i).template as<value_t>();
}
return result;
}
template <typename string_t>
template <size_t index, typename tuple_t>
inline void basic_array<string_t>::set_tuple(tuple_t& tup) const
{
using elem_t = std::tuple_element_t<index, tuple_t>;
if constexpr (index > 0) {
set_tuple<index - 1>(tup);
}
std::get<index>(tup) = static_cast<elem_t>(at(index));
}
template <typename string_t>
template <typename tuple_t>
inline tuple_t basic_array<string_t>::as_tuple_templ() const
{
constexpr size_t tuple_size = std::tuple_size_v<tuple_t>;
if (size() != tuple_size) {
throw exception("Wrong array size");
}
tuple_t result;
set_tuple<tuple_size - 1>(result);
return result;
}
template <typename string_t>
template <typename... elem_ts>
inline std::tuple<elem_ts...> basic_array<string_t>::as_tuple() const
{
return as_tuple_templ<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_tuple_templ<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,534 @@
// 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 map_t,
std::enable_if_t<
_utils::is_map<map_t>
&& std::is_constructible_v<value_type, _utils::range_value_t<map_t>>,
bool> = true>
basic_object(map_t map)
: _object_data(std::make_move_iterator(map.begin()), std::make_move_iterator(map.end()))
{
}
template <
typename jsonization_t,
std::enable_if_t<_utils::has_to_json_in_member<jsonization_t>::value, bool> = true>
basic_object(const jsonization_t& value)
: basic_object(value.to_json())
{
}
template <
typename jsonization_t,
std::enable_if_t<_utils::has_to_json_in_templ_spec<jsonization_t>::value, bool> = true>
basic_object(const jsonization_t& value)
: basic_object(ext::jsonization<jsonization_t>().to_json(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;
// 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_member<jsonization_t, string_t>::value, bool> =
true>
explicit operator jsonization_t() const
{
jsonization_t dst {};
if (!dst.from_json(*this)) {
throw exception("Wrong JSON");
}
return dst;
}
template <
typename jsonization_t,
std::enable_if_t<
_utils::has_from_json_in_templ_spec<jsonization_t, string_t>::value,
bool> = true>
explicit operator jsonization_t() const
{
jsonization_t dst {};
if (!ext::jsonization<jsonization_t>().from_json(*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
{
map_t<string_t, value_t> result;
for (const auto& [key, val] : _object_data) {
result.emplace(key, val.template as<value_t>());
}
return result;
}
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,331 @@
// 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 T>
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>
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>
class has_to_json_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<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_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_check_json_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<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_from_json_in_templ_spec
{
template <typename U>
static auto test(int)
-> decltype(std::declval<ext::jsonization<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 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");
}
}
template <std::size_t id, typename string_t, typename variant_t>
inline bool _serialize_variant_impl(basic_value<string_t>& val, variant_t&& var)
{
if (var.index() != id) {
return false;
}
val = basic_value<string_t>(std::get<id>(std::forward<variant_t>(var)));
return true;
}
template <typename string_t, typename variant_t, std::size_t... ids>
inline basic_value<string_t> serialize_variant(variant_t&& var, std::index_sequence<ids...>)
{
basic_value<string_t> val;
(_serialize_variant_impl<ids>(val, std::forward<variant_t>(var)) || ...);
return val;
}
template <std::size_t id, typename string_t, typename variant_t>
inline bool _deserialize_variant_impl(const basic_value<string_t>& val, variant_t& var)
{
using alt_t = std::variant_alternative_t<id, variant_t>;
if (!val.template is<alt_t>()) {
return false;
}
var = val.template as<alt_t>();
return true;
}
template <typename string_t, typename variant_t, std::size_t... ids>
inline variant_t deserialize_variant(const basic_value<string_t>& val, std::index_sequence<ids...>)
{
variant_t var;
(_deserialize_variant_impl<ids>(val, var) || ...);
return var;
}
template <typename string_t, typename variant_t, std::size_t... ids>
inline bool detect_variant(const basic_value<string_t>& val, std::index_sequence<ids...>)
{
return (val.template is<std::variant_alternative_t<ids, variant_t>>() || ...);
}
template <typename string_t, typename tuple_t, std::size_t... ids>
inline bool detect_tuple(const basic_value<string_t>& val, std::index_sequence<ids...>)
{
return val.is_array() && val.as_array().size() == std::tuple_size_v<tuple_t>
&& (val.at(ids).template is<std::tuple_element_t<ids, tuple_t>>() || ...);
}
} // namespace json::_utils

1233
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

8
3rdparty/include/meojson/json5.hpp vendored Normal file
View File

@@ -0,0 +1,8 @@
#pragma once
// IWYU pragma: begin_exports
#include "common/types.hpp"
#include "parser5/parser5.hpp"
// IWYU pragma: end_exports

View File

@@ -0,0 +1,139 @@
// 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;
}
}
#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);
}
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);
}
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);
}
#elif defined(_MSC_VER)
#ifdef __AVX2__
// lzcnt intrinsics is not constexpr
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);
}
#else
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;
return _BitScanForward64(&index, x) ? index : 64;
}
#endif // __AVX2__
#else // compiler
#error "bring your own bit counting implementation"
#endif
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);
}
// no constexpr endian awareness before C++20
inline bool is_little_endian()
{
union
{
uint32_t u32;
uint8_t u8;
} u = { 0x01020304 };
return u.u8 == 4;
}
} // namespace json::_bitops
#endif // C++20

View File

@@ -0,0 +1,161 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <cstdint>
#include <cstring>
#include <type_traits>
#include "bitops.hpp"
#if defined(__GNUC__) || defined(__clang__)
#define __packed_bytes_strong_inline __attribute__((always_inline))
#elif defined(_MSC_VER)
#define __packed_bytes_strong_inline __forceinline
#else
#define __packed_bytes_strong_inline inline
#endif
namespace json::_packed_bytes
{
struct packed_bytes_trait_none
{
static constexpr bool available = false;
};
template <size_t N>
struct packed_bytes
{
using traits = packed_bytes_trait_none;
};
}
#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
{
struct packed_bytes_trait_uint64
{
static constexpr bool available = sizeof(void*) >= 8;
static constexpr auto step = 8;
using value_type = uint64_t;
__packed_bytes_strong_inline static value_type load_unaligned(const void* ptr)
{
value_type result;
memcpy((void*)&result, ptr, 8);
return result;
}
__packed_bytes_strong_inline static value_type less(value_type x, uint8_t n)
{
return (((x)-UINT64_C(0x0101010101010101) * (n)) & ~(x)&UINT64_C(0x8080808080808080));
}
__packed_bytes_strong_inline static value_type is_zero_memberwise(value_type v)
{
return (((v)-UINT64_C(0x0101010101010101)) & ~(v)&UINT64_C(0x8080808080808080));
}
__packed_bytes_strong_inline static bool is_all_zero(value_type v) { return v == UINT64_C(0); }
__packed_bytes_strong_inline static value_type equal(value_type x, uint8_t n)
{
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 size_t first_nonzero_byte(value_type x)
{
if (_bitops::is_little_endian()) {
return _bitops::countr_zero(x) / 8;
}
else {
return _bitops::countl_zero(x) / 8;
}
}
};
struct packed_bytes_trait_uint32
{
static constexpr bool available = true;
static constexpr auto step = 4;
using value_type = uint32_t;
__packed_bytes_strong_inline static value_type load_unaligned(const void* ptr)
{
value_type result;
memcpy((void*)&result, ptr, 4);
return result;
}
__packed_bytes_strong_inline static value_type less(value_type x, uint8_t n)
{
return (((x) - ~UINT32_C(0) / 255 * (n)) & ~(x) & ~UINT32_C(0) / 255 * 128);
}
__packed_bytes_strong_inline static value_type is_zero_memberwise(value_type v)
{
return (((v)-UINT32_C(0x01010101)) & ~(v)&UINT32_C(0x80808080));
;
}
__packed_bytes_strong_inline static bool is_all_zero(value_type v) { return v == UINT32_C(0); }
__packed_bytes_strong_inline static value_type equal(value_type x, uint8_t n)
{
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 size_t first_nonzero_byte(value_type x)
{
if (_bitops::is_little_endian()) {
return _bitops::countr_zero(x) / 8;
}
else {
return _bitops::countl_zero(x) / 8;
}
}
};
template <>
struct packed_bytes<8>
{
using traits = packed_bytes_trait_uint64;
};
template <>
struct packed_bytes<4>
{
using traits = packed_bytes_trait_uint32;
};
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>>>>;
} // namespace json::_packed_bytes

View File

@@ -0,0 +1,79 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
// current NEON implementation doesn't outperform 64-bit scalar implementation
#ifdef MEOJSON_ENABLE_NEON
#include "packed_bytes.hpp"
#include <arm_neon.h>
#if defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64)
#define __packed_bytes_trait_arm64
#endif
namespace json::_packed_bytes
{
struct packed_bytes_trait_neon
{
static constexpr bool available = true;
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 less(value_type x, uint8_t n)
{
auto bcast = vdupq_n_u8(n);
auto is_less = vcltq_u8(x, bcast);
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, 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 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);
return fold32 == 0;
#endif
}
__packed_bytes_strong_inline static size_t first_nonzero_byte(value_type x)
{
// https://community.arm.com/arm-community-blogs/b/infrastructure-solutions-blog/posts/porting-x86-vector-bitmask-optimizations-to-arm-neon
auto cmp = equal(x, 0);
auto res = vshrn_n_u16(cmp, 4);
auto mask64 = vget_lane_u64(vreinterpret_u64_u8(res), 0);
return _bitops::countr_one(mask64) >> 2;
}
};
template <>
struct packed_bytes<16>
{
using traits = packed_bytes_trait_neon;
};
}
#endif

View File

@@ -0,0 +1,140 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include "packed_bytes.hpp"
#include <emmintrin.h>
#if defined(__SSE4_1__) || defined(__AVX2__) || defined(_MSC_VER)
// MSVC enables all SSE4.1 intrinsics by default
#include <smmintrin.h>
#endif
namespace json::_packed_bytes
{
struct packed_bytes_trait_sse
{
static constexpr bool available = true;
static constexpr auto step = 16;
using value_type = __m128i;
__packed_bytes_strong_inline static value_type load_unaligned(const void* ptr)
{
return _mm_loadu_si128(reinterpret_cast<const __m128i*>(ptr));
}
__packed_bytes_strong_inline static value_type less(value_type x, uint8_t n)
{
auto bcast = _mm_set1_epi8(static_cast<char>(n));
auto all1 = _mm_set1_epi8(-1);
auto max_with_n = _mm_max_epu8(x, bcast);
auto is_greater_or_equal = _mm_cmpeq_epi8(max_with_n, x);
auto is_less = _mm_andnot_si128(is_greater_or_equal, all1);
return is_less;
}
__packed_bytes_strong_inline static value_type equal(value_type x, uint8_t n)
{
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 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)
{
#if defined(__SSE4_1__) || defined(__AVX2__) || defined(_MSC_VER)
// SSE4.1 path
return !!_mm_testz_si128(x, x);
#else
// SSE2 path
auto cmp = _mm_cmpeq_epi8(x, _mm_set1_epi8(0));
auto mask = (uint16_t)_mm_movemask_epi8(cmp);
return mask == UINT16_C(0xFFFF);
#endif
}
__packed_bytes_strong_inline static size_t first_nonzero_byte(value_type x)
{
auto cmp = _mm_cmpeq_epi8(x, _mm_set1_epi8(0));
auto mask = (uint16_t)_mm_movemask_epi8(cmp);
return _bitops::countr_one((uint32_t)mask);
}
};
template <>
struct packed_bytes<16>
{
using traits = packed_bytes_trait_sse;
};
}
#ifdef __AVX2__
#include <immintrin.h>
namespace json::_packed_bytes
{
struct packed_bytes_trait_avx2
{
static constexpr bool available = true;
static constexpr auto step = 32;
using value_type = __m256i;
__packed_bytes_strong_inline static value_type load_unaligned(const void* ptr)
{
return _mm256_loadu_si256(reinterpret_cast<const __m256i*>(ptr));
}
__packed_bytes_strong_inline static value_type less(value_type x, uint8_t n)
{
auto bcast = _mm256_set1_epi8(static_cast<char>(n));
auto all1 = _mm256_set1_epi8(-1);
auto max_with_n = _mm256_max_epu8(x, bcast);
auto is_greater_or_equal = _mm256_cmpeq_epi8(max_with_n, x);
auto is_less = _mm256_andnot_si256(is_greater_or_equal, all1);
return is_less;
}
__packed_bytes_strong_inline static value_type equal(value_type x, uint8_t n)
{
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 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 size_t first_nonzero_byte(value_type x)
{
auto cmp = _mm256_cmpeq_epi8(x, _mm256_set1_epi8(0));
auto mask = (uint32_t)_mm256_movemask_epi8(cmp);
// AVX512 alternative: _mm_cmpeq_epi8_mask
return _bitops::countr_one(mask);
}
};
template <>
struct packed_bytes<32>
{
using traits = packed_bytes_trait_avx2;
};
}
#endif

View File

@@ -0,0 +1,763 @@
// 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 <
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_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 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);
template <typename ifstream_t = std::ifstream, typename path_t = void>
auto open(const path_t& path, bool check_bom = 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 <typename string_t, typename parsing_t, typename accel_traits>
inline std::optional<basic_value<string_t>>
parser<string_t, parsing_t, accel_traits>::parse(const parsing_t& content)
{
return parser<string_t, parsing_t, accel_traits>(content.cbegin(), content.cend()).parse();
}
template <typename string_t, typename parsing_t, typename accel_traits>
inline std::optional<basic_value<string_t>> parser<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 <typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<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 <typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<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 <typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<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 <typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<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 <typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<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 <typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<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>();
}
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 <typename string_t, typename parsing_t, typename accel_traits>
inline basic_value<string_t> parser<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>();
}
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 <typename string_t, typename parsing_t, typename accel_traits>
inline std::optional<string_t> parser<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 <typename string_t, typename parsing_t, typename accel_traits>
inline bool parser<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 <typename string_t, typename parsing_t, typename accel_traits>
inline bool parser<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 <typename string_t, typename parsing_t, typename accel_traits>
inline bool parser<string_t, parsing_t, accel_traits>::skip_whitespace() noexcept
{
while (_cur != _end) {
switch (*_cur) {
case ' ':
case '\t':
case '\r':
case '\n':
++_cur;
break;
case '\0':
return false;
default:
return true;
}
}
return false;
}
template <typename string_t, typename parsing_t, typename accel_traits>
inline bool parser<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<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)
{
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 parse(str);
}
template <typename ifstream_t, typename path_t>
auto open(const path_t& filepath, bool check_bom)
{
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);
ifs.close();
return opt;
}
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

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,473 @@
// IWYU pragma: private, include <meojson/json.hpp>
#pragma once
#include <string>
#include <type_traits>
#include "../common/types.hpp"
namespace json::_jsonization_helper
{
struct next_is_optional_t
{
};
struct va_arg_end
{
};
struct dumper
{
template <typename var_t, typename... rest_t>
json::value _to_json(const char* key, const var_t& var, rest_t&&... rest) const
{
json::value result = _to_json(std::forward<rest_t>(rest)...);
result.emplace(key, var);
return result;
}
template <typename... rest_t>
json::value _to_json(const char*, next_is_optional_t, rest_t&&... rest) const
{
return _to_json(std::forward<rest_t>(rest)...);
}
json::value _to_json(va_arg_end) const { return {}; }
};
struct checker
{
template <typename var_t, typename... rest_t>
bool _check_json(
const json::value& in,
std::string& error_key,
const char* key,
const var_t&,
rest_t&&... rest) const
{
auto opt = in.find(key);
if (!opt || !opt->is<var_t>()) {
error_key = key;
return false;
}
return _check_json(in, error_key, std::forward<rest_t>(rest)...);
}
template <typename var_t, typename... rest_t>
bool _check_json(
const json::value& in,
std::string& error_key,
const char*,
next_is_optional_t,
const char* key,
const var_t&,
rest_t&&... rest) const
{
auto opt = in.find(key);
if (opt) {
if (!opt->is<var_t>()) {
error_key = key;
return false;
}
} // next_is_optional_t, ignore key not found
return _check_json(in, error_key, std::forward<rest_t>(rest)...);
}
bool _check_json(const json::value&, std::string&, va_arg_end) const { return true; }
};
struct loader
{
template <typename var_t, typename... rest_t>
bool _from_json(
const json::value& in,
std::string& error_key,
const char* key,
var_t& var,
rest_t&&... rest) const
{
auto opt = in.find(key);
if (!opt || !opt->is<var_t>()) {
error_key = key;
return false;
}
var = std::move(opt)->as<var_t>();
return _from_json(in, error_key, std::forward<rest_t>(rest)...);
}
template <typename var_t, typename... rest_t>
bool _from_json(
const json::value& in,
std::string& error_key,
const char*,
next_is_optional_t,
const char* key,
var_t& var,
rest_t&&... rest) const
{
auto opt = in.find(key);
if (opt) {
if (!opt->is<var_t>()) {
error_key = key;
return false;
}
var = std::move(opt)->as<var_t>();
} // next_is_optional_t, ignore key not found
return _from_json(in, error_key, std::forward<rest_t>(rest)...);
}
bool _from_json(const json::value&, std::string&, va_arg_end) const { return true; }
};
} // 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_0(pred, ...)
#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 \
{ \
return json::_jsonization_helper::dumper()._to_json( \
_MEOJSON_EXPAND(_MEOJSON_FOR_EACH(_MEOJSON_KEY_VALUE, __VA_ARGS__)) \
json::_jsonization_helper::va_arg_end {}); \
}
#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 {},
#if defined(__clang__)
#pragma clang diagnostic pop // -Wgnu-zero-variadic-macro-arguments
#endif

View File

@@ -1,49 +1,48 @@
## v4.19.2
## v5.16.5
### 新增
### 新增 | New
- 新增 LE 活动关卡导航 @ABA2396
* Mac新增基建配置 @hguandl
* 特征匹配 (#10966) @status102
* 绿票、黄票、活动商店 (#12586) @Daydreamer114 @status102 @ABA2396
### 改进
### 改进 | Improved
- 雷神保全浊蒂版&约翰保全浊蒂版修改 修改职业名称为英文,同步作业站版本 (#5172) @junyihan233
- 重训了国服, 日服, 台服和韩服的OCR模型 (#5151) @Plumess
- 更新了简中和英文的ocr det模型, 以及英文的ocr rec模型 (#5156) @Plumess
- 优化退出模拟器,添加日志 @ABA2396
- 随机展示简中文档中模拟器支持列表 (#5161) @bakashigure @AnnAngela
- 优化界面显示 @moomiji @ABA2396
- 关卡提示支持显示多个活动 @ABA2396
* 调整连战输出 @ABA2396
* 肉鸽不期而遇退出检测加个重试 @status102
### 修复
### 修复 | Fix
- 修复特别关注识别错误、部分干员名错误 @MistEO
- 修复抄作业编队超过 10 人时无法选人的问题 @MistEO
- 修复自动基建 制造站 bskill_man_exp4 技能错误 @MistEO
- 扩大roi范围修复PlayCover无法开始唤醒 #5099 @ABA2396
- 点赞接口序列化两次导致后端报错 @ABA2396
* 修复MaaCore asst.log文件句柄泄露 (#12639) @status102
* 修复了屎遇上手动覆盖文件的大聪明爆炸的问题 @ABA2396
* 凹开局干员直升精二选项显示时机错误 @ABA2396
* 连战次数乘号匹配失败 @status102
* store underfunded ocr full match @Daydreamer114
### 其他
### 文档 | Docs
- fix filename @horror-proton
- Auto Update Game Resources
- 修正拼写错误 @ABA2396 @kongwei981126 @doquangminh28
- Update en-bug-report.yaml @ABA2396
- 移除不需要的changelog @AnnAngela
- 删除多余mac完整包 @AnnAngela
- Do not force push tag @MistEO
- 集成战略文档更新 (#5186) @LingXii
- 发版检测到docs发生变动时部署 @AnnAngela
* 任务流color_scales注释优化 @status102
### For overseas
### 其他 | Other
#### YostarEN
- translation refactoring of en-us.xaml for YostarEN (#5111) @Constrat @ABA2396
- Difficulty selection for YostarEN (#5200) @Constrat
- Fight Task Adverse Start YostarEN (#5196) @Constrat
- OperBoxNameOCR tasks.json YostarEN (#5169) @Constrat
#### YostarKR
- recruitment failure with DP-Recovery tag for KR (after OCR update) @178619
- Update ocrReplaces for KR @178619
* yellow ticket items @Daydreamer114
* ocrTask text @status102
* Store@UnderfundedOCR @Daydreamer114
* 再铲一屎 @status102
* cache 移动逻辑 @ABA2396
* ubuntu unused @status102
* 铲屎 @status102
* 指定类型 @status102
* store loading @Daydreamer114
* Revert "feat: 在肉鸽招募中增加m3作为群奶 (#12353)" @Saratoga-Official
* 简化代码 @ABA2396
* 提示补全 @status102
* NumberReplace @status102
* 再次调整官网细节 @MistEO
* 调整官网标题 @MistEO
* Revert "fix: github change string to int (#12574)" @Daydreamer114
* 绿票、黄票、活动商店-国际服适配 (#12674) @Daydreamer114
* mark @status102
* 调整 UI 与 Core 版本不一致的解决方案提示 @ABA2396
* 点击任意职业回正列表 @ABA2396
* 基建先进行技能识别并返回列表首位,再清空选择 @ABA2396

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

@@ -13,38 +13,46 @@ option(BUILD_UNIVERSAL "build both arm64 and x86_64 on macOS" OFF)
option(INSTALL_PYTHON "install python ffi" OFF)
option(INSTALL_RESOURCE "install resource" OFF)
option(INSTALL_DEVEL "install development files" OFF)
option(INSTALL_FLATTEN "do not use bin lib include directory" ON)
option(INSTALL_THIRD_LIBS "install third party libraries" ON)
option(USE_MAADEPS "use third-party libraries built by MaaDeps" ON)
option(USE_RANGE_V3 "use range-v3" OFF)
option(WITH_EMULATOR_EXTRAS "build with emulator extras" ${WIN32})
option(WITH_THRIFT "build with thrift" OFF)
option(WITH_ASST_DEBUG "build with ASST_DEBUG defined" OFF)
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)
target_include_directories(header_only_libraries INTERFACE 3rdparty/include 3rdparty/EmulatorExtras)
file(GLOB_RECURSE maa_src src/MaaCore/*.cpp)
add_library(MaaCore SHARED ${maa_src})
if (MSVC)
target_compile_options(MaaCore PRIVATE "/utf-8")
target_compile_options(MaaCore PRIVATE "/MP")
target_compile_options(MaaCore PRIVATE "/W4;/WX")
target_compile_options(MaaCore PRIVATE "/wd4127") # conditional expression is constant
target_compile_options(MaaCore PRIVATE "/Wv:19.35.32217") # disable warning introduced after this version
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
else ()
target_compile_options(MaaCore PRIVATE "-Wall;-Wextra;-Wpedantic")
# LLVM clang 16 will failed with `error: no member named 'join' in namespace 'std::ranges::views'`, but Apple clang 16 won't
# value defined in https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_ID.html
if ((CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17))
target_compile_options(MaaCore PRIVATE "-fexperimental-library")
endif ()
endif ()
if (WIN32)
#注意相比VS版本缺少了 -D_CONSOLE -D_WINDLL 两项
target_compile_definitions(MaaCore PRIVATE ASST_DLL_EXPORTS _UNICODE UNICODE)
@@ -58,7 +66,9 @@ set_target_properties(MaaCore PROPERTIES
PUBLIC_HEADER "${MaaCore_PUBLIC_HEADERS}"
)
if(UNIX)
if(APPLE)
set_target_properties(MaaCore PROPERTIES INSTALL_RPATH "@loader_path/")
elseif(UNIX)
set_target_properties(MaaCore PROPERTIES INSTALL_RPATH "$ORIGIN/")
endif()
@@ -71,20 +81,64 @@ if (BUILD_TEST)
target_link_libraries(test MaaCore)
endif (BUILD_TEST)
find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs videoio)
find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs videoio features2d)
find_package(OpenCV QUIET COMPONENTS xfeatures2d)
find_package(ZLIB REQUIRED)
find_package(MaaDerpLearning REQUIRED)
find_package(asio REQUIRED)
find_package(ONNXRuntime)
find_package(cpr CONFIG REQUIRED)
target_link_libraries(MaaCore ${OpenCV_LIBS} MaaDerpLearning asio::asio ZLIB::ZLIB ONNXRuntime::ONNXRuntime cpr::cpr header_only_libraries)
list(APPEND maa_libs ${OpenCV_LIBS} ZLIB::ZLIB cpr::cpr header_only_libraries)
if(USE_MAADEPS)
find_package(asio REQUIRED)
list(APPEND maa_libs asio::asio)
endif()
find_package(onnxruntime CONFIG REQUIRED) # provided by onnxruntime>=1.16
list(APPEND maa_libs onnxruntime::onnxruntime)
if(DEFINED fastdeploy_SOURCE_DIR)
# TODO: FetchContent github.com/MaaAssistantArknights/FastDeploy
if(NOT DEFINED fastdeploy_BINARY_DIR)
set(fastdeploy_BINARY_DIR ${CMAKE_BINARY_DIR}/fastdeploy)
endif()
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
add_subdirectory(${fastdeploy_SOURCE_DIR} ${fastdeploy_BINARY_DIR} EXCLUDE_FROM_ALL SYSTEM)
if(NOT DEFINED fastdeploy_INCLUDE_DIRS)
set(fastdeploy_INCLUDE_DIRS ${fastdeploy_SOURCE_DIR})
endif()
target_include_directories(MaaCore SYSTEM PRIVATE ${fastdeploy_INCLUDE_DIRS})
get_target_property(fastdeploy_type fastdeploy_ppocr TYPE)
if(fastdeploy_type STREQUAL "SHARED_LIBRARY")
install(TARGETS fastdeploy_ppocr)
endif()
else()
find_package(fastdeploy_ppocr REQUIRED)
endif()
list(APPEND maa_libs fastdeploy_ppocr)
target_link_libraries(MaaCore ${maa_libs})
if(WITH_EMULATOR_EXTRAS AND NOT EXISTS ${PROJECT_SOURCE_DIR}/3rdparty/EmulatorExtras/Mumu)
message(WARNING "EmulatorExtras not found, please run `git submodule update --init 3rdparty/EmulatorExtras`")
set(WITH_EMULATOR_EXTRAS OFF)
endif()
target_compile_definitions(MaaCore PRIVATE ASST_WITH_EMULATOR_EXTRAS=$<BOOL:${WITH_EMULATOR_EXTRAS}>)
if(WITH_THRIFT)
find_package(Thrift CONFIG REQUIRED)
add_subdirectory(src/MaaThriftController)
target_link_libraries(MaaCore MaaThriftController)
endif(WITH_THRIFT)
if (WITH_ASST_DEBUG)
target_compile_definitions(MaaCore PRIVATE ASST_DEBUG)
endif ()
if(WIN32)
target_link_libraries(MaaCore ws2_32)
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
if (USE_RANGE_V3)
target_compile_definitions(MaaCore PRIVATE ASST_USE_RANGES_RANGE_V3)
find_package(range-v3 REQUIRED)
target_link_libraries(MaaCore range-v3::range-v3)
endif ()
@@ -93,12 +147,11 @@ 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_FLATTEN)
set(MaaCore_install_flatten_args RUNTIME DESTINATION . LIBRARY DESTINATION . PUBLIC_HEADER DESTINATION .)
endif()
install(TARGETS MaaCore ${MaaCore_install_flatten_args} ${MaaCore_install_extra_args})
if(INSTALL_THIRD_LIBS AND USE_MAADEPS)
maadeps_install()

View File

@@ -0,0 +1,77 @@
@echo off
chcp 65001
setlocal enabledelayedexpansion
:: 定义ANSI颜色代码
for /f %%a in ('echo prompt $E^| cmd') do set "ESC=%%a"
set "RESET=%ESC%[0m"
set "GREEN=%ESC%[32m"
set "RED=%ESC%[31m"
set "YELLOW=%ESC%[33m"
set "BLUE=%ESC%[34m"
set "CYAN=%ESC%[36m"
set "WHITE=%ESC%[37m"
set "BOLD=%ESC%[1m"
:: 初始化错误标志
set "ErrorOccurred=0"
openfiles >nul 2>&1
if %errorlevel% neq 0 (
echo %YELLOW%正在获取管理员权限...%RESET%
echo %YELLOW%Obtaining administrator privileges...%RESET%
powershell -Command "Start-Process cmd.exe -ArgumentList '/c %~dpnx0' -Verb RunAs"
exit /b
)
echo.
echo %BLUE%========================================%RESET%
echo %BOLD%%CYAN%正在安装 Microsoft Visual C++ Redistributable%RESET%
echo %BOLD%%CYAN%Installing Microsoft Visual C++ Redistributable%RESET%
echo %BLUE%========================================%RESET%
echo.
winget install "Microsoft.VCRedist.2015+.x64" --override "/repair /passive /norestart" --uninstall-previous --accept-package-agreements --force
if %errorlevel% neq 0 (
echo.
echo %BOLD%%RED%错误: Microsoft.VCRedist.2015+.x64 安装失败%RESET%
echo %BOLD%%RED%Error: Microsoft.VCRedist.2015+.x64 installation failed%RESET%
set "ErrorOccurred=1"
)
echo.
echo %BLUE%========================================%RESET%
echo %BOLD%%CYAN%正在安装 .NET Desktop Runtime 8.0%RESET%
echo %BOLD%%CYAN%Installing .NET Desktop Runtime 8.0%RESET%
echo %BLUE%========================================%RESET%
echo.
winget install "Microsoft.DotNet.DesktopRuntime.8" --override "/repair /passive /norestart" --uninstall-previous --accept-package-agreements --force
if %errorlevel% neq 0 (
echo.
echo %BOLD%%RED%错误: Microsoft.DotNet.DesktopRuntime.8 安装失败%RESET%
echo %BOLD%%RED%Error: Microsoft.DotNet.DesktopRuntime.8 installation failed%RESET%
set "ErrorOccurred=1"
)
echo.
if %ErrorOccurred% equ 0 (
echo %BOLD%%GREEN%运行库修复完成,请重启电脑后再次尝试运行 MAA。%RESET%
echo %BOLD%%GREEN%The runtime library repair is complete. Please restart your computer and try running MAA again.%RESET%
) else (
echo %RED%========================================%RESET%
echo %BOLD%%RED%运行库修复过程中出现错误%RESET%
echo %BOLD%%RED%Errors occurred during runtime library repair%RESET%
echo.
echo %YELLOW%您可以尝试手动下载并安装以下组件:%RESET%
echo %YELLOW%You can try to manually download and install the following components:%RESET%
echo.
echo %WHITE%Microsoft Visual C++ Redistributable:%RESET%
echo %CYAN%https://aka.ms/vs/17/release/vc_redist.x64.exe%RESET%
echo.
echo %WHITE%.NET Desktop Runtime 8.0:%RESET%
echo %CYAN%https://aka.ms/dotnet/8.0/windowsdesktop-runtime-win-x64.exe%RESET%
echo %RED%========================================%RESET%
)
pause

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

14
MAA.sln
View File

@@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaaWpfGui", "src\MaaWpfGui\
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
@@ -58,6 +60,18 @@ Global
{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

170
MAA.sln.DotSettings Normal file
View File

@@ -0,0 +1,170 @@
<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/=EN/@EntryIndexedValue">EN</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KR/@EntryIndexedValue">KR</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JP/@EntryIndexedValue">JP</s:String>
<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/GrammarAndSpelling/GrammarChecking/Exceptions/=Github/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/GrammarAndSpelling/GrammarChecking/Exceptions/=_4E00_9375_8F2A/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/GrammarAndSpelling/GrammarChecking/Exceptions/=_591C_95F4_6A21_5F0F/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=acast/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=acfend/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=acguad/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=acpion/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=acspec/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=acsupo/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=advapi/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Aero/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Affero/@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/=ccast/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=cdfend/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=cguard/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Chayn/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Chyan/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=cmedic/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Collapsal/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=cpione/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=csnipe/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=cspec/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=csuppo/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ctrler/@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/=Eyjafjalla/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Favourite/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=filetime/@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/=Foldartals/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=framerate/@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/=iter/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=jsend/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ldconsole/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ldplayer/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=LD_0027s/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=leidian/@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/=MAA_0027s/@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/=mirrorc/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mirrorchyan/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mizuki/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mumu/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Nemu/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Netease/@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/=objstr/@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/=powrprof/@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/=qmsg/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Raidian/@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/=removelist/@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/=Sarkaz/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Screencap/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=sctp/@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/=Skland/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=specialaccess/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=spid/@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/=Stormeye/@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/=Surtr/@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/=vmonitor/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Webhook/@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/=Yostar/@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

184
README.md
View File

@@ -1,12 +1,14 @@
<!-- 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
<br>
<div>
<img alt="C++" src="https://img.shields.io/badge/c++-20-%2300599C?logo=cplusplus">
<img alt="C++" src="https://img.shields.io/badge/C++-20-%2300599C?logo=cplusplus">
</div>
<div>
<img alt="platform" src="https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS-blueviolet">
@@ -14,11 +16,16 @@
<div>
<img alt="license" src="https://img.shields.io/github/license/MaaAssistantArknights/MaaAssistantArknights">
<img alt="commit" src="https://img.shields.io/github/commit-activity/m/MaaAssistantArknights/MaaAssistantArknights?color=%23ff69b4">
</div>
<div>
<img alt="stars" src="https://img.shields.io/github/stars/MaaAssistantArknights/MaaAssistantArknights?style=social">
<img alt="GitHub all releases" src="https://img.shields.io/github/downloads/MaaAssistantArknights/MaaAssistantArknights/total?style=social">
</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://maa.plus/docs/zh-cn/) | [繁體中文](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/)
MAA 的意思是 MAA Assistant Arknights
@@ -26,57 +33,66 @@ MAA 的意思是 MAA Assistant Arknights
基于图像识别技术,一键完成全部日常任务!
绝赞更新中 ✿✿ヽ(°▽°)ノ✿<br>
绝赞更新中 ✿✿ヽ(°▽°)ノ✿
</div>
## 下载与安装
请阅读 [文档](https://maa.plus/docs/zh-cn/manual/newbie.html) 后前往 [官网](https://maa.plus) 或 [Releases](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases) 下载,并参考 [新手上路](https://maa.plus/docs/zh-cn/manual/newbie.html) 进行安装。
## 亮点功能
- 刷理智,掉落识别及上传 [企鹅物流](https://penguin-stats.cn/)
- 智能基建换班,自动计算干员效率,单设施内最优解;同时也支持 [自定义排班](https://maa.plus/docs/3.6-基建排班协议.html)
- 自动公招,可选使用加急许可,一次全部刷完!公招数据上传 [企鹅物流](https://penguin-stats.cn/result/stage/recruit/recruit)[一图流](https://yituliu.site/maarecruitdata)
- 访问好友、收取信用及购物、领取日常奖励等。一键全日常自动长草!
- 肉鸽全自动刷源石锭和蜡烛,自动识别干员及练度
- 选择作业 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://maa.plus/docs/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/99072975/232381589-558a8213-d840-4d00-a8f6-89467e2d35c9.png)
![zh2](https://user-images.githubusercontent.com/99072975/232381604-4066d3f5-dfee-45e5-a10f-8ca91ad4404b.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/1.3-模拟器支持.html),进行对应的操作
2. 修改模拟器分辨率为 `16:9` 比例,最低 `1280 * 720`,更高不限。
3. 开始使用吧!
更多使用说明请参考 [详细介绍](https://maa.plus/docs/1.1-详细介绍.html)
### 常见问题
- 软件一打开就闪退
- 连接错误、不知道 adb 路径怎么填写
- 连接成功了,但没反应
- 如何连接自定义端口
- 下载速度慢,且镜像站无法打开网页
- 下载到一半提示“登陆”/“鉴权”
- 连接正常,任务开始了,但是没反应
请参考 [常见问题](https://maa.plus/docs/1.2-常见问题.html)
请参阅 [用户手册](https://maa.plus/docs/zh-cn/manual/)
### 外服支持
目前国际服(美服)、日服、韩服、繁中服的绝大部分功能均已支持。但由于外服用户较少及项目人手不足,很多功能并没有进行全面的测试,所以请自行体验。
若您遇到了 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://maa.plus/docs/zh-cn/develop/overseas-client-adaptation.html)
### CLI 支持
MAA 支持命令行界面CLI操作支持 LinuxmacOS 和 Windows可用于自动化脚本或在无图形界面的服务器上使用。请参阅 [CLI 使用指南](https://maa.plus/docs/zh-cn/manual/cli/)
## 加入我们
@@ -84,64 +100,57 @@ MAA 的意思是 MAA Assistant Arknights
**目前项目组非常缺前端大佬,若您有相关经验,欢迎加入我们!**
- 全新 GUI[MaaX](https://github.com/MaaAssistantArknights/MaaX) (正在开发中,欢迎加入!)
- [作业站](https://prts.plus) 前端:[maa-copilot-frontend](https://github.com/MaaAssistantArknights/maa-copilot-frontend) (正在开发中,欢迎加入!)
- 全新框架[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)
- [官网](https://maa.plus)[前端](website)
- 深度学习:[MaaAI](https://github.com/MaaAssistantArknights/MaaAI)
### 多语言 (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/)
[![Weblate](https://weblate.maa-org.net/widget/maa/wpf-gui/multi-auto.svg)](https://weblate.maa-org.net/engage/maa/)
### Windows
### 参与开发
1. 下载预构建的第三方库
#### Windows
```cmd
python maadeps-download.py
```
请参阅 [开始开发](https://maa.plus/docs/zh-cn/develop/development.html)。
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/2.2-开发相关.html#在-visual-studio-中启用-clang-format)
#### Linux | macOS
### Linux | macOS
请参阅 [Linux 编译教程](https://maa.plus/docs/zh-cn/develop/linux-tutorial.html)。
请参考 [Linux 编译教程](https://maa.plus/docs/2.1-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)
- [集成文档](https://maa.plus/docs/3.1-集成文档.html)
- [回调消息协议](https://maa.plus/docs/3.2-回调消息协议.html)
- [任务流程协议](https://maa.plus/docs/3.4-任务流程协议.html)
- [自动抄作业协议](https://maa.plus/docs/3.3-战斗流程协议.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://maa.plus/docs/zh-cn/protocol/integration.html)
- [回调消息协议](https://maa.plus/docs/zh-cn/protocol/callback-schema.html)
- [任务流程协议](https://maa.plus/docs/zh-cn/protocol/task-schema.html)
- [自动抄作业协议](https://maa.plus/docs/zh-cn/protocol/copilot-schema.html)
### 外服适配
#### 外服适配
请参 [外服适配教程](https://maa.plus/docs/2.5-外服适配教程.html),对于国服已支持的功能,绝大部分的外服适配工作仅需要截图 + 简单的 JSON 修改即可。
请参 [外服适配教程](https://maa.plus/docs/zh-cn/develop/overseas-client-adaptation.html),对于国服已支持的功能,绝大部分的外服适配工作仅需要截图 + 简单的 JSON 修改即可。
### 想参与开发,但不太会用 GitHub?
#### 想参与开发,但不太会用 GitHub?
[GitHub Pull Request 流程简述](https://maa.plus/docs/2.2-开发相关.html#github-pull-request-流程简述)
[GitHub Pull Request 流程简述](https://maa.plus/docs/zh-cn/develop/development.html#github-pull-request-流程简述)
### Issue bot
#### Issue bot
请参 [Issue bot 使用方法](https://maa.plus/docs/2.3-IssueBot使用方法.html)
请参 [Issue Bot 使用方法](https://maa.plus/docs/zh-cn/develop/issue-bot-usage.html)
## 致谢
@@ -154,47 +163,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)](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 吧!~(网页最上方右上角的小星星),这就是对我们最大的支持了!

21
SECURITY.md Normal file
View File

@@ -0,0 +1,21 @@
# 安全策略 / Security Policy
## 受支持的版本 / Supported Versions
我们仅对 v4 和 v5 两个大版本的最新稳定版提供安全支持,如有安全问题,我们将会尽可能快地发布新的稳定版解决。
内测版、公测版仅供测试,我们不会对其提供安全支持。
We only provide security support for the latest Stable Release versions of v4 and v5. If there are security issues, we will release a new stable version as soon as possible to solve them.
The Nightly Release version and the Beta Release version are for testing only, and we will not provide security support for them.
## 如何报告漏洞 / Reporting a Vulnerability
如果该漏洞可以公开发表,请通过 [issue](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/new?assignees=&labels=bug&projects=&template=cn-bug-report.yaml) 发布。
如果该漏洞**不可以**公开发表(例如远程控制功能等可能被用于入侵用户的),请通过[秘密途径](https://github.com/MaaAssistantArknights/MaaAssistantArknights/security/advisories/new)报告。
If the vulnerability can be published publicly, please [publish it through an issue](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/new?assignees=&labels=bug&projects=&template=cn-bug-report.yaml).
If the vulnerability **cannot be published publicly** (for example, the vulnerability that can be used to invade the user's devices), please [report it privately](https://github.com/MaaAssistantArknights/MaaAssistantArknights/security/advisories/new).

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()

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,21 +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)

44
cmake/thrift-gen.cmake Normal file
View File

@@ -0,0 +1,44 @@
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

@@ -24,6 +24,26 @@ function(get_osx_architecture)
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 12.0)
get_osx_architecture()

1
docs/.gitignore vendored
View File

@@ -6,6 +6,7 @@
# Generated files
/.vuepress/.cache/
/.vuepress/.temp/
/.vuepress/dist/
# Misc
.DS_Store

View File

@@ -223,6 +223,4 @@ MD052: true
# MD053/link-image-reference-definitions - Link and image reference definitions should be needed
MD053:
# Ignored definitions
ignored_definitions: [
"//"
]
ignored_definitions: ["//"]

12
docs/.vuepress/client.ts Normal file
View File

@@ -0,0 +1,12 @@
import { defineClientConfig } from "vuepress/client";
import Image1 from "../components/Image1.vue";
import Image2 from "../components/Image2.vue";
import Image4 from "../components/Image4.vue";
export default defineClientConfig({
enhance: ({ app }) => {
app.component("Image1", Image1);
app.component("Image2", Image2);
app.component("Image4", Image4);
},
});

View File

@@ -0,0 +1,52 @@
import type { VNode } from "vue";
import { defineComponent, h } from "vue";
import NavbarDropdown from "@theme-hope/modules/navbar/components/NavbarDropdown";
import { I18nIcon } from "@theme-hope/modules/navbar/components/icons/index";
import { useNavbarLanguageDropdown } from "@theme-hope/modules/navbar/composables/index";
export default defineComponent({
name: "LanguageDropdown",
setup() {
const dropdown = useNavbarLanguageDropdown();
const filteredDropdown = () => {
if (!dropdown.value) return null;
const filteredConfig = { ...dropdown.value };
if (filteredConfig.children) {
filteredConfig.children = filteredConfig.children.filter(item => item.link !== '/');
}
return filteredConfig;
};
//console.log("OldLanguageDropdown", dropdown.value);
//console.log("NewLanguageDropdown", filteredDropdown());
return (): VNode | null =>
dropdown.value
? h(
"div",
{ class: "vp-nav-item" },
h(
NavbarDropdown,
{ config: filteredDropdown() },
{
title: () =>
h(I18nIcon, {
"aria-label": filteredDropdown()?.ariaLabel,
style: {
width: "1rem",
height: "1rem",
verticalAlign: "middle",
},
}),
},
),
)
: null;
},
});

View File

@@ -1,42 +1,98 @@
import { defineUserConfig } from 'vuepress';
import Theme from './theme.config';
import SearchPlugin from './plugins/search';
import { defineUserConfig } from "vuepress";
import { getDirname, path } from "vuepress/utils";
import { viteBundler } from "@vuepress/bundler-vite";
import { googleAnalyticsPlugin } from "@vuepress/plugin-google-analytics";
import Theme from "./theme";
const __dirname = getDirname(import.meta.url);
export default defineUserConfig({
base: '/docs/',
base: "/docs/",
lang: "zh-CN",
title: "MaaAssistantArknights",
description: "MAA",
theme: Theme,
port: 3001,
locales: {
'/': {
lang: 'zh-CN',
description: '开发者文档',
"/": {
lang: " ",
title: " ",
description: " ",
},
'/zh-tw/': {
lang: 'zh-TW',
description: '開發者文檔',
"/zh-cn/": {
lang: "zh-cn",
description: "文档",
},
'/en-us/': {
lang: 'en-US',
title: 'Documents'
"/zh-tw/": {
lang: "zh-tw",
description: "文件",
},
'/ja-jp/': {
lang: 'ja-JP',
description: 'ドキュメント'
"/en-us/": {
lang: "en-us",
description: "Documentation",
},
"/ja-jp/": {
lang: "ja-jp",
description: "ドキュメンテーション",
},
"/ko-kr/": {
lang: "ko-kr",
description: "선적 서류 비치",
},
'/ko-kr/': {
lang: 'ko-KR',
description: '문서'
}
},
markdown: {
headers: {
level: [2, 3, 4, 5],
},
},
plugins: [SearchPlugin()],
temp: '.vuepress/.temp',
cache: '.vuepress/.cache'
theme: Theme,
alias: {
"@theme-hope/modules/navbar/components/LanguageDropdown": path.resolve(
__dirname,
"./components/LanguageDropdown.ts",
),
},
plugins: [
googleAnalyticsPlugin({
id: "G-FJQDKG394Z",
}),
],
head: [
["link", { rel: "preconnect", href: "https://fonts.googleapis.com" }],
[
"link",
{ rel: "preconnect", href: "https://fonts.gstatic.com", crossorigin: "" },
],
[
"link",
{
href: "https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@100..900&display=swap",
rel: "stylesheet",
},
],
[
"link",
{
href: "https://fonts.googleapis.com/css2?family=Noto+Serif+SC:wght@200..900&display=swap",
rel: "stylesheet",
},
],
[
"link",
{
href: "https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap",
rel: "stylesheet",
},
],
],
bundler: viteBundler({
viteOptions: {},
vuePluginOptions: {},
}),
});

View File

@@ -0,0 +1,29 @@
import { navbar } from "vuepress-theme-hope";
export const enusNavbar = navbar([
{
text: "Home",
icon: "ic:round-home",
link: "/en-us/",
},
{
text: "User Manual",
icon: "mdi:user",
link: "/en-us/manual/",
},
{
text: "Development Docs",
icon: "ph:code-bold",
link: "/en-us/develop/",
},
{
text: "Protocol Docs",
icon: "basil:document-solid",
link: "/en-us/protocol/",
},
{
text: "MAA Website",
icon: "mdi:cow",
link: "https://maa.plus",
},
]);

View File

@@ -0,0 +1,5 @@
export * from "./zh-cn";
export * from "./zh-tw";
export * from "./en-us";
export * from "./ja-jp";
export * from "./ko-kr";

View File

@@ -0,0 +1,29 @@
import { navbar } from "vuepress-theme-hope";
export const jajpNavbar = navbar([
{
text: "ホームページ",
icon: "ic:round-home",
link: "/ja-jp/",
},
{
text: "使用説明",
icon: "mdi:user",
link: "/ja-jp/manual/",
},
{
text: "開発関連",
icon: "ph:code-bold",
link: "/ja-jp/develop/",
},
{
text: "プロトコルドキュメント",
icon: "basil:document-solid",
link: "/ja-jp/protocol/",
},
{
text: "MAA 公式サイト",
icon: "mdi:cow",
link: "https://maa.plus",
},
]);

View File

@@ -0,0 +1,29 @@
import { navbar } from "vuepress-theme-hope";
export const kokrNavbar = navbar([
{
text: "홈페이지",
icon: "ic:round-home",
link: "/ko-kr/",
},
{
text: "사용자 설명서",
icon: "mdi:user",
link: "/ko-kr/manual/",
},
{
text: "개발 문서",
icon: "ph:code-bold",
link: "/ko-kr/develop/",
},
{
text: "프로토콜 문서",
icon: "basil:document-solid",
link: "/ko-kr/protocol/",
},
{
text: "MAA 공식 홈페이지",
icon: "mdi:cow",
link: "https://maa.plus",
},
]);

View File

@@ -0,0 +1,29 @@
import { navbar } from "vuepress-theme-hope";
export const zhcnNavbar = navbar([
{
text: "主页",
icon: "ic:round-home",
link: "/zh-cn/",
},
{
text: "用户手册",
icon: "mdi:user",
link: "/zh-cn/manual/",
},
{
text: "开发文档",
icon: "ph:code-bold",
link: "/zh-cn/develop/",
},
{
text: "协议文档",
icon: "basil:document-solid",
link: "/zh-cn/protocol/",
},
{
text: "MAA 官网",
icon: "mdi:cow",
link: "https://maa.plus",
},
]);

View File

@@ -0,0 +1,29 @@
import { navbar } from "vuepress-theme-hope";
export const zhtwNavbar = navbar([
{
text: "首頁",
icon: "ic:round-home",
link: "/zh-tw/",
},
{
text: "用戶說明書",
icon: "mdi:user",
link: "/zh-tw/manual/",
},
{
text: "開發文件",
icon: "ph:code-bold",
link: "/zh-tw/develop/",
},
{
text: "協議文件",
icon: "basil:document-solid",
link: "/zh-tw/protocol/",
},
{
text: "MAA 官網",
icon: "mdi:cow",
link: "https://maa.plus",
},
]);

View File

@@ -1,21 +1,88 @@
import { searchPlugin } from "@vuepress/plugin-search";
export default function SearchPlugin() {
return searchPlugin({
export default {
appId: "99JM20SIFG",
apiKey: "7596a5a8c95cd64d4cf3050c9a4f878e",
indexName: "maa",
// 这里应该把所有本地化配置都放入 locales 中
locales: {
'/': {
placeholder: '搜索',
},
'/zh-tw/': {
placeholder: '搜索',
},
'/en-us/': {
placeholder: 'Search',
},
'/ja-jp/': {
placeholder: '検索する'
}
"/zh-cn/": {
placeholder: "搜索",
translations: {
button: {
buttonText: "搜索",
},
modal: {
searchBox: {
resetButtonTitle: "清除查询条件",
cancelButtonText: "取消",
},
startScreen: {
recentSearchesTitle: "搜索历史",
noRecentSearchesText: "没有搜索历史",
saveRecentSearchButtonTitle: "保存至搜索历史",
removeRecentSearchButtonTitle: "从搜索历史中移除",
favoriteSearchesTitle: "收藏",
removeFavoriteSearchButtonTitle: "从收藏中移除",
},
errorScreen: {
titleText: "无法获取结果",
helpText: "你可能需要检查你的网络连接",
},
footer: {
selectText: "选择",
navigateText: "切换",
closeText: "关闭",
searchByText: "搜索提供者",
},
noResultsScreen: {
noResultsText: "无法找到相关结果",
suggestedQueryText: "你可以尝试查询",
reportMissingResultsText: "你认为该查询应该有结果?",
reportMissingResultsLinkText: "点击反馈",
},
},
},
},
"/en-us/": {
placeholder: "Search",
translations: {
button: {
buttonText: "Search",
},
modal: {
searchBox: {
resetButtonTitle: "Clear the query",
cancelButtonText: "Cancel",
},
startScreen: {
recentSearchesTitle: "Recent",
noRecentSearchesText: "No recent searches",
saveRecentSearchButtonTitle: "Save this search",
removeRecentSearchButtonTitle:
"Remove this search from history",
favoriteSearchesTitle: "Favorite",
removeFavoriteSearchButtonTitle:
"Remove this search from favorites",
},
errorScreen: {
titleText: "Unable to fetch results",
helpText:
"You might want to check your network connection.",
},
footer: {
selectText: "to select",
navigateText: "to navigate",
closeText: "to close",
searchByText: "Search by",
},
noResultsScreen: {
noResultsText: "No results for",
suggestedQueryText: "Try searching for",
reportMissingResultsText:
"Believe this query should return results?",
reportMissingResultsLinkText: "Let us know.",
},
},
},
},
},
hotKeys: ['k']
})
}
};

View File

@@ -0,0 +1,101 @@
# This file MUST use GBK encoding, whatever the system language is.
# You may do more testing, but at least it works like this for me.
# Fuck Microsoft.
# 修改请使用 GBK 编码保存。
# 如果能用 UTF-8 保存而不乱码,那就去做,我实在是研究不明白微软的屎了。
# 你或许想加一条 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8 来解决问题。
# 但很神奇的,这根本不管用,甚至还会让中文汉字渲染重叠在一起。
# 我在 CMD 里面都能 chcp 65001 换成 UTF-8。
# 微软什么时候能把 PowerShell 7 集成到系统里。
# 我由衷的认为 Windows 中预装的 PowerShell 就是一坨屎,甚至不如 CMD。
# 用 PowerShell 写这东西真成为了一盘醋包的饺子了。
# 检查 PowerShell 脚本运行策略
# 我真理解不了这个运行策略的存在意义了,明明叫脚本运行策略,却可以用脚本修改。
# 我既可以在不提权的情况下允许所有脚本运行,也可以直接启动一个运行所有脚本运行的会话。
# 本脚本在测试时发现,在不修改策略且不提权的情况下也可以正常运行,只是在安装运行库时需要点安装程序的 UAC 弹窗。
# 而不修改策略且提权时反而因为脚本策略运行不了了,这是什么品种的管理员权限。
# $ExecutionPolicy = Get-ExecutionPolicy
# if ($ExecutionPolicy -eq 'Restricted' -or $ExecutionPolicy -eq 'AllSigned') {
# Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
# Write-Host "已修改当前用户的 PowerShell 脚本运行策略为 RemoteSigned 以便运行此脚本。"
# Write-Host "这只需运行一次,且理应不会产生较大的安全风险。"
# Write-Host "如果您对此有疑虑,请在脚本运行结束后,在 PowerShell 中运行以下命令将策略值清空。"
# Write-Host "Set-ExecutionPolicy -ExecutionPolicy Undefined -Scope CurrentUser"
# Pause
# }
# 获取 UAC 权限并启动一个 RemoteSigned 脚本策略会话
If (-Not ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)) {
Write-Host "正在获取管理员权限..."
Start-Process powershell.exe "-ExecutionPolicy RemoteSigned -File `"$PSCommandPath`" -ArgumentList `"$PSCommandPath`"" -Verb RunAs
Exit
}
# 读取系统代理并应用
$Internet_Settings = Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings'
if ($Internet_Settings.ProxyEnable -eq 1) {
$env:HTTP_PROXY = "http://$($Internet_Settings.ProxyServer)"
$env:HTTPS_PROXY = "http://$($Internet_Settings.ProxyServer)"
Write-Host "已应用系统代理:$($Internet_Settings.ProxyServer)"
}
# else {
# Write-Host "未启用系统代理。"
# }
Remove-Variable -Name Internet_Settings
# 新建下载用临时文件夹
New-Item -Path "$env:TEMP" -Name "MAA_Runtime_Fix_Pwsh" -ItemType "Directory" | Out-Null
# 使用 BITS 下载运行库安装包
Write-Host "正在下载运行库安装包..."
# Start-Sleep -Seconds 1
Start-BitsTransfer -Source "https://aka.ms/vs/17/release/vc_redist.x64.exe" -Destination "$env:TEMP\MAA_Runtime_Fix_Pwsh\vc_redist.x64.exe"
Start-BitsTransfer -Source "https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/8.0.11/windowsdesktop-runtime-8.0.11-win-x64.exe" -Destination "$env:TEMP\MAA_Runtime_Fix_Pwsh\windowsdesktop-runtime-8.0.11-win-x64.exe"
# 卸载 vc++ 和 dotnet8
Write-Host ""
Write-Host "尝试调用 WinGet 卸载已安装的运行库..."
winget uninstall "Microsoft.VCRedist.2015+.x64" "Microsoft.DotNet.DesktopRuntime.8" --force --all-versions
# 安装 vc++
Write-Host ""
Write-Host "正在安装/修复 Microsoft Visual C++ 可再发行程序包..."
$vcProcess = Start-Process "$env:TEMP\MAA_Runtime_Fix_Pwsh\vc_redist.x64.exe" -ArgumentList '/repair', '/passive', '/norestart' -PassThru
$vcProcess.WaitForExit()
# 安装 dotnet8
Write-Host "正在安装/修复 .NET 桌面运行时 8..."
$dotnetProcess = Start-Process "$env:TEMP\MAA_Runtime_Fix_Pwsh\windowsdesktop-runtime-8.0.11-win-x64.exe" -ArgumentList '/repair', '/passive', '/norestart' -PassThru
$dotnetProcess.WaitForExit()
# 删除临时文件夹
Write-Host ""
Write-Host "正在清理临时文件..."
Remove-Item -Path "$env:TEMP\MAA_Runtime_Fix_Pwsh" -Recurse -Force
Write-Host "运行库修复完成,请再次尝试运行 MAA。"
Write-Host ""
Pause
# 使用 winget 安装/更新运行库并卸载旧版本
# winget install "Microsoft.VCRedist.2015+.x64" "Microsoft.DotNet.DesktopRuntime.8" --uninstall-previous --accept-package-agreements
# 使用 winget 下载运行库安装包
# winget download --id "Microsoft.VCRedist.2015+.x64" -d "$env:TEMP\MAA_Runtime_Fix_Pwsh\"
# winget download --id "Microsoft.DotNet.DesktopRuntime.8" -d "$env:TEMP\MAA_Runtime_Fix_Pwsh\"
# 不使用 winget 卸载 vc++
# 会进行卸载 但是卸不掉
# Get-Package -Name "Microsoft Visual C++ 2015-2022 Redistributable (x64) - *" | Uninstall-Package -Force
# 不使用 winget 卸载 dotnet8
# 会进行卸载 但是卸不掉
# Get-Package -Name "Microsoft Windows Desktop Runtime - 8.* (x64)" | Uninstall-Package -Force
# 下载安装包那里注释了一个睡一秒是因为本来下载文件的那个进度条会把上面输出过的所有内容都覆盖掉,上来就只能看到个下载进度条,别的啥也看不到。
# 但当我去掉新建文件夹时输出的一大坨东西之后,这行就能露出来了。
# 我建议每个人都去看一下 PowerShell 的 New-Item 新建文件夹能输出多大一坨玩意。
# 还有 PowerShell 弱智一样的进度条显示机制,非得搞个固定不透明一大坨的浮窗上去干什么,就不能和别人一样在命令底部显示吗。
# 再用 Pwsh 写脚本我就是傻逼。

Binary file not shown.

After

Width:  |  Height:  |  Size: 691 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Some files were not shown because too many files have changed in this diff Show More