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

4137 Commits

This Branch
This Branch
All Branches
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
WWPXX
cd06c0a4dd 新增水月肉鸽关卡 2022-10-09 00:54:08 +08:00
WWPXX
d7f7b95fa5 新增水月肉鸽关卡 2022-10-09 00:54:00 +08:00
zzyyyl
b13019ddc0 fix: 修复各种 tasks.json 2022-10-09 00:42:53 +08:00
MistEO
1c23ea3aea docs: update changelog 2022-10-09 00:35:55 +08:00
zzyyyl
d539c96641 fix: 修复外服资源 2022-10-09 00:24:43 +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
c3413368ac Merge pull request #2234 from MaaAssistantArknights/dev 
Release v4.6.0
 2022-10-08 23:59:34 +08:00
MistEO
de9b277497 docs: update changelog 2022-10-08 23:58:40 +08:00
MistEO
3ff3f89a59 fix: 修复傀影肉鸽潜在的不期而遇卡住问题 2022-10-08 23:15:39 +08:00
MistEO
7228706ea3 feat: 更新界面关于里的链接 2022-10-08 23:12:34 +08:00
MistEO
2f0c412e68 fix: 尝试修复水月肉鸽不期而遇不优先离开/选择希望的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2233
 2022-10-08 21:59:29 +08:00
MistEO
68052ca3c8 docs: 更新部分文档 2022-10-08 21:44:15 +08:00
MistEO
576db078b2 Merge pull request #2229 from MaaAssistantArknights/dev 
Release v4.6.0-rc.2
 2022-10-08 21:15:35 +08:00
MistEO
cd9fab0471 docs: update changelog 2022-10-08 21:15:01 +08:00
nightofknife
843c8edd8a feat: 提供公孙长乐的333长期搓玉方案 (#2216) 
* 提供公孙长乐的243中枢永动基建方案，使用彩虹6号实现中枢永动

测了一下应该能跑，反正先看看有没有反馈

* 333长期搓玉组

* Rename 333长期搓玉(TE).json to 333_layout_for_Orundum_3_times_pre_day.json

* Delete 243中枢永动(三班)(TE).json

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-08 21:09:16 +08:00
MistEO
0626d32a03 fix: 修复网络不佳时，信用商店购物卡住的问题。并优化信用商店购物速度 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1349
 2022-10-08 21:01:16 +08:00
MistEO
eddb4fef29 fix: 修复水月肉鸽点完骰子后又点到收藏品列表的问题 2022-10-08 20:35:49 +08:00
MistEO
a217bbd2f0 fix: 修复水月肉鸽在干员招募界面弹出奖励后不招干员的问题 2022-10-08 20:33: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
f62a387e8f perf: 优化肉鸽重连逻辑 
怎么全是 deletion？没想到吧
 2022-10-07 22:00:53 +08:00
zzyyyl
626b5835f6 fix: 修复笔误 2022-10-07 21:51:32 +08:00
uye
4d738c7adb doc: 更新六群加群链接 2022-10-07 21:35:45 +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
60bd30008e refactor: 模板任务示例： 简化 Recruit 相关 task 2022-10-07 19:52:53 +08:00
zzyyyl
53b898ccdb feat: 增加模板任务逻辑 2022-10-07 19:52:25 +08:00
MistEO
7e1db825dd Merge pull request #2213 from MaaAssistantArknights/dev 
Release v4.6.0-rc.1
 2022-10-07 19:21:54 +08:00