fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,568 Commits 61 Branches 1,836 Tags
2d4e1f01219939d29b0bead015f2fbcff695063a
Commit Graph

14568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
2d4e1f0121 chore: miss brackets 2025-04-13 14:26:24 +08:00
uye
0fc22c60ba fix: 雷电模拟器重新连接时误认为断开连接 
fix #12345
 2025-04-13 14:21:46 +08:00
github-actions[bot]
7c1355871a chore: Auto Templates Optimization 
Triggered by c138dba6c5

[skip changelog]
 2025-04-13 05:35:09 +00:00
github-actions[bot]
c138dba6c5 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
336a316f96 feat: 配置增加全局键移除 & bool自动转换 2025-04-13 11:19:26 +08:00
uye
2c6083573b chore: FightSeries use the same ROI for all clients 2025-04-12 23:43:50 +08:00
status102
21139bb448 fix: 自动战斗网络请求返回失败时，错误提示异常 2025-04-12 23:40:54 +08:00
status102
e2cf028951 perf: wpf自动战斗增加启动失败时的log 2025-04-12 23:40:54 +08:00
bodayw
fb4cf37b3d 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
26156ea157 fix: FightSeries for global (#12332) 2025-04-12 23:05:55 +08:00
Szzrain
9888f1bdd7 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
52558b3609 perf: 移除无效调用 2025-04-12 22:35:48 +08:00
status102
46e334b007 fix: 非自定义关卡名情况下，未能移除不显示的关卡 
fix #12331
 2025-04-12 22:35:47 +08:00
status102
5af7efa04b Revert "chore: 给剩余理智加个兜底" 
This reverts commit 3838bce450.
 2025-04-12 22:35:41 +08:00
uye
65a33d4dcc fix: 点击开始行动三秒未进入备战界面导致二次点击 
fix #12324
 2025-04-12 20:36:35 +08:00
status102
3e2f13525d ci: issue-checker顺带加一下新的反馈包名 2025-04-12 19:47:00 +08:00
status102
a8750173e5 ci: issue-checker 日志上传失败提示 2025-04-12 19:43:26 +08:00
uye
3838bce450 chore: 给剩余理智加个兜底 2025-04-12 17:43:13 +08:00
Constrat
a972a61aed fix: trade post rewards post base update 
fix #12333
 2025-04-12 09:02:03 +02:00
Constrat
4b6eecd1d0 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
4bad087008 docs: fix punctuation for en-us 2025-04-11 17:35:39 +02:00
status102
1ca7e325a3 chore: file header & warning 2025-04-11 15:22:23 +08:00
HX3N
4a87b56e23 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]
69a962aaa4 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
f7a174b321 fix: YostarKR InfrastReward ocr fix (#12317) 2025-04-10 22:34:53 +02:00
uye
cb27fdd72f chore: 使用 MirrorChyan 进行软件更新时未处理 errorCode 显示 2025-04-11 01:57:02 +08:00
uye
928f037b30 chore: 顺序检查 2025-04-10 23:39:25 +08:00
uye
a73b540233 chore: 弹窗加个文件名 2025-04-10 18:29:19 +08:00
pre-commit-ci[bot]
884725c125 chore: Auto update by pre-commit hooks [skip changelog] 2025-04-10 16:51:35 +08:00
status102
bf1bea6574 feat: 自动战斗15章突袭难度适配 2025-04-10 16:51:35 +08:00
status102
f36f17a0b9 chore: 自动战斗 战斗列表 关卡导航名允许覆盖 2025-04-10 16:51:35 +08:00
status102
0e532da380 perf: 背景图默认值修改为相对路径 2025-04-10 15:34:32 +08:00
status102
005396048d fix: Wpf一键长草任务栏设置按钮绑定报错 2025-04-10 15:34:31 +08:00
Constrat
88eef35e38 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
abdca491e8 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
b3d2efaa6f fix: 修复手动关闭模拟器导致的连接状态不一致问题 
fix #12309
 2025-04-09 19:10:57 +08:00
uye
b89f106591 fix: 连战次数 2025-04-09 17:50:59 +08:00
Weiyou Wang
1580c79db5 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
38df43762b 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
5e679b5606 fix: Wpf刷理智连战次数UI为空 2025-04-09 17:29:28 +08:00
status102
be215f61fc fix: task name 
[skip changelog]
 2025-04-09 17:12:46 +08:00
uye
ad077a9f33 perf: 热更新资源改为异步加载避免启动阻塞 2025-04-09 16:58:52 +08:00
status102
be7f4f999d fix: 刷理智碎石时网络卡顿造成重复点击 
fix #12290
 2025-04-09 16:51:28 +08:00
status102
17d77ce901 Revert "fix: 吃药/碎石 时网络波动延迟导致二次确认时点到取消代理" 
This reverts commit b3b1638127.
 2025-04-09 16:38:50 +08:00
status102
31cef06bc5 fix: task type 2025-04-09 16:27:54 +08:00
status102
4e3997637d fix: 修复刷理智错误识别突袭关3星结算 2025-04-09 16:27:41 +08:00
uye
4546b6596b fix: typo 
[skip changelog]
 2025-04-09 16:25:11 +08:00
uye
a26b46dc30 fix: 主线关卡未选择默认进度时无法导航 2025-04-09 16:21:04 +08:00
uye
b3b1638127 fix: 吃药/碎石 时网络波动延迟导致二次确认时点到取消代理 2025-04-09 15:57:58 +08:00
uye
e9c79cddef chore: 调整热更提示 2025-04-09 13:49:58 +08:00