fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,164 Commits 61 Branches 1,838 Tags
90067a7ad7cc4eade87cc263f13f746128bc80da
Commit Graph

2164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DESKTOP-9PHO9TI\kenko
90067a7ad7 add: 增加了任务完成关闭游戏的功能 2022-06-26 00:36:49 +08:00
MistEO
2a769534d9 Merge pull request #976 from cglcv/dev-tray-winform 
feat.托盘
 2022-06-25 17:08:43 +08:00
MistEO
926643d5a3 fix: 修复一个设置界面布局的小问题 2022-06-25 17:07:17 +08:00
MistEO
5c265ec8d3 fix: 修复公招识别及自动战斗不开始的问题 2022-06-25 17:04:18 +08:00
cglcv
c372751ff2 fix.删除不该存在的注释 2022-06-25 13:55:54 +08:00
MistEO
57d7bb5742 refactor: 整理任务完成后的动作，修改为枚举 2022-06-25 02:19:34 +08:00
MistEO
dde66ea213 chore: 暂时移除肉鸽职业与部署位不对应的干员 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/963
 2022-06-25 01:51:50 +08:00
MistEO
3445d175f9 fix: 修复没有公招券时的崩溃问题；整理公招回调逻辑 2022-06-25 01:43:06 +08:00
cglcv
6e469d64a3 feat.托盘 2022-06-24 21:46:30 +08:00
MistEO
cd79c6093c docs: 更新文档格式 2022-06-24 17:09:16 +08:00
MistEO
4376985744 Merge pull request #951 from zzyyyl/fix/recruit 
fix. 修改公招流程
 2022-06-24 08:44:51 +08:00
MistEO
6bc80275be feat: 任务新增支持 enable 字段，可用于占位 2022-06-23 23:52:07 +08:00
MistEO
d2d98903d6 feat: 支持运行中修改刷理智设置 2022-06-23 23:32:23 +08:00
zzyyyl
09e3c1af23 style: 加个注释 2022-06-23 23:09:41 +08:00
zzyyyl
697f8f6f14 style: 改个变量名以便理解 2022-06-23 23:04:32 +08:00
zzyyyl
394801366c fix: 修一下 warning 2022-06-23 22:59:06 +08:00
zzyyyl
a3d0c62d2a feat: 公招重试次数达到上限时报错并返回 2022-06-23 22:50:24 +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
zzyyyl
bcba7b0ec9 feat: 给公招每一个槽位设置重试上限 2022-06-23 22:40: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
zzyyyl
b55fd5c47b chore: 稍微详细地写一下公招相关的 callback 2022-06-22 18:23:10 +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
zzyyyl
9b2d151f0e style: for -> while 2022-06-21 23:06:57 +08:00
zzyyyl
6f8aa55dc9 feat: 让日志行内没有影响功能的代码，并对刷新次数上限检测做一个小改进 2022-06-21 23:01:53 +08:00
MistEO
5760430f89 chore: 移动arkplanner的默认模板到配置文件中，并简单修改了一下输出json格式 2022-06-21 22:50:00 +08:00
zzyyyl
f874dc836a feat: 公招刷新时显示刷新次数，并使刷新次数不超过3 2022-06-21 22:01:48 +08:00
zzyyyl
67a12fccb2 perf: 删除冗余任务 2022-06-21 21:46:53 +08:00
zzyyyl
c78a0c9e41 fix: 修改公招流程 2022-06-21 21:46:44 +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