fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,559 Commits 60 Branches 1,840 Tags
d4cdf8a215c1ddf34c2d88e3d2d92f9dcb2c67fd
Commit Graph

1559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Zhang
d4cdf8a215 fix.修复了tasks.json中SN-Open.png的大小写错误 2022-05-29 13:38:12 +08:00
MistEO
a829a5aec3 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-28 20:31:44 +08:00
MistEO
41801c15a2 fix.修复一个掉落识别错误的问题 2022-05-28 19:08:04 +08:00
Shawnsdaddy
d216f6a2ab 改成中文名 2022-05-27 23:28:49 -07:00
MistEO
0419676366 Merge pull request #592 from sakuraxp/dev 
fix.修正了在某些情况下，修改模拟器连接设置不生效的bug。
 2022-05-28 12:51:40 +08:00
sakuraxp
fd828416d9 fix.修正了在某些情况下，修改模拟器连接设置不生效的bug。 2022-05-28 11:02:38 +08:00
MistEO
fb44abba9f Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-28 01:45:35 +08:00
MistEO
c0e23399f0 refactor.重构肉鸽选人逻辑。招募等级识别、战斗中技能释放策略暂时还没做完 2022-05-28 01:45:31 +08:00
MistEO
2d11cf2a8d Merge pull request #591 from sakuraxp/dev 
fix.规避自动战斗作业文件不能用中文路径文件名的bug; feat.标题栏增加显示模拟器和连接地址
 2022-05-28 00:45:18 +08:00
sakuraxp
7feebbc78f 1.通过复制临时文件的方式，规避了自动战斗作业文件不能用中文路径或文件名的bug。 
2.修改了标题栏，增加模拟器和IP端口显示。
 2022-05-28 00:32:50 +08:00
MistEO
9f98ac18d6 Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-27 21:46:57 +08:00
Shawnsdaddy
c36e54c328 小工具功能增删 2022-05-27 02:17:11 -07:00
MistEO
81553e5183 docs.更新CHANGELOG v3.9.0-beta.5 2022-05-27 01:28:19 +08:00
MistEO
3645acf447 feat.自动战斗支持关闭技能 2022-05-27 01:26:09 +08:00
MistEO
05abae1f31 perf.优化自动编队干员名的检测算法 2022-05-27 01:26:00 +08:00
MistEO
8be3968ccb fix.修复自动战斗编队技能选择，点到技能词条上的问题 2022-05-27 01:25:57 +08:00
Shawnsdaddy
d384f54842 移动charName到指定文件 2022-05-26 10:01:40 -07:00
MistEO
7eda0f529b docs. fix url 2022-05-25 21:50:06 +08:00
Shawnsdaddy
42be1a1ec0 新增插入功能+支持文本和颜色，修改部分UI 2022-05-24 17:48:12 -07:00
MistEO
df76c59b29 docs. 更新模拟器支持文档 2022-05-25 00:33:32 +08:00
MistEO
3b253b69fc Merge pull request #562 from MaaAssistantArknights/dev 
Release v3.9.0-beta.4
 2022-05-25 00:24:28 +08:00
MistEO
5d3a6da321 docs.更新常见问题文档 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/571
 2022-05-25 00:23:46 +08:00
MistEO
6ebcbf3ecc docs. use us instead of me 2022-05-25 00:14:27 +08:00
MistEO
423c6adc62 chore.wpf工程自动部署作业生成器html, 更新changelog v3.9.0-beta.4 2022-05-25 00:10:12 +08:00
MistEO
bfebf4efc9 feat.加了一个关于页面 2022-05-25 00:00:45 +08:00
MistEO
08913c2023 feat.初步完成c#侧抓模拟器adb路径的逻辑 2022-05-24 23:48:59 +08:00
MistEO
c76dc3102c Merge pull request #569 from zzyyyl/dev 
修复无法保存adb连接地址的bug
 2022-05-24 13:24:47 +08:00
zzyyyl
2958704271 fix.修复无法保存adb连接地址的bug 
fix #568
 2022-05-24 12:33:38 +08:00
Shawnsdaddy
0eb69435bd 根据现有json移除actiontable增加判定+契合实际json+修复bug 2022-05-23 19:47:11 -07:00
Liam Sho
f1c9d8150b chore.移除 submodule AGAIN！ 
玛丽！你在干什么！
 2022-05-24 01:30:51 +08:00
MistEO
73934bfac6 Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-24 01:20:20 +08:00
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
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