fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 01:59:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,137 Commits 61 Branches 1,838 Tags
95300cae4e242670fa7405d4e91bfb2d7f41b4e9
Commit Graph

2243 Commits

Author SHA1 Message Date
DavidWang19
95300cae4e fix: 修复不能正确识别医疗干员攻击范围的问题 2022-10-09 00:54:09 +08:00
DavidWang19
3bfbfa86c2 resolve conflict 2022-10-09 00:54:09 +08:00
DavidWang19
8570bcfa67 perf: 加速了对撤退干员的查询 2022-10-09 00:54:09 +08:00
DavidWang19
f34126d60c perf: 优化肉鸽自动战斗逻辑 2022-10-09 00:54:09 +08:00
MistEO
9e7abf4b74 Merge pull request #2116 from MaaAssistantArknights/feat/at 
feat: 增加模板任务逻辑
 2022-10-09 00:05:48 +08:00
MistEO
72df50cbc3 Merge pull request #2231 from fearlessxjdx/dev 
perf: 加快相邻排班变化不大时的干员选取速度
 2022-10-09 00:02:55 +08:00
MistEO
7228706ea3 feat: 更新界面关于里的链接 2022-10-08 23:12:34 +08:00
MistEO
0626d32a03 fix: 修复网络不佳时，信用商店购物卡住的问题。并优化信用商店购物速度 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1349
 2022-10-08 21:01:16 +08:00
xjdx
8ec0480c8b fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2195 2022-10-08 17:38:31 +08:00
MistEO
220aee8675 perf: 优化自定义基建period判断逻辑 2022-10-08 17:17:53 +08:00
MistEO
fd2c464ef3 fix: 修复自定义基建period时间错位的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2153
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2210
 2022-10-08 17:01:59 +08:00
MistEO
c8ba16f83a Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-10-08 14:27:54 +08:00
MistEO
933dc89735 fix: typo 2022-10-08 14:27:36 +08:00
zzyyyl
c2b1a67a62 Merge pull request #2220 from MaaAssistantArknights/feat/string_logger 
feat: 更新部分 string() 和 Logger
 2022-10-08 13:35:07 +08:00
Horror Proton
3e5543f5ef fix: update recruit types, use tag id in penguin stats payload 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2222
 2022-10-08 12:55:17 +08:00
MistEO
b9c2c6d383 Merge pull request #2215 from moomiji/dev 
feat: 添加配置文件每日备份机制
 2022-10-08 10:28:01 +08:00
MistEO
ad3d58fb65 Merge pull request #2206 from hguandl/feat/aapl-vision 
feat: 在 Apple 平台上使用 Vision 框架提供的 OCR
 2022-10-08 10:27:38 +08:00
zzyyyl
a11ccd50ab perf: 继续优化 2022-10-08 00:23:27 +08:00
zzyyyl
a081c4d9ea feat: 更新部分 string() 和 Logger 2022-10-07 23:13:15 +08:00
zzyyyl
5831a644c4 feat(TaskData): static generate_task_info 2022-10-07 22:15:52 +08:00
zzyyyl
626b5835f6 fix: 修复笔误 2022-10-07 21:51:32 +08:00
zzyyyl
2c90ef64e0 perf: 按照 reviews 意见修改 ProcessTask 
把 max_times 的计算拉出来做个函数
 2022-10-07 21:30:39 +08:00
zzyyyl
bb0817c128 feat: 完成之前画的饼 
1. base 存在相同前缀则不加前缀
2. tasks 个数超过上限的时候返回临时值

我没测试
 2022-10-07 20:59:46 +08:00
zzyyyl
422de7036b perf: 按照 reviews 意见修改 TaskData 2022-10-07 20:06:54 +08:00
枫雨
6da9cebb35 feat: 添加配置文件每日备份机制 
close #2145
 2022-10-07 20:02:32 +08:00
zzyyyl
f9ed17c9f3 feat: 不使用不安全的 string_view::data() 函数 2022-10-07 19:57:38 +08:00
zzyyyl
d9f635fc47 style: format 2022-10-07 19:57:38 +08:00
zzyyyl
851e03dd4f feat: reduce_other_times 从模板任务生成时也加上前缀 2022-10-07 19:57:38 +08:00
zzyyyl
2047422b9c feat: 更新 tasks.json 
1. StartUp 任务在 EndOfAction 界面不再直接停止，而是一直点击返回直到主界面
2. 把 StartUp 相关的 task 放到一起
3. `set_times_limit("A")` 对 `B@A`、`B@...@A` 任务也生效
 2022-10-07 19:57:30 +08:00
zzyyyl
95b5362b2c refactor: 用模板任务简化 task 2022-10-07 19:55:31 +08:00
zzyyyl
53b898ccdb feat: 增加模板任务逻辑 2022-10-07 19:52:25 +08:00
MistEO
f6c522910a fix: using different material item configuration for the different clients 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2010
 2022-10-07 19:05:39 +08:00
only562
dba35d8d36 fix: 修复雷电模拟器“退出模拟器”卡死的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/2212
 2022-10-07 18:30:09 +08:00
zzyyyl
855150815a style: format 2022-10-07 18:13:45 +08:00
MistEO
8a71a2b1d3 fix: 修复偶现仓库材料种类识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2048
 2022-10-07 18:12:48 +08:00
MistEO
516ca96146 style: 修正一些翻译 2022-10-07 17:41:49 +08:00
MistEO
269afa02b1 perf: 优化选择材料界面显示 2022-10-07 17:09:48 +08:00
MistEO
a99d9b0b11 Merge pull request #2178 from DavidWang19/fix/reception 
fix: 修复了会客室把可以挂上的线索送出的问题
 2022-10-07 15:01:40 +08:00
uye
6636210d63 feat: 更新加群链接 2022-10-07 13:59:05 +08:00
uye
8b42294022 Merge pull request #2196 from MaaAssistantArknights/feat/RoguelikeTheme 
feat: 修改肉鸽主题选择方式
 2022-10-07 13:16:16 +08:00
uye
06999a36c0 feat: 更新翻译 2022-10-07 11:31:03 +08:00
Hao Guan
f2b461bde6 feat: use VisionOCR for apple platform 2022-10-07 04:57:51 +10:00
DavidWang19
265a94735f fix: 修复了会客室把可以挂上的线索送出的问题 2022-10-06 19:42:37 +01:00
Hao Guan
595247ad28 build fix: clang with range-v3 on Linux & macOS 
Add header for POSIX

range-v3 for clang

std::string <=> operator for clang

string_view constructor for apple-clang

string format for apple
 2022-10-07 02:39:43 +10:00
uye
b01d2305e9 fix: typo 2022-10-07 00:26:09 +08:00
uye
d3d553fb28 feat: 修改肉鸽主题选择方式 2022-10-06 21:07:13 +08:00
uye
d17b8d5296 fix: 尝试修复指定材料选择错误的问题 2022-10-06 14:23:38 +08:00
zzyyyl
36724f0d1c fix: [workaround] 修复 range-v3 编译报错 
在启用 ASST_USE_RANGES_RANGE_V3 的时候：
- 用 addressof(*) 代替 to_address
- 用 forward_iterator 代替 contiguous_iterator

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-10-06 10:51:46 +08:00
zzyyyl
26a94bc03d feat: 删除 asst::utils::string_split_view, 使用 asst::views::split 2022-10-06 10:51:46 +08:00
zzyyyl
7a2e2ffce0 feat: make_string_view 
Co-authored-by: Hao Guan <10684225+hguandl@users.noreply.github.com>
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-10-06 10:51:46 +08:00