Commit Graph

701 Commits

Author SHA1 Message Date
MistEO
ecfa2753bf feat: 肉鸽技能识别不准,所以不识别了.jpg 2022-08-01 23:29:32 +08:00
zzyyyl
110a1327b6 style: 日志首字母大写 2022-08-01 22:28:37 +08:00
MistEO
08728e7b6c fix: 整理一点肉鸽的日志 2022-08-01 22:25:18 +08:00
MistEO
c7b017b93d feat: 调整一下肉鸽战斗中放干员的优先级 2022-08-01 22:17:30 +08:00
MistEO
8d2314ccf7 fix: 修复肉鸽指定干员较靠后时选不到的问题,整理一些日志 2022-08-01 22:17:28 +08:00
zzyyyl
d33de91230 chore: 给肉鸽招募加点日志 2022-08-01 21:57:54 +08:00
zzyyyl
6477463fd3 feat: 给肉鸽招募加点日志;修改一下 check_core_char 的逻辑 2022-08-01 18:14:13 +08:00
lhhxxxxx
4bba73ce7a fix. 补上漏掉的重构 2022-08-01 12:36:32 +08:00
Horror Proton
59da4fcf50 fix: fix recruit slot force skip 2022-08-01 11:17:55 +08:00
lhhxxxxx
477458d896 fix. 漏了一个 2022-07-31 22:57:40 +08:00
lhhxxxxx
6b6c4f8048 fix. 紧急修复msvc warning 2022-07-31 22:51:48 +08:00
lhhxxxxx
777f3a2819 fix. 修复c++17除meojson外的g++ warning
style. 语法修复
2022-07-31 22:27:11 +08:00
lhhxxxxx
e66cc1b31b style. typo大修正 2022-07-31 20:47:58 +08:00
MistEO
2321c30cdb fix: 修复运行报错 2022-07-31 20:39:48 +08:00
MistEO
716bf3edcd Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-31 20:32:13 +08:00
MistEO
46eff7411c feat: 肉鸽商店购物支持按稀有度计算具体的晋升等级,修改相关资源及解析 2022-07-31 20:31:59 +08:00
MistEO
a97c77cd5c feat: 简单加个肉鸽商店是否买个晋升类物品的判断逻辑 2022-07-31 20:16:26 +08:00
MistEO
dce42c67e6 Merge pull request #1385 from horror-proton/test/recruit_mech
自动公招相关的调整
2022-07-31 20:11:13 +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
166b8e59d4 Merge pull request #1387 from et2012/dev
feat: 肉鸽招募券支持翻页
2022-07-31 15:14:58 +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
et
0e994b2e5e feat: 肉鸽招募券支持翻页 2022-07-31 12:36:40 +08:00
Horror Proton
bb9ce93d16 fix: update auto recruit mech 2022-07-31 10:53:04 +08:00
Horror Proton
ebe3760ef3 perf: use functional tools in recruit config 2022-07-31 10:51:25 +08:00
lhhxxxxx
9578358947 Merge pull request #1374 from lhhxxxxx/dev
Code Tidy
2022-07-31 03:20:24 +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
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
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
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
c029fdfafb fix: 修复自选干员重装和术师不选的问题 2022-07-30 03:04:38 +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