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
2,679 Commits 61 Branches 1,839 Tags
0c8d0944bb883c052d5cfeafd75fdb2277f8d00f
Commit Graph

2679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
冷沫天使blue
c0968fb896 更新 Readme.md 加入fastgit镜像渠道 2022-06-04 03:16:25 +08:00
Dusk_NM02
749a593eb5 fix.修复了ansi_to_utf8的wstr数组初始化不完全的问题 
调整了ansi_to_utf8和utf8_to_ansi中的中间数组初始化方式
 2022-06-04 02:36:39 +08:00
Dusk_NM02
30869594f6 refactor.将编码互转函数重命名 
gbk_2_utf8 -> ansi_to_utf8
utf8_to_gbk -> utf8_to_ansi
 2022-06-04 01:36:22 +08:00
MistEO
d4c07531d5 Merge pull request #723 from lhhxxxxx/feat/robot 
[New Feature] 公招小车识别
 2022-06-04 01:18:51 +08:00
lhhxxxxx
de082f7e55 Typo fix. 2022-06-03 21:42:52 +08:00
lhhxxxxx
536e7e32b8 feat. Add recruit skip robot option 2022-06-03 21:39:58 +08:00
cglcv
4fc9e41c30 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-03 20:54:07 +08:00
cgl
019e69d92c 修改格式，处理版本，增加复选框限制 2022-06-03 20:51:01 +08:00
cgl
4383ae03d2 加上复选框Check 2022-06-03 19:27:41 +08:00
MistEO
76cdbc4bf0 fix.格子识别增加levelId和stageId的支持 2022-06-03 18:29:05 +08:00
MistEO
1508253670 Merge pull request #709 from MaaAssistantArknights/dev 
Release v3.9.3
 2022-06-03 18:12:14 +08:00
MistEO
dad12eac1a feat.自动战斗新增支持模拟悖论（需要自己选技能） v3.9.3 2022-06-03 18:04:22 +08:00
MistEO
4deb5f8314 docs.更新v3.9.3版本文档，及CHANGLOG 2022-06-03 17:53:17 +08:00
MistEO
41c921cc0d Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-03 17:35:33 +08:00
MistEO
4ac431d101 fix.修复基建贸易站没有赤金的时候，长时间卡住的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/472
 2022-06-03 17:35:30 +08:00
MistEO
74c3c54ef4 fix.新增一个备选连接地址的逻辑，修复雷电等模拟器直接连不上的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/712
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/688
 2022-06-03 17:29:24 +08:00
MistEO
8dbe56003b Merge pull request #718 from lhhxxxxx/feat/robot 
feat. Add xaml dependency in IDE
 2022-06-03 17:00:41 +08:00
cgl
1884961fd0 Merge branch 'dev' of https://github.com/cglcv/MaaAssistantArknights into dev 2022-06-03 16:32:14 +08:00
cglcv
2572ac2672 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-03 16:32:03 +08:00
cgl
fca1625a3e 通知结构修改，增加退出时清空消息功能 2022-06-03 16:28:51 +08:00
lhhxxxxx
eb83234eb0 small fix 2022-06-03 16:23:35 +08:00
lhhxxxxx
f2e35d0102 feat. Add xaml dependency in IDE 2022-06-03 16:06:01 +08:00
MistEO
bfbae56e3e fix.修复地图格子识别不准的问题，更新格子识别仓库代码及资源 2022-06-03 15:53:37 +08:00
cglcv
de20749830 把VS2022的bug加进去 2022-06-03 14:39:52 +08:00
cglcv
7cf3435f92 Update README.md 
加上VS2022的bug，否则不知道的萌新可能就给升级了
 2022-06-03 14:37:38 +08:00
MistEO
b325a7ad2e Merge pull request #714 from LengmoAngel/patch-1 
update 模拟器支持.md 更人性化的表达方式对于Bluestack for hyperv
 2022-06-03 13:04:05 +08:00
冷沫天使blue
c770fc07f4 update 模拟器支持.md 更人性化的表达方式对于Bluestack for hyperv 
update 模拟器支持.md 更人性化的表达方式对于Bluestack for hyperv
 2022-06-03 12:38:34 +08:00
cglcv
7532695935 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-03 11:45:45 +08:00
cgl
5cbb2bef00 使用系统推送通知 2022-06-03 11:41:52 +08:00
MistEO
61a5136f14 fix.修复不选择作业直接开始时的崩溃问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/679
 2022-06-03 05:06:24 +08:00
MistEO
671155d25e fix.简单修复一下技能描述过长时，自动编队选不到3技能的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/683
 2022-06-03 05:02:17 +08:00
MistEO
271eb46159 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-03 04:25:27 +08:00
MistEO
483e0abe51 fix.修复信用商店弹出物品后偶尔卡住的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/513
 2022-06-03 03:10:56 +08:00
MistEO
8a496b2ea8 fix.简单修复一下开始唤醒后卡在每日补给界面的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/581
 2022-06-03 02:53:37 +08:00
MistEO
65eb71905f fix.修复搓玉自动补货时卡住的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/655
 2022-06-03 02:21:25 +08:00
MistEO
95b1ec9c4a Merge pull request #691 from sakuraxp/dev 
feat.增加了自动休眠和自动待机的代码，UI上面暂未启用。
 2022-06-03 02:05:21 +08:00
MistEO
07169e5061 chore.下调基建办公室地灵的优先级 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/667
 2022-06-03 02:02:44 +08:00
MistEO
d6de65c1e5 chore.日志增加一个warn等级，调整部分日志为warn 2022-06-03 01:59:18 +08:00
MistEO
7f1e33bbd8 fix.修复两个肉鸽闪退的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/669
 2022-06-03 01:59:14 +08:00
guigui
2d630c6c52 feat.HTTP增加getImage接口 2022-06-03 01:14:43 +08:00
MistEO
886ff3af9b fix.修复作业没有actions字段时的崩溃问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/692
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/685
 2022-06-03 01:12:12 +08:00
sakuraxp
32f7df54aa Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-03 00:59:16 +08:00
sakuraxp
1d301b3e74 Merge branch 'dev' of https://github.com/sakuraxp/MaaAssistantArknights into dev 2022-06-03 00:58:50 +08:00
sakuraxp
5ade1b8955 feat.选中自动关机后按H出现的休眠选项。 2022-06-03 00:58:41 +08:00
MistEO
f31fac0b35 fix.修复信用购物黑名单为空时，不会购物的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/706
 2022-06-03 00:57:29 +08:00
MistEO
57173d02b1 fix.添加一个配置文件备份机制，尝试解决配置文件回滚问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/707
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/531
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/491
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/264
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/424
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/439
 2022-06-03 00:51:20 +08:00
MistEO
85b08f29e8 Merge pull request #700 from LYZhelloworld/doc/Helloworld/translation 
翻译工作
 2022-06-03 00:29:17 +08:00
MistEO
cc05e95936 Merge pull request #698 from LYZhelloworld/hotfix/Helloworld/issue-692 
Hotfix Issue 692
 2022-06-03 00:28:48 +08:00
MistEO
ffb3842036 fix.修复某种情况下不收取会客室的问题 2022-06-03 00:26:04 +08:00
Helloworld
5a5d204a30 翻译 Linux编译教程 2022-06-02 23:56:41 +08:00