fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,083 Commits 60 Branches 1,840 Tags
dba35d8d36feeac5100a99bd354890ce1df50cc7
Commit Graph

4083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2a96530ae2 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
516ca96146 style: 修正一些翻译 2022-10-07 17:41:49 +08:00
MistEO
9fb80fb138 fix: 尝试修复凌晨四点更新后肉鸽卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2182
 2022-10-07 17:25:12 +08:00
MistEO
effc3d0c28 fix: 修复退出基建的确认按钮没点上导致后续任务卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2193
 2022-10-07 17:20:05 +08:00
MistEO
269afa02b1 perf: 优化选择材料界面显示 2022-10-07 17:09:48 +08:00
MistEO
b8429105ae fix: 修复肉鸽不期而遇不满足条件无法选择时卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2208
 2022-10-07 16:57:54 +08:00
MistEO
a99d9b0b11 Merge pull request #2178 from DavidWang19/fix/reception 
fix: 修复了会客室把可以挂上的线索送出的问题
 2022-10-07 15:01:40 +08:00
MistEO
92bcf0d7e2 Merge pull request #2204 from WWPXX233/dev 
perf: 调整水月肉鸽干员技能选取，略微提高个别干员的精英化优先级
 2022-10-07 14:58:31 +08:00
MistEO
aa3bfa7936 style: format json 2022-10-07 14:58:08 +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
zzyyyl
59388fbcda 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
265a94735f fix: 修复了会客室把可以挂上的线索送出的问题 2022-10-06 19:42:37 +01:00
MistEO
698407f013 perf: 优化ROI脚本输出 2022-10-07 01:31:14 +08:00
MistEO
4da674c1f7 perf: 优化ROI裁剪脚本 2022-10-07 01:26:06 +08:00
WWPXX
7a9b8c723f 调整干员技能选取，略微提高个别干员的精英化优先级 2022-10-07 01:01:21 +08:00
zzyyyl
37ede9d545 Merge pull request #2159 from hguandl/aapl-build 
fix: 修复使用 clang 在 Linux 和 macOS 平台的编译问题
 2022-10-07 00:55:59 +08:00
WWPXX
04f7992fee 调整干员技能选取，略微提高个别干员的精英化优先级 2022-10-07 00:54:55 +08: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
zzyyyl
6f5ddce56c style: format 2022-10-06 18:01:25 +08:00
MistEO
57ff462a21 Merge pull request #2187 from anywugn/master 
feat: 增加1天4换的基建极限243配置作业
 2022-10-06 16:46:19 +08:00
AnyWugn
f4b06c4b17 新增1天4换基建作业 删除了period字段 2022-10-06 01:30:24 -07:00
AnyWugn
8b4d33fb4f 增加1天4换的极限243配置作业 2022-10-05 23:49:35 -07:00
uye
d17b8d5296 fix: 尝试修复指定材料选择错误的问题 2022-10-06 14:23:38 +08:00
Horror Proton
fdb5f8b2f9 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
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
MistEO
85d0908d19 Merge pull request #2174 from DavidWang19/perf/guilog 
perf: 将GUI日志信息改为上对齐
 2022-10-06 03:01:30 +08:00
zzyyyl
46ca508d45 fix: 修复 ansi_to_utf8, utf8_to_ansi 传入 string_view 时长度错乱的问题 2022-10-06 01:48:35 +08:00
zzyyyl
9ee4a05c05 style: format 2022-10-06 01:47:02 +08:00
DavidWang19
a056021451 perf: 将GUI日志信息改为上对齐 2022-10-05 18:29:15 +01:00
MistEO
7408e06156 fix: 修复水月肉鸽招募后卡在骰子界面的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2164
 2022-10-06 00:31:31 +08:00
MistEO
14b89c9706 fix & format: roguelike recruit 2022-10-06 00:26:14 +08:00
nightofknife
9ce397774f 增加部分干员识别错误的替换 (#2173) 
* 增加部分干员识别错误的替换

重新补充部分干员识别错误替换
实在是没理解怎么在原来的上面改
QaQ

* Update tasks.json

试试修改pr

* Update tasks.json

赤黑->^赤黑$
 2022-10-06 00:24:35 +08:00
MistEO
e170bc6a1e Merge pull request #2146 from wallsman/dev 
doc: Inside data name JP
 2022-10-06 00:23:54 +08:00
MistEO
abf8e71748 Merge pull request #2156 from WWPXX233/dev 
perf: 优化水月肉鸽干员招募与晋升优先级
 2022-10-06 00:21:53 +08:00
MistEO
7f6f9f79e4 Merge pull request #2147 from 545426/master 
fix: 修复但书班次，skip部分设施增加换班速度
 2022-10-06 00:19:14 +08:00
MistEO
bebcc7f16f style: format json 2022-10-06 00:18:22 +08:00
MistEO
db3a4d3476 fix: 修复水月肉鸽第五层不进 boss 关的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2163
 2022-10-05 21:39:45 +08:00
WWPXX
b0a28c611e 再次调整了晋升优先级 当精英干员与急需精2的幻神同时出现时 优先精英2 2022-10-05 20:57:20 +08:00
童心
34210203ba 删除skip 
仅进行导入测试，未实测
 2022-10-05 18:18:52 +08:00
童心
427ed9ca4a 改了一些错误 
未实测（没号）麻烦再检查一下了
 2022-10-05 18:10:22 +08:00
WWPXX
6a61158ef1 新增水月肉鸽道具 简单的排列了一下商店购买优先级 2022-10-05 17:47:45 +08:00