Commit Graph

2867 Commits

Author SHA1 Message Date
lhhxxxxx
2aa203e08a fix. 紧急修复msvc warning 2022-07-31 22:51:48 +08:00
lhhxxxxx
2a6e2ac9f7 fix. 修复c++17除meojson外的g++ warning
style. 语法修复
2022-07-31 22:27:11 +08:00
MistEO
35e513deda docs: 更新 CHANGELOG 2022-07-31 21:41:33 +08:00
MistEO
9f9dda00ae perf: 调整肉鸽招募优先级 2022-07-31 21:32:19 +08:00
lhhxxxxx
2199112a39 fix. update .gitignore 2022-07-31 21:16:26 +08:00
lhhxxxxx
0afff07787 style. typo大修正 2022-07-31 20:47:58 +08:00
MistEO
43219f31b9 fix: 修复运行报错 2022-07-31 20:39:48 +08:00
MistEO
9737aa38c5 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-31 20:32:13 +08:00
MistEO
490b4a5da7 feat: 肉鸽商店购物支持按稀有度计算具体的晋升等级,修改相关资源及解析 2022-07-31 20:31:59 +08:00
Helloworld
4cee6f208b Merge pull request #1393 from MaaAssistantArknights/docs/doc
docs: 漏网之鱼
2022-07-31 20:26:13 +08:00
MistEO
3ce039cc87 feat: 召唤不要首选令了 2022-07-31 20:18:42 +08:00
Helloworld
8694ab0c5d docs: 漏网之鱼 2022-07-31 20:18:38 +08:00
MistEO
6f4ca63076 feat: 简单加个肉鸽商店是否买个晋升类物品的判断逻辑 2022-07-31 20:16:26 +08:00
MistEO
13fd3d48b7 Merge pull request #1385 from horror-proton/test/recruit_mech
自动公招相关的调整
2022-07-31 20:11:13 +08:00
Helloworld
b726323c02 Merge pull request #1390 from MaaAssistantArknights/docs/i18n
i18n: 修正笔误
2022-07-31 20:09:43 +08:00
Helloworld
8f1e487548 i18n: 修正笔误 2022-07-31 19:37:07 +08:00
lhhxxxxx
9827d8b78f Merge pull request #1389 from MaaAssistantArknights/docs/doc
添加文档注释
2022-07-31 19:31:24 +08:00
Helloworld
022bdb0076 Merge branch 'dev' into docs/doc 2022-07-31 19:24:05 +08:00
lhhxxxxx
93383c3126 Merge remote-tracking branch 'origin/dev' into dev 2022-07-31 18:50:58 +08:00
lhhxxxxx
2d642fc7c5 style. 部分typo修正及翻译修正 2022-07-31 18:50:31 +08:00
uye
eb289b5695 feat: 重新添加源石锭额外掉落藏品的属性 2022-07-31 18:32:19 +08:00
uye
00396b3ca4 feat: 更新肉鸽商店购买列表 2022-07-31 18:23:35 +08:00
Helloworld
cb6d772c85 docs: UserControl 2022-07-31 17:43:00 +08:00
zzyyyl
b58e86263d style: 对齐一下被 code tidy 打乱的注释 2022-07-31 17:39:57 +08:00
Helloworld
29f9d865e4 docs: Bootstrapper 2022-07-31 17:38:16 +08:00
Helloworld
a8afd335ee docs: ViewModels 2022-07-31 17:32:56 +08:00
zzyyyl
221a56062a fix: 修复 c++17 没有但是 c++20 有的 errors 2022-07-31 16:43:45 +08:00
Helloworld
eaec55c0b6 docs: Helper 2022-07-31 16:43:13 +08:00
MistEO
7dfea3d416 perf: 优化肉鸽购物逻辑,将职业改为数组,并新增 chars 字段 2022-07-31 16:20:55 +08:00
Helloworld
83c265d8e0 docs: AsstProxy 2022-07-31 16:13:26 +08:00
Helloworld
adb299a948 修复格式 2022-07-31 15:34:17 +08:00
MistEO
be3d7656ef fix: 增加一下额外滑动距离,不知道对基建误触有没有改善 2022-07-31 15:29:33 +08:00
MistEO
e8c49c6d1b Merge pull request #1387 from et2012/dev
feat: 肉鸽招募券支持翻页
2022-07-31 15:14:58 +08:00
MistEO
22bfecdedd fix: 修复肉鸽干员重复开技能的问题 2022-07-31 14:56:16 +08:00
MistEO
039b3ef3e7 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-31 14:48:28 +08:00
MistEO
512cc97d55 fix: 修复肉鸽信用商店购买完招募相关物品后直接离开商店的问题 2022-07-31 14:48:20 +08:00
lhhxxxxx
f1b676f58e style. use _v instead of ::value 2022-07-31 13:15:35 +08:00
lhhxxxxx
d9039f0dc7 style. typo fix 2022-07-31 13:09:22 +08:00
uye
cd8dcf973c fix: 修复一个笔误引起的提示错误 2022-07-31 12:42:44 +08:00
et
965ac5d525 feat: 肉鸽招募券支持翻页 2022-07-31 12:36:40 +08:00
Horror Proton
683332b3cb fix: update auto recruit mech 2022-07-31 10:53:04 +08:00
Horror Proton
855f214d75 perf: use functional tools in recruit config 2022-07-31 10:51:25 +08:00
lhhxxxxx
de288b8759 Merge pull request #1374 from lhhxxxxx/dev
Code Tidy
2022-07-31 03:20:24 +08:00
MistEO
ef9069eab8 docs: 更新CHANGELOG 2022-07-31 03:10:07 +08:00
MistEO
5002b7504d style: 傻逼VS怎么又给我瞎格式化 2022-07-31 03:03:10 +08:00
MistEO
3c6b822fc6 feat: 支持肉鸽商店根据当前已有干员区分是否购买;支持购买金酒之杯后不再额外消耗源石锭 2022-07-31 03:01:56 +08:00
MistEO
4efa10a37c fix: 修复肉鸽商店购买收藏品时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1380
2022-07-31 01:04:11 +08:00
MistEO
5056d6a86b perf: 调整肉鸽干员的技能 2022-07-31 01:04:11 +08:00
lhhxxxxx
cdc98eefe8 Merge remote-tracking branch 'myfork/dev' into dev 2022-07-30 18:25:32 +08:00
lhhxxxxx
a579d8b944 perf. c++ code tidy
style. typo fixed
2022-07-30 18:24:31 +08:00