fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,187 Commits 60 Branches 1,840 Tags
ead67ca20cdedec6fc5fc72d9ff84abb83b5c9a5
Commit Graph

13187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
ead67ca20c chore: Auto Templates Optimization 
Triggered by 6331dbb82b

[skip changelog]
 2024-10-31 17:16:46 +00:00
Constrat
6331dbb82b feat: MiningActivity for YostarEN 2024-10-31 18:16:25 +01:00
github-actions[bot]
44c3b2f54b 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
uye
37cb7f80eb Release v5.9.0-beta.1 (#10989) 2024-10-31 23:53:31 +08:00
github-actions[bot]
f513fc6234 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
a92e11e51f 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]
ff64dd86ab chore: Auto Templates Optimization 
Triggered by 42a00e0e18

[skip changelog]
 2024-10-31 14:37:47 +00:00
晓丶梦丶仁
319c88319e 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
77f9cd6b62 docs: MuMu 网络桥接 (#10953) 
* docs: 追一下最新修改

* i18n: MuMu 网络桥接

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-10-31 22:02:44 +08:00
晓丶梦丶仁
c07e989d64 perf: 肉鸽选难度允许不选难度 (#10979) 
* perf: 肉鸽选难度允许不选难度

* fix: 在插件中对 gui 传入的 -1 值做特殊处理
 2024-10-31 21:41:36 +08:00
Weiyou Wang
4c385f0915 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]
9b54b32ffc 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
ffc2f2d14f chore: 繁中服「銀心湖列車」活動導航 (#10987) 2024-10-31 14:22:26 +01:00
Manicsteiner
42a00e0e18 chore: YostarJP EP14 ocr update (#10986) 2024-10-31 14:21:16 +01:00
uye
9f956d9720 chore: 优化模拟器最小化启动 2024-10-31 20:20:13 +08:00
uye
8808602ee0 perf: 优化互斥锁 2024-10-31 20:20:13 +08:00
github-actions[bot]
6f7269336e 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]
2e6be1989f 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]
5a74fb2d12 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]
49a12a8cfb 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
19dd31a74c docs: 移除赘字 (#10977) 2024-10-31 01:31:53 +08:00
uye
c805518591 chore: 对 gui.json 排序 2024-10-30 12:47:37 +08:00
Weiyou Wang
f74e556cc6 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
3e5bf41bc4 fix: 肉鸽难度默认值错误 2024-10-30 10:51:04 +08:00
uye
d970dae452 fix: 1234567890ABCDEF 给爷爬 2024-10-30 10:48:35 +08:00
萨拉托加
e711f2236e 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]
49722e547f 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
f2c89c0446 fix: Special Access not claiming 2024-10-29 17:51:25 +01:00
uye
12da3b36d8 chore: 修改版本不一致描述，提前 return 位置 2024-10-29 18:03:40 +08:00
uye
e2e73a8937 chore: 资源更新失败时弹出吐司通知 2024-10-29 17:19:37 +08:00
uye
b84b94656c feat: 添加直接显示吐司内容函数，固定Show执行线程 2024-10-29 17:10:54 +08:00
uye
c45d4dc2a1 chore: 设置代理时提高github优先度 2024-10-29 17:08:38 +08:00
uye
c4da235de7 chore: 移除多余变量 2024-10-29 16:53:48 +08:00
uye
75dba872a5 fix: 修复手动关闭或闪退后，无法截图到新窗口 2024-10-29 16:24:40 +08:00
uye
23549003b2 feat: 添加主任务进度条 2024-10-29 16:06:38 +08:00
uye
eb12ebf8fc chore: remove test 2024-10-29 15:22:11 +08:00
uye
cd5397bfc9 perf: 调整关卡选择更新逻辑 (#10913) 2024-10-29 14:47:52 +08:00
晓丶梦丶仁
3249f809a4 fix: 为生息演算无存档刷点数模式最后的删除存档任务添加重试机制 (#10965) 
fix: 为 Tales@RA@PNS-ProsperityBelowLimit-SwipeSave 任务添加重试机制
 2024-10-29 14:44:59 +08:00
uye
8e81eb1010 perf: 优化全主线关卡导航 2024-10-29 13:37:31 +08:00
github-actions[bot]
8a60089a0f 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
f4cb72aef9 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]
f415a29a6c 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
667c4bba89 feat: Special Access YostarEN 2024-10-28 22:53:59 +01:00
uye
96927fe22e feat: 支持状态栏显示进度条 2024-10-29 02:57:07 +08:00
Manicsteiner
209876ca36 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
2be9e12936 fix: 快速编队向左滑动后等待可能的画面回弹 2024-10-28 11:25:38 +08:00
status102
e57cded7af style: format 
[skip changelog]
 2024-10-28 09:24:38 +08:00
Weiyou Wang
e4bfd54d94 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
f632936e39 fix: MaaCore RoguelikeTask 补充未选择刷开局模式下启用凹精二的禁用判定 2024-10-27 19:24:08 +08:00
Alisa
fde8363f92 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