fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,942 Commits 61 Branches 1,838 Tags
287c0e09558fc95d1db1d71a547333fb03c566bb
Commit Graph

2942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lhhxxxxx
287c0e0955 style. use same_as && derived_from 2022-08-05 01:33:41 +08:00
Alisa
360727a202 Merge pull request #1446 from MaaAssistantArknights/fix/checksum-encoding 
修复 MaaBuilder 的一些错误
 2022-08-05 00:53:28 +08:00
Liam Sho
c191f57e48 fix: 修复 MaaBuilder 路径错误 
顺便修复一下
 2022-08-05 00:31:33 +08:00
Liam Sho
1c98592b47 fix: 修复 checksum.json 编码错误 
fix #1444
 2022-08-05 00:24:07 +08:00
lhhxxxxx
4075e39a77 perf. 加了应该没问题的[[unlikely]] 2022-08-05 00:13:10 +08:00
lhhxxxxx
decd53dc3d style. 使用字面量时间 2022-08-04 22:26:03 +08:00
uye
7513ad2ddf feat: 切换语言的弹窗提示由目标语言显示 2022-08-04 14:50:52 +08:00
uye
037099dcfc style: 优化全屏显示 2022-08-04 14:50:52 +08:00
Horror Proton
6b8a6e0831 fix: fix a typo in YoStarEN ocr replace rules 2022-08-04 00:55:15 +08:00
MistEO
aca1b51b86 fix: 删掉一些用不上还可能带来问题的函数，修复肉鸽 假日威龙陈 技能选择错误 2022-08-04 00:05:38 +08:00
MistEO
42b62e781f perf: 尝试按照maa的战斗思路优化肉鸽商店购买优先级 2022-08-03 23:09:02 +08:00
MistEO
c4f3819636 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-03 20:50:19 +08:00
MistEO
f9e0940d42 fix: 修复肉鸽商店弹出额外赠送的藏品后卡住的问题 2022-08-03 20:50:09 +08:00
uye
ca323aed9e doc: Update README_en-US.md 2022-08-03 19:45:35 +08:00
uye
ae2f534a5a doc: Update README_ja-JP.md 2022-08-03 19:44:36 +08:00
uye
00bf11d381 doc: Update README_zh-TW.md 2022-08-03 19:43:04 +08:00
uye
1bae1afe1c doc: Update README.md 2022-08-03 19:41:18 +08:00
MistEO
0934e5e48f Merge pull request #1426 from MaaAssistantArknights/dev 
Release v4.2.2
 2022-08-03 19:40:31 +08:00
uye
dc8817534f feat: 一群又不满啦！ 2022-08-03 19:39:18 +08:00
MistEO
57861db9aa perf: 调整了一下肉鸽干员优先级 2022-08-03 19:38:50 +08:00
Horror Proton
4f7d219389 fix: fix a recruit iterator issue 2022-08-03 19:09:20 +08:00
uye
5cb47ef051 fix: 修复连续切换语言后的报错 2022-08-03 17:35:07 +08:00
uye
6ae7c5e9a0 feat: 翻译 2022-08-03 17:11:06 +08:00
uye
86daa70b56 style: 优化全屏显示 2022-08-03 16:08:21 +08:00
zzyyyl
69f894d67f perf: 优化公招 tags 处理 2022-08-03 13:52:34 +08:00
Horror Proton
a246748c04 fix: fix a recruit iterator issue 2022-08-03 12:50:30 +08:00
uye
b7f7c4fa66 feat: 修改关卡导航排序 2022-08-03 00:19:07 +08:00
MistEO
d6d52648ac Merge pull request #1420 from MaaAssistantArknights/dev 
Release v4.2.2-beta.1
 2022-08-02 23:57:33 +08:00
MistEO
20b63d8680 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-02 23:56:59 +08:00
MistEO
e33484a03f docs: 更新 CHANGELOG 2022-08-02 23:56:56 +08:00
uye
76ffd3ede6 style: 修改肉鸽设置格式 2022-08-02 23:55:44 +08:00
MistEO
dfd68357ad Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-02 23:48:12 +08:00
MistEO
fd77590a4b docs: 补充肉鸽新增自动的文档， 修正测试用例 2022-08-02 23:48:08 +08:00
Horror Proton
b463cec24c fix: fix output of auto recruit task when there is senior tag 2022-08-02 23:44:28 +08:00
Horror Proton
aca00c85d4 perf: change sorting rule of RecruitCombs operator list 2022-08-02 23:44:28 +08:00
MistEO
46747dfe27 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-02 23:42:28 +08:00
MistEO
ca7011b80b docs: 更新CHANGELOG 2022-08-02 23:42:22 +08:00
MistEO
b57e1cf085 Merge pull request #1409 from lhhxxxxx/dev 
perf. 使用ranges及views及<=>及其他一些c++20优化及一般优化
 2022-08-02 23:41:39 +08:00
MistEO
269168fac9 i18n: add i18n of the I.S. core char tip 2022-08-02 23:35:21 +08:00
MistEO
1ba86e8acc Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-02 23:29:40 +08:00
MistEO
63a66cc95e feat: the I.S. custom starting supports YoStarEN and YoStarJP now, and add localized translation 2022-08-02 23:29:37 +08:00
uye
1a2525855f style: 修改切换语言后的ui 2022-08-02 23:24:14 +08:00
MistEO
7de5bb865b fix: 尝试修复部分设备上基建滑动失效导致的干员换班错误 2022-08-02 22:22:05 +08:00
MistEO
628b962615 fix: 修复肉鸽编队偶现少选一个人的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1417
 2022-08-02 22:16:00 +08:00
MistEO
76fcfaa0ea feat: 支持剿灭模式全权委托及掉落识别 2022-08-02 22:01:11 +08:00
MistEO
5ff4ec4e1c Merge pull request #1412 from horror-proton/test/clang_warnings 
修复 Linux 下的部分编译错误和警告
 2022-08-02 20:01:16 +08:00
MistEO
8d3c77b935 Merge pull request #1402 from zzyyyl/feat/concept 
perf: 使用 concept 优化代码
 2022-08-02 19:59:30 +08:00
uye
5416c46a0d style: 格式化xaml 2022-08-02 18:14:28 +08:00
uye
6e10be4fc8 style: 优化全屏显示效果 2022-08-02 18:07:10 +08:00
lhhxxxxx
5f6fdb4bf0 style. 小修一下格式 2022-08-02 17:59:38 +08:00