fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,933 Commits 61 Branches 1,839 Tags
b5fc070ced55a135203bdc8751666d0aee71fd69
Commit Graph

1933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lhhxxxxx
b5fc070ced Update 集成文档.md 2022-06-09 00:20:19 +08:00
lhhxxxxx
02b13f16e5 Update 集成文档.md 2022-06-09 00:12:59 +08:00
MistEO
ed76f009ac fix.修复了另一种刷理智中途游戏崩溃的重连机制；并重构了一部分代码 2022-06-08 22:03:09 +08:00
lhhxxxxx
2d2ad13075 Merge pull request #799 from lhhxxxxx/feat/drag_and_drop 
[New Feature] 允许拖拽导入作业
 2022-06-08 18:57:01 +08:00
lhhxxxxx
df2f7b2416 feat. allow drag a file 2022-06-08 18:23:22 +08:00
ABA2396
ddcc4c27a1 fix.修复 上一次 作战导航失败 2022-06-08 16:40:57 +08:00
ABA2396
f269f8e13c feat.修改通知显示设置界面布局 2022-06-08 16:13:32 +08:00
ABA2396
95af0b6c16 feat.修改了启动设置的布局 2022-06-08 15:50:28 +08:00
ABA2396
7fc32f714b feat.修改了下通知设置界面布局 2022-06-08 14:54:36 +08:00
ABA2396
1a6694a432 feat.修改了下启动设置的布局 2022-06-08 14:38:11 +08:00
ABA2396
539a809fc6 feat.关于我们在运行时也可以点击 2022-06-08 14:23:54 +08:00
lhhxxxxx
1ef60e19c6 Merge pull request #793 from lhhxxxxx/perf/color 
[Perf] 改进了颜色
 2022-06-08 11:01:51 +08:00
lhhxxxxx
dc8961a23d perf. use darkgoldenrod 2022-06-08 10:50:59 +08:00
lhhxxxxx
8f7781b07b [Done][Fix&Perf]MistEO's Fault (#792) 
* fix. MistEO's fault with incomplete rename

* perf. code enhance

* fix. callback bug

* perf. use darkred

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-06-08 10:38:57 +08:00
MistEO
0a72eb03ad Merge pull request #779 from cglcv/dev 
Dev-MAA开机自启
 2022-06-08 10:37:58 +08:00
cglcv
79e372e92e Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-08 09:12:41 +08:00
cgl
a3985a77d5 去掉通知，修改描述 2022-06-08 09:07:02 +08:00
MistEO
0a6ca1343c fix.删除多余的关卡选项 2022-06-08 02:02:00 +08:00
MistEO
419baa1a18 docs.更新CHANGELOG 2022-06-08 01:53:37 +08:00
MistEO
2bc48ef946 feat.新增支持刷理智时崩溃自动重开游戏并继续上一次战斗。还重构了一些有的没的 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/720
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/115
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/766
 2022-06-08 01:50:51 +08:00
MistEO
3c83b205fc feat.增加了adb炸了之后的重连机制及错误回调 2022-06-08 00:02:35 +08:00
MistEO
6b0dac1849 fix.修复刷理智某种情况下PRTS识别不准的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/749
 2022-06-07 23:23:12 +08:00
MistEO
920d9e8cc1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-07 23:06:03 +08:00
MistEO
c1e1fdd2b2 fix. 减慢一点点部署速度 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/783
 2022-06-07 23:02:18 +08:00
MistEO
1cdb177bfb fix.修复击杀数识别不准的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/783
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/782
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/702
 2022-06-07 23:01:32 +08:00
ABA2396
d01be2efb3 doc.强迫症玛丽的空格要求 2022-06-07 22:50:26 +08:00
ABA2396
a990f26cc9 fix.修复资源关导航问题 2022-06-07 22:43:25 +08:00
ABA2396
a4b383f924 doc.修改了一下文档格式，增加了一点next和sub字段的顺序描述 2022-06-07 20:44:13 +08:00
ABA2396
5b946454ed doc.添加了两个现有字段的介绍 2022-06-07 20:36:00 +08:00
MistEO
6f8971e084 fix.修复一个掉落识别错误的问题 2022-06-07 20:08:03 +08:00
MistEO
057c90df03 chore.简单整一下日志 2022-06-07 19:55:41 +08:00
MistEO
b1320aa939 chore.增加一点超时时间 2022-06-07 02:50:28 +08:00
MistEO
afeb328078 docs.更新CHANGELOG 2022-06-07 02:40:56 +08:00
MistEO
f951b48aac fix.简单修复一下截图转发端口获取不正确的问题 2022-06-07 02:39:11 +08:00
MistEO
b70caf29da fix.修复自动战斗不能放技能的问题，并修复拖动速度 2022-06-07 02:17:57 +08:00
MistEO
ed36032af6 fix.修复socket不可用时阻塞住的问题 2022-06-07 02:12:33 +08:00
MistEO
68d5bea68f merge feat/specify_the_drops 2022-06-07 01:18:28 +08:00
MistEO
0bc0757e34 feat.指定掉落功能，适配界面，修复一些bug 2022-06-07 01:15:45 +08:00
MistEO
08dfe3a56e Merge pull request #773 from lhhxxxxx/perf/enhancement 
[Done] [Perf] code tidy
 2022-06-07 00:01:09 +08:00
lhhxxxxx
38c9bcdf15 perf. remove redundant semicolon 2022-06-06 23:11:00 +08:00
cgl
f6d515660e 改的注释 2022-06-06 22:49:20 +08:00
cglcv
52a6afbaea Merge pull request #2 from cglcv/dev-autostart 
去除不必要的命名空间
 2022-06-06 22:35:40 +08:00
cgl
98bd7894e3 去除不必要的命名空间 2022-06-06 22:33:59 +08:00
lhhxxxxx
4dddc7d92c perf. use false instead of 0 2022-06-06 22:33:39 +08:00
cglcv
f3c4435ca2 Merge pull request #1 from cglcv/dev-autostart 
自动启动
 2022-06-06 21:27:34 +08:00
cgl
ebb87690ce clear! 2022-06-06 21:12:09 +08:00
MistEO
54e10f3599 feat.新增支持刷理智指定材料数量 2022-06-06 20:26:56 +08:00
lhhxxxxx
78148e01f1 perf. use reinterpret_cast 2022-06-06 20:11:12 +08:00
lhhxxxxx
649131b4da perf. use const& or std::move() 2022-06-06 20:02:51 +08:00
lhhxxxxx
f5be7340c0 perf. use c++ form import 2022-06-06 19:46:13 +08:00