fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,651 Commits 61 Branches 1,839 Tags
6db893a23dc9cd24802c2e8ea790bfb287750e65
Commit Graph

14651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 alpha/v5.15.1-alpha.1.d038.g3d7b7d5e5 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>
alpha/v5.15.1-alpha.1.d034.g3babe9d76 		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酱链接按照操作系统自动生成 alpha/v5.15.1-alpha.1.d024.g63bedace6 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: 连战次数 alpha/v5.15.1-alpha.1.d020.gea29cc2c2 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?)
v5.15.0 		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 alpha/v5.15.0-beta.2.d034.g5ad0f1e1f 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