fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,119 Commits 61 Branches 1,839 Tags
47b5ecf40bdedbbf913219a540782f0ed44e6397
Commit Graph

2213 Commits

Author SHA1 Message Date
zzyyyl
47b5ecf40b feat: 增加模板任务逻辑 2022-10-07 19:52:25 +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
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
18050712d2 style: 修正一些翻译 2022-10-07 17:41:49 +08:00
MistEO
330596eff2 perf: 优化选择材料界面显示 2022-10-07 17:09:48 +08:00
MistEO
c05972396f Merge pull request #2178 from DavidWang19/fix/reception 
fix: 修复了会客室把可以挂上的线索送出的问题
 2022-10-07 15:01:40 +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
DavidWang19
3d834e763e fix: 修复了会客室把可以挂上的线索送出的问题 2022-10-06 19:42:37 +01: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
uye
69a2308528 fix: 尝试修复指定材料选择错误的问题 2022-10-06 14:23:38 +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
DavidWang19
58e8c9f0e7 perf: 将GUI日志信息改为上对齐 2022-10-05 18:29:15 +01:00
MistEO
e54c16d64e fix: 修复一些右值使用的问题 2022-10-05 05:21:29 +08:00
MistEO
37a9fb6729 fix: 增加一个运行期模板图片不存在时的报错 2022-10-05 01:56:22 +08:00
MistEO
fa002b6003 fix: 修复水月肉鸽第五层boss关卡卡住的问题，顺便优化一些任务流程 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2119
 2022-10-05 01:25:22 +08:00
Horror Proton
f4c3651f8f fix: fix a null-terminated string issue 2022-10-04 22:37:09 +08:00
Horror Proton
ae4fe7dbe8 refactor: move functions to platorm 2022-10-04 22:19:14 +08:00
Horror Proton
446aefea8f refactor: move platform files 2022-10-04 22:19:14 +08:00
Horror Proton
e0c92d8787 refactor: split Logger and assert from AsstUtils 2022-10-04 22:19:14 +08:00
zzyyyl
eb981d494a style: format 2022-10-04 22:06:14 +08:00
MistEO
23e2a67153 fix: 优化一个不明所以的逻辑 2022-10-04 03:00:30 +08:00
MistEO
88711b2b50 fix: 修复肉鸽无可放置位置时，来回点干员的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2114
 2022-10-04 01:49:32 +08:00
zzyyyl
edf3da646f feat: 将肉鸽招募的滑动最大值放入 tasks.json 中方便修改 2022-10-03 23:10:44 +08:00
zzyyyl
bd045487a1 fix: [workaround] 修复往水上放东西的问题 2022-10-03 15:31:53 +08:00
Horror Proton
f19f55fe61 feat: update logging of file not exist error 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2085
 2022-10-03 11:31:53 +08:00
MistEO
05ddee8c50 fix: 修复肉鸽招募列表滑动没反应的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2081
 2022-10-03 03:09:34 +08:00
zzyyyl
1366108eea rft: 重构当前/上次作战的逻辑 2022-10-03 02:25:23 +08:00
zzyyyl
d23c6efb3c style: format 2022-10-03 02:25:12 +08:00
MistEO
58f12882bd Merge pull request #2094 from MaaAssistantArknights/perf/fight 
perf: 优化刷理智任务逻辑
 2022-10-03 02:03:59 +08:00
MistEO
06e6962867 Merge pull request #2093 from DavidWang19/fix/rgmodetext 
fix: update roguelike mode text for the change at 4.6.0.alpha.8
 2022-10-03 01:28:03 +08:00
MistEO
6fa071c21d fix: 简单修复一下肉鸽没位置时还一直放人的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2072
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1006
 2022-10-03 01:26:01 +08:00
zzyyyl
a9c8f09461 perf: 优化刷理智任务逻辑 
1. LastBattle 之前没有用上，干脆拿来当作 当前/上次作战 的启动任务
2. 把 StageBegin 的 next 抽出来（因为它是 JustReturn 的不会重试）
 2022-10-03 01:13:49 +08:00
DavidWang19
34e82dd08d fix: update roguelike mode text for the change at 4.6.0.alpha.8 2022-10-02 18:08:41 +01:00
MistEO
95afc10b58 fix: 简单修复水月肉鸽点开宝箱的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2071
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2052
 2022-10-03 00:36:49 +08:00
zzyyyl
54803c23a1 Merge pull request #2090 from yilin2020/dev 
fix, docs: 更新readme&忽略文件增加指定不忽略
 2022-10-03 00:30:16 +08:00
zzyyyl
753a0650d4 Merge pull request #2074 from DavidWang19/MyDev 
fix: 修复在战斗中进入刷理智任务时任务崩溃的问题
 2022-10-03 00:27:59 +08:00
DavidWang19
acfe3395b2 fix: 修复在战斗中进入刷理智任务时任务崩溃的问题 2022-10-02 17:14:07 +01:00
zzyyyl
8ba056a643 Merge pull request #2084 from MaaAssistantArknights/fix/tasks 
fix: 修一些 tasks.json 的 bug，继续增加语法检查
 2022-10-02 23:56:50 +08:00
chenyilin
c3591787aa fix(golang) rename mma.go => maa.go 2022-10-02 23:50:29 +08:00
MistEO
d5024989e2 fix: 默认关闭信用溢出时仍购物选项 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2075
 2022-10-02 23:40:29 +08:00