fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,810 Commits 60 Branches 1,840 Tags
fb6fbfc77e372cdbb6bf0f54dcda062363d19a68
Commit Graph

2810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
fb6fbfc77e feat: 更新肉鸽商店购买列表 2022-07-31 18:23:35 +08:00
zzyyyl
349f7635b6 style: 对齐一下被 code tidy 打乱的注释 2022-07-31 17:39:57 +08:00
zzyyyl
5de783ed29 fix: 修复 c++17 没有但是 c++20 有的 errors 2022-07-31 16:43:45 +08:00
MistEO
e319ddf4a9 perf: 优化肉鸽购物逻辑，将职业改为数组，并新增 chars 字段 2022-07-31 16:20:55 +08:00
MistEO
fa972811af fix: 增加一下额外滑动距离，不知道对基建误触有没有改善 2022-07-31 15:29:33 +08:00
MistEO
166b8e59d4 Merge pull request #1387 from et2012/dev 
feat: 肉鸽招募券支持翻页
 2022-07-31 15:14:58 +08:00
MistEO
f0acfacb06 fix: 修复肉鸽干员山重复开技能的问题 2022-07-31 14:56:16 +08:00
MistEO
1aa9e49410 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-31 14:48:28 +08:00
MistEO
a3760084ef fix: 修复肉鸽信用商店购买完招募相关物品后直接离开商店的问题 2022-07-31 14:48:20 +08:00
lhhxxxxx
0a418a2260 style. use _v instead of ::value 2022-07-31 13:15:35 +08:00
lhhxxxxx
6ff5ba9c11 style. typo fix 2022-07-31 13:09:22 +08:00
uye
6b03929c8b fix: 修复一个笔误引起的提示错误 2022-07-31 12:42:44 +08:00
et
0e994b2e5e feat: 肉鸽招募券支持翻页 2022-07-31 12:36:40 +08:00
lhhxxxxx
9578358947 Merge pull request #1374 from lhhxxxxx/dev 
Code Tidy
 2022-07-31 03:20:24 +08:00
MistEO
af06898963 docs: 更新CHANGELOG 2022-07-31 03:10:07 +08:00
MistEO
f720b9184d style: 傻逼VS怎么又给我瞎格式化 2022-07-31 03:03:10 +08:00
MistEO
6f1692dd7a feat: 支持肉鸽商店根据当前已有干员区分是否购买；支持购买金酒之杯后不再额外消耗源石锭 2022-07-31 03:01:56 +08:00
MistEO
98b1d6aab7 fix: 修复肉鸽商店购买收藏品时卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1380
 2022-07-31 01:04:11 +08:00
MistEO
f5d00d29a3 perf: 调整肉鸽干员的技能 2022-07-31 01:04:11 +08:00
lhhxxxxx
0384702fc8 Merge remote-tracking branch 'myfork/dev' into dev 2022-07-30 18:25:32 +08:00
lhhxxxxx
f303018fdc perf. c++ code tidy 
style. typo fixed
 2022-07-30 18:24:31 +08:00
lhhxxxxx
424decb288 Merge remote-tracking branch 'origin/dev' into dev 2022-07-30 18:22:10 +08:00
lhhxxxxx
ec3561862e Merge remote-tracking branch 'origin/dev' into dev 2022-07-30 18:21:33 +08:00
Horror Proton
90b51ab97f fix: remove a fake error in auto recruit task 2022-07-30 15:57:20 +08:00
MistEO
c2218b72cf fix: 修复战斗中干员 cooling 状态偶现识别错误问题 2022-07-30 15:55:17 +08:00
zzyyyl
a0efa59991 fix: 修复公招文本 出现错误 的本地化问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1379
 2022-07-30 15:45:27 +08:00
uye
595e0fa962 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-30 10:22:57 +08:00
uye
e646baac0a feat: 添加连接设置提示 2022-07-30 10:20:05 +08:00
uye
4d71999da5 feat: 更新作业群 2022-07-30 10:06:37 +08:00
Horror Proton
ecd36f0f42 fix: fix wrong behavior when recruit permit ran out 2022-07-30 10:01:59 +08:00
lhhxxxxx
f52d30a6cc revert. add asst:: 2022-07-30 06:18:55 +08:00
lhhxxxxx
19206538e2 revert. add asst:: 2022-07-30 06:18:47 +08:00
lhhxxxxx
f37ba5a795 revert. add std:: 2022-07-30 06:18:25 +08:00
lhhxxxxx
5a7d9fc52a revert. delete [[nodiscard]] 2022-07-30 06:11:56 +08:00
lhhxxxxx
9dbfcf7984 Merge remote-tracking branch 'origin/dev' into dev_ 
# Conflicts:
#	src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs
 2022-07-30 05:33:11 +08:00
lhhxxxxx
0c03220220 perf. c++ code tidy 2022-07-30 05:31:19 +08:00
MistEO
2ec3082246 perf: 优化肉鸽压轴登场摆放 2022-07-30 05:04:20 +08:00
MistEO
61c60fe077 Merge branch 'dev' 2022-07-30 03:06:49 +08:00
MistEO
c029fdfafb fix: 修复自选干员重装和术师不选的问题 2022-07-30 03:04:38 +08:00
MistEO
42c7234165 Merge pull request #1372 from MaaAssistantArknights/dev 
Release v4.2.0-alpha.2
 2022-07-30 02:37:30 +08:00
MistEO
d998976d44 docs: 更新CHANGELOG 2022-07-30 02:36:47 +08:00
MistEO
bacbd519a8 fix: 修复界面检查更新错误 2022-07-30 02:36:12 +08:00
zzyyyl
736de156f8 feat: 优化更新时的 Changelog 弹窗样式 (#1373) 
* feat: 优化贡献者名字显示

但是好丑

* feat: 换了个玛丽说好看的 Markdown
 2022-07-30 02:31:14 +08:00
MistEO
91e1949d46 feat: 肉鸽下干员等等费用，不急着下 2022-07-30 02:30:55 +08:00
MistEO
e3c80a9e94 feat: 肉鸽不在需求内的干员排个序（招精二也要优先招等级高的！） 2022-07-30 01:32:38 +08:00
MistEO
af2d2f6c06 perf: 调整肉鸽一些阈值参数等 2022-07-30 01:18:51 +08:00
MistEO
835d1e56c7 fix: 修复肉鸽干员优先级排序错误 2022-07-30 01:18:36 +08:00
MistEO
61185cb70b Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-30 00:34:06 +08:00
MistEO
87a3319e30 fix: 修复自定义干员不选的问题，修复临时招募的精二干员不选的问题 2022-07-30 00:33:59 +08:00
MistEO
c4b49c7aa9 fix: 修复肉鸽第二次进入商店无法投资时，任务失败的问题 2022-07-30 00:23:37 +08:00