Compare commits

...

1219 Commits

Author SHA1 Message Date
MistEO
ff704cf271 fix.删除多余的关卡选项 2022-06-08 02:02:00 +08:00
MistEO
4e9f2e0919 docs.更新CHANGELOG 2022-06-08 01:53:37 +08:00
MistEO
cdc633d400 feat.新增支持刷理智时崩溃自动重开游戏并继续上一次战斗。还重构了一些有的没的
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/720
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/115
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/766
2022-06-08 01:50:51 +08:00
MistEO
422a2bb2af feat.增加了adb炸了之后的重连机制及错误回调 2022-06-08 00:02:35 +08:00
MistEO
1b0890ad43 fix.修复刷理智某种情况下PRTS识别不准的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/749
2022-06-07 23:23:12 +08:00
MistEO
aa56e1dd11 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-07 23:06:03 +08:00
MistEO
dfe6d93ba1 fix. 减慢一点点部署速度
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/783
2022-06-07 23:02:18 +08:00
MistEO
c27c1df594 fix.修复击杀数识别不准的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/783
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/782
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/702
2022-06-07 23:01:32 +08:00
ABA2396
9d4a9a7f43 doc.强迫症玛丽的空格要求 2022-06-07 22:50:26 +08:00
ABA2396
e8539a9b8a fix.修复资源关导航问题 2022-06-07 22:43:25 +08:00
ABA2396
8b3d0d82e4 doc.修改了一下文档格式,增加了一点nextsub字段的顺序描述 2022-06-07 20:44:13 +08:00
ABA2396
6932699f20 doc.添加了两个现有字段的介绍 2022-06-07 20:36:00 +08:00
MistEO
511cf1a79f fix.修复一个掉落识别错误的问题 2022-06-07 20:08:03 +08:00
MistEO
eea3721681 chore.简单整一下日志 2022-06-07 19:55:41 +08:00
MistEO
8a9801be01 chore.增加一点超时时间 2022-06-07 02:50:28 +08:00
MistEO
550b5ef83a docs.更新CHANGELOG 2022-06-07 02:40:56 +08:00
MistEO
c0c8c128b5 fix.简单修复一下截图转发端口获取不正确的问题 2022-06-07 02:39:11 +08:00
MistEO
88bf06cc6e fix.修复自动战斗不能放技能的问题,并修复拖动速度 2022-06-07 02:17:57 +08:00
MistEO
adac77f36b fix.修复socket不可用时阻塞住的问题 2022-06-07 02:12:33 +08:00
MistEO
e8479a001a merge feat/specify_the_drops 2022-06-07 01:18:28 +08:00
MistEO
401a740df9 feat.指定掉落功能,适配界面,修复一些bug 2022-06-07 01:15:45 +08:00
MistEO
a6a2d30e0a Merge pull request #773 from lhhxxxxx/perf/enhancement
[Done] [Perf] code tidy
2022-06-07 00:01:09 +08:00
lhhxxxxx
326ab62350 perf. remove redundant semicolon 2022-06-06 23:11:00 +08:00
lhhxxxxx
23c88e88e0 perf. use false instead of 0 2022-06-06 22:33:39 +08:00
MistEO
a8bd0e0a26 feat.新增支持刷理智指定材料数量 2022-06-06 20:26:56 +08:00
lhhxxxxx
be759e1bb1 perf. use reinterpret_cast 2022-06-06 20:11:12 +08:00
lhhxxxxx
425a287121 perf. use const& or std::move() 2022-06-06 20:02:51 +08:00
lhhxxxxx
c3a27eeadc perf. use c++ form import 2022-06-06 19:46:13 +08:00
lhhxxxxx
7a15449dfe perf. use nullptr 2022-06-06 19:31:48 +08:00
lhhxxxxx
803134d541 perf. return braced init list 2022-06-06 19:25:17 +08:00
lhhxxxxx
9e3bde4b63 perf. remove invalid std::move() 2022-06-06 18:54:01 +08:00
lhhxxxxx
e6ad9b242b perf. use static_cast 2022-06-06 18:52:42 +08:00
ABA2396
714a693897 feat.隐藏下划线 2022-06-06 13:43:38 +08:00
ABA2396
1122828200 feat.修改了链接之间的间距 2022-06-06 13:38:26 +08:00
ABA2396
e6cea9c6d4 feat.增加了 常见问题 的网页超链接 2022-06-06 13:37:30 +08:00
ABA2396
00ffd0edf5 feat.增加了问题反馈导航 2022-06-06 13:22:13 +08:00
MistEO
23d6d63c90 fix. 修复一个蓝叠多开时连不上的问题 2022-06-06 03:21:56 +08:00
ABA2396
ad92daf350 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-06 03:16:43 +08:00
ABA2396
df6f34feb7 fix.开始唤醒b服类名错误 2022-06-06 03:16:26 +08:00
MistEO
59c887bca1 fix.自动战斗修复角落的干员释放技能和撤退按钮点不到的问题 2022-06-06 03:02:43 +08:00
MistEO
6721ac5da6 Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-06 02:53:22 +08:00
MistEO
95f94a77ac docs.更新CHANGELOG 2022-06-06 02:46:03 +08:00
MistEO
95d527d9d1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-06 02:35:20 +08:00
MistEO
6b8287e96e feat.肉鸽支持月度小队,同时修复肉鸽的一些被改坏了的地方 2022-06-06 02:35:10 +08:00
ABA2396
7c1a6cf716 feat.修改了作业链接显示方式 2022-06-06 02:23:41 +08:00
ABA2396
9cc76f749f feat.作业界面log自动换行 2022-06-06 02:13:32 +08:00
MistEO
5c9b12bc7d chore.水了几个没什么意义的变量名 2022-06-06 02:05:33 +08:00
MistEO
3007cc3357 fix.修复几个肉鸽识别错误的问题 2022-06-06 02:02:38 +08:00
MistEO
9f3134165f feat.掉落识别错误的时候,自动保存一下图片
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/753
2022-06-06 01:03:03 +08:00
MistEO
6816b4d3c5 chore.增加了一个分辨率获取错误的报错 2022-06-06 01:02:35 +08:00
MistEO
f52d6a7043 chore.去掉了个默认参数 2022-06-06 00:46:13 +08:00
MistEO
a120b0a3da feat.自动抄作业的使用技能和撤退,优先按坐标进行 2022-06-06 00:43:10 +08:00
MistEO
32d11d9912 chore.改了点变量名,和有的没的 2022-06-06 00:42:33 +08:00
MistEO
dd4870cc31 Merge pull request #756 from sakuraxp/dev
remove.移除自动作业显示视频来源URL。
2022-06-05 23:53:49 +08:00
MistEO
3bdb19620c Merge pull request #745 from MaaAssistantArknights/perf/netcat
perf. 使用 nc 转发的方式,优化截图速度
2022-06-05 23:53:32 +08:00
MistEO
84f3eaf827 merge dev 2022-06-05 23:52:38 +08:00
sakuraxp
68a33b4294 Merge branch 'dev' of https://github.com/sakuraxp/MaaAssistantArknights into dev 2022-06-05 23:52:13 +08:00
sakuraxp
c7a364f59d remove.移除自动作业显示视频来源URL。 2022-06-05 23:51:21 +08:00
ABA2396
aae4f1aedb feat.默认关闭自动编队(现在自动编队还有问题) 2022-06-05 23:46:27 +08:00
MistEO
6926ecb592 chore.简单调整一下延迟 2022-06-05 23:39:40 +08:00
MistEO
9c12620898 docs. fix a space typo 2022-06-05 19:06:48 +08:00
MistEO
8c456e3c49 Merge pull request #729 from LengmoAngel/patch-2
更新 Readme.md 加入fastgit镜像渠道
2022-06-05 19:00:36 +08:00
ABA2396
f561891749 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-05 18:59:44 +08:00
ABA2396
7d538c9083 feat.修改log控件宽度 2022-06-05 18:58:27 +08:00
MistEO
98c777bd3b Merge pull request #746 from sakuraxp/dev
feat.优化,当操作系统不支持Windows系统推送通知时,隐藏相应设置选项。
2022-06-05 18:56:55 +08:00
MistEO
b23223df3b Merge pull request #743 from lhhxxxxx/feat/startup
[Done] [New Feature] 自动启动方舟
2022-06-05 18:56:18 +08:00
ABA2396
354fd7c8bc feat.log自动换行 2022-06-05 18:49:21 +08:00
lhhxxxxx
3c2951f727 renamed. 2022-06-05 18:35:13 +08:00
lhhxxxxx
4a1389cdf1 startup subtask error callback implement. 2022-06-05 18:15:32 +08:00
ABA2396
1e2da65fe2 doc.更新下陈年老图 2022-06-05 18:08:25 +08:00
lhhxxxxx
7a4d5efa90 gui refactor. 2022-06-05 18:05:06 +08:00
lhhxxxxx
e3573d7880 core refactor. 2022-06-05 17:57:05 +08:00
lhhxxxxx
c63194c885 gui start enable implement. 2022-06-05 16:37:26 +08:00
lhhxxxxx
dd34e29b02 core start game enable implement. 2022-06-05 15:47:27 +08:00
lhhxxxxx
2244a2ae61 order changed. 2022-06-05 15:29:15 +08:00
cglcv
8408cc8a13 优化文档中对WSA连接方式的描述 (#750)
* 修改WSA的连接描述,使其更精确

WSA这波更新我愿称之为一言难尽……

* Update 模拟器支持.md

* Update 模拟器支持.md

* Update 模拟器支持.md

* Update 模拟器支持.md
2022-06-05 15:14:35 +08:00
lhhxxxxx
189d755c08 deleted redundant if. 2022-06-05 15:08:54 +08:00
ABA2396
c1aeb3aadc Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-05 12:07:41 +08:00
ABA2396
9e3ac39731 fix.资源关卡导航失败 2022-06-05 12:07:34 +08:00
MistEO
e6e1153880 perf.优化自动战斗的一些延迟 2022-06-05 04:40:19 +08:00
sakuraxp
8849a2c55d fix.恢复误删除的内容。 2022-06-05 04:15:12 +08:00
sakuraxp
178427dc60 fix.再次修bug。 2022-06-05 04:13:18 +08:00
sakuraxp
91838e5ed3 Merge branch 'dev' of https://github.com/sakuraxp/MaaAssistantArknights into dev 2022-06-05 03:51:29 +08:00
sakuraxp
c4732589e0 fix.修正了在配置文件启用而实际不支持Windows 推送通知的逻辑判断。 2022-06-05 03:51:22 +08:00
sakuraxp
75af4921e6 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-05 03:26:11 +08:00
sakuraxp
a2f51d23b8 feat.优化,当操作系统不支持Windows系统推送通知时,隐藏相应设置选项。 2022-06-05 03:07:05 +08:00
MistEO
a2e4ee6d76 perf.优化自动战斗从入场到开始识别干员之间的延迟 2022-06-05 03:06:27 +08:00
MistEO
93bad27880 merge dev 2022-06-05 02:34:44 +08:00
MistEO
cfc6a04ff0 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-05 02:30:34 +08:00
MistEO
d33ac95870 feat.不用用雷电,会变得不幸.jpg 2022-06-05 02:29:30 +08:00
MistEO
f8b2f30994 fix.修复socket转发截图反代失效的问题,并取消gzip压缩 2022-06-05 02:28:38 +08:00
ABA2396
dcf8d71bb4 feat.修改了关卡选框宽度,重新排序关卡列表 2022-06-05 02:20:33 +08:00
ABA2396
a180cc8611 feat.导入了掉落物数据 2022-06-05 01:46:53 +08:00
lhhxxxxx
7aeb05ef61 full completed. 2022-06-05 01:24:06 +08:00
lhhxxxxx
0ec73e5aa0 view completed. 2022-06-05 01:13:54 +08:00
lhhxxxxx
f694204856 core completed. 2022-06-05 00:46:21 +08:00
ABA2396
0a46c00983 feat.完成下拉框模糊匹配 2022-06-05 00:36:56 +08:00
lhhxxxxx
2cc08e3971 add files 2022-06-04 23:58:27 +08:00
lhhxxxxx
2bdca8241a before add files 2022-06-04 23:43:06 +08:00
lhhxxxxx
6e9c1914c2 underlying codes implement 2022-06-04 23:15:03 +08:00
冷沫天使blue
a14acc58a4 update readme.md
update readme.md
2022-06-04 22:59:13 +08:00
lhhxxxxx
d0049ddd1f refract start command 2022-06-04 21:52:53 +08:00
MistEO
4adb5072ea Merge pull request #713 from cglcv/dev
Dev-可选择使用系统通知推送MAA通知
2022-06-04 21:52:36 +08:00
MistEO
e0a5305394 Merge pull request #733 from lhhxxxxx/feat/robot
[Enhancement] 小车提示
2022-06-04 21:29:08 +08:00
MistEO
35b0338f68 Merge pull request #735 from LYZhelloworld/hotfix/Helloworld/issue-716
Hotfix/helloworld/issue 716
2022-06-04 21:28:19 +08:00
iguigui
eadad98bbb Merge pull request #741 from BTreeNewBee/maaHTTP
doc.HTTP接口相关文档优化
2022-06-04 21:26:34 +08:00
lhhxxxxx
f68527b258 change name 2022-06-04 21:04:58 +08:00
lhhxxxxx
ee2657e38b update adb command 2022-06-04 21:01:02 +08:00
guigui
2cc514c16d doc.优化HTTP文档 2022-06-04 20:20:14 +08:00
ABA2396
639aad730d feat.增加了材料下拉框 2022-06-04 20:10:03 +08:00
guigui
a7f3bbeea0 doc.微调首页文档增加HTTP接口文档指引 2022-06-04 20:08:39 +08:00
guigui
27070370ea doc.优化HTTP文档 2022-06-04 19:55:39 +08:00
Helloworld
502bce664b Fix wrong usage of val 2022-06-04 17:32:25 +08:00
Helloworld
965875359d 修复“作业制作器仅填写关卡名,而不填写其他的内容时,点击 下载 JSON 没有反应” 2022-06-04 17:28:50 +08:00
lhhxxxxx
5933b78ab3 fixed test tag 2022-06-04 17:01:07 +08:00
lhhxxxxx
4576a632cf enhancement. color enhance 2022-06-04 16:59:06 +08:00
cglcv
a7ceef90cf 改bug 2022-06-04 16:53:33 +08:00
lhhxxxxx
f12a504a69 fix. robot tag won't be refreshed 2022-06-04 16:29:49 +08:00
lhhxxxxx
09d234796d feat. robot notification 2022-06-04 16:27:22 +08:00
cglcv
d2ec527886 改变UpdateUrl和show的处理方式 2022-06-04 15:42:57 +08:00
cglcv
c0b9ff7209 改个输错版本号的bug 2022-06-04 14:14:50 +08:00
cglcv
3a39f626e5 Merge branch 'dev' of https://github.com/cglcv/MaaAssistantArknights into dev 2022-06-04 13:47:43 +08:00
cglcv
172d04cd44 去掉一个未使用的变量 2022-06-04 13:43:38 +08:00
cglcv
0b800a28ac 取消不必要的更改 2022-06-04 12:54:27 +08:00
cglcv
c131e92edc 取消更改README 2022-06-04 12:53:43 +08:00
cgl
e18eb97ba4 尝试去除不必要的更改-2 2022-06-04 10:52:57 +08:00
cgl
437e3c4b38 尝试去除不必要的更改 2022-06-04 10:52:30 +08:00
MistEO
d94f0a9f61 feat.初步完成socket通讯 2022-06-04 08:48:11 +08:00
cgl
7d6647e0ad Merge branch 'dev' of https://github.com/cglcv/MaaAssistantArknights into dev 2022-06-04 08:41:19 +08:00
cgl
75776be0ff 统一降级配置 2022-06-04 08:40:42 +08:00
cglcv
0f5a65a79c Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-04 08:35:47 +08:00
cgl
4366e133ff Merge branch 'dev' of https://github.com/cglcv/MaaAssistantArknights into dev 2022-06-04 07:52:51 +08:00
cgl
95359eed7b 更改OScheck 2022-06-04 07:47:31 +08:00
MistEO
1af0a01ced feat.不用用雷电,会变得不幸.jpg 2022-06-04 04:35:07 +08:00
MistEO
886b8ce9a8 fix.简单修复一些干员名识别错误 2022-06-04 04:00:13 +08:00
MistEO
49dc284a5a Merge pull request #728 from BombaxCeiba/PR499Impl
重命名了asst::utils下的字符串编码转换函数,修复了ansi_to_utf8的wstr数组初始化不完全的问题
2022-06-04 03:59:16 +08:00
冷沫天使blue
17ec8e0b6b update Readme.md 格式格式格式
update Readme.md 格式格式格式
2022-06-04 03:53:03 +08:00
冷沫天使blue
0a3bbb3b14 update Readme.md 格式修正
update Readme.md 格式修正
2022-06-04 03:22:37 +08:00
冷沫天使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.自动战斗新增支持模拟悖论(需要自己选技能) 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
Helloworld
9ce6274837 翻译 README 2022-06-02 23:41:05 +08:00
cgl
f3b5e35fdb Merge branch 'dev' of https://github.com/cglcv/MaaAssistantArknights into dev 2022-06-02 23:25:59 +08:00
cgl
f8f04cbf4b 开始改通知方案 2022-06-02 23:07:48 +08:00
Helloworld
ce22666f8c 修复一些翻译错误的文本和未翻译的文本 2022-06-02 22:48:36 +08:00
sakuraxp
2631f5a5b1 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-02 19:24:30 +08:00
Helloworld
a5957af59d 翻译 集成文档(部分) 2022-06-02 15:03:33 +08:00
Helloworld
df45c0539a 翻译 详细介绍(部分) 2022-06-02 14:35:42 +08:00
Helloworld
25e2b0d3a0 翻译 肉鸽战斗流程协议 2022-06-02 13:30:47 +08:00
Helloworld
b3c9071179 翻译 模拟器支持 2022-06-02 13:16:58 +08:00
Helloworld
fd8206052c 翻译 战斗流程协议 2022-06-02 11:39:46 +08:00
Helloworld
021a754c07 翻译 任务流程协议 2022-06-02 11:06:48 +08:00
Helloworld
271fe74338 翻译 回调消息协议 2022-06-02 10:28:07 +08:00
Helloworld
93c4c91bef Make actions field required 2022-06-02 09:36:59 +08:00
sakuraxp
5054855523 feat.增加了自动休眠和自动待机的代码,UI上面暂未启用。 2022-06-02 01:27:02 +08:00
MistEO
25eeaf5a59 Merge pull request #689 from LYZhelloworld/doc/Helloworld/translation
文档翻译工作
2022-06-02 01:22:34 +08:00
MistEO
472d4c07e5 Merge pull request #687 from MikeQu223/master
docs.更新HyperV的操作描述
2022-06-02 01:19:59 +08:00
Helloworld
4dc670c8a8 翻译 常见问题 2022-06-02 00:14:33 +08:00
Helloworld
86d8d76ce1 翻译 写给萌新的发电全流程 2022-06-01 23:44:52 +08:00
MikeQu223
489894ffd0 docs.更新HyperV的操作描述 2022-06-01 23:05:59 +08:00
iguigui
be5ff96125 feat.增加getImage接口 2022-06-01 20:54:50 +08:00
ABA2396
8415a488fd fix.修复了在任务执行中仍可以使用 全/反选 按钮的问题 2022-06-01 17:33:23 +08:00
ABA2396
fdebcb940a fix.修复翎羽识别错误 2022-06-01 17:01:43 +08:00
MistEO
6bf03b5d10 docs.更新HyperV的操作描述 2022-06-01 09:40:04 +08:00
MistEO
6bfb64151a Merge pull request #661 from BTreeNewBee/maaHTTP
feta.Maa-HTTP+Websocket接口实现
2022-06-01 00:06:28 +08:00
guigui
2ddb2e3587 Merge remote-tracking branch 'origin/maaHTTP' into maaHTTP 2022-06-01 00:01:00 +08:00
guigui
5de7177ba2 doc.优化文档文案 2022-06-01 00:00:43 +08:00
iguigui
f52779ebb3 Merge branch 'MaaAssistantArknights:master' into maaHTTP 2022-05-31 23:57:44 +08:00
guigui
2f4b60f849 feat.Maa-HTTP 0.0.1版本完成 2022-05-31 23:57:19 +08:00
MistEO
c199185ba5 Merge branch 'dev' 2022-05-31 23:54:39 +08:00
MistEO
108b94ad55 fix.修复一个肉鸽选择技能时越界崩溃的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/642
2022-05-31 23:35:07 +08:00
MistEO
920bfa7bc3 Merge pull request #658 from MaaAssistantArknights/dev
Release v3.9.1
2022-05-31 23:13:22 +08:00
MistEO
d19bdcfba4 docs.更新CHANGELOG 2022-05-31 23:01:23 +08:00
MistEO
09c89c264d feat.新增一个分辨率过低的界面提示 2022-05-31 22:55:55 +08:00
MistEO
37b00f84d4 docs.更新文档关于连接模拟器的一些内容 2022-05-31 22:38:18 +08:00
MistEO
dbab1ca310 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-31 22:26:11 +08:00
MistEO
1a4225c844 feat.新增C#侧自动检测adb端口 2022-05-31 22:24:25 +08:00
MistEO
cdce968b5d fix.修复一些模拟器的进程抓取逻辑 2022-05-31 21:27:18 +08:00
ABA2396
ed9b11bb52 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-31 21:27:15 +08:00
ABA2396
702e9c2049 feat.添加了任务栏 全选反选 功能(肉鸽除外) 2022-05-31 21:27:06 +08:00
MistEO
631959c9d8 fix.修复诡异行商处招募干员然后卡住的问题,顺便去掉了一些多余的日志 2022-05-31 20:50:29 +08:00
iguigui
303d52bed7 打包优化一下 2022-05-31 20:47:35 +08:00
MistEO
8682ecf649 fix.修复某些情况下开始行动次数是负数的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/483
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/645
2022-05-31 20:28:41 +08:00
MistEO
d37e75888a fix.修复掉落识别错误 2022-05-31 19:40:32 +08:00
MistEO
8e5369887e Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-31 18:44:14 +08:00
MistEO
58c46bfd95 docs.更新主文档 2022-05-31 16:28:15 +08:00
MistEO
7486c43342 docs.更新常见问题文档 2022-05-31 16:27:16 +08:00
MistEO
5f005496df docs.更新文档导航部分 2022-05-31 15:48:39 +08:00
MistEO
737ce71384 docs.更新文档 (#640)
* docs.更新文档关于HyperV的小tips

* docs.更新常见问题,连接错误

* docs.更新雷电的介绍
2022-05-31 15:45:17 +08:00
MistEO
fbffacb24c docs.更新雷电的介绍 2022-05-31 15:43:24 +08:00
MistEO
d8f4ed45e7 docs.更新常见问题,连接错误 2022-05-31 15:38:25 +08:00
MistEO
ba9c91f9cb docs.更新文档关于HyperV的小tips 2022-05-31 15:33:46 +08:00
MistEO
da5fb597bb Merge pull request #632 from MaaAssistantArknights/dev
Release v3.9.0-beta.8
2022-05-31 01:21:50 +08:00
ABA2396
46b4d21159 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-31 01:11:36 +08:00
ABA2396
692225d6f3 fix.修改一处大小写错误 2022-05-31 01:11:30 +08:00
MistEO
547fd9fe82 docs.更新CHANGELOG 2022-05-31 01:05:43 +08:00
MistEO
9ee59fd0a7 fix.修复肉鸽随机购买收藏品但钱不够时卡住的问题
fix #615
2022-05-31 00:51:39 +08:00
MistEO
a3ba8803ea fix.修复HyperV小后门的bug 2022-05-31 00:40:23 +08:00
MistEO
4f40003f8b chore.整理任务流程文档及配置,修改subErrorIgnored默认值为false 2022-05-31 00:20:30 +08:00
MistEO
a1039bc056 fix.修复覆潮之下关卡返回卡住的问题
fix #627
2022-05-31 00:11:20 +08:00
MistEO
4411b0ff85 feat.为HyperV蓝叠开了个小后门,自动获取地址的 2022-05-30 23:54:05 +08:00
MistEO
7bf26551e3 fix.修复自动更新时的崩溃问题 2022-05-30 23:48:35 +08:00
guigui
d392e99a99 试图弄一个Maa-HTTP.exe 2022-05-30 23:22:16 +08:00
MistEO
2de25d8fb1 fix.修复自动抄作业突袭模式不开始的问题 2022-05-30 22:49:06 +08:00
MistEO
6bab110f75 chore.更新项目工程配置 2022-05-30 22:48:52 +08:00
MistEO
71ac936079 fix.修复自动编队识别少了的问题
fix #622
2022-05-30 22:25:25 +08:00
MistEO
50f5eaceac Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-30 22:24:50 +08:00
ABA2396
c04fd8f729 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-30 22:19:51 +08:00
ABA2396
fdf942b17f feat.整合了现有关卡导航
修改了上次提交未修改的内容;将活动导航方式统一,以后出新活动可以直接复制修改;1-7的导航未修改,只是将其和其他导航放在了一起
2022-05-30 22:18:14 +08:00
MistEO
ca8e7b7214 fix.修复一个掉落识别错误的问题
fix 626
2022-05-30 22:17:05 +08:00
MistEO
87dc7c767d Merge pull request #631 from LYZhelloworld/hotfix/Helloworld/fix-wrong-field-for-title-and-details
修复错误字段名
2022-05-30 22:00:30 +08:00
Helloworld
2046ebb2fd UI adjustments 2022-05-30 21:58:44 +08:00
MistEO
16fff7e1b2 chore.给子任务加了点日志 2022-05-30 21:57:52 +08:00
Helloworld
7452ec6f53 Fix wrong fields 2022-05-30 21:56:19 +08:00
MistEO
9a4855db59 chore.更新关卡数据 2022-05-30 21:36:44 +08:00
MistEO
aeb5c554c5 chore. rename 2022-05-30 21:33:54 +08:00
MistEO
d352d9f877 Merge pull request #624 from soundofautumn/dev
python作业生成器更新
2022-05-30 21:33:11 +08:00
ABA2396
19feb974c6 feat.修改了资源类关卡的导航 2022-05-30 19:36:10 +08:00
ABA2396
58c7917942 feat.添加“覆潮之下”复刻活动关卡导航 2022-05-30 16:07:24 +08:00
ABA2396
8eb4702ceb fix.修复上次提交的顺序问题 2022-05-30 16:01:00 +08:00
ABA2396
459824f52f fix.修复斯卡蒂海嗣失败问题 2022-05-30 15:24:43 +08:00
AutumnSound
11ffd382b5 添加自动生成文件名功能 2022-05-30 13:52:55 +08:00
AutumnSound
33db2124c6 新增海嗣语
让你的作业一键带上神经损伤(
2022-05-30 13:28:50 +08:00
MistEO
5178bfd37a Merge pull request #617 from sakuraxp/dev
fix.增加了group类型的干员显示
2022-05-30 12:00:00 +08:00
MistEO
871f1d7e0f Merge pull request #621 from LYZhelloworld/feat/Helloworld/add-missing-features
添加重构后丢失的功能
2022-05-30 11:59:51 +08:00
Helloworld
5f0c453157 UI changes 2022-05-30 11:00:47 +08:00
Helloworld
d24dd7d3b7 Implement moving 2022-05-30 10:56:03 +08:00
Helloworld
8702abe745 Use array manipulation 2022-05-30 10:32:56 +08:00
Helloworld
eb00695e56 Add autocomplete for operator names 2022-05-30 10:01:47 +08:00
AutumnSound
2fae53247c Merge branch 'MaaAssistantArknights:dev' into dev 2022-05-30 09:04:39 +08:00
AutumnSound
4a1d3c0321 优化调用方式 2022-05-30 08:59:52 +08:00
sakuraxp
8f572345ae fix.增加了备选group类型的干员显示 2022-05-30 03:01:17 +08:00
sakuraxp
708a4380e6 Merge branch 'MaaAssistantArknights:dev' into dev 2022-05-30 02:57:48 +08:00
sakuraxp
84be2234de fix.增加了备选group类型的干员显示 2022-05-30 02:56:54 +08:00
MistEO
39bfe8c8b4 Merge pull request #616 from sakuraxp/dev
feat.自动战斗界面增加显示干员阵容和攻略url。
2022-05-30 02:12:50 +08:00
MistEO
4f67e9dc04 feat.为 ProcessTask 添加子任务字段
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/584
2022-05-30 02:10:48 +08:00
sakuraxp
388048ce52 feat.自动战斗界面增加显示干员阵容和攻略url。 2022-05-30 02:03:16 +08:00
MistEO
acf07e063d chore.新增了一个连接的兼容模式(不获取uuid) 2022-05-30 01:25:04 +08:00
MistEO
7e3450e64c Merge pull request #614 from MaaAssistantArknights/dev
Release v3.9.0-beta.7
2022-05-30 01:05:45 +08:00
MistEO
189fdedbe6 fix.修复部署时的目录错误;添加了老版本的作业制作器 2022-05-30 01:03:18 +08:00
MistEO
379edc2465 docs.更新v3.9.0-beta.7 CHANGELOG 2022-05-30 00:44:07 +08:00
MistEO
074f563e7d chore.WPF工程生成时顺便拷贝python脚本 2022-05-30 00:35:53 +08:00
MistEO
6e1bad98a1 feat.新增支持定时执行 2022-05-30 00:35:11 +08:00
guigui
d5c18bf2c4 编译 2022-05-30 00:19:25 +08:00
guigui
eb5c556b09 加入日志系统 2022-05-29 23:58:20 +08:00
MistEO
09c80f3b61 chore.简单调整一下作业生成器布局 2022-05-29 23:37:59 +08:00
MistEO
1af1645b2b Merge pull request #613 from LYZhelloworld/hotfix/Helloworld/group-new-oper-button
为群组添加“新增干员”按钮
2022-05-29 23:31:13 +08:00
Helloworld
36c83f1baf Add new oper button for groups 2022-05-29 23:29:03 +08:00
MistEO
eab51d3cc8 chore.简单调整了一下作业制作器 2022-05-29 23:13:42 +08:00
MistEO
f9d33fbdaa Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-29 23:07:30 +08:00
MistEO
7abfc10dd1 perf.优化自动抄作业,同时支持关卡中文名和英文名 2022-05-29 23:05:54 +08:00
guigui
b7c52ccbbe Maa WS接口实现 2022-05-29 22:54:09 +08:00
MistEO
0a403b012d perf.简单调整一下肉鸽的选人优先级 2022-05-29 22:46:49 +08:00
MistEO
822fb29ca4 fix.修复肉鸽干员名的错别字 2022-05-29 22:44:54 +08:00
MistEO
238dcac02c Merge pull request #612 from LYZhelloworld/feat/Helloworld/tools-copilot-parse-groups
作业生成器增加"分组"的功能
2022-05-29 22:38:37 +08:00
MistEO
ca04ffb4fe perf.修复一个关卡掉落识别错误的问题;并优化关卡掉落数量的识别速度(不split了) 2022-05-29 22:37:40 +08:00
Helloworld
fe351346c6 Added cost changes 2022-05-29 22:37:31 +08:00
Helloworld
a8bc18c220 Merge branch 'dev' into feat/Helloworld/tools-copilot-parse-groups
# Conflicts:
#	tools/CopilotDesinger/自动战斗作业生成器.html
2022-05-29 22:34:52 +08:00
Helloworld
25eba8f1c4 Add group feature 2022-05-29 22:07:25 +08:00
Helloworld
706a37e24c refactored html and js 2022-05-29 21:46:17 +08:00
MistEO
e47a625d2b Merge pull request #611 from soundofautumn/dev
python生成作业脚本更新
2022-05-29 20:54:21 +08:00
AutumnSound
92fb428b12 添加干员名称自动补全功能 2022-05-29 20:19:10 +08:00
AutumnSound
6175032302 添加对cost_changes的支持 2022-05-29 18:33:48 +08:00
MistEO
fe74e84161 fix.修复图片模板越界时的崩溃问题;并添加一些日志
fix #610
2022-05-29 17:15:44 +08:00
MistEO
bf50a61dd1 feat.再改改制作器ui 2022-05-29 16:57:01 +08:00
MistEO
369aea9870 feat.作业制作器新增支持cost_changes字段,并简单调整了一下布局 2022-05-29 16:53:04 +08:00
MistEO
fd391c2a1d fix.修复自动战斗cost_changes和kills同时存在时,cost_changes基准计算错误的问题 2022-05-29 16:35:36 +08:00
MistEO
76f6ccce79 feat.自动战斗新增支持费用增量字段,与击杀数是与的关系 2022-05-29 16:31:39 +08:00
MistEO
e762b88696 docs.新增自动战斗 cost_changes 字段描述;修改一些其他的文档表述问题 2022-05-29 16:04:47 +08:00
MistEO
2b0b70acc6 Merge pull request #609 from zhangchi0104/dev
fix.修复了tasks.json中SN-Open.png的大小写错误
2022-05-29 14:17:09 +08:00
Alex Zhang
8eff738e53 fix.修复了task.json中其他的拼写错误 2022-05-29 13:59:32 +08:00
MistEO
44c64730d1 Merge pull request #608 from zhangchi0104/dev
修复了tasks.json中SN-Open.png的大小写错误以及dart的格式
2022-05-29 13:47:49 +08:00
Alex Zhang
e9f9bcae34 style.重命名src/dart -> src/Dart 2022-05-29 13:46:16 +08:00
Alex Zhang
2337c63731 style.格式化了maa_core.dart 2022-05-29 13:44:39 +08:00
Alex Zhang
d4cdf8a215 fix.修复了tasks.json中SN-Open.png的大小写错误 2022-05-29 13:38:12 +08:00
MistEO
ad5646579d docs.更新文档描述 2022-05-29 05:51:06 +08:00
MistEO
536a5ce49e docs. update style 2022-05-29 05:46:41 +08:00
MistEO
6b41c38783 Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights 2022-05-29 05:42:19 +08:00
MistEO
bdee4beadb docs.新增作业群群号 2022-05-29 05:42:14 +08:00
MistEO
d0b106bbb6 docs.更新文档一些过时的部分 2022-05-29 05:38:42 +08:00
MistEO
a7d786a057 Merge pull request #601 from MaaAssistantArknights/dev
Release v3.9.0-beta.6: 新版肉鸽重构及适配完成;自动抄作业优化
2022-05-29 05:01:36 +08:00
MistEO
5f50ecbc82 Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-29 04:50:46 +08:00
MistEO
2e84a9b0ec docs.更新v3.9.0-beta.6的CHANGLOG 2022-05-29 04:48:25 +08:00
MistEO
23495b47ce chore.关闭掉落识别的调试宏 2022-05-29 04:48:09 +08:00
MistEO
da773a1c98 chore.自动抄作业关闭掉界面上重复的doc显示 2022-05-29 04:47:06 +08:00
MistEO
8ed9eafafc feat.自动战斗新增支持按location撤退(尽量少使用) 2022-05-29 04:40:44 +08:00
MistEO
c5b3327cdb fix.修复肉鸽一个没什么影响的小问题(格子数据用错了) 2022-05-29 04:31:35 +08:00
MistEO
bd992c6aea chore.整理一下小工具的拷贝路径 2022-05-29 04:26:33 +08:00
MistEO
be82235f28 feat.自动战斗界面上新增直接显示文件介绍 2022-05-29 04:20:45 +08:00
MistEO
09a43b48f6 feat.界面上加上官网和源码地址 2022-05-29 04:04:54 +08:00
MistEO
091ab2c879 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-29 03:45:23 +08:00
MistEO
361a12de99 perf.调整肉鸽战斗放置干员的优先级 2022-05-29 03:44:56 +08:00
MistEO
1b4c4bf82b perf.牛牛! 2022-05-29 02:51:07 +08:00
MistEO
42284391f0 Merge pull request #599 from soundofautumn/dev
python自动生成作业脚本更新
2022-05-29 02:40:48 +08:00
MistEO
659d784015 perf.优化肉鸽干员朝向 2022-05-29 02:39:12 +08:00
MistEO
b7a6ed84cf feat.新增肉鸽招募干员精英化、等级识别,自动判断是否招募 2022-05-29 01:07:49 +08:00
MistEO
425101c2e3 feat.完成肉鸽自动释放技能 2022-05-28 23:20:03 +08:00
AutumnSound
46e3e41908 重新配置asst导入方式 2022-05-28 22:29:03 +08:00
AutumnSound
436de69f18 python自动生成作业脚本更新
加了点注释 添加了自动调试功能 (连打开mma选作业都省了)
2022-05-28 20:42:30 +08:00
MistEO
112919df61 Merge pull request #595 from soundofautumn/master
添加自动生成作业工具
2022-05-28 20:32:15 +08:00
MistEO
a829a5aec3 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-28 20:31:44 +08:00
guigui
e9099c1698 Maa WS接口回调实现 2022-05-28 19:38:15 +08:00
MistEO
41801c15a2 fix.修复一个掉落识别错误的问题 2022-05-28 19:08:04 +08:00
AutumnSound
66a4c3db42 添加自动生成作业工具 2022-05-28 16:45:12 +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
iguigui
dfab6b5606 Maa HTTP server 2022-05-27 18:12:13 +08:00
Shawnsdaddy
c36e54c328 小工具功能增删 2022-05-27 02:17:11 -07:00
guigui
43f878a356 Maa HTTP Server 2022-05-27 02:11:28 +08:00
guigui
814d139837 Maa HTTP Server 2022-05-27 01:49:48 +08:00
MistEO
81553e5183 docs.更新CHANGELOG 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
iguigui
4d07b67a40 Maa HTTP server 2022-05-26 20:55:12 +08:00
guigui
d6f2b8d5d2 Maa HTTP Server 2022-05-25 22:45:05 +08:00
MistEO
7eda0f529b docs. fix url 2022-05-25 21:50:06 +08:00
iguigui
cb3e6fc211 Maa HTTP server DTO实现 2022-05-25 20:57:17 +08:00
iguigui
bc9795fb3c Maa HTTP server DTO实现 2022-05-25 20:52:24 +08:00
iguigui
0c301841b3 Merge branch 'MaaAssistantArknights:master' into maaHTTP 2022-05-25 16:47:07 +08:00
Shawnsdaddy
42be1a1ec0 新增插入功能+支持文本和颜色,修改部分UI 2022-05-24 17:48:12 -07:00
guigui
a05548be4b Maa HTTP Server 2022-05-25 02:37:24 +08: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 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
guigui
d7c1f87a59 Maa HTTP Server 2022-05-23 23:55:39 +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
Shawnsdaddy
fdd1ed423a 简易作业JSON生成器 2022-05-23 03:12:09 -07:00
Shawnsdaddy
6079d970c1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-23 03:05:12 -07:00
ABA2396
f9be730eab fix.修复一处文本错误 2022-05-23 12:51:47 +08:00
ABA2396
75b41081db feat.关闭愚人号活动导航入口 2022-05-23 12:46:27 +08:00
zzyyyl
251600eca5 fix.修复一处文本错误
`诡异` -> `诡意`
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/531#issuecomment-1133818839
2022-05-22 19:38:52 +08:00
Shawnsdaddy
e0cc3e9276 fix.修复无法代理图片识别错误情况 (#550) 2022-05-22 18:29:02 +08:00
Shawnsdaddy
c4442ee1f0 修复无法代理图片识别错误情况 2022-05-22 03:25:57 -07:00
Shawnsdaddy
792daa78c4 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-21 23:41:17 -07:00
Liam Sho
a75a44b4ac feat.更新日志显示支持 Markdown 渲染 2022-05-22 14:38:44 +08:00
zzyyyl
7da9e5e6a8 Merge pull request #545 from zzyyyl/fix/#544
fix.修复掉落识别部分关卡名识别错误的问题
2022-05-22 14:16:39 +08:00
zzyyyl
668b33b797 perf.只截取关卡代号 2022-05-22 13:41:59 +08:00
zzyyyl
578b20d0b1 fix.修复掉落识别部分关卡名识别错误的问题
fix #544
2022-05-22 13:15:38 +08:00
Liam Sho
4b135212eb perf.修改CICD,支持发布PreRelease
fix #541
2022-05-22 12:00:37 +08:00
MistEO
18ba05189c fix.修复自动战斗的一些小问题 2022-05-22 04:08:30 +08:00
MistEO
557c6f60f4 fix.回滚错误提交的调试用代码 2022-05-22 01:47:41 +08:00
MistEO
4b49e6d87d Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-22 01:00:05 +08:00
MistEO
f930bd5f2b chore.更新CD ChangLog相关,更新ChangeLog 2022-05-22 00:59:57 +08:00
MistEO
e9c925cf90 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
d5b0270916 fix.修复掉落识别第十章普通难度可能存在的难度识别错误问题 2022-05-21 23:58:19 +08:00
MistEO
254cf6ee30 fix.修复掉落识别部分数字识别错误的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/537
2022-05-21 23:48:04 +08:00
MistEO
af4c866fcd feat.添加了一个掉落识别错误的提示 2022-05-21 23:42:44 +08:00
MistEO
fb2b7d2773 Merge pull request #539 from BTreeNewBee/maaJavaSample
Maa Java Sample
2022-05-21 20:49:12 +08:00
guigui
b006f917b5 Maa Java Sample 2022-05-21 20:44:43 +08:00
MistEO
8c785fbd5f Merge pull request #534 from MaaAssistantArknights/dev
Release v3.9.0-beta
2022-05-21 02:03:22 +08:00
MistEO
1a1c1defed docs.更新CHANGELOG 2022-05-21 01:16:43 +08:00
Shawnsdaddy
29ee718257 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-20 10:14:18 -07:00
MistEO
0b09c9c3d7 feat.给界面上做了个简单的adb地址及配置选择 2022-05-21 01:11:20 +08:00
MistEO
f510bd537c fix.修复开始编队并关闭职业选择时,选人错误的问题 2022-05-21 00:03:40 +08:00
MistEO
118ca77d45 feat.自动抄作业界面的一些小优化 2022-05-21 00:03:22 +08:00
MistEO
2dc53ae568 fix.修复自动抄作业,识别干员之后总会再去识别其中某几个的问题 2022-05-20 23:53:52 +08:00
MistEO
9f7139c63b fix.修复自动抄作业的一些小bug 2022-05-20 23:31:35 +08:00
MistEO
15650f5e8a fix.修复一些掉落识别错误的情况 2022-05-20 23:04:27 +08:00
MistEO
bf1803c285 chore. task 接口支持了空参数 2022-05-20 22:30:10 +08:00
ABA2396
113ed8a473 fix.修复危机合约开放后愚人号关卡导航失效 2022-05-20 00:12:33 +08:00
MistEO
b3de192238 docs. update CHANGELOG 2022-05-20 00:10:12 +08:00
MistEO
fca35bd30e feat.简单优化了一下抄作业的 UI 2022-05-20 00:07:29 +08:00
MistEO
8f96b9f958 Merge pull request #526 from MaaAssistantArknights/feat/copilot
自动抄作业
2022-05-19 22:35:42 +08:00
MistEO
0a97e30b02 perf.简单优化了一下危机合约18的作业 2022-05-19 22:35:15 +08:00
MistEO
d092da8909 feat.修复肉鸽的一些小问题,增加盐风溶洞18作业 2022-05-19 22:10:06 +08:00
MistEO
cdaeffb817 fix.优化并修复掉落识别关卡名识别错误的问题 2022-05-19 20:31:21 +08:00
MistEO
de817bdfc6 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-05-19 20:18:42 +08:00
MistEO
434e4e657d fix.临时修复关卡名识别错误时的崩溃问题 2022-05-19 11:23:13 +08:00
Shawnsdaddy
093bcc21c7 Merge branch 'MaaAssistantArknights:dev' into dev 2022-05-18 09:55:19 -07:00
MistEO
f2dfcf3e72 feat. 自动战斗初版UI 2022-05-19 00:38:37 +08:00
MistEO
85b2d4d2d9 docs.更新文档 2022-05-19 00:37:27 +08:00
MistEO
d4fa71dea6 Merge branch 'dev' 2022-05-19 00:33:16 +08:00
MistEO
86d58b1c94 feat.重新开放企鹅上传。优化对未知材料的识别 2022-05-18 23:44:26 +08:00
MistEO
7bf34b094e fix.修复meojson的笔误 2022-05-18 23:44:04 +08:00
Shawnsdaddy
8eb0355724 Merge branch 'MaaAssistantArknights:dev' into dev 2022-05-17 22:26:27 -07:00
Liam Sho
0fafb91427 chore.移除 submodule 2022-05-18 12:30:08 +08:00
Liam Sho
d188af4417 perf.使 DevBuild 使用 Release 配置进行编译 2022-05-18 12:29:42 +08:00
MistEO
ec1df2544b fix.修复多个号交替使用时,领取任务卡住的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/481
2022-05-18 03:16:48 +08:00
MistEO
d36f4e5cd9 fix.尝试修复信用商店错误购买的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/516
2022-05-18 03:10:28 +08:00
MistEO
6564c82725 fix.修复错误的提示可用干员不足的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/502
2022-05-18 03:06:52 +08:00
MistEO
e26c28a741 Merge pull request #521 from ABA2396/output
Output
2022-05-18 02:24:11 +08:00
ABA2396
b38839a197 feat.优化输出信息 2022-05-18 02:22:41 +08:00
MistEO
98866b30e8 chore.修复自动更新OTA带来的一些问题 2022-05-18 02:04:42 +08:00
MistEO
6b02924629 fix.修复一个文件名错误 2022-05-18 01:41:32 +08:00
MistEO
748187713b chore.更新一下打包的脚本 2022-05-18 01:32:11 +08:00
MistEO
ca23377efc chore.修复一个配置错误 2022-05-18 01:26:34 +08:00
MistEO
f160b8eea2 Merge. Squash feature/drops 2022-05-18 01:24:25 +08:00
MistEO
d4e22e8e69 Merge pull request #520 from MaaAssistantArknights/dev
Dev
2022-05-18 01:10:59 +08:00
MistEO
7e03b09691 Merge pull request #518 from zhangchi0104/dev
添加了dart windows支持, 稳定了api(应该
2022-05-17 22:19:05 +08:00
Alex Zhang
398c1cd3c9 稳定了dart的api 2022-05-17 21:10:59 +08:00
Liam Sho
8030ca6065 perf.使 DevBuild 在所有非 master 分支运行 2022-05-17 17:26:32 +08:00
Liam Sho
6e116eefe3 perf. WPF 在非正式版不检查更新 2022-05-17 17:22:55 +08:00
Shawnsdaddy
546aaa4758 Merge branch 'MaaAssistantArknights:dev' into dev 2022-05-16 10:23:13 -07:00
MistEO
2220ffdfff Merge pull request #514 from LiamSho/master
重构 CI
2022-05-16 21:28:06 +08:00
Liam Sho
aaa4dd5141 chore.未知 Ref 不再使 Workflow 失败 2022-05-16 17:42:43 +08:00
Liam Sho
571e658d51 fix.修复 PR 时 CI 爆炸的问题
GitHub 你罪大恶极!(划掉)

我是笨比(
2022-05-16 16:51:43 +08:00
Liam Sho
dccca67377 chore.重命名发布文档 CI 2022-05-16 16:16:28 +08:00
Liam Sho
dc34427335 style.应用 GitAttributes
gitattributes 你罪大恶极!
2022-05-16 16:02:58 +08:00
Liam Sho
6e364878f6 chore.移除 Nuke Plan HTML 文件 2022-05-16 14:40:58 +08:00
Liam Sho
738ceec037 fix.修复打包错误 2022-05-16 14:16:26 +08:00
Liam Sho
6c82f7f005 fix.修复 CI 触发和参数错误 2022-05-16 14:02:39 +08:00
Liam Sho
05d3f02984 Merge branch 'dev' 2022-05-16 13:05:48 +08:00
Liam Sho
0674943519 fix.修复 Artifact 未上传的问题 2022-05-16 12:54:31 +08:00
Liam Sho
e78ab4f0ca fix.修复 Wpf 项目编译时未 Restore 的问题 2022-05-16 03:30:13 +08:00
Liam Sho
9a90027395 fix.修复获取 Workflow 名称失败的问题 2022-05-16 03:18:26 +08:00
Liam Sho
f0b0c1360c ci.添加 Workflow 2022-05-16 03:04:10 +08:00
Liam Sho
94a0aec1a6 fix.修复 Builder 流程 2022-05-16 02:50:58 +08:00
Alex Zhang
2267df26a1 updated core syntax 2022-05-15 22:44:47 +08:00
MistEO
fe17fe834c Merge pull request #506 from MaaAssistantArknights/dev
Merge Dev
2022-05-15 19:23:04 +08:00
Liam Sho
4d4dde54f8 chore.使 RelWithDebInfo 和 CICD 支持设置 MAA_VERSION 2022-05-15 16:49:59 +08:00
Liam Sho
b1c4a81c57 feat.重构 Builder 项目,使用 Nuke 作为构建工具 2022-05-15 16:47:08 +08:00
Liam Sho
9a79ea5345 ci.移除旧 GitHub Actions 配置文件 2022-05-15 16:44:25 +08:00
Shawnsdaddy
3dc622d1e5 Merge pull request #2 from MaaAssistantArknights/dev
Dev
2022-05-15 00:54:38 -07:00
MistEO
867fae1a53 docs.更新群号 2022-05-15 15:27:45 +08:00
MistEO
71d8ce84e4 docs.更新群号 2022-05-15 15:25:47 +08:00
MistEO
a99119c263 style.格式化 2022-05-15 15:15:14 +08:00
Alex Zhang
02fd60000e added windows support 2022-05-14 21:46:34 +08:00
Alex Zhang
ee67e01f97 updated flutter code 2022-05-14 17:39:56 +08:00
MistEO
4f05a45d6b perf.更新缩放图像的插值算法 2022-05-14 16:02:03 +08:00
MistEO
d967a2cf9d chore.加了一点日志以追踪问题 issues/502
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/502
2022-05-14 15:56:22 +08:00
MistEO
450a9eb8ec Merge pull request #499 from zzyyyl/feat/encoding
perf.用一种更合理的方式处理编码问题
2022-05-14 15:33:11 +08:00
Alisa
cac2bab721 Merge pull request #500 from MaaAssistantArknights/feature/version
perf.以一种更加优雅的方式生成版本号
2022-05-14 14:21:34 +08:00
zzyyyl
27a91aee67 perf.小优化 2022-05-14 13:22:47 +08:00
zzyyyl
05052a0b56 fix.修复笔误 2022-05-14 13:17:39 +08:00
zzyyyl
48817ecc8c style.增加一个.gitattributes文件用于统一格式 2022-05-14 13:15:45 +08:00
Alex Zhang
02da9eb0cf updated deps 2022-05-14 12:48:51 +08:00
Alex Zhang
4ea6caa697 对不同平台使用不同的library name 2022-05-14 12:47:31 +08:00
Alex Zhang
e19f45b912 rewrite callback for msvc 2022-05-14 12:30:40 +08:00
Alex Zhang
fb87c00d1b updated .gitignore 2022-05-14 10:43:20 +08:00
MistEO
cd98e78ebb perf.以一种更加优雅的方式生成版本号 2022-05-14 03:54:21 +08:00
MistEO
7ebc78b91e fix.修复公招券不足时卡很久才报错的问题 2022-05-14 02:56:26 +08:00
MistEO
88f0d2546e fix.修复部分前一个任务出错,后面的任务不执行的问题 2022-05-14 02:56:18 +08:00
zzyyyl
104646833b fix.修复编码问题
中文路径也能用maa辣!
windows下,路径相关的全都用gbk存储,输出到log的信息统一用utf8
2022-05-14 02:20:17 +08:00
MistEO
b21c15dab1 fix.修复上次作战愚人号关卡后卡住的问题 2022-05-14 02:08:49 +08:00
MistEO
c2198344e6 chore. Treat warninngs as errors
赶尽杀绝(
2022-05-14 01:57:03 +08:00
MistEO
dca63426a6 feat.新增支持信用商店优先购买选项 2022-05-14 01:19:54 +08:00
MistEO
c9bd4dcb63 feat.新增信用商店黑名单自定义功能
C# 一直有编码问题,交给 C++ 来转了
2022-05-14 00:14:57 +08:00
MistEO
0358aaaffd chore.强制打开检查更新开关 2022-05-14 00:14:57 +08:00
MistEO
31eb285f2f Merge pull request #492 from zhangchi0104/feat/dart-plugin
添加了dart interface (但搞不定链接库)
2022-05-13 22:00:17 +08:00
Alex Zhang
2dbfb27cd9 修复了json格式 2022-05-13 21:52:04 +08:00
Alex Zhang
f2864546d7 优化了dartapi 2022-05-13 21:49:46 +08:00
MistEO
3e50dc20de Merge pull request #496 from zzyyyl/feat/update-check
feat.优化检查更新的UI
2022-05-13 19:53:18 +08:00
zzyyyl
7eab0f15e5 fix.修复检查测试版本时不会检查正式版本的bug
怎么还有for越界的问题(?
2022-05-13 17:29:33 +08:00
zzyyyl
7766dabf8c perf.用全角空格对齐吃石头
强迫症狂喜
2022-05-13 17:29:17 +08:00
zzyyyl
eaa2981aa7 feat.增加一个是否检查更新的选项 2022-05-13 17:29:01 +08:00
MistEO
214d596764 Merge remote-tracking branch 'origin/master' into dev 2022-05-13 14:00:26 +08:00
Alex Zhang
611a84d4cf 添加了dart interface (但搞不定链接库) 2022-05-13 11:41:22 +08:00
bakashigure
1aafd343ec perf: 修改uuid获取方式 2022-05-12 11:17:47 +08:00
MistEO
d25348e9bb docs.修复文档链接错误 2022-05-11 23:44:23 +08:00
MistEO
7044c48e1a chore. disable a warning 2022-05-11 23:31:24 +08:00
MistEO
4f1b0bb450 Merge pull request #485 from zhangchi0104/patch-1
修复了linux编译Logger.hpp报错
2022-05-11 23:27:22 +08:00
MistEO
66dd3b4840 Merge pull request #482 from MaaAssistantArknights/dev
MAA Core 4.0, New Version!
2022-05-11 23:26:16 +08:00
MistEO
4ae9c05879 chore.删除一些用不上了的文件 2022-05-11 23:24:36 +08:00
MistEO
58f6819820 fix.修复SN活动关卡偶尔卡住的问题 2022-05-11 23:20:55 +08:00
MistEO
88f87da4df feat.初步完成4.0 core wpf适配 2022-05-11 23:17:34 +08:00
MistEO
9905037cb7 Merge pull request #488 from zzyyyl/dev
feat.更新肉鸽用的干员配置
2022-05-11 22:35:36 +08:00
zzyyyl
8a5fb6f710 feat.更新肉鸽用的干员配置 2022-05-11 22:32:12 +08:00
alexzhang
3a210bb0bd 修复了linux编译时logger.hpp报错
linux编译时会报错
```
In file included from /home/alexzhang/code/maa-building/MaaAssistantArknights/src/MeoAssistant/AbstractConfiger.cpp:6:
/home/alexzhang/code/maa-building/MaaAssistantArknights/src/MeoAssistant/Logger.hpp: In member function ‘void asst::Logger::log(std::string_view, Args&& ...)’:
/home/alexzhang/code/maa-building/MaaAssistantArknights/src/MeoAssistant/Logger.hpp:136:52: error: ‘std::this_thread’ has not been declared
  136 |                       level.data(), getpid(), std::this_thread::get_id()
      |                                                    ^~~~~~~~~~~
```
添加了 `#include <thread>`后问题解决
2022-05-11 07:12:42 +08:00
Liam Sho
6f16c47727 chore.加回 aria2c.exe 2022-05-11 01:12:11 +08:00
MistEO
07772d17e9 feat. WPF界面初步跑通新core 2022-05-10 22:59:38 +08:00
MistEO
77b2ef979b Merge pull request #479 from Andor233/patch-1
Update 模拟器支持.md
2022-05-10 22:28:03 +08:00
Spring Burst
a71e7b894e Update 模拟器支持.md 2022-05-10 22:26:51 +08:00
MistEO
430e706f5c merge.合并master 2022-05-10 21:32:11 +08:00
MistEO
ded8b1dc34 Merge pull request #470 from ABA2396/DigAndRecruit
feat.添加了矿区开采和限定寻访功能
2022-05-10 21:29:26 +08:00
MistEO
97bc803900 Merge branch 'LiamSho-master' 2022-05-10 21:25:05 +08:00
MistEO
46509c281b Merge branch 'master' of https://github.com/LiamSho/MaaAssistantArknights into LiamSho-master 2022-05-10 21:23:41 +08:00
Spring Burst
b47edc9670 Update 模拟器支持.md 2022-05-10 20:05:08 +08:00
MistEO
81d0f58694 docs.更新关于WSA的支持 2022-05-10 17:46:29 +08:00
Liam Sho
c06139a8e7 fix.修复编译 Warning 2022-05-10 01:50:42 +08:00
Alisa
978d6f1d12 Merge pull request #473 from LiamSho/master
ci.GitHub Actiona 配置
Make GitHub Actions Great Again
2022-05-10 00:27:32 +08:00
Liam Sho
63eaac9187 ci.修复参数错误 2022-05-10 00:15:13 +08:00
Liam Sho
8996f72b9c ci.添加 MaaBundle 的发布 2022-05-09 23:50:05 +08:00
Liam Sho
8e5d29f698 ci. 重命名 Bundle 名称 2022-05-09 23:49:38 +08:00
Liam Sho
466786dc7a ci.添加 MaaWpf 和 MaaResource 的 Release 2022-05-09 21:59:39 +08:00
Liam Sho
a919fe8b80 ci.限定 DevBuild 的生效范围 2022-05-09 21:06:17 +08:00
ABA2396
e66d16cc06 feat.添加了矿区开采和限定寻访功能图片 2022-05-09 19:21:22 +08:00
ABA2396
a5f3867c6d feat.添加了矿区开采和限定寻访功能 2022-05-09 19:05:52 +08:00
Liam Sho
c9309fa970 ci.修改 ReleaseCore 配置 2022-05-09 18:27:44 +08:00
Liam Sho
bcd00723ab ci.添加 ReleaseCore 2022-05-09 17:58:15 +08:00
Liam Sho
2f400b4adc ci.添加手动触发器 2022-05-09 16:51:24 +08:00
Liam Sho
9fe96c2228 ci.优化 DevBuild 2022-05-09 15:58:57 +08:00
Liam Sho
55a4e16208 ci.分开所有的 Artifacts 2022-05-09 14:27:22 +08:00
Liam Sho
74138012ce ci.修改使用 GitHub Action 的 Upload Artifacts 配置 2022-05-09 14:04:11 +08:00
Alisa
2bf62f25f2 ci.修复 CI 上传 Artifact 失败的问题 2022-05-09 13:45:00 +08:00
Liam Sho
76d1bc9eb4 ci.修 Ci 2022-05-09 13:12:41 +08:00
Liam Sho
2e7ff173d1 ci.添加 DevBuild 配置文件 2022-05-09 13:06:12 +08:00
Liam Sho
0394987d80 feat.添加构建项目 2022-05-09 13:05:46 +08:00
Liam Sho
188c1f5f3a bump.清理项目,更新依赖 2022-05-09 13:05:28 +08:00
MistEO
058c490286 chore. add cmake opt 2022-05-09 01:00:21 +08:00
Liam Sho
7fce10f584 Merge branch 'master' of https://github.com/LiamSho/MaaAssistantArknights 2022-05-09 00:55:23 +08:00
MistEO
77c0612edd chore.更新企鹅库,修复警告
cf5ebbc89c
2022-05-09 00:53:55 +08:00
Liam Sho
60c70b723f chore.修改项目文件以适配构建工具 2022-05-09 00:53:20 +08:00
MistEO
e0442ffcc2 chore.更新版本号v3.3.2 2022-05-09 00:33:22 +08:00
MistEO
5fc6b31d88 fix.更新企鹅识别库,修复一些识别问题 2022-05-09 00:32:29 +08:00
MistEO
317e194ddc Merge branch 'master' into dev 2022-05-09 00:14:15 +08:00
MistEO
64228e095f Merge pull request #463 from zzyyyl/master
chore.优化文档CI/CD使得在fork上不运行
2022-05-08 23:49:12 +08:00
MistEO
fcd7c8803b Merge pull request #465 from ABA2396/ActivityStage2
fix.活动更新后导航失败
2022-05-08 23:39:46 +08:00
ABA2396
3efa6ac234 fix.活动更新后导航失败 2022-05-08 23:37:44 +08:00
MistEO
555958ab53 Merge pull request #462 from aa889788/master
fix: Fix build error on Linux with gnustl
2022-05-08 23:25:22 +08:00
zzyyyl
18caf9b3c0 style.随便改点测试一下 2022-05-08 13:16:13 +08:00
zzyyyl
819df66666 chore.优化CI使得在fork上不运行 2022-05-08 13:16:12 +08:00
shxyke
8c3e6d345a fix: Fix build error on Linux with gnustl
This error seems caused by gnustl vector, I do not know
how to fix it, so I use macro to change container to deque
under gnustl, use deque under other STL library will also
cause problem.
2022-05-08 10:37:22 +08:00
MistEO
28055235aa docs.更新文档及cmake,删除老版本企鹅库的相关内容 2022-05-07 22:51:47 +08:00
MistEO
423cc6bafd feat.界面关卡导航的一点小修改 2022-05-07 22:38:47 +08:00
MistEO
e43fb927ce fix.修复SN-9导航在加载动画较慢时卡住的问题 2022-05-07 22:34:50 +08:00
MistEO
d8ef5a1e1a Merge pull request #456 from ABA2396/Combined-navigation
feat.合并LS-5 LS-6;CE-5 CE-6导航
2022-05-07 22:32:29 +08:00
MistEO
1e8baa1f00 Merge pull request #450 from zzyyyl/fix/1-7
fix.修复已知的1-7导航失效问题
2022-05-07 22:32:19 +08:00
MistEO
526978a607 chore. Update appveyor config (#457) 2022-05-07 13:33:47 +08:00
MistEO
4971bfe84b chore. Update appveyor config 2022-05-07 13:26:13 +08:00
zzyyyl
43177d9bc1 perf.增长单次SlowSwipe滑动时间防止滑飞 2022-05-07 12:37:53 +08:00
ABA2396
027207a732 feat.修改合并导航后的ui 2022-05-07 12:20:11 +08:00
ABA2396
4068f991c0 Merge branch 'MaaAssistantArknights:master' into Combined-navigation 2022-05-07 11:42:23 +08:00
ABA2396
6d82e889ae feat.合并LS-5 LS-6;CE-5 CE-6导航 2022-05-07 11:17:07 +08:00
zzyyyl
1db9e797dc perf.增长单次SlowSwipe滑动长度,但不会超过屏幕宽度的80% 2022-05-07 10:20:15 +08:00
Alisa
1b1253344a ci.优化文档发布 CI/CD 2022-05-07 03:16:01 +08:00
Alisa
7dcec8d949 Update package.json 2022-05-07 03:05:30 +08:00
Alisa
e19ef5f842 ci: add Azure Static Web Apps workflow file
on-behalf-of: @Azure opensource@microsoft.com
2022-05-07 02:57:01 +08:00
bakashigure
336daf887d Merge pull request #453 from bakashigure/vercel-test
新增 Vercel 文档
2022-05-07 02:55:21 +08:00
bakashigure
0ada5fbdae Merge branch 'MaaAssistantArknights:master' into vercel-test 2022-05-07 02:06:06 +08:00
bakashigure
70301c63b0 feat: 新增文档 2022-05-07 02:04:48 +08:00
zzyyyl
778888b941 perf.给出一个1-7导航时万一划过头的解决方案 2022-05-07 01:02:28 +08:00
zzyyyl
ff79ca0a07 perf.修改need_matchfullMatch 2022-05-07 00:55:45 +08:00
zzyyyl
7ea44668b0 fix.修复把1-1*识别成1-1的bug 2022-05-07 00:31:10 +08:00
zzyyyl
301a282f96 fix.修复残阳章节没有开启导致的1-7导航失效问题
我解锁了,没法测试
2022-05-07 00:08:48 +08:00
MistEO
b855ed0c10 chore.更新版本号 2022-05-06 23:28:19 +08:00
MistEO
9f08a6ad28 fix.修复肉鸽干员输出不够时候卡死的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/449
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/213
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/206
2022-05-06 23:20:58 +08:00
MistEO
9f2a731fc7 Merge branch 'ABA2396-master' 2022-05-06 22:36:06 +08:00
zzyyyl
ec8b65207c feat.给SN-8~10加个ui 2022-05-06 22:34:15 +08:00
MistEO
b26a49b405 Merge branch 'master' of https://github.com/ABA2396/MaaAssistantArknights into ABA2396-master 2022-05-06 22:31:02 +08:00
MistEO
daedc0637d fix.修复displayId不存在时的报错 2022-05-06 22:28:15 +08:00
ABA2396
aa743ba058 feat.添加了愚人号SN8-10的关卡导航 2022-05-06 18:55:10 +08:00
MistEO
52e9d147a5 chore.更新企鹅关卡数据,新增对CE-6、LS-6掉落识别的支持 2022-05-05 23:01:02 +08:00
MistEO
960a6b4d77 docs. 更新贡献者列表展现方式 2022-05-05 01:39:08 +08:00
Alaric Gilbert
5f7bec0349 fix. 修复无法软重启的问题 2022-05-05 01:16:43 +08:00
Alaric Gilbert
c718018700 feat. 增加WSA支持 2022-05-05 01:16:10 +08:00
LiamSho
f64aadb8c6 doc.修改 Contributors 展现方式 2022-05-05 01:13:38 +08:00
MistEO
b00378e989 chore.更新版本号v3.3 2022-05-04 23:40:35 +08:00
MistEO
06e2adef6b feat.新增支持贸易站源石碎片自动补货字段 2022-05-04 22:32:08 +08:00
MistEO
4749e3e326 fix.更换作战结束的识别标志,修复升级、剿灭等的掉落识别错误问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/426
2022-05-04 22:19:32 +08:00
MistEO
c4af165b1e chore. Update issue templates 2022-05-04 22:06:37 +08:00
MistEO
797fb41241 Merge branch 'penguin_recognizer_tough' 2022-05-04 21:56:33 +08:00
MistEO
1aa0da1e96 chore.更新企鹅识别库到 v4.2.3 版本,修复磨难关卡的识别 2022-05-04 21:55:59 +08:00
MistEO
1c6810aca9 Merge pull request #431 from zzyyyl/chore/minor_optimization
perf.增加一些日志
2022-05-04 20:42:02 +08:00
zzyyyl
e5fce05360 fix.在因配置错误导致的指针失效时向日志输出信息 2022-05-04 18:08:39 +08:00
zzyyyl
a74ceac116 chore.增加一个日志输出 2022-05-04 14:30:30 +08:00
MistEO
67946e75e7 chore.更新版本号v3.2.2 2022-05-04 02:20:24 +08:00
MistEO
398a4bdd3e feat.更新企鹅识别库4.2.2版本,新增对第十章磨难/普通的识别支持 2022-05-04 02:15:02 +08:00
MistEO
9bc48f21e2 chore.补上漏了的模板图片 2022-05-04 01:56:43 +08:00
MistEO
f4331a5d60 chore.补充一些基建的日志 2022-05-04 01:23:50 +08:00
MistEO
bf66aade3b chore.基建添加心情的日志
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/384
2022-05-04 00:58:23 +08:00
MistEO
a79e961bba fix.修复肉鸽有复活类收藏品,战斗失败后卡住的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/421
2022-05-04 00:35:09 +08:00
MistEO
2152769f79 fix.修复一个肉鸽干员名识别错误的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/414
2022-05-04 00:26:47 +08:00
MistEO
5668e8c04b fix.尝试修复基建不使用无人机的问题 2022-05-04 00:17:19 +08:00
MistEO
c500cbd202 fix.尝试修复肉鸽循环投资的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/422
2022-05-03 23:48:59 +08:00
MistEO
3b5ce56d8a Merge branch 'zzyyyl-feat/1-7' 2022-05-03 23:08:48 +08:00
MistEO
fa05fb937a feat.增加一个缓慢滑动的 ProcessTask action 2022-05-03 23:05:26 +08:00
zzyyyl
d049efb496 perf.优化1-7导航时的滑动逻辑 2022-05-03 22:17:25 +08:00
MistEO
f5b351fe6c Merge pull request #406 from zzyyyl/fix/reconnect
fix.修复某些情况下断线重连可能卡住的问题
2022-05-03 22:01:22 +08:00
zzyyyl
269a0a8e9b style.修复一处英语语法问题 2022-05-03 02:48:58 +08:00
zzyyyl
d83a65c43f feat.增加一些日志信息 2022-05-03 02:22:59 +08:00
zzyyyl
f489498420 fix.修复GameStart按钮缓存位置错误导致无法唤醒的问题 2022-05-03 02:09:25 +08:00
zzyyyl
f08abc2d60 fix.修复某些情况下B服卡在登录界面的问题 2022-05-02 19:06:45 +08:00
zzyyyl
dfab798beb fix.修复某些情况下断线重连可能卡在登录界面的问题 2022-05-02 18:35:09 +08:00
zzyyyl
1507c53c56 fix.继续修复某些情况下断线重连可能卡住的问题 2022-05-02 18:31:31 +08:00
zzyyyl
8ce99baa36 feat.新增对新关卡1-7的支持 2022-05-02 17:52:23 +08:00
zzyyyl
7d1c19046f fix.修复某些情况下断线重连可能卡住的问题 2022-05-02 16:34:46 +08:00
MistEO
6130cff3b3 fix.修复愚人号活动关卡,在某些分辨率下不点代理指挥的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/403
2022-05-02 15:38:52 +08:00
MistEO
a05191fb5e fix.修复刷理智,在某种情况下凌晨4点更新后卡住的问题 2022-05-02 15:36:40 +08:00
MistEO
8b59951a08 fix.修复几个肉鸽干员名的识别错误 2022-05-02 15:26:17 +08:00
MistEO
f8b6264d2d fix.修复肉鸽投资满了数量还在涨的问题 2022-05-02 15:26:17 +08:00
MistEO
a1f0e6a3fd Merge pull request #401 from zzyyyl/fix/StageSN
fix.修复打开`愚人号`关卡时,各种任务出错的问题
2022-05-02 14:48:54 +08:00
zzyyyl
bcf405cef3 fix.修复打开愚人号关卡时,各种任务出错的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/400
2022-05-02 03:41:58 +08:00
MistEO
4271847889 fix.掉落识别改用原图,修复识别错误的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/395
2022-05-02 00:28:31 +08:00
MistEO
fb3c0b9496 fix.修复愚人号关卡的开始作战的一些问题 2022-05-02 00:08:37 +08:00
MistEO
c62fd8bdda fix.修复打开愚人号关卡时,开始唤醒任务出错的问题(这个界面没返回按钮) 2022-05-01 23:23:47 +08:00
MistEO
8717caf3d8 feat.新增一个代理指挥失误的ui提示 2022-05-01 23:17:47 +08:00
MistEO
c0b80c2d9f chore.更新版本号v3.2 2022-05-01 23:08:24 +08:00
MistEO
ef1580b66a fix.修复界面上开始和停止按钮的逻辑
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/370
2022-05-01 23:01:45 +08:00
MistEO
a1724d12ca feat.新增对新关卡LS-6CE-6的支持 2022-05-01 22:53:14 +08:00
MistEO
643ba623f0 fix.修复活动关卡“愚人号”“开始行动”界面没有返回按钮,导致后续任务卡住的问题 2022-05-01 22:36:03 +08:00
MistEO
26a4514615 fix.修复愚人号活动关卡不勾选代理指挥的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/392
2022-05-01 22:16:17 +08:00
MistEO
c1cc7a556c fix.修复活动关卡愚人号掉落不识别的问题 2022-05-01 19:24:09 +08:00
MistEO
b3ea6170a0 chore.更新活动关卡数据 2022-05-01 16:42:49 +08:00
MistEO
019528cb5d Merge.合并v3.1.3 2022-05-01 00:29:23 +08:00
MistEO
c3cc4def49 chore.更新版本号3.1.3 2022-04-30 23:20:40 +08:00
MistEO
9f6da72528 feat.适配游戏新ui,更新企鹅物流识别库;重新打开掉落识别及汇报功能 2022-04-30 22:57:07 +08:00
MistEO
b863a15c65 fix.修复初次进入肉鸽,选干员的时候卡在新手引导的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/374
2022-04-30 00:55:10 +08:00
MistEO
970a60b284 fix.修复肉鸽开局获得收藏品后卡住的问题(但没测试)
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/374
2022-04-30 00:46:07 +08:00
MistEO
760846245e fix.修复B服凌晨四点更新后卡住的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/355
2022-04-30 00:33:43 +08:00
MistEO
626c9c1d66 fix.修复肉鸽赫默识别错误的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/385
2022-04-30 00:28:57 +08:00
MistEO
fc1e1a8b0e fix.修复新版本会客室技能线索搜集识别错误的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/377
2022-04-28 14:18:09 +08:00
MistEO
843db3ab96 fix.修复开始行动按钮位置识别错误的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/369
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/365
2022-04-28 13:55:43 +08:00
MistEO
95432db1c4 Merge pull request #356 from usaginya/master
feat. 增加通知显示位置的设置选项 (#348)
2022-04-24 14:51:39 +08:00
YIU
2109f82163 feat. 增加通知显示位置的设置选项 (#348)
* 通知显示可以设置为屏幕任意 8 个位置的其中一个位置、也可以设置为不显示
* 增加通知时任务栏闪烁提醒
2022-04-17 04:46:02 +08:00
MistEO
1689a5dcf0 chore.更新公招风笛慑砂的数据 2022-04-15 10:35:01 +08:00
MistEO
ec90dc3593 chore.适配明日方舟新ui,修复关卡导航的问题 2022-04-15 10:20:46 +08:00
MistEO
c55eb71afd fix.修复一个GUI的闪退问题 2022-04-13 21:55:58 +08:00
MistEO
5047afa0de chore.适配关卡掉落新UI,临时关闭掉落识别功能 2022-04-13 20:25:07 +08:00
MistEO
2fd19faf5b docs.强调一下分辨率 2022-04-12 22:14:14 +08:00
MistEO
74da7bc643 fix.修复aria2下载完成后的处理错误
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/322
2022-04-12 01:28:22 +08:00
MistEO
0c50e00f65 fix.修复“行动结束”识别错误的问题,改用模板匹配
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/330
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/203
2022-04-12 01:04:34 +08:00
MistEO
a0b04c77a0 fix.修复公招刷新后的识别错误,添加一些日志
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/336
2022-04-12 00:39:27 +08:00
MistEO
8506d52ac8 fix.修复获取不到模拟器分辨率后报错的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/345
2022-04-12 00:00:57 +08:00
MistEO
1d6d555ce7 fix.修复ProcessTask的任务间延迟为0的问题 2022-04-11 23:53:13 +08:00
MistEO
78776d47fa merge.合并master 2022-04-11 22:31:10 +08:00
MistEO
2bdd257973 Merge pull request #342 from zzyyyl/master
fix.修复某些情况下肉鸽掉落物识别错误的问题
2022-04-11 22:24:14 +08:00
zzyyyl
ceedd21e81 fix.修复某些情况下卡在加载界面的问题 2022-04-11 14:34:19 +08:00
zzyyyl
b731fe262a fix.修复某些情况下肉鸽掉落物识别错误的问题 2022-04-11 00:23:06 +08:00
bakashigure
3f0c828ae2 Merge pull request #338 from bakashigure/dev
perf: 更换 uuid 获取方式
2022-04-09 17:13:45 +08:00
MistEO
4b1c431ffd Merge branch 'master' of https://github.com/MistEO/MeoAssistance-Arknights 2022-04-09 14:11:13 +08:00
MistEO
8d0c66f2ea chore.重命名"连接设置"to"调试设置",修复蓝叠conf文件不存在时的崩溃问题 2022-04-09 14:10:24 +08:00
MistEO
4c6ac81212 docs.更新帮助文档 2022-04-09 13:53:14 +08:00
MistEO
5846220681 feat.支持蓝叠国际版新版本窗口名 2022-04-09 13:42:32 +08:00
bakashigure
2ffb5babd8 perf: 更换 uuid 获取方式 2022-04-09 01:35:23 +08:00
MistEO
6f65ef4e5c Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights 2022-04-06 22:59:38 +08:00
MistEO
facebef5b1 feat.检测到EX关卡时,则停止继续刷理智
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/325
2022-04-06 22:59:29 +08:00
MistEO
3c166aa83b Merge pull request #335 from zzyyyl/master
fix.修复B服没有开始唤醒导致的StartUp失败的问题
2022-04-06 15:48:44 +08:00
zzyyyl
68663cdfb5 fix.更换模板图片以适配不同分辨率 2022-04-06 14:33:51 +08:00
zzyyyl
a6b32fd771 fix.修复B服没有开始唤醒导致的StartUp失败的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/334
2022-04-06 13:15:13 +08:00
MistEO
5ef2016e7c fix.修复肉鸽掉落物点快了卡住的问题,及一些相关的可能性
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/327
2022-04-05 01:59:05 +08:00
MistEO
e1c8896159 fix.修复打过一次肉鸽后,后续再执行其他任务,不能正常导航到肉鸽界面的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/326
2022-04-05 01:43:49 +08:00
MistEO
57b21b06fc feat.肉鸽新协议画饼,完成了读取配置部分的内容 2022-04-03 23:09:29 +08:00
MistEO
660135f93f chore.重命名抄作业类 2022-04-03 21:08:39 +08:00
MistEO
e94ffeaf5e perf.肉鸽选人一处小细节优化 2022-04-03 20:40:40 +08:00
MistEO
62fa7fc978 Merge branch 'zzyyyl-dev' into dev 2022-04-03 20:32:40 +08:00
MistEO
b8e116ea44 perf.肉鸽选人一些工程上的小优化 2022-04-03 20:32:13 +08:00
zzyyyl
12dcad7ea3 fix.优化肉鸽选人逻辑,修复某些情况下肉鸽选人希望不够的情况,增加干员配置文件 2022-04-03 13:01:18 +08:00
MistEO
def276c44f perf.优化python接口的一些调用方式 2022-04-03 01:26:05 +08:00
MistEO
439fd655d7 perf.自动战斗,若oper为空,则不选人 2022-04-03 01:17:28 +08:00
MistEO
180ce9266e fix.修复自动抄作业干员名识别错的问题 2022-04-03 00:59:58 +08:00
MistEO
83112537ab chore.修改python脚本及版本包 2022-04-01 23:57:38 +08:00
MistEO
43065775a0 fix.修复Python脚本读取非当前目录报错的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/323
2022-04-01 23:17:24 +08:00
MistEO
3cee6b0c3b fix.修复自动抄作业的一些bug 2022-04-01 23:05:37 +08:00
MistEO
67b733ba90 chore.优化了一些有的没的,修复笔误等 2022-04-01 22:33:47 +08:00
MistEO
2190c1faca feat.增加对关卡选人的支持 2022-04-01 01:22:54 +08:00
MistEO
acf667f37d perf.优化干员技能使用 2022-03-31 23:17:29 +08:00
MistEO
df25368e5c Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-03-31 23:14:00 +08:00
MistEO
6f3ce9d890 perf.优化抄作业逻辑 2022-03-31 23:13:54 +08:00
MistEO
33ad9f4d42 fix.修复笔误 2022-03-30 16:16:42 +08:00
MistEO
c60c09afe1 feat.增加任务回调taskid字段 2022-03-30 01:44:44 +08:00
MistEO
95379bd281 chore.完成WD-EX8-突袭作业,优化一些小问题 2022-03-30 00:46:16 +08:00
MistEO
63178a07d0 feat.加入生成关卡坐标截图的小功能 2022-03-29 22:49:01 +08:00
MistEO
7e695f9331 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-03-29 22:26:32 +08:00
MistEO
3e3f78a69c merge.合并master 3.1.0 2022-03-29 22:26:27 +08:00
MistEO
9e985eee49 fix.临时修复遗尘漫步 复刻关卡识别错误的问题 2022-03-29 21:59:32 +08:00
MistEO
c737b34a3d docs. fix typo 2022-03-29 17:32:57 +08:00
MistEO
e4677c6d0e chore.更新遗尘漫步 复刻资源文件,更新版本号 2022-03-29 16:25:28 +08:00
MistEO
526e76473f chore.将Python脚本也打包到发版包中 2022-03-29 00:14:56 +08:00
MistEO
712f1e9473 feat.新增抄作业的接口支持 2022-03-28 23:47:24 +08:00
MistEO
8384854870 fix.修复自动抄作业的一些bug 2022-03-28 22:32:57 +08:00
MistEO
9f7d0767c2 fix.修复GameStart卡住的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/293
2022-03-27 23:58:29 +08:00
MistEO
b5dda25795 feat.增加一个自动抄作业-修改技能用法的字段 2022-03-27 23:47:13 +08:00
MistEO
0b410cf792 feat.完成自动抄作业-自动使用技能 2022-03-27 23:29:07 +08:00
MistEO
c0b506a17f chore.修改战斗技能用法的序号 2022-03-27 21:56:02 +08:00
MistEO
fad74cd09d chore. Remove useless files 2022-03-27 21:42:04 +08:00
MistEO
1e73e6fc00 fix.界面的一些小修改 2022-03-27 02:53:07 +08:00
MistEO
ac8a30d0ec fix.修复某些case下开始唤醒卡住的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/316
2022-03-27 02:47:46 +08:00
MistEO
da8d6b0a9d feat.自动抄作业完成干员名-干员组名转换 2022-03-26 18:43:38 +08:00
MistEO
5dd40d93c3 fix.修复自动抄作业撤退干员的识别逻辑 2022-03-26 17:42:48 +08:00
MistEO
888c5cb7d8 fix.修复不访问好友的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/314
2022-03-25 17:38:19 +08:00
MistEO
abb18ac5fc perf.调整基建干员脸部哈希距离阈值 2022-03-25 01:29:41 +08:00
MistEO
3d37af4bc0 fix.修复一个链接警告 2022-03-25 00:59:50 +08:00
MistEO
d5de8c83c9 fix.修复退出时adb释放不掉的问题 2022-03-25 00:53:39 +08:00
MistEO
fbb75ca58a fix.修复一些自动抄作业的bug 2022-03-24 01:13:54 +08:00
MistEO
45bdbd99c5 merge.合并master 2022-03-23 22:25:15 +08:00
MistEO
87ed2ec4fd Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights 2022-03-23 21:54:51 +08:00
MistEO
fbdc1b3c31 fix.修复代理指挥失败后卡住的问题 2022-03-23 21:54:46 +08:00
MistEO
b6f0ab115b fix.修复掉落识别一处可能的崩溃问题 2022-03-23 21:48:49 +08:00
MistEO
aa10ee43d7 fix.修复非三星掉落仍上传企鹅数据的问题 2022-03-23 21:47:05 +08:00
MistEO
89f30436bb docs.修复文档链接
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/309
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/304
2022-03-23 11:23:30 +08:00
MistEO
099915821f Merge pull request #300 from mslxl/master
fix. 网络环境较为恶劣时无法正常执行
2022-03-23 00:13:05 +08:00
MistEO
be62189743 perf.简单调整抄作业的部分任务延时 2022-03-22 23:37:31 +08:00
MistEO
eede7ed1ca chore.修改自动战斗部分字段支持中文 2022-03-22 23:33:15 +08:00
MistEO
1b8a6e5244 feat.完成自动抄作业-撤退 2022-03-22 22:49:58 +08:00
MistEO
e679cba366 feat.完成自动抄作业-action开技能的逻辑 2022-03-22 22:24:16 +08:00
MistEO
a9ff54a3d6 feat.完成自动抄作业-部署干员全部逻辑 2022-03-22 21:29:54 +08:00
MistEO
b9f0e1ac40 fix.修复笔误 2022-03-22 20:21:01 +08:00
MistEO
4a12de5b75 feat.新增分辨率兼容性检测 2022-03-22 20:16:37 +08:00
mslxl
45b6b0d6e9 Merge pull request #1 from mslxl/clue-patch1-wait_test
fix. 极端网络下传递线索卡住
2022-03-22 07:33:33 +08:00
mslxl
09daf2689c fix. 极端网络下公招不调整时间 2022-03-21 18:11:55 +08:00
MistEO
1a062dcbba docs. fix typos
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/295
2022-03-21 15:58:00 +08:00
MistEO
2da470b2bd fix.修复析构时adb卡住的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/297
2022-03-21 15:53:22 +08:00
mslxl
a85211149e fix. typo 2022-03-21 14:14:01 +08:00
MistEO
77c78816af Merge branch 'master' into dev 2022-03-21 11:28:46 +08:00
MistEO
f4dd64fb6c fix.修复adb命令超时导致卡住的问题 2022-03-21 11:15:07 +08:00
MistEO
185a75e442 fix.修复自动抄作业的一些bug 2022-03-21 01:18:37 +08:00
mslxl
a729a04591 fix. 极端网络下传递线索卡住
原本在传递完一个线索后,会尝试传递下一个线索。在传递这个线索时,首先会在左侧选择它,然后在右边找能传的好友,找不到就翻页。由于方舟加载较慢,没有选中线索,右侧好友栏中找不到能传的对象,会不停的翻页后卡在最后一页。
2022-03-21 01:06:49 +08:00
mslxl
04739a01dc fix. 极端网络下无法使用全部无人机 2022-03-21 00:41:37 +08:00
MistEO
de59bbf87f feat.完成最基本的抄作业逻辑。重构了一部分代码 2022-03-20 23:09:46 +08:00
MistEO
5e872b532b chore.更新版本号 2022-03-20 01:10:46 +08:00
MistEO
61aeba9a3d fix.修复“信赖已满”卡住的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/292
2022-03-20 01:08:44 +08:00
MistEO
315ce129b0 Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights 2022-03-20 01:07:00 +08:00
MistEO
73e75467b0 fix.更新企鹅识别库,修复部分崩溃问题 2022-03-20 01:06:55 +08:00
MistEO
c7a0fb91af feat.修改战斗流程协议,并完成 parser 2022-03-19 16:20:25 +08:00
MistEO
362e7581a3 chore.更新版本号,移除 WPF 工程 2022-03-19 14:46:02 +08:00
mslxl
e0b4c36715 fix. 极端网络环境下无法完成公招
点击聘用候选人后游戏进入漫长的加载,此时MAA会执行尝试RecruitSkip, RecruitSkipWithoutButton等一系列任务(大概会全失败吧)后开始基建任务,待游戏加载完成后进入开简历界面,这时MAA既无法点击SKIP按钮,也无法正常执行基建任务
2022-03-18 13:15:45 +08:00
MistEO
b838aab54d docs. RENAME!!! 2022-03-18 12:34:04 +08:00
mslxl
5b095c9d40 fix. 极端网络环境下无法进入公招并进入错误界面 2022-03-18 12:18:33 +08:00
MistEO
918fd70f3c docs.自动战斗流程画饼 2022-03-18 00:12:19 +08:00
MistEO
4ccc3cf9ac feat.新增支持贸易站源石碎片自动补货字段 2022-03-16 22:10:22 +08:00
MistEO
96b8563fed Merge branch 'master' of github.com:MistEO/MeoAssistantArknights 2022-03-16 01:04:32 +08:00
MistEO
fd8bc23526 fix.修复基建allowExternal字段不生效及外部干员选择错误的问题
https://github.com/MistEO/MeoAssistantArknights/issues/288
2022-03-16 01:04:23 +08:00
MistEO
96a1ae0f0a feat.更新吾导先路活动关卡资源 2022-03-15 17:15:53 +08:00
MistEO
06ad2501b6 fix.修复一些浮点数溢出导致的异常 2022-03-15 01:10:50 +08:00
MistEO
07bad47b0e feat.新增支持肉鸽随机购买物品,优化一些小问题 2022-03-15 00:15:02 +08:00
MistEO
29832045d3 fix.修复一些浮点数溢出导致的异常 2022-03-15 00:13:43 +08:00
MistEO
953ae8363b fix.修复编队干员名识别错误 2022-03-14 22:18:26 +08:00
MistEO
ddb1392904 fix.修复特别卡的电脑上,关卡识别错误的问题
https://github.com/MistEO/MeoAssistantArknights/issues/284
2022-03-14 21:48:19 +08:00
MistEO
baff0ad0c7 fix.修复干员山的一些识别问题 2022-03-13 23:33:31 +08:00
MistEO
5122f1b917 feat.肉鸽新增支持skill_usage字段 2022-03-13 23:09:01 +08:00
MistEO
cd007ee786 feat.支持肉鸽干员技能选择字段 2022-03-13 19:19:19 +08:00
MistEO
92c27fcaa3 feat.增加企鹅数据汇报的字段,默认关闭 2022-03-13 02:03:38 +08:00
MistEO
3cad2c8be7 feat.支持增量更新国际服资源 2022-03-13 01:48:41 +08:00
MistEO
83eb988a0f feat.合并master,并整理外服资源文件 2022-03-13 01:14:45 +08:00
MistEO
5ced298663 feat.完成肉鸽干员选择(技能选择还没做) 2022-03-13 00:51:14 +08:00
MistEO
59637500e0 chore.更新 C、Python 集成示例 2022-03-12 23:41:30 +08:00
MistEO
328daa7e03 fix.修复一些任务参数不生效或错误的问题 2022-03-12 23:01:10 +08:00
MistEO
679d4b8c9f fix.修复公招任务的一些问题 2022-03-12 22:31:10 +08:00
MistEO
dca1aebeef perf.以一种更安全的方式禁用SubTask 2022-03-12 21:51:09 +08:00
MistEO
0a1c7c1355 fix.修复选关的识别错误
https://github.com/MistEO/MeoAssistantArknights/issues/279
2022-03-12 18:17:49 +08:00
MistEO
8962da2278 fix.增加添加任务类型的检查 2022-03-12 00:41:54 +08:00
MistEO
26dde72f66 feat.完成集成文档中画的饼,并少量修改字段
~~肉鸽选干员除外~~
2022-03-10 23:27:07 +08:00
MistEO
f060d8d909 docs.更新字段
假装时雨没看见(
2022-03-10 20:04:20 +08:00
MistEO
300384385d fix.补上漏了的接口实现 2022-03-10 18:10:51 +08:00
MistEO
a8b2af12a7 fix.修复一些跨平台编译问题
https://github.com/MistEO/MeoAssistantArknights/issues/278
2022-03-10 14:21:41 +08:00
MistEO
3c2d57a6da docs.补充不支持运行期设置的选项 2022-03-10 00:08:34 +08:00
MistEO
122ff429a0 docs.更新集成文档(还没实现) 2022-03-10 00:02:55 +08:00
MistEO
e3b2401ca6 refactor.删除实例化的TaskData 2022-03-09 23:40:28 +08:00
MistEO
50ccafdf44 feat.新增支持部分任务 2022-03-09 23:23:29 +08:00
MistEO
78d574f185 perf.调整一些锁的粒度 2022-03-09 18:06:36 +08:00
MistEO
4557fca662 fix.修复返回值错误 2022-03-09 17:49:06 +08:00
MistEO
019937fb0e feat.更新主任务队列的结构 2022-03-09 17:16:57 +08:00
MistEO
b81441a1ee chore.整理接口定义 2022-03-09 00:12:00 +08:00
MistEO
426ad68c40 docs.补充文档 2022-03-09 00:06:05 +08:00
MistEO
a1fb78cc32 refactor.重构添加任务接口 2022-03-08 23:57:37 +08:00
MistEO
6be8a43c1a fix.修复 json 字段错误 2022-03-08 22:03:11 +08:00
MistEO
49aa72f12b Merge branch 'dev' of github.com:MistEO/MeoAssistantArknights into dev 2022-03-08 21:05:12 +08:00
MistEO
21c0a73647 chore.更新meojson, 并更新一些调用方法 2022-03-08 17:27:00 +08:00
MistEO
f6ab307db0 chore.同步回调消息 2022-03-08 10:08:55 +08:00
MistEO
f5eb37583a docs.修复文档错误 2022-03-08 10:03:30 +08:00
MistEO
b1313b8a8d Merge pull request #273 from InvoluteHell/dev
按照文档为 tasks.json 配置了 json schema, 并对 tasks.json 中不符合文档的内容进行了修改。
2022-03-08 00:30:42 +08:00
Handiwork
fa5512d4c3 按照文档为tasks.json配置了 json schema, 并对tasks.json中不符合文档的内容进行了修改。 2022-03-07 23:02:38 +08:00
MistEO
8142c1172b chore.整理VS工程 2022-03-07 22:35:46 +08:00
MistEO
2b99e09c6b chore.整理AsstConnect的回调及文档 2022-03-07 22:25:34 +08:00
MistEO
029fafc802 style.代码格式化 2022-03-07 22:09:06 +08:00
MistEO
da35f9c848 Merge pull request #272 from bakashigure/dev
feat.新增address回调字段
2022-03-07 15:43:14 +08:00
MistEO
a230296473 chore.重命名一个task config key, 与文档保持同步 2022-03-07 15:42:57 +08:00
bakashigure
430fd8ff7c feat.新增address回调字段 2022-03-07 15:29:39 +08:00
MistEO
392332ec45 docs.完成任务流程文档 2022-03-07 00:04:43 +08:00
MistEO
8b34480d88 docs.文档小优化 2022-03-06 22:28:55 +08:00
MistEO
352ebbc700 chore.更新集成文档,修改setparam部分接口实现 2022-03-06 22:15:34 +08:00
MistEO
c9663dbc52 refactor.完成setparam接口的重构 2022-03-06 21:56:24 +08:00
MistEO
04569388cc docs.更新群号等 2022-03-05 20:11:18 +08:00
MistEO
67d6d5395e feat.增加一些接口检查 2022-03-05 01:29:30 +08:00
MistEO
8e42d4ede1 feat.支持多开 2022-03-05 01:23:09 +08:00
MistEO
f4d2c91b1d refactor.读取资源接口解耦 2022-03-04 23:51:08 +08:00
MistEO
efb04e2f9b feat.新增UUID回调字段 2022-03-04 23:00:31 +08:00
MistEO
e91183dcef feat.补上python的开始唤醒接口 2022-03-04 21:41:03 +08:00
MistEO
a601d0a1d7 Merge pull request #260 from gmh5225/master
Update Controller.cpp
2022-03-01 17:32:36 +08:00
gmh
936106fdc4 Update Controller.cpp
兼容clang编译
2022-03-01 17:19:55 +08:00
MistEO
ec66380a39 perf.优化一个内存碎片的问题 2022-03-01 00:07:57 +08:00
MistEO
e5a84d0fda fix.修复一个任务死循环的问题 2022-02-28 10:16:46 +08:00
MistEO
8fbc38063d fix.修复开始唤醒后卡在今日补给界面的问题 2022-02-27 14:07:11 +08:00
MistEO
4962d7e6c9 fix.修复adb连接重构后的一些问题 2022-02-26 20:49:48 +08:00
MistEO
5df058d1fa Merge branch 'refactor' 2022-02-26 20:22:11 +08:00
MistEO
0b8366d1f1 Merge pull request #256 from StupidBh/refactor
呆喵兽牛逼!
2022-02-26 18:57:40 +08:00
MistEO
92af41c2d5 fix.修复一个引用失效的问题 2022-02-26 18:57:25 +08:00
StupidBh
037e11c75d Boring revision 2022-02-26 18:10:08 +08:00
MistEO
264f54c037 docs.更新一个失效的链接 2022-02-26 12:19:19 +08:00
MistEO
5257ee212f feat.新增 java sample (但好像还不能用) 2022-02-22 00:38:32 +08:00
MistEO
18217f4bed feat. JNI 2022-02-21 23:30:54 +08:00
MistEO
f7e8195e34 Merge pull request #241 from AlaricGilbert/feat/wsa
[experimental] feat. 增加WSA支持
2022-02-21 01:31:00 +08:00
MistEO
d9fcd78d6f chore.更新版本号 2022-02-20 22:58:17 +08:00
MistEO
d71e75d9e6 fix.修复肉鸽在某种情况下虚空投资的问题 2022-02-20 20:57:22 +08:00
MistEO
3e45d969c1 fix.修复开始行动按钮识别修复带来的额外问题
https://github.com/MistEO/MeoAssistantArknights/issues/233
https://github.com/MistEO/MeoAssistantArknights/issues/243
2022-02-20 18:36:19 +08:00
MistEO
2ed4a23ee5 Revert "fix.修复某种情况下刷理智任务卡在开始行动界面的问题"
This reverts commit e20a32c0c6.
2022-02-20 18:33:15 +08:00
MistEO
2dff14b654 fix.修复一处肉鸽卡住的问题
https://github.com/MistEO/MeoAssistantArknights/issues/235
2022-02-20 18:09:19 +08:00
MistEO
dc051077a6 fix.修复关卡掉落不识别的问题
https://github.com/MistEO/MeoAssistantArknights/issues/242
https://github.com/MistEO/MeoAssistantArknights/issues/240
2022-02-20 18:03:26 +08:00
MistEO
25038cfd01 chore.更新版本号 2022-02-20 01:10:15 +08:00
MistEO
a51018e2f2 fix.修复网络波动时,信用交易所识别错误的问题
https://github.com/MistEO/MeoAssistantArknights/issues/222
2022-02-20 00:59:45 +08:00
MistEO
e20a32c0c6 fix.修复某种情况下刷理智任务卡在开始行动界面的问题
https://github.com/MistEO/MeoAssistantArknights/issues/233
2022-02-20 00:41:06 +08:00
MistEO
4b396652d9 feat.去除对橙色开始按钮页开始战斗的支持,会导致碎石、吃理智药数量不正确 2022-02-20 00:35:04 +08:00
MistEO
2179e88982 feat.增加关卡掉落识别的时间戳检查,解决万一卡住了会连续识别并上传的问题 2022-02-20 00:26:09 +08:00
MistEO
c39d144c88 fix.修复取消代理指挥后,卡在关卡掉落页面的问题 2022-02-20 00:02:49 +08:00
MistEO
58fe182d3e fix.修复凌晨四点更新时,碎石卡住的问题
https://github.com/MistEO/MeoAssistantArknights/issues/232
2022-02-19 23:56:27 +08:00
Alaric Gilbert
548fc4c2b8 fix. 修复无法软重启的问题 2022-02-19 23:48:05 +08:00
MistEO
ab706ff8fb fix.尝试修复掉落识别时一个崩溃的可能性 2022-02-19 23:43:31 +08:00
Alaric Gilbert
25b4f25d9c feat. 增加WSA支持 2022-02-19 23:01:32 +08:00
MistEO
a72ac6c005 feat.新增日志外部接口,更新python接口 2022-02-19 22:36:45 +08:00
MistEO
b2baed17b1 fix.修复重构后的 controller 截图错误 2022-02-19 21:59:20 +08:00
MistEO
eba5c715c2 refactor.完成 Controller 部分的重构 2022-02-19 21:58:44 +08:00
zhangweijian97
acbdbff9f4 chore.整理python定时demo 2022-02-19 00:42:14 +08:00
Zhang Weijian
3d0362c7b9 添加到 src/Python (#237)
* 添加定时任务模块

* 改成只提交一个py文件

* 修改了一些测试用的代码
2022-02-18 20:04:58 +08:00
MistEO
2e70c290a5 fix.修复一个宿舍只换了一间就结束的问题 2022-02-18 18:04:07 +08:00
Zhang Weijian
b5095cba7a 添加定时任务插件 (#234)
* 添加定时任务模块

* 改成只提交一个py文件
2022-02-17 12:57:31 +08:00
MistEO
789d576bd1 chore.更新版本号v3.0.4 2022-02-15 18:51:59 +08:00
MistEO
68feeba680 feat.适配夜神国际版
https://github.com/MistEO/MeoAssistantArknights/issues/228
2022-02-15 18:50:27 +08:00
MistEO
142ad317bf Merge branch 'dev' 2022-02-15 18:47:24 +08:00
MistEO
efcc0dd406 feat.更新阴云火花关卡资源,更新版本号 2022-02-15 18:46:29 +08:00
MistEO
267da18e7e chore.更新WPF包版本 2022-02-15 01:45:08 +08:00
MistEO
c66227c0d3 perf.优化了一个没啥用的逻辑 2022-02-15 01:13:26 +08:00
MistEO
bc06f1a53a fix.修复12点后关卡提示变成新一天了的问题 2022-02-15 00:49:53 +08:00
MistEO
6ba866154c docs.更新常见问题文档 2022-02-15 00:32:17 +08:00
MistEO
eea2d834a0 chore.更新版本号 v3.0.2 2022-02-15 00:12:38 +08:00
MistEO
874a74ddf2 fix.尝试修复几个崩溃问题(不知道有没有效果)
https://github.com/MistEO/MeoAssistantArknights/issues/183
https://github.com/MistEO/MeoAssistantArknights/issues/182
2022-02-15 00:11:32 +08:00
MistEO
d71f2daa5a fix.修复一个无人机加速导致卡住的问题 2022-02-15 00:02:59 +08:00
MistEO
f8bb61f5e9 docs.更新了肉鸽的python接口及文档 2022-02-14 23:55:20 +08:00
MistEO
0d7d0bed12 feat.新增支持企鹅物流自动获取id 2022-02-14 23:40:17 +08:00
MistEO
8cb4227fac fix.修复没有公招券,恰好又可以刷新的时候,卡住的问题
https://github.com/MistEO/MeoAssistantArknights/issues/177
2022-02-14 23:11:15 +08:00
MistEO
f32cdd112a chore.添加部分日志,用于排查基建选人时计算错误的问题
https://github.com/MistEO/MeoAssistantArknights/issues/204
2022-02-14 22:54:27 +08:00
MistEO
c3862bb418 fix.修复肉鸽有复活类的收藏品时,战斗失败后卡住的问题
https://github.com/MistEO/MeoAssistantArknights/issues/214
2022-02-14 22:32:28 +08:00
MistEO
f07b9260e5 feat.界面上新增了一个当日关卡提示
https://github.com/MistEO/MeoAssistantArknights/issues/219
2022-02-14 22:25:39 +08:00
MistEO
f87e53b110 fix.修复设置不使用无人机时,也会被巫恋组使用掉的问题
https://github.com/MistEO/MeoAssistantArknights/issues/220
2022-02-14 21:44:38 +08:00
MistEO
63b052b1a1 Merge branch 'dev' 2022-02-14 21:41:24 +08:00
MistEO
4fdaa5816b docs. 更新关于自动肉鸽的使用说明 2022-02-07 02:38:20 +08:00
MistEO
b8a6f861d0 docs.更新文档肉鸽截图 2022-02-07 02:29:35 +08:00
MistEO
1212125da8 chore.更新版本号 v3.0.1 2022-02-07 01:50:25 +08:00
MistEO
d119b97871 perf.优化肉鸽战斗技能使用,特种、无人机的摆放 2022-02-07 01:48:26 +08:00
MistEO
f4a6eff6af perf.优化肉鸽摆放干员朝向 2022-02-07 01:41:09 +08:00
MistEO
bc530f60e5 refactor.重构肉鸽战斗干员朝向的逻辑 2022-02-06 23:57:41 +08:00
MistEO
ac3b1c0a00 fix.修复肉鸽战斗结束正好又在开技能时,意外的点进某些界面,然后卡住的问题 2022-02-06 21:53:36 +08:00
MistEO
f9aa40cbab fix.修复一个代理指挥识别错误的问题 2022-02-06 21:41:23 +08:00
MistEO
654668a586 fix.修复一个肉鸽战斗结束后卡在选择干员skip界面的问题 2022-02-06 08:23:55 +08:00
MistEO
a3101646f6 feat.肉鸽新增支持古堡观光(简单模式)
https://github.com/MistEO/MeoAssistantArknights/issues/178
2022-02-06 06:23:50 +08:00
MistEO
795aa97666 fix.修复会客室线索满后不送线索的问题 2022-02-05 04:07:16 +08:00
MistEO
a1a20d3f9f fix.修复一个肉鸽进阶干员时卡住的问题
https://github.com/MistEO/MeoAssistantArknights/issues/197
2022-02-04 18:55:15 +08:00
MistEO
a880eae47f fix.修复干员名的错别字
https://github.com/MistEO/MeoAssistantArknights/issues/185
2022-02-04 18:32:29 +08:00
MistEO
75990c2297 feat.更新界面的小优化 2022-02-04 18:27:59 +08:00
MistEO
8720263f1c fix.修复肉鸽在凌晨4点更新后卡在代办列表界面的问题
https://github.com/MistEO/MeoAssistantArknights/issues/198
2022-02-04 18:20:22 +08:00
MistEO
25dc1ec62a Merge pull request #196 from Puqns67/master
perf.优化来自 #184 的问题,添加基于 C# 原生的下载方式
2022-02-04 01:24:32 +08:00
Puqns67
4b818067a9 perf.优化来自 #184 的问题,添加基于 C# 原生的下载方式 2022-02-03 17:01:08 +08:00
MistEO
fa11e8d7d2 docs.更新群号 2022-02-02 19:08:27 +08:00
MistEO
3290106d66 fix.修复肉鸽源石锭投资满了之后的错误
https://github.com/MistEO/MeoAssistantArknights/issues/186
2022-02-01 18:34:00 +08:00
MistEO
ff5f862ff0 perf.优化一个代理指挥的识别问题 2022-02-01 03:47:44 +08:00
MistEO
909c531f26 chore.更新meojson,更新版本号v3.0 2022-02-01 03:16:43 +08:00
MistEO
002641f0ac fix.修复肉鸽关卡名识别错误 2022-01-31 16:02:05 +08:00
MistEO
04d5d5a16d fix.修复一个肉鸽一直退出重进的问题 2022-01-31 14:49:24 +08:00
MistEO
5299e9c165 chore.更新版本号v2.9.8 2022-01-30 23:47:41 +08:00
MistEO
f9eab318b3 feat.支持肉鸽掉线后重连,增删一些日志 2022-01-30 23:46:34 +08:00
MistEO
2297155e30 fix.修复肉鸽离开商店的时候卡住的问题 2022-01-30 23:23:47 +08:00
MistEO
85dd19e789 feat.肉鸽新增支持从任意界面导航过去、支持凌晨四点掉线重连 2022-01-30 23:05:11 +08:00
MistEO
a2f658d1ce fix.修复肉鸽关卡进入按钮卡住的问题
https://github.com/MistEO/MeoAssistantArknights/issues/174
2022-01-30 22:07:10 +08:00
MistEO
00abb00e8d docs. fix typo 2022-01-30 02:23:29 +08:00
MistEO
322e3bc00f Merge branch 'dev' 2022-01-30 01:42:18 +08:00
MistEO
aaee282f9d chore.更新版本号 2022-01-30 01:30:09 +08:00
MistEO
02d945c90d perf.更换飞桨OCR det模型,提高干员名识别率 2022-01-30 01:29:18 +08:00
MistEO
ed2f4604a9 fix.修复肉鸽重开后计数清零的问题 2022-01-30 01:28:44 +08:00
MistEO
29cee57e23 fix.修复招募干员后卡住的问题
https://github.com/MistEO/MeoAssistantArknights/issues/169
2022-01-30 00:19:13 +08:00
MistEO
0cc42b0e5f fix.修复肉鸽刚进入选人时弹出收藏品然后卡住的问题 2022-01-29 23:02:43 +08:00
MistEO
977507fe8f fix.修复一些linux下的编译错误 2022-01-29 22:44:40 +08:00
MistEO
9ed6e364ee docs.更新文档 2022-01-29 22:34:13 +08:00
MistEO
b4fcc95ff5 fix.修复基建低等级控制中枢不换班的问题,再次关闭控制中枢异格干员的使用 2022-01-29 22:27:00 +08:00
MistEO
a6c76d268e fix.尝试修复肉鸽卡住后不重试的问题,优化干员配置,更新版本号 2022-01-29 21:48:28 +08:00
MistEO
0f16afa48f fix.修复公招偶尔不点时间的问题
https://github.com/MistEO/MeoAssistantArknights/issues/127
https://github.com/MistEO/MeoAssistantArknights/issues/125
2022-01-29 21:35:54 +08:00
MistEO
dcfc4ca4f0 fix.修复PRTS无法识别到的问题
https://github.com/MistEO/MeoAssistantArknights/issues/140
2022-01-29 21:31:11 +08:00
MistEO
fd1c60f521 fix.修复基建某种case下不领取自己线索的问题
https://github.com/MistEO/MeoAssistantArknights/issues/160
2022-01-29 21:24:24 +08:00
MistEO
c521fc7e3d fix.修复boss关卡住、源石锭虚空投资、未知的剧目卡住、进入古堡卡住、不期而遇四个选项时卡住
https://github.com/MistEO/MeoAssistantArknights/issues/152
https://github.com/MistEO/MeoAssistantArknights/issues/164
https://github.com/MistEO/MeoAssistantArknights/issues/161
https://github.com/MistEO/MeoAssistantArknights/issues/157
https://github.com/MistEO/MeoAssistantArknights/issues/163
https://github.com/MistEO/MeoAssistantArknights/issues/162
2022-01-29 21:20:41 +08:00
MistEO
0754afbe60 fix.修复公招”高级资深干员”被识别成“资深干员”的问题 2022-01-29 19:07:31 +08:00
MistEO
fd7f49b9a8 feat.新增源石锭往第二层刷的选项,修复鸭爵关卡名识别错误的问题
https://github.com/MistEO/MeoAssistantArknights/issues/156
2022-01-29 04:22:29 +08:00
MistEO
191ffe02bb docs.更新识别错误的解决办法 2022-01-29 03:50:16 +08:00
MistEO
1efff95ccc perf.优化源石锭投资识别的识别率 2022-01-29 03:07:01 +08:00
MistEO
ae7c59b6d2 opt.优化了一下紧急作战和普通作战的提示 2022-01-29 02:21:52 +08:00
MistEO
d942b2866f fix.修复离开商店卡住的问题 2022-01-29 01:11:28 +08:00
MistEO
9a3ef19db2 fix.修复肉鸽上次突破两层后,更多支援卡住的问题 2022-01-29 00:48:56 +08:00
MistEO
565cac3d8d chore.更新版本号 2022-01-29 00:42:00 +08:00
MistEO
0292ffe137 fix.修复肉鸽弹出”大锁“卡住的问题
https://github.com/MistEO/MeoAssistantArknights/issues/149
2022-01-29 00:11:47 +08:00
MistEO
856123086b fix.修复部分环境下肉鸽源石锭不存钱的问题
https://github.com/MistEO/MeoAssistantArknights/issues/154
2022-01-29 00:10:15 +08:00
MistEO
dd81bd69c0 fix.修复“上次作战”选项卡住的问题 2022-01-28 22:14:39 +08:00
MistEO
ff93575a67 Merge branch 'dev' 2022-01-28 20:27:27 +08:00
MistEO
30705d0c7c chore.更新新角色基建技能识别的支持,更新版本号 2022-01-28 19:54:20 +08:00
MistEO
b520541e9d feat.界面新增肉鸽战斗关卡名提示 2022-01-28 17:47:46 +08:00
MistEO
7fd7a21551 fix.试图缓解关卡名识别错误的问题 2022-01-28 16:56:36 +08:00
MistEO
916d9a4bdd fix.修复肉鸽掉落奖励中,点快了,点到了招募然后卡住了问题 2022-01-28 15:36:20 +08:00
MistEO
ac76d46eb2 opt.减少第一次上干员的延时 2022-01-28 14:52:11 +08:00
MistEO
8026a4b2b6 fix.修复肉鸽不期而遇鸭爵后卡住的问题
https://github.com/MistEO/MeoAssistantArknights/issues/144
2022-01-28 14:48:47 +08:00
MistEO
fdf5838650 fix.修复部分关卡名识别错误的问题 2022-01-28 14:28:03 +08:00
MistEO
a6adecb4f7 fix.修复异格导致基建卡住的问题、修复识别错误导致设施从头开始换班的问题
https://github.com/MistEO/MeoAssistantArknights/issues/132
https://github.com/MistEO/MeoAssistantArknights/issues/129
2022-01-28 13:55:46 +08:00
MistEO
9240d450cd fix.修复一个关卡识别错误时崩溃的问题 2022-01-28 12:46:54 +08:00
MistEO
a1ec39e799 fix.修复关卡识别错误的问题、修复不期而遇多次的选项卡住的问题、修复源石锭系统不投资的问题
https://github.com/MistEO/MeoAssistantArknights/issues/144
https://github.com/MistEO/MeoAssistantArknights/issues/142
2022-01-28 12:44:01 +08:00
MistEO
d9fa61f73f fix.修复一些肉鸽的bug 2022-01-28 02:07:03 +08:00
MistEO
4b4beef9a7 fix.修复一些肉鸽的bug 2022-01-28 01:55:28 +08:00
MistEO
ce95510199 docs.更新文档 2022-01-28 01:20:15 +08:00
MistEO
1c6d57ba78 feat.完成自动肉鸽的界面 2022-01-28 01:07:40 +08:00
MistEO
463679a795 feat.新增肉鸽接口,修复肉鸽的一些bug 2022-01-28 00:09:39 +08:00
MistEO
38d97d923f fix.优化自动肉鸽,修复一些bug 2022-01-27 22:40:23 +08:00
MistEO
cbeb1548e6 perf.优化肉鸽的各种流程 2022-01-27 00:55:41 +08:00
MistEO
da2d88e58b docs.修改文档措辞 2022-01-26 13:41:37 +08:00
MistEO
445e683591 docs.拆分并整理文档 2022-01-26 12:06:16 +08:00
MistEO
14eb95e659 feat.集成格子识别,初步跑通整个肉鸽流程 2022-01-26 01:59:47 +08:00
MistEO
4488470733 chore.更新 meojson, 同步接口变动 2022-01-25 22:05:22 +08:00
MistEO
eda9724405 chore.更新版本号 2022-01-25 17:40:10 +08:00
MistEO
341529b3b3 feat.更新将进酒关卡资源、公招新干员数据 2022-01-25 17:26:19 +08:00
MistEO
b9c696b0de feat.初步集成地图格子识别 2022-01-25 00:54:07 +08:00
MistEO
7b8c4c2281 fix.尝试修复关卡掉落识别的崩溃问题 2022-01-24 19:48:09 +08:00
MistEO
63af14db08 opt.优化了一下选人策略,开放debug接口 2022-01-24 03:34:50 +08:00
MistEO
4a975a895d feat.初步完成自动肉鸽全流程 2022-01-24 02:54:14 +08:00
MistEO
19ffb6b88f refactor.将肉鸽编队及战斗改为任务插件形式 2022-01-23 23:49:16 +08:00
MistEO
8486b65a96 feat.完成自动释放技能 2022-01-23 17:51:09 +08:00
MistEO
7040f3ce76 fix.修复会客室某种线索满了流程出错的问题 2022-01-23 02:58:39 +08:00
MistEO
ae94759d78 feat.打通肉鸽第一次战斗失败,及战斗成功只领取掉落界面的流程 2022-01-23 02:28:04 +08:00
MistEO
4497132169 feat.打通肉鸽从进入到第一次战斗的流程 2022-01-23 01:04:57 +08:00
MistEO
1e4947a0d2 chore.更新meojson,修复转义错误 2022-01-23 00:45:19 +08:00
MistEO
b96491e97e fix.修复基建干员偶尔识别漏了的问题 2022-01-22 13:49:09 +08:00
MistEO
f46b04ca4d feat.完成肉鸽从进入选人 2022-01-22 01:02:31 +08:00
MistEO
8459649d11 chore.添加一个ROI小工具 2022-01-22 00:24:26 +08:00
MistEO
c5fbd4bb93 opt.优化自动战斗任务 2022-01-21 23:24:34 +08:00
MistEO
9e7209c283 opt.优化可放置干员位置的识别 2022-01-21 22:54:45 +08:00
MistEO
6b3b5169ac fix.修复会客室解锁线索交流的错误 2022-01-21 19:07:30 +08:00
MistEO
ebd6e8f4d1 opt.简单优化了下战斗任务 2022-01-21 00:17:56 +08:00
MistEO
577e70bd33 fix.修复界面关于更新的一点小问题 2022-01-21 00:17:51 +08:00
YIU
ad9908ec92 fix.修复通知提示在线程调用时崩溃和一些其他改进
* 修复 toast通知提示在非UI线程调用引起程式懵了的问题
* 修复 OTA 更新 stages.json 地址错误的问题
* 新增 3个OTA更新下载地址CDN接口,获取失败会尝试从下一个接口获取
* 新增 更新提示的 toast 通知样式
* 更改 部分 toast 通知样式
* 更改 设置页面滚动条滚动定位计算
* 调整 GUI 一些代码排版格式
2022-01-20 23:00:16 +08:00
MistEO
1cbfe1b096 chore.更新meojson新版本 2022-01-20 23:00:16 +08:00
MistEO
b6b59f11d4 fix.修复自动战斗的一些小问题 2022-01-20 22:59:54 +08:00
MistEO
e0c871de4d Merge branch 'master' into dev 2022-01-19 14:49:25 +08:00
MistEO
638ce08150 fix.修复进驻宿舍卡住的问题 2022-01-19 11:49:36 +08:00
MistEO
859d41726f feat.初步完成战斗上干员 2022-01-19 00:41:06 +08:00
MistEO
a34590195d Merge branch 'auto_battle' into dev 2022-01-18 21:58:37 +08:00
MistEO
db7983e6f2 chore.代码格式化、更新版本号、更新了一些脚本 2022-01-18 21:50:18 +08:00
MistEO
8622f312a6 opt.优化了一点💩 2022-01-18 15:14:58 +08:00
MistEO
f6f430d58a fix.修复异格干员进驻宿舍卡住的问题
https://github.com/MistEO/MeoAssistantArknights/issues/56
https://github.com/MistEO/MeoAssistantArknights/issues/118
2022-01-18 12:01:16 +08:00
MistEO
47d3cba6d4 opt.优化截图和点击接口 2022-01-18 10:43:41 +08:00
MistEO
6b1570164d fix.修复会客室关闭线索交流后识别错误的问题 2022-01-18 01:49:55 +08:00
MistEO
7d11763dd7 fix.修复一个没啥用的宏定义 2022-01-18 00:56:38 +08:00
MistEO
7fa512efc7 opt.优化干员费用及职业识别 2022-01-18 00:52:28 +08:00
MistEO
8b593d4b9d refactor.重构哈希计算的调用逻辑 2022-01-17 23:55:55 +08:00
MistEO
51f511aec9 fix.修复基建技能识别错误的问题,更新版本号 2022-01-17 23:51:24 +08:00
MistEO
6e08f8ede5 fix.修复基建技能识别错误的问题,更新版本号 2022-01-17 22:39:49 +08:00
MistEO
86ecebb540 feat.新增了截图和点击的外部接口(C层接口) 2022-01-17 17:18:25 +08:00
MistEO
90e11c510e fix.修复一些回调消息错误的问题 2022-01-17 14:30:02 +08:00
MistEO
bc3d610dbb opt.增加对截图数据全 0 的检查
https://github.com/MistEO/MeoAssistantArknights/issues/99
2022-01-17 10:25:22 +08:00
MistEO
6fa1ea2882 feat.初步完成干员职业及费用识别 2022-01-17 01:11:31 +08:00
MistEO
02740bd1d4 Merge pull request #117 from usaginya/dev
优化通知提示和界面部分功能
2022-01-16 22:46:17 +08:00
YIU
985b9e91fb Update MeoAsstGui.csproj 2022-01-16 21:49:55 +08:00
YIU
799f0176e0 优化通知提示和界面部分功能
* 更换微软的 Notification 为兼容的 Notification.WPF 通知 效果差不多
* 修复 AsstProxy 中初始化异常时 ShowMessageBox 会导致程序未响应的问题
* 给当前使用的 ShowMessageBox 消息框加上消息图标
* 增加了主界面上各个设置数值的保存
* 更换了设置页面滚动和菜单列表定位方法
* 优化一点代码格式冗余
2022-01-16 21:32:55 +08:00
MistEO
41d3067a12 refactor.重载部分图像识别器 2022-01-16 05:38:23 +08:00
MistEO
fe9525b0a8 fix.修复更新美服配置文件 2022-01-16 00:26:41 +08:00
MistEO
341b23a16c Merge branch 'dev' 2022-01-15 11:42:50 +08:00
MistEO
83fef36eca fix.修复巫恋专属加速不生效的问题 2022-01-15 00:03:15 +08:00
MistEO
564c0ddf86 chore.更新模拟器支持,更新版本号 2022-01-14 21:13:46 +08:00
MistEO
44e4c5efe0 fix.重构并修复截图错误的问题 2022-01-14 20:52:28 +08:00
MistEO
0475b1fd6d Merge branch 'dev' of https://github.com/MistEO/MeoAssistance-Arknights into dev 2022-01-14 12:30:20 +08:00
MistEO
85591d8689 fix.尝试修复会客室的操作错误 2022-01-14 12:29:50 +08:00
MistEO
3cc01da947 docs.改改文档格式 2022-01-13 01:28:05 +08:00
MistEO
6cb7e163a2 chore.一些小优化,更新版本号 v2.7.4 2022-01-12 23:37:41 +08:00
MistEO
b4587b449e opt.优化关卡掉落识别,修复一些识别错误的问题 2022-01-12 23:12:15 +08:00
MistEO
c563760bb1 chore.阻止多实例创建 2022-01-12 17:40:38 +08:00
MistEO
2488ac968e fix.修复Linux下子进程返回值的问题 2022-01-12 16:48:00 +08:00
MistEO
52c0a35bc8 feat.更新企鹅数据识别库,增加对龙门币、未知关卡的识别 2022-01-12 00:54:58 +08:00
MistEO
869fbf529d opt.优化一些插件的工作逻辑 2022-01-11 23:01:37 +08:00
MistEO
01e8b6e6d6 Merge branch 'master' into dev 2022-01-11 22:16:11 +08:00
MistEO
fbe56b800b feat. Support more features of the US server 2022-01-11 22:14:57 +08:00
MistEO
4b6f1160d6 docs.改改声明,logo裁剪 2022-01-11 21:16:03 +08:00
MistEO
9614b1807f chore.新LOGO! 2022-01-11 19:38:34 +08:00
MistEO
4520c5c562 chore.优化配置文件,巫恋的阈值、关闭弹出公告、进入基建延迟;优化更新资源脚本等 2022-01-11 18:03:31 +08:00
MistEO
c37d4cd7bd chore.更新版本号v2.7.3, 更新文档 2022-01-10 23:05:36 +08:00
MistEO
c7691a6f7b feat.新增无人机 for 巫恋任务插件,优化部分函数调用方式 2022-01-10 22:56:13 +08:00
MistEO
3f6958d796 feat. Support the auto battle function of the US server 2022-01-10 21:50:24 +08:00
MistEO
61e5d6fb50 chore.更新画中人活动关卡数据 2022-01-10 19:26:51 +08:00
MistEO
663a8eadba chore.更新版本号 2022-01-10 01:19:27 +08:00
MistEO
9b1f0a5541 fix.修复自动公招崩溃的问题 2022-01-10 01:17:46 +08:00
MistEO
93b0f6a37c docs.更新格式 2022-01-10 00:51:38 +08:00
MistEO
bfcdc12046 feat. SubTask相关回调消息新增subtask字段 2022-01-10 00:42:26 +08:00
MistEO
9e1c34db53 chore.更新版本号 2022-01-10 00:24:59 +08:00
MistEO
9967aaa9e2 refactor.重构基建类,添加可用干员人数不足的回调 2022-01-10 00:09:46 +08:00
MistEO
52eb57940b refactor.优化任务插件的工作方式 2022-01-09 22:40:34 +08:00
MistEO
bebb64dc01 fix.修复没有石头时,刷完理智卡住的问题 2022-01-09 22:05:01 +08:00
MistEO
618fccd08a docs.更新文档对夜神的描述,修改一点文档格式 2022-01-09 21:31:33 +08:00
MistEO
4b09cbd110 fix.调用命令部分加入一些检查,尝试修复部分崩溃问题 2022-01-09 19:57:44 +08:00
MistEO
5eb4e6f7b8 chore.宏学! 2022-01-09 17:12:19 +08:00
MistEO
b0c2c21402 fix.修复TaskChain相关回调的一些问题 2022-01-09 16:27:45 +08:00
MistEO
05d5838162 chore.修改关卡掉落的回调 2022-01-09 03:25:17 +08:00
MistEO
b16db5004b fix.修复偶尔会进到肉鸽的问题 2022-01-09 03:00:30 +08:00
MistEO
d528c3cb32 opt.提高基建技能识别准确率 2022-01-09 02:28:51 +08:00
MistEO
3f6601b21e fix.补上漏了的界面消息 2022-01-09 02:28:36 +08:00
MistEO
8b87ba9c6f fix.修复漏了的返回值 2022-01-09 01:18:54 +08:00
MistEO
d3e67874ff Merge branch 'dev' 2022-01-09 01:16:04 +08:00
MistEO
83528bbca6 docs.更新版本号,更新文档 2022-01-09 01:15:30 +08:00
MistEO
9ec37b5f37 refactor.解耦关卡掉落相关任务,插件化 2022-01-09 00:46:55 +08:00
MistEO
544cf71f09 Merge branch 'temp' into dev 2022-01-08 16:29:07 +08:00
MistEO
27a23a93d9 refactor.适配新的回调消息 2022-01-08 16:28:53 +08:00
MistEO
30918807d5 fix.修复回调消息的一些错误 2022-01-08 16:24:38 +08:00
MistEO
dd45cbf3d9 fix.修复收完信用后卡住的问题 2022-01-08 14:28:13 +08:00
MistEO
af75601fba opt.加入一点奇怪的语法糖( 2022-01-08 02:00:35 +08:00
MistEO
de49dcdf81 chore.更新资源文件目录,及相关脚本 2022-01-08 01:28:26 +08:00
MistEO
0633e8e7a9 refactor.初步完成回调消息的重构 2022-01-08 01:10:25 +08:00
MistEO
e8904c7ae0 docs.新增回调消息文档 2022-01-08 01:00:45 +08:00
MistEO
172ac05eba Update 模拟器支持.md 2022-01-07 19:46:41 +08:00
MistEO
860fa9ac88 Merge branch 'master' into dev 2022-01-06 22:18:33 +08:00
MistEO
526126b263 docs.更新readme 2022-01-06 22:17:51 +08:00
MistEO
f54b69e887 interface.修改回调json为utf-8 2022-01-06 18:08:55 +08:00
MistEO
d0995ead1a chore.一些有的没有小优化 2022-01-06 18:07:38 +08:00
MistEO
adcdbb187f fix.更新版本号v2.6.6 2022-01-06 00:17:04 +08:00
MistEO
bb5c10314c fix.修复关卡打到一半卡住的问题 2022-01-06 00:16:31 +08:00
MistEO
57f1cc46cc fix.修复游戏更新后,选择资源关卡卡住的问题(图标位置变了) 2022-01-06 00:15:30 +08:00
MistEO
154e76943d chore.更新版本号v2.6.5 2022-01-06 00:04:49 +08:00
MistEO
2ef2f20a5c fix.修复网络较差时,公招加急卡住的问题 2022-01-06 00:03:45 +08:00
MistEO
e3090acf21 fix.修复自动公招任务无法停止的问题 2022-01-05 23:59:20 +08:00
MistEO
710bdacc3b fix.重构会客室,修复会客室的各种问题 2022-01-05 23:57:38 +08:00
MistEO
ef4d0e574d Merge pull request #95 from yuanyan3060/master
fix a bug
2022-01-05 18:12:39 +08:00
MistEO
697bad0649 fix.修复笔误 2022-01-05 18:12:15 +08:00
MistEO
31ec7cc7ca fix.修复笔误 2022-01-05 18:11:32 +08:00
yuanyan3060
2d79d6e3ef fix a bug 2022-01-05 17:04:57 +08:00
yuanyan3060
083287f533 fix a bug 2022-01-05 14:16:52 +08:00
MistEO
baa41c2644 Merge pull request #94 from yuanyan3060/master
添加 golang接口
2022-01-05 12:35:56 +08:00
yuanyan3060
cb57d7218c Merge branch 'MistEO:master' into master 2022-01-05 03:49:35 +08:00
yuanyan3060
340950b828 fix a bug 2022-01-05 03:49:13 +08:00
yuanyan3060
1b0621a1c1 添加 golang接口 2022-01-05 02:06:10 +08:00
MistEO
70e3c61582 docs.更新对mumu模拟器的描述 2022-01-05 00:23:07 +08:00
MistEO
989ad6061f feat.完成会客室送线索的逻辑,暂未集成 2022-01-05 00:03:16 +08:00
MistEO
46ee9727f4 fix.重构并修复自动公招任务 2022-01-04 22:40:00 +08:00
MistEO
0d081cd4c3 chore.优化调试日志和调试宏 2022-01-04 15:15:49 +08:00
MistEO
1f454a2e45 chore.去掉一些多余的日志打印 2022-01-04 01:27:32 +08:00
MistEO
2857fcdf22 feat.新增公招加急功能 2022-01-04 00:59:17 +08:00
MistEO
9011217c8f opt.为领取日常奖励任务添加ROI 2022-01-03 23:41:32 +08:00
MistEO
04b3f3c614 docs.更新Python接口文档链接 2022-01-03 22:58:16 +08:00
MistEO
a28626318d fix.修复C++ demo中的调用错误 2022-01-03 22:49:05 +08:00
MistEO
628170c609 docs.更新部分文档的地址 2022-01-03 22:40:36 +08:00
MistEO
075a678cb5 chore.更新Python接口及demo 2022-01-03 22:40:23 +08:00
MistEO
0c2f2b7d9d chore.活动到期,从界面上移除“风雪过境”关卡选择。更新版本号 2022-01-03 22:16:47 +08:00
MistEO
911ecdfa0e opt.公招的一些小优化 2022-01-03 22:11:56 +08:00
MistEO
93d2ff9772 fix.修复领取周常任务后卡住的问题 2022-01-03 21:55:14 +08:00
MistEO
c5815fec39 fix.修复一处CRLF转换造成的崩溃问题 2022-01-03 21:45:56 +08:00
MistEO
277bb958ac fix.修复Linux下的编译错误 2022-01-03 04:22:55 +08:00
MistEO
f05f28f8f4 docs.添加亿些标点符号 2022-01-03 02:38:09 +08:00
MistEO
0abe4bd1c9 docs.更新文档,更新一些界面提示 2022-01-03 02:03:06 +08:00
MistEO
6af383dc1d Merge pull request #89 from Initial-heart-1/patch-2
docs.修改闪退问题解决方案
2022-01-03 01:28:43 +08:00
MistEO
1fe2470295 Merge branch 'master' of github.com:MistEO/MeoAssistantArknights into dev 2022-01-03 01:27:21 +08:00
MistEO
25fb18c064 chore.更新版本号,添加ppocr_noavx.zip 2022-01-03 01:27:05 +08:00
MistEO
841a3845f0 perf.大幅优化流程任务的操作速度 2022-01-03 01:26:00 +08:00
MistEO
4f85435189 opt.优化截图命令的缓冲区申请 2022-01-03 01:25:59 +08:00
MistEO
43582c3f0d feat.支持更多模拟器的gzip 2022-01-03 01:23:32 +08:00
Initial-heart
999b3bd2f4 docs.更新信息 2022-01-02 23:52:26 +08:00
MistEO
559ec3ef97 docs.更新logo及致谢 2022-01-02 21:06:04 +08:00
Initial-heart
56f552d58a docs.修改闪退问题解决方案
顺便好像还格式化了哪里?忘了
血糖低,干饭去了
2022-01-02 20:37:13 +08:00
MistEO
85807e9f3f perf.优化蓝叠国际版的截图速度 2022-01-02 03:45:21 +08:00
StupidBh
61f714f835 fix.修复一些warning 2022-01-02 01:17:12 +08:00
MistEO
7db6346c05 perf.更新飞桨OCR接口,改用cv::Mat::data, 优化性能 2022-01-02 00:32:24 +08:00
MistEO
33239e8de1 perf.更新企鹅数据识别接口,改用cv::Mat::data,优化性能 2022-01-01 23:03:38 +08:00
MistEO
5c0db8c315 fix.修复代理指挥失败后的逻辑错误 2022-01-01 19:09:55 +08:00
MistEO
aaba204e8e Merge pull request #64 from mole828/patch-1
Update interface.py
2022-01-01 13:53:35 +08:00
MistEO
a569dbc833 perf.优化读取管道的CPU占用 2022-01-01 02:53:51 +08:00
MistEO
5ebabd18bc chore.更新版本号 2021-12-31 23:59:15 +08:00
MistEO
d424cfb935 fix.修复一些warning 2021-12-31 23:19:49 +08:00
MistEO
fecd067c18 sytle.统一行尾 2021-12-31 22:56:03 +08:00
–StupidBh
f1cfd65beb fix.修复一些warning 2021-12-31 22:17:55 +08:00
MistEO
163dd2e865 perf.优化刷理智时的CPU占用 2021-12-31 21:44:33 +08:00
MistEO
3314acab6d perf.优化任务 sleep 的实现 2021-12-31 21:21:50 +08:00
MistEO
296a0028a6 Merge pull request #86 from bakashigure/patch-2
fix linux env
2021-12-31 11:24:08 +08:00
bakashigure
24dd93eae0 Update Linux编译教程.md
实际上是因为大小写导致的找不到OpenCV
2021-12-31 03:08:40 +08:00
MistEO
9eca69fc2c docs. fix space 2021-12-29 11:47:42 +08:00
MistEO
b75f70f64e docs.更新README 2021-12-28 23:51:57 +08:00
MistEO
2b6942feb5 docs.更新 Linux 教程 2021-12-28 23:10:55 +08:00
MistEO
e5c1c38b07 chore.更新版本号和Linux教程 2021-12-28 22:50:27 +08:00
MistEO
e936051472 opt.优化无人机的使用时机 2021-12-28 19:19:38 +08:00
MistEO
7d67ca1178 opt.游戏版本更新,基建设施进入时无需再额外滑动,优化掉滑动的逻辑 2021-12-28 16:19:20 +08:00
MistEO
500c81659c fix.修复错误的冲突合并问题导致碎石的问题 2021-12-28 13:58:53 +08:00
MistEO
da3a0464f5 chore.更新版本号 2021-12-28 01:03:04 +08:00
MistEO
d0225f4ad0 fix.修复活动签到窗口卡住的问题 2021-12-28 01:02:17 +08:00
MistEO
b1c9dcd18c chore.修改一些报错提示 2021-12-28 00:57:58 +08:00
MistEO
1d1ef8ff2b docs.更新README 2021-12-28 00:32:38 +08:00
MistEO
50e6976901 Merge branch 'master' into dev 2021-12-28 00:23:24 +08:00
MistEO
55e1783b37 docs.更新Linux编译教程 2021-12-28 00:20:53 +08:00
MistEO
a2da6b2c3e chore.代码格式化,修复Windows下的cmake配置 2021-12-28 00:11:44 +08:00
MistEO
c20482c9fb Merge branch 'cross_platform' into dev 2021-12-27 23:35:15 +08:00
MistEO
783f2aac79 chore.更新Linux下Python集成示例 2021-12-27 23:32:44 +08:00
MistEO
3322fa96cf chore.删除调试逻辑 2021-12-27 23:24:44 +08:00
MistEO
1ce4ac208b Merge pull request #83 from Initial-heart-1/patch-1
docs.修改闪退提示,格式化
2021-12-27 10:31:33 +08:00
Initial-heart
7c1ceb1eff Revert "docs.更新ADB下载链接,免过共沸物"
This reverts commit 62a76117ec.
2021-12-27 03:07:50 +08:00
Initial-heart
62a76117ec docs.更新ADB下载链接,免过共沸物
共沸物是什么呢?小编也很好奇
2021-12-27 03:04:16 +08:00
Initial-heart
855b32977e docs.修改闪退提示,格式化
格式化:指加亿点点空格
2021-12-27 02:48:22 +08:00
MistEO
d719121cb9 fix.修复会客室杰西卡技能的识别错误 2021-12-27 01:19:54 +08:00
MistEO
b19a5eaf3e Merge pull request #82 from Initial-heart-1/patch-1
docs.替换 Visual C++ Redistributable 链接
2021-12-27 01:08:49 +08:00
MistEO
dc3d48ab71 fix.改了些有的没的报错,修复一处崩溃问题 2021-12-27 00:59:44 +08:00
Initial-heart
16cbc3c4f0 docs.替换 Visual C++ Redistributable 链接
这怎么说啊。。。。。。
2021-12-27 00:58:20 +08:00
MistEO
37b526672f docs.编译教程,更新adb相关 2021-12-26 04:22:54 +08:00
MistEO
94d67b05ae docs.更新链接 2021-12-26 04:13:42 +08:00
MistEO
bfb74467ae docs.更新跨平台相关文档 2021-12-26 04:06:50 +08:00
MistEO
aa9c780a72 Merge branch 'dev' into cross_platform 2021-12-26 03:48:33 +08:00
MistEO
806484a6ce fix.修复Windows下的编译错误 2021-12-26 03:39:53 +08:00
MistEO
53a30e46f1 feat.完成Linux下子进程通讯 2021-12-26 02:28:35 +08:00
MistEO
8658395fee feat.初步完成跨平台移植的初始化部分 2021-12-25 17:48:20 +08:00
MistEO
6ddb2c7103 chore.更新版本号 2021-12-24 22:44:42 +08:00
MistEO
55620a6b80 opt.优化会客室处理速度 2021-12-24 22:44:10 +08:00
MistEO
f1ee5c112f fix.修复吃理智药/吃石头后,开始行动次数被清空的问题 2021-12-24 22:44:05 +08:00
MistEO
077c8fa734 fix.修复吃理智药/吃石头后,开始行动次数被清空的问题 2021-12-23 22:23:58 +08:00
MistEO
db58f55a38 chore.更新版本号 2021-12-22 22:31:44 +08:00
MistEO
90c34de49f fix.修复初始化未完成时,开始任务失败的问题 2021-12-22 22:30:55 +08:00
MistEO
1bd871777a feat.支持关掉突然弹出来的通知窗口 2021-12-22 22:19:48 +08:00
MistEO
238cf3ecfe feat.优化启动速度 2021-12-22 21:57:27 +08:00
MistEO
452d7fb9fd feat.支持新基建技能的识别(没有什么用 2021-12-22 21:55:36 +08:00
MistEO
1916200154 fix.修复任务失败死循环的问题 2021-12-22 21:40:03 +08:00
MistEO
0444c116d4 feat.一些小优化 2021-12-22 20:39:24 +08:00
MistEO
a25cfc0d51 Merge branch 'dev' 2021-12-22 15:32:47 +08:00
MistEO
4dd6a2f6c1 Merge branch 'master' of https://github.com/MistEO/MeoAssistance-Arknights 2021-12-22 15:32:35 +08:00
MistEO
60094d43b9 Merge branch 'master' into dev 2021-12-21 23:14:49 +08:00
MistEO
aba7050c54 docs.更新文档 2021-12-21 23:14:41 +08:00
MistEO
051eb425e7 chore.更新版本号 2021-12-21 23:03:48 +08:00
MistEO
d01f88f44f feat.新增支持风雪过境部分关卡选关 2021-12-21 23:03:17 +08:00
MistEO
e7b7c76590 opt.界面简单调整 2021-12-21 23:02:19 +08:00
MistEO
8e62d3e9c0 feat.选关新增支持CA5 2021-12-21 22:11:52 +08:00
MistEO
a9df0e1842 perf.优化adb连接 2021-12-21 22:05:42 +08:00
MistEO
e8a20b2986 feat.更新风雪过境活动关卡数据 2021-12-21 18:54:45 +08:00
MistEO
1a4ddfee71 fix.修复任务开始后,选关按钮仍可用的问题 2021-12-20 23:32:55 +08:00
MistEO
3c0d91e320 chore.更新版本号 2021-12-20 23:23:59 +08:00
MistEO
a0f317b7c3 opt.更新python的接口 2021-12-20 23:23:41 +08:00
MistEO
08b5d92f6d opt.界面上解耦自动公招与公招识别 2021-12-20 23:13:17 +08:00
MistEO
fb8b323335 perf.降低日志开关文件频率 2021-12-20 22:42:30 +08:00
MistEO
afabb54c42 fix.修复ADB子进程不释放的问题: https://github.com/MistEO/MeoAssistantArknights/issues/53 2021-12-20 22:42:15 +08:00
MistEO
aa89efee15 feat.添加任务全部完成通知 2021-12-20 21:39:30 +08:00
MistEO
0bc224f671 feat.优化选关功能,新增部分关卡 2021-12-20 21:33:27 +08:00
MistEO
d0164a958d chore.更新版本号 2021-12-20 01:35:37 +08:00
MistEO
f165e0b2b2 feat.新增选关-剿灭;新增开始唤醒选项 2021-12-20 01:35:09 +08:00
MistEO
a5f9e55fe2 feat.完成选关功能 2021-12-20 01:02:39 +08:00
MistEO
7fc46c160c fix.修复OCR缓存区域错误的问题 2021-12-19 22:41:51 +08:00
MistEO
481135bcb2 chore.更新版本号 2021-12-18 21:04:33 +08:00
MistEO
a2c49d2feb feat.暂时废弃百度 OCR API 2021-12-18 21:00:24 +08:00
MistEO
02551f62ce Merge branch 'dev' of https://github.com/MistEO/MeoAssistance-Arknights into dev 2021-12-16 12:22:53 +08:00
MistEO
07436c3c70 fix.修复偶现的公招识别错误 2021-12-16 01:32:26 +08:00
MistEO
53c993cd67 chore. Update issue templates 2021-12-16 01:26:39 +08:00
MistEO
d7b21ea307 feat.初步完成百度OCR API的集成 2021-12-16 01:21:11 +08:00
MistEO
d2962f10be fix.修复红云组未精二火神的效率 2021-12-16 00:29:18 +08:00
MistEO
39ffb8e50a chore.Init issue templates 2021-12-15 22:50:53 +08:00
MistEO
d3d81253a4 fix.修复更新检查策略 2021-12-15 12:33:09 +08:00
MistEO
febe7eacd7 merge.合并dev 2021-12-15 11:46:38 +08:00
MistEO
240dee72d5 chore.更新版本号,修改cmake产物名 2021-12-15 11:32:15 +08:00
MistEO
7e5875d213 chore.补上漏了的依赖 2021-12-15 11:23:44 +08:00
mole828
d33f01f04f Merge branch 'MistEO:master' into patch-1 2021-12-15 11:00:49 +08:00
MistEO
5e36b493c1 chore.修改接口类型 2021-12-15 01:42:56 +08:00
MistEO
7274f50684 chore.项目重命名 2021-12-15 01:07:10 +08:00
MistEO
d9182694a6 style.代码格式化 2021-12-15 00:29:25 +08:00
MistEO
ad68e046f1 feat.OcrReplace支持正则替换,优化公招识别 2021-12-15 00:29:25 +08:00
MistEO
0d082d1635 perf.更新飞桨为移动端资源,调整部分参数 2021-12-15 00:29:24 +08:00
MistEO
989b96213f opt.优化一些计时方式 2021-12-15 00:29:23 +08:00
MistEO
f2c3129fee opt.优化日志的一些小问题 2021-12-15 00:29:23 +08:00
MistEO
9c20b5da49 style.项目、文件名统一化 2021-12-15 00:29:17 +08:00
MistEO
b516c94512 opt.优化新版本下载出错的情况 2021-12-13 22:19:53 +08:00
mole828
4d636c2d13 Update interface.py 2021-12-10 17:15:13 +08:00
1144 changed files with 697582 additions and 53915 deletions

View File

@@ -5,7 +5,7 @@ root = true
indent_style = space
insert_final_newline = true
charset = utf-8
end_of_line = crlf
end_of_line = lf
[*.json]

11
.gitattributes vendored Normal file
View File

@@ -0,0 +1,11 @@
* text=auto
*.cs text eol=crlf
*.xaml text eol=crlf
*.cpp text eol=lf
*.hpp text eol=lf
*.h text eol=lf
*.json text eol=lf
*.md text eol=lf
*.yaml text eol=lf

View File

@@ -0,0 +1,16 @@
---
name: 问题反馈Bug report
about: 识别错误、操作异常、连接错误等
title: ''
labels: bug
assignees: ''
---
!!!请尽可能详细的描述你遇到的问题,并附上助手软件目录下的 `asst.log` 日志文件!!!
!!!日志文件是可以直接拖拽进来的,没有日志文件的 bug 反馈我们会直接关掉!!!
最好再能说明下使用的模拟器、并附上出错时的游戏和软件的截图要是没截到就算啦_(:з」∠)_
Thanks♪(・ω・)ノ

View File

@@ -0,0 +1,10 @@
---
name: 需求建议Feature request
about: 新功能、建议等
title: ''
labels: enhancement
assignees: ''
---

10
.github/ISSUE_TEMPLATE/---others-.md vendored Normal file
View File

@@ -0,0 +1,10 @@
---
name: 其他Others)
about: 其他议题
title: ''
labels: ''
assignees: ''
---

30
.github/workflows/deploy-docs.yml vendored Normal file
View File

@@ -0,0 +1,30 @@
name: deploy-docs
on:
push:
branches:
- master
paths:
- "docs/*"
workflow_dispatch:
jobs:
deploy-to-azure:
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_GENTLE_DESERT_00290F400 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/docs" # App source code path
api_location: "" # Api source code path - optional
output_location: ".vuepress/dist" # Built app content directory - optional

69
.github/workflows/dev-build.yml vendored Normal file
View File

@@ -0,0 +1,69 @@
# ------------------------------------------------------------------------------
# <auto-generated>
#
# This code was generated.
#
# - To turn off auto-generation set:
#
# [GitHubActions (AutoGenerate = false)]
#
# - To trigger manual generation invoke:
#
# nuke --generate-configuration GitHubActions_dev-build --host GitHubActions
#
# </auto-generated>
# ------------------------------------------------------------------------------
name: dev-build
on:
push:
branches-ignore:
- master
paths:
- 'src/MeoAssistant/**'
- 'src/MeoAssistantBuilder/**'
- 'src/MeoAsstGui/**'
- '3rdparty/**'
- 'include/**'
- 'resource/**'
- MeoAssistantArknights.sln
pull_request:
branches:
- dev
paths:
- 'src/MeoAssistant/**'
- 'src/MeoAssistantBuilder/**'
- 'src/MeoAsstGui/**'
- '3rdparty/**'
- 'include/**'
- 'resource/**'
- MeoAssistantArknights.sln
workflow_dispatch:
inputs:
Reason:
description: "Reason"
required: true
jobs:
windows-latest:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Run './build.cmd DevBuild'
run: ./build.cmd DevBuild
env:
Reason: ${{ github.event.inputs.Reason }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v1
with:
name: artifacts
path: artifacts

View File

@@ -0,0 +1,48 @@
# ------------------------------------------------------------------------------
# <auto-generated>
#
# This code was generated.
#
# - To turn off auto-generation set:
#
# [GitHubActions (AutoGenerate = false)]
#
# - To trigger manual generation invoke:
#
# nuke --generate-configuration GitHubActions_release-maa-resource --host GitHubActions
#
# </auto-generated>
# ------------------------------------------------------------------------------
name: release-maa-resource
on:
push:
branches:
- master
paths:
- 'resource/**'
- '3rdparty/resource/**'
jobs:
windows-latest:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Run './build.cmd ReleaseMaaResource'
run: ./build.cmd ReleaseMaaResource
env:
PUBLISH_GH_PAT: ${{ secrets.PUBLISH_GH_PAT }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v1
with:
name: artifacts
path: artifacts

45
.github/workflows/release-maa.yml vendored Normal file
View File

@@ -0,0 +1,45 @@
# ------------------------------------------------------------------------------
# <auto-generated>
#
# This code was generated.
#
# - To turn off auto-generation set:
#
# [GitHubActions (AutoGenerate = false)]
#
# - To trigger manual generation invoke:
#
# nuke --generate-configuration GitHubActions_release-maa --host GitHubActions
#
# </auto-generated>
# ------------------------------------------------------------------------------
name: release-maa
on:
push:
tags:
- 'v*'
jobs:
windows-latest:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Run './build.cmd ReleaseMaa'
run: ./build.cmd ReleaseMaa
env:
PUBLISH_GH_PAT: ${{ secrets.PUBLISH_GH_PAT }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v1
with:
name: artifacts
path: artifacts

11
.gitignore vendored
View File

@@ -1,3 +1,6 @@
# docs
docs/node_modules
docs/.vuepress/.temp
# Prerequisites
*.d
@@ -430,5 +433,11 @@ FodyWeavers.xsd
screen.png
adb_screen.png
tools/*.png
tools/**/*.png
resource/infrast
.vscode
!3rdparty/tools/*
# Nuke
.nuke/temp/*
/tools/ItemMappingCvt/Arknights-Bot-Resource

137
.nuke/build.schema.json Normal file
View File

@@ -0,0 +1,137 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Build Schema",
"$ref": "#/definitions/build",
"definitions": {
"build": {
"type": "object",
"properties": {
"Continue": {
"type": "boolean",
"description": "Indicates to continue a previously failed build attempt"
},
"Help": {
"type": "boolean",
"description": "Shows the help text for this build assembly"
},
"Host": {
"type": "string",
"description": "Host for execution. Default is 'automatic'",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
},
"NoLogo": {
"type": "boolean",
"description": "Disables displaying the NUKE logo"
},
"Partition": {
"type": "string",
"description": "Partition to use on CI"
},
"Plan": {
"type": "boolean",
"description": "Shows the execution plan (HTML)"
},
"Profile": {
"type": "array",
"description": "Defines the profiles to load",
"items": {
"type": "string"
}
},
"Root": {
"type": "string",
"description": "Root directory during build execution"
},
"Skip": {
"type": "array",
"description": "List of targets to be skipped. Empty list skips all dependencies",
"items": {
"type": "string",
"enum": [
"Default",
"DevBuild",
"ReleaseMaa",
"ReleaseMaaCore",
"ReleaseMaaResource",
"SetMaaChangeLog",
"SetPackageBundled",
"SetVersion",
"UseCleanArtifact",
"UseCleanRelease",
"UseCommitVersion",
"UseMaaChangeLog",
"UseMaaCore",
"UseMaaDevBundle",
"UseMaaLegacyBundle",
"UseMaaResource",
"UseMaaResourceChangeLog",
"UsePublishArtifact",
"UsePublishRelease",
"UseTagVersion",
"WithCompileCoreRelease",
"WithCompileResourceRelease",
"WithCompileWpfRelease"
]
}
},
"Target": {
"type": "array",
"description": "List of targets to be invoked. Default is '{default_target}'",
"items": {
"type": "string",
"enum": [
"Default",
"DevBuild",
"ReleaseMaa",
"ReleaseMaaCore",
"ReleaseMaaResource",
"SetMaaChangeLog",
"SetPackageBundled",
"SetVersion",
"UseCleanArtifact",
"UseCleanRelease",
"UseCommitVersion",
"UseMaaChangeLog",
"UseMaaCore",
"UseMaaDevBundle",
"UseMaaLegacyBundle",
"UseMaaResource",
"UseMaaResourceChangeLog",
"UsePublishArtifact",
"UsePublishRelease",
"UseTagVersion",
"WithCompileCoreRelease",
"WithCompileResourceRelease",
"WithCompileWpfRelease"
]
}
},
"Verbosity": {
"type": "string",
"description": "Logging verbosity during build execution. Default is 'Normal'",
"enum": [
"Minimal",
"Normal",
"Quiet",
"Verbose"
]
}
}
}
}
}

4
.nuke/parameters.json Normal file
View File

@@ -0,0 +1,4 @@
{
"$schema": "./build.schema.json",
"Solution": "tools/MaaBuilder.sln"
}

10
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,10 @@
{
"json.schemas": [
{
"fileMatch": [
"resource/tasks.json"
],
"url": "./docs/maa_tasks_schema.json"
}
]
}

BIN
3rdparty/bin/libiomp5md.dll vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
3rdparty/bin/ppocr.dll vendored

Binary file not shown.

View File

@@ -0,0 +1,202 @@
#pragma once
#include <string>
#include <vector>
#include <cmath>
#include <fstream>
#include <iostream>
#include <opencv2/core.hpp>
#include <meojson/json.hpp>
namespace Map
{
struct Tile
{
int heightType = 0;
int buildableType = 0;
std::string tileKey;
};
class Level
{
public:
Level(const json::value& data);
int get_width() const { return width; }
int get_height() const { return height; }
Tile get_item(int y, int x) const { return tiles[y][x]; }
std::vector<cv::Point3d> view;
std::string stageId;
std::string code;
std::string levelId;
std::string name;
private:
int height = 0;
int width = 0;
std::vector<std::vector<Tile>> tiles;
};
class TileCalc
{
public:
TileCalc(int width, int height, const std::string& dir);
bool run(const std::string& code_or_name, bool side, std::vector<std::vector<cv::Point2d>>& out_pos, std::vector<std::vector<Tile>>& out_tiles) const;
private:
int width = 0;
int height = 0;
const double degree = atan(1.0) * 4 / 180;
std::vector<Level> levels;
cv::Mat MatrixP = cv::Mat(4, 4, CV_64F);
cv::Mat MatrixX = cv::Mat(4, 4, CV_64F);
cv::Mat MatrixY = cv::Mat(4, 4, CV_64F);
bool adapter(double& x, double& y) const;
};
inline void InitMat4x4(cv::Mat& m, double(*num)[4])
{
for (int i = 0; i < m.rows; i++)
for (int j = 0; j < m.cols; j++)
m.at<double>(i, j) = num[i][j];
}
inline Level::Level(const json::value& data)
{
Level::stageId = data.at("stageId").as_string();
Level::code = data.at("code").as_string();
Level::levelId = data.at("levelId").as_string();
Level::name = data.get("name", "null");
Level::height = data.at("height").as_integer();
Level::width = data.at("width").as_integer();
for (const json::value& point_data : data.at("view").as_array()) {
cv::Point3d tmp;
auto point_array = point_data.as_array();
tmp.x = point_array[0].as_double();
tmp.y = point_array[1].as_double();
tmp.z = point_array[2].as_double();
Level::view.emplace_back(std::move(tmp));
}
for (const json::value& row : data.at("tiles").as_array()) {
std::vector<Tile> tmp;
tmp.reserve(Level::width);
for (const json::value& tile : row.as_array()) {
tmp.emplace_back(Tile{
tile.at("heightType").as_integer(),
tile.at("buildableType").as_integer(),
tile.get("tileKey", std::string()) });
}
tiles.emplace_back(std::move(tmp));
}
}
inline TileCalc::TileCalc(int width, int height, const std::string& dir)
{
TileCalc::width = width;
TileCalc::height = height;
double ratio = static_cast<double>(height) / width;
double matrixP[4][4]{
{ ratio / tan(20 * degree), 0, 0, 0},
{ 0, 1 / tan(20 * degree), 0, 0},
{ 0, 0, -(1000 + 0.3) / (1000 - 0.3), -(1000 * 0.3 * 2) / (1000 - 0.3)},
{ 0, 0, -1, 0 }
};
InitMat4x4(TileCalc::MatrixP, matrixP);
double matrixX[4][4]{
{ 1, 0, 0, 0},
{ 0, cos(30 * degree), -sin(30 * degree), 0},
{ 0, -sin(30 * degree), -cos(30 * degree), 0},
{ 0, 0, 0, 1}
};
InitMat4x4(TileCalc::MatrixX, matrixX);
double matrixY[4][4]{
{ cos(10 * degree), 0, sin(10 * degree), 0},
{ 0, 1, 0, 0},
{ -sin(10 * degree), 0, cos(10 * degree), 0},
{ 0, 0, 0, 1}
};
InitMat4x4(TileCalc::MatrixY, matrixY);
std::ifstream ifs(dir, std::ios::in);
if (!ifs.is_open()) {
std::cerr << "Read resource failed" << std::endl;
throw "Read resource failed";
}
std::stringstream iss;
iss << ifs.rdbuf();
ifs.close();
std::string content = iss.str();
auto ret = json::parse(content);
if (!ret) {
std::cerr << "Parsing failed" << std::endl;
throw "Parsing failed";
}
for (const json::value& item : ret.value().as_array()) {
TileCalc::levels.emplace_back(item);
}
}
inline bool TileCalc::adapter(double& x, double& y) const
{
const double fromRatio = 9.0 / 16;
const double toRatio = 3.0 / 4;
double ratio = static_cast<double>(height) / width;
if (ratio < fromRatio - 0.00001) {
x = 0;
y = 0;
return false;
}
double t = (ratio - fromRatio) / (toRatio - fromRatio);
x = -1.4 * t;
y = -2.8 * t;
return true;
}
inline bool TileCalc::run(const std::string& code_or_name, bool side, std::vector<std::vector<cv::Point2d>>& out_pos, std::vector<std::vector<Tile>>& out_tiles) const
{
for (const Map::Level& level : TileCalc::levels) {
if (level.code != code_or_name &&
level.name != code_or_name &&
level.levelId != code_or_name &&
level.stageId != code_or_name) {
continue;
}
auto [x, y, z] = level.view[side ? 1 : 0];
double adapter_y = 0, adapter_z = 0;
TileCalc::adapter(adapter_y, adapter_z);
double matrix[4][4]{
{ 1, 0, 0, -x},
{ 0, 1, 0, -y - adapter_y},
{ 0, 0, 1, -z - adapter_z},
{ 0, 0, 0, 1}
};
auto raw = cv::Mat(cv::Size(4, 4), CV_64F);
auto Finall_Matrix = cv::Mat(cv::Size(4, 4), CV_64F);
InitMat4x4(raw, matrix);
if (side) {
Finall_Matrix = TileCalc::MatrixP * TileCalc::MatrixX * TileCalc::MatrixY * raw;
}
else {
Finall_Matrix = TileCalc::MatrixP * TileCalc::MatrixX * raw;
}
int h = level.get_height();
int w = level.get_width();
auto map_point = cv::Mat(cv::Size(1, 4), CV_64F);
map_point.at<double>(3, 0) = 1;
auto tmp_pos = std::vector<cv::Point2d>(w);
auto tmp_tiles = std::vector<Tile>(w);
for (int i = 0; i < h; i++) {
for (int j = 0; j < w; j++) {
tmp_tiles[j] = level.get_item(i, j);
map_point.at<double>(0, 0) = j - (w - 1) / 2.0;
map_point.at<double>(1, 0) = (h - 1) / 2.0 - i;
map_point.at<double>(2, 0) = tmp_tiles[j].heightType * -0.4;
cv::Mat view_point = Finall_Matrix * map_point;
view_point = view_point / view_point.at<double>(3, 0);
view_point = (view_point + 1) / 2;
tmp_pos[j] = cv::Point2d(view_point.at<double>(0, 0) * TileCalc::width, (1 - view_point.at<double>(1, 0)) * TileCalc::height);
}
out_pos.emplace_back(tmp_pos);
out_tiles.emplace_back(tmp_tiles);
}
return true;
}
return false;
}
}

View File

@@ -13,26 +13,43 @@ typedef unsigned char uint8_t;
extern "C" {
#endif
OCRAPI_PORT paddle_ocr_t* OCR_CALL PaddleOcrCreate(
const char* det_model_dir, const char* rec_model_dir,
const char* char_list_file, const char* cls_model_dir);
OCRAPI_PORT paddle_ocr_t* OCR_CALL PaddleOcrCreate(
const char* det_model_dir, const char* rec_model_dir,
const char* char_list_file, const char* cls_model_dir);
void OCRAPI PaddleOcrDestroy(paddle_ocr_t* ocr_ptr);
void OCRAPI PaddleOcrDestroy(paddle_ocr_t* ocr_ptr);
OCR_ERROR OCRAPI PaddleOcrDet(
paddle_ocr_t* ocr_ptr, const uint8_t* encode_buf, size_t encode_buf_size,
int* out_boxes, size_t* out_boxes_size,
double* out_times, size_t* out_times_size);
OCR_ERROR OCRAPI PaddleOcrDet(
paddle_ocr_t* ocr_ptr, const uint8_t* encode_buf, size_t encode_buf_size,
int* out_boxes, size_t* out_boxes_size,
double* out_times, size_t* out_times_size);
OCR_ERROR OCRAPI PaddleOcrRec(
paddle_ocr_t* ocr_ptr, const uint8_t* encode_buf, size_t encode_buf_size,
char** out_strs, float* out_scores, size_t* out_size,
double* out_times, size_t* out_times_size);
OCR_ERROR OCRAPI PaddleOcrDetWithData(
paddle_ocr_t* ocr_ptr, int rows, int cols, int type, void* data,
int* out_boxes, size_t* out_boxes_size,
double* out_times, size_t* out_times_size);
OCR_ERROR OCRAPI PaddleOcrSystem(
paddle_ocr_t* ocr_ptr, const uint8_t* encode_buf, size_t encode_buf_size, bool with_cls,
int* out_boxes, char** out_strs, float* out_scores, size_t* out_size,
double* out_times, size_t* out_times_size);
OCR_ERROR OCRAPI PaddleOcrRec(
paddle_ocr_t* ocr_ptr, const uint8_t* encode_buf, size_t encode_buf_size,
char** out_strs, float* out_scores, size_t* out_size,
double* out_times, size_t* out_times_size);
OCR_ERROR OCRAPI PaddleOcrRecWithData(
paddle_ocr_t* ocr_ptr, int rows, int cols, int type, void* data,
char** out_strs, float* out_scores, size_t* out_size,
double* out_times, size_t* out_times_size);
OCR_ERROR OCRAPI PaddleOcrSystem(
paddle_ocr_t* ocr_ptr, const uint8_t* encode_buf, size_t encode_buf_size,
bool with_cls,
int* out_boxes, char** out_strs, float* out_scores, size_t* out_size,
double* out_times, size_t* out_times_size);
OCR_ERROR OCRAPI PaddleOcrSystemWithData(
paddle_ocr_t* ocr_ptr, int rows, int cols, int type, void* data,
bool with_cls,
int* out_boxes, char** out_strs, float* out_scores, size_t* out_size,
double* out_times, size_t* out_times_size);
#ifdef __cplusplus
}

310
3rdparty/include/cpp-base64/base64.hpp vendored Normal file
View File

@@ -0,0 +1,310 @@
/*
base64.cpp and base64.h
base64 encoding and decoding with C++.
More information at
https://renenyffenegger.ch/notes/development/Base64/Encoding-and-decoding-base-64-with-cpp
Version: 2.rc.08 (release candidate)
Copyright (C) 2004-2017, 2020, 2021 René Nyffenegger
This source code is provided 'as-is', without any express or implied
warranty. In no event will the author be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this source code must not be misrepresented; you must not
claim that you wrote the original source code. If you use this source code
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original source code.
3. This notice may not be removed or altered from any source distribution.
René Nyffenegger rene.nyffenegger@adp-gmbh.ch
*/
#ifndef BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A
#define BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A
#include <string>
#if __cplusplus >= 201703L
#include <string_view>
#endif // __cplusplus >= 201703L
std::string base64_encode (std::string const& s, bool url = false);
std::string base64_encode_pem (std::string const& s);
std::string base64_encode_mime(std::string const& s);
std::string base64_decode(std::string const& s, bool remove_linebreaks = false);
std::string base64_encode(unsigned char const*, size_t len, bool url = false);
#if __cplusplus >= 201703L
//
// Interface with std::string_view rather than const std::string&
// Requires C++17
// Provided by Yannic Bonenberger (https://github.com/Yannic)
//
std::string base64_encode (std::string_view s, bool url = false);
std::string base64_encode_pem (std::string_view s);
std::string base64_encode_mime(std::string_view s);
std::string base64_decode(std::string_view s, bool remove_linebreaks = false);
#endif // __cplusplus >= 201703L
#include <algorithm>
#include <stdexcept>
//
// Depending on the url parameter in base64_chars, one of
// two sets of base64 characters needs to be chosen.
// They differ in their last two characters.
//
static const char* base64_chars[2] = {
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789"
"+/",
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789"
"-_"};
static unsigned int pos_of_char(const unsigned char chr) {
//
// Return the position of chr within base64_encode()
//
if (chr >= 'A' && chr <= 'Z') return chr - 'A';
else if (chr >= 'a' && chr <= 'z') return chr - 'a' + ('Z' - 'A') + 1;
else if (chr >= '0' && chr <= '9') return chr - '0' + ('Z' - 'A') + ('z' - 'a') + 2;
else if (chr == '+' || chr == '-') return 62; // Be liberal with input and accept both url ('-') and non-url ('+') base 64 characters (
else if (chr == '/' || chr == '_') return 63; // Ditto for '/' and '_'
else
//
// 2020-10-23: Throw std::exception rather than const char*
//(Pablo Martin-Gomez, https://github.com/Bouska)
//
throw std::runtime_error("Input is not valid base64-encoded data.");
}
static std::string insert_linebreaks(std::string str, size_t distance) {
//
// Provided by https://github.com/JomaCorpFX, adapted by me.
//
if (!str.length()) {
return "";
}
size_t pos = distance;
while (pos < str.size()) {
str.insert(pos, "\n");
pos += distance + 1;
}
return str;
}
template <typename String, unsigned int line_length>
static std::string encode_with_line_breaks(String s) {
return insert_linebreaks(base64_encode(s, false), line_length);
}
template <typename String>
static std::string encode_pem(String s) {
return encode_with_line_breaks<String, 64>(s);
}
template <typename String>
static std::string encode_mime(String s) {
return encode_with_line_breaks<String, 76>(s);
}
template <typename String>
static std::string encode(String s, bool url) {
return base64_encode(reinterpret_cast<const unsigned char*>(s.data()), s.length(), url);
}
std::string base64_encode(unsigned char const* bytes_to_encode, size_t in_len, bool url) {
size_t len_encoded = (in_len +2) / 3 * 4;
unsigned char trailing_char = url ? '.' : '=';
//
// Choose set of base64 characters. They differ
// for the last two positions, depending on the url
// parameter.
// A bool (as is the parameter url) is guaranteed
// to evaluate to either 0 or 1 in C++ therefore,
// the correct character set is chosen by subscripting
// base64_chars with url.
//
const char* base64_chars_ = base64_chars[url];
std::string ret;
ret.reserve(len_encoded);
unsigned int pos = 0;
while (pos < in_len) {
ret.push_back(base64_chars_[(bytes_to_encode[pos + 0] & 0xfc) >> 2]);
if (pos+1 < in_len) {
ret.push_back(base64_chars_[((bytes_to_encode[pos + 0] & 0x03) << 4) + ((bytes_to_encode[pos + 1] & 0xf0) >> 4)]);
if (pos+2 < in_len) {
ret.push_back(base64_chars_[((bytes_to_encode[pos + 1] & 0x0f) << 2) + ((bytes_to_encode[pos + 2] & 0xc0) >> 6)]);
ret.push_back(base64_chars_[ bytes_to_encode[pos + 2] & 0x3f]);
}
else {
ret.push_back(base64_chars_[(bytes_to_encode[pos + 1] & 0x0f) << 2]);
ret.push_back(trailing_char);
}
}
else {
ret.push_back(base64_chars_[(bytes_to_encode[pos + 0] & 0x03) << 4]);
ret.push_back(trailing_char);
ret.push_back(trailing_char);
}
pos += 3;
}
return ret;
}
template <typename String>
static std::string decode(String encoded_string, bool remove_linebreaks) {
//
// decode(…) is templated so that it can be used with String = const std::string&
// or std::string_view (requires at least C++17)
//
if (encoded_string.empty()) return std::string();
if (remove_linebreaks) {
std::string copy(encoded_string);
copy.erase(std::remove(copy.begin(), copy.end(), '\n'), copy.end());
return base64_decode(copy, false);
}
size_t length_of_string = encoded_string.length();
size_t pos = 0;
//
// The approximate length (bytes) of the decoded string might be one or
// two bytes smaller, depending on the amount of trailing equal signs
// in the encoded string. This approximation is needed to reserve
// enough space in the string to be returned.
//
size_t approx_length_of_decoded_string = length_of_string / 4 * 3;
std::string ret;
ret.reserve(approx_length_of_decoded_string);
while (pos < length_of_string) {
//
// Iterate over encoded input string in chunks. The size of all
// chunks except the last one is 4 bytes.
//
// The last chunk might be padded with equal signs or dots
// in order to make it 4 bytes in size as well, but this
// is not required as per RFC 2045.
//
// All chunks except the last one produce three output bytes.
//
// The last chunk produces at least one and up to three bytes.
//
size_t pos_of_char_1 = pos_of_char(encoded_string[pos+1] );
//
// Emit the first output byte that is produced in each chunk:
//
ret.push_back(static_cast<std::string::value_type>( ( (pos_of_char(encoded_string[pos+0]) ) << 2 ) + ( (pos_of_char_1 & 0x30 ) >> 4)));
if ( ( pos + 2 < length_of_string ) && // Check for data that is not padded with equal signs (which is allowed by RFC 2045)
encoded_string[pos+2] != '=' &&
encoded_string[pos+2] != '.' // accept URL-safe base 64 strings, too, so check for '.' also.
)
{
//
// Emit a chunk's second byte (which might not be produced in the last chunk).
//
unsigned int pos_of_char_2 = pos_of_char(encoded_string[pos+2] );
ret.push_back(static_cast<std::string::value_type>( (( pos_of_char_1 & 0x0f) << 4) + (( pos_of_char_2 & 0x3c) >> 2)));
if ( ( pos + 3 < length_of_string ) &&
encoded_string[pos+3] != '=' &&
encoded_string[pos+3] != '.'
)
{
//
// Emit a chunk's third byte (which might not be produced in the last chunk).
//
ret.push_back(static_cast<std::string::value_type>( ( (pos_of_char_2 & 0x03 ) << 6 ) + pos_of_char(encoded_string[pos+3]) ));
}
}
pos += 4;
}
return ret;
}
std::string base64_decode(std::string const& s, bool remove_linebreaks) {
return decode(s, remove_linebreaks);
}
std::string base64_encode(std::string const& s, bool url) {
return encode(s, url);
}
std::string base64_encode_pem (std::string const& s) {
return encode_pem(s);
}
std::string base64_encode_mime(std::string const& s) {
return encode_mime(s);
}
#if __cplusplus >= 201703L
//
// Interface with std::string_view rather than const std::string&
// Requires C++17
// Provided by Yannic Bonenberger (https://github.com/Yannic)
//
std::string base64_encode(std::string_view s, bool url) {
return encode(s, url);
}
std::string base64_encode_pem(std::string_view s) {
return encode_pem(s);
}
std::string base64_encode_mime(std::string_view s) {
return encode_mime(s);
}
std::string base64_decode(std::string_view s, bool remove_linebreaks) {
return decode(s, remove_linebreaks);
}
#endif // __cplusplus >= 201703L
#endif /* BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A */

View File

@@ -1,7 +0,0 @@
#pragma once
#include "json_parser.h"
#include "json_value.h"
#include "json_object.h"
#include "json_array.h"
#include "json_exception.h"

2342
3rdparty/include/meojson/json.hpp vendored Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,97 +0,0 @@
#pragma once
#include <string>
#include <vector>
#include <initializer_list>
namespace json
{
class value;
class array
{
public:
using raw_array = std::vector<value>;
using iterator = raw_array::iterator;
using const_iterator = raw_array::const_iterator;
using reverse_iterator = raw_array::reverse_iterator;
using const_reverse_iterator = raw_array::const_reverse_iterator;
array() = default;
array(const array& rhs) = default;
array(array&& rhs) noexcept = default;
array(const raw_array& arr);
array(raw_array&& arr) noexcept;
array(std::initializer_list<raw_array::value_type> init_list);
template<typename ArrayType>
array(ArrayType arr) {
static_assert(
std::is_constructible<json::value, typename ArrayType::value_type>::value,
"Parameter can't be used to construct a json::value");
for (auto&& ele : arr) {
_array_data.emplace_back(std::move(ele));
}
}
~array() noexcept = default;
bool empty() const noexcept { return _array_data.empty(); }
size_t size() const noexcept { return _array_data.size(); }
bool exist(size_t pos) const { return _array_data.size() < pos; }
const value& at(size_t pos) const;
const std::string to_string() const;
const std::string format(std::string shift_str = " ", size_t basic_shift_count = 0) const;
const bool get(size_t pos, bool default_value) const;
const int get(size_t pos, int default_value) const;
const long get(size_t pos, long default_value) const;
const unsigned long get(size_t pos, unsigned default_value) const;
const long long get(size_t pos, long long default_value) const;
const unsigned long long get(size_t pos, unsigned long long default_value) const;
const float get(size_t pos, float default_value) const;
const double get(size_t pos, double default_value) const;
const long double get(size_t pos, long double default_value) const;
const std::string get(size_t pos, std::string default_value) const;
const std::string get(size_t pos, const char* default_value) const;
template <typename... Args>
decltype(auto) emplace_back(Args &&... args)
{
static_assert(
std::is_constructible<raw_array::value_type, Args...>::value,
"Parameter can't be used to construct a raw_array::value_type");
return _array_data.emplace_back(std::forward<Args>(args)...);
}
void clear() noexcept;
// void earse(size_t pos);
iterator begin() noexcept;
iterator end() noexcept;
const_iterator begin() const noexcept;
const_iterator end() const noexcept;
const_iterator cbegin() const noexcept;
const_iterator cend() const noexcept;
reverse_iterator rbegin() noexcept;
reverse_iterator rend() noexcept;
const_reverse_iterator rbegin() const noexcept;
const_reverse_iterator rend() const noexcept;
const_reverse_iterator crbegin() const noexcept;
const_reverse_iterator crend() const noexcept;
const value& operator[](size_t pos) const;
value& operator[](size_t pos);
array& operator=(const array&) = default;
array& operator=(array&&) noexcept = default;
// const raw_array &raw_data() const;
private:
raw_array _array_data;
};
std::ostream& operator<<(std::ostream& out, const array& arr);
} // namespace json

View File

@@ -1,97 +0,0 @@
#pragma once
#include <string>
#include "json_value.h"
namespace json
{
static std::string unescape_string(std::string&& str)
{
std::string replace_str;
std::string escape_str = std::move(str);
for (size_t pos = 0; pos < escape_str.size(); ++pos)
{
switch (escape_str[pos]) {
case '\"':
replace_str = R"(\")";
break;
case '\\':
replace_str = R"(\\)";
break;
case '\b':
replace_str = R"(\b)";
break;
case '\f':
replace_str = R"(\f)";
break;
case '\n':
replace_str = R"(\n)";
break;
case '\r':
replace_str = R"(\r)";
break;
case '\t':
replace_str = R"(\t)";
break;
default:
continue;
break;
}
escape_str.replace(pos, 1, replace_str);
++pos;
}
return escape_str;
}
static std::string unescape_string(const std::string& str)
{
return unescape_string(std::string(str));
}
static std::string escape_string(std::string&& str)
{
std::string escape_str = std::move(str);
for (size_t pos = 0; pos + 1 < escape_str.size(); ++pos)
{
if (escape_str[pos] != '\\') {
continue;
}
std::string replace_str;
switch (escape_str[pos + 1]) {
case '"':
replace_str = "\"";
break;
case '\\':
replace_str = "\\";
break;
case 'b':
replace_str = "\b";
break;
case 'f':
replace_str = "\f";
break;
case 'n':
replace_str = "\n";
break;
case 'r':
replace_str = "\r";
break;
case 't':
replace_str = "\t";
break;
default:
return std::string();
break;
}
escape_str.replace(pos, 2, replace_str);
}
return escape_str;
}
static std::string escape_string(const std::string& str)
{
return escape_string(std::string(str));
}
}

View File

@@ -1,27 +0,0 @@
#pragma once
#include <exception>
#include <string>
namespace json
{
class exception : public std::exception
{
public:
exception() = default;
exception(const std::string& msg);
exception(const exception&) = default;
exception& operator=(const exception&) = default;
exception(exception&&) = default;
exception& operator=(exception&&) = default;
virtual ~exception() noexcept override = default;
virtual const char* what() const noexcept override;
private:
std::string m_msg;
};
} // namespace json

View File

@@ -1,88 +0,0 @@
#pragma once
#include <string>
#include <unordered_map>
#include <initializer_list>
#include "json_value.h"
namespace json
{
class object
{
public:
using raw_object = std::unordered_map<std::string, value>;
using iterator = raw_object::iterator;
using const_iterator = raw_object::const_iterator;
object() = default;
object(const object& rhs) = default;
object(object&& rhs) = default;
object(const raw_object& raw_obj);
object(raw_object&& raw_obj);
object(std::initializer_list<raw_object::value_type> init_list);
template<typename MapType>
object(MapType map) {
static_assert(
std::is_constructible<raw_object::value_type, typename MapType::value_type>::value,
"Parameter can't be used to construct a json::object::raw_object::value_type");
for (auto&& ele : map) {
_object_data.emplace(std::move(ele));
}
}
~object() = default;
bool empty() const noexcept { return _object_data.empty(); }
size_t size() const noexcept { return _object_data.size(); }
bool exist(const std::string& key) const { return _object_data.find(key) != _object_data.cend(); }
const value& at(const std::string& key) const;
const std::string to_string() const;
const std::string format(std::string shift_str = " ", size_t basic_shift_count = 0) const;
const bool get(const std::string& key, bool default_value) const;
const int get(const std::string& key, int default_value) const;
const long get(const std::string& key, long default_value) const;
const unsigned long get(const std::string& key, unsigned default_value) const;
const long long get(const std::string& key, long long default_value) const;
const unsigned long long get(const std::string& key, unsigned long long default_value) const;
const float get(const std::string& key, float default_value) const;
const double get(const std::string& key, double default_value) const;
const long double get(const std::string& key, long double default_value) const;
const std::string get(const std::string& key, std::string default_value) const;
const std::string get(const std::string& key, const char* default_value) const;
template <typename... Args>
decltype(auto) emplace(Args &&... args)
{
static_assert(
std::is_constructible<raw_object::value_type, Args...>::value,
"Parameter can't be used to construct a raw_object::value_type");
return _object_data.emplace(std::forward<Args>(args)...);
}
void clear() noexcept;
bool earse(const std::string& key);
iterator begin() noexcept;
iterator end() noexcept;
const_iterator begin() const noexcept;
const_iterator end() const noexcept;
const_iterator cbegin() const noexcept;
const_iterator cend() const noexcept;
value& operator[](const std::string& key);
value& operator[](std::string&& key);
object& operator=(const object&) = default;
object& operator=(object&&) = default;
// const raw_object &raw_data() const;
private:
raw_object _object_data;
};
std::ostream& operator<<(std::ostream& out, const json::object& obj);
} // namespace json

View File

@@ -1,50 +0,0 @@
#pragma once
#include <string>
#include <optional>
namespace json
{
class value;
class object;
class array;
enum class value_type : char;
class parser
{
public:
~parser() noexcept = default;
static std::optional<value> parse(const std::string& content);
private:
parser(
const std::string::const_iterator& cbegin,
const std::string::const_iterator& cend) noexcept
: _cur(cbegin), _end(cend) {}
std::optional<value> parse();
value parse_value();
value parse_null();
value parse_boolean();
value parse_number();
// parse and return a json::value whose type is value_type::String
value parse_string();
value parse_array();
value parse_object();
// parse and return a std::string
std::optional<std::string> parse_stdstring();
bool skip_whitespace() noexcept;
bool skip_digit() noexcept;
private:
std::string::const_iterator _cur;
std::string::const_iterator _end;
};
std::optional<value> parse(const std::string& content);
} // namespace json

View File

@@ -1,160 +0,0 @@
#pragma once
#include <string>
#include <ostream>
// #include <iostream>
#include <memory>
namespace json
{
enum class value_type : char
{
Invalid,
Null,
Boolean,
String,
Number,
Array,
Object,
NUM_T
};
class array;
class object;
class value
{
using unique_array = std::unique_ptr<array>;
using unique_object = std::unique_ptr<object>;
public:
value();
value(const value& rhs);
value(value&& rhs) noexcept;
value(bool b);
value(int num);
value(unsigned num);
value(long num);
value(unsigned long num);
value(long long num);
value(unsigned long long num);
value(float num);
value(double num);
value(long double num);
value(const char* str);
value(const std::string& str);
value(std::string&& str);
value(const array& arr);
value(array&& arr);
// value(std::initializer_list<value> init_list); // for array
value(const object& obj);
value(object&& obj);
// error: conversion from <brace-enclosed initializer list> to json::value is ambiguous
// value(std::initializer_list<std::pair<std::string, value>> init_list); // for object
// Constructed from raw data
template <typename... Args>
value(value_type type, Args &&...args)
: _type(type),
_raw_data(std::forward<Args>(args)...)
{
static_assert(
std::is_constructible<std::string, Args...>::value,
"Parameter can't be used to construct a std::string");
}
// Prohibit conversion of other types to value
template <typename T>
value(T) = delete;
~value();
bool valid() const noexcept { return _type != value_type::Invalid ? true : false; }
bool empty() const noexcept { return (_type == value_type::Null && _raw_data.compare("null") == 0) ? true : false; }
bool is_null() const noexcept { return empty(); }
bool is_number() const noexcept { return _type == value_type::Number; }
bool is_boolean() const noexcept { return _type == value_type::Boolean; }
bool is_string() const noexcept { return _type == value_type::String; }
bool is_array() const noexcept { return _type == value_type::Array; }
bool is_object() const noexcept { return _type == value_type::Object; }
bool exist(const std::string& key) const;
bool exist(size_t pos) const;
value_type type() const noexcept { return _type; }
const value& at(size_t pos) const;
const value& at(const std::string& key) const;
template <typename Type>
decltype(auto) get(const std::string& key, Type default_value) const
{
return is_object() ? as_object().get(key, default_value) : default_value;
}
template <typename Type>
decltype(auto) get(size_t pos, Type default_value) const
{
return is_array() ? as_array().get(pos, default_value) : default_value;
}
const bool as_boolean() const;
const int as_integer() const;
// const unsigned as_unsigned() const;
const long as_long() const;
const unsigned long as_unsigned_long() const;
const long long as_long_long() const;
const unsigned long long as_unsigned_long_long() const;
const float as_float() const;
const double as_double() const;
const long double as_long_double() const;
const std::string as_string() const;
const array& as_array() const;
const object& as_object() const;
array& as_array();
object& as_object();
// return raw string
const std::string to_string() const;
const std::string format(std::string shift_str = " ", size_t basic_shift_count = 0) const;
value& operator=(const value& rhs);
value& operator=(value&&) noexcept;
const value& operator[](size_t pos) const;
value& operator[](size_t pos);
value& operator[](const std::string& key);
value& operator[](std::string&& key);
//explicit operator bool() const noexcept { return valid(); }
explicit operator bool() const { return as_boolean(); }
explicit operator int() const { return as_integer(); }
explicit operator long() const { return as_long(); }
explicit operator unsigned long() const { return as_unsigned_long(); }
explicit operator long long() const { return as_long_long(); }
explicit operator unsigned long long() const { return as_unsigned_long_long(); }
explicit operator float() const { return as_float(); }
explicit operator double() const { return as_double(); }
explicit operator long double() const { return as_long_double(); }
explicit operator std::string() const { return as_string(); }
private:
template <typename T>
static std::unique_ptr<T> copy_unique_ptr(const std::unique_ptr<T>& t)
{
return t == nullptr ? nullptr : std::make_unique<T>(*t);
}
value_type _type = value_type::Null;
std::string _raw_data = "null"; // If the value_type is Object or Array, the _raw_data will be a empty string.
unique_array _array_ptr;
unique_object _object_ptr;
};
const value invalid_value();
std::ostream& operator<<(std::ostream& out, const value& val);
// std::istream &operator>>(std::istream &in, value &val);
} // namespace json

View File

@@ -1,19 +0,0 @@
#pragma once
#include "port.h"
typedef unsigned char uint8_t;
#ifdef __cplusplus
extern "C" {
#endif
PENGUINAPI_PORT const char* PENGUIN_CALL get_info();
void PENGUINAPI load_server(const char* server);
void PENGUINAPI load_json(const char* stage_index, const char* hash_index);
void PENGUINAPI load_templ(const char* itemId, const uint8_t* buffer, size_t size);
PENGUINAPI_PORT const char* PENGUIN_CALL recognize(const uint8_t* buffer, size_t size);
#ifdef __cplusplus
}
#endif

View File

@@ -1,37 +0,0 @@
#pragma once
// The way how the function is called
#if !defined(PENGUIN_CALL)
#if defined(_WIN32)
#define PENGUIN_CALL __stdcall
#else
#define PENGUIN_CALL
#endif /* _WIN32 */
#endif /* PENGUIN_CALL */
// The function exported symbols
#if defined _WIN32 || defined __CYGWIN__
#define PENGUIN_DLL_IMPORT __declspec(dllimport)
#define PENGUIN_DLL_EXPORT __declspec(dllexport)
#define PENGUIN_DLL_LOCAL
#else
#if __GNUC__ >= 4
#define PENGUIN_DLL_IMPORT __attribute__ ((visibility ("default")))
#define PENGUIN_DLL_EXPORT __attribute__ ((visibility ("default")))
#define PENGUIN_DLL_LOCAL __attribute__ ((visibility ("hidden")))
#else
#define PENGUIN_DLL_IMPORT
#define PENGUIN_DLL_EXPORT
#define PENGUIN_DLL_LOCAL
#endif
#endif
#ifdef PENGUIN_DLL_EXPORTS // defined if we are building the DLL (instead of using it)
#define PENGUINAPI_PORT PENGUIN_DLL_EXPORT
#else
#define PENGUINAPI_PORT PENGUIN_DLL_IMPORT
#endif // PENGUIN_DLL_EXPORTS
#define PENGUINAPI PENGUINAPI_PORT PENGUIN_CALL
#define PENGUINLOCAL PENGUIN_DLL_LOCAL PENGUIN_CALL

5
3rdparty/include/zlib/config.hpp vendored Normal file
View File

@@ -0,0 +1,5 @@
#pragma once
#ifndef ZLIB_CONST
#define ZLIB_CONST
#endif

99
3rdparty/include/zlib/decompress.hpp vendored Normal file
View File

@@ -0,0 +1,99 @@
#include "config.hpp"
// std
#include <limits>
#include <stdexcept>
#include <string>
namespace gzip
{
// zlib
#include "zlib.h"
class Decompressor
{
std::size_t max_;
public:
Decompressor(std::size_t max_bytes = 1000000000) // by default refuse operation if compressed data is > 1GB
: max_(max_bytes)
{}
template <typename OutputType>
void decompress(OutputType& output,
const uchar* data,
std::size_t size) const
{
z_stream inflate_s;
inflate_s.zalloc = Z_NULL;
inflate_s.zfree = Z_NULL;
inflate_s.opaque = Z_NULL;
inflate_s.avail_in = 0;
inflate_s.next_in = Z_NULL;
// The windowBits parameter is the base two logarithm of the window size (the size of the history buffer).
// It should be in the range 8..15 for this version of the library.
// Larger values of this parameter result in better compression at the expense of memory usage.
// This range of values also changes the decoding type:
// -8 to -15 for raw deflate
// 8 to 15 for zlib
// (8 to 15) + 16 for gzip
// (8 to 15) + 32 to automatically detect gzip/zlib header
constexpr int window_bits = 15 + 32; // auto with windowbits of 15
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
if (inflateInit2(&inflate_s, window_bits) != Z_OK) {
throw std::runtime_error("inflate init failed");
}
#pragma GCC diagnostic pop
inflate_s.next_in = reinterpret_cast<z_const Bytef*>(data);
#ifdef DEBUG
// Verify if size (long type) input will fit into unsigned int, type used for zlib's avail_in
std::uint64_t size_64 = size * 2;
if (size_64 > std::numeric_limits<unsigned int>::max()) {
inflateEnd(&inflate_s);
throw std::runtime_error("size arg is too large to fit into unsigned int type x2");
}
#endif
if (size > max_ || (size * 2) > max_) {
inflateEnd(&inflate_s);
throw std::runtime_error("size may use more memory than intended when decompressing");
}
inflate_s.avail_in = static_cast<unsigned int>(size);
std::size_t size_uncompressed = 0;
do {
std::size_t resize_to = size_uncompressed + 2 * size;
if (resize_to > max_) {
inflateEnd(&inflate_s);
throw std::runtime_error("size of output string will use more memory then intended when decompressing");
}
output.resize(resize_to);
inflate_s.avail_out = static_cast<unsigned int>(2 * size);
inflate_s.next_out = reinterpret_cast<Bytef*>(&output[0] + size_uncompressed);
int ret = inflate(&inflate_s, Z_FINISH);
if (ret != Z_STREAM_END && ret != Z_OK && ret != Z_BUF_ERROR) {
std::string error_msg = inflate_s.msg;
inflateEnd(&inflate_s);
//throw std::runtime_error(error_msg);
output.clear();
return;
}
size_uncompressed += (2 * size - inflate_s.avail_out);
} while (inflate_s.avail_out == 0);
inflateEnd(&inflate_s);
output.resize(size_uncompressed);
}
};
inline std::vector<uchar> decompress(const uchar* data, std::size_t size)
{
Decompressor decomp;
std::vector<uchar> output;
decomp.decompress(output, data, size);
return output;
}
} // namespace gzip

536
3rdparty/include/zlib/zconf.h vendored Normal file
View File

@@ -0,0 +1,536 @@
/* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
/* @(#) $Id$ */
#ifndef ZCONF_H
#define ZCONF_H
/* #undef Z_PREFIX */
/* #undef Z_HAVE_UNISTD_H */
/*
* If you *really* need a unique prefix for all types and library functions,
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
* Even better than compiling with -DZ_PREFIX would be to use configure to set
* this permanently in zconf.h using "./configure --zprefix".
*/
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
# define Z_PREFIX_SET
/* all linked symbols and init macros */
# define _dist_code z__dist_code
# define _length_code z__length_code
# define _tr_align z__tr_align
# define _tr_flush_bits z__tr_flush_bits
# define _tr_flush_block z__tr_flush_block
# define _tr_init z__tr_init
# define _tr_stored_block z__tr_stored_block
# define _tr_tally z__tr_tally
# define adler32 z_adler32
# define adler32_combine z_adler32_combine
# define adler32_combine64 z_adler32_combine64
# define adler32_z z_adler32_z
# ifndef Z_SOLO
# define compress z_compress
# define compress2 z_compress2
# define compressBound z_compressBound
# endif
# define crc32 z_crc32
# define crc32_combine z_crc32_combine
# define crc32_combine64 z_crc32_combine64
# define crc32_z z_crc32_z
# define deflate z_deflate
# define deflateBound z_deflateBound
# define deflateCopy z_deflateCopy
# define deflateEnd z_deflateEnd
# define deflateGetDictionary z_deflateGetDictionary
# define deflateInit z_deflateInit
# define deflateInit2 z_deflateInit2
# define deflateInit2_ z_deflateInit2_
# define deflateInit_ z_deflateInit_
# define deflateParams z_deflateParams
# define deflatePending z_deflatePending
# define deflatePrime z_deflatePrime
# define deflateReset z_deflateReset
# define deflateResetKeep z_deflateResetKeep
# define deflateSetDictionary z_deflateSetDictionary
# define deflateSetHeader z_deflateSetHeader
# define deflateTune z_deflateTune
# define deflate_copyright z_deflate_copyright
# define get_crc_table z_get_crc_table
# ifndef Z_SOLO
# define gz_error z_gz_error
# define gz_intmax z_gz_intmax
# define gz_strwinerror z_gz_strwinerror
# define gzbuffer z_gzbuffer
# define gzclearerr z_gzclearerr
# define gzclose z_gzclose
# define gzclose_r z_gzclose_r
# define gzclose_w z_gzclose_w
# define gzdirect z_gzdirect
# define gzdopen z_gzdopen
# define gzeof z_gzeof
# define gzerror z_gzerror
# define gzflush z_gzflush
# define gzfread z_gzfread
# define gzfwrite z_gzfwrite
# define gzgetc z_gzgetc
# define gzgetc_ z_gzgetc_
# define gzgets z_gzgets
# define gzoffset z_gzoffset
# define gzoffset64 z_gzoffset64
# define gzopen z_gzopen
# define gzopen64 z_gzopen64
# ifdef _WIN32
# define gzopen_w z_gzopen_w
# endif
# define gzprintf z_gzprintf
# define gzputc z_gzputc
# define gzputs z_gzputs
# define gzread z_gzread
# define gzrewind z_gzrewind
# define gzseek z_gzseek
# define gzseek64 z_gzseek64
# define gzsetparams z_gzsetparams
# define gztell z_gztell
# define gztell64 z_gztell64
# define gzungetc z_gzungetc
# define gzvprintf z_gzvprintf
# define gzwrite z_gzwrite
# endif
# define inflate z_inflate
# define inflateBack z_inflateBack
# define inflateBackEnd z_inflateBackEnd
# define inflateBackInit z_inflateBackInit
# define inflateBackInit_ z_inflateBackInit_
# define inflateCodesUsed z_inflateCodesUsed
# define inflateCopy z_inflateCopy
# define inflateEnd z_inflateEnd
# define inflateGetDictionary z_inflateGetDictionary
# define inflateGetHeader z_inflateGetHeader
# define inflateInit z_inflateInit
# define inflateInit2 z_inflateInit2
# define inflateInit2_ z_inflateInit2_
# define inflateInit_ z_inflateInit_
# define inflateMark z_inflateMark
# define inflatePrime z_inflatePrime
# define inflateReset z_inflateReset
# define inflateReset2 z_inflateReset2
# define inflateResetKeep z_inflateResetKeep
# define inflateSetDictionary z_inflateSetDictionary
# define inflateSync z_inflateSync
# define inflateSyncPoint z_inflateSyncPoint
# define inflateUndermine z_inflateUndermine
# define inflateValidate z_inflateValidate
# define inflate_copyright z_inflate_copyright
# define inflate_fast z_inflate_fast
# define inflate_table z_inflate_table
# ifndef Z_SOLO
# define uncompress z_uncompress
# define uncompress2 z_uncompress2
# endif
# define zError z_zError
# ifndef Z_SOLO
# define zcalloc z_zcalloc
# define zcfree z_zcfree
# endif
# define zlibCompileFlags z_zlibCompileFlags
# define zlibVersion z_zlibVersion
/* all zlib typedefs in zlib.h and zconf.h */
# define Byte z_Byte
# define Bytef z_Bytef
# define alloc_func z_alloc_func
# define charf z_charf
# define free_func z_free_func
# ifndef Z_SOLO
# define gzFile z_gzFile
# endif
# define gz_header z_gz_header
# define gz_headerp z_gz_headerp
# define in_func z_in_func
# define intf z_intf
# define out_func z_out_func
# define uInt z_uInt
# define uIntf z_uIntf
# define uLong z_uLong
# define uLongf z_uLongf
# define voidp z_voidp
# define voidpc z_voidpc
# define voidpf z_voidpf
/* all zlib structs in zlib.h and zconf.h */
# define gz_header_s z_gz_header_s
# define internal_state z_internal_state
#endif
#if defined(__MSDOS__) && !defined(MSDOS)
# define MSDOS
#endif
#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
# define OS2
#endif
#if defined(_WINDOWS) && !defined(WINDOWS)
# define WINDOWS
#endif
#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
# ifndef WIN32
# define WIN32
# endif
#endif
#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
# ifndef SYS16BIT
# define SYS16BIT
# endif
# endif
#endif
/*
* Compile with -DMAXSEG_64K if the alloc function cannot allocate more
* than 64k bytes at a time (needed on systems with 16-bit int).
*/
#ifdef SYS16BIT
# define MAXSEG_64K
#endif
#ifdef MSDOS
# define UNALIGNED_OK
#endif
#ifdef __STDC_VERSION__
# ifndef STDC
# define STDC
# endif
# if __STDC_VERSION__ >= 199901L
# ifndef STDC99
# define STDC99
# endif
# endif
#endif
#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
# define STDC
#endif
#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
# define STDC
#endif
#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
# define STDC
#endif
#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
# define STDC
#endif
#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
# define STDC
#endif
#ifndef STDC
# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
# define const /* note: need a more gentle solution here */
# endif
#endif
#if defined(ZLIB_CONST) && !defined(z_const)
# define z_const const
#else
# define z_const
#endif
#ifdef Z_SOLO
typedef unsigned long z_size_t;
#else
# define z_longlong long long
# if defined(NO_SIZE_T)
typedef unsigned NO_SIZE_T z_size_t;
# elif defined(STDC)
# include <stddef.h>
typedef size_t z_size_t;
# else
typedef unsigned long z_size_t;
# endif
# undef z_longlong
#endif
/* Maximum value for memLevel in deflateInit2 */
#ifndef MAX_MEM_LEVEL
# ifdef MAXSEG_64K
# define MAX_MEM_LEVEL 8
# else
# define MAX_MEM_LEVEL 9
# endif
#endif
/* Maximum value for windowBits in deflateInit2 and inflateInit2.
* WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
* created by gzip. (Files created by minigzip can still be extracted by
* gzip.)
*/
#ifndef MAX_WBITS
# define MAX_WBITS 15 /* 32K LZ77 window */
#endif
/* The memory requirements for deflate are (in bytes):
(1 << (windowBits+2)) + (1 << (memLevel+9))
that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
plus a few kilobytes for small objects. For example, if you want to reduce
the default memory requirements from 256K to 128K, compile with
make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
Of course this will generally degrade compression (there's no free lunch).
The memory requirements for inflate are (in bytes) 1 << windowBits
that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
for small objects.
*/
/* Type declarations */
#ifndef OF /* function prototypes */
# ifdef STDC
# define OF(args) args
# else
# define OF(args) ()
# endif
#endif
#ifndef Z_ARG /* function prototypes for stdarg */
# if defined(STDC) || defined(Z_HAVE_STDARG_H)
# define Z_ARG(args) args
# else
# define Z_ARG(args) ()
# endif
#endif
/* The following definitions for FAR are needed only for MSDOS mixed
* model programming (small or medium model with some far allocations).
* This was tested only with MSC; for other MSDOS compilers you may have
* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
* just define FAR to be empty.
*/
#ifdef SYS16BIT
# if defined(M_I86SM) || defined(M_I86MM)
/* MSC small or medium model */
# define SMALL_MEDIUM
# ifdef _MSC_VER
# define FAR _far
# else
# define FAR far
# endif
# endif
# if (defined(__SMALL__) || defined(__MEDIUM__))
/* Turbo C small or medium model */
# define SMALL_MEDIUM
# ifdef __BORLANDC__
# define FAR _far
# else
# define FAR far
# endif
# endif
#endif
#if defined(WINDOWS) || defined(WIN32)
/* If building or using zlib as a DLL, define ZLIB_DLL.
* This is not mandatory, but it offers a little performance increase.
*/
# ifdef ZLIB_DLL
# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
# ifdef ZLIB_INTERNAL
# define ZEXTERN extern __declspec(dllexport)
# else
# define ZEXTERN extern __declspec(dllimport)
# endif
# endif
# endif /* ZLIB_DLL */
/* If building or using zlib with the WINAPI/WINAPIV calling convention,
* define ZLIB_WINAPI.
* Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
*/
# ifdef ZLIB_WINAPI
# ifdef FAR
# undef FAR
# endif
# include <windows.h>
/* No need for _export, use ZLIB.DEF instead. */
/* For complete Windows compatibility, use WINAPI, not __stdcall. */
# define ZEXPORT WINAPI
# ifdef WIN32
# define ZEXPORTVA WINAPIV
# else
# define ZEXPORTVA FAR CDECL
# endif
# endif
#endif
#if defined (__BEOS__)
# ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL
# define ZEXPORT __declspec(dllexport)
# define ZEXPORTVA __declspec(dllexport)
# else
# define ZEXPORT __declspec(dllimport)
# define ZEXPORTVA __declspec(dllimport)
# endif
# endif
#endif
#ifndef ZEXTERN
# define ZEXTERN extern
#endif
#ifndef ZEXPORT
# define ZEXPORT
#endif
#ifndef ZEXPORTVA
# define ZEXPORTVA
#endif
#ifndef FAR
# define FAR
#endif
#if !defined(__MACTYPES__)
typedef unsigned char Byte; /* 8 bits */
#endif
typedef unsigned int uInt; /* 16 bits or more */
typedef unsigned long uLong; /* 32 bits or more */
#ifdef SMALL_MEDIUM
/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
# define Bytef Byte FAR
#else
typedef Byte FAR Bytef;
#endif
typedef char FAR charf;
typedef int FAR intf;
typedef uInt FAR uIntf;
typedef uLong FAR uLongf;
#ifdef STDC
typedef void const *voidpc;
typedef void FAR *voidpf;
typedef void *voidp;
#else
typedef Byte const *voidpc;
typedef Byte FAR *voidpf;
typedef Byte *voidp;
#endif
#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
# include <limits.h>
# if (UINT_MAX == 0xffffffffUL)
# define Z_U4 unsigned
# elif (ULONG_MAX == 0xffffffffUL)
# define Z_U4 unsigned long
# elif (USHRT_MAX == 0xffffffffUL)
# define Z_U4 unsigned short
# endif
#endif
#ifdef Z_U4
typedef Z_U4 z_crc_t;
#else
typedef unsigned long z_crc_t;
#endif
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H
#endif
#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
# define Z_HAVE_STDARG_H
#endif
#ifdef STDC
# ifndef Z_SOLO
# include <sys/types.h> /* for off_t */
# endif
#endif
#if defined(STDC) || defined(Z_HAVE_STDARG_H)
# ifndef Z_SOLO
# include <stdarg.h> /* for va_list */
# endif
#endif
#ifdef _WIN32
# ifndef Z_SOLO
# include <stddef.h> /* for wchar_t */
# endif
#endif
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
* though the former does not conform to the LFS document), but considering
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
* equivalently requesting no 64-bit operations
*/
#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
# undef _LARGEFILE64_SOURCE
#endif
#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
# define Z_HAVE_UNISTD_H
#endif
#ifndef Z_SOLO
# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
# ifdef VMS
# include <unixio.h> /* for off_t */
# endif
# ifndef z_off_t
# define z_off_t off_t
# endif
# endif
#endif
#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
# define Z_LFS64
#endif
#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
# define Z_LARGE64
#endif
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
# define Z_WANT64
#endif
#if !defined(SEEK_SET) && !defined(Z_SOLO)
# define SEEK_SET 0 /* Seek from beginning of file. */
# define SEEK_CUR 1 /* Seek from current position. */
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
#endif
#ifndef z_off_t
# define z_off_t long
#endif
#if !defined(_WIN32) && defined(Z_LARGE64)
# define z_off64_t off64_t
#else
# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
# define z_off64_t __int64
# else
# define z_off64_t z_off_t
# endif
#endif
/* MVS linker does not support external names larger than 8 bytes */
#if defined(__MVS__)
#pragma map(deflateInit_,"DEIN")
#pragma map(deflateInit2_,"DEIN2")
#pragma map(deflateEnd,"DEEND")
#pragma map(deflateBound,"DEBND")
#pragma map(inflateInit_,"ININ")
#pragma map(inflateInit2_,"ININ2")
#pragma map(inflateEnd,"INEND")
#pragma map(inflateSync,"INSY")
#pragma map(inflateSetDictionary,"INSEDI")
#pragma map(compressBound,"CMBND")
#pragma map(inflate_table,"INTABL")
#pragma map(inflate_fast,"INFA")
#pragma map(inflate_copyright,"INCOPY")
#endif
#endif /* ZCONF_H */

1912
3rdparty/include/zlib/zlib.h vendored Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

BIN
3rdparty/lib/ppocr.lib vendored

Binary file not shown.

BIN
3rdparty/lib/zlibstatic.lib vendored Normal file

Binary file not shown.

BIN
3rdparty/ppocr_noavx.zip vendored Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@@ -0,0 +1 @@
ch_PP-OCRv2_det_infer

Binary file not shown.

View File

@@ -0,0 +1 @@
ch_ppocr_mobile_v2.0_rec_slim_infer

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Some files were not shown because too many files have changed in this diff Show More