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
1,539 Commits 62 Branches 1,839 Tags
8079bc752ff1ee20c0b60e8a7d5e82b6b672fa43
Commit Graph

1539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
8079bc752f Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-28 01:45:35 +08:00
MistEO
07ec3f0416 refactor.重构肉鸽选人逻辑。招募等级识别、战斗中技能释放策略暂时还没做完 2022-05-28 01:45:31 +08:00
MistEO
6af04ca9bb Merge pull request #591 from sakuraxp/dev 
fix.规避自动战斗作业文件不能用中文路径文件名的bug; feat.标题栏增加显示模拟器和连接地址
 2022-05-28 00:45:18 +08:00
sakuraxp
91d4d5dede 1.通过复制临时文件的方式，规避了自动战斗作业文件不能用中文路径或文件名的bug。 
2.修改了标题栏，增加模拟器和IP端口显示。
 2022-05-28 00:32:50 +08:00
MistEO
5957b4ca26 Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-27 21:46:57 +08:00
Shawnsdaddy
ccc470fb73 小工具功能增删 2022-05-27 02:17:11 -07:00
MistEO
3730bb29dd docs.更新CHANGELOG 2022-05-27 01:28:19 +08:00
MistEO
8a9b3b89d8 feat.自动战斗支持关闭技能 2022-05-27 01:26:09 +08:00
MistEO
265c21cba8 perf.优化自动编队干员名的检测算法 2022-05-27 01:26:00 +08:00
MistEO
38bc1f92b9 fix.修复自动战斗编队技能选择，点到技能词条上的问题 2022-05-27 01:25:57 +08:00
Shawnsdaddy
1c043a1718 移动charName到指定文件 2022-05-26 10:01:40 -07:00
MistEO
798adf0b06 docs. fix url 2022-05-25 21:50:06 +08:00
Shawnsdaddy
57b55007ea 新增插入功能+支持文本和颜色，修改部分UI 2022-05-24 17:48:12 -07:00
MistEO
4f0c773227 docs. 更新模拟器支持文档 2022-05-25 00:33:32 +08:00
MistEO
c1b792509f Merge pull request #562 from MaaAssistantArknights/dev 
Release v3.9.0-beta.4
 2022-05-25 00:24:28 +08:00
MistEO
580ed577f7 docs.更新常见问题文档 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/571
 2022-05-25 00:23:46 +08:00
MistEO
df1bb9688b docs. use us instead of me 2022-05-25 00:14:27 +08:00
MistEO
a0209e561e chore.wpf工程自动部署作业生成器html, 更新changelog 2022-05-25 00:10:12 +08:00
MistEO
71bc551fd6 feat.加了一个关于页面 2022-05-25 00:00:45 +08:00
MistEO
bcff92c6f3 feat.初步完成c#侧抓模拟器adb路径的逻辑 2022-05-24 23:48:59 +08:00
MistEO
d380664a9a Merge pull request #569 from zzyyyl/dev 
修复无法保存adb连接地址的bug
 2022-05-24 13:24:47 +08:00
zzyyyl
719043e495 fix.修复无法保存adb连接地址的bug 
fix #568
 2022-05-24 12:33:38 +08:00
Shawnsdaddy
097a4b7a6e 根据现有json移除actiontable增加判定+契合实际json+修复bug 2022-05-23 19:47:11 -07:00
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