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
2,141 Commits 60 Branches 1,840 Tags
d2d98903d61dcfd9b27f0318bc01e6287ed5e2ba
Commit Graph

2141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
d2d98903d6 feat: 支持运行中修改刷理智设置 2022-06-23 23:32:23 +08:00
MistEO
eb7cd8a491 feat: 把界面上的反选按钮改成了清空 2022-06-23 22:47:32 +08:00
MistEO
b3e2471e5e Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-23 22:43:38 +08:00
MistEO
93c2baf3a5 fix: 简单修复一下任务被重复添加的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/943
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/960
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/967
 2022-06-23 22:43:30 +08:00
MistEO
d6ec50e8b0 Merge pull request #882 from MaaAssistantArknights/feat/depot 
feat: 仓库识别
 2022-06-23 22:37:49 +08:00
MistEO
832f9a7240 merge: merge dev and resolve conflicts 2022-06-23 22:37:27 +08:00
MistEO
34b74334e2 perf: 减少载入作业时的文件读写频率 2022-06-23 22:33:24 +08:00
MistEO
a9dc585c83 fix: 修复作业文件读取失败的问题，并优化掉不必要的读取逻辑 2022-06-23 22:27:56 +08:00
MistEO
6c2d706ce7 refactor: 重写导入作业功能 2022-06-23 22:06:31 +08:00
Shawnsdaddy
9bb11712b4 feat. 增加用户指南和网站链接 2022-06-23 01:26:45 -07:00
Shawnsdaddy
a171bdc56b Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-23 01:03:28 -07:00
Shawnsdaddy
795f602f20 feat. 增加从copilot服务器端拿作业 2022-06-23 01:00:04 -07:00
ABA2396
6707771bf7 feat:移除「尘影余音」活动导航入口 2022-06-23 11:20:23 +08:00
MistEO
33743e2e43 feat: 新增回调 AllTaskCompleted 回调消息 runned_tasks 字段，并修复公招计算、自动战斗完成后也会触发完成后动作的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/955
 2022-06-23 02:27:59 +08:00
MistEO
7e3369af2c fix: 手动停止时，不再触发 AllTasksCompleted 回调消息 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/956
 2022-06-23 01:59:38 +08:00
MistEO
10b70fb135 Merge branch 'dev' into feat/depot 2022-06-22 00:40:16 +08:00
MistEO
7663778a1c fix: 修复一个笔误导致的编译错误 2022-06-22 00:39:59 +08:00
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