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,785 Commits 60 Branches 1,840 Tags
506f44e8f7209824e7afcd86bad6c4e1ae8aa074
Commit Graph

922 Commits

Author SHA1 Message Date
MistEO
506f44e8f7 Merge pull request #713 from cglcv/dev 
Dev-可选择使用系统通知推送MAA通知
 2022-06-04 21:52:36 +08:00
MistEO
9c2258de0f Merge pull request #733 from lhhxxxxx/feat/robot 
[Enhancement] 小车提示
 2022-06-04 21:29:08 +08:00
iguigui
6b8e95ab79 Merge pull request #741 from BTreeNewBee/maaHTTP 
doc.HTTP接口相关文档优化
 2022-06-04 21:26:34 +08:00
guigui
0e71639767 doc.优化HTTP文档 2022-06-04 20:20:14 +08:00
guigui
e222a87239 doc.优化HTTP文档 2022-06-04 19:55:39 +08:00
lhhxxxxx
678fab328a fixed test tag 2022-06-04 17:01:07 +08:00
lhhxxxxx
19d41191d5 enhancement. color enhance 2022-06-04 16:59:06 +08:00
cglcv
b80b3bf44a 改bug 2022-06-04 16:53:33 +08:00
lhhxxxxx
304e447cb5 fix. robot tag won't be refreshed 2022-06-04 16:29:49 +08:00
lhhxxxxx
8a9523c096 feat. robot notification 2022-06-04 16:27:22 +08:00
cglcv
5a104621e4 改变UpdateUrl和show的处理方式 2022-06-04 15:42:57 +08:00
cglcv
942a981475 改个输错版本号的bug 2022-06-04 14:14:50 +08:00
cglcv
dc3e1af8c2 去掉一个未使用的变量 2022-06-04 13:43:38 +08:00
cgl
9f964cee37 Merge branch 'dev' of https://github.com/cglcv/MaaAssistantArknights into dev 2022-06-04 08:41:19 +08:00
cgl
bcfadead53 统一降级配置 2022-06-04 08:40:42 +08:00
cglcv
485f597d01 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-04 08:35:47 +08:00
cgl
411161621b Merge branch 'dev' of https://github.com/cglcv/MaaAssistantArknights into dev 2022-06-04 07:52:51 +08:00
cgl
72d8220692 更改OScheck 2022-06-04 07:47:31 +08:00
MistEO
95bd4d06ba Merge pull request #728 from BombaxCeiba/PR499Impl 
重命名了asst::utils下的字符串编码转换函数，修复了ansi_to_utf8的wstr数组初始化不完全的问题
 2022-06-04 03:59:16 +08:00
Dusk_NM02
70f09e3dde fix.修复了ansi_to_utf8的wstr数组初始化不完全的问题 
调整了ansi_to_utf8和utf8_to_ansi中的中间数组初始化方式
 2022-06-04 02:36:39 +08:00
Dusk_NM02
e3116a07e3 refactor.将编码互转函数重命名 
gbk_2_utf8 -> ansi_to_utf8
utf8_to_gbk -> utf8_to_ansi
 2022-06-04 01:36:22 +08:00
MistEO
56ea4bb5c5 Merge pull request #723 from lhhxxxxx/feat/robot 
[New Feature] 公招小车识别
 2022-06-04 01:18:51 +08:00
lhhxxxxx
7639a75eb9 Typo fix. 2022-06-03 21:42:52 +08:00
lhhxxxxx
927620df92 feat. Add recruit skip robot option 2022-06-03 21:39:58 +08:00
cglcv
64e262a76d Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-03 20:54:07 +08:00
cgl
7ef01840a1 修改格式，处理版本，增加复选框限制 2022-06-03 20:51:01 +08:00
cgl
a1d56afb4a 加上复选框Check 2022-06-03 19:27:41 +08:00
MistEO
9bf23182fe feat.自动战斗新增支持模拟悖论（需要自己选技能） 2022-06-03 18:04:22 +08:00
MistEO
1337e9feab Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-03 17:35:33 +08:00
MistEO
613d669489 fix.修复基建贸易站没有赤金的时候，长时间卡住的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/472
 2022-06-03 17:35:30 +08:00
MistEO
9f4daee24c fix.新增一个备选连接地址的逻辑，修复雷电等模拟器直接连不上的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/712
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/688
 2022-06-03 17:29:24 +08:00
cgl
2c6ea88b5c Merge branch 'dev' of https://github.com/cglcv/MaaAssistantArknights into dev 2022-06-03 16:32:14 +08:00
cgl
29f434f1cd 通知结构修改，增加退出时清空消息功能 2022-06-03 16:28:51 +08:00
lhhxxxxx
0650bfd7ab small fix 2022-06-03 16:23:35 +08:00
lhhxxxxx
b04fb000b2 feat. Add xaml dependency in IDE 2022-06-03 16:06:01 +08:00
cglcv
edd8c04b02 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-03 11:45:45 +08:00
cgl
3b3a298dbb 使用系统推送通知 2022-06-03 11:41:52 +08:00
MistEO
598c7f58f0 fix.修复不选择作业直接开始时的崩溃问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/679
 2022-06-03 05:06:24 +08:00
MistEO
a2c943d7b1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-03 04:25:27 +08:00
MistEO
d3387c408c chore.日志增加一个warn等级，调整部分日志为warn 2022-06-03 01:59:18 +08:00
MistEO
56983880d0 fix.修复两个肉鸽闪退的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/669
 2022-06-03 01:59:14 +08:00
guigui
5f0f04986e feat.HTTP增加getImage接口 2022-06-03 01:14:43 +08:00
MistEO
3517c4f173 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
dc12895c0f feat.选中自动关机后按H出现的休眠选项。 2022-06-03 00:58:41 +08:00
MistEO
76e3635740 fix.修复信用购物黑名单为空时，不会购物的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/706
 2022-06-03 00:57:29 +08:00
MistEO
aebd893893 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
cgl
1f31cb2d29 Merge branch 'dev' of https://github.com/cglcv/MaaAssistantArknights into dev 2022-06-02 23:25:59 +08:00
cgl
2ec791d90a 开始改通知方案 2022-06-02 23:07:48 +08:00
sakuraxp
1ca193bc14 feat.增加了自动休眠和自动待机的代码，UI上面暂未启用。 2022-06-02 01:27:02 +08:00
iguigui
4a4e83d1ae feat.增加getImage接口 2022-06-01 20:54:50 +08:00