fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,679 Commits 62 Branches 1,839 Tags
0c8d0944bb883c052d5cfeafd75fdb2277f8d00f
Commit Graph

2679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
3068b0ee70 chore.使部分json任务字段符合新标准 2022-05-24 01:16:47 +08:00
MistEO
c998f1c84f chore.整理干员名替换的字段 2022-05-24 01:13:21 +08:00
MistEO
04eeee2831 chore. remove MaaBuilder proj from main solution file 2022-05-24 00:37:48 +08:00
MistEO
0c847d6ead docs. make MAA to upper 2022-05-24 00:33:57 +08:00
MistEO
70ce15dd47 docs. make markdownic 2022-05-24 00:31:58 +08:00
MistEO
09f9ac6fab Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-24 00:15:09 +08:00
MistEO
47345a7961 feat.自动战斗gui上增加了显示文档字段及颜色的功能 2022-05-24 00:14:44 +08:00
guigui
d7c1f87a59 Maa HTTP Server 2022-05-23 23:55:39 +08:00
bakashigure
c40f8b11f8 Merge pull request #561 from zhangweijian97/dev 
docs: 新增开发文档并修改相关文档
 2022-05-23 23:52:26 +08:00
Zhang Weijian
5363e6c4cf Merge branch 'MaaAssistantArknights:dev' into dev 2022-05-23 23:45:03 +08:00
zhangweijian97
4b913695c3 docs: 新增文档-写给萌新的发电全流程以及修改了package.json 2022-05-23 23:44:26 +08:00
Liam Sho
bc1d9cb9c4 perf.优化构建管道，移除对 CICD 配置的的依赖 2022-05-23 23:39:25 +08:00
zhangweijian97
803a9abd30 docs: 新增开发文档并更新README 2022-05-23 23:36:51 +08:00
Liam Sho
881e79022a Merge remote-tracking branch 'origin/dev' into dev 2022-05-23 23:17:39 +08:00
Liam Sho
e998cf7d28 chore.移动 MaaBuilder 项目位置 2022-05-23 23:17:28 +08:00
MistEO
28df75f516 perf.简单优化了一点自动战斗的逻辑，盐风溶洞 30 写了一半摆烂了 2022-05-23 23:16:23 +08:00
MistEO
c013df1751 docs.更新 API 文档导航 2022-05-23 20:42:56 +08:00
Shawnsdaddy
e8175c6e60 Merge branch 'dev' into dev 2022-05-23 03:43:17 -07:00
Shawnsdaddy
43f3107795 Fix wrong html Label 2022-05-23 03:40:36 -07:00
Shawnsdaddy
81378cb1c7 Dev (#557) 
* 修复无法代理图片识别错误情况

* 简易作业JSON生成器
 2022-05-23 18:14:34 +08:00
Shawnsdaddy
fdd1ed423a 简易作业JSON生成器 2022-05-23 03:12:09 -07:00
Shawnsdaddy
6079d970c1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-23 03:05:12 -07:00
ABA2396
f9be730eab fix.修复一处文本错误 2022-05-23 12:51:47 +08:00
ABA2396
75b41081db feat.关闭愚人号活动导航入口 2022-05-23 12:46:27 +08:00
zzyyyl
251600eca5 fix.修复一处文本错误 
`诡异` -> `诡意`
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/531#issuecomment-1133818839
 2022-05-22 19:38:52 +08:00
Shawnsdaddy
e0cc3e9276 fix.修复无法代理图片识别错误情况 (#550) 2022-05-22 18:29:02 +08:00
Shawnsdaddy
c4442ee1f0 修复无法代理图片识别错误情况 2022-05-22 03:25:57 -07:00
Shawnsdaddy
792daa78c4 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-21 23:41:17 -07:00
Liam Sho
a75a44b4ac feat.更新日志显示支持 Markdown 渲染 2022-05-22 14:38:44 +08:00
zzyyyl
7da9e5e6a8 Merge pull request #545 from zzyyyl/fix/#544 
fix.修复掉落识别部分关卡名识别错误的问题
 2022-05-22 14:16:39 +08:00
zzyyyl
668b33b797 perf.只截取关卡代号 2022-05-22 13:41:59 +08:00
zzyyyl
578b20d0b1 fix.修复掉落识别部分关卡名识别错误的问题 
fix #544
 2022-05-22 13:15:38 +08:00
Liam Sho
4b135212eb perf.修改CICD，支持发布PreRelease 
fix #541
 2022-05-22 12:00:37 +08:00
MistEO
18ba05189c fix.修复自动战斗的一些小问题 2022-05-22 04:08:30 +08:00
MistEO
557c6f60f4 fix.回滚错误提交的调试用代码 v3.9.0-beta.3 2022-05-22 01:47:41 +08:00
MistEO
4b49e6d87d Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev v3.9.0-beta.2 2022-05-22 01:00:05 +08:00
MistEO
f930bd5f2b chore.更新CD ChangLog相关，更新ChangeLog 2022-05-22 00:59:57 +08:00
MistEO
e9c925cf90 fix.简单修复一下界面上连接设置ip地址错误的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/540
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/538
 2022-05-22 00:36:38 +08:00
MistEO
d5b0270916 fix.修复掉落识别第十章普通难度可能存在的难度识别错误问题 2022-05-21 23:58:19 +08:00
MistEO
254cf6ee30 fix.修复掉落识别部分数字识别错误的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/537
 2022-05-21 23:48:04 +08:00
MistEO
af4c866fcd feat.添加了一个掉落识别错误的提示 2022-05-21 23:42:44 +08:00
MistEO
fb2b7d2773 Merge pull request #539 from BTreeNewBee/maaJavaSample 
Maa Java Sample
 2022-05-21 20:49:12 +08:00
guigui
b006f917b5 Maa Java Sample 2022-05-21 20:44:43 +08:00
MistEO
8c785fbd5f Merge pull request #534 from MaaAssistantArknights/dev 
Release v3.9.0-beta
 2022-05-21 02:03:22 +08:00
MistEO
1a1c1defed docs.更新CHANGELOG v3.9.0-beta 2022-05-21 01:16:43 +08:00
Shawnsdaddy
29ee718257 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-20 10:14:18 -07:00
MistEO
0b09c9c3d7 feat.给界面上做了个简单的adb地址及配置选择 2022-05-21 01:11:20 +08:00
MistEO
f510bd537c fix.修复开始编队并关闭职业选择时，选人错误的问题 2022-05-21 00:03:40 +08:00
MistEO
118ca77d45 feat.自动抄作业界面的一些小优化 2022-05-21 00:03:22 +08:00
MistEO
2dc53ae568 fix.修复自动抄作业，识别干员之后总会再去识别其中某几个的问题 2022-05-20 23:53:52 +08:00