fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 10:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,126 Commits 60 Branches 1,841 Tags
cd4b4fb64deb072ade50d2306905ea18b9fe9fd4
Commit Graph

4126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzyyyl
cd4b4fb64d perf: 按照 reviews 意见修改 TaskData 2022-10-07 20:06:54 +08:00
zzyyyl
c3ff8f1268 feat: 不使用不安全的 string_view::data() 函数 2022-10-07 19:57:38 +08:00
zzyyyl
0f705361f3 style: format 2022-10-07 19:57:38 +08:00
zzyyyl
9890c942da feat: reduce_other_times 从模板任务生成时也加上前缀 2022-10-07 19:57:38 +08:00
zzyyyl
bbb2eda626 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
92b694a46c refactor: 用模板任务简化 task 2022-10-07 19:55:31 +08:00
zzyyyl
5f5032b4fd refactor: 模板任务示例： 简化 Recruit 相关 task 2022-10-07 19:52:53 +08:00
zzyyyl
47b5ecf40b feat: 增加模板任务逻辑 2022-10-07 19:52:25 +08:00
MistEO
deb2213d1c Merge pull request #2213 from MaaAssistantArknights/dev 
Release v4.6.0-rc.1
v4.6.0-rc.1 		2022-10-07 19:21:54 +08:00
MistEO
553de2be46 docs: update changelog 2022-10-07 19:21:13 +08:00
MistEO
c9459dfe44 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
MistEO
c2dd0a67b6 docs: 更新肉鸽协议文档 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/2167
 2022-10-07 18:42:21 +08:00
only562
278c63938d fix: 修复雷电模拟器“退出模拟器”卡死的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/2212
 2022-10-07 18:30:09 +08:00
zzyyyl
84ed87e322 style: format 2022-10-07 18:13:45 +08:00
MistEO
0e442767f7 fix: 修复偶现仓库材料种类识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2048
 2022-10-07 18:12:48 +08:00
MistEO
deaacba25e fix: 修复肉鸽不期而遇选项不能正确选择的问 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2183
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2191
 2022-10-07 17:53:11 +08:00
MistEO
18050712d2 style: 修正一些翻译 2022-10-07 17:41:49 +08:00
MistEO
f131044643 fix: 尝试修复凌晨四点更新后肉鸽卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2182
 2022-10-07 17:25:12 +08:00
MistEO
c1c6fb721e fix: 修复退出基建的确认按钮没点上导致后续任务卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2193
 2022-10-07 17:20:05 +08:00
MistEO
330596eff2 perf: 优化选择材料界面显示 2022-10-07 17:09:48 +08:00
MistEO
9c08e8c4b2 fix: 修复肉鸽不期而遇不满足条件无法选择时卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2208
 2022-10-07 16:57:54 +08:00
MistEO
c05972396f Merge pull request #2178 from DavidWang19/fix/reception 
fix: 修复了会客室把可以挂上的线索送出的问题
 2022-10-07 15:01:40 +08:00
MistEO
d631e1f8b4 Merge pull request #2204 from WWPXX233/dev 
perf: 调整水月肉鸽干员技能选取，略微提高个别干员的精英化优先级
 2022-10-07 14:58:31 +08:00
MistEO
05aa9fc425 style: format json 2022-10-07 14:58:08 +08:00
uye
db724a3c6c feat: 更新加群链接 2022-10-07 13:59:05 +08:00
uye
053d76507c Merge pull request #2196 from MaaAssistantArknights/feat/RoguelikeTheme 
feat: 修改肉鸽主题选择方式
 2022-10-07 13:16:16 +08:00
uye
28f0d9ecec feat: 更新翻译 2022-10-07 11:31:03 +08:00
zzyyyl
249bc9fdb0 chore(issue-checker): 修复一些 pr-ambiguous 和 duplicate 的问题 
现在类似 duplicate of ${link} 的评论会自动给当前 issue 加上 duplicate 标签
现在在 PR 没有 commitizen 且没有 module 类标签时，给 PR 评论不会导致 ambiguous 标签消失
 2022-10-07 04:23:51 +08:00
DavidWang19
3d834e763e fix: 修复了会客室把可以挂上的线索送出的问题 2022-10-06 19:42:37 +01:00
MistEO
4eedfb0273 perf: 优化ROI脚本输出 2022-10-07 01:31:14 +08:00
MistEO
b30e598998 perf: 优化ROI裁剪脚本 2022-10-07 01:26:06 +08:00
WWPXX
1978c17e6c 调整干员技能选取，略微提高个别干员的精英化优先级 2022-10-07 01:01:21 +08:00
zzyyyl
37ca1f07a0 Merge pull request #2159 from hguandl/aapl-build 
fix: 修复使用 clang 在 Linux 和 macOS 平台的编译问题
 2022-10-07 00:55:59 +08:00
WWPXX
64c3f8f5c2 调整干员技能选取，略微提高个别干员的精英化优先级 2022-10-07 00:54:55 +08:00
Hao Guan
68585a70ab 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
fd23720b4e fix: typo 2022-10-07 00:26:09 +08:00
uye
05282c95bd feat: 修改肉鸽主题选择方式 2022-10-06 21:07:13 +08:00
zzyyyl
8e978cfd0f style: format 2022-10-06 18:01:25 +08:00
MistEO
e7ab0fc41a Merge pull request #2187 from anywugn/master 
feat: 增加1天4换的基建极限243配置作业
 2022-10-06 16:46:19 +08:00
AnyWugn
d488883946 新增1天4换基建作业 删除了period字段 2022-10-06 01:30:24 -07:00
AnyWugn
c876256d2a 增加1天4换的极限243配置作业 2022-10-05 23:49:35 -07:00
uye
69a2308528 fix: 尝试修复指定材料选择错误的问题 2022-10-06 14:23:38 +08:00
Horror Proton
3b87d395bb Merge pull request #2168 from MaaAssistantArknights/feat/string_split_view 
feat: 删除 `asst::utils::string_split_view`, 使用 `asst::views::split`
 2022-10-06 10:52:57 +08:00
zzyyyl
1527e2e863 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
d52981637b feat: 删除 asst::utils::string_split_view, 使用 asst::views::split 2022-10-06 10:51:46 +08:00
zzyyyl
9771ab3933 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
MistEO
20d3f8ee9c Merge pull request #2174 from DavidWang19/perf/guilog 
perf: 将GUI日志信息改为上对齐
 2022-10-06 03:01:30 +08:00
zzyyyl
7c524bf46c fix: 修复 ansi_to_utf8, utf8_to_ansi 传入 string_view 时长度错乱的问题 2022-10-06 01:48:35 +08:00
zzyyyl
db7d8dc728 style: format 2022-10-06 01:47:02 +08:00
DavidWang19
58e8c9f0e7 perf: 将GUI日志信息改为上对齐 2022-10-05 18:29:15 +01:00