Commit Graph

12979 Commits

Author SHA1 Message Date
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: 判断是否存在捕获组
alpha/v5.6.1-alpha.1.d074.g34a2b083d
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 alpha/v5.6.1-alpha.1.d070.g389ce2d5f 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>
alpha/v5.6.1-alpha.1.d062.g08f44e066
2024-09-10 12:03:52 +01:00
github-actions[bot]
ba596c74f8 chore: Auto Templates Optimization
[skip changelog]
alpha/v5.6.1-alpha.1.d061.gba596c74f
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.
alpha/v5.6.1-alpha.1.d045.g40327e4f4
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]
alpha/v5.6.1-alpha.1.d044.gb1c607518
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]
alpha/v5.6.1-alpha.1.d037.g927ab19e3
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