Commit Graph

1557 Commits

Author SHA1 Message Date
lhhxxxxx
8f23c2ae16 style. 使用宏优化编码 2022-08-02 00:03:41 +08:00
MistEO
921fedab18 style: 改改界面提示 2022-08-01 23:34:03 +08:00
MistEO
f25e70b642 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-01 23:29:45 +08:00
MistEO
16f5aed6a1 feat: 肉鸽技能识别不准,所以不识别了.jpg 2022-08-01 23:29:32 +08:00
MistEO
7f9b72e0b7 Merge pull request #1391 from MaaAssistantArknights/feat/c++20
refactor: 升级c++20
2022-08-01 23:20:52 +08:00
MistEO
2a447b4ad2 feat: Change the delimiter for credit store to a semicolon 2022-08-01 22:36:19 +08:00
zzyyyl
927fbd2f08 style: 日志首字母大写 2022-08-01 22:28:37 +08:00
MistEO
4ea91a858b fix: 整理一点肉鸽的日志 2022-08-01 22:25:18 +08:00
MistEO
3c22e6ab06 feat: 调整一下肉鸽战斗中放干员的优先级 2022-08-01 22:17:30 +08:00
MistEO
eec1399126 fix: 修复肉鸽指定干员较靠后时选不到的问题,整理一些日志 2022-08-01 22:17:28 +08:00
zzyyyl
706eef50fa chore: 给肉鸽招募加点日志 2022-08-01 21:57:54 +08:00
MistEO
4964f75646 fix: 修复Deb下的项目配置(C++20) 2022-08-01 20:25:18 +08:00
MistEO
f9a63b3528 refactor: 将 disable cv warning 的宏额外封装了一层头文件 2022-08-01 20:16:58 +08:00
zzyyyl
9ab5fb78a5 feat: 给肉鸽招募加点日志;修改一下 check_core_char 的逻辑 2022-08-01 18:14:13 +08:00
zzyyyl
b09d0509cb chore: 把 Config.hpp 放到 filter 的 Utils 里面 2022-08-01 12:45:13 +08:00
zzyyyl
a2cb5eae1c style: 删掉多的换行 2022-08-01 12:39:40 +08:00
lhhxxxxx
07d2a32fc4 fix. 补上漏掉的重构 2022-08-01 12:36:32 +08:00
MistEO
0ecbab590f fix: 补上漏掉的肉鸽分队
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1399
2022-08-01 12:18:28 +08:00
Horror Proton
b651e8e0ae feat: add Config.hpp 2022-08-01 12:12:30 +08:00
zzyyyl
2f545acedb fix: 尝试修复 clang warnings 2022-08-01 11:29:36 +08:00
Horror Proton
d6b2f47f9a fix: fix recruit slot force skip 2022-08-01 11:17:55 +08:00
lhhxxxxx
22edec16c8 fix. 漏了一个 2022-07-31 22:57:40 +08:00
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
zzyyyl
d80f37f4a6 fix: 修复 linux 下的一些 errors 2022-07-31 21:56:48 +08:00
Horror Proton
d0b752d719 fix: suppress -Wdeprecated-enum-enum-conversion in opencv 2022-07-31 21:39:16 +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
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
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
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
64d571ad33 refactor: 升级 c++20! 2022-07-31 16:59:31 +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
e8c49c6d1b Merge pull request #1387 from et2012/dev
feat: 肉鸽招募券支持翻页
2022-07-31 15:14:58 +08:00