fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,215 Commits 61 Branches 1,837 Tags
dc8d8e89e4da4af545cb41ee29bd2d4048db5c4e
Commit Graph

2215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
dc8d8e89e4 fix: 修复托盘设置不保存的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1001
 2022-06-29 22:04:49 +08:00
MistEO
2e960ce4ee fix: 修复部分情况下槐琥效率计算的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1005
 2022-06-29 22:01:52 +08:00
MistEO
24dd7b3472 Merge pull request #999 from zzyyyl/fix/recruit 
fix: 修复公招错误
 2022-06-27 19:27:55 +08:00
MistEO
9bac645562 chore: 更新meojson库，重构部分json的调用方式 
优雅！实在是太优雅了！
 2022-06-27 18:16:18 +08:00
MistEO
93d3216a4f chore: 修复一些项目配置的问题 2022-06-27 16:10:14 +08:00
zzyyyl
d8f5fdce15 fix: 修复公招错误 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/995
 2022-06-27 16:07:11 +08:00
MistEO
6b00fe14ad Merge pull request #988 from GalvinGao/dev 
feat: add multiple timers support (up to 8)
 2022-06-26 23:37:38 +08:00
GalvinGao
a832acdd32 feat: timer UI improvement 2022-06-26 23:22:38 +08:00
GalvinGao
2d5f769b8e feat: add multiple timers support (up to 8) 2022-06-26 22:05:05 +08:00
MistEO
1b95d091e8 Merge pull request #980 from MaaAssistantArknights/dev 
Release v4.0.1
v4.0.1 		2022-06-26 21:38:06 +08:00
MistEO
47206ebb3a docs: 更新文档 2022-06-26 21:28:55 +08:00
MistEO
b4e6a15f34 chore: 调整了更新记录界面的缩放条 2022-06-26 21:28:48 +08:00
MistEO
194e861f66 chore: 不再支持非 16:9 分辨率 2022-06-26 20:14:57 +08:00
MistEO
8d0a6c171e perf: 简单优化肉鸽一些站位 2022-06-26 20:01:33 +08:00
MistEO
7a8ddc9742 fix: 修复第一次使用时，企鹅id不断变化的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/501
 2022-06-26 19:01:02 +08:00
MistEO
21738805e8 fix: 修复adb地址修改后不会重连的问题，并添加了一些GUI->core的日志打印 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/969
 2022-06-26 18:56:52 +08:00
MistEO
0676d07990 fix: 修复肉鸽拾取战利品时卡住的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/977
 2022-06-26 18:41:29 +08:00
MistEO
ea28f54007 fix: 简单修复一个肉鸽解锁藏品后卡住的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/979
 2022-06-26 18:37:20 +08:00
MistEO
fe5caf3b68 perf: 以一种更合理的方式完成CloseDown任务 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/984
 2022-06-26 18:26:08 +08:00
MistEO
dc428884de feat: 将托盘设置改为实时生效，并修复一些小问题 2022-06-26 18:14:36 +08:00
MistEO
fa5c61028b chore: 自动公招界面提示的一些小改动 
没有识别机制，RecruitSlotCompleted 并不可靠
 2022-06-26 18:14:36 +08:00
MistEO
658bc3e6b5 Merge pull request #984 from AkagiYui/dev 
feat: 增加了任务完成关闭游戏的功能
 2022-06-26 18:11:05 +08:00
DESKTOP-9PHO9TI\kenko
57f1af7b5d fix: 修复过程中无法删除'退出游戏'任务的问题 2022-06-26 13:28:35 +08:00
DESKTOP-9PHO9TI\kenko
7efe0da642 add: 增加了任务完成关闭游戏的功能 2022-06-26 00:36:49 +08:00
MistEO
f005578345 Merge pull request #976 from cglcv/dev-tray-winform 
feat.托盘
 2022-06-25 17:08:43 +08:00
MistEO
a11970b9cf fix: 修复一个设置界面布局的小问题 2022-06-25 17:07:17 +08:00
MistEO
cbed00b581 fix: 修复公招识别及自动战斗不开始的问题 2022-06-25 17:04:18 +08:00
cglcv
9ab225a9a8 fix.删除不该存在的注释 2022-06-25 13:55:54 +08:00
MistEO
bc62fd10e4 refactor: 整理任务完成后的动作，修改为枚举 2022-06-25 02:19:34 +08:00
MistEO
6fb0e44422 chore: 暂时移除肉鸽职业与部署位不对应的干员 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/963
 2022-06-25 01:51:50 +08:00
MistEO
87a6b533a8 chore: 更新第十章磨难关卡地图数据 2022-06-25 01:44:24 +08:00
MistEO
c04f3c57cf fix: 修复没有公招券时的崩溃问题；整理公招回调逻辑 2022-06-25 01:43:06 +08:00
cglcv
a517e1d90b feat.托盘 2022-06-24 21:46:30 +08:00
MistEO
cc8f559a29 docs: 更新文档格式 2022-06-24 17:09:16 +08:00
MistEO
26e2264401 Merge pull request #951 from zzyyyl/fix/recruit 
fix. 修改公招流程
 2022-06-24 08:44:51 +08:00
MistEO
1a6dc9be67 feat: 任务新增支持 enable 字段，可用于占位 2022-06-23 23:52:07 +08:00
MistEO
92b8443e66 feat: 支持运行中修改刷理智设置 2022-06-23 23:32:23 +08:00
zzyyyl
0558da2302 style: 加个注释 2022-06-23 23:09:41 +08:00
zzyyyl
e8b275c965 style: 改个变量名以便理解 2022-06-23 23:04:32 +08:00
zzyyyl
22bcf4e91d fix: 修一下 warning 2022-06-23 22:59:06 +08:00
zzyyyl
978fb6c444 feat: 公招重试次数达到上限时报错并返回 2022-06-23 22:50:24 +08:00
MistEO
3bdb5d0c11 feat: 把界面上的反选按钮改成了清空 2022-06-23 22:47:32 +08:00
MistEO
a3bb62856f Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-23 22:43:38 +08:00
MistEO
f79c567a86 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
5765c0466b feat: 给公招每一个槽位设置重试上限 2022-06-23 22:40:30 +08:00
MistEO
7276a71200 Merge pull request #882 from MaaAssistantArknights/feat/depot 
feat: 仓库识别
 2022-06-23 22:37:49 +08:00
MistEO
0b9cf9f3ab merge: merge dev and resolve conflicts 2022-06-23 22:37:27 +08:00
MistEO
7d787fcd5d perf: 减少载入作业时的文件读写频率 2022-06-23 22:33:24 +08:00
MistEO
bede184f94 fix: 修复作业文件读取失败的问题，并优化掉不必要的读取逻辑 2022-06-23 22:27:56 +08:00
MistEO
4149286ba0 refactor: 重写导入作业功能 2022-06-23 22:06:31 +08:00