fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,124 Commits 61 Branches 1,838 Tags
8bfd5410e539ce9909f2ee0cd5f73cc6008e87bf
Commit Graph

2124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
8bfd5410e5 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into feat/depot 2022-06-22 00:32:13 +08:00
MistEO
ffc8620489 feat: 完成仓库识别 2022-06-22 00:29:15 +08:00
MistEO
e724ef5ce6 fix: 修复仓库识别结果中材料位置错误的问题 2022-06-21 23:53:44 +08:00
MistEO
6294dd4b3f fix: 修复仓库识别的一些小bug, 进整理了一下任务相关代码 2022-06-21 23:44:07 +08:00
MistEO
5760430f89 chore: 移动arkplanner的默认模板到配置文件中，并简单修改了一下输出json格式 2022-06-21 22:50:00 +08:00
lhhxxxxx
bd115f995e feat: dlx工具函数 (#941) 
* add func template

* completed?

* use optional

* refactor constructor

* readability optimization

* rename

* rename

* add link

* use size_t

* add explanatory notes

* add notes

* use template

* little refactor

* remove extra space
 2022-06-21 21:43:21 +08:00
MistEO
e6f610df35 Merge pull request #935 from horror-proton/test/tidy 
Code tidy
 2022-06-21 21:42:54 +08:00
cglcv
d2687a14fc feat: 修改linkstart逻辑，增加第一次连接失败时尝试重启模拟器 (#947) 2022-06-21 21:40:32 +08:00
MistEO
fc6406f3c1 fix: 为肉鸽开不出技能添加一个兜底策略，避免一直卡着 2022-06-20 23:58:47 +08:00
MistEO
1a8cd6cec9 Merge pull request #932 from cglcv/dev 
暂时屏蔽待机模式
 2022-06-20 21:51:46 +08:00
ABA2396
1a58ffcebc feat:增加任务完成后执行内容描述 2022-06-20 20:23:32 +08:00
MistEO
880cd1830a fix: 修复自动抄作业坐标图片保存错误的问题 2022-06-20 15:57:12 +08:00
Horror Proton
58b81e9002 Replace recursive call in AutoRecruitTask with loop. 2022-06-20 14:45:48 +08:00
Horror Proton
d3f1bac198 Add log items in AutoRecruitTask 2022-06-20 14:38:37 +08:00
Horror Proton
7ffd27de9f Fix typo 2022-06-20 08:59:59 +08:00
MistEO
475b3db27b fix: 修复一个肉鸽关卡名识别错误 
fix #931
 2022-06-19 23:02:21 +08:00
cglcv
b2b138ed50 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-19 23:01:25 +08:00
Horror Proton
2c2b27c9d7 Add a FIXME 2022-06-19 23:00:45 +08:00
Horror Proton
3f20b71ae4 Improve style and tidiness, simplify nested namespace 2022-06-19 23:00:40 +08:00
cglcv
24f83a8eb9 屏蔽待机功能 2022-06-19 22:56:48 +08:00
Horror Proton
efcf1b5f2c Remove redundant if, fix some compile errors on linux platform (uncompleted) 2022-06-19 22:52:46 +08:00
MistEO
d9e26cd0de style: 所有代码格式化 2022-06-19 21:24:07 +08:00
MistEO
4d92537e91 style: 傻逼VS怎么总是乱格式化 2022-06-19 21:08:21 +08:00
MistEO
c63e90b908 docs: update changelog 2022-06-19 20:44:23 +08:00
MistEO
f913f5d678 Merge pull request #921 from MaaAssistantArknights/feat/rg_copilot 
perf: 优化肉鸽评分表算法及专家系统
 2022-06-19 20:41:44 +08:00
MistEO
1ba9b5468e Merge pull request #918 from zhangweijian97/dev 
feat.适配美服访问好友
 2022-06-19 20:41:33 +08:00
MistEO
3ebf43c41e Merge pull request #926 from cglcv/dev 
修改自动关机UI，新增关闭程序及关闭模拟器
 2022-06-19 20:41:22 +08:00
MistEO
c3a1159029 perf: 优化肉鸽评分表的值，新增几个地图的家门替换，修复一些小问题 2022-06-19 19:19:01 +08:00
cglcv
a81bb154c8 Merge pull request #7 from cglcv/dev-taskqueueshow 
完成关闭模拟器功能
 2022-06-19 13:09:31 +08:00
cglcv
cc9a997237 完成关闭模拟器功能 2022-06-19 13:04:01 +08:00
cglcv
713b07ce59 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-19 10:13:17 +08:00
cglcv
fb9d3ceb2a Merge pull request #6 from cglcv/dev-taskqueueshow 
关闭程序先推过来
 2022-06-19 10:13:01 +08:00
cglcv
9379ac40b9 减少修改 2022-06-19 10:12:03 +08:00
cglcv
4cbed1ca2f 优化 2022-06-19 10:08:36 +08:00
cglcv
677d09c7c2 关闭程序 2022-06-19 09:26:51 +08:00
MistEO
0c9cc1c56e fix: 修复版本号解析错误 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/901
 2022-06-19 00:37:34 +08:00
MistEO
c473cf4f69 docs: update changelog 2022-06-18 23:24:13 +08:00
MistEO
6e3954ca1d Merge branch 'dev' into feat/rg_copilot 2022-06-18 23:21:07 +08:00
MistEO
8e40e3f80b feat: 支持一些深入调查模式，支持一些图的 copilot 2022-06-18 23:18:09 +08:00
MistEO
bb8f7951b3 feat: 完成肉鸽 copilot 2022-06-18 22:58:46 +08:00
MistEO
83064c1d58 chore: remove useless files 2022-06-18 22:02:15 +08:00
MistEO
7b07a2031d docs: update translation 2022-06-18 21:35:23 +08:00
MistEO
c8a77f2869 docs: update translation 2022-06-18 21:33:47 +08:00
MistEO
ebb75f767b perf: 优化肉鸽评分表算法 2022-06-18 19:04:46 +08:00
zhangweijian97
3b92a11154 fix.参数名更正 2022-06-18 18:30:58 +08:00
zhangweijian97
75d94431b5 Merge branch 'dev' of https://github.com/zhangweijian97/MaaAssistantArknights into dev 2022-06-18 18:26:31 +08:00
zhangweijian97
33fc84b615 Merge branch 'master' of https://github.com/zhangweijian97/MaaAssistantArknights into dev 2022-06-18 18:26:25 +08:00
Zhang Weijian
9aa4b80ecd Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-18 18:21:02 +08:00
zhangweijian97
5db200ed61 feat.适配美服领取任务奖励（已测试）& fix.修复领取奖励任务死循环的问题 2022-06-18 18:20:35 +08:00
MistEO
bf180e1252 Merge branch 'docs/FAQ' 2022-06-18 17:47:58 +08:00