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

1516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liam Sho
b95a34b4e0 chore.移除 submodule AGAIN！ 
玛丽！你在干什么！
 2022-05-24 01:30:51 +08:00
MistEO
7cc58dc2a6 Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-24 01:20:20 +08:00
MistEO
889cebb707 chore.使部分json任务字段符合新标准 2022-05-24 01:16:47 +08:00
MistEO
c52c3eb2e7 chore.整理干员名替换的字段 2022-05-24 01:13:21 +08:00
MistEO
681c56983c chore. remove MaaBuilder proj from main solution file 2022-05-24 00:37:48 +08:00
MistEO
2f86de10f1 docs. make MAA to upper 2022-05-24 00:33:57 +08:00
MistEO
e5302d7cc9 docs. make markdownic 2022-05-24 00:31:58 +08:00
MistEO
93ab47c382 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-24 00:15:09 +08:00
MistEO
60c3b29d42 feat.自动战斗gui上增加了显示文档字段及颜色的功能 2022-05-24 00:14:44 +08:00
bakashigure
f11ced0bdf Merge pull request #561 from zhangweijian97/dev 
docs: 新增开发文档并修改相关文档
 2022-05-23 23:52:26 +08:00
Zhang Weijian
0935839ff8 Merge branch 'MaaAssistantArknights:dev' into dev 2022-05-23 23:45:03 +08:00
zhangweijian97
fd0f89fac0 docs: 新增文档-写给萌新的发电全流程以及修改了package.json 2022-05-23 23:44:26 +08:00
Liam Sho
c249f3f442 perf.优化构建管道，移除对 CICD 配置的的依赖 2022-05-23 23:39:25 +08:00
zhangweijian97
c2e23e67a5 docs: 新增开发文档并更新README 2022-05-23 23:36:51 +08:00
Liam Sho
01ca15363e Merge remote-tracking branch 'origin/dev' into dev 2022-05-23 23:17:39 +08:00
Liam Sho
ca85f31fd9 chore.移动 MaaBuilder 项目位置 2022-05-23 23:17:28 +08:00
MistEO
19284507ee perf.简单优化了一点自动战斗的逻辑，盐风溶洞 30 写了一半摆烂了 2022-05-23 23:16:23 +08:00
MistEO
13bc587c4c docs.更新 API 文档导航 2022-05-23 20:42:56 +08:00
Shawnsdaddy
8476553be5 Merge branch 'dev' into dev 2022-05-23 03:43:17 -07:00
Shawnsdaddy
4f92bf2937 Fix wrong html Label 2022-05-23 03:40:36 -07:00
Shawnsdaddy
77aa70e96b Dev (#557) 
* 修复无法代理图片识别错误情况

* 简易作业JSON生成器
 2022-05-23 18:14:34 +08:00
Shawnsdaddy
7c0d6b9f79 简易作业JSON生成器 2022-05-23 03:12:09 -07:00
Shawnsdaddy
e3ccedaa5f Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-23 03:05:12 -07:00
ABA2396
c8dbc30cd1 fix.修复一处文本错误 2022-05-23 12:51:47 +08:00
ABA2396
b6860a7598 feat.关闭愚人号活动导航入口 2022-05-23 12:46:27 +08:00
zzyyyl
8583610d09 fix.修复一处文本错误 
`诡异` -> `诡意`
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/531#issuecomment-1133818839
 2022-05-22 19:38:52 +08:00
Shawnsdaddy
688fa99fdf fix.修复无法代理图片识别错误情况 (#550) 2022-05-22 18:29:02 +08:00
Shawnsdaddy
0524ee24b5 修复无法代理图片识别错误情况 2022-05-22 03:25:57 -07:00
Shawnsdaddy
9d5f3bb7e5 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-21 23:41:17 -07:00
Liam Sho
6f55edbacf feat.更新日志显示支持 Markdown 渲染 2022-05-22 14:38:44 +08:00
zzyyyl
c2366ca8e6 Merge pull request #545 from zzyyyl/fix/#544 
fix.修复掉落识别部分关卡名识别错误的问题
 2022-05-22 14:16:39 +08:00
zzyyyl
b1e6041c3c perf.只截取关卡代号 2022-05-22 13:41:59 +08:00
zzyyyl
04846b8667 fix.修复掉落识别部分关卡名识别错误的问题 
fix #544
 2022-05-22 13:15:38 +08:00
Liam Sho
44a3afeaa4 perf.修改CICD，支持发布PreRelease 
fix #541
 2022-05-22 12:00:37 +08:00
MistEO
a564cf1760 fix.修复自动战斗的一些小问题 2022-05-22 04:08:30 +08:00
MistEO
2906362bfd fix.回滚错误提交的调试用代码 2022-05-22 01:47:41 +08:00
MistEO
70d1da5043 Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-22 01:00:05 +08:00
MistEO
15925f2db7 chore.更新CD ChangLog相关，更新ChangeLog 2022-05-22 00:59:57 +08:00
MistEO
c976ec41b2 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
bfd364cabe fix.修复掉落识别第十章普通难度可能存在的难度识别错误问题 2022-05-21 23:58:19 +08:00
MistEO
e28c407977 fix.修复掉落识别部分数字识别错误的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/537
 2022-05-21 23:48:04 +08:00
MistEO
39a68da1dd feat.添加了一个掉落识别错误的提示 2022-05-21 23:42:44 +08:00
MistEO
d5917786a3 Merge pull request #539 from BTreeNewBee/maaJavaSample 
Maa Java Sample
 2022-05-21 20:49:12 +08:00
guigui
58a759ab20 Maa Java Sample 2022-05-21 20:44:43 +08:00
MistEO
bf8253f583 Merge pull request #534 from MaaAssistantArknights/dev 
Release v3.9.0-beta
 2022-05-21 02:03:22 +08:00
MistEO
b4d5bd863b docs.更新CHANGELOG 2022-05-21 01:16:43 +08:00
Shawnsdaddy
42e8877e9b Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-20 10:14:18 -07:00
MistEO
f55c7d8856 feat.给界面上做了个简单的adb地址及配置选择 2022-05-21 01:11:20 +08:00
MistEO
c8ff01cc3f fix.修复开始编队并关闭职业选择时，选人错误的问题 2022-05-21 00:03:40 +08:00
MistEO
88b8df61ce feat.自动抄作业界面的一些小优化 2022-05-21 00:03:22 +08:00