Compare commits

..

4139 Commits

Author SHA1 Message Date
MistEO
9f0723fb8d Merge pull request #3144 from MaaAssistantArknights/dev
Release v4.8.2-beta.1
2022-12-21 23:17:51 +08:00
MistEO
8603f66cc4 docs: update changelog 2022-12-21 23:17:28 +08:00
MistEO
5fdf49bebf Merge pull request #3146 from vonnoq/dev
錯字導致基建不會收赤金經驗
2022-12-21 23:16:31 +08:00
MistEO
3d82d9240b docs: update changelog 2022-12-21 23:15:51 +08:00
vonnoq
081372922e 錯字 基建無法收赤金經驗
"可收獲" -> "可收穫"
2022-12-21 23:04:26 +08:00
MistEO
0e11ad297a fix: try to fix the stuck of Auto I.S. 2022-12-21 23:03:13 +08:00
MistEO
cd11eb06a0 fix: 修复minitouch重连时可能存在的问题 2022-12-21 22:58:02 +08:00
MistEO
2b56e0c87c fix: 修复没有curl时上传任务一直卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3096
2022-12-21 22:36:10 +08:00
MistEO
bf4c9564c6 docs: update docs 2022-12-21 22:30:24 +08:00
MistEO
cc58080238 chore: 添加点注释 2022-12-21 22:30:23 +08:00
uye
9fba862176 docs: 2.4-外服适配教程 -> 2.5-外服适配教程 2022-12-21 22:00:28 +08:00
MistEO
7609706115 fix: build error on linux, and perf json parsing of Tile 2022-12-21 21:36:06 +08:00
uye
b9b1fe9b2d feat: 添加刷信用干员 2022-12-21 19:28:16 +08:00
MistEO
8e15e559b7 feat: 拆分levels.json文件 2022-12-21 18:34:43 +08:00
MistEO
63d33bc303 chore: 更新macui repo 2022-12-21 18:04:08 +08:00
MistEO
9c2433cf6b chore: 将资源统一移动至 resource 文件夹 2022-12-21 18:00:15 +08:00
MistEO
3408b51a2b fix: 再次尝试删除CN OCR Replacement 2022-12-21 16:14:31 +08:00
MistEO
774e2c928e perf: 更新fastdeploy库,修复精度下降问题。更新12/18重新训练的新CN rec模型
https://github.com/PaddlePaddle/FastDeploy/issues/782#issuecomment-1360968825
2aea7da973
2022-12-21 16:08:24 +08:00
uye
c4101c8a25 feat: 支持EN服开始唤醒功能/Support EN client login function 2022-12-21 13:08:39 +08:00
uye
1b85111181 Merge pull request #3139 from Pitiedwzr/dev
feat: 补全EN服缺少的截图&修改部分基建截图
2022-12-21 11:08:19 +08:00
Pitiedwzr
0d55ca947c feat: 补全EN服截图&修改部分基建截图
已知还差一张ContactSuspended.png 不知道触发条件是什么 暂时跳过
2022-12-21 14:03:29 +13:00
uye
b37506b58a fix: 修复关卡关闭后导航的问题
fix #3117
2022-12-20 16:48:01 +08:00
uye
b577126eaf fix: 修复关卡关闭后导航的问题
fix #3117
2022-12-20 16:42:33 +08:00
uye
7c529f280f docs: 修改外服适配文档 2022-12-20 15:09:10 +08:00
MistEO
44cd2f4c2c Merge pull request #3125 from WLLEGit/dev
feat: MaaCore添加肉鸽助战支持
2022-12-20 14:09:10 +08:00
MistEO
38292c7e5d Merge pull request #3132 from Pitiedwzr/dev
feat: 添加EN服基建截图 Add EN client Base photo
2022-12-20 13:57:06 +08:00
Pitiedwzr
49f0a5b293 添加EN服基建截图 2022-12-20 17:49:09 +13:00
wangli
6e07b889a4 change specificRect to specialParmas
完善外语继承文档的肉鸽助战参数

task.json 助战swipe继承base_task

助战相关结构体添加初始值

修改变量定义语法风格

修改Return task为封装函数

更改精英化图标识别阈值,合并识别task模板
2022-12-20 11:44:55 +08:00
CallMeChin
7222770923 修改了一下英文文档 (#3126)
* Update 2.4-Oversea Service Adaptation.md

根据华文的文档改了一些错误。但是可能还有其他错误。

* Update 2.4-Oversea Service Adaptation.md

* Update 2.4-Oversea Service Adaptation.md

* Update 2.4-Oversea Service Adaptation.md
2022-12-20 10:15:12 +08:00
uye
f90d9f7618 docs: 调整外服适配教程位置 2022-12-19 23:33:29 +08:00
uye
434dde999b docs: 外服适配教程(我们需要更多的电!) 2022-12-19 22:54:33 +08:00
uye
ae2e02afb5 docs: 更新3.4-任务流程协议 2022-12-19 22:16:10 +08:00
wangli
32d4779a40 feat: MaaCore添加肉鸽助战支持 2022-12-19 20:45:59 +08:00
MistEO
24301299e4 Merge branch 'master' into dev 2022-12-19 17:44:26 +08:00
MistEO
026f87ef23 docs: 删除一些冗余的文档内容 2022-12-19 17:44:23 +08:00
WWPXX
fa02636706 新增多个补充说明 (#3111)
* Update 1.2-常见问题.md

新增问题解决办法

* Update 1.2-常见问题.md

新增杀毒软件误查杀解决方案

* Update 1.2-常见问题.md

新增被杀毒软件拦截误报错解决方案

* Update 1.2-常见问题.md

新增被杀毒软件拦截报错解决方案

* Update 1.1-详细介绍.md

新增信用购物

* Update 1.1-详细介绍.md

新增帮助

* Update 1.1-详细介绍.md

新增关于助战信用等说明 修正格式

* Update 1.2-常见问题.md

新增杀毒软件问题 修正格式

* Update 1.3-模拟器支持.md

新增提示替换ADB

* Update 1.1-详细介绍.md

* Update 1.2-常见问题.md

* Update 1.3-模拟器支持.md
2022-12-19 17:44:23 +08:00
MistEO
59cb532035 docs: 删除一些冗余的文档内容 2022-12-19 17:43:58 +08:00
uye
19ee07fd66 feat: 更新截图工具 2022-12-19 17:19:21 +08:00
yueshen
c9fa2dcd83 feat:基建作业更新 (#3121)
* 更新243极限4班

* 更新153极限3班

* 更新252满血基建3班

* 更新333长期搓玉3班

* 更新243极限4班

* 更新153极限3班

* 更新243极限4班
2022-12-19 16:16:38 +08:00
yueshen
c4b91f0433 feat:基建作业更新 (#3106)
* 更新243极限4班

* 更新153极限3班

* 更新252满血基建3班

* 更新333长期搓玉3班

* 更新243极限4班

* 更新153极限3班
2022-12-19 11:25:19 +08:00
WWPXX
5eba3c989e 新增多个补充说明 (#3111)
* Update 1.2-常见问题.md

新增问题解决办法

* Update 1.2-常见问题.md

新增杀毒软件误查杀解决方案

* Update 1.2-常见问题.md

新增被杀毒软件拦截误报错解决方案

* Update 1.2-常见问题.md

新增被杀毒软件拦截报错解决方案

* Update 1.1-详细介绍.md

新增信用购物

* Update 1.1-详细介绍.md

新增帮助

* Update 1.1-详细介绍.md

新增关于助战信用等说明 修正格式

* Update 1.2-常见问题.md

新增杀毒软件问题 修正格式

* Update 1.3-模拟器支持.md

新增提示替换ADB

* Update 1.1-详细介绍.md

* Update 1.2-常见问题.md

* Update 1.3-模拟器支持.md
2022-12-19 10:52:16 +08:00
Horror Proton
f88de850a1 chore: update action trigger 2022-12-19 10:28:15 +08:00
uye
315bc32a66 feat: 添加YJ历时间转换 2022-12-19 02:09:43 +08:00
uye
334fb94505 feat: 借助战一日只执行一次 2022-12-19 01:28:49 +08:00
MistEO
35cb2c39ce Merge pull request #3099 from popjdh/dev
fix pr#3086 && 添加Python环境变量设置流程
2022-12-18 00:39:48 +08:00
trance233
54d2adc2c5 Update asst.py
修改环境变量设置流程, 避免空环境变量问题
2022-12-17 21:25:05 +08:00
trance233
347ef7f014 Update asst.py
修正枚举类使用错误, 删除部分冗余代码
2022-12-17 16:53:44 +08:00
trance233
c012e6201e Update asst.py
修正Python枚举类型使用错误
2022-12-17 16:47:40 +08:00
uye
ef3ee1194b fix: 修复选择关卡日志输出错误 2022-12-17 16:03:33 +08:00
MistEO
0451d1958f Merge pull request #3086 from popjdh/dev
修改截图命令 && 添加Python额外配置(触控, 暂停下干员等)接口
2022-12-17 13:54:43 +08:00
popjdh
006beb88f0 修改Python额外配置接口命名 2022-12-17 13:27:27 +08:00
MistEO
3c958f6639 Merge pull request #3090 from fearlessxjdx/dev
fix: 宿舍内sort和autofill同为true时的选人bug #2693
2022-12-17 13:13:00 +08:00
popjdh
4539342098 Python触控配置接口解耦, 增加使用例 2022-12-17 12:28:01 +08:00
popjdh
c1c0c14fde 完善Python触控配置接口 2022-12-17 12:04:49 +08:00
popjdh
2685c40d17 添加Python触控配置接口 2022-12-17 11:50:05 +08:00
popjdh
2634acd8d2 修正adb exec-out参数, 防止重定向符不生效 2022-12-17 11:41:18 +08:00
xjdx
956cf5778e fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2693 2022-12-16 23:52:16 +08:00
popjdh
e001326987 删除截图命令冗余操作 2022-12-16 20:52:37 +08:00
popjdh
24ab5410b3 Revert "删除截图命令冗余操作"
This reverts commit 9341f6b3d3.
2022-12-16 20:52:10 +08:00
popjdh
9341f6b3d3 删除截图命令冗余操作 2022-12-16 20:18:01 +08:00
popjdh
2e8218d5c1 添加屏蔽错误输出的连接配置类型 2022-12-16 19:36:46 +08:00
popjdh
00c5e4eb1a Revert "修改截图命令"
This reverts commit 8dfaa3a35a.
2022-12-16 19:17:39 +08:00
trance233
8dfaa3a35a 修改截图命令
丢弃截图命令的stderr. 如Amd显卡+Waydroid时, screencap会先输出一行报错, 再输出图片信息, 通过丢弃stderr让adb exec-out能得到仅图片信息, 防止MAA解码失败.
2022-12-16 16:53:46 +08:00
MistEO
c408fe622b Merge pull request #3079 from hguandl/osx/multiple-builds
macOS: 分别编译 x86_64 和 arm64 应用
2022-12-16 11:51:07 +08:00
Hao Guan
80748a7c91 ci: macOS builds 2022-12-16 04:36:18 +10:00
Hao Guan
d0d864df3c cmake: update MaaCore rules for macOS 2022-12-16 03:27:52 +10:00
Hao Guan
0e240ff050 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-12-16 03:14:26 +10:00
Hao Guan
e8aaca422a cmake: macOS architectures 2022-12-16 03:12:22 +10:00
Horror Proton
1c8844e740 chore: update cmake checksum 2022-12-15 23:13:33 +08:00
MistEO
2971cc9d9a Merge branch 'master' into dev 2022-12-15 21:48:27 +08:00
MistEO
965668db75 Merge pull request #3076 from MaaAssistantArknights/dev
Release v4.8.1
2022-12-15 21:47:53 +08:00
MistEO
6bb955cba7 docs: update changelog 2022-12-15 21:47:45 +08:00
MistEO
716ab41ade feat: 启动时删除.old文件夹 2022-12-15 21:26:08 +08:00
uye
ef02c2e5b1 fix: 修复关卡导航错误 2022-12-15 19:36:39 +08:00
uye
e17952fe6e fix: 修复活动关卡名错误 2022-12-15 17:57:36 +08:00
uye
582b37124d feat: 支持活动导航 2022-12-15 17:34:11 +08:00
MistEO
8afc9f3ffc Merge pull request #3071 from MaaAssistantArknights/dev
Release v4.8.0
2022-12-15 16:14:22 +08:00
MistEO
62bd51f77d docs: update changelog 2022-12-15 16:13:04 +08:00
MistEO
67a3b8368a chore: 更新2022/12/15关卡掉落数据 2022-12-15 16:11:32 +08:00
MistEO
a8211317c1 docs: update changelog 2022-12-15 15:31:21 +08:00
MistEO
461fd9419d perf: 优化战斗中技能识别的性能 2022-12-15 14:12:48 +08:00
MistEO
d7af9ecd95 chore: 更新2022/12/15游戏数据(不包括关卡掉落信息) 2022-12-15 14:07:52 +08:00
Horror Proton
6a44663779 chore: parallel build for linux workflow 2022-12-15 09:16:44 +08:00
Horror Proton
4d731d2c3b fix: install 3rdparty/resource in CMakeList 2022-12-15 00:34:13 +08:00
MistEO
12a50d1c92 docs: update issue teamplate 2022-12-15 00:06:29 +08:00
MistEO
b74d7cda18 docs: fix typos 2022-12-14 23:58:15 +08:00
MistEO
2a1dcf5745 Merge pull request #3068 from MaaAssistantArknights/dev
Release v4.8.0-rc.1
2022-12-14 23:51:40 +08:00
MistEO
a9697e5629 docs: update changelog 2022-12-14 23:48:18 +08:00
MistEO
b3b2331cd1 chore: update issue template 2022-12-14 23:43:36 +08:00
MistEO
27994385f2 fix: 修复肉鸽打到一半,识别错误导致突然摆烂的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3032
2022-12-14 23:20:59 +08:00
MistEO
0996106764 fix: 修复肉鸽关卡名识别错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3061
2022-12-14 23:20:59 +08:00
MistEO
f39c93e0f2 fix: 修复肉鸽卡在放弃招募界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3063
2022-12-14 23:20:59 +08:00
uye
a8b00ba87b style: 信用商店显示内容自动换行
fix #3065
2022-12-14 22:49:00 +08:00
MistEO
18d367ee9e feat: 关机和休眠也保存设置 2022-12-14 21:41:27 +08:00
uye
1fc4f37ef0 fix: 修复WEChapterToWE算法选择错误 2022-12-14 15:04:04 +08:00
uye
f6a82decd2 feat: 添加活动导航 2022-12-14 14:59:14 +08:00
MistEO
6f70db89c4 chore: 调整 OCR keys 文件路径 2022-12-14 01:00:39 +08:00
MistEO
de5e9424e5 perf: 进一步提高http解析的鲁棒性 2022-12-14 00:11:44 +08:00
MistEO
c4689fd0d0 fix: 修复http解析错误 2022-12-13 23:35:38 +08:00
MistEO
10b9b9c1cf Merge pull request #2869 from MaaAssistantArknights/feat/skill_ready_match
feat: 修改战斗技能图标识别方法
2022-12-13 20:54:13 +08:00
MistEO
e4f13409c5 perf: 缩小技能图标识别范围 2022-12-13 20:49:36 +08:00
uye
df812f1241 refactor: 重构切换语言提示 2022-12-13 20:31:34 +08:00
Horror Proton
e99651d52b perf: update BattleSkillReadyImageAnalyzer 2022-12-13 19:07:48 +08:00
MistEO
5dc843fc83 refactor: 重新封装了一下战斗技能识别。 BattleSkillReadyImageAnalyzer::analyze 还没写完 2022-12-13 18:50:18 +08:00
uye
67d038d313 feat: 切换语言添加双语提示 2022-12-13 18:10:02 +08:00
MistEO
4951110bd9 merge: dev 2022-12-13 17:44:06 +08:00
MistEO
269e0dcd07 styles: 修复资源文件缩进 2022-12-13 17:38:29 +08:00
Horror Proton
e9dbb56f09 chore: try adding Linux release 2022-12-13 13:17:06 +08:00
Horror Proton
cf363aef0f Revert "fix: update ocr replace list for roguelike"
This reverts commit fa2af73c82.

Not needed for the latest OCR model
2022-12-13 11:50:42 +08:00
MistEO
98c161d2fc Merge pull request #3054 from MaaAssistantArknights/dev
Release v4.8.0-beta.4
2022-12-13 01:00:52 +08:00
MistEO
68036d7048 docs: update changelog 2022-12-13 00:59:53 +08:00
MistEO
d18105ccdb perf: 删除所有外服OCR det模型,沿用cn det模型 2022-12-13 00:24:09 +08:00
MistEO
5d55f90bfe fix: 掉落识别错误 2022-12-12 23:49:33 +08:00
MistEO
b615afa0b7 fix: build error 2022-12-12 23:48:30 +08:00
MistEO
445c897838 perf: update OCR rec models for all overseas client 2022-12-12 23:46:57 +08:00
MistEO
614c7bd85e revert: 回滚charOCR 2022-12-12 23:33:02 +08:00
uye
464038c6cc feat: 将HelpUri移入MaaUrls 2022-12-11 23:47:19 +08:00
uye
d8fc8d339c style: 隐藏已满员的Q群 2022-12-11 23:47:19 +08:00
MistEO
17d0973f64 Merge pull request #3038 from liuyifan-eric/dev
chore: tools for global servers & sorted json files
2022-12-11 14:27:59 +08:00
MistEO
aa5ab30232 fix: build error 2022-12-11 14:04:08 +08:00
MistEO
74aff44667 fix: 修复潜在的非法关卡名检测错误 2022-12-11 13:55:04 +08:00
MistEO
858bb9fb6d chore: 删除一些日志 2022-12-11 13:47:38 +08:00
MistEO
9373f5f862 chore: 删除char ocr模型 2022-12-11 13:45:46 +08:00
MistEO
ee2d3d1162 feat: 升级12/11飞桨中文模型 2022-12-11 13:35:45 +08:00
shxyke
200ce59e47 Merge pull request #3042 from MaaAssistantArknights/feat/cmake_libraries
feat: Add checksums for download libs
2022-12-11 10:15:13 +08:00
shxyke
46eff1ccb0 feat: Add checksums for download libs 2022-12-11 01:24:37 +00:00
uye
2326190958 feat: 支持16点界面与关卡选择热更新 2022-12-10 23:54:18 +08:00
Horror Proton
e5c71c3ed3 fix: update tools/global_servers 2022-12-10 17:30:40 +08:00
Yifan Liu
c00461bb93 Update tools/global_servers/diff_resource.py
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-12-10 03:10:11 -06:00
Yifan Liu
906eefd998 Update tools/global_servers/diff_resource.py
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-12-10 03:07:53 -06:00
Horror Proton
fa2af73c82 fix: update ocr replace list for roguelike
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3036
2022-12-10 16:18:00 +08:00
Yifan Liu
d7d8b36fb0 style: Sort JP/KR/EN/ZH_TW json files according to the ZH json order
reordered the keys/attributes, should not affect anything
2022-12-10 01:31:35 -06:00
Yifan Liu
4822706c47 chore: tools for global servers (diff_resource & match_json)
diff_resource finds the templates in ZH server but without a
corresponding global template yet.
match_json sorts the json files according to ZH json
2022-12-10 01:26:14 -06:00
MistEO
0d46dbb474 Merge pull request #3023 from liuyifan-eric/fix/JP_wakeup
fix: [JP] fix the error msg occured on wakeup
2022-12-10 10:27:30 +08:00
Yifan Liu
05c8bbfb8d fix: JP daily supply & loading text fix
Updated the JP json file to include the previously untranslated
TodaysSupplies and Loading attributes.

This should close #2901
2022-12-09 15:18:46 -06:00
uye
f8ac07ca9c fix: 修复提示框按钮显示不全 2022-12-10 01:38:06 +08:00
uye
77e44c6579 feat: 添加9群链接 2022-12-10 00:31:54 +08:00
Horror Proton
09e949b373 fix: update workflow trigger for linux 2022-12-09 18:51:39 +08:00
Horror Proton
67dab0e9cb fix: update FastDeploy version for linux 2022-12-09 18:49:01 +08:00
Horror Proton
89fbf5a668 fix: update linux 3rdparty repos 2022-12-09 18:44:07 +08:00
MistEO
e76e072ede chore: 修复fastdeploy头文件版本错误 2022-12-08 21:39:15 +08:00
MistEO
9a78bfd9cb fix: 修复OCR参数错误 2022-12-08 21:24:59 +08:00
MistEO
ed4e6bcf6a chore: 更新fastdeploy
83824f7969
2022-12-08 21:00:19 +08:00
Horror Proton
41ed6eec9a Merge pull request #2939 from MaaAssistantArknights/chore/linux_build
feat: 增加编译 Linux 版本的 workflow
2022-12-08 12:39:22 +08:00
Horror Proton
75c885e3b1 chore: download files with cmake in gh workflow, clean up 2022-12-08 12:24:23 +08:00
Yifan Liu
906360a2fe fix: [JP] fix the error msg occured on wakeup
updated the roi of StartUpConnectingFlag to fit JP server
2022-12-07 13:13:11 -06:00
MistEO
dd9e9b758b feat: 热键设置界面enable不与运行绑定 2022-12-08 00:18:46 +08:00
MistEO
ac9a502d58 feat: 移除对切换OCR后端功能的支持 2022-12-08 00:18:46 +08:00
Horror Proton
d258fa80eb chore: add release body for nightly workflow 2022-12-07 22:41:43 +08:00
MistEO
0ae6e2deae Merge branch 'master' into dev 2022-12-07 22:21:14 +08:00
MistEO
f43ffc1f35 perf: 更新模型,优化中文识别 2022-12-07 22:20:26 +08:00
MistEO
b441cb9b10 chore: 重命名ocr keys文件 2022-12-07 20:35:43 +08:00
MistEO
2759142e1d chore: 重命名部分文件,修复task检查错误 2022-12-07 20:33:33 +08:00
MistEO
955c358e90 fix: build error 2022-12-07 19:52:45 +08:00
Horror Proton
c5f38b1035 chore: fix release-ota 2022-12-07 19:10:01 +08:00
uye
a57ff81e5e fix: 修复主线关卡导航 2022-12-07 16:09:06 +08:00
MistEO
99e9029e6d Merge pull request #2982 from MaaAssistantArknights/dev
Release v4.8.0-beta.3
2022-12-07 14:46:56 +08:00
MistEO
2aded57286 docs: update changelog 2022-12-07 14:46:06 +08:00
MistEO
eaf4f7609f Merge pull request #2994 from horror-proton/test/patch_rust
feat: 更新 Rust ffi
2022-12-07 11:49:55 +08:00
Horror Proton
3576ae5fa5 fix: update rust ffi 2022-12-06 23:39:34 +08:00
Horror Proton
3177caca4b chore: fix typos in src/Rust 2022-12-06 23:39:34 +08:00
MistEO
e28fce318b Merge pull request #3014 from MaaAssistantArknights/perf/api_type
perf: 明确api参数及返回值类型,并兼容原先接口
2022-12-06 20:30:45 +08:00
Hao Guan
157fd3ffe5 fix: mac API upgrade 2022-12-06 18:10:52 +08:00
MistEO
2966eb1e2a perf: 明确api参数及返回值类型,并兼容原先接口 2022-12-06 18:10:52 +08:00
MistEO
b103427ba2 Merge pull request #3013 from 178619/dev
update resources for KR Client
2022-12-05 22:59:19 +08:00
Clock
e6e11267a4 KR resources 2022-12-05 23:13:03 +09:00
MistEO
d92d1a7fec fix: 修复龙舌兰识别错误 2022-12-05 21:56:41 +08:00
shxyke
e2d40e2ed5 feat: Download libraries with CMake 2022-12-05 13:01:15 +00:00
MistEO
24bd6cd64b docs: 修正文档 2022-12-05 15:12:12 +08:00
MistEO
9fb64ce140 docs: Update 3.1-集成文档.md (#3009)
Update 3.1-集成文档.md
2022-12-05 15:04:31 +08:00
Horror Proton
4b37647123 feat: add linux build workflow 2022-12-05 13:27:56 +08:00
Horror Proton
e6477b7758 chore: remove a redundant requires 2022-12-05 13:26:27 +08:00
Horror Proton
ceced45130 feat: updae CMakeLists for installing libraries 2022-12-05 13:08:01 +08:00
Hao Guan
cfa27376f0 Merge pull request #3008 from hguandl/osx/fastdeploy
feat / macOS: 支持 FastDeploy 和 MaaTouch
2022-12-05 12:33:08 +10:00
ChildeRolando
6362eaf5c2 Update 3.1-集成文档.md
修改了错别字
2022-12-05 02:27:50 +01:00
Hao Guan
2e75218a6d Mac: support MaaTouch 2022-12-05 05:03:14 +10:00
MistEO
2678758d70 feat: 新增仅MaaTouch支持的暂停下干员优化。下的更快! 2022-12-05 01:17:31 +08:00
Hao Guan
f6f9a7f879 feat: macOS support FastDeploy 2022-12-04 20:23:46 +10:00
Mr-Milk
192b4e759c 修改可能产生歧义的语句 (#3004)
* Fixed、

* docs: 修正文档格式

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-12-04 17:12:27 +08:00
nightofknife
fdfdd62737 更新霜华识别错误 (#3001)
* 更新霜华识别错误

* 更新
2022-12-04 03:36:17 +08:00
uye
a2e5aafffb Merge pull request #3000 from 178619/dev
docs, resources and localization update for KR
2022-12-04 02:08:56 +08:00
Clock
c15d5d6a61 Localization Update 2022-12-04 02:18:30 +09:00
Clock
6a7a0c712c KR resource update 2022-12-04 02:18:30 +09:00
Clock
f1d125a202 KR docs update 2022-12-04 02:18:30 +09:00
uye
993013603c fix: 修复信用商店描述错误 2022-12-03 22:44:30 +08:00
MistEO
aeb3cfb0d7 docs: 更新ts接口链接 2022-12-03 21:29:09 +08:00
MistEO
ec561e6a61 feat: 新增“暂停下干员”选项,默认关闭。调整部署部署干员的参数 2022-12-03 21:02:58 +08:00
MistEO
0688de2c6c perf: 自动战斗一些没啥用的优化 2022-12-03 20:24:47 +08:00
MistEO
26ead84646 fix: 修复自动战斗子弹时间部署不生效的问题 2022-12-03 20:16:09 +08:00
MistEO
7eeef88b93 perf: 优化界面一处判断逻辑 2022-12-03 19:27:24 +08:00
Horror Proton
0340efbb60 perf: update Assistant::async_call 2022-12-03 17:41:07 +08:00
Horror Proton
9ff7d16b23 chore: fix typos 2022-12-03 17:35:24 +08:00
MistEO
6329213e58 feat: 启动时删除old文件
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2988
2022-12-03 14:47:10 +08:00
MistEO
9a54bb1809 fix: 修复暂停下干员的配置错误 2022-12-03 14:33:18 +08:00
MistEO
3c7e62bfef fix: config减少一些容错 2022-12-03 14:30:50 +08:00
MistEO
7ab21dad9b fix: 修复夜神模拟器配置错误 2022-12-03 14:24:23 +08:00
MistEO
7a934afd4f fix: 修复潜在的config集成错误 2022-12-03 14:21:44 +08:00
MistEO
3cb80dc973 refactor: 重构 config,修复 maatouch 不可用问题 2022-12-03 14:10:30 +08:00
MistEO
c410747b19 perf: 优化string相关头文件 2022-12-03 04:29:49 +08:00
MistEO
bddd8484b3 chore: 给夜神也打开暂停部署 2022-12-03 03:29:29 +08:00
MistEO
e6df4deca2 fix: 修正nightly多打包了一个文件的问题 2022-12-03 01:54:39 +08:00
MistEO
5794a1005a fix: 修复日服肉鸽卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2983
2022-12-03 00:54:36 +08:00
MistEO
9ddbdf7d2c docs: 更新集成文档 2022-12-03 00:33:43 +08:00
MistEO
571440b52b feat: 分离触控模式设置 2022-12-03 00:11:36 +08:00
MistEO
e48a99eba5 fix: 修复wpf界面无法预览的问题 2022-12-02 22:50:37 +08:00
MistEO
68b3b15693 feat: 支持暂停部署干员 2022-12-02 22:50:37 +08:00
Horror Proton
1b334f5ed4 feat: pop ready futures in Assistant.cpp 2022-12-02 22:19:08 +08:00
MistEO
8949554d97 docs: update doc 2022-12-02 21:30:58 +08:00
Horror Proton
cd214977c6 chore: update CMakeLists.txt for ec87edc1 2022-12-02 20:37:46 +08:00
MistEO
d44cc3ceeb perf: OCR小细节优化 2022-12-02 18:06:42 +08:00
MistEO
5424776536 chore: 把上传源改回去了 2022-12-02 14:16:44 +08:00
MistEO
bff4c929b1 Update CHANGELOG.md 2022-12-02 10:58:32 +08:00
MistEO
86febb5b1a chore: code analysis 2022-12-02 10:55:53 +08:00
MistEO
6ad134fb4b fix: 修复界面启动错误 2022-12-02 01:32:54 +08:00
MistEO
4995d6c80e Merge branch 'master' into dev 2022-12-02 01:15:43 +08:00
MistEO
48f9b6cbb7 Merge pull request #2974 from MaaAssistantArknights/release/v4.8.0-beta.2
Release v4.8.0-beta.2
2022-12-02 01:12:57 +08:00
MistEO
1dd3e47cea docs: update changelog 2022-12-02 01:12:47 +08:00
MistEO
eb46fbf1bd fix: 修复连接断开重连后不使用minitouch的问题 2022-12-02 01:09:37 +08:00
MistEO
61d0aebce8 fix: 尝试修复检查更新弹窗炸了的问题 2022-12-02 01:09:15 +08:00
MistEO
87cc036342 fix: 修复掉落关卡识别错误 2022-12-02 01:09:03 +08:00
MistEO
8102e4785f fix: 再次尝试修复肉鸽不期而遇放弃的问题 2022-12-02 01:08:54 +08:00
uye
d861de4cde refactor: 优化活动关卡导航 2022-12-02 01:08:44 +08:00
MistEO
4d69b24990 fix: 修复连接断开重连后不使用minitouch的问题 2022-12-02 01:05:13 +08:00
MistEO
71675abc18 fix: 修复资源拷贝错误 2022-12-02 01:01:17 +08:00
MistEO
f1a3b7bec1 chore: try to fix win CI 2022-12-02 00:43:13 +08:00
MistEO
5c33fa6e83 chore: blame ignore 2022-12-02 00:35:04 +08:00
MistEO
21617270bc chore: move ffi 2022-12-02 00:34:32 +08:00
MistEO
1fdaa4af14 chore: blame ignore 2022-12-02 00:30:46 +08:00
MistEO
37918f7d15 chore: 就叫MAA算了.jpg 2022-12-02 00:27:27 +08:00
MistEO
3d83b80dd6 chore: breaking rename 2022-12-02 00:22:47 +08:00
MistEO
5abf4f0c1c fix: 修复项目配置错误 2022-12-02 00:14:59 +08:00
MistEO
9d8d5f705f fix: 尝试修复检查更新弹窗炸了的问题 2022-12-02 00:14:59 +08:00
MistEO
f7f3d10677 Merge pull request #2970 from MaaAssistantArknights/refactor/SwipeToStage
refactor: 优化活动关卡导航
2022-12-01 23:08:32 +08:00
MistEO
ec87edc15e chore: 重命名vs工程 2022-12-01 23:00:31 +08:00
MistEO
c0f2c74d94 fix: 修复掉落关卡识别错误 2022-12-01 22:26:01 +08:00
MistEO
8ec26208e0 fix: res error 2022-12-01 22:24:47 +08:00
MistEO
4e5bd87fb1 chore: blame ignore 2022-12-01 22:15:07 +08:00
MistEO
bae271c09b chore: 重命名cs文件目录结构 2022-12-01 22:14:16 +08:00
MistEO
0af4042eee fix: 再次尝试修复肉鸽不期而遇放弃的问题 2022-12-01 22:13:59 +08:00
MistEO
053a8843a9 fix: Win CI error 2022-12-01 21:19:23 +08:00
uye
5d0634e691 refactor: 优化活动关卡导航 2022-12-01 20:49:26 +08:00
MistEO
f5ffe1bd8d chore: 重命名vs工程 2022-12-01 20:46:21 +08:00
MistEO
bedb25eb7e chore: 调整项目结构,更新文档 2022-12-01 20:34:18 +08:00
MistEO
8dd6ddb514 Merge pull request #2968 from MaaAssistantArknights/dev
Release v4.8.0-beta.1
2022-12-01 20:04:29 +08:00
MistEO
a319c3c35e docs: update changelog 2022-12-01 20:04:18 +08:00
MistEO
cf1d3132ac fix: 修复一些干员名识别错误 2022-12-01 19:53:23 +08:00
MistEO
27752e6214 fix: 修复借助战卡住的问题,修复一个编译错误 2022-12-01 19:49:05 +08:00
MistEO
c6b98d2f41 chore: 更新地图和关卡数据 2022-12-01 19:49:05 +08:00
uye
7874fd0e65 fix: 风雪过境活动导航错误 2022-12-01 19:39:53 +08:00
MistEO
8256205a47 perf: 删除过时的打包信息 2022-12-01 19:11:46 +08:00
MistEO
92356c097b Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-12-01 17:24:06 +08:00
MistEO
e62d0804db fix: 修复部分unique_ptr没初始化的问题 2022-12-01 17:23:44 +08:00
MistEO
84c49f193e Merge pull request #2964 from WWPXX233/master
修改艾莉妮为一技能
2022-12-01 17:19:49 +08:00
MistEO
d210e8b409 feat: 新增支持设置ocr后端类型 2022-12-01 17:18:53 +08:00
WWPXX
1e8e36249a 修改艾莉妮为一技能
二技能在范围内没有怪无法释放会重复点击
2022-12-01 16:29:51 +08:00
uye
f4cf8ed9d8 fix: 修复一个主线导航错误 2022-12-01 01:54:49 +08:00
MistEO
cc5db25fe5 Merge pull request #2957 from 178619/dev
fix: fix visiting and add more ocrReplaces for KR
2022-11-30 21:09:10 +08:00
MistEO
984db76c2d Merge pull request #2950 from Hydrogina/dev
fix: 修复借助战刷信用无法进图 #2947
2022-11-30 21:09:00 +08:00
Clock
6350b23477 more ocrReplaces 2022-11-30 21:19:52 +09:00
Clock
c44f4b90d8 fix: fixed visiting and added more ocrReplaces to KR 2022-11-30 16:36:47 +09:00
Hydrogina
df7ecaac7a fix: 修复借助战刷信用无法进图 #2947
fix: 修复OF-1未开启情况下信用任务卡住&功能说明不明确 #2949
2022-11-30 13:06:44 +08:00
Hydrogina
4235ce9358 fix: 修复借助战刷信用无法进图 #2947
fix: 修复OF-1未开启情况下信用任务卡住&功能说明不明确 #2949
2022-11-30 13:03:00 +08:00
MistEO
b81d53ee48 Merge pull request #2941 from MaaAssistantArknights/dev
Release v4.8.0-alpha.1
2022-11-29 21:51:02 +08:00
MistEO
d6d2313f5b docs: fix docs 2022-11-29 21:49:50 +08:00
MistEO
0441493a34 chore: 更新fastdeploy到fed3cfc (仍然替换了yaml-cpp) 2022-11-29 21:49:43 +08:00
MistEO
68fa1548f9 docs: update changelog 2022-11-29 21:43:10 +08:00
MistEO
5885abc550 Merge pull request #2935 from Hydrogina/dev
fix: 修复借助战作战失败后卡住的问题
2022-11-29 21:18:05 +08:00
MistEO
82973d9383 Merge pull request #2940 from 178619/dev
Yostar KR Support
2022-11-29 21:14:20 +08:00
Clock
a7926263e9 Yostar KR Support 2022-11-29 20:11:14 +09:00
uye
e5206bbe96 docs: Update 3.4-任务流程协议.md 2022-11-29 17:45:22 +08:00
uye
32fa9bd98c fix: 修复主线关卡导航 2022-11-29 17:27:14 +08:00
Horror Proton
d1c6d00baf fix: set OPENCV_DIRECTORY for patched FastDeploy.cmake 2022-11-29 16:15:35 +08:00
Hydrogina
2f30cae07a fix: 修复借助战作战失败后卡住的问题 使用baseTask 2022-11-29 15:40:16 +08:00
Hydrogina
8da3e972cc fix: 修复借助战作战失败后卡住的问题 2022-11-29 10:47:38 +08:00
MistEO
f8ac05037f Merge branch 'master' into dev 2022-11-29 01:32:57 +08:00
MistEO
b465d23127 fix: drops rec error
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2894
2022-11-29 00:41:49 +08:00
MistEO
14f9ca6ad3 fix: 修复水月肉鸽不期而遇放弃的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2895
2022-11-29 00:18:42 +08:00
MistEO
0f704d2ebf Merge pull request #2931 from MaaAssistantArknights/release/v4.7.3
Release v4.7.3
2022-11-29 00:03:01 +08:00
MistEO
e1c744c139 docs: update changelog 2022-11-29 00:02:22 +08:00
MistEO
634d9c6c46 fix: merge error 2022-11-28 23:57:20 +08:00
MistEO
ae40f6141a refactor: 重构minitouch的选择逻辑 2022-11-28 23:54:18 +08:00
MistEO
6193f602b6 feat: 新增maatouch配置项,修复资源路径错误问题 2022-11-28 23:53:46 +08:00
MistEO
2eb40523b3 perf: 优化一点自动作战逻辑,优化adb滑动延迟 2022-11-28 23:51:00 +08:00
MistEO
39c1adb1a3 fix: 修复自动战斗自动编队偶尔失败的问题 2022-11-28 20:58:57 +08:00
MistEO
9e20f72e7d Merge pull request #2918 from horror-proton/test/onnx_linux
feat: 更新 `CMakeLists.txt`
2022-11-28 19:40:43 +08:00
uye
cc3bd7e82c Merge pull request #2925 from 178619/dev
core docs localization for KR
2022-11-28 15:43:56 +08:00
Clock
307e3febbe core docs localization for KR 2022-11-28 16:33:26 +09:00
Tastror
c15e67001e Merge pull request #2922 from 178619/dev
Localization
2022-11-28 10:54:26 +08:00
MistEO
0e66c59dab chore: Assistant.h 细节优化 2022-11-28 09:58:39 +08:00
Clock
070e2d35cb Localization 2022-11-28 10:07:39 +09:00
MistEO
b426533954 refactor: 重命名一些基类 2022-11-28 03:26:40 +08:00
MistEO
a4814e23ae refactor: 重构获取实例属性的调用方式 2022-11-28 03:18:34 +08:00
Horror Proton
6a1b95ce29 feat: update CMakeLists.txt for Linux 2022-11-28 02:35:42 +08:00
MistEO
a08bae0a5c perf: 优化Running接口为const 2022-11-28 02:32:49 +08:00
MistEO
06fb11d9d6 fix: 修复 ProcessTaskImageAnalyzer 错误调用时可能的空指针引用 2022-11-28 02:28:15 +08:00
MistEO
bb01894350 refactor: 重构控制器及状态调用体系 2022-11-28 02:21:27 +08:00
MistEO
5218e89d04 perf: 减少回调的json复制 2022-11-28 01:36:40 +08:00
MistEO
52d6614961 refactor: 重构任务回调体系 2022-11-28 01:32:37 +08:00
MistEO
0e4881bfa8 chore: rename task_callback to async_callback 2022-11-28 00:50:30 +08:00
MistEO
f76f7ad47d feat: 新增异步外部调用接口
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/597
2022-11-28 00:45:12 +08:00
MistEO
25ca5805b9 refactor: 重构minitouch的选择逻辑 2022-11-27 23:19:12 +08:00
MistEO
b4e559b544 docs: update docs for MaaTouch 2022-11-27 22:49:10 +08:00
Horror Proton
7c8a7caba1 fix: update roi of recruit timer
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2911
2022-11-27 22:42:29 +08:00
MistEO
3f1bafd90c chore: 修复翻译 2022-11-27 21:42:43 +08:00
MistEO
4b16d93d68 feat: 新增maatouch配置项,修复资源路径错误问题 2022-11-27 21:38:15 +08:00
uye
b3dbbde1f5 feat: 增加难度切换提示
fix #2846
2022-11-27 18:42:03 +08:00
MistEO
fc3eff4881 chore: 删除错误的注释 2022-11-27 04:35:10 +08:00
MistEO
0d2be1e432 perf: 优化自动抄作业不支持的关卡报错逻辑 2022-11-27 04:16:56 +08:00
MistEO
269207ca85 perf: 优化自动战斗参数判断 2022-11-27 03:49:51 +08:00
MistEO
8d50698c72 chore: 放宽自定义关卡导航输入限制 2022-11-27 03:30:18 +08:00
MistEO
eae4571a77 chore: 调整下注释 2022-11-27 03:15:51 +08:00
MistEO
2f5bdbae3f perf: 整理一下关卡导航代码,调整滑动速度 2022-11-27 03:11:35 +08:00
MistEO
48f94432a8 chore: 删除用不上的库 2022-11-26 23:38:53 +08:00
MistEO
a9f5198687 fix: 干员名识别 2022-11-26 22:32:30 +08:00
uye
1a0b8cf3d6 Merge pull request #2905 from wallsman/dev
Doc: JP Missing text add and tweak.
2022-11-26 21:47:38 +08:00
uye
77f0ae3011 feat: 支持切换主线关卡难度 2022-11-26 20:33:36 +08:00
Wallsman
ae7c3dbd6a Doc: JP Missing text add and tweak.
-Missing text Add
ADB option text and Tips add.
2022-11-26 18:36:25 +09:00
Wallsman
c0ec3a19f2 Update ja-jp.xaml 2022-11-26 18:23:04 +09:00
uye
63ade1f3bc style: 修改信用相关日语描述 2022-11-26 17:16:09 +08:00
uye
4b7ac76144 feat: SideStory「风雪过境」复刻活动关卡导航 2022-11-26 16:58:09 +08:00
uye
9e75a488ea style: 修改信用相关描述 2022-11-26 16:16:33 +08:00
uye
ff277f265f fix: 修复OF关卡识别问题 2022-11-26 16:11:30 +08:00
MistEO
175b140bdf chore: 更正链接库 2022-11-26 12:57:14 +08:00
MistEO
cfd1ec2abe Merge branch 'master' into dev 2022-11-26 11:57:30 +08:00
Horror Proton
575d701334 fix: fix roi out of range 2022-11-26 10:31:29 +08:00
Horror Proton
749d7d0fa3 fix: update skill ready matching for battle task 2022-11-26 10:31:24 +08:00
Horror Proton
1e694868f5 feat: update skill ready icon matching 2022-11-26 10:29:42 +08:00
Horror Proton
55c8c9cfb6 feat: add MoreCV.hpp 2022-11-26 10:25:17 +08:00
MistEO
67131b3aca chore: 重命名fastdeploy相关库 2022-11-26 05:24:30 +08:00
MistEO
fb55b01094 fix: 修复部分任务执行错误 2022-11-26 05:16:23 +08:00
MistEO
dee99ae06c fix: 修复 filter 错误 2022-11-26 04:54:41 +08:00
MistEO
f0d938578d chore: 忽略blame 2022-11-26 04:44:55 +08:00
MistEO
49b3aba96b chore: 再次重命名部分文件夹 2022-11-26 04:44:26 +08:00
MistEO
b8e4080339 Merge pull request #2889 from MaaAssistantArknights/perf/onnx
perf: 踢飞桨!
2022-11-26 04:38:51 +08:00
MistEO
9c140181fa docs: update doc about fastdeploy 2022-11-26 04:09:15 +08:00
MistEO
cb1a93244b chore: 更新fastdeploy库 2022-11-26 03:53:50 +08:00
MistEO
0db99775c7 feat: 集成 fastdeploy,启用 paddle2onnx ocr 2022-11-26 03:53:50 +08:00
MistEO
1fbcf09ef4 feat: 删除访问好友任务,整合进商店任务中 2022-11-26 03:47:05 +08:00
MistEO
7b2c9e4db9 Merge pull request #2898 from MaaAssistantArknights/feat/credit_fight
refactor: 添加借助战作战赚信用功能
2022-11-26 02:26:50 +08:00
MistEO
344deabf79 chore: 添加 blame ignore 2022-11-26 02:23:08 +08:00
MistEO
91abbb7f17 refactor: 重构cpp侧文件结构 2022-11-26 02:12:51 +08:00
MistEO
4b3b84df8f refactor: Rename Configer -> Config 2022-11-25 23:31:30 +08:00
MistEO
2cec773c91 Merge pull request #2899 from MaaAssistantArknights/dev
Release v4.7.2
2022-11-25 23:23:47 +08:00
MistEO
910572fdf2 docs: update changelog 2022-11-25 23:21:20 +08:00
MistEO
f9e6dd3e5a refactor: 重构 PackageTask 2022-11-25 23:16:29 +08:00
MistEO
a92cb7b5d3 fix: 修复 filter 错误 2022-11-25 21:18:47 +08:00
MistEO
9e5337d240 Merge pull request #2849 from Hydrogina/dev
feat: 添加借助战作战赚信用功能
2022-11-25 21:10:35 +08:00
MistEO
c6cdd30f4f chore: 优化一点点逻辑 2022-11-25 21:02:34 +08:00
MistEO
416c05bca1 chore: 加点日志 2022-11-25 20:55:46 +08:00
MistEO
44de3ef45b Merge pull request #2897 from MaaAssistantArknights/revert-2893-dev
Revert "更新 夜神模拟器 介绍"
2022-11-25 20:53:21 +08:00
MistEO
423dbdae70 Revert "更新 夜神模拟器 介绍" 2022-11-25 20:52:58 +08:00
MistEO
a4198da68d fix: 修复开始战斗后delay的缓存不生效的问题 2022-11-25 20:51:19 +08:00
DavidWang19
f14576bd59 Merge pull request #2893 from ntgmc/dev
更新 夜神模拟器 介绍
2022-11-25 12:46:27 +00:00
MistEO
10bb86dc98 fix: 修复极端情况下不停掉落识别的问题 2022-11-25 20:19:08 +08:00
MAA无情关ISSUE人
32f6fc0d35 更新 夜神模拟器 介绍
这个真的挺多人反馈的
2022-11-25 16:03:23 +08:00
Horror Proton
2d1196849c fix: update ocr replace list
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2885
2022-11-25 15:53:06 +08:00
Hydrogina
2360bbcbb1 feat:借助战作战使用AbstractTask 2022-11-25 11:35:17 +08:00
MistEO
7e14dc8e6a Merge pull request #2888 from WWPXX233/patch-1
优化育生池干员朝向
2022-11-25 00:37:10 +08:00
WWPXX
313b19b894 优化育生池干员朝向 2022-11-24 22:43:05 +08:00
MistEO
b00bee5745 fix: build error 2022-11-24 20:56:46 +08:00
MistEO
617d50080f Revert "fix: 修复VS上编辑器的红线"
This reverts commit c361426dc0.
2022-11-24 20:52:13 +08:00
Horror Proton
95b265ed4d fix: update ocr replace list
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2885
2022-11-24 19:06:32 +08:00
Hydrogina
86c052aa82 feat: 借助战作战从json中读取关卡名 2022-11-24 19:01:33 +08:00
Hydrogina
b3c209a235 feat: 在CopilotTask中添加参数support_unit_name 2022-11-24 17:28:47 +08:00
MistEO
c361426dc0 fix: 修复VS上编辑器的红线
其实是把红线换了个地方
2022-11-24 17:26:36 +08:00
Hydrogina
5af2011055 feat: 修正resource_dir 2022-11-24 16:43:01 +08:00
Hydrogina
61bc4f2da4 feat: 添加借助战作战Tips 2022-11-24 15:44:58 +08:00
MistEO
e2f4cbff29 fix: 修复夜神模拟器偶尔截个黑屏的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2882
2022-11-24 15:09:57 +08:00
MistEO
2b1cc4796e Merge pull request #2880 from MaaAssistantArknights/wallsman-patch-1
Doc: hotfix
2022-11-24 13:29:45 +08:00
Hydrogina
b1c4c0b83c feat: 修改OF-1导航 2022-11-24 13:25:32 +08:00
Wallsman
7f3d1ae1b8 Doc: hotfix 2022-11-24 13:09:22 +09:00
Hydrogina
c01755e16a Merge pull request #2 from Hydrogina/MaaAssistantArknights-dev
Maa assistant arknights dev
2022-11-24 12:04:15 +08:00
Hydrogina
e5d8d22a7f Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into MaaAssistantArknights-dev 2022-11-24 11:57:33 +08:00
MistEO
a7b7e2fe60 refactor: 整理Dir相关单例 2022-11-24 11:06:30 +08:00
MistEO
42582fb0e1 fix: build error on MSVC v142 2022-11-24 10:36:12 +08:00
MistEO
77dfd44ae2 Merge pull request #2874 from MaaAssistantArknights/dev
Release v4.7.1 hotfix
2022-11-23 23:39:02 +08:00
MistEO
2a20acd443 chore: 再添加一些界面关于ADB替换的提示 2022-11-23 23:37:14 +08:00
MistEO
9d868348bf Merge pull request #2873 from MaaAssistantArknights/dev
Release v4.7.1
2022-11-23 23:30:00 +08:00
MistEO
bb9f15fe0d docs: update changelog 2022-11-23 23:29:38 +08:00
MistEO
e326cd3c2b perf: 优化检查更新的一些小细节 2022-11-23 23:20:32 +08:00
MistEO
01cdc39326 docs: fix changelog 2022-11-23 23:05:42 +08:00
tangge233
6754d75cdc fix: 检查更新镜像 API ,防止有时候检查更新失效 (#2867)
* 加个镜像 API ,防止有时候检查更新失效

* Revert "加个镜像 API ,防止有时候检查更新失效"

This reverts commit b9ab106409.

* Revert "Revert "加个镜像 API ,防止有时候检查更新失效""

This reverts commit 68c55a8df4.

* 修改了下代码

* 获取 GitHub 上版本信息时尝试去使用镜像 API 以防止 rate limit 阻碍信息获取

* 忘改了几处……
2022-11-23 23:05:01 +08:00
MistEO
5340b984ef fix: 修复替换完 adb 还是有界面提示的问题 2022-11-23 22:55:36 +08:00
MistEO
70ca43e566 fix: 修复肉鸽不期而遇中的紧急作战卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2858
2022-11-23 22:53:17 +08:00
MistEO
17d14953ec Merge pull request #2871 from cenfusheng/dev
修复三个识别问题
2022-11-23 22:37:42 +08:00
MistEO
a8a03d7e73 feat: 新增一些触控相关的界面提示 2022-11-23 22:37:31 +08:00
MistEO
0f8140753c fix: 修复adb正在运行时,强制替换不掉的问题 2022-11-23 22:37:30 +08:00
cenfusheng
200564a6a8 修复三个识别问题
影——傀影,桑芸——桑葚,罪——斥罪
2022-11-23 21:22:24 +08:00
MistEO
b051c6f099 Merge pull request #2861 from hguandl/fix/macos-arp
fix: 修复macOS启动卡住的问题
2022-11-23 21:20:47 +08:00
Hydrogina
5d98fd023e Merge branch 'dev' into dev 2022-11-23 20:06:41 +08:00
Hydrogina
2795384484 feat: 优化Copilot任务助战功能封装性 2022-11-23 19:59:59 +08:00
Hydrogina
ae6079e862 feat: 在gui添加“借助战作战”选项 2022-11-23 19:34:34 +08:00
Hydrogina
8bd902133a feat: 将借助战作战移入VisitTask
去除吃源石、吃理智药等冗余参数
2022-11-23 18:27:57 +08:00
Tastror
397f4c90a8 Merge pull request #2859 from wallsman/dev 2022-11-23 13:24:13 +08:00
Hao Guan
243931937a fix: 修复macOS启动卡住的问题 2022-11-23 10:16:58 +10:00
Wallsman
238dfcbaaf typo fix
fix typo
2022-11-23 06:49:08 +09:00
Wallsman
611e8f238b doc: Text update v4.7.0
Base ch text.
2022-11-23 06:33:05 +09:00
Wallsman
258081ee31 doc: Update text
Memo
Next ver. release to Image change.
2022-11-23 04:22:04 +09:00
MistEO
f24e218eb5 Merge pull request #2856 from MaaAssistantArknights/master
Release v4.7.0
2022-11-22 23:49:02 +08:00
MistEO
39929e7ad5 Merge pull request #2855 from MaaAssistantArknights/dev
Release v4.7.0 hotfix
2022-11-22 23:48:32 +08:00
MistEO
f8cc5b6750 Merge pull request #2854 from ajk946009123/dev
日服基建线索相关
2022-11-22 23:47:33 +08:00
MistEO
0db2226e1a Merge pull request #2826 from MaaAssistantArknights/master
Release v4.7.0
2022-11-22 23:45:51 +08:00
MistEO
d0af1cec90 Merge pull request #2853 from MaaAssistantArknights/dev
Release v4.7.0
2022-11-22 23:45:40 +08:00
MistEO
ec389a6509 docs: update changelog 2022-11-22 23:45:08 +08:00
ajk946009123
e1c6a2999f 日服基建线索相关 2022-11-22 23:44:31 +08:00
MistEO
1f39fc75b9 feat: Support Annihilation Combat for the EN client
fix #2691
2022-11-22 23:33:35 +08:00
MistEO
f22e98fb0c feat: 新增自动战斗自动编队识别错误时的重试机制 2022-11-22 23:21:49 +08:00
MistEO
9e6fc6a738 fix: 修复自动战斗自动编队有时候识别漏人的问题 2022-11-22 23:06:34 +08:00
MistEO
82418535ff fix: 修复自动战斗跳过剧情时,点的太快没跳过的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2848
2022-11-22 22:54:41 +08:00
MistEO
890f032375 fix: 修复前一个任务刚完成就停止,UI卡住的问题 2022-11-22 22:50:57 +08:00
MistEO
6ca90b52bc fix: 再次修复文字识别器的参数错误 2022-11-22 22:47:15 +08:00
MistEO
8fe6599e08 fix: 修复龙门币识别错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2747
2022-11-22 22:44:30 +08:00
MistEO
0b98dc3208 fix: 修复外服资源错误 2022-11-22 22:40:58 +08:00
MistEO
cd77388c36 fix: 修复文字器一处多态错误 2022-11-22 22:40:00 +08:00
Hydrogina
541ce591b2 feat:添加借助战作战赚信用功能 2022-11-22 18:23:29 +08:00
uye
ced7f27428 feat: 添加主线难度选择 (Normal/Hard) 2022-11-22 17:39:43 +08:00
MistEO
adba9affee chore: 更新抄作业视频演示地址 2022-11-22 01:18:32 +08:00
MistEO
effb5e9e4e build: 从主仓库release OTA包中删除ppocr 2022-11-22 01:07:54 +08:00
MistEO
f35f0de6ca docs: update JP doc 2022-11-22 00:58:17 +08:00
MistEO
110fc9e50a chore: 自动战斗删除一些过时的提示 2022-11-22 00:54:51 +08:00
MistEO
eed5d3a3d3 Merge pull request #2844 from MaaAssistantArknights/dev
Release v4.7.0-rc.1
2022-11-22 00:50:47 +08:00
MistEO
417f306b43 chore: 添加一些设置参数的日志 2022-11-22 00:49:14 +08:00
MistEO
2819166dfd fix: 修复一种可能的minitouch方向检测错误 2022-11-22 00:46:20 +08:00
MistEO
087c60e58e Merge pull request #2843 from MaaAssistantArknights/dev
Release v4.7.0-rc.1
2022-11-22 00:32:47 +08:00
MistEO
ca574a6b8c docs: update doc 2022-11-22 00:32:29 +08:00
MistEO
1269446ba7 docs: update docs 2022-11-22 00:18:50 +08:00
MistEO
05c902c11c docs: update FAQ 2022-11-21 23:51:55 +08:00
MistEO
590dac3390 feat: 删除minitouch临时开关 2022-11-21 23:43:06 +08:00
MistEO
8898ac4009 fix: 修复部分滑动太靠边导致的问题 2022-11-21 23:41:42 +08:00
MistEO
39705649a2 fix: 修复基建制造、贸易站偶尔点不上tab导致某个房间不换班的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2833
2022-11-21 23:40:11 +08:00
MistEO
185670b264 fix: 修复启动后AdbTouchMode设置不生效的问题 2022-11-21 23:35:19 +08:00
MistEO
01346f0613 feat: 添加adb触控兼容模式 2022-11-21 23:25:27 +08:00
uye
1879848120 Merge pull request #2842 from ntgmc/dev
更新 蓝叠模拟器,蓝叠模拟器国际版,夜神模拟器,MuMu模拟器,逍遥模拟器,MuMu模拟器X 说明
2022-11-21 22:15:18 +08:00
MAA无情关ISSUE人
c4429b83eb 更新 蓝叠模拟器,蓝叠模拟器国际版,夜神模拟器,MuMu模拟器,逍遥模拟器,MuMu模拟器X 说明
结合个人使用经历及各群群友反馈内容得出修改
2022-11-21 21:44:42 +08:00
DavidWang19
770cd127db Merge pull request #2819 from liuyifan-eric/dev
fix: Fix JP Rewards Collection JP任务领取修复 JP報酬受取の修正
2022-11-21 04:55:56 +00:00
DavidWang19
42a6cc275e Merge pull request #2834 from liuyifan-eric/fix/JP_wakeup
fix: fix JP auto wakeup
2022-11-21 04:54:50 +00:00
DavidWang19
03bd52d730 Update tasks.json 2022-11-21 04:38:26 +00:00
Yifan Liu
d196671255 fix: fix JP auto wakeup
change the ROI for JP server so it captures "TAP TO START"
2022-11-20 22:17:32 -06:00
uye
481714dd23 Merge pull request #2832 from Black1312/dev
修复基建霜叶识别错误
2022-11-21 08:32:20 +08:00
筱竹聽雨
a341bac7cc 修复基建霜叶识别错误
修复基建霜叶识别为"霸霜叶“的错误。issues/2823
2022-11-21 08:13:32 +08:00
MistEO
273cc4418a Merge pull request #2820 from MaaAssistantArknights/dev
Release v4.7.0-beta.2
2022-11-20 14:55:56 +08:00
MistEO
f0a7d68959 fix: update changelog 2022-11-20 14:55:42 +08:00
Yifan Liu
cf6fc5a723 fix JP task pic in main menu 2022-11-19 23:26:12 -06:00
MistEO
b4b5faf2ba fix: 修复一些自动战斗的bug 2022-11-20 05:22:07 +08:00
MistEO
22d89dd992 feat: 调低minitouch额外延迟 2022-11-20 03:10:54 +08:00
MistEO
281c0a470b feat: minitouch 全局开启 2022-11-20 03:07:58 +08:00
MistEO
dedf9a2e95 Merge pull request #2812 from MaaAssistantArknights/dev
Release v4.7.0-beta.1
2022-11-19 23:05:11 +08:00
MistEO
4b19fbb141 feat: 自动战斗支持开技能使用子弹时间 2022-11-19 23:04:42 +08:00
MistEO
3bd4069304 Merge pull request #2811 from MaaAssistantArknights/dev
Release v4.7.0-beta.1
2022-11-19 22:51:09 +08:00
MistEO
bcc7bdbc09 docs: update changelog 2022-11-19 22:50:08 +08:00
MistEO
a7a9ceaf7a Merge pull request #2766 from MaaAssistantArknights/feat/minitouch_posix
feat: 尝试为 MacOS 增加 minitouch 支持
2022-11-19 22:39:38 +08:00
MistEO
14f8d96f11 fix: 修复EN服肉鸽卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2803
2022-11-19 22:36:11 +08:00
MistEO
01bff8d972 fix: 修复连接断开重连后minitouch不工作的问题 2022-11-19 22:28:22 +08:00
MistEO
9dac57f8b4 fix: 修复部分模拟器上竖屏时minitouch坐标不能正确计算的问题 2022-11-19 21:36:58 +08:00
Horror Proton
bfdc3d43cc docs: update docs 2022-11-19 19:42:33 +08:00
uye
cb783ccf80 fix: 修复基建工作心情阈值显示与实际不符 2022-11-19 00:56:56 +08:00
MistEO
c510585fbd Merge pull request #2797 from MaaAssistantArknights/dev
Release v4.7.0-alpha.4
2022-11-18 22:23:21 +08:00
MistEO
fef6005f75 docs: update changelog 2022-11-18 22:23:11 +08:00
MistEO
da32d7e5b1 chore: 重命名内置基建作业 2022-11-18 22:20:41 +08:00
MistEO
dd968b8274 feat: 更新自定义基建协议 description_post 字段
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1911
2022-11-18 22:10:04 +08:00
MistEO
64634a9a94 fix: 去掉内置基建作业中的时间说明 2022-11-18 21:52:05 +08:00
筱竹聽雨
6528bd2f01 Update 243_layout_3_times_pre_day.json 2022-11-18 21:52:05 +08:00
MistEO
5aaae7077c Merge pull request #2790 from aa889788/dev
fix: 修复POSIX下socket超时时间过长的问题
2022-11-18 21:44:45 +08:00
MistEO
98e3f22bd6 chore: 删除一些注释 2022-11-18 21:44:02 +08:00
MistEO
88c2e5c691 fix: 修复minitouch竖屏下的操作错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2794
2022-11-18 21:38:20 +08:00
MistEO
35eb427a83 fix: 再次修复路径错误 2022-11-18 20:01:42 +08:00
MistEO
62817d8369 fix: 修复中文路径中minitouch上传错误 2022-11-18 19:50:43 +08:00
shxyke
0f1d615108 fix: 修复POSIX下socket超时时间过长的问题 2022-11-18 03:18:02 +00:00
DavidWang19
47f827e015 Update README.md 2022-11-17 17:12:42 +00:00
Horror Proton
5c7edb2d6a feat: update controller for posix 2022-11-17 22:45:41 +08:00
MistEO
04d0c61b2e Merge pull request #2784 from MaaAssistantArknights/dev
Release v4.7.0-alpha.3
2022-11-17 22:27:22 +08:00
MistEO
047a34cff2 feat: Support Annihilation Combat for the JP client (But without testing).
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2691
2022-11-17 22:23:07 +08:00
MistEO
a96136cfd9 docs: update docs 2022-11-17 22:10:20 +08:00
MistEO
32d4567c24 fix: 调整上干员滑动参数 2022-11-17 21:46:47 +08:00
MistEO
d300c026f9 Merge pull request #2770 from hguandl/fix/macos-config
fix: 修复 #2752 遗漏的 config 修改
2022-11-17 21:32:25 +08:00
Horror Proton
1d84c240a8 feat: update logging for minitouch operation 2022-11-17 20:12:48 +08:00
zzyyyl
6c8f51af22 fix: 修复肉鸽关卡识别错误导致内存疯狂占用的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2432
2022-11-17 18:01:23 +08:00
Horror Proton
6d10f56a98 feat: add minitouch control for posix 2022-11-17 12:29:31 +08:00
Hao Guan
32fbf8d9f2 fix: 修复 #2752 遗漏config修改 2022-11-17 10:05:12 +10:00
MistEO
842c6a9dac fix: 修复多次强制拷贝adb时的报错 2022-11-17 01:56:29 +08:00
MistEO
26cce08fd5 Merge pull request #2768 from MaaAssistantArknights/dev
Release v4.7.0-alpha.1
2022-11-17 00:48:59 +08:00
MistEO
0d0a824869 docs: update changelog 2022-11-17 00:48:22 +08:00
MistEO
a29d87296d docs: update changelog 2022-11-17 00:45:50 +08:00
MistEO
af07e2ddfd feat: 添加了一个自动重新加载资源的后门
新建 DEBUG.txt 即可
2022-11-17 00:30:46 +08:00
MistEO
7a8d9432bd perf: 调整战斗时滑动参数 2022-11-17 00:24:31 +08:00
MistEO
54a90186dd feat: 新增替换adb操作 2022-11-16 23:52:32 +08:00
MistEO
fd2ef4335b perf: 优化基建干员列表滑动次数 2022-11-16 22:53:52 +08:00
MistEO
c16d7e6111 Merge pull request #2751 from MaaAssistantArknights/feat/cubic_swipe
feat: 在 minitouch 滑动操作中使用三次插值
2022-11-16 22:45:31 +08:00
Horror Proton
3937595aad fix: use binary interpolation in slowly swipe task
velocity after swipe is not zero if cubic interpolation 0, 0 is used
2022-11-16 11:50:47 +08:00
Horror Proton
9454be263d feat: remove post delay in minitouch swipe 2022-11-16 10:38:23 +08:00
Horror Proton
9a4b01f760 feat: use cubic interpolation in minitouch swipe 2022-11-16 10:28:20 +08:00
MistEO
5202455301 Merge pull request #2759 from MaaAssistantArknights/perf/swipe_params
perf: 优化所有滑动任务参数
2022-11-16 01:39:08 +08:00
MistEO
8447162869 Merge pull request #2758 from MaaAssistantArknights/feat/jpInfrast
feat: Support Base for the JP client
2022-11-16 01:38:49 +08:00
MistEO
ad25df94cb fix: 修复基建部分房间滑不到头的问题 2022-11-16 01:35:04 +08:00
MistEO
bdb4f39c4c perf: 调整所有滑动任务参数 2022-11-16 01:27:26 +08:00
MistEO
f55acb4220 perf: 简单调整一点滑动延迟 2022-11-16 01:18:10 +08:00
MistEO
49484943fc feat: 新增minitouch abi检测 2022-11-16 01:18:10 +08:00
uye
c63b2bd94a feat: 添加日服基建图片 2022-11-16 01:00:17 +08:00
MistEO
55b0ce2118 Merge pull request #2753 from hguandl/fix/txwy-ocr-replace
fix: 修复繁中肉鸽的 OCR 替换词
2022-11-16 00:31:30 +08:00
MistEO
3a7a00d490 perf: adb 封装的一些优化 2022-11-16 00:11:00 +08:00
Hao Guan
2fb6ef096d fix: 避免用通配符去匹配宽字符 2022-11-15 23:53:14 +10:00
MistEO
a0e5c4614b Merge pull request #2754 from hguandl/fix/issue-2745
fix: 修复 Mac 信用商店设置错误
2022-11-15 21:41:05 +08:00
MistEO
a50a60c528 chore: 更新地图数据 2022-11-15 21:38:34 +08:00
Hao Guan
e8be52e366 fix: 修复Mac信用商店设置错误 2022-11-15 22:28:13 +10:00
uye
ebaed23681 fix: 修复资源关卡全开放时Tips显示不全 2022-11-15 20:02:20 +08:00
Hao Guan
8dab15d593 fix: 修复繁中肉鸽的OCR替换词 2022-11-15 21:53:17 +10:00
uye
96c3ac8eed fix: 修复危机合约开放后IS关导航问题 2022-11-15 18:38:07 +08:00
MistEO
4d021c4681 fix: 额外为minitouch每次操作增加延迟 2022-11-15 00:05:06 +08:00
MistEO
b73e24cbe9 perf: minitouch一些小优化 2022-11-14 23:37:17 +08:00
MistEO
9dad127ef3 refactor: 重构minitouch调用 2022-11-14 23:32:11 +08:00
zzyyyl
0491b1ede8 fix: 直线滑动 2022-11-14 22:42:35 +08:00
MistEO
b2009a92f6 fix: 修复本地changelog生成 2022-11-14 22:18:08 +08:00
MistEO
6eaf631943 Merge pull request #2743 from MaaAssistantArknights/feat/swipe_acce
feat: 优化 minitouch 滑动操作
2022-11-14 21:11:29 +08:00
Horror Proton
614f5033e7 fix: update char name ocr replace list 2022-11-14 19:35:25 +08:00
zzyyyl
17eb851d4b style: format 2022-11-14 19:16:34 +08:00
zzyyyl
4b943f0f7a feat: 增加滑动 interval,增加 SlowlySwipe postDelay,调整部分滑动参数 2022-11-14 19:16:26 +08:00
zzyyyl
eca64fda08 feat: swipe 的 up 也增加 50ms 延迟
否则可能 maa 等的时间 minitouch 没等,白等了.jpg
2022-11-14 19:16:18 +08:00
zzyyyl
d078c6fc37 feat: 增加滑动加速度参数 acceleration_coef
acceleration_coef∈(-1,1),=0表示匀速,>0表示加速,<0表示减速
超出范围会往反方向滑动一段
2022-11-14 17:20:15 +08:00
MistEO
0fad489ec7 Merge branch 'master' into dev 2022-11-14 01:36:34 +08:00
MistEO
4f5d04d771 feat: 为所有滑动选项打开minitouch 2022-11-14 01:22:18 +08:00
MistEO
52351348dc chore: 新增几个镜像站 2022-11-14 01:12:53 +08:00
MistEO
5dc465cee0 perf: 优化自动战斗干员部署,新增支持子弹时间、费用字段 2022-11-14 01:06:32 +08:00
MistEO
aa6df8bbcb fix: 修复滑动错误,优化肉鸽操作 2022-11-13 23:56:59 +08:00
MistEO
b1ea3c7ccb perf: 打开自动战斗的minitouch功能,调整战斗时部署干员的滑动参数 2022-11-13 23:28:32 +08:00
MistEO
d398c141cf Merge pull request #2642 from MaaAssistantArknights/feat/minitouch
feat: 新增支持 minitouch
2022-11-13 22:25:01 +08:00
MistEO
b2cc2ab931 fix: mac build error 2022-11-13 19:11:50 +08:00
MistEO
afd5fe8cdc perf: 优化了一些有的没的 2022-11-13 19:10:10 +08:00
MistEO
8179450da2 fix: 完全跑通minitouch管道 2022-11-13 19:00:09 +08:00
MistEO
289e897e27 feat: 暂时关闭minitouch,并优化一些controller的调用 2022-11-13 18:20:57 +08:00
MistEO
a16caa7849 fix: 暂时统一关闭minitouch,后续逐步适配并开启 2022-11-13 16:13:51 +08:00
MistEO
e150a2bf22 fix: 合并后的一些冲突问题及优化 2022-11-13 15:58:07 +08:00
MistEO
8d9704b37b perf: 增加minitouch额外滑动,调整参数 2022-11-13 15:41:58 +08:00
MistEO
c076a005a0 fix: build error on macOS 2022-11-13 15:41:36 +08:00
MistEO
2ccba7f101 fix: 修复minitouch参数错误 2022-11-13 15:41:36 +08:00
MistEO
50edd9e5e2 fix: 修复一些参数问题 2022-11-13 15:41:36 +08:00
MistEO
b8574ad1fb feat: 基本跑通minitouch 2022-11-13 15:41:36 +08:00
MistEO
8d9c5b9d8d feat: 调通minitouch写 2022-11-13 15:41:36 +08:00
MistEO
04d74f1c04 feat: 重构minitouch管道,但不知道为啥还是没反应 2022-11-13 15:41:36 +08:00
MistEO
a1b7598810 fix: build error on mac 2022-11-13 15:41:36 +08:00
MistEO
902783b851 feat: 命令支持minitouch点击和滑动(但是不知道为啥不起来) 2022-11-13 15:41:36 +08:00
MistEO
cb6b057f92 feat: 完成minitouch的push 2022-11-13 15:41:36 +08:00
MistEO
9055670e7d refactor: 重构controller,改为同步操作,修改部分接口参数 2022-11-13 15:41:33 +08:00
MistEO
ed107d6b35 Merge pull request #2716 from hguandl/feat/posix-socket
feat: 实现 POSIX socket 传输
2022-11-13 15:39:04 +08:00
MistEO
b46b278d5c fix: unix sock 一些小优化 2022-11-13 15:38:18 +08:00
MistEO
411c9a8538 Merge pull request #2717 from MaaAssistantArknights/feat/det_ascii
feat: 优化 isAscii、withoutDet 参数的处理
2022-11-12 14:53:53 +08:00
MistEO
1785f5fb8d perf: 优化mat拷贝行为 2022-11-12 00:57:24 +08:00
MistEO
c986354648 fix: warnings 2022-11-12 00:19:22 +08:00
zzyyyl
904d01684b fix: mac build error 2022-11-12 00:14:23 +08:00
Hao Guan
e1c3d30fbf cleanup 2022-11-12 02:08:23 +10:00
zzyyyl
4cabf9f53e Update src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp
Co-authored-by: MistEO <mistereo@hotmail.com>
2022-11-12 00:08:01 +08:00
MistEO
d9413606ab Merge pull request #2701 from zzyyyl/fix/#2692
fix: 修复通知报错
2022-11-12 00:07:53 +08:00
iguigui
d0c12b8fc2 Merge pull request #2714 from CaoMeiYouRen/master
fix: 修复 javaPath 路径错误; 修复 maaPath 路径错误
2022-11-11 23:59:19 +08:00
zzyyyl
d0e7a5211a feat: 优化 #2708,不使用 det 2022-11-11 23:23:06 +08:00
zzyyyl
c1a8dc4cc5 feat: 优化 without_det,使用 OcrWithPreprocessImageAnalyzer 2022-11-11 22:43:04 +08:00
Hao Guan
9614cff5e5 feat: 实现 POSIX socket 传输 2022-11-12 00:33:43 +10:00
zzyyyl
3699d19042 feat: 把 isAscii 写进 tasks.json,在 analyzer set_task_info 时自动设置 is_ascii 2022-11-11 21:22:04 +08:00
CaoMeiYouRen
7e3c3d558a fix: 修复 javaPath 路径错误; 修复 maaPath 路径错误 2022-11-11 21:17:10 +08:00
zzyyyl
e36a02cea6 chore(issue-checker): 增加 issue-checker 标签 macOS 的关键词 2022-11-11 17:55:23 +08:00
zzyyyl
b959958dfc Merge pull request #2708 from txtxj/dev
feat: 水月肉鸽支持活用安全屋选项

fix #2055
2022-11-11 17:34:22 +08:00
LyeaChan
632f479e0f feat: 安全屋再利用选项 next 改为 StageEncounterOption#next 2022-11-11 15:34:05 +08:00
LyeaChan
545fb1ef00 feat: 水月肉鸽支持活用安全屋选项 2022-11-11 13:44:48 +08:00
uye
876f8296a8 Merge pull request #2706 from MaaAssistantArknights/dev
Release v4.6.13
2022-11-11 01:23:43 +08:00
uye
5fe5335a5c docs: update changelog 2022-11-11 01:22:36 +08:00
MistEO
c7f1d633ff fix: 修复基建内置作业错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2689
2022-11-10 22:14:35 +08:00
lhhxxxxx
05dc0147c1 feat. 增加始终自动检测连接选项 2022-11-10 22:10:48 +08:00
MistEO
35aa7379a5 Merge pull request #2683 from MaaAssistantArknights/docs/typos
docs: 修复文档中的一些拼写问题
2022-11-10 21:52:23 +08:00
uye
4c839ba817 feat: 清空作业或输入错误时链接变为作业站网址 2022-11-10 20:50:11 +08:00
uye
7b34f4fe1c feat: 修改几个链接的显示位置 2022-11-10 20:23:30 +08:00
uye
6970094a12 Merge pull request #2673 from MaaAssistantArknights/feat/infrast_list
feat: 添加基建排班内置配置文件选择
2022-11-10 19:12:32 +08:00
uye
b159e48a0a feat: 添加8群与频道链接 2022-11-10 19:11:33 +08:00
zzyyyl
88aa12e60b style: 优化格式 2022-11-10 15:23:58 +08:00
zzyyyl
07b58a8a50 fix: 通知异常时使用兼容版通知 2022-11-10 14:50:51 +08:00
zzyyyl
2fca0a3203 feat: 给通知相关的套一层 Execute.OnUIThread
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2692
2022-11-10 14:28:37 +08:00
zzyyyl
02d203a248 fix: typos 2022-11-09 23:34:49 +08:00
zzyyyl
72263db4de fix: 修复有时 Failed initializing notifications 的问题
加了一层 try catch

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2692
2022-11-09 23:33:05 +08:00
uye
836a3c6212 doc: 更新mumuX模拟器 2022-11-09 18:45:11 +08:00
Horror Proton
b6b65cd43a docs: fix typos 2022-11-09 11:49:38 +08:00
uye
4892142df2 feat: "user_defined"改为变量 2022-11-09 00:15:10 +08:00
zzyyyl
7cdea06f59 Merge pull request #2672 from MaaAssistantArknights/dev
Release v4.6.12
2022-11-09 00:12:10 +08:00
zzyyyl
b629e6ba35 fix: 修复 1-7 进不去的问题 again 2022-11-09 00:07:18 +08:00
zzyyyl
51836dd8d4 docs: update changelog 2022-11-09 00:05:16 +08:00
zzyyyl
a1d3b606ea fix: 修复 部分主线关卡 进不去的问题 2022-11-09 00:05:08 +08:00
zzyyyl
1064dea5db fix: 修复 刷理智 战斗结束后误判游戏崩溃的可能问题 2022-11-09 00:05:00 +08:00
MistEO
672094ca0a docs: update changelog 2022-11-08 23:57:30 +08:00
uye
3e7fba84f8 feat: 使用基建内置配置时不可修改文本框内容 2022-11-08 23:54:40 +08:00
zzyyyl
3746e6b343 docs: update changelog 2022-11-08 23:31:12 +08:00
zzyyyl
5748a8e927 fix: 修复 1-7 进不去的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2670
2022-11-08 23:26:13 +08:00
uye
353fb41a55 feat: 添加基建排班内置配置文件选择 2022-11-08 23:09:28 +08:00
MistEO
00460754ee Merge pull request #2669 from MaaAssistantArknights/dev
Release v4.6.11
2022-11-08 22:35:44 +08:00
MistEO
3abf8e5f27 fix: 修复公招一定次数后卡住的问题 2022-11-08 22:35:09 +08:00
MistEO
614847935f chore: 新版本OTA打包的时候,别急.jpg 2022-11-08 21:15:44 +08:00
MistEO
a93c3d3c63 Merge pull request #2668 from MaaAssistantArknights/dev
Release v4.6.10
2022-11-08 20:42:56 +08:00
MistEO
ef4c7218cf chore: 更新mac代码 2022-11-08 20:40:36 +08:00
MistEO
bf15b7ad09 fix: 修复自动战斗编队时的滑动错误 2022-11-08 20:38:40 +08:00
MistEO
f0e4bf7b09 Merge pull request #2666 from MaaAssistantArknights/dev
Release v4.6.9
2022-11-08 19:21:35 +08:00
zzyyyl
b6dc09a5b5 fix: 更新 EX 关卡更新后的活动入口 2022-11-08 18:57:47 +08:00
zzyyyl
8793be0588 feat: 调整选择干员时的滑动参数 2022-11-08 16:45:31 +08:00
MistEO
59f9cf03df Merge pull request #2664 from MaaAssistantArknights/dev
Release v4.6.8
2022-11-08 16:18:48 +08:00
MistEO
4d222e7992 docs: update changelog 2022-11-08 16:18:24 +08:00
MistEO
baaead6895 chore: update ark bot resources 2022-11-08 16:14:37 +08:00
MistEO
bfb16d5a8b fix: 简单修复下傀影肉鸽不期而遇卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2662
2022-11-08 15:47:37 +08:00
MistEO
fe93b27515 Merge pull request #2654 from horror-proton/test/nightly_strip
chore: 从 nightly 的 OTA 中去除 `*.lib` 和 `*.pdb`
2022-11-08 15:34:58 +08:00
uye
8a7e71c0f2 fix: 修复4点更新后公开招募任务卡商店的问题 2022-11-08 12:05:53 +08:00
Horror Proton
d30e88fff2 chore: remove lib and pdb files from nightly OTA 2022-11-07 23:25:32 +08:00
Hao Guan
f329624b9e fix: 修复 Mac 肉鸽干员及练度识别 2022-11-07 23:38:39 +10:00
MistEO
a98be921da fix: 修复一些可能的数字识别错误 2022-11-07 21:21:16 +08:00
lhhxxxxx
56d75bc2ab feat. 优化153基建 2022-11-07 21:17:38 +08:00
MistEO
81a1569a24 Merge pull request #2649 from MaaAssistantArknights/dev
Release v4.6.7
2022-11-07 20:26:34 +08:00
MistEO
d5f69687f6 docs: update changelog 2022-11-07 20:26:16 +08:00
MistEO
0b921ef4db perf: 优化肉鸽“水月”干员技能,使用1技能
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2651
2022-11-07 20:13:06 +08:00
MistEO
9bfd4246ec fix: 修复繁中基建宿舍无法进入的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2652
2022-11-07 19:59:48 +08:00
MistEO
2d28d448bf chore: 更新自定义基建内置243 3换作业 2022-11-07 19:56:51 +08:00
MistEO
32cacd4b0d fix: store error for JP client
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2646
2022-11-07 16:02:58 +08:00
zzyyyl
28576c1ad9 Merge pull request #2635 from MaaAssistantArknights/feat/nightly_workaround
ci: Allow input nightly tag
2022-11-06 22:03:33 +08:00
Tastror
3355b97d26 Merge pull request #2633 from wallsman/dev
doc: tweak and translation JP lines
2022-11-06 21:00:33 +08:00
zzyyyl
e62cfdbf8d docs: Update 3.4-任务流程协议.md 2022-11-06 20:47:19 +08:00
zzyyyl
ee12dc56d1 chore: 增加 IssueBot 标签 macOS,增加其它标签的一些关键词 2022-11-06 19:20:48 +08:00
zzyyyl
00073745c9 fix: 修复 归溟幽灵鲨 的识别问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2638
2022-11-06 18:29:16 +08:00
uye
ea6842d94c Update 3.4-任务流程协议.md 2022-11-06 17:19:10 +08:00
zzyyyl
ddbcbd6481 Merge pull request #2636 from MaaAssistantArknights/dev
Release v4.6.7-beta.4
2022-11-06 16:17:49 +08:00
zzyyyl
9c17767484 docs: update changelog 2022-11-06 16:01:23 +08:00
zzyyyl
cc4e4bde3c ci: allow input nightly tag 2022-11-06 15:55:40 +08:00
zzyyyl
6a1b72638e fix: 修复 beta.3 打开即闪退的问题 2022-11-06 15:52:27 +08:00
uye
23f49acbc4 Update 3.6-基建排班协议.md
fix #2625
2022-11-06 15:49:24 +08:00
uye
8d2664e0cc feat: 更新顶配基建作业 2022-11-06 15:32:13 +08:00
Wallsman
12787f8f0e Update ja-jp.xaml 2022-11-06 16:13:11 +09:00
Wallsman
ac39e81db4 doc: tweak JP line
Has the argument changed? <system:String x:Key="IdentifyTheMistakes">
2022-11-06 16:05:34 +09:00
MistEO
4df87953f3 Merge pull request #2629 from MaaAssistantArknights/dev
Release v4.6.7-beta.3
2022-11-06 14:13:15 +08:00
MistEO
63691306e0 perf: 优化自动更新的版本号解析 2022-11-06 14:12:41 +08:00
MistEO
c43dfcb7e0 docs: update changelog 2022-11-06 14:02:46 +08:00
MistEO
878c908829 Merge pull request #2626 from MaaAssistantArknights/feat/TaskData
feat: 优化 TaskData
2022-11-06 13:59:20 +08:00
MistEO
63d7857e71 fix: 修复nightly版本检查更新不正确的问题 2022-11-06 02:56:33 +08:00
zzyyyl
ca39ae1c14 feat: baseTask 定义但留空表示不使用已生成的同名任务
例如国际服覆写不使用同名国服任务

perf: 检测任务是否循环依赖(在此之前若循环依赖会直接 runtime error (递归爆栈))

例如 `"A": { "baseTask": "A" }`
2022-11-06 01:58:05 +08:00
zzyyyl
45af45d73e feat: 把 get 和 get_raw 放进 .cpp 而不是 .h 中 2022-11-06 01:57:56 +08:00
MistEO
98b60e9d18 Merge pull request #2621 from MaaAssistantArknights/perf/stage_nav
feat: 优化关卡导航
2022-11-06 00:57:00 +08:00
MistEO
01af0ffc24 feat: 支持外服基建收菜 2022-11-06 00:36:52 +08:00
Vincent-2019
46b7682b50 feat: 完善繁中服基建任务 (#2623)
* Update tasks.json

* Update tasks.json

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-11-05 23:47:10 +08:00
MistEO
1087690f59 feat: 新增dll无法加载时弹窗的解决方案提示
ref to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2620
2022-11-05 23:27:05 +08:00
zzyyyl
824669c684 feat: 把繁中服的 LS-6 和 CE-6 导航替换成 LS-5 和 CE-5 2022-11-05 22:54:12 +08:00
zzyyyl
789dbb813a feat: 优化关卡导航
1. 删除章节导航的“未解锁”并使用 CharOcr
2022-11-05 21:53:55 +08:00
uye
b2e7cc4afc fix: fix typo 2022-11-05 20:12:34 +08:00
zzyyyl
ba708e0a87 style: format 2022-11-05 19:01:27 +08:00
MistEO
ac511992e2 Merge pull request #2615 from MaaAssistantArknights/dev
Release v4.6.7-beta.2
2022-11-05 18:25:44 +08:00
MistEO
3a15a74129 docs: update changelog 2022-11-05 18:24:56 +08:00
MistEO
7b50951c80 Merge pull request #2612 from MaaAssistantArknights/feat/episode
feat: 优化主线关卡导航逻辑
2022-11-05 18:14:19 +08:00
MistEO
7cacdd9512 fix: 尝试修复基建掉线后无法重连的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2579
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2521
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2510
2022-11-05 18:10:18 +08:00
MistEO
c04dbb6d7c fix: 修复访问好友失败不报错的问题 2022-11-05 18:00:54 +08:00
MistEO
68b096aceb fix: 尝试修复基建选人有时候滑不到最左边的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2613
2022-11-05 17:58:04 +08:00
MistEO
96ba747663 fix: fix replace error in JP task
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2601
2022-11-05 17:45:45 +08:00
uye
8a8bdce98f feat: 添加isAscii 2022-11-05 17:42:32 +08:00
uye
09cbb365d4 feat: 优化主线关卡导航逻辑 2022-11-05 17:25:50 +08:00
MistEO
42db89cdb1 chore: update resources for overseas clients
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2601
2022-11-05 17:19:06 +08:00
MistEO
3b01e8f6f9 fix: 尝试修复自动战斗、肉鸽偶现不设置干员方向的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2549
2022-11-05 17:13:04 +08:00
MistEO
a470ab442a feat: 调整自动基建中异格干员的效率计算
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2574
2022-11-05 17:05:54 +08:00
MistEO
ab1cad05a2 fix: 调整滑动参数,修复部分滑动惯性导致的错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2596
2022-11-05 16:49:31 +08:00
MistEO
4182eecc43 fix: build error 2022-11-05 16:48:02 +08:00
MistEO
e723b22ecd feat: 增加一个是否使用原始数据进行OCR的配置项
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2604
2022-11-05 16:32:29 +08:00
Horror Proton
b0b0fd3a64 chore: upload latest release to server 2022-11-05 10:00:34 +08:00
Horror Proton
1a88f572cc chore: upload OTA to server 2022-11-05 10:00:19 +08:00
MistEO
6bfe952bfa perf: 新增一些可用的github镜像站 2022-11-05 02:16:41 +08:00
zzyyyl
ac2b54457f feat: 关卡导航若进入章节界面时已经出现待选关卡则直接点击不再滑动 (#2591)
* feat: 关卡导航时若进入章节界面时已经出现对应关卡,不再滑动

* fix: typos

* Update tasks.json

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-11-04 23:08:29 +08:00
MistEO
59aa87a823 Merge pull request #2594 from WWPXX233/dev
feat: 简单改了改影子哥肉鸽
2022-11-04 23:07:37 +08:00
MistEO
9f013a59a6 feat: 新增从 ota.maa.plus 下载 OTA 包 2022-11-04 23:02:43 +08:00
WWPXX
625ccd2c6d 简单改了改影子哥肉鸽 2022-11-04 16:32:16 +08:00
zzyyyl
68c5a67bde perf: 给一些关卡导航的 OCR 使用 isAscii 优化 2022-11-03 23:47:23 +08:00
zzyyyl
adc2a3e623 feat: 给 OcrTaskInfo 加一个 without_det,默认 false;进入关卡前的关卡名识别不使用检测模型 2022-11-03 23:13:53 +08:00
zzyyyl
413ae17f21 feat: 给 OcrTaskInfo 加一个 is_ascii,默认 false;关卡识别仍然使用 CharModel 2022-11-03 23:13:53 +08:00
zzyyyl
02bca1130b feat: 主线关卡导航也改用 tasks.json 逻辑 2022-11-03 23:13:53 +08:00
uye
ebb243d574 Merge pull request #2587 from MaaAssistantArknights/ABA2396-2
refactor: 修改主线导航方式
2022-11-03 22:06:40 +08:00
zzyyyl
d2959e5266 fix: 修复 #self 任务有时崩溃的问题 2022-11-03 21:24:20 +08:00
MistEO
6ff7754151 Merge pull request #2573 from anywugn/master
feat: 更新基建作业243一日四换至2022年11月版本
2022-11-03 21:23:53 +08:00
MistEO
ffb37d670a Merge pull request #2582 from horror-proton/test/nightly_ota
chore: 新增发 nightly 版本的 workflow
2022-11-03 21:23:39 +08:00
Hao Guan
b5cd1a018f fix: 修复macOS采购中心识别错误 (#2583)
* fix: 修复macOS采购中心识别错误

* Update tasks.json

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-11-03 21:23:11 +08:00
Horror Proton
a5ce8f0234 chore: add NuGet cache for nightly build workflow 2022-11-03 20:37:40 +08:00
Horror Proton
853d6542eb chore: use git describe semver 2022-11-03 20:37:40 +08:00
Horror Proton
9aa4a299d9 chore: add nightly build workflow 2022-11-03 20:37:40 +08:00
uye
0efbfe6293 refactor: 主线导航改为从左往右寻找 2022-11-03 20:27:06 +08:00
uye
e44913f67c Merge pull request #2584 from MaaAssistantArknights/ABA2396-1
refactor: 滑动任务改为#next
2022-11-03 19:09:05 +08:00
uye
98ce13b8b5 refactor: 滑动任务改为#next 2022-11-03 18:35:09 +08:00
zzyyyl
797f418f5b style: format 2022-11-03 18:07:10 +08:00
zzyyyl
faab4b3c18 feat: 增加 #self 任务
`"A": { "next": [ "#self" ] }`
`A->self = A`
`B@A->self = B@A`
2022-11-03 18:05:29 +08:00
zzyyyl
b02ed4e588 fix: 修复网络不佳时信用商店卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2564
2022-11-03 17:40:27 +08:00
Horror Proton
2c572199cf feat: allow custom version in MaaBuilder 2022-11-03 15:27:08 +08:00
MistEO
a622bb6c89 feat: 自动基建新干员技能效率支持
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2580
2022-11-03 14:51:43 +08:00
MistEO
4f040c9ab2 fix: 修复网络不佳时信用商店卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2564
2022-11-03 14:41:16 +08:00
AnyWugn
f00abbb42f 更新基建作业243一日四换至2022年11月版本 2022-11-02 11:58:49 -07:00
uye
ba645aa787 fix: 修复活动导航可能遇到的问题 2022-11-03 01:50:26 +08:00
zzyyyl
a5cd569f01 feat: 肉鸽招募前先往前翻两页,因为有可能进招募界面时不是从最左边开始
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2571
2022-11-03 01:26:18 +08:00
uye
dd952714f9 fix: 修复活动开放时间判断错误 2022-11-03 00:40:55 +08:00
MistEO
965f92cd7d Merge pull request #2570 from MaaAssistantArknights/dev
Release v4.6.7-beta.1
2022-11-03 00:22:56 +08:00
MistEO
297cf35eeb docs: update changelog 2022-11-03 00:22:42 +08:00
MistEO
1ecc9f060e perf: 优化自动战斗输入神秘代码时重复请求的问题 2022-11-03 00:14:11 +08:00
MistEO
1983bc2424 fix: 修复自动战斗没有剧情时不开始的问题 2022-11-03 00:14:11 +08:00
MistEO
94c08cfd89 Merge pull request #2565 from dantmnf/dev
fix: suppress exception on RegistryKey.OpenSubKey fail
2022-11-03 00:11:17 +08:00
zzyyyl
376cbbc3b8 feat: 增加活动商业洽谈会弹窗的自动关闭 2022-11-03 00:04:00 +08:00
uye
0ae74d8fe3 feat: 叙拉古人活动导航 2022-11-02 22:51:14 +08:00
MistEO
3d51081294 feat: 自动战斗支持自动跳过战斗前剧情 2022-11-02 22:34:55 +08:00
MistEO
d3bf05b6e0 fix: 修复加载资源时的crash 2022-11-02 22:32:25 +08:00
MistEO
c5b95bc303 Merge pull request #2550 from MaaAssistantArknights/feat/cover_task
feat: tasks.json 中,国际服资源显式声明的参数覆写同名国服资源
2022-11-02 22:05:55 +08:00
MistEO
7a08bf6b46 fix: fix resource load failed for ZH_CHT and JP client 2022-11-02 22:05:31 +08:00
MistEO
d6fca7b6a1 chore: 更新外服资源及文档 2022-11-02 21:58:49 +08:00
MistEO
f989f5d84d feat: 分离不同肉鸽的招募、购物配置 (#2562) 2022-11-02 21:30:51 +08:00
MistEO
d07b5e8b05 Merge pull request #2546 from MaaAssistantArknights/perf/swipe_task
refactor: 重构滑动任务
2022-11-02 21:18:24 +08:00
dantmnf
f6bfdd54b6 fix: suppress exception on RegistryKey.OpenSubKey fail 2022-11-02 20:54:34 +08:00
Hao Guan
769ce6d79d fix: mix Vision OCR revisions 2022-11-02 22:02:13 +10:00
uye
3acee1f7d9 fix: 修复野鬃识别问题
fix #2559
2022-11-02 19:22:39 +08:00
uye
260139052a style: 修改肉鸽策略描述 2022-11-02 18:35:28 +08:00
zzyyyl
cd77beee43 fix: 修复B服更新后无法打开方舟的问题
换了个包名

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2553
2022-11-02 17:34:41 +08:00
uye
8c331c3e5f fix: 修复缄默德克萨斯识别问题 2022-11-02 01:33:52 +08:00
MistEO
64cbc15568 Merge branch 'perf/swipe_task' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into perf/swipe_task 2022-11-02 00:25:03 +08:00
MistEO
2fe3d84b4b fix: 调整滑动参数 2022-11-02 00:24:54 +08:00
uye
182fc61c82 fix: 修复缄默德克萨斯识别问题 2022-11-02 00:20:42 +08:00
zzyyyl
157c548d0d fix: 修复错别字,UnableToAgent 小优化 2022-11-01 23:59:15 +08:00
MistEO
60ab6ac729 fix: 修复一些 task 错误,调整参数 2022-11-01 23:56:05 +08:00
MistEO
6092c283bc fix: typos 2022-11-01 23:36:26 +08:00
MistEO
c9a354d238 refactor: 重构滑动任务 2022-11-01 23:24:14 +08:00
zzyyyl
2596c9437b feat: tasks.json 中,同名国际服资源显式声明的参数覆写国服资源 2022-11-01 21:26:08 +08:00
MistEO
746574d8cb Merge pull request #2545 from MaaAssistantArknights/master
Release v4.6.6
2022-11-01 18:13:28 +08:00
MistEO
bb6faab2af Merge pull request #2544 from MaaAssistantArknights/dev
Release v4.6.6
2022-11-01 18:11:32 +08:00
MistEO
eea0050dba Update CHANGELOG.md 2022-11-01 18:11:22 +08:00
MistEO
d269ef69a8 fix: 修复 release note 太长时崩溃的问题 2022-11-01 18:07:34 +08:00
MistEO
9bd2866cf0 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-11-01 17:59:28 +08:00
MistEO
117f5fa115 Merge pull request #2539 from horror-proton/test/better_ota
chore: OTA 打包时在 MaaRelease 创建新的 commit 和 tag
2022-11-01 17:58:31 +08:00
Horror Proton
f6b85040f6 chore: push new commit and tag to MaaRelease in workflow 2022-11-01 17:28:03 +08:00
Horror Proton
cc84d689ee fix: fix normal release issue in OTA workflow 2022-11-01 17:27:14 +08:00
MistEO
aeda24cba0 chore: 更新泰迪的资源 2022-11-01 16:58:59 +08:00
MistEO
9bdb60ac4c Merge pull request #2538 from MaaAssistantArknights/master
Release v4.6.5
2022-11-01 16:34:19 +08:00
MistEO
1ba88343b3 Merge pull request #2541 from MaaAssistantArknights/dev
docs: update changelog
2022-11-01 16:33:53 +08:00
MistEO
2eed9cc19e docs: update changelog 2022-11-01 16:33:40 +08:00
MistEO
6ad11e123a Merge pull request #2537 from MaaAssistantArknights/dev
Release v4.6.5
2022-11-01 13:56:22 +08:00
MistEO
9dcde5fdf0 docs: update changelog 2022-11-01 13:55:12 +08:00
MistEO
19f3854dc1 chore: 更新221101游戏数据 2022-11-01 13:31:24 +08:00
MistEO
475d49d14b Merge pull request #2522 from MaaAssistantArknights/dev
Release v4.6.5-rc.1
2022-11-01 00:04:27 +08:00
MistEO
36215f0d96 docs: update changelog 2022-10-31 23:20:50 +08:00
MistEO
880f33b208 fix: 修复界面*显示错误 2022-10-31 23:10:45 +08:00
MistEO
33841362bf fix: 修复战斗中嵯峨识别错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2529
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2317
2022-10-31 23:10:15 +08:00
MistEO
e2b2366481 fix: 修复肉鸽不期而遇卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2527
@zzyyyl 背锅!
2022-10-31 22:47:38 +08:00
MistEO
1e6c33527b perf: 优化c#日志打印 2022-10-31 22:40:39 +08:00
MistEO
f27e9199d4 perf: rename UILogColor 2022-10-31 22:20:02 +08:00
MistEO
fee582a2bf perf: 优化检查更新返回逻辑,新增提示重启弹窗 2022-10-31 22:18:19 +08:00
MistEO
1396bddb18 perf: 优化检查更新类型 2022-10-31 21:18:39 +08:00
MistEO
697b37b971 chore: 更新数据资源 2022-10-31 20:58:12 +08:00
MistEO
881e9e23d6 Merge pull request #2524 from MaaAssistantArknights/perf/new_version_toast
perf: 整理检查更新的弹出通知逻辑,做了一下i18n
2022-10-31 20:55:48 +08:00
zzyyyl
8a2506b1cf Update src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs
Co-authored-by: MistEO <mistereo@hotmail.com>
2022-10-31 20:06:16 +08:00
zzyyyl
826008551c feat: 检查更新失败时不报 “已是最新版本” 而是报错 2022-10-31 16:19:25 +08:00
MistEO
f1a31de286 perf: 整理检查更新的弹出通知逻辑,做了一下i18n 2022-10-31 15:37:18 +08:00
zzyyyl
6177369408 fix: 修复有时关闭模拟器抛未处理异常的问题 2022-10-31 14:09:19 +08:00
zzyyyl
7084dede2f fix: Nightly 时放宽当前版本要求
只要不是 DEBUG 版本都行
2022-10-31 13:39:19 +08:00
MistEO
27f3ad7e73 Merge pull request #2518 from horror-proton/test/better_ota
chore: 更新 OTA 脚本, 同步 Pre-release 类型
2022-10-31 13:33:19 +08:00
MistEO
ab82930118 Merge pull request #2517 from MaaAssistantArknights/feat/nightly
feat: 内测版本更新 GUI 选项
2022-10-31 13:32:59 +08:00
MistEO
7b0d9168f5 docs: 新增 GPU 版本下载地址 2022-10-31 01:12:09 +08:00
Horror Proton
97835f7bf0 chore: sync pre-release info to MaaRelease 2022-10-30 23:50:35 +08:00
Horror Proton
8175cd6e82 chore: update OTA build script 2022-10-30 23:50:35 +08:00
MistEO
b3549c49a7 perf: 更新ppocr,启动时不再打印日志 2022-10-30 23:01:29 +08:00
zzyyyl
dca4a21487 fix: 修复笔误 2022-10-30 22:53:04 +08:00
zzyyyl
2968ec6552 feat: 更新检查更新逻辑 2022-10-30 22:45:30 +08:00
zzyyyl
3e4efddd0c feat: 调整几个版本在下拉框的位置 2022-10-30 20:19:48 +08:00
zzyyyl
52ce7ae26b feat: 略微调整更新设置界面 2022-10-30 20:19:48 +08:00
zzyyyl
e4ef921c0a feat: 一些翻译 2022-10-30 20:19:48 +08:00
zzyyyl
e0acccf634 feat: 更新类别使用下拉框,找不到OTA时弹出消息而不是错误框 2022-10-30 20:19:48 +08:00
zzyyyl
907627cbf6 feat: 增加内测版本更新 GUI 选项
勾选内测版更新后,在 MaaRelease 仓库中若最新者不是当前版本,则直接使用该版本。
测试版和稳定版检测版本号是否为v开头的版本,内测版不做检查。
2022-10-30 20:19:40 +08:00
zzyyyl
571577f457 feat: 章节导航允许划动多次 2022-10-30 20:19:01 +08:00
Hao Guan
b1da06b6a8 fix: update mac app 2022-10-30 22:12:54 +10:00
MistEO
f2df4a8315 chore: 删除空行 2022-10-30 18:55:57 +08:00
MistEO
27b7bb253b chore: rename rear_delay to post_delay 2022-10-30 18:52:33 +08:00
MistEO
ebf34d5966 chore: 删除用不上了的工具 2022-10-30 18:52:33 +08:00
zzyyyl
50b4cc073e chore: 删除没啥用的图片资源 2022-10-30 17:00:32 +08:00
MistEO
8c29796f4c chore: 更新翻译字段名 2022-10-30 15:52:51 +08:00
MistEO
6b1e320bd6 chore: 删除没啥用的图片资源 2022-10-30 15:48:53 +08:00
uye
ca0080f251 feat: 肉鸽重启后不改变勾选状态
#2499
2022-10-30 15:45:11 +08:00
uye
9fb4790816 fix: 修复伊桑识别错误 2022-10-30 15:09:31 +08:00
Hao Guan
afeed42931 Sync macOS App updates 2022-10-30 16:30:08 +10:00
Horror Proton
aee4969748 chore: add default value for auto triggered OTA workflow 2022-10-30 13:53:45 +08:00
zzyyyl
45d331726a fix: 修复水月肉鸽boss关跑路的问题 2022-10-30 13:02:55 +08:00
zzyyyl
b9adabc231 fix: 修复 OTA 内无子文件夹时且当前文件夹下无.old文件夹时更新报错的问题 2022-10-30 11:46:28 +08:00
MistEO
36aa322a24 fix: 兼容连接模式不真实获取uuid
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2495
2022-10-30 05:55:01 +08:00
MistEO
e7530fe781 fix: 尝试修复傀影肉鸽不期而遇卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2304
2022-10-30 05:13:18 +08:00
MistEO
3344771d02 fix: 修复台服肉鸽分队名识别错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
2022-10-30 05:07:42 +08:00
MistEO
289a09be00 Merge pull request #2507 from MaaAssistantArknights/dev
Release v4.6.5-beta.4
2022-10-30 04:22:58 +08:00
MistEO
4887e81a1c docs: update changelog 2022-10-30 04:22:33 +08:00
MistEO
12c6d37d6f chore: update mac ui 2022-10-30 04:22:06 +08:00
MistEO
05aaa781d4 fix: 肉鸽刷源石锭模式不再截图
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2488
2022-10-30 04:20:38 +08:00
MistEO
0aa9afe19b fix: C# warning 2022-10-30 04:05:44 +08:00
MistEO
7bcc73ac82 fix: 修复关卡导航往右滑不到位的问题 2022-10-30 04:03:30 +08:00
MistEO
95d80ee7d7 fix: 修复资源本关卡导航失效的问题 2022-10-30 03:29:59 +08:00
MistEO
19f8d57a9f chore: 不再支持点击用户隐私协议
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2426
2022-10-30 03:01:07 +08:00
MistEO
d0e262473d Revert "fix: 修复卡在隐私协议界面的问题"
This reverts commit e641692b53.

涉及用户协议,可能存在法律风险,经项目组讨论,不建议帮用户点

close https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2426
2022-10-30 02:56:33 +08:00
MistEO
fd0b73c27a docs: update changelog and package def 2022-10-30 02:55:45 +08:00
MistEO
340a9c030e Merge pull request #2418 from MaaAssistantArknights/perf/task
perf: 对任务流程及配置的一些优化
2022-10-30 02:51:44 +08:00
Horror Proton
11f8ca6507 chore: update OTA filenames, etc 2022-10-30 02:30:18 +08:00
Horror Proton
2774c48168 chore: add md5sum.txt in OTA pack 2022-10-30 02:30:18 +08:00
Horror Proton
a7523c2a99 chore: add OTA workflow 2022-10-30 02:30:18 +08:00
MistEO
f786dfe9de docs: update pictures 2022-10-30 02:30:18 +08:00
MistEO
ade6eeac78 docs: 修改 ISSUE 模板 2022-10-30 02:30:18 +08:00
Yanstime
f37ca0d2f6 Update 1.1-详细介绍.md 2022-10-30 02:30:18 +08:00
Yanstime
6759a8e19c Update 1.1-详细介绍.md 2022-10-30 02:30:18 +08:00
uye
6cd1518a15 fix: 尝试修复 指定材料 功能的问题
fix #2354
fix #2431
fix #2476
2022-10-30 02:26:22 +08:00
MistEO
350c8420d9 Merge pull request #2506 from MaaAssistantArknights/feat/ota
feat: 更新 GUI 的 OTA 机制
2022-10-30 02:26:22 +08:00
MistEO
1dc1a1fac3 chore: update server name for PenguinStats 2022-10-30 02:23:53 +08:00
MistEO
81fe123ca2 fix: 修复台服高资识别错误的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2508
2022-10-30 02:22:33 +08:00
MistEO
e0306fbfb1 fix: 修复更新后保存gui.json时冲突的问题 2022-10-30 00:43:35 +08:00
zzyyyl
44c369dc50 feat: 更新 OTA 机制 2022-10-30 00:43:12 +08:00
MistEO
ca1bcc3566 fix: 更新飞桨接口,尝试修复一个崩溃问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2500
2022-10-30 00:24:26 +08:00
zzyyyl
b722ab6006 fix: 修复更新出错的问题 2022-10-29 22:04:46 +08:00
zzyyyl
1d7529cb93 fix: 尝试修复不期而遇卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2501
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2478
2022-10-29 21:22:53 +08:00
zzyyyl
d2a0249e35 fix: 修复有时商店购买进阶券/招募券卡住的问题 2022-10-29 21:18:14 +08:00
MistEO
83488137f5 Merge pull request #2504 from StarWishLXH/dev
fix: 修复ADB重连失败重启模拟器重试功能在重试时不进行任何操作直接停止
2022-10-29 20:37:03 +08:00
MistEO
5b68a7a5ad fix: 修复自定义基建时的warning 2022-10-29 20:36:20 +08:00
StarWish
b839f00187 fix: 修复ADB重连失败时重启模拟器重试功能在重试时不进行任何操作直接停止 2022-10-29 17:56:20 +08:00
zzyyyl
d5451d825d feat: 将 virtual task 中的 "" 更换为 "#back" 2022-10-29 16:54:36 +08:00
zzyyyl
a687221087 style: format 2022-10-29 16:54:36 +08:00
zzyyyl
e641692b53 fix: 修复卡在隐私协议界面的问题 2022-10-29 16:54:35 +08:00
zzyyyl
e9f8c7d2c0 feat: 抽出一个 sharp_task StartUpThemes#next 2022-10-29 16:54:35 +08:00
zzyyyl
9f31da95d8 feat: 删除 Main 任务,简化资源关卡导航,简化章节导航 2022-10-29 16:54:35 +08:00
zzyyyl
df903fa77a perf(TaskData): append_prefix 小优化 2022-10-29 16:54:35 +08:00
zzyyyl
e505881586 feat: 用 virtual task 优化 Loading 相关任务 2022-10-29 16:54:35 +08:00
zzyyyl
2598069667 feat: 增加 virtual task
```
"Loading": {
    "next": [ "Loading", "#next", "" ]
},
"B": {
    "next": [ "Other", "B@Loading" ]
}
```

可以生成:
   "B@Loading"->next = [ "B@Loading", "Other", "B" ]
   "Loading"  ->next = [ "Loading" ]
注 (在 m_raw_all_tasks_info 中):
   "B@Loading"->next = [ "B@Loading", "B#next", "B" ]
2022-10-29 16:54:35 +08:00
zzyyyl
989f02c577 feat: 增加肉鸽战斗结束的加载画面 2022-10-29 16:54:34 +08:00
zzyyyl
16e9609e1a feat: 稍微修改 tasks.json 中肉鸽开始的逻辑
`Roguelike@Begin` 增加 GetDrops#next 即允许从 战斗掉落界面 开始任务
2022-10-29 16:54:34 +08:00
zzyyyl
5563c3ec1e feat: 用 baseTask 字段优化 tasks.json
拆出三个基类: `Roguelike@Stage`, `Roguelike@StageEnter`, `Roguelike@StageEnterBattle`
分别是 关卡图标相关、 进入关卡相关、 进入战斗关卡相关
2022-10-29 16:54:34 +08:00
zzyyyl
cc8f3a3c88 fix: 修复部分任务生成失败的问题
```
"B@A1": { "next": [ "B@A2#next" ] },
"B@A2": { "next": [ "N0" ] },
"C@B@A2": { "next": [ "N1" ] }
```
以上这种情况, `Task.get("C@B@A1")->next` 应该为 `[ "N1" ]` 而不是 `[ "C@N0" ]`.
2022-10-29 16:54:34 +08:00
zzyyyl
9618968d38 feat: 尝试把 sharp_task 的生成变为预处理,大幅修改 TaskData 2022-10-29 16:54:34 +08:00
zzyyyl
a541c3e525 feat: 检查是否有 JustReturn 任务不是最后一个任务 2022-10-29 16:54:34 +08:00
zzyyyl
0d47ad3fd7 feat: 对于相同任务,第一次识别后第二次就不再识别
`"next": [ "A", "B", "A", "A" ]` <=> `"next": [ "A", "B" ]`
2022-10-29 16:54:33 +08:00
zzyyyl
42d3cdf412 feat: 用 baseTask 字段简化 tasks.json 2022-10-29 16:54:25 +08:00
DavidWang19
7c690c7e45 feat: 增加了中途开始肉鸽的编队信息处理 2022-10-29 06:53:43 +01:00
Horror Proton
4023747c1c chore: update OTA filenames, etc 2022-10-29 13:39:39 +08:00
Horror Proton
9d98268d27 chore: add md5sum.txt in OTA pack 2022-10-29 13:39:39 +08:00
Horror Proton
d7879ebaec chore: add OTA workflow 2022-10-29 13:39:39 +08:00
MistEO
dd0de388f7 Merge pull request #2474 from gdlcf88/user-friendly-exception-handling
feat: 用户友好的异常处理
2022-10-29 13:23:23 +08:00
DavidWang19
ef78544ef9 fix: 修复了不能检测到开始肉鸽的bug 2022-10-29 05:58:49 +01:00
uye
60d19c85f2 Update README.md 2022-10-29 01:56:44 +08:00
uye
9a526e5737 Update README_en-US.md 2022-10-29 01:56:41 +08:00
uye
fb6737e64f Update README_ja-JP.md 2022-10-29 01:56:40 +08:00
uye
9e2c2b8131 Update README_zh-TW.md 2022-10-29 01:56:37 +08:00
MistEO
8b104a297f docs: update pictures 2022-10-29 01:04:50 +08:00
MistEO
9b74340136 fix: 修复美服无法成功上传企鹅的问题 2022-10-29 00:56:48 +08:00
MistEO
7272af282d chore: update translations. 2022-10-29 00:48:58 +08:00
MistEO
f76d70472b docs: 修改 ISSUE 模板 2022-10-29 00:27:22 +08:00
zzyyyl
b93f796a2c fix: 修复 copilot 自动编队的 roi 问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2459
2022-10-29 00:03:53 +08:00
DavidWang19
0a62b36c47 Merge pull request #2471 from MaaAssistantArknights/perf/roguefight_v3
perf: 改进肉鸽招募逻辑并修复了部分bug
2022-10-28 14:58:50 +01:00
DavidWang19
398fda071b Merge pull request #2489 from WWPXX233/perf/roguefight_v3
根据队伍优化选取等级
2022-10-28 14:57:12 +01:00
WWPXX
8167cfefd2 根据队伍优化选取等级 2022-10-28 21:55:31 +08:00
zzyyyl
7a74447de5 fix: 修复某些情况下停止键不可用的问题 2022-10-28 18:13:59 +08:00
gdlcf88
740683caf8 移除Pause方法 2022-10-28 17:31:15 +08:00
gdlcf88
8b656c957b 引入MaaUrls 2022-10-28 14:10:15 +08:00
MistEO
d52bafd4f3 Merge pull request #2461 from Yanstory/patch-1
doc: Update 1.1-详细介绍.md
2022-10-28 10:47:47 +08:00
Yanstime
2de1d9e827 Update 1.1-详细介绍.md 2022-10-28 01:01:13 +08:00
gdlcf88
7e14628529 feat: 用户友好的异常处理 2022-10-27 23:49:20 +08:00
zzyyyl
7cf4529946 fix: 修复下载完整包导致 noavx 相关文件被覆盖的问题 2022-10-27 23:11:13 +08:00
uye
65ae4d29e0 feat: 添加7群加群链接 2022-10-27 23:01:52 +08:00
DavidWang19
96db264e52 feat: 新增根据队伍内已有近战干员数量决定招募权重的选项并修复了一些bug 2022-10-27 15:59:50 +01:00
Tastror
76f66976c3 docs: 更改错误输出提示 2022-10-27 22:30:45 +08:00
zzyyyl
ae3e2f9bcb fix: 修复 "Return" 任务没 roi 的问题 2022-10-27 21:15:05 +08:00
zzyyyl
b58ecd022d fix: 修复一些返回按钮位置变动的问题 2022-10-27 21:09:54 +08:00
MistEO
815d7be24c Merge pull request #2468 from MaaAssistantArknights/dev
Release v4.6.5-beta.3
2022-10-27 20:54:57 +08:00
MistEO
e916a21eea chore: update MeoAsstMac 2022-10-27 20:43:37 +08:00
MistEO
8306396cb8 docs: update changelog 2022-10-27 20:41:24 +08:00
MistEO
ec7f10f424 Merge pull request #2405 from MaaAssistantArknights/perf/roguefight_v3
perf: 改进肉鸽招募和部署逻辑
2022-10-27 20:13:00 +08:00
zzyyyl
d686cdfb8b fix: 继续修复停止按钮有时失效的问题 2022-10-27 20:02:43 +08:00
MistEO
63f15cbaf0 Merge pull request #2467 from MaaAssistantArknights/feat/version_update
feat: 更新更新逻辑
2022-10-27 19:50:49 +08:00
zzyyyl
d1ff082212 fix: 修复停止按钮有时失效的问题 2022-10-27 19:37:23 +08:00
zzyyyl
14c3f1886f feat: 加一句 TODO 2022-10-27 18:46:01 +08:00
zzyyyl
1d7e194c26 feat: 更新更新逻辑 2022-10-27 18:37:43 +08:00
MistEO
dccb4efbb7 perf: 优化自定义基建识别名字时候一堆warn日志的问题 2022-10-27 14:18:27 +08:00
Yanstime
79099d4ba2 Update 1.1-详细介绍.md 2022-10-27 12:42:02 +08:00
MistEO
9d5f4a6861 fix: runtime warning in ImageAnalyzer ROI check 2022-10-27 11:24:00 +08:00
MistEO
22705d1406 fix: 修复工作线程标志位判断错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2460
2022-10-27 10:42:42 +08:00
DavidWang19
16e93186e6 feat: 新增根据队伍内已有同职业干员数量决定招募权重的选项 2022-10-26 23:03:52 +01:00
MistEO
d8c922eb6a Merge pull request #2456 from MaaAssistantArknights/dev
Release v4.6.5-beta.2
2022-10-27 00:59:40 +08:00
MistEO
d54a513d12 docs: update changelog 2022-10-27 00:59:28 +08:00
MistEO
8de5d5d1c7 Merge pull request #2455 from KiyuM1n/dev
feat: 台服識別圖檔更新
2022-10-27 00:34:45 +08:00
MistEO
155a74d95d perf: 自定义基建无人机和菲亚同时为pre时,优先使用无人机
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2224
2022-10-27 00:33:58 +08:00
KiyuM1n
190d930c2c 更新終局圖檔 2022-10-27 00:15:16 +08:00
KiyuM1n
d016f4dacb 加入收集日常獎勵圖檔 2022-10-27 00:12:24 +08:00
KiyuM1n
d3cae73a86 更新終局圖檔 2022-10-27 00:01:17 +08:00
MistEO
247600e607 fix: 修复部分任务出错时不报错的问题 2022-10-26 23:56:44 +08:00
zzyyyl
03746598ab fix: 修复万象追忆录更新时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2446
2022-10-26 23:50:18 +08:00
MistEO
f903d110e4 fix: 修复手动停止时回调消息错误,新增TaskChainStopped回调消息
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2442
2022-10-26 23:48:33 +08:00
MistEO
42da45e807 feat: 基建宿舍”信赖排序“改为从低到高的方式 2022-10-26 23:17:26 +08:00
MistEO
44516bb79e perf: 删除自定义基建肥鸭多余的一次滑动操作 2022-10-26 23:12:31 +08:00
MistEO
64696a8380 fix: 修复基建返回按钮没点上导致的错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2451
2022-10-26 23:07:06 +08:00
MistEO
915f15fd21 Merge pull request #2448 from wallsman/dev
doc: Name change
2022-10-26 22:52:46 +08:00
MistEO
0e23311aea Merge pull request #2443 from lanhao34/dev
fix: 修复252发电站界面返回以及未找到会客室时卡住的问题
2022-10-26 22:52:27 +08:00
MistEO
2ec3022eae fix: 修复美服掉落识别,开放日服掉落上传,更新掉落测试集 2022-10-26 22:48:58 +08:00
Horror Proton
96e7b01496 fix: add replace rules for txwy client
ref: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
2022-10-26 16:07:29 +08:00
Wallsman
b305ac96fb doc : Name change
after 10/26 Update(Name change 11/3 am04:00)
2022-10-26 15:47:51 +09:00
lanhao34
1cc03e8775 Merge branch 'dev' of https://github.com/lanhao34/MaaAssistantArknights into dev 2022-10-25 23:33:57 -04:00
lanhao34
656e675326 fix: 未找到会客室时返回false 2022-10-25 23:33:05 -04:00
lanhao34
c2b9e88585 fix: 修复252发电站界面返回时卡住的问题 2022-10-25 23:31:33 -04:00
uye
fc1ba2bd74 Update 1.1-详细介绍.md 2022-10-26 10:28:08 +08:00
uye
6eaa812eab Update 1.1-详细介绍.md 2022-10-26 10:16:17 +08:00
MistEO
61483af38a chore: 优化内置243作业无人机的使用 2022-10-26 00:37:50 +08:00
MistEO
8f85844370 chore: 更新台服gamedata数据
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
2022-10-26 00:21:11 +08:00
MistEO
a36679f1ee feat: 新增肉鸽关卡识别错误时自动保存图片功能,修复台服一个肉鸽关卡识别错误
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2311
2022-10-25 23:56:43 +08:00
MistEO
aab55771c5 fix: 肉鸽不招募”砾“了
识别错误,解决不了.jpg
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2333
2022-10-25 23:44:27 +08:00
MistEO
0295b1d525 docs: 更新CI产物包内容 2022-10-25 23:30:09 +08:00
MistEO
27d7f3537c Merge pull request #2435 from MaaAssistantArknights/perf/multi_ocr
perf: optimize OCR for numbers and letters
2022-10-25 23:08:03 +08:00
zzyyyl
9d18abcd46 fix: 修复肉鸽闪退的问题
`at(0)`
2022-10-25 23:06:52 +08:00
MistEO
71fd1ce7ad docs: update FAQ and emulator supports 2022-10-25 22:59:43 +08:00
MistEO
2ab5cdb33b merge: dev to perf/multi_ocr 2022-10-25 22:44:33 +08:00
MistEO
fff0865d6e fix: 修复繁中服部分肉鸽识别错误 2022-10-25 22:39:02 +08:00
MistEO
0b492b519d perf: 优化飞桨接口调用 2022-10-25 22:38:52 +08:00
KiyuM1n
a0080952c1 chore: 更新台服肉鸽json
台服ocr內容
2022-10-25 22:38:36 +08:00
MistEO
a31b303eec fix: fix rebase error 2022-10-25 22:33:04 +08:00
Horror Proton
e7d702598f feat: add drop quantity roi and intensity range for JP
ref: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
2022-10-25 22:33:04 +08:00
MistEO
eaed0d4cd6 perf: 删除一些已经用不上了的数字replace 2022-10-25 22:33:04 +08:00
MistEO
3727fcad6a perf: 对部分数字/字母识别场景更新到使用EN OCR模型 2022-10-25 22:33:04 +08:00
MistEO
4b81064289 feat: 集成飞桨EN模型 2022-10-25 22:33:04 +08:00
MistEO
2af05e8e75 fix: 修复curl上传数据时的报错
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2427
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1747
2022-10-25 22:25:42 +08:00
MistEO
5b6328b3cd fix: 修复肉鸽”高规格分队“无法识别的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2430
2022-10-25 22:25:09 +08:00
zzyyyl
85f5f7365b feat: 更新战斗结束的模板图片
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2422
2022-10-25 02:09:09 +08:00
MistEO
b514ab9547 Merge pull request #2419 from KiyuM1n/dev
台服肉鴿識別文字轉換
2022-10-25 00:32:27 +08:00
MistEO
bb82bc1d6e chore: remove note from json 2022-10-25 00:32:17 +08:00
KiyuM1n
70f6bbf980 Merge branch 'MaaAssistantArknights:dev' into dev 2022-10-25 00:20:16 +08:00
KiyuM1n
91c1aace9e Update tasks.json
台服ocr內容
2022-10-25 00:17:52 +08:00
MistEO
a0256d7bba fix: fix rebase error 2022-10-24 23:38:01 +08:00
Horror Proton
28366130d1 feat: add drop quantity roi and intensity range for JP
ref: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
2022-10-24 23:22:31 +08:00
MistEO
24d1dfd3e8 Merge pull request #2412 from MaaAssistantArknights/feat/enum_to_string
feat: 为部分枚举类型增加与字符串类型的互转函数
2022-10-24 22:00:51 +08:00
MistEO
d2b5191ca7 Merge pull request #2381 from MaaAssistantArknights/feat/sharp_task
feat: 增加 `#` 型任务 和 `baseTask` 字段
2022-10-24 21:58:17 +08:00
MistEO
a2b26cf426 Merge pull request #2400 from gdlcf88/main-window-manager
fix: 引入 `IMainWindowManager` 并修正 #2379 唤起MAA热键失效问题
2022-10-24 21:57:24 +08:00
zzyyyl
71135979d8 fix: 修复没有信赖提升标志时跳过掉落识别的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2360
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2348
2022-10-24 21:25:35 +08:00
zzyyyl
a9780d51dc fix: 修复笔误 2022-10-24 20:15:09 +08:00
zzyyyl
99bae5c1a3 feat: 增加加载界面图片
不知道有没有修了,暂时不打 fix

https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2414
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2374
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2378
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2294
2022-10-24 19:55:14 +08:00
lhhxxxxx
d4c026be2f fix. 修复官方153作业红云组,泡泡组断暖机的问题,优化了换班前后各组顺序 2022-10-24 19:51:39 +08:00
zzyyyl
e4e6bf074e perf: 修改 GUI 更新相关逻辑 2022-10-24 17:20:15 +08:00
zzyyyl
633301f365 feat: 退而求其次,改用 enum_to_string() 2022-10-24 16:24:31 +08:00
zzyyyl
fd4dfbf6ce feat: 重载枚举类型 AlgorithmType, ProcessTaskAction 的 std::to_string(), 并在回调与日志输出时使用 std::to_string() 2022-10-24 15:42:05 +08:00
zzyyyl
5236543d3d style: fix c# build warnings 2022-10-24 15:32:23 +08:00
zzyyyl
d04ef3f4f4 feat: 用 baseTask 字段简化 tasks.json 2022-10-23 22:19:22 +08:00
zzyyyl
cc24509cdd style: 肉鸽相关 Task 按照字典序排序 2022-10-23 22:19:14 +08:00
zzyyyl
aa189aed40 feat: baseTask @ # 任务同时使用的例子 2022-10-23 22:19:06 +08:00
zzyyyl
b977ae03cf feat: 新增字段 baseTask 用来直接继承(模板任务的变体)
refactor: 重构模板任务相关的生成逻辑
2022-10-23 22:18:58 +08:00
zzyyyl
ceb62f91c1 feat: 用 "#" 型任务简化 tasks.json 2022-10-23 22:18:01 +08:00
zzyyyl
c03b7389e9 feat: 拓扑排序检查 "#" 型任务是否循环依赖 2022-10-23 22:18:01 +08:00
zzyyyl
0d82787073 feat: 增加 "#" 型任务
```json
{
    "A": {
        "next": ["B"]
    },
    "C": {
        "next": ["A#next"]
    }
}
```
可以得到 "C" 的 next 是 "B"
2022-10-23 22:17:53 +08:00
zzyyyl
75200911cf fix: 修复下载新版本失败导致闪退的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2394
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2397
2022-10-23 21:01:46 +08:00
DavidWang19
1a90afb018 perf: 新增强制部署时禁用医疗干员的选项 2022-10-23 10:27:14 +01:00
uye
1d1a7be644 style: 修改热键界面布局 2022-10-23 16:39:19 +08:00
uye
1c95de7214 style: 修改符号 2022-10-23 16:26:17 +08:00
uye
8aadb7b0f5 feat: 修改今日关卡小提示 2022-10-23 16:23:01 +08:00
uye
e99de1ba6a feat: 更新自定义导航提示信息的日语翻译 2022-10-23 15:27:08 +08:00
uye
066e8e0034 feat: 修改自定义导航提示信息描述 (Modify the description of the custom stage prompt) 2022-10-23 14:21:30 +08:00
gdlcf88
951fa75e15 Introduce IMainWindowManager and fix the bug of the hotkey not working 2022-10-23 14:14:45 +08:00
MistEO
989c844f56 Merge pull request #2393 from MaaAssistantArknights/dev
docs: update changelog
2022-10-23 02:25:44 +08:00
MistEO
cd49d0733f docs: update changelog 2022-10-23 02:25:02 +08:00
MistEO
25f86b0a31 Merge pull request #2392 from MaaAssistantArknights/dev
Release v4.6.5-beta.1
2022-10-23 02:21:33 +08:00
MistEO
f7f72e9f56 docs: update changelog 2022-10-23 02:20:57 +08:00
MistEO
33a14dd378 fix: 修复基建宿舍未进驻的逻辑,并尽可能将宿舍的人填满 2022-10-23 01:59:03 +08:00
DavidWang19
00794ab032 feat: 修改回调消息文档 2022-10-22 18:43:39 +01:00
DavidWang19
c5039fa7c3 feat: 修改回调消息文档 2022-10-22 18:42:21 +01:00
Horror Proton
973d64a113 feat: allow empty confirm list in non-calc_only_task
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2334
2022-10-23 00:24:34 +08:00
WWPXX
b8a66f2229 perf: 优化肉鸽部署顺序以及位置 (#2388)
* 优化部署顺序以及位置

* 提高了带有控制技能的干员优先度

* 优化部署方向位置顺序

* Update roguelike_copilot.json

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-10-23 00:12:01 +08:00
MistEO
2acf75e7b1 feat: support roguelike shopping, more stages, more opers for JP and EN client 2022-10-23 00:10:56 +08:00
zzyyyl
5a12c7eaf4 fix: 修复关卡 溟痕乐园 识别错误的问题 2022-10-22 23:31:16 +08:00
MistEO
19f4ff80ec feat: 略微延长肉鸽撤退的时间 2022-10-22 21:22:56 +08:00
uye
24b53619b9 feat: DropsItemName默认改为不选择 2022-10-22 21:12:40 +08:00
MistEO
b7c7a43083 fix: 尝试修复外服肉鸽等级识别错误时不招人的问题 2022-10-22 20:59:55 +08:00
uye
125ccb8962 feat: 添加肉鸽主题提示/更新翻译 2022-10-22 20:54:16 +08:00
MistEO
a8f57a2a09 chore: Some clients do not upload drops data to PenguinStats
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
2022-10-22 20:25:52 +08:00
MistEO
89ded9f2c1 Merge pull request #2380 from gdlcf88/hotkeys
feat: 实现MAA基础热键
2022-10-22 20:12:44 +08:00
MistEO
2ddba7f54d feat: support drops rec for EN client 2022-10-22 20:04:27 +08:00
Horror Proton
fbe3b4b3e4 feat: add nodiscard 2022-10-22 19:35:14 +08:00
MistEO
e5564dd81c chore: update test caller 2022-10-22 18:15:45 +08:00
MistEO
9120427650 fix: test caller 2022-10-22 18:10:46 +08:00
MistEO
b67cb2d19e chore: 更新游戏数据 2022-10-22 17:55:01 +08:00
MistEO
612da61223 Merge pull request #2355 from horror-proton/test/cmake_version_from_vcs
chore: 使 CMake 能自动定义 `MAA_VERSION`
2022-10-22 16:48:58 +08:00
MistEO
ad8cc9e0a4 Merge pull request #2353 from MaaAssistantArknights/refactor/break_utils
refactor: 拆分 `AsstUtils.hpp`
2022-10-22 16:48:46 +08:00
MistEO
a206754575 fix: 自定义一键强制改变菲亚梅塔的位置,修复技能不生效的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2260
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2335
2022-10-22 16:46:45 +08:00
MistEO
6c96193f72 fix: 修复基建会客室随时弹出来的线索交流结束导致卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2244
2022-10-22 16:09:10 +08:00
MistEO
bc915ef5a1 Merge pull request #2382 from wallsman/dev
doc : Add operator
2022-10-22 13:25:39 +08:00
MistEO
6f3441d6db perf: 优化肉鸽地图部署 2022-10-22 13:20:24 +08:00
Wallsman
7414232bc6 Update operators.md 2022-10-22 08:55:38 +09:00
Wallsman
224613c112 doc : Add operator
Chapter 10(JP & EN) & 狂人号(JP wirte only)
2022-10-22 08:55:08 +09:00
DavidWang19
e03c184817 fix: 回退为旧版回调函数以提高兼容性 2022-10-21 14:53:20 +01:00
gdlcf88
68910b759b 增加热键修改的 Tips 2022-10-21 21:51:21 +08:00
Horror Proton
543bb05d32 refactor: remove AsstUtils 2022-10-21 21:30:04 +08:00
Horror Proton
59440c7acb refactor: add Time 2022-10-21 21:27:33 +08:00
Horror Proton
f6a7354f4f refactor: move Platform 2022-10-21 21:27:33 +08:00
Horror Proton
77fd1b1186 refactor: move UserDir 2022-10-21 21:27:33 +08:00
Horror Proton
ed8e0b3df1 refactor: add Locale.hpp 2022-10-21 21:27:33 +08:00
Horror Proton
e5f56cb322 refactor: move functions to string misc 2022-10-21 21:27:21 +08:00
gdlcf88
2cc4019779 feat: 实现MAA基础热键 2022-10-21 21:21:43 +08:00
Horror Proton
f05e1ecf85 refactor: move make_rect 2022-10-21 21:17:49 +08:00
zzyyyl
6737267d2d perf: 字符串替换的小优化 2022-10-21 16:46:37 +08:00
zzyyyl
0fe585f731 fix(TaskData): 修复 syntax_check 检查模板类型时无法确定 algorithm 的问题 2022-10-21 16:39:16 +08:00
zzyyyl
2029be5fcc fix(TaskData): 修复一个 with_emplace 的 bug 2022-10-21 16:26:38 +08:00
MistEO
0326465a2d fix: build error 2022-10-21 01:42:14 +08:00
MistEO
559be69a7d feat: 支持企鹅数据的退避策略 2022-10-21 01:29:11 +08:00
DavidWang19
79df443023 Merge pull request #2373 from DavidWang19/feat/logImprove
feat: 合并本次掉落和掉落统计
2022-10-20 18:22:36 +01:00
MistEO
11979bf8b0 fix: 修复debug默认下外服加载错误,修复掉落上传服务器错误 2022-10-21 01:08:55 +08:00
MistEO
7a445e8525 fix: 修复肉鸽卡在“误入奇境”的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2367
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2262
2022-10-21 00:53:51 +08:00
DavidWang19
ab02b4175d feat: 合并本次掉落和掉落统计 2022-10-20 17:38:26 +01:00
MistEO
ee8720ed09 perf: 优化肉鸽“NextLevel"任务 2022-10-20 23:27:01 +08:00
MistEO
0522380c13 fix: 修复傀影肉鸽卡在楼层界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1178
2022-10-20 23:20:01 +08:00
MistEO
75378e69c2 fix: 修复“8面骰子”识别错误 2022-10-20 23:08:31 +08:00
MistEO
776bc7770e fix: 修复水月肉鸽“海窟沙暴”关卡名识别错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2325
2022-10-20 23:06:38 +08:00
MistEO
3a3247cfda fix: 修复一些自定义基建的傻逼操作 2022-10-20 22:39:49 +08:00
MistEO
6ebc2b48c7 fix: 修复基建发电站数量不足时后续操作错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2330
2022-10-20 22:39:31 +08:00
MistEO
a724dafe98 fix: 初步修复日服掉落无法上传问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
2022-10-20 22:10:53 +08:00
MistEO
cc63eaa79a fix: 同步修复美服掉落识别的问题 2022-10-20 22:10:33 +08:00
MistEO
41cfb66736 fix: 修复基建搓玉补货后不换人的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2366
2022-10-20 21:51:46 +08:00
MistEO
e509d36fdc Merge pull request #2365 from wallsman/dev
doc: JP Add update line
2022-10-20 20:18:52 +08:00
uye
99eebad482 feat: 当材料选择框为"NotSelected"时不过滤材料列表 2022-10-20 19:26:21 +08:00
uye
ef0cd8efc8 style: 肉鸽加*
fix #2347
2022-10-20 19:11:23 +08:00
Horror Proton
80d539b2df chore: increase fetch depth of dev-build-mac for git-describe 2022-10-20 17:00:37 +08:00
Horror Proton
3ffd653d2d chore: define MAA_VERSION automatically in CMake 2022-10-20 17:00:37 +08:00
zzyyyl
ccfadc4221 fix: 同步外服 StartButton1 的设置 2022-10-20 16:41:07 +08:00
zzyyyl
fbc4d4d738 fix: JP Client 结算界面识别问题 again
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
2022-10-20 16:35:01 +08:00
zzyyyl
2a928a7263 fix: JP Client 结算界面识别问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
2022-10-20 16:20:16 +08:00
Wallsman
1946585c1b Doc : Add update line
Base EN
2022-10-20 08:45:46 +09:00
MistEO
a63efe1fa9 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-10-18 11:18:05 +08:00
MistEO
f46bb3a03d chore: update translations 2022-10-18 11:17:41 +08:00
MistEO
57e21066ab Merge pull request #2337 from preminstrel/patch-1
docs: 修正了一些英文语法错误
2022-10-18 00:27:12 +08:00
MistEO
409fc199e0 Merge pull request #2332 from LittleFall/fix/stop-not-fail
fix: 修复手动终止任务时有概率出现的“任务出错”
2022-10-18 00:24:53 +08:00
Horror Proton
f7fefcde9c fix: fix an if branch in asst.py 2022-10-17 20:56:34 +08:00
MistEO
1d3acf411b fix: 修复肉鸽战斗中干员名识别错误时,一直点干员的问题 2022-10-16 22:34:35 +08:00
Hanshi Sun
1083b5ed3f Docs: 修正了一些英文语法错误 2022-10-16 16:05:51 +08:00
Zhi Qi
77820b134c fix compile error 2022-10-16 08:24:50 +08:00
Zhi Qi
b450e6f265 fix: 修复手动终止任务时有概率出现的“任务出错” 2022-10-16 08:06:28 +08:00
MistEO
cc50427ae3 Merge branch 'build/package_name' into dev 2022-10-16 06:20:33 +08:00
MistEO
7d49ea1eab build: rename CI package 2022-10-16 05:56:04 +08:00
DavidWang19
cd31802fc7 Revert "fix: 修复了肉鸽战斗时一个导致程序崩溃的问题"
This reverts commit a687037a36.
2022-10-15 22:22:39 +01:00
zzyyyl
d6d45efc39 feat: 适配台服肉鸽 2022-10-15 22:38:17 +08:00
Horror Proton
a421c5c3cb feat: use blue channel image in RoguelikeRecruitImageAnalyzer::match_level 2022-10-15 22:34:37 +08:00
MistEO
9d877b46d9 Merge pull request #2272 from MaaAssistantArknights/refactor/roguelike
refactor: 重构肉鸽任务并修改回调
2022-10-15 22:28:00 +08:00
MistEO
30b1e84b37 Merge pull request #2328 from MaaAssistantArknights/build/package_name
build: Modify CI product name and remove unneeded files from the product package
2022-10-15 22:27:45 +08:00
MistEO
31cb5e8a4a Merge pull request #2322 from KiyuM1n/dev
feat: 適配台服肉鴿
2022-10-15 22:27:09 +08:00
MistEO
c353fc7c7c build: Modify CI product name and remove unneeded files from the product package 2022-10-15 22:24:37 +08:00
MistEO
769082db9c Merge pull request #2306 from hguandl/feat/macos-app
feat: 构建 macOS App
2022-10-15 21:15:58 +08:00
Hao Guan
6ec11bf0a8 Release trigger; debug symbols 2022-10-15 23:06:40 +10:00
KiyuM1n
30abf0242c 補齊部分圖檔
剩餘
Roguelike1GamePass
Roguelike1GamePassSkip1
2022-10-15 17:42:29 +08:00
zzyyyl
333a97a829 feat: 新版肉鸽外服支持 2022-10-15 16:32:50 +08:00
zzyyyl
c8bf252ff6 docs: 集成文档 2022-10-15 16:32:50 +08:00
zzyyyl
b5cda20163 docs: 修改回调文档 2022-10-15 16:32:50 +08:00
zzyyyl
435854934f perf: 修改部分任务名 2022-10-15 16:32:50 +08:00
zzyyyl
05087fb663 fix: 修复回调 2022-10-15 16:32:50 +08:00
zzyyyl
afb7895433 style: 字典序排列肉鸽相关 task 2022-10-15 16:32:50 +08:00
zzyyyl
93af574386 fix: 修复写错的任务 2022-10-15 16:32:49 +08:00
zzyyyl
01f9ec08ab refactor: 重构肉鸽文件结构 2022-10-15 16:32:49 +08:00
MistEO
0269d33af2 chore: 删除肉鸽切换主题时的重启提示 2022-10-15 16:32:49 +08:00
MistEO
e6de08c26d perf: 统一定义肉鸽主题状态字段 2022-10-15 16:32:49 +08:00
zzyyyl
677aa3f90c feat: 加点日志
Co-authored-by: MistEO <mistereo@hotmail.com>
2022-10-15 16:32:49 +08:00
zzyyyl
809453e40a perf: std::move string
Co-authored-by: MistEO <mistereo@hotmail.com>
2022-10-15 16:32:49 +08:00
zzyyyl
0a8db14315 refactor: 重构肉鸽资源加载逻辑和任务流程 2022-10-15 16:32:49 +08:00
zzyyyl
b2cf7163fb fix: 修复笔误 2022-10-15 16:32:49 +08:00
MistEO
b8811e587a perf: 优化任务参数设置 2022-10-15 16:32:49 +08:00
zzyyyl
9fb1b94f34 fix: 修复任务特化时 next 等不带前缀的问题 2022-10-15 16:32:48 +08:00
zzyyyl
e7ca26ec9a fix: 修复任务流程 2022-10-15 16:32:48 +08:00
zzyyyl
71f113a8a1 feat: 增加一些模板任务生成逻辑
除了 template,其余参数若留空则生成时继承模板任务的参数

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-10-15 16:32:40 +08:00
MistEO
cb29b09250 Merge pull request #2302 from Yanstory/patch-1
docs: Update 1.1-详细介绍.md
2022-10-15 10:45:04 +08:00
MistEO
3757a561e5 Update docs/1.1-详细介绍.md
Co-authored-by: Yanstime <862415702@qq.com>
2022-10-15 10:44:50 +08:00
KiyuM1n
ff0949ac02 加入肉鴿的文字替換
不完整 只改了一小部分
2022-10-15 03:17:04 +08:00
KiyuM1n
73e47e81c2 台服肉鴿圖檔
Roguelike1StageDreadfulFoeEnter
Roguelike1GamePassSkip1
Roguelike1GamePass
因為還沒遇上 所以是國服的圖檔
2022-10-15 03:15:13 +08:00
Hao Guan
1361de769c feat: App for macOS 2022-10-15 04:45:28 +10:00
DavidWang19
a687037a36 fix: 修复了肉鸽战斗时一个导致程序崩溃的问题 2022-10-14 19:27:44 +01:00
MistEO
d935d69bc2 fix: 修复肉鸽没部署也可能识别到cooling干员的问题 2022-10-15 02:22:40 +08:00
MistEO
2cfccc28bf fix: 修复战斗中部分干员cooling识别错误的问题
能天使 oper_cooling_analyze | 870
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2313
2022-10-15 02:11:45 +08:00
MistEO
c21b14847b perf: 优化肉鸽一个没啥用的逻辑 2022-10-15 01:49:52 +08:00
MistEO
7c37b51e40 Merge pull request #2297 from DavidWang19/fix/removeNL
fix: 移除长夜临光关卡选择
2022-10-15 00:55:52 +08:00
MistEO
12d05841be Merge pull request #2307 from JiHongYuan/patch-2
docs: Update 3.2-回调消息协议.md
2022-10-15 00:50:36 +08:00
zzyyyl
d40952f519 fix: 修复嵯峨 ocr 识别错误的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2317
2022-10-14 15:20:33 +08:00
Yanstime
413e4207f5 Update 1.1-详细介绍.md 2022-10-14 14:41:34 +08:00
uye
245692f531 fix: 修复11章开启后自定义导航无法进入第9/10章 2022-10-14 01:37:14 +08:00
Horror Proton
7a40588606 fix: 公开招募 tag 识别失败后跳过
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2299
2022-10-13 22:22:25 +08:00
JiHongYuan
b1d1d5beaf Update 3.2-回调消息协议.md
完善消息类型信息
2022-10-13 21:58:33 +08:00
Yanstime
436cef62bf Update 1.1-详细介绍.md 2022-10-13 16:44:55 +08:00
zzyyyl
96545be6c1 Merge pull request #2285 from MaaAssistantArknights/fix/task_name
fix: 修复 reduce_other_times 不能正常工作的问题
2022-10-13 15:49:23 +08:00
zzyyyl
b995fdc81a fix: 处理 verify 问题 2022-10-13 14:30:32 +08:00
zzyyyl
4da88f326a fix: 修复 reduce_other_times 不能正常工作的问题
perf: 优化回调处理

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-10-13 14:30:24 +08:00
zzyyyl
7eb1a55b8c style: format 2022-10-13 14:15:46 +08:00
Horror Proton
c42c40df83 fix: add ocr replace for recruit tag 王员 手员
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2299
2022-10-13 13:28:07 +08:00
DavidWang19
75cd67b18d fix: 移除长夜临光关卡选择 2022-10-12 22:51:49 +01:00
MistEO
35906ec920 fix: 修复肉鸽战斗中一直点能天使的问题 2022-10-12 21:51:27 +08:00
MistEO
db1650a9d6 Merge pull request #2288 from MaaAssistantArknights/dev
Release v4.6.4
2022-10-12 01:34:14 +08:00
MistEO
275494af3f docs: update changelog 2022-10-12 01:33:42 +08:00
zzyyyl
3110fac2c6 feat: 更新 changelog 2022-10-12 01:26:22 +08:00
MistEO
4b1665edd5 Merge pull request #2289 from DavidWang19/fix/roguefight
fix: 修复了远程/近战位干员无空位时不能部署任何干员的问题
2022-10-12 01:20:55 +08:00
DavidWang19
251c5d66dc fix: 修复了远程/近战位干员无空位时不能部署任何干员的问题 2022-10-11 18:14:54 +01:00
MistEO
1203361a74 feat: 肉鸽通关时截个图 2022-10-12 00:47:51 +08:00
MistEO
270d766ed3 docs: update changelog 2022-10-12 00:38:33 +08:00
MistEO
b8c616a074 fix: 修复偶现OCR多一个空格的问题 2022-10-11 23:46:20 +08:00
MistEO
61bc27d57e fix: 修复肉鸽关卡名识别错误 2022-10-11 23:46:10 +08:00
MistEO
ce3c338cee fix: 修复水月肉鸽中,排异反应干员无法识别的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2177
2022-10-11 23:03:55 +08:00
MistEO
ada43862ad Merge pull request #2282 from MaaAssistantArknights/dev
Release v4.6.3
2022-10-11 20:40:55 +08:00
MistEO
de0ceebba6 fix: 修复肉鸽骰子乱放的问题 2022-10-11 20:40:35 +08:00
MistEO
159700b2df Merge pull request #2281 from MaaAssistantArknights/dev
Release v4.6.2 fix
2022-10-11 20:16:08 +08:00
MistEO
d89db93145 fix: 修复肉鸽选技能太快卡在开始行动界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2280
2022-10-11 20:15:28 +08:00
MistEO
3e8b2e9b16 Merge pull request #2279 from MaaAssistantArknights/dev
Release v4.6.2
2022-10-11 20:04:53 +08:00
MistEO
19010e9ce8 docs: update changelog 2022-10-11 20:04:25 +08:00
MistEO
74dd879953 perf: 优化会客室使用线索的逻辑 2022-10-11 19:58:17 +08:00
MistEO
b63c763c09 fix: 修复会客室不收取线索的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2273
2022-10-11 19:57:01 +08:00
MistEO
a399b7cea0 docs: 修正肉鸽文档字段 2022-10-11 19:44:14 +08:00
MistEO
de9e2b2f64 fix: 修复唤醒任务会返回主界面的问题 2022-10-11 19:42:17 +08:00
MistEO
2c9fa536ab chore: 修改调试代码 2022-10-11 19:32:54 +08:00
MistEO
fe54e6c85a fix: 修复水月肉鸽通关后卡住的问题 2022-10-11 19:32:45 +08:00
MistEO
ce9ac86ef5 chore: 更新掉落识别资源 2022-10-11 19:22:34 +08:00
MistEO
9454424a06 Merge pull request #2256 from MaaAssistantArknights/perf/roguefight_v2
perf: I.S. auto fight
2022-10-11 19:20:38 +08:00
MistEO
3405ed878f fix: 修复资源错误 2022-10-11 19:02:47 +08:00
MistEO
1ae8b563d6 merge: dev 2022-10-11 18:56:39 +08:00
MistEO
6ade08b8d9 fix: 修复肉鸽和主线地图名相同时,关卡数据的错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2277
2022-10-11 18:06:35 +08:00
MistEO
4110d233ac chore: 更新第十一章除企鹅数据外的资源 2022-10-11 16:34:54 +08:00
MistEO
d2528b6f70 perf: 给调用命令再次加个锁
This reverts commit 019f219ef8.
2022-10-11 11:02:53 +08:00
MistEO
019f219ef8 fix: 修复一个死锁问题
by socket 时,这行逻辑会引发死锁

           if (is_reconnect_success) {
                auto recall_ret = call_command(cmd, timeout, false /* 禁止重连避免无限递归 */, recv_by_socket);
2022-10-11 02:16:44 +08:00
MistEO
c3d6a33966 Merge pull request #2271 from WWPXX233/perf/roguefight_v2
新增大量傀影关卡,优化水月特殊环境关卡
2022-10-11 01:10:01 +08:00
WWPXX
1688ff4daa 新增大量傀儡肉鸽关卡,优化部分水月特殊关卡 2022-10-11 01:05:06 +08:00
MistEO
eb484b1950 perf: 整理肉鸽强制放空的一些结构 2022-10-11 00:49:20 +08:00
WWPXX
0de7eece6d 新增大量傀影关卡,优化水月特殊环境关卡 2022-10-11 00:44:55 +08:00
MistEO
6d583f4ac3 perf: 重构并优化肉鸽战斗时,地面阻挡、对空防御的逻辑 2022-10-11 00:37:13 +08:00
NonX
d13134dd4a fix: period设定时间不能准时开始 (#2261)
* fix: period设定时间不能准时开始

* Update TaskQueueViewModel.cs

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-10-10 22:37:44 +08:00
MistEO
2892b45631 Merge pull request #2264 from anywugn/master
修正基建243 1天4换作业bug
2022-10-10 22:35:37 +08:00
AnyWugn
dfcbcad066 修正基建243 1天4换作业bug 并回滚正义骑士号修改 2022-10-10 04:02:58 -07:00
AnyWugn
f97c68dbe2 修正基建243 1天4换作业bug 2022-10-10 03:25:15 -07:00
DavidWang19
199967f948 perf: 新增对某点的强制部署方向设置 2022-10-10 01:22:22 +01:00
MistEO
134d91fb06 fix: 修复肉鸽战斗中对”近卫阿米娅“、”术师阿米娅“的处理 2022-10-10 01:41:14 +08:00
MistEO
450953f711 Merge pull request #2255 from gdlcf88/hide-from-task-switcher
perf: Hide MAA from the Windows Task Switcher when it is minimized
2022-10-10 01:00:27 +08:00
MistEO
719a169a66 feat: 新增支持肉鸽部署职业与高台/地面不同的干员 2022-10-10 00:59:54 +08:00
MistEO
7421179be0 docs: 修正语法 2022-10-09 22:35:02 +08:00
MistEO
886eec5e66 docs: 更新雷电模拟器支持的描述 2022-10-09 22:33:20 +08:00
gdlcf88
1d782c6a35 Hide MAA from the Windows Task Switcher when it is minimized 2022-10-09 21:52:00 +08:00
MistEO
8104e7f17c Merge pull request #2251 from dantmnf/dev
feat: package debug symbols
2022-10-09 21:10:00 +08:00
dantmnf
9aee5bd4e2 feat: package debug symbols 2022-10-09 21:08:40 +08:00
MistEO
43a205c2d5 perf: 流程任务中不处理disable的任务 2022-10-09 17:27:13 +08:00
MistEO
3847bf216d Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-10-09 17:17:19 +08:00
MistEO
deb35c8f6f fix: 修复傀影肉鸽凌晨4点更新后卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2242
2022-10-09 17:17:00 +08:00
MistEO
dd2fd782c1 Merge pull request #2248 from WWPXX233/dev
perf: 略微优化水月肉鸽4-5层的部分高难度关卡
2022-10-09 17:11:59 +08:00
MistEO
965dfb7a09 feat: 新增AsstSetUserDir接口 2022-10-09 15:59:52 +08:00
WWPXX
93eca2df02 略微优化4-5层的部分高难度关卡 2022-10-09 15:47:56 +08:00
MistEO
e070db97ed fix: 修复战斗中将“能天使”认为是cooling的问题
oper_cooling_analyze | 804
2022-10-09 14:31:38 +08:00
MistEO
26457b7234 chore: update l10n 2022-10-09 13:48:27 +08:00
MistEO
d68cf0f091 Merge pull request #2235 from MaaAssistantArknights/dev
Release v4.6.1-alpha.1
2022-10-09 01:21:44 +08:00
zzyyyl
03cbeec5d0 style: format 2022-10-09 01:09:23 +08:00
zzyyyl
8a71c873c4 Merge pull request #2167 from MaaAssistantArknights/perf/roguefight
perf: 优化肉鸽自动战斗逻辑
2022-10-09 01:07:57 +08:00
DavidWang19
77b86d27b3 fix: 修复了召唤物识别错误的问题 2022-10-09 00:56:34 +08:00
WWPXX
d8ec02d27c 满编优先精英2 调整技能选取 2022-10-09 00:56:33 +08:00
WWPXX
883db7eaa0 满编队优先精英 调整技能使用 2022-10-09 00:56:33 +08:00
DavidWang19
f5f2da6a57 perf: 加速了对撤退干员的识别 2022-10-09 00:56:33 +08:00
DavidWang19
8f894dae9b fix: 修复了干员部署逻辑的重大问题和会导致程序异常退出的问题 2022-10-09 00:56:33 +08:00
DavidWang19
fb64271f07 perf: 新增强制部署远程干员控制选项 2022-10-09 00:56:25 +08:00
WWPXX
01e91ec61a 设置在队伍满的情况下优先精英2的干员 技能变更 2022-10-09 00:55:55 +08:00
WWPXX
40479f54f6 优化大量水月关卡 2022-10-09 00:55:55 +08:00
MistEO
80eb8f5e1d Update roguelike_copilot.json 2022-10-09 00:55:55 +08:00
MistEO
c793ab9284 fix: roguelike copilot typo 2022-10-09 00:55:46 +08:00
WWPXX
e9b0687547 肉鸽新版本 2022-10-09 00:55:28 +08:00
MistEO
6c53187366 feat: 新增肉鸽队伍满时降低招募优先级+提升晋升优先级的逻辑 2022-10-09 00:55:13 +08:00
zzyyyl
be199c574a fix: 修复编译问题 2022-10-09 00:55:12 +08:00
zzyyyl
b99dd7d0ff perf: 简单修改部分日志输出 2022-10-09 00:55:12 +08:00
zzyyyl
aa5286e483 perf: 按照 reviews 意见修改 RoguelikeBattleTaskPlugin 2022-10-09 00:55:12 +08:00
zzyyyl
f0a65bf721 perf: 按照 reviews 意见修改 RoguelikeCopilotConfiger 2022-10-09 00:55:04 +08:00
zzyyyl
0f41a9cd75 style: format 2022-10-09 00:54:29 +08:00
DavidWang19
737aa36ec9 perf: 增加了对骰子和职业部署顺序的分关卡控制 2022-10-09 00:54:20 +08:00
DavidWang19
82c3485ed6 fix: 修复不能正确识别医疗干员攻击范围的问题 2022-10-09 00:54:09 +08:00
DavidWang19
269bf9a947 resolve conflict 2022-10-09 00:54:09 +08:00
DavidWang19
1ad9f2d482 perf: 加速了对撤退干员的查询 2022-10-09 00:54:09 +08:00
DavidWang19
a592711adb perf: 优化肉鸽自动战斗逻辑 2022-10-09 00:54:09 +08:00
WWPXX
3603cc15cf 新增水月肉鸽关卡 2022-10-09 00:54:08 +08:00
WWPXX
747e725c8f 新增水月肉鸽关卡 2022-10-09 00:54:00 +08:00
zzyyyl
ebb236bbc4 fix: 修复各种 tasks.json 2022-10-09 00:42:53 +08:00
MistEO
05cf6f8bec docs: update changelog 2022-10-09 00:35:55 +08:00
zzyyyl
51d8a29d96 fix: 修复外服资源 2022-10-09 00:24:43 +08:00
MistEO
69d14dbcff Merge pull request #2116 from MaaAssistantArknights/feat/at
feat: 增加模板任务逻辑
2022-10-09 00:05:48 +08:00
MistEO
e9970736ad Merge pull request #2231 from fearlessxjdx/dev
perf: 加快相邻排班变化不大时的干员选取速度
2022-10-09 00:02:55 +08:00
MistEO
263436eb45 Merge pull request #2234 from MaaAssistantArknights/dev
Release v4.6.0
2022-10-08 23:59:34 +08:00
MistEO
9d53747be1 docs: update changelog 2022-10-08 23:58:40 +08:00
MistEO
e1bce7ceb5 fix: 修复傀影肉鸽潜在的不期而遇卡住问题 2022-10-08 23:15:39 +08:00
MistEO
a113ae4cd2 feat: 更新界面关于里的链接 2022-10-08 23:12:34 +08:00
MistEO
b2c0572f3e fix: 尝试修复水月肉鸽不期而遇不优先离开/选择希望的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2233
2022-10-08 21:59:29 +08:00
MistEO
501563d215 docs: 更新部分文档 2022-10-08 21:44:15 +08:00
MistEO
4325b0b00c Merge pull request #2229 from MaaAssistantArknights/dev
Release v4.6.0-rc.2
2022-10-08 21:15:35 +08:00
MistEO
09c1b8e6ca docs: update changelog 2022-10-08 21:15:01 +08:00
nightofknife
6757a12177 feat: 提供公孙长乐的333长期搓玉方案 (#2216)
* 提供公孙长乐的243中枢永动基建方案,使用彩虹6号实现中枢永动

测了一下应该能跑,反正先看看有没有反馈

* 333长期搓玉组

* Rename 333长期搓玉(TE).json to 333_layout_for_Orundum_3_times_pre_day.json

* Delete 243中枢永动(三班)(TE).json

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-10-08 21:09:16 +08:00
MistEO
b90d7892e4 fix: 修复网络不佳时,信用商店购物卡住的问题。并优化信用商店购物速度
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1349
2022-10-08 21:01:16 +08:00
MistEO
f1e53df76e fix: 修复水月肉鸽点完骰子后又点到收藏品列表的问题 2022-10-08 20:35:49 +08:00
MistEO
6f9b44a7ae fix: 修复水月肉鸽在干员招募界面弹出奖励后不招干员的问题 2022-10-08 20:33:16 +08:00
xjdx
d2dee78bc7 fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2195 2022-10-08 17:38:31 +08:00
MistEO
af67aea49b perf: 优化自定义基建period判断逻辑 2022-10-08 17:17:53 +08:00
MistEO
1d3fc6254a fix: 修复自定义基建period时间错位的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2153
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2210
2022-10-08 17:01:59 +08:00
MistEO
479b235f28 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-10-08 14:27:54 +08:00
MistEO
c5c6958dee fix: typo 2022-10-08 14:27:36 +08:00
zzyyyl
740a14c84b Merge pull request #2220 from MaaAssistantArknights/feat/string_logger
feat: 更新部分 string() 和 Logger
2022-10-08 13:35:07 +08:00
Horror Proton
86a12cce8d fix: update recruit types, use tag id in penguin stats payload
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2222
2022-10-08 12:55:17 +08:00
MistEO
3c6d4b13d5 Merge pull request #2215 from moomiji/dev
feat: 添加配置文件每日备份机制
2022-10-08 10:28:01 +08:00
MistEO
caf4071cd9 Merge pull request #2206 from hguandl/feat/aapl-vision
feat: 在 Apple 平台上使用 Vision 框架提供的 OCR
2022-10-08 10:27:38 +08:00
zzyyyl
9b1d960334 perf: 继续优化 2022-10-08 00:23:27 +08:00
zzyyyl
40ecedaf74 feat: 更新部分 string() 和 Logger 2022-10-07 23:13:15 +08:00
zzyyyl
add9ca6ae8 feat(TaskData): static generate_task_info 2022-10-07 22:15:52 +08:00
zzyyyl
b251fe56e4 perf: 优化肉鸽重连逻辑
怎么全是 deletion?没想到吧
2022-10-07 22:00:53 +08:00
zzyyyl
4d1307c2ee fix: 修复笔误 2022-10-07 21:51:32 +08:00
uye
4562baba31 doc: 更新六群加群链接 2022-10-07 21:35:45 +08:00
zzyyyl
a3aa69849d perf: 按照 reviews 意见修改 ProcessTask
把 max_times 的计算拉出来做个函数
2022-10-07 21:30:39 +08:00
zzyyyl
f06231eae0 feat: 完成之前画的饼
1. base 存在相同前缀则不加前缀
2. tasks 个数超过上限的时候返回临时值

我没测试
2022-10-07 20:59:46 +08:00
zzyyyl
cd4b4fb64d perf: 按照 reviews 意见修改 TaskData 2022-10-07 20:06:54 +08:00
枫雨
d952854591 feat: 添加配置文件每日备份机制
close #2145
2022-10-07 20:02:32 +08:00
zzyyyl
c3ff8f1268 feat: 不使用不安全的 string_view::data() 函数 2022-10-07 19:57:38 +08:00
zzyyyl
0f705361f3 style: format 2022-10-07 19:57:38 +08:00
zzyyyl
9890c942da feat: reduce_other_times 从模板任务生成时也加上前缀 2022-10-07 19:57:38 +08:00
zzyyyl
bbb2eda626 feat: 更新 tasks.json
1. StartUp 任务在 EndOfAction 界面不再直接停止,而是一直点击返回直到主界面
2. 把 StartUp 相关的 task 放到一起
3. `set_times_limit("A")` 对 `B@A`、`B@...@A` 任务也生效
2022-10-07 19:57:30 +08:00
zzyyyl
92b694a46c refactor: 用模板任务简化 task 2022-10-07 19:55:31 +08:00
zzyyyl
5f5032b4fd refactor: 模板任务示例: 简化 Recruit 相关 task 2022-10-07 19:52:53 +08:00
zzyyyl
47b5ecf40b feat: 增加模板任务逻辑 2022-10-07 19:52:25 +08:00
MistEO
deb2213d1c Merge pull request #2213 from MaaAssistantArknights/dev
Release v4.6.0-rc.1
2022-10-07 19:21:54 +08:00
MistEO
553de2be46 docs: update changelog 2022-10-07 19:21:13 +08:00
MistEO
c9459dfe44 fix: using different material item configuration for the different clients
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2010
2022-10-07 19:05:39 +08:00
MistEO
c2dd0a67b6 docs: 更新肉鸽协议文档
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/2167
2022-10-07 18:42:21 +08:00
only562
278c63938d fix: 修复雷电模拟器“退出模拟器”卡死的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/2212
2022-10-07 18:30:09 +08:00
zzyyyl
84ed87e322 style: format 2022-10-07 18:13:45 +08:00
MistEO
0e442767f7 fix: 修复偶现仓库材料种类识别错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2048
2022-10-07 18:12:48 +08:00
MistEO
deaacba25e fix: 修复肉鸽不期而遇选项不能正确选择的问
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2183
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2191
2022-10-07 17:53:11 +08:00
MistEO
18050712d2 style: 修正一些翻译 2022-10-07 17:41:49 +08:00
MistEO
f131044643 fix: 尝试修复凌晨四点更新后肉鸽卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2182
2022-10-07 17:25:12 +08:00
MistEO
c1c6fb721e fix: 修复退出基建的确认按钮没点上导致后续任务卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2193
2022-10-07 17:20:05 +08:00
MistEO
330596eff2 perf: 优化选择材料界面显示 2022-10-07 17:09:48 +08:00
MistEO
9c08e8c4b2 fix: 修复肉鸽不期而遇不满足条件无法选择时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2208
2022-10-07 16:57:54 +08:00
MistEO
c05972396f Merge pull request #2178 from DavidWang19/fix/reception
fix: 修复了会客室把可以挂上的线索送出的问题
2022-10-07 15:01:40 +08:00
MistEO
d631e1f8b4 Merge pull request #2204 from WWPXX233/dev
perf: 调整水月肉鸽干员技能选取,略微提高个别干员的精英化优先级
2022-10-07 14:58:31 +08:00
MistEO
05aa9fc425 style: format json 2022-10-07 14:58:08 +08:00
uye
db724a3c6c feat: 更新加群链接 2022-10-07 13:59:05 +08:00
uye
053d76507c Merge pull request #2196 from MaaAssistantArknights/feat/RoguelikeTheme
feat: 修改肉鸽主题选择方式
2022-10-07 13:16:16 +08:00
uye
28f0d9ecec feat: 更新翻译 2022-10-07 11:31:03 +08:00
zzyyyl
249bc9fdb0 chore(issue-checker): 修复一些 pr-ambiguous 和 duplicate 的问题
现在类似 duplicate of ${link} 的评论会自动给当前 issue 加上 duplicate 标签
现在在 PR 没有 commitizen 且没有 module 类标签时,给 PR 评论不会导致 ambiguous 标签消失
2022-10-07 04:23:51 +08:00
Hao Guan
11064c631f feat: use VisionOCR for apple platform 2022-10-07 04:57:51 +10:00
DavidWang19
3d834e763e fix: 修复了会客室把可以挂上的线索送出的问题 2022-10-06 19:42:37 +01:00
MistEO
4eedfb0273 perf: 优化ROI脚本输出 2022-10-07 01:31:14 +08:00
MistEO
b30e598998 perf: 优化ROI裁剪脚本 2022-10-07 01:26:06 +08:00
WWPXX
1978c17e6c 调整干员技能选取,略微提高个别干员的精英化优先级 2022-10-07 01:01:21 +08:00
zzyyyl
37ca1f07a0 Merge pull request #2159 from hguandl/aapl-build
fix: 修复使用 clang 在 Linux 和 macOS 平台的编译问题
2022-10-07 00:55:59 +08:00
WWPXX
64c3f8f5c2 调整干员技能选取,略微提高个别干员的精英化优先级 2022-10-07 00:54:55 +08:00
Hao Guan
68585a70ab build fix: clang with range-v3 on Linux & macOS
Add header for POSIX

range-v3 for clang

std::string <=> operator for clang

string_view constructor for apple-clang

string format for apple
2022-10-07 02:39:43 +10:00
uye
fd23720b4e fix: typo 2022-10-07 00:26:09 +08:00
uye
05282c95bd feat: 修改肉鸽主题选择方式 2022-10-06 21:07:13 +08:00
zzyyyl
8e978cfd0f style: format 2022-10-06 18:01:25 +08:00
MistEO
e7ab0fc41a Merge pull request #2187 from anywugn/master
feat: 增加1天4换的基建极限243配置作业
2022-10-06 16:46:19 +08:00
AnyWugn
d488883946 新增1天4换基建作业 删除了period字段 2022-10-06 01:30:24 -07:00
AnyWugn
c876256d2a 增加1天4换的极限243配置作业 2022-10-05 23:49:35 -07:00
uye
69a2308528 fix: 尝试修复指定材料选择错误的问题 2022-10-06 14:23:38 +08:00
Horror Proton
3b87d395bb Merge pull request #2168 from MaaAssistantArknights/feat/string_split_view
feat: 删除 `asst::utils::string_split_view`, 使用 `asst::views::split`
2022-10-06 10:52:57 +08:00
zzyyyl
1527e2e863 fix: [workaround] 修复 range-v3 编译报错
在启用 ASST_USE_RANGES_RANGE_V3 的时候:
- 用 addressof(*) 代替 to_address
- 用 forward_iterator 代替 contiguous_iterator

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-10-06 10:51:46 +08:00
zzyyyl
d52981637b feat: 删除 asst::utils::string_split_view, 使用 asst::views::split 2022-10-06 10:51:46 +08:00
zzyyyl
9771ab3933 feat: make_string_view
Co-authored-by: Hao Guan <10684225+hguandl@users.noreply.github.com>
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-10-06 10:51:46 +08:00
MistEO
20d3f8ee9c Merge pull request #2174 from DavidWang19/perf/guilog
perf: 将GUI日志信息改为上对齐
2022-10-06 03:01:30 +08:00
zzyyyl
7c524bf46c fix: 修复 ansi_to_utf8, utf8_to_ansi 传入 string_view 时长度错乱的问题 2022-10-06 01:48:35 +08:00
zzyyyl
db7d8dc728 style: format 2022-10-06 01:47:02 +08:00
DavidWang19
58e8c9f0e7 perf: 将GUI日志信息改为上对齐 2022-10-05 18:29:15 +01:00
MistEO
6b5802488a fix: 修复水月肉鸽招募后卡在骰子界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2164
2022-10-06 00:31:31 +08:00
MistEO
6a2f6d1534 fix & format: roguelike recruit 2022-10-06 00:26:14 +08:00
nightofknife
366b95fdc2 增加部分干员识别错误的替换 (#2173)
* 增加部分干员识别错误的替换

重新补充部分干员识别错误替换
实在是没理解怎么在原来的上面改
QaQ

* Update tasks.json

试试修改pr

* Update tasks.json

赤黑->^赤黑$
2022-10-06 00:24:35 +08:00
MistEO
16e074fe18 Merge pull request #2146 from wallsman/dev
doc: Inside data name JP
2022-10-06 00:23:54 +08:00
MistEO
de8dd265f3 Merge pull request #2156 from WWPXX233/dev
perf: 优化水月肉鸽干员招募与晋升优先级
2022-10-06 00:21:53 +08:00
MistEO
ebefa51911 Merge pull request #2147 from 545426/master
fix: 修复但书班次,skip部分设施增加换班速度
2022-10-06 00:19:14 +08:00
MistEO
92e7e029ff style: format json 2022-10-06 00:18:22 +08:00
MistEO
8c06519996 fix: 修复水月肉鸽第五层不进 boss 关的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2163
2022-10-05 21:39:45 +08:00
WWPXX
97f3a860b7 再次调整了晋升优先级 当精英干员与急需精2的幻神同时出现时 优先精英2 2022-10-05 20:57:20 +08:00
童心
666b0c58f0 删除skip
仅进行导入测试,未实测
2022-10-05 18:18:52 +08:00
童心
7ab69085a3 改了一些错误
未实测(没号)麻烦再检查一下了
2022-10-05 18:10:22 +08:00
WWPXX
58e838e653 新增水月肉鸽道具 简单的排列了一下商店购买优先级 2022-10-05 17:47:45 +08:00
WWPXX
7cccce31d1 新增水月肉鸽道具 简单排列一下优先级 2022-10-05 17:46:35 +08:00
WWPXX
2a3f38a876 添加水月肉鸽新增道具 简单规划了一下商店优先级 2022-10-05 17:43:17 +08:00
WWPXX
fdb398a22f 提高全局精英优先级,新增常用6星5星备选,降低辅助干员的招募优先级防止浪费,调整了部分干员的优先级 2022-10-05 17:29:15 +08:00
WWPXX
1f5d243efd 提高全局精英优先度,新增常用6星5星干员,删除大量辅助干员防止希望浪费,修改个别干员的优先级 2022-10-05 16:49:00 +08:00
WWPXX
33eb9ec6b1 全局晋升优先级提高,新增常用六星以及五星备选,修改了个别的干员优先级 2022-10-05 16:21:33 +08:00
WWPXX
5761ba3af1 提高了全局精英化优先级,新增更多常用六星干员,新增常用五星备选干员,新增少量四星对策干员 2022-10-05 15:43:42 +08:00
WWPXX
61d0bdf715 新增持有量较高的五星干员以常用六星备选,降低特种干员全局优先级,优化全局晋升优先级 2022-10-05 13:57:25 +08:00
童心
46198a9807 实测后报错,已修
漏了一个逗号,我的错
2022-10-05 11:29:53 +08:00
童心
7cd2d4c673 新增满血252一天三换
本策略未实测,首次使用请务必从第一个班开始。
2022-10-05 07:30:50 +08:00
童心
5eb9a7d27a 修复但书班次,skip部分设施增加换班速度
C班但书替换为崖心,解决班次问题。中班的A组(第一、第三设施)和晚班的C组(二、四设施)增加skip字段,加快换班速度,但首次使用本策略必须从早班开始,否则部分设施可能被略过。修改内容具体还待运行测试。
2022-10-05 06:50:34 +08:00
MistEO
e54c16d64e fix: 修复一些右值使用的问题 2022-10-05 05:21:29 +08:00
MistEO
27debb67e9 fix: 修复水月肉鸽一处卡住的问题 2022-10-05 04:49:32 +08:00
Wallsman
45bc7b5607 Doc: Inside data name JP
内部データの数字部分がアルファベットのIではなく数字変換の方になっているので変更
2022-10-05 05:39:24 +09:00
MistEO
4c753794df Merge pull request #2144 from wallsman/dev
fix: Cant recruit Ling fix JP client #2143
2022-10-05 04:27:42 +08:00
Wallsman
bdbcbe17e9 Merge pull request #5 from wallsman/wallsman-patch-1
fix: Cant recruit Ling fix #2143
2022-10-05 05:07:47 +09:00
Wallsman
8b0d552eff fix: Cant recruit Ling fix #2143
Add OCR リィン and リィソ
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2143

Maybe can uses
2022-10-05 05:06:13 +09:00
MistEO
883719b1bb Merge pull request #2142 from MaaAssistantArknights/dev
Release v4.6.0-beta.3
2022-10-05 02:08:17 +08:00
MistEO
943e8ca6ff docs: update changelog 2022-10-05 02:07:32 +08:00
zzyyyl
9f334be58e docs: escape * 2022-10-05 02:07:32 +08:00
MistEO
e8b500b15a docs: add space 2022-10-05 02:07:32 +08:00
MistEO
23d2948707 docs: fix grammar 2022-10-05 02:07:32 +08:00
MistEO
ce792e8e51 docs: 新增纯网页端PR教程 (#2124)
* docs: 更新纯网页 PR 指南

这个教程也是纯网页写的

* Update 2.2-开发相关.md

* docs: fix markdown format
2022-10-05 02:07:32 +08:00
MistEO
37a9fb6729 fix: 增加一个运行期模板图片不存在时的报错 2022-10-05 01:56:22 +08:00
MistEO
0c51b4da33 Merge pull request #2141 from nightofknife/patch-3
Update roguelike_copilot.json
2022-10-05 01:50:39 +08:00
MistEO
6902ed23b3 fix: 修复水月肉鸽一处卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2123
2022-10-05 01:49:49 +08:00
MistEO
75fccffa5c fix: 补上漏掉的模板图片 2022-10-05 01:44:45 +08:00
MistEO
e5c28eeca0 fix: 修复水月肉鸽通关后卡主的问题 2022-10-05 01:37:36 +08:00
MistEO
fa002b6003 fix: 修复水月肉鸽第五层boss关卡卡住的问题,顺便优化一些任务流程
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2119
2022-10-05 01:25:22 +08:00
nightofknife
1cc8e1cf46 Update roguelike_copilot.json
阻止”巢穴“和”狩猎场“中将干员放在左侧路送死的情况
将”纠错“和”订正“的中间一路设为黑名单,看看效果(自测通过可能性提高了一点)
把”海神的信者“中打错的方向改成”左“,并且蓝门右移一格
把”无声呼号“的蓝门左移一格
2022-10-05 01:12:22 +08:00
Horror Proton
f4c3651f8f fix: fix a null-terminated string issue 2022-10-04 22:37:09 +08:00
Horror Proton
ae4fe7dbe8 refactor: move functions to platorm 2022-10-04 22:19:14 +08:00
Horror Proton
446aefea8f refactor: move platform files 2022-10-04 22:19:14 +08:00
Horror Proton
e0c92d8787 refactor: split Logger and assert from AsstUtils 2022-10-04 22:19:14 +08:00
zzyyyl
eb981d494a style: format 2022-10-04 22:06:14 +08:00
MistEO
242da9ba77 Merge pull request #2125 from WWPXX233/dev
feat: 优化水月肉鸽招募逻辑
2022-10-04 22:03:42 +08:00
zzyyyl
f515b8f80b docs: escape * 2022-10-04 20:19:41 +08:00
MistEO
437d7b0a77 docs: add space 2022-10-04 20:11:30 +08:00
WWPXX
ce8ee94dc9 新增了持有率较高的五星干员 重新优化了六星干员的选取逻辑 2022-10-04 19:46:34 +08:00
MistEO
d4471e4e91 docs: fix grammar 2022-10-04 17:15:29 +08:00
WWPXX
34f6447cb8 修改了水月肉鸽更适合的干员 提高了水月肉鸽对策卡的优先级,增加了全六星优先级 2022-10-04 15:47:55 +08:00
zzyyyl
37dc58a1ec perf: 继续修复部分 EX 关卡不会停止打的问题
好像有可能有活动关卡以 EX-、MO-、S- 开头(?
2022-10-04 15:46:30 +08:00
MistEO
45e5189cfa docs: 新增纯网页端PR教程 (#2124)
* docs: 更新纯网页 PR 指南

这个教程也是纯网页写的

* Update 2.2-开发相关.md

* docs: fix markdown format
2022-10-04 15:32:30 +08:00
zzyyyl
509ec9d0ad feat: 修复部分 EX 关卡不会停止打的问题 2022-10-04 15:28:36 +08:00
MistEO
23e2a67153 fix: 优化一个不明所以的逻辑 2022-10-04 03:00:30 +08:00
MistEO
88711b2b50 fix: 修复肉鸽无可放置位置时,来回点干员的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2114
2022-10-04 01:49:32 +08:00
zzyyyl
edf3da646f feat: 将肉鸽招募的滑动最大值放入 tasks.json 中方便修改 2022-10-03 23:10:44 +08:00
zzyyyl
a3887f6583 Merge pull request #2108 from MaaAssistantArknights/feat/deepsea
fix: [workaround] 修复往水上放东西的问题

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2065
2022-10-03 18:06:54 +08:00
zzyyyl
bd045487a1 fix: [workaround] 修复往水上放东西的问题 2022-10-03 15:31:53 +08:00
MistEO
d8eec5b208 fix: 修复水月肉鸽一处招募界面卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2103
2022-10-03 12:58:06 +08:00
MistEO
a81ba7db02 fix: 修复水月肉鸽“选择”按钮卡住的问题 2022-10-03 12:54:52 +08:00
Horror Proton
f19f55fe61 feat: update logging of file not exist error
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2085
2022-10-03 11:31:53 +08:00
MistEO
e7c26fd347 Merge pull request #2097 from MaaAssistantArknights/dev
Release v4.6.0-beta.2
2022-10-03 03:10:33 +08:00
MistEO
05ddee8c50 fix: 修复肉鸽招募列表滑动没反应的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2081
2022-10-03 03:09:34 +08:00
MistEO
23d4dfd3cb Merge pull request #2095 from MaaAssistantArknights/dev
Release v4.6.0-beta.1
2022-10-03 02:41:17 +08:00
MistEO
404ae31214 Merge pull request #2096 from MaaAssistantArknights/perf/fight
rft: 重构当前/上次作战的逻辑
2022-10-03 02:31:56 +08:00
zzyyyl
1366108eea rft: 重构当前/上次作战的逻辑 2022-10-03 02:25:23 +08:00
zzyyyl
d23c6efb3c style: format 2022-10-03 02:25:12 +08:00
MistEO
5542b6c458 docs: update changelog 2022-10-03 02:06:26 +08:00
MistEO
58f12882bd Merge pull request #2094 from MaaAssistantArknights/perf/fight
perf: 优化刷理智任务逻辑
2022-10-03 02:03:59 +08:00
Yizhen Wang
87085bc28d Create maa-infra.schema.json 2022-10-02 19:03:39 +01:00
MistEO
9fadcbca38 fix: 修复战斗中干员职业识别错误的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2049
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1965
2022-10-03 01:43:58 +08:00
MistEO
06e6962867 Merge pull request #2093 from DavidWang19/fix/rgmodetext
fix: update roguelike mode text for the change at 4.6.0.alpha.8
2022-10-03 01:28:03 +08:00
MistEO
6fa071c21d fix: 简单修复一下肉鸽没位置时还一直放人的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2072
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1006
2022-10-03 01:26:01 +08:00
zzyyyl
a9c8f09461 perf: 优化刷理智任务逻辑
1. LastBattle 之前没有用上,干脆拿来当作 当前/上次作战 的启动任务
2. 把 StageBegin 的 next 抽出来(因为它是 JustReturn 的不会重试)
2022-10-03 01:13:49 +08:00
DavidWang19
34e82dd08d fix: update roguelike mode text for the change at 4.6.0.alpha.8 2022-10-02 18:08:41 +01:00
MistEO
e40fc37648 fix: 修复水月肉鸽卡在数据回溯界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2080
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1997
2022-10-03 01:06:51 +08:00
MistEO
95afc10b58 fix: 简单修复水月肉鸽点开宝箱的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2071
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2052
2022-10-03 00:36:49 +08:00
zzyyyl
54803c23a1 Merge pull request #2090 from yilin2020/dev
fix, docs: 更新readme&忽略文件增加指定不忽略
2022-10-03 00:30:16 +08:00
zzyyyl
753a0650d4 Merge pull request #2074 from DavidWang19/MyDev
fix: 修复在战斗中进入刷理智任务时任务崩溃的问题
2022-10-03 00:27:59 +08:00
yilin2020
2ca58d2953 docs: update README_en-US ja-JP zh-TW 2022-10-03 00:26:34 +08:00
DavidWang19
acfe3395b2 fix: 修复在战斗中进入刷理智任务时任务崩溃的问题 2022-10-02 17:14:07 +01:00
zzyyyl
8ba056a643 Merge pull request #2084 from MaaAssistantArknights/fix/tasks
fix: 修一些 tasks.json 的 bug,继续增加语法检查
2022-10-02 23:56:50 +08:00
chenyilin
c3591787aa fix(golang) rename mma.go => maa.go 2022-10-02 23:50:29 +08:00
MistEO
d5024989e2 fix: 默认关闭信用溢出时仍购物选项
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2075
2022-10-02 23:40:29 +08:00
MistEO
23369da077 fix: 修复水月肉鸽“风雨际会”、“紧急运输“关卡卡住的问题 2022-10-02 23:26:08 +08:00
yilin2020
2fc6fc2c94 docs: update readme.md 2022-10-02 21:24:58 +08:00
yilin2020
b84f129d8b fix[golang] .gitignore add specify file 2022-10-02 21:20:38 +08:00
MistEO
8c8b4885a6 Merge pull request #2089 from yilin2020/dev
feat[golang] update go code for AsstHandle
2022-10-02 20:40:40 +08:00
yilin2020
17e992e6a4 feat[golang] update go code for AsstHandle 2022-10-02 20:27:24 +08:00
zzyyyl
607bc8f544 style: format 2022-10-02 20:27:09 +08:00
zzyyyl
369c4fc35e fix: 修正格式以符合 syntax_check 2022-10-02 18:02:20 +08:00
zzyyyl
a9365a1fa6 fix: 修一些 tasks.json 的 bug 2022-10-02 17:39:03 +08:00
DavidWang19
097516fa5d Remove support for starting at StartButton2 2022-10-02 07:21:04 +01:00
MistEO
74306d6d4f Merge pull request #2079 from DavidWang19/feat/improveRogueRecruit
Improve Roguelike Recruitment
2022-10-02 14:11:25 +08:00
DavidWang19
21dfe881af Improve Roguelike Recruitment 2022-10-02 06:28:21 +01:00
MistEO
d8f794d9f7 fix: 修复水月肉鸽关闭事件后又弹出事件,卡住的问题 2022-10-02 12:21:14 +08:00
uye
14733b1430 fix: 修复活动结束后仍导航进入活动关卡问题 2022-10-02 10:46:15 +08:00
DavidWang19
7a13b937c9 Add support for entering fight from StartButton2, PRTS and EndOfAction. 2022-10-01 20:50:31 +01:00
zzyyyl
644e2f6f8f feat: GUI 抛异常时的日志加个换行 2022-10-01 23:39:10 +08:00
zzyyyl
02400176ec feat: 增加三个地块
`tile_deepwater` -> DeepSea(我也不知道这玩意跟 `tile_deepsea` 有啥关系,看名字差不多)
`tile_flystart`  -> Airport(无人机出发点)
`tile_grass`     -> Grass  (草地)
2022-10-01 23:36:24 +08:00
zzyyyl
883429ffb1 feat: debug 模式下,tasks.json 加载的时候做一个语法检查
link to beddc7c828
2022-10-01 23:35:35 +08:00
zzyyyl
beddc7c828 fix: 修复傀影肉鸽进不去的 bug
templateThreshold -> templThreshold

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2067
2022-10-01 22:52:15 +08:00
zzyyyl
5cdb64d96c perf: fix typo 2022-10-01 22:38:48 +08:00
zzyyyl
81c3c5640d feat: 更新水月和傀影肉鸽入口图片 2022-10-01 22:27:32 +08:00
zzyyyl
59bb50a26d feat: GUI 抛异常时打点日志 2022-10-01 18:38:30 +08:00
zzyyyl
6936700515 fix: 尝试修复日服肉鸽招募时等级识别错误的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1777
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2057
2022-10-01 17:35:17 +08:00
MistEO
bab3668c22 Merge pull request #2059 from MaaAssistantArknights/dev
Release v4.6.0-alpha.7
2022-10-01 14:26:46 +08:00
MistEO
fffbfc5d9d docs: update changelog 2022-10-01 14:26:33 +08:00
MistEO
774b820302 perf: 肉鸽不招募不在需求中的干员 2022-10-01 14:21:39 +08:00
MistEO
af89771086 fix: 修复水月肉鸽一处卡住的问题 2022-10-01 13:26:55 +08:00
MistEO
6bd8bb82ea fix: 再次修复一些肉鸽卡住的问题 2022-10-01 12:37:23 +08:00
MistEO
077b43a1f4 fix: 增加肉鸽招募时的左滑次数 2022-10-01 03:09:05 +08:00
MistEO
785cd4a44e fix: 修复水月肉鸽刷投资时,第二层初的骰子卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2045
2022-10-01 02:02:55 +08:00
MistEO
dad2fdd7a4 Merge pull request #2044 from MaaAssistantArknights/dev
Release v4.6.0-alpha.6
2022-10-01 01:48:58 +08:00
MistEO
38ed0ed408 fix: 修复战斗完掉落时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2043
2022-10-01 01:48:40 +08:00
Horror Proton
7416357248 fix: fix text in recruit task
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2041
2022-10-01 01:41:30 +08:00
MistEO
674abf9639 fix: 修复战斗完掉落时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2043
2022-10-01 01:39:14 +08:00
MistEO
76d1aaff6d fix: 修复水月肉鸽骑士事件卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2043
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2042
2022-10-01 01:39:14 +08:00
MistEO
13c4dd4b21 Merge pull request #2039 from MaaAssistantArknights/dev
Release v4.6.0-alpha.5
2022-10-01 00:16:21 +08:00
MistEO
375db8107a docs: update changelog 2022-10-01 00:16:12 +08:00
MistEO
decd22cd46 perf: 优化肉鸽招募时的滑动逻辑 2022-10-01 00:06:35 +08:00
MistEO
0302bbf4b7 feat: 新增支持水月肉鸽“万象追忆” 2022-09-30 23:48:45 +08:00
MistEO
e5fe9b8b32 fix: 修复水月肉鸽在“继续探索”界面卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2027
2022-09-30 23:37:07 +08:00
MistEO
051871f077 perf: 降低肉鸽桃金娘招募优先级
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2025
2022-09-30 23:32:36 +08:00
MistEO
8bd5a390cc feat: ProcessTask支持后置超限,并将肉鸽刷源石锭改为进入第二层后再退出
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2037
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1959
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1073
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/396
2022-09-30 23:31:05 +08:00
MistEO
da0cfd4dbb perf: 优化内置243作业 2022-09-30 22:57:10 +08:00
MistEO
809611503a perf: 优化基建干员识别器 InfrastOperImageAnalyzer 的标志位设置 2022-09-30 22:57:10 +08:00
zzyyyl
7ceb7cead6 style: format 2022-09-30 22:55:25 +08:00
MistEO
54ddca80df fix: 为基建清空按钮添加识别重试机制,修复干员清空失败导致的换班错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1940
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1495
2022-09-30 22:48:09 +08:00
Wallsman
0a20d9904e Update operators.md
typo fix
2022-09-30 23:24:38 +09:00
Wallsman
984db71aca doc: Japanese and English add 2022-09-30 23:22:53 +09:00
MistEO
cd46dcc5ee fix: 修复水月肉鸽委托任务完成后卡住的问题
暂时还不会领奖励,起码别卡(

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2016
2022-09-30 22:19:16 +08:00
MistEO
a3677518b6 fix: 一定程度上缓解干员招募页滑动过快后卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2033
2022-09-30 22:02:58 +08:00
zzyyyl
439555b2d3 Merge pull request #2026 from MaaAssistantArknights/feat/guilog
feat: 界面上的日志保存到 `gui.log`
close #434
close #1939
2022-09-30 21:54:53 +08:00
MistEO
727907c7ed feat: 新增水月肉鸽新格子种类的评分,并修复一些干员朝向错误,以及黑名单地块不生效的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2024
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2025
2022-09-30 21:29:44 +08:00
zzyyyl
b63b687245 feat: 改小日志大小阈值 2022-09-30 21:08:12 +08:00
zzyyyl
9f3c79d446 feat: 界面上的日志保存到 gui.log
每次 GUI 启动时,若超过 16M, `gui.log` -> `gui.bak.log`

link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/434
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1939
2022-09-30 16:50:22 +08:00
zzyyyl
cada49478f fix: 修复有时候莫名截图错误的问题
(修复 screencap 和 call_command 的 重连 和 socket 参数传递错误的问题)

link to d94a288a70
2022-09-30 15:56:01 +08:00
MistEO
df37355d6f fix: 调高干员招募task的优先级,再次修复干员招页卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2018
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2018
2022-09-30 15:51:24 +08:00
MistEO
af157c4da4 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-09-30 15:47:08 +08:00
MistEO
2a24f1cadf fix: 简单修复一下肉鸽狂点开始的问题 2022-09-30 15:47:03 +08:00
MistEO
cf579ecafa fix: 简单修复下肉鸽在干员招募页卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2018
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2023
2022-09-30 15:46:00 +08:00
zzyyyl
d9534908e3 docs: style 2022-09-30 15:19:01 +08:00
zzyyyl
16455719d0 perf: 继续优化公招 Tags 逻辑
link to a33e708b2b
2022-09-30 14:29:25 +08:00
Helloworld
327d633cee Merge pull request #2021 from MaaAssistantArknights/i18n
docs: inline some translations for JSON in JP docs
2022-09-30 14:21:44 +08:00
Helloworld
8a071b2a07 docs: inline some translations for JSON in JP docs 2022-09-30 14:19:26 +08:00
MistEO
f552bdc79d refactor: 再次整理项目部分文件目录结构 2022-09-30 13:41:38 +08:00
Horror Proton
a33e708b2b chore: remove hardcoded stuff 2022-09-30 11:57:16 +08:00
Horror Proton
08d45ed839 fix: fix a compile error 2022-09-30 11:44:03 +08:00
GalvinGao
ef2a7e8ce1 docs: update icon 2022-09-29 14:06:04 -04:00
GalvinGao
76dce545a7 docs: update icon 2022-09-29 13:57:02 -04:00
MistEO
ec30b7c3b2 Merge pull request #2011 from MaaAssistantArknights/dev
Release v4.6.0-alpha.4
2022-09-30 01:30:24 +08:00
MistEO
30ede2d7c8 docs: update icon, readme, and changelog 2022-09-30 01:30:02 +08:00
MistEO
37de7332e2 feat: 优化水月肉鸽招募配置 2022-09-30 01:13:14 +08:00
MistEO
c87d6a9e8a Merge pull request #1931 from MaaAssistantArknights/chore/recruitment_resource-zzyyyl-patch-1
fix: 修复公招资源及其生成器
2022-09-30 01:05:28 +08:00
Horror Proton
da00534847 fix: update include path of certain files 2022-09-30 00:55:58 +08:00
MistEO
ac1e9e537c fix: 修复 json 格式错误 2022-09-30 00:40:23 +08:00
zzyyyl
f62694525b fix: 尝试适配 range-v3 2022-09-30 00:36:37 +08:00
MistEO
8857aa0e7b fix: 修复公招tag不完全匹配的问题 2022-09-30 00:36:34 +08:00
MistEO
8e6c7dd0eb fix: 修复水月肉鸽一处卡住的问题 2022-09-30 00:32:55 +08:00
MistEO
d39b138faf feat: 再添加一些ProcessTask的日志 2022-09-30 00:32:55 +08:00
MistEO
2036426d47 fix: 修复一些水月肉鸽卡住的问题 2022-09-30 00:32:55 +08:00
zzyyyl
719746c95d chore: 修复公招支援机械词条消失的问题
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-09-30 00:25:43 +08:00
zzyyyl
494092369c fix: 修复一个潜在的数组越界问题 2022-09-30 00:25:35 +08:00
zzyyyl
cb678fb86d rft: 使用 asst::utils 的 string 处理 2022-09-30 00:25:27 +08:00
zzyyyl
0ed041b089 feat(string_split_view): enable_view, enable_borrowed_range 2022-09-30 00:20:23 +08:00
zzyyyl
419f704429 fix: 修复公招忽略支援机械的问题
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1993
2022-09-30 00:20:15 +08:00
zzyyyl
97261abe25 chore(issue-checker): 存在 roguelike 标签时跳过 copilot 2022-09-30 00:15:13 +08:00
MistEO
5847e3685f Merge pull request #2008 from nightofknife/patch-2
feat: Update `roguelike_copilot.json` [Skip module label]
2022-09-29 23:56:13 +08:00
MistEO
11fa16a488 Update roguelike_copilot.json 2022-09-29 23:55:58 +08:00
zzyyyl
e5c69bb322 Merge pull request #2004 from MaaAssistantArknights/refactor/maacore
refactor: 按照 filters 为 MaaCore 重新建立文件结构
2022-09-29 23:51:29 +08:00
nightofknife
b9f51e4f4b Update roguelike_copilot.json
添加了新字段支持,优化站位,尝试解决#1991问题
2022-09-29 23:43:48 +08:00
zzyyyl
255758bb1c chore: blame-ignore 2022-09-29 23:35:13 +08:00
zzyyyl
559c913fca style: format 2022-09-29 23:30:40 +08:00
zzyyyl
c9b5aa638a refactor: 给头文件加上路径
直接在上一个 commit 里改的话可能会导致 history 消失
2022-09-29 23:30:32 +08:00
zzyyyl
206df466fd refactor: 按照 filters 为 MaaCore 重新建立文件结构 2022-09-29 23:25:33 +08:00
Horror Proton
1fae5d65d2 chore: update CMakeLists.txt 2022-09-29 23:09:05 +08:00
MistEO
24ea6ce17c feat: 再添加一些日志 2022-09-29 22:57:47 +08:00
MistEO
9d1547a150 feat: 保存图片时增加一些日志 2022-09-29 22:49:43 +08:00
MistEO
7d2b074620 feat: 优化肉鸽copilot,支持推荐方向和黑名单地块 2022-09-29 22:35:00 +08:00
MistEO
18ae9d07f7 docs: update readme 2022-09-29 01:31:14 +08:00
MistEO
e538e4c5f4 Merge pull request #1986 from MaaAssistantArknights/dev
Release v4.6.0-alpha.3
2022-09-29 00:44:40 +08:00
MistEO
0a6c2ec158 docs: update changelog 2022-09-29 00:44:22 +08:00
MistEO
01187b930e fix: 修复水月肉鸽第三层战利品选择卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1964
2022-09-29 00:07:55 +08:00
MistEO
db94ef864a Merge pull request #1966 from JiHongYuan/patch-1
fix: java doc集成文档地址
2022-09-29 00:03:17 +08:00
nightofknife
307a474b5f chore: Update roguelike_copilot.json (#1983) 2022-09-29 00:02:46 +08:00
MistEO
7bcd2d9084 fix: build errror
@zzyyyl 屑!
2022-09-28 23:53:10 +08:00
MistEO
ae43464668 Merge pull request #1982 from MaaAssistantArknights/feat/mizuki
feat: 给水月肉鸽增加 招募 和 藏品 的配置文件
2022-09-28 23:50:49 +08:00
zzyyyl
dadfbdf8cf fix: fix build error 2022-09-28 23:47:52 +08:00
MistEO
50253cd4d2 fix: 修复了亿点点水月肉鸽的bug 2022-09-28 23:47:24 +08:00
zzyyyl
758affb37c feat: 给水月肉鸽增加 招募 和 藏品 的配置文件 2022-09-28 23:28:10 +08:00
MistEO
580e6ca112 feat: 肉鸽卡住时自动保存截图 2022-09-28 22:40:13 +08:00
zzyyyl
fc8d809ee2 Merge pull request #1975 from MaaAssistantArknights/docs/issue-template
docs: Update issue template
2022-09-28 20:15:21 +08:00
zzyyyl
505caebac3 docs: Update issue template 2022-09-28 19:46:40 +08:00
zzyyyl
d7e041cbe6 docs: Update issue template 2022-09-28 19:40:00 +08:00
JiHongYuan
8bb2971873 fix: java doc集成文档地址
**java doc集成文档地址**
2022-09-28 16:11:27 +08:00
MistEO
492b7d66a3 perf: 优化抄作业json文件路径转换 2022-09-28 15:47:34 +08:00
MistEO
ffd2ccd2db Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-09-28 15:41:34 +08:00
MistEO
bd47072a47 fix: 修复一些解析json时的crash问题 2022-09-28 15:41:15 +08:00
zzyyyl
a5c99ce3bd chore(issue-checker): fix Release 2022-09-28 15:06:37 +08:00
MistEO
d94a288a70 perf: 优化截图出错时的重试机制 2022-09-28 14:49:13 +08:00
Tastror
de677f4a76 Merge pull request #1950 from wallsman/dev
doc: add line Japanese traslate and minor change
2022-09-28 14:21:52 +08:00
Wallsman
281a12401f Update ja-jp.xaml 2022-09-28 15:11:20 +09:00
MistEO
57817ce34f docs: fix link 2022-09-28 13:24:31 +08:00
Horror Proton
1fdc12afbe chore: fix a compile error 2022-09-28 13:14:27 +08:00
MistEO
b3b865aa37 docs: 更新用户群 2022-09-28 11:23:31 +08:00
uye
375b43198e feat: 添加五群链接 2022-09-28 11:08:58 +08:00
Wallsman
615185a0ea Update ja-jp.xaml 2022-09-28 02:51:04 +09:00
Wallsman
4069986170 Update ja-jp.xaml 2022-09-28 02:35:22 +09:00
Wallsman
a9fbc444fe doc:add Mizuki rogue
追加抜け分の先行対応
2022-09-28 02:34:12 +09:00
MistEO
f4a23e080b Merge pull request #1949 from MaaAssistantArknights/dev
fix: 再次修复第三层boss卡住的问题
2022-09-28 01:25:32 +08:00
MistEO
0a5041ff45 fix: 再次修复第三层boss卡住的问题 2022-09-28 01:24:47 +08:00
Wallsman
916b9565d5 doc:Japanese traslation
英語部分の日本語化と日本語説明の表示位置変更
English line to Japanese.
Japanese text priority to top view.
2022-09-28 02:17:56 +09:00
MistEO
dec524a723 Merge pull request #1948 from MaaAssistantArknights/dev
Release v4.6.0-alpha.2
2022-09-28 01:15:17 +08:00
MistEO
efdbaecb21 fix: 修复水月肉鸽第三层boss卡住的问题
但是这样第五层boss就会卡了,明天再改.jpg
2022-09-28 01:14:29 +08:00
Wallsman
b1337cea6e doc:minor change
2Byte だったセミコロンの修正
OCRを分かりやすいように実例に変更
; to Byte code
2022-09-28 02:11:47 +09:00
MistEO
c4a6c4548b Merge pull request #1947 from MaaAssistantArknights/dev
Release v4.6.0-alpha.1
2022-09-28 00:50:34 +08:00
MistEO
0ac093e6e8 fix: 修复一些水月肉鸽卡住的问题 2022-09-28 00:41:50 +08:00
MistEO
a647b9e19c fix: 修复水月肉鸽紧急作战关卡识别错误 2022-09-28 00:25:46 +08:00
MistEO
38b3b9d594 docs: update changelog 2022-09-28 00:25:46 +08:00
MistEO
0ad4877bf8 fix: 修复水月肉鸽的一些卡住的问题 2022-09-28 00:25:46 +08:00
MistEO
5ccdea5deb Merge pull request #1930 from MaaAssistantArknights/feat/more_overseas_support
feat: support more features for overseas clients
2022-09-28 00:05:27 +08:00
MistEO
85b3583dce Merge pull request #1927 from Hydrogina/dev
feat: 在信用值溢出时无视黑名单进行购物
2022-09-28 00:04:53 +08:00
MistEO
acff028f1a Merge pull request #1946 from MaaAssistantArknights/fix/process_still_active
fix: 修复 hProcess 返回值 259(STILL_ACTIVE)导致重连的问题
2022-09-27 23:57:46 +08:00
MistEO
e4a3b2b644 feat: 初步完成水月肉鸽 2022-09-27 23:52:30 +08:00
MistEO
9b333e8025 perf: 优化肉鸽干员招募时的识别逻辑 2022-09-27 23:52:30 +08:00
uye
66d0ff1972 feat: 修复出新活动后导航可能出错的问题 2022-09-27 21:01:17 +08:00
uye
2db46731c4 fix: 修复更新后活动导航失效 2022-09-27 20:58:01 +08:00
zzyyyl
f86a198b38 fix: 加个 closesocket 2022-09-27 19:26:34 +08:00
zzyyyl
d56dd5a1ad feat: 加点日志,timeout 时强制中止 hProcess 2022-09-27 19:10:25 +08:00
zzyyyl
7f0661d45f fix: 继续修复退出时两次 kill-server 的问题 2022-09-27 19:07:12 +08:00
Hydrogina
048ca128d3 refactor: 优化信用商店购买逻辑 2022-09-27 18:12:30 +08:00
zzyyyl
b727266268 feat: 加点日志输出 2022-09-27 17:47:33 +08:00
MistEO
52390525db fix: typo 2022-09-27 17:05:19 +08:00
MistEO
637990da93 chore: update resources 2022-09-27 17:01:08 +08:00
MistEO
3fc24d1662 Merge pull request #1924 from wallsman/dev
doc:ja-jp.xaml add line.
2022-09-27 16:39:52 +08:00
MistEO
d358f3ea4f docs: update ja-jp.xml 2022-09-27 16:39:39 +08:00
MistEO
346fcd0f77 Merge pull request #1928 from MaaAssistantArknights/chore/recruitment_resource
feat: Localize recruitment results and make resources auto updated
2022-09-27 16:38:28 +08:00
MistEO
72cc3ff0f6 perf: Optimize some minor issues of recruitment 2022-09-27 16:37:51 +08:00
MistEO
f24aa187ee perf: 自定义基建干员名为空时候则忽略该项 2022-09-26 19:04:43 +08:00
MistEO
ef70f00c6c feat: 新增自定义基建无人机和 Fia 的 enable 字段,优化部分解析逻辑 2022-09-26 19:01:32 +08:00
Hydrogina
70325f45ac style, docs: 优化参数名,补充集成文档 2022-09-26 17:59:30 +08:00
Hydrogina
6d1cecf77f style, docs: 优化参数名,补充集成文档 2022-09-26 17:48:52 +08:00
Hydrogina
a973c95cf3 style, docs: 优化参数名,补充集成文档 2022-09-26 13:12:04 +08:00
Hydrogina
fd8ebb02c0 feat: 添加选项 信用溢出时无视黑名单 2022-09-25 19:04:23 +08:00
zzyyyl
26ba3b9d2e Merge pull request #1929 from MaaAssistantArknights/docs/issue-bot
docs: 更新 IssueBot 文档
2022-09-25 14:56:06 +08:00
Hydrogina
34c369ad97 perf: 优化数字识别 2022-09-25 12:52:18 +08:00
zzyyyl
7990475023 chore(issue-checker): fix typo 2022-09-25 00:03:47 +08:00
MistEO
87b2d48bde feat: support credit shopping for JP and EN clients 2022-09-24 23:53:39 +08:00
zzyyyl
48350c4612 docs: 更新 IssueBot 文档 2022-09-24 23:14:02 +08:00
zzyyyl
b9b9110ed6 chore(issue-checker): 紧急修复 issue-checker 2022-09-24 23:05:19 +08:00
MistEO
f3a7f353ab feat: Localize recruitment results and make resources auto updated 2022-09-24 22:42:39 +08:00
Hydrogina
82bc46925d feat: 在信用值溢出时无视黑名单进行购物 2022-09-24 22:19:41 +08:00
zzyyyl
9bdcd2ea1c chore(issue-checker): 把 issue-checker 的配置写得让正常人能看得懂
chore(issue-checker): 更新 issue-checker 到 v1.7

chore(issue-checker): 修复 IssueBot 把基建作业相关的内容打上 copilot 标签的问题
2022-09-24 21:59:53 +08:00
Wallsman
7cb71c51d3 doc:ja-jp.xaml add line.
"RemainingSanityStage" add Base EN.
2022-09-24 20:50:05 +09:00
Tastror
0b4f0bc641 Merge pull request #1918 from wallsman/dev
doc:Create 3.6-インフラスケジュール設定.md
2022-09-24 16:24:01 +08:00
Wallsman
fc75f62e9d Update 3.6-インフラスケジュール設定.md 2022-09-24 16:50:07 +09:00
MistEO
e71a13bd07 Merge branch 'master' into dev 2022-09-24 13:26:21 +08:00
MistEO
b6bafc462c docs: Make base doc more accurate
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1918
2022-09-24 12:32:40 +08:00
MistEO
6a49d974a4 chore: 更新界面翻译 2022-09-24 06:57:01 +08:00
MistEO
b2e0fe9f67 chore: 将内置243作业改为巫恋组永动 2022-09-24 02:05:16 +08:00
Wallsman
5b57268420 Create 3.6-インフラスケジュール設定.md
CN base in Japanese, Maybe the translation is a little suspect.

https://github.com/wallsman/MaaAssistantArknights/blob/dev/docs/3.6-%E5%9F%BA%E5%BB%BA%E6%8E%92%E7%8F%AD%E5%8D%8F%E8%AE%AE.md
2022-09-23 22:51:46 +09:00
MistEO
4ff2f54aa8 Merge pull request #1916 from MaaAssistantArknights/feat/rt_params
feat: 主界面参数实时生效,删除“修改”按钮
2022-09-23 19:53:37 +08:00
MistEO
3825aecb4e docs: update docs about custom base, fix built-in configuration 2022-09-23 18:04:55 +08:00
MistEO
a1e231a4b4 Merge pull request #1907 from MaaAssistantArknights/docs/development
docs: 修改开发相关文档
2022-09-23 17:46:38 +08:00
MistEO
335d2f94de docs: add contributor in the changelog 2022-09-23 17:44:34 +08:00
MistEO
0d91a01589 Merge pull request #1917 from MaaAssistantArknights/dev
Fix Release v4.5.0-rc.3
2022-09-23 17:42:39 +08:00
MistEO
6470313ea7 feat: Custom Base function translation 2022-09-23 17:41:56 +08:00
MistEO
5a2971dc16 docs: update changelog 2022-09-23 17:38:03 +08:00
MistEO
d06b7b3020 feat: real time gui params 2022-09-23 17:14:50 +08:00
MistEO
891e3052ac Update docs/en-us/2.2-DEVELOPMENT.md
Co-authored-by: Helloworld <1326521+LYZhelloworld@users.noreply.github.com>
2022-09-23 11:45:06 +08:00
MistEO
a8a7139746 perf: 优化基建进入房间时的逻辑,修复自定义基建菲亚任务进入后面宿舍的问题 2022-09-23 11:25:33 +08:00
MistEO
5dd73d34bc perf: 优化在定义基建获取房间信息的效率
perf https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1914
2022-09-23 01:40:52 +08:00
MistEO
409b71c03c fix: 修复自定义基建当前房间配置与房间index不同步的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1914
2022-09-23 01:36:46 +08:00
MistEO
0aa2928fe7 Merge pull request #1913 from MaaAssistantArknights/dev
Release v4.5.0-rc.3
2022-09-22 20:28:40 +08:00
MistEO
9981114dba docs: update changelog 2022-09-22 20:28:11 +08:00
MistEO
97a0137523 fix: 修复自定义基建排序的判断 2022-09-22 20:07:35 +08:00
MistEO
2f9c28a906 fix: 修复自定义基建autofill不生效的问题 2022-09-22 20:05:34 +08:00
MistEO
0e7ab77b75 fix: 修复自定义基建菲亚梅塔不排序的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1909
2022-09-22 19:35:40 +08:00
Horror Proton
1ae01df352 docs: update DEVELOPMENT.md 2022-09-22 18:34:36 +08:00
uye
bc17e6e55c feat: 刻俄柏也需开启sort 2022-09-22 18:19:01 +08:00
MistEO
2000506866 Merge pull request #1908 from MaaAssistantArknights/dev
chore: 更新企鹅关卡数据
2022-09-22 18:13:03 +08:00
MistEO
1a6ee14c1c chore: 更新企鹅关卡数据 2022-09-22 18:12:17 +08:00
MistEO
bfe5fdbdc1 Merge pull request #1906 from MaaAssistantArknights/dev
Release v4.5.0-rc.2
2022-09-22 18:05:56 +08:00
MistEO
69579c7303 docs: update changelog 2022-09-22 18:05:18 +08:00
MistEO
f369375455 docs: update changelog 2022-09-22 18:04:27 +08:00
MistEO
8faa3e8bd5 fix: 修复界面关卡导航选择 2022-09-22 18:02:12 +08:00
MistEO
ebafc158ad Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-09-22 17:57:35 +08:00
MistEO
7c3a2778f4 fix: 修复自定义基建第一间房间skip参数不生效问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1905
2022-09-22 17:56:03 +08:00
MistEO
0ec438c1bb Merge pull request #1903 from MaaAssistantArknights/dev
Release v4.5.0-rc.1
2022-09-22 16:33:28 +08:00
MistEO
2990378849 docs: update changelog 2022-09-22 16:32:57 +08:00
MistEO
ce1f670c43 chore: 更新活动关卡资源 2022-09-22 16:25:48 +08:00
uye
af2a0bf0f0 feat: 开放「长夜临光」复刻活动导航 2022-09-22 16:17:54 +08:00
zzyyyl
c652774086 chore: 更新 clang-formatter.py
1. 允许 格式化单个文件
2. 允许 自定义 style
3. 允许 指定后缀名
2022-09-22 15:35:34 +08:00
MistEO
d2255f8913 fix: typo 2022-09-22 13:09:50 +08:00
MistEO
6e292203fa fix: build error 2022-09-22 13:09:41 +08:00
MistEO
636d2ec900 fix: 再次修复基建组合干员不足时,选择外部干员的逻辑 2022-09-22 12:23:52 +08:00
MistEO
128aa0e441 perf: 优化自定义基建找不到人时的重试操作 2022-09-22 11:29:48 +08:00
MistEO
8593ffd15e feat: 新增自定义基建sort字段,默认关闭
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1900
2022-09-22 11:07:58 +08:00
MistEO
6208287327 Merge pull request #1897 from MaaAssistantArknights/dev
Release v4.5.0-beta.2
2022-09-22 00:51:48 +08:00
MistEO
5f87433490 fix: 修复自定义换班错误 2022-09-22 00:50:26 +08:00
zzyyyl
4a594c64a2 fix: 修复退出时两次 kill-server 的问题 2022-09-22 00:25:05 +08:00
uye
94d2c5af5e feat: 「长夜临光」复刻活动导航预更新 2022-09-22 00:03:02 +08:00
MistEO
09c37f1029 Merge pull request #1896 from MaaAssistantArknights/dev
Release v4.5.0-beta.1
2022-09-21 23:56:09 +08:00
MistEO
5b5e34da67 docs: 更新 changelog 2022-09-21 23:55:43 +08:00
MistEO
217440f529 chore: fix a minor warning 2022-09-21 23:44:31 +08:00
MistEO
973bea20c4 fix: 尝试修复调用命令时抛出异常的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1871
2022-09-21 23:28:53 +08:00
Horror Proton
6fba1bf790 fix: fix function lookup issue
ref: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1881
2022-09-21 23:20:15 +08:00
Horror Proton
fa75894087 fix: fix compile error 2022-09-21 23:19:00 +08:00
MistEO
d8afc33cc3 fix: 尝试修复一个飞桨运行时的崩溃问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1879
2022-09-21 23:14:33 +08:00
MistEO
db9f3c5c6c Merge pull request #1797 from MaaAssistantArknights/feat/logger_separator
feat: logger separator
2022-09-21 23:02:23 +08:00
MistEO
93b1ac0615 feat: 新增自定义基建找不到人时的重试机制
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1894
2022-09-21 22:49:30 +08:00
MistEO
81a0e2b6ef fix: 修复基建组合不可用时的效率计算错误
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1895
2022-09-21 22:40:00 +08:00
ABA2396
e97c71b9a2 chore: 新增自定义基建 153 极限效率作业 2022-09-21 22:26:20 +08:00
MistEO
0a15c8b573 perf: 优化自定义基建的界面输出 2022-09-21 22:13:54 +08:00
zzyyyl
31874d6bf7 perf: reference_wrapper 相关优化 2022-09-21 21:59:15 +08:00
zzyyyl
089c9e3982 fix: 修复 debug 模式下的编码问题
在 RelWithDebInfo 模式下,往控制台输出的编码为 ANSI,日志文件仍然为 UTF-8
fix 513978cb1498105b951372746ba9209fb9bd84a5
2022-09-21 21:59:15 +08:00
zzyyyl
d8980c369d perf: 优化 Logger
1. 删除了 m_is_first,改用参数是否为 Logger::level 判断
2. LogStream 构造时,必须传入 level

workaround:
暂时找不到 ToAnsi 有效的设置方法。现在 Debug 模式为 true,其余为 false
2022-09-21 21:59:15 +08:00
zzyyyl
1f6bacbc84 fix(Logger.hpp): fix error 2022-09-21 21:59:15 +08:00
zzyyyl
b9e6c12e36 perf(Logger.hpp): constexpr 2022-09-21 21:59:15 +08:00
zzyyyl
da459a363f perf(asst::ostreams): use std::reference_wrapper 2022-09-21 21:59:14 +08:00
zzyyyl
38e36e49d0 perf: use separator::space 2022-09-21 21:59:14 +08:00
zzyyyl
165bfcbb69 perf: debug 时同时往 std::cout 里输出日志 2022-09-21 21:59:14 +08:00
zzyyyl
ea65f206e6 perf: 在析构函数里调用 std::endl 2022-09-21 21:59:14 +08:00
zzyyyl
a6c0fdb71a chore: rename 2022-09-21 21:59:14 +08:00
zzyyyl
79ef3fa842 chore: 用 operator<< 重构 Logger 2022-09-21 21:59:06 +08:00
MistEO
0db8d19561 fix: 修复自定义基建会客室少选人的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1893
2022-09-21 21:26:49 +08:00
zzyyyl
873abb3264 style: 优化小部分 c# 代码格式 2022-09-21 18:05:59 +08:00
zzyyyl
088f5359d1 fix: 修复关闭模拟器后台进程不完全
Co-authored-by: Hydrogina <2221964239@qq.com>
2022-09-21 18:05:39 +08:00
MistEO
bbefd3fbc5 Merge pull request #1878 from Hydrogina/dev
fix: 修复关闭模拟器后台进程不完全
2022-09-21 17:47:18 +08:00
MistEO
c5061487e9 feat: 完成自定义基建period字段支持
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1885
2022-09-21 17:45:04 +08:00
MistEO
db775e15a1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-09-21 16:04:11 +08:00
MistEO
4269cea18a fix: 修复自定义基建会清空单人房间的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1891
2022-09-21 16:03:52 +08:00
Hydrogina
f6d28d000a perf: 优化代码 修复关闭模拟器后台进程不完全 2022-09-21 15:41:10 +08:00
zzyyyl
044c4f55b8 fix: 修复某些情况下点击停止后重连时间很长的问题 2022-09-21 15:26:52 +08:00
MistEO
bd4b07bfbe perf: 优化检测连接的逻辑,不再每次重置连接 2022-09-21 13:57:49 +08:00
MistEO
dfa6f52a2b fix: 修复自定义基建宿舍始终autofill的问题,优化部分自定义基建判断逻辑 2022-09-21 12:16:39 +08:00
MistEO
b8a010333a fix: 修复自定义基建部分设施skip字段不生效问题 2022-09-21 10:02:29 +08:00
MistEO
79d9371240 docs: 修复自定义基建文档错误 2022-09-21 09:52:00 +08:00
MistEO
2ee9d36d08 Merge pull request #1887 from MaaAssistantArknights/dev
docs: 修正基建协议
2022-09-21 01:01:57 +08:00
MistEO
4470427406 docs: 修正基建协议 2022-09-21 01:01:35 +08:00
MistEO
433e430f3c Merge pull request #1886 from MaaAssistantArknights/dev
Release v4.5.0-alpha.3
2022-09-21 00:45:30 +08:00
MistEO
8534e9f27e docs: update changelog 2022-09-21 00:45:06 +08:00
MistEO
22db06ba94 fix: 再次修复自定义基建skip字段不生效的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1875
2022-09-21 00:43:48 +08:00
MistEO
2a2a348a1c docs: add custom infrast in the main readme 2022-09-21 00:29:55 +08:00
MistEO
2eebaff151 docs: 修改自定义基建 period 文档
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1885
2022-09-21 00:29:55 +08:00
MistEO
31e080e1d9 fix: 修复自定义基建中,宿舍autofill不生效的问题 2022-09-21 00:29:55 +08:00
MistEO
9682f62679 feat: 自定义换班当产物与配置不同时弹出警告 2022-09-21 00:29:55 +08:00
MistEO
b8539f33eb feat: 自定义基建产品不同报错,临时保存 2022-09-21 00:29:55 +08:00
MistEO
833b27f315 feat: 自定义基建支持通过切换标签排序干员 2022-09-21 00:29:55 +08:00
MistEO
ba78b3d0e3 fix: 修复基建办公室和会客室的自定义换班逻辑错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1882
2022-09-21 00:29:54 +08:00
Horror Proton
4134c415c5 fix: fix regex issue of ~1 2022-09-20 23:55:24 +08:00
Horror Proton
dd853c4b11 fix: update OCR replace list
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1883
2022-09-20 21:46:48 +08:00
MistEO
8add7003ab perf: 用更好的方式实现关卡导航失败时的逻辑 2022-09-20 20:40:30 +08:00
MistEO
01845db68c fix: 修复刷理智,设置导航到未开放关卡卡住的问题 2022-09-20 20:35:16 +08:00
uye
e9ab64615a feat: 无匹配关卡时使用Stage1 2022-09-20 20:22:50 +08:00
MistEO
5786650d07 feat: 自定义基建时threshold针对autofill房间生效
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1880
2022-09-20 17:56:21 +08:00
MistEO
71c776edd3 feat: 自定义基建计划自动增序 2022-09-20 17:24:30 +08:00
MistEO
a4ddf376f6 feat: 新增剩余理智界面选项 2022-09-20 17:09:17 +08:00
MistEO
9d7488ffc4 perf: 自定义基建换班排序 2022-09-20 16:31:04 +08:00
Hydrogina
1e0fb185f9 fix: 修复关闭模拟器后台进程不完全 2022-09-20 14:23:33 +08:00
MistEO
bf65309214 fix: 修复子任务识别后,主任务还一直重试的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/992
2022-09-20 00:50:50 +08:00
et2012
549a147186 fix: 尝试修复界面材料选择框被清空的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1854
2022-09-20 00:38:31 +08:00
MistEO
f9eee63abb fix: 尝试修复界面材料下拉框被清空的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1854
2022-09-20 00:33:53 +08:00
zzyyyl
2ab08fc4e6 chore(issue-checker): 优化 issue-checker 2022-09-20 00:03:24 +08:00
MistEO
15f784a830 chore: 禁用c#一些注释相关的warning 2022-09-20 00:02:58 +08:00
MistEO
b133416a72 perf: Optimize the interface for l10n resource reading 2022-09-19 23:05:23 +08:00
MistEO
a457cf8e0b fix: 修复自定义基建skip字段的错误 2022-09-19 21:52:13 +08:00
MistEO
f0a44dc619 Merge pull request #1869 from wallsman/dev
doc:add custom infrast line
2022-09-19 21:07:11 +08:00
zzyyyl
c5f9ef3552 style: format 2022-09-19 19:18:56 +08:00
MistEO
c8da32a0b9 fix: 修复自定义基建的一些干员识别错误 2022-09-19 10:19:54 +08:00
Wallsman
ddd00f28fc doc:add custom infrast line 2022-09-19 07:44:48 +09:00
MistEO
3f9e09f4fc Merge pull request #1867 from MaaAssistantArknights/dev
Release v4.5.0-alpha.2
2022-09-19 01:01:50 +08:00
MistEO
dd1cab7641 fix: 修复自定义基建界面及文档的一些小问题 2022-09-19 01:00:58 +08:00
MistEO
9342ce8fc4 fix: 内置作业 typo 2022-09-19 00:21:34 +08:00
MistEO
9262268992 Merge pull request #1866 from MaaAssistantArknights/dev
Release v4.5.0-alpha.1
2022-09-18 23:57:58 +08:00
MistEO
35f13a8deb Merge pull request #1860 from MaaAssistantArknights/feat/custom_infrast
feat: 新增支持基建自定义排班
2022-09-18 23:57:49 +08:00
MistEO
fa2105c639 docs: update changelog 2022-09-18 23:57:34 +08:00
MistEO
08b28cd753 Merge pull request #1861 from MaaAssistantArknights/refactor/controller
fix: 优化 Controller
2022-09-18 23:47:45 +08:00
MistEO
8b1ad9e6ec fix: 修复自定义基建不选择”技能“排序的问题 2022-09-18 23:44:54 +08:00
MistEO
c2d44acea0 chore: 添加一份默认基建排班作业(243-3换) 2022-09-18 23:28:03 +08:00
MistEO
cd0f0514b6 feat: 完成自定义基建基本界面功能 2022-09-18 22:37:02 +08:00
MistEO
1989b6f523 feat: 支持自定义换班drones字段,新增skip字段 2022-09-18 20:58:49 +08:00
MistEO
126a93fa58 feat: 完成自定义基建肥鸭换班,修复一些bug 2022-09-18 20:13:42 +08:00
zzyyyl
2ed51cd6a9 perf: 重连必须已经初始化 2022-09-18 20:01:36 +08:00
zzyyyl
e58a3401e0 feat: TaskQueue 界面 Stop() 也为异步函数,减少 connect 阶段 Stop 的卡顿时间 2022-09-18 19:25:55 +08:00
zzyyyl
c8fb6e3c3b feat: 增加 kill_adb_daemon() 使得在没连上模拟器的时候 adb daemon 也能退出 2022-09-18 19:25:46 +08:00
zzyyyl
bef151660e perf: set_inited() 与 try_release() 合并 2022-09-18 19:25:33 +08:00
zzyyyl
a724e97c78 perf: socket init/close 的一些逻辑调整 2022-09-18 19:25:17 +08:00
zzyyyl
9e9395f5e8 feat: core 不对连接的 call_command 进行重试 2022-09-18 19:25:02 +08:00
MistEO
7c034fd81d docs: 更新自定义基建肥鸭的协议字段 2022-09-18 15:39:16 +08:00
MistEO
a128a1b920 feat: 更新排班协议 2022-09-18 15:35:56 +08:00
MistEO
2ca8b9a09f feat: 支持自定义换班autofill和candidates字段 2022-09-18 15:33:13 +08:00
MistEO
9465e253eb fix: 修复自定义基建的一些小问题 2022-09-18 14:44:38 +08:00
zzyyyl
62e3e036eb feat: 删除 screencap() 里的 try_release() 2022-09-18 12:26:34 +08:00
zzyyyl
57eb9c3975 fix: fix typo 2022-09-18 02:29:09 +08:00
MistEO
9cf437e46f docs: fix typo 2022-09-17 23:35:37 +08:00
MistEO
5932eb5475 feat: 初步完成自定义换班协议解析,operators字段支持,重构一小部分代码 2022-09-17 22:46:59 +08:00
zzyyyl
dc701e568e feat: [workaround] 上传一图流时用 m_penguin_id 暂时替代 m_yituliu_id 2022-09-17 17:29:12 +08:00
zzyyyl
7bc3d823db fix: 修复 Controller 中 m_instance_count 一定会减到负数的问题
满是bug的代码居然正常的跑起来了.jpg
2022-09-17 17:01:52 +08:00
MistEO
36d1157066 docs: 新增基建自定义排班协议 2022-09-17 16:18:42 +08:00
uye
18cbfdfd13 fix: 尝试修复指定材料选择问题 2022-09-17 14:21:19 +08:00
zzyyyl
7a59f471f2 fix: 修复连接失败析构时 call_command 空指令的问题 2022-09-17 02:55:55 +08:00
Horror Proton
cd87b8a22f feat: update recruit mech
Keep running even if there is no expedited plan left
fixes https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1856
2022-09-16 20:12:54 +08:00
uye
1625dfe1a3 feat: 添加OF-F3和GT-5的导航 2022-09-16 20:00:27 +08:00
MistEO
3a52553ad0 Merge pull request #1853 from horror-proton/test/cmake
chore: 修改 `CMakeLists.txt`
2022-09-16 16:27:54 +08:00
MistEO
fd3a272190 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-09-16 14:17:18 +08:00
MistEO
ed4ae69317 docs: fix & format markdown docs 2022-09-16 14:17:09 +08:00
zzyyyl
1ee9bec320 chore(issue-checker): 优化 issue-checker 的一些逻辑 2022-09-16 13:58:24 +08:00
MistEO
006d3c1a76 docs: remove language switching help 2022-09-16 13:54:36 +08:00
zzyyyl
413c65395c style: CRLF -> LF 2022-09-16 13:15:48 +08:00
zzyyyl
d4e403ae78 Merge pull request #1849 from wallsman/dev
docs: japanese text fixed and added
2022-09-16 13:09:28 +08:00
MistEO
27146545b8 chore: fix translation. 2022-09-16 10:20:49 +08:00
Horror Proton
09642eecf7 chore: update CMakeLists.txt, use -idirafter 2022-09-15 23:06:34 +08:00
zzyyyl
af8e878db6 Merge pull request #1850 from wallsman/patch-13
doc: Quick fix README_ja-JP.md
2022-09-15 18:06:03 +08:00
uye
c6684accfd feat: 开启备选功能时初始化关卡时不重置资源关卡 2022-09-15 17:37:55 +08:00
Wallsman
051ea305d5 Update README_ja-JP.md
Link fix
2022-09-15 18:25:34 +09:00
Wallsman
677a662ea9 Update 3.2-コールバックAPI.md
Add Text EN base document
2022-09-15 18:18:28 +09:00
MistEO
0dcc1f49cb Merge pull request #1847 from MaaAssistantArknights/dev
Release v4.4.2
2022-09-15 16:35:21 +08:00
MistEO
af7ee382ab chore: 更新泰迪仓库里的资源 + 企鹅的关卡资源 2022-09-15 16:34:29 +08:00
Wallsman
51fba07754 doc:miss document fix
3-2 to 3-1 base document miss
2022-09-15 17:13:34 +09:00
MistEO
23f98083f4 docs: update changelog 2022-09-15 15:36:29 +08:00
Horror Proton
40e5886ceb fix. fix some compile errors, etc 2022-09-15 01:21:04 +08:00
zzyyyl
61b57ae189 Merge pull request #1845 from MaaAssistantArknights/perf/csharp
perf: 优化 c# 部分代码
2022-09-15 00:06:03 +08:00
zzyyyl
24a1bbaf7f perf: Use c:Binding instead of Converter to handle Visibility. 2022-09-14 23:50:48 +08:00
zzyyyl
05346100e4 perf: fix c# warnings & suggestions 2022-09-14 23:34:58 +08:00
zzyyyl
158e4fdd9e perf: 优化代码 2022-09-14 23:10:29 +08:00
zzyyyl
4a4751fb87 fix: fix ui layout
link to 1e2c1d357e
2022-09-14 22:52:01 +08:00
zzyyyl
e93b116514 fix: fix binding error
link to c8df25f05a
2022-09-14 22:49:58 +08:00
zzyyyl
c911eeff65 style: CRLF -> LF 2022-09-14 22:49:35 +08:00
Tastror
13a65adfdc Update README_ja-JP.md 2022-09-14 15:28:08 +08:00
Tastror
5ec2d83478 Merge pull request #1841 from wallsman/dev
doc:Many text line added and tweaks(大幅な修正や翻訳の追加)
2022-09-14 15:20:00 +08:00
Wallsman
71df811e08 doc:Synced Newer README_en-US.md
Synced 00494bbe69
2022-09-14 12:07:52 +09:00
Wallsman
a62d64f13e Update 1.1-詳細説明.md 2022-09-14 11:40:56 +09:00
Wallsman
164b069972 doc:Synced text 1.1-詳細説明.md 2022-09-14 11:35:54 +09:00
Wallsman
aaa4e486c0 doc:Newer en document syced text.
Base in [this commit](00494bbe69)
2022-09-14 11:08:05 +09:00
Wallsman
3f7a1e5e69 Update 1.2-よくある質問.md
"The download speed is slow and the mirror site is not accessible" add
2022-09-14 09:49:23 +09:00
Wallsman
cc20b1d1ac Update 3.3-自動作戦API.md
English base in Japanese add(日本語訳追加)
2022-09-14 09:43:25 +09:00
Wallsman
2ee3721fd2 Update 3.2-コールバックAPI.md 2022-09-14 08:40:19 +09:00
Wallsman
2ff4c494fc Update 3.2-コールバックAPI.md 2022-09-14 08:37:20 +09:00
Wallsman
a5b5d1a419 Update 3.2-コールバックAPI.md
English base in Japanese text add.
2022-09-14 08:34:16 +09:00
Wallsman
45bf72f5f3 Rename 2.3-IssueBot使う方.md to 2.3-IssueBotの使用方法.md 2022-09-14 02:41:12 +09:00
Wallsman
9f87814c97 Update 1.1-詳細説明.md 2022-09-14 02:39:50 +09:00
Wallsman
2ead9ade03 Rename 1.1-詳細な説明.md to 1.1-詳細説明.md 2022-09-14 02:36:11 +09:00
MistEO
361b0f2de2 chore: 更新掉落识别测试集
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1817
2022-09-13 23:47:45 +08:00
MistEO
6a75ce291d feat: 放开基建精二但书的使用 2022-09-13 23:47:06 +08:00
zzyyyl
ffa5e921c1 style: format 2022-09-13 15:37:18 +08:00
MistEO
4781350098 Merge pull request #1833 from xRosemary/master
fix: 修复仓库识别数量时数组越界的错误
2022-09-13 11:14:07 +08:00
MistEO
87a82f5185 perf: update depot analyzer, some minor issues 2022-09-13 11:12:50 +08:00
xRosemary
8898f29ba0 Merge pull request #1 from xRosemary/dev
fix: 修复仓库识别数量时数组越界的错误
2022-09-13 02:34:23 +08:00
xRosemary
50755868b4 fix: 修复仓库识别数量时数组越界的错误 2022-09-13 02:30:34 +08:00
MistEO
5af1c79fda Merge pull request #1830 from horror-proton/test/stage_drops
fix: 修复关卡掉落识别
2022-09-12 23:29:27 +08:00
MistEO
02572e4060 Merge pull request #1829 from MaaAssistantArknights/docs/i18n-zh-en
docs: Update en/zh-tw user manual
2022-09-12 23:28:54 +08:00
MistEO
960c842fe0 Merge pull request #1828 from wallsman/dev
doc:Japanese Manual text add and Screenshot change
2022-09-12 23:28:46 +08:00
MistEO
ba6b6fdebf Merge pull request #1827 from MistEO/dev
docs: Update Chinese user manual
2022-09-12 23:28:25 +08:00
MistEO
11531ca256 Merge pull request #1826 from MaaAssistantArknights/chore/labeler
chore: 增加 labeler 标签 `module: drop`
2022-09-12 23:27:52 +08:00
Wallsman
f59082e59f Typo fix 2022-09-12 23:42:10 +09:00
Horror Proton
a01b9f2147 fix: defer image cropping in analyze_baseline 2022-09-12 22:33:56 +08:00
Helloworld
00494bbe69 docs: Update en/zh-tw user manual 2022-09-12 22:22:36 +08:00
Wallsman
20971b08cd Merge pull request #4 from wallsman/patch-8
Patch 8
2022-09-12 23:16:21 +09:00
Wallsman
b4c8b95078 Merge pull request #3 from wallsman/patch-10
Patch 10
2022-09-12 23:15:00 +09:00
Wallsman
ee396a06fe Merge pull request #2 from wallsman/patch-11
Patch 11
2022-09-12 23:14:45 +09:00
Wallsman
065291ff0a Merge pull request #1 from wallsman/patch-12
Patch 12
2022-09-12 23:14:27 +09:00
Wallsman
2edf306d38 doc:Japanese text translated.
Add Japanese text in base English Documents.(英語ドキュメントの翻訳を追加)
2022-09-12 23:01:01 +09:00
Wallsman
c0aaaeca26 doc:Japanese text add
Japanese text translated in base english text.(英語ドキュメントベースで日本語訳追加)
2022-09-12 22:49:39 +09:00
MistEO
b09282e751 docs: update Chinese user manuals 2022-09-12 21:20:09 +08:00
Wallsman
0343fd72f2 Doc:Change Screenshot
Change Screenshot(要望があったので実際の動作中のものに差し替え)
2022-09-12 22:09:59 +09:00
MistEO
6a063d1f9e docs: update readme 2022-09-12 20:58:20 +08:00
MistEO
726df11563 Merge pull request #1812 from dantmnf/dev
fix: potential data racing
2022-09-12 20:43:30 +08:00
MistEO
4973b63e20 Merge pull request #1825 from Hydrogina/dev
feat: 添加完成后选项 退出并关闭模拟器并休眠
2022-09-12 20:42:51 +08:00
dantmnf
2f53502222 fix: potential data racing
&&

perf: use aligned io buffer
2022-09-12 19:09:17 +08:00
Tastror
e89536c0cf docs(fix): delete <br> 2022-09-12 18:24:56 +08:00
Hydrogina
935b4fa67f feat: i18n 退出并关闭模拟器并休眠 2022-09-12 18:20:10 +08:00
zzyyyl
d8bac48330 chore: 增加 labeler 标签 module: drop 2022-09-12 18:17:13 +08:00
Tastror
e65d77c212 Merge pull request #1818 from wallsman/patch-6
Doc:Text tweak Ver4.4.1
2022-09-12 17:49:45 +08:00
Hydrogina
1e2c1d357e feat: 添加完成后选项 退出并关闭模拟器并休眠 2022-09-12 17:11:33 +08:00
Tastror
a72ed73d3e Merge pull request #1821 from wallsman/patch-8 2022-09-12 13:41:59 +08:00
Tastror
dd40e84f7e Merge pull request #1822 from wallsman/patch-9 2022-09-12 13:39:02 +08:00
Tastror
437f39a7d8 Merge pull request #1820 from wallsman/patch-7 2022-09-12 13:38:46 +08:00
Tastror
97e34e6e7f Merge pull request #1816 from wallsman/patch-5 2022-09-12 13:38:17 +08:00
Wallsman
97eef72428 Doc:Tweak JP line(4.4.1)
Japanese text tweak(日本語訳修正)
2022-09-12 12:57:14 +09:00
Wallsman
8a1c3062dc Doc::Tweak JP text
JP text tweak(日本語の翻訳を若干修正)
2022-09-12 12:50:19 +09:00
Wallsman
9410d64466 Doc:Update 4.4.1 text.
Tweak Ver 4.4.1 JP client(4.4.1に合わせて文章などを改変)
2022-09-12 12:39:12 +09:00
Wallsman
bf3fcaa3d1 Doc:Text tweak Ver4.4.1
Text fix(一部テキスト修正) / Text tweak(リードミー回りの文章整形) /  4.4.1 Add Depot Recognition Line(倉庫アイテム認識の説明追加) / Screenshot change for 4.4.1
2022-09-12 12:27:13 +09:00
Wallsman
5741224ee9 Doc:Depot Recognition Text Tweak
Depot Recognition Over sees client "how to" add.(CN版では自動で可能だがJPでは手順が一つ増えているので追記)
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1809
2022-09-12 10:22:05 +09:00
MistEO
1972778aee Merge pull request #1807 from MaaAssistantArknights/dev
Release v4.4.1
2022-09-11 03:11:21 +08:00
MistEO
8ed1b589c0 docs: update changelog 2022-09-11 03:10:21 +08:00
MistEO
05a03b64d4 fix: 再次降低基建控制中枢歌蕾蒂娅优先级
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1800
2022-09-11 03:10:06 +08:00
MistEO
a7fa47cdaf perf: logger 2022-09-11 02:54:29 +08:00
MistEO
f3e925f5d7 Merge pull request #1805 from MaaAssistantArknights/chore/labeler
chore: 优化 labeler
2022-09-11 02:34:59 +08:00
MistEO
c10a5336aa Merge pull request #1803 from MaaAssistantArknights/feat/logger_separator_v1
feat: logger separator - v1 version
2022-09-11 02:33:35 +08:00
zzyyyl
ca569a7f61 chore: 增加 labeler 标签 outdated 2022-09-11 02:33:35 +08:00
zzyyyl
90afd56523 chore: 给 labeler 加了个没什么用的功能
`Remove module labels` 可以去掉 `module` 系列标签
`Remove Client labels` 可以去掉 `Client` 系列标签
以及,`Remove` 型命令同样可以由 `Skip` 触发
2022-09-11 02:29:59 +08:00
MistEO
de49f4b763 fix: 调整基建控制中心歌蕾蒂娅的效率计算
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1800
2022-09-11 02:15:43 +08:00
zzyyyl
7932d2030d chore: 优化客户端 labeler 2022-09-11 02:15:13 +08:00
MistEO
6f2445844a fix: 修复仓库识别错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1795
2022-09-11 02:05:57 +08:00
zzyyyl
0814868bb3 chore: 增加仓库识别、文档 labeler 2022-09-11 01:19:38 +08:00
MistEO
de0c579917 fix: build error
(cherry picked from commit 3ed940c49377e49e194a31c8714f8de6ca1d7aca)
2022-09-11 00:52:10 +08:00
MistEO
c99da4ec01 perf: add logger::level
(cherry picked from commit ae317affff09d7c9c94920d6f5618706b070797c)
2022-09-11 00:52:10 +08:00
Horror Proton
831e95753f perf: add qualifiers 2022-09-11 00:51:57 +08:00
MistEO
7d10b1e773 perf: 添加separator的静态对象 2022-09-11 00:51:57 +08:00
MistEO
8e331f74e1 perf: Remove redundant parameters for logger 2022-09-11 00:51:57 +08:00
Horror Proton
a72a67f330 feat: WIP Logger::separator 2022-09-11 00:51:57 +08:00
MistEO
0c78e3c2a4 fix: 修复 Logger::separator 调用错误 2022-09-11 00:51:57 +08:00
MistEO
c557970ef4 feat: 初版 Logger::separator 2022-09-11 00:51:57 +08:00
MistEO
4e61686e18 fix: 初步优化仓库数字ROI检测错误 2022-09-10 23:52:40 +08:00
Horror Proton
b46d12ad6a fix: fix return types 2022-09-10 23:23:27 +08:00
zzyyyl
d74ed5ed09 fix: fix relwithdebinfo build error
(cherry picked from commit 2650af0c750db7c6a01ccdfcce9256fdb7fe1168)
2022-09-10 22:50:12 +08:00
Horror Proton
381cc9bbb9 fix: add replace map for AutoRecruitTask::check_timer
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1798
2022-09-10 19:39:09 +08:00
Tastror
c15bbf866a style & doc: 更新样式与错误描述 2022-09-10 16:43:48 +08:00
Tastror
501c853fd6 docs: 修改部分文本 2022-09-10 16:23:10 +08:00
Tastror
5174e3ea8e Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 2022-09-10 16:08:04 +08:00
Tastror
6400976f24 docs(fix): 修改常见问题的uri,并添加多语言uri跳转 2022-09-10 16:04:35 +08:00
zzyyyl
7a5cb927e3 perf: 小优化
(cherry picked from commit 7a7e947a9d)
2022-09-10 13:14:54 +08:00
Helloworld
36d6db117f docs: 添加zh-tw文档 2022-09-09 22:41:55 +08:00
MistEO
c42128ee68 perf: 优化调用命令时的日志 2022-09-09 22:03:57 +08:00
zzyyyl
6225a2e819 style: format 2022-09-09 20:52:24 +08:00
zzyyyl
6ea48f69d8 perf: 继续修复连接时间过长的问题
fix 83d6b7b738
2022-09-09 20:48:44 +08:00
Helloworld
d3fc19d018 docs: 同步zh-tw的README 2022-09-09 20:36:18 +08:00
MistEO
4c6edc130f Merge pull request #1786 from BombaxCeiba/fix_cmake
chore:修复在Windows下因CMake脚本缺少宏定义导致构建失败的问题
2022-09-09 20:05:31 +08:00
MistEO
b4f30a00fd perf: 优化调整 但书玛恩纳 基建效率 2022-09-09 20:05:04 +08:00
zzyyyl
83d6b7b738 fix: 修复连接时间过长的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1789
2022-09-09 15:59:41 +08:00
Helloworld
e6ee4bbac4 docs: 同步README 2022-09-09 15:28:44 +08:00
Helloworld
f50966735f docs: 同步en-us文档 2022-09-09 15:28:44 +08:00
Horror Proton
ced63a522e fix: fix compile error
revert: ddedf824c0
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1791
2022-09-09 14:39:09 +08:00
Helloworld
2ff4c034d9 docs: 更新README_en-US.md 2022-09-09 14:25:27 +08:00
Tastror
ed7b9d4521 Merge pull request #1787 from wallsman/patch-4 2022-09-09 10:07:39 +08:00
Wallsman
0d6354d596 Fixed and Tweaked.
The text was cut down to fit the UI.(一部をUIの表示幅に合わせて微調整) / Fixed wrong argument.(公開求人タブの項目が新規UIの引数に替わっていなかったのを修正)/ Added Depot Recognition was missing in its entirety.(Depot Recognitionがまるまる抜け落ちていたのを追加。)
2022-09-09 02:30:05 +09:00
Dusk_NM02
864ec70796 chore: CMake仅在WIN32下定义UNICODE相关宏 2022-09-09 00:48:19 +08:00
Dusk_NM02
1def108445 chore: 移除NDEBUG宏 2022-09-08 23:08:22 +08:00
zzyyyl
0817a9e57c style: 增加一些 clang-format 15 新配置 2022-09-08 23:08:14 +08:00
Dusk_NM02
112861e3be chore: 修复在Windows下使用CMake构建失败的问题 2022-09-08 22:25:55 +08:00
MistEO
3de7b3409c Merge pull request #1785 from MaaAssistantArknights/master
Release v4.4.0
2022-09-08 21:11:52 +08:00
MistEO
85d2a99488 Merge pull request #1784 from MaaAssistantArknights/dev
Release v4.4.0-rc.1
2022-09-08 16:28:09 +08:00
MistEO
32a6377e31 docs: update changelog 2022-09-08 16:27:35 +08:00
MistEO
7b678475bd chore: 更新泰迪仓库里的资源 + 企鹅的关卡资源 2022-09-08 16:17:30 +08:00
MistEO
ef02b1a886 fix: 修复自动战斗自动编队时最右侧的干员识别不到的问题 2022-09-08 13:24:59 +08:00
Tastror
1036ffb746 docs: 日语文本小修订2 2022-09-08 01:57:26 +08:00
Tastror
ffaf93cd60 docs: 日语文本小修订 2022-09-08 01:49:11 +08:00
Tastror
93a29e28c8 docs: 更新readme跳转显示 2022-09-08 01:47:20 +08:00
Tastror
7cd77b9d18 Merge pull request #1775 from wallsman/patch-3
docs: Update ja-jp.xaml
2022-09-08 01:42:52 +08:00
MistEO
71fa8e0cda Merge pull request #1783 from MaaAssistantArknights/dev
Release v4.4.0-beta.3
2022-09-08 01:09:42 +08:00
MistEO
de31a644b1 docs: update CHANGELOG 2022-09-08 01:09:13 +08:00
MistEO
0d7c137b2b docs: update changelog 2022-09-08 01:08:29 +08:00
Tastror
db4bff8774 Merge branch 'dev' into patch-3 2022-09-08 01:03:01 +08:00
MistEO
a980a5517a fix: 修复自动战斗编队点错位置的问题 2022-09-08 00:59:58 +08:00
Tastror
51a294b78d Merge branch 'dev' into patch-3 2022-09-08 00:55:28 +08:00
MistEO
f6ca683366 feat: 新增仓库识别 UI 2022-09-08 00:40:08 +08:00
MistEO
14d4b0b87e feat: 修改本地化翻译的读取逻辑 2022-09-07 23:43:03 +08:00
MistEO
b82247b90e fix: 再次修复界面自定义关卡名和其他选项排列组合的错误 2022-09-07 22:51:56 +08:00
MistEO
45e4f01d8b fix: 修复手动输入关卡选项和其他选项排列组合时的界面显示问题 2022-09-07 22:29:55 +08:00
MistEO
cd5ea8754b fix: 修复自定义关卡选项切换不实时生效的问题 2022-09-07 22:18:46 +08:00
MistEO
81b6f1ff77 feat: 界面新增支持手动输入关卡ID
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1776
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1778
2022-09-07 22:14:57 +08:00
MistEO
92854ebce0 perf: 调整上传线程退出时机 2022-09-07 21:26:36 +08:00
MistEO
b44d11089d fix: 修复潜在的空回调函数的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1780
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1779
2022-09-07 21:18:02 +08:00
MistEO
4a572dd5e6 Merge pull request #1760 from et2012/fix/gui_drop
perf: 改进Gui指定材料下拉框过滤逻辑
2022-09-07 17:48:16 +08:00
MistEO
7e900ffc6f Merge pull request #1767 from MaaAssistantArknights/perf/assthttp
perf: AsstHttp 的各种优化
2022-09-07 17:48:04 +08:00
Wallsman
4feadfbe0b Update ja-jp.xaml
mistranslation fixed(誤訳修正) / Japanese tweaked(わかりにくい部分を修正) / Timer line Combined with English translation(タイマー部分がかなり分かりづらかったので英語訳と合わせた)/ Add comment out(翻訳修正候補など追加)
2022-09-06 16:40:38 +09:00
MistEO
2fe874a80a Merge pull request #1774 from wallsman/patch-2
docs: Update 1.1-詳細な説明.md
2022-09-06 14:51:45 +08:00
MistEO
4e36709bed Merge pull request #1772 from wallsman/patch-1
docs: Update README_ja-JP.md
2022-09-06 14:51:36 +08:00
zzyyyl
e52bc9fafc perf: noexcept, const& 2022-09-06 14:14:52 +08:00
zzyyyl
0f341c2f30 perf: 直接修改 m_raw_data 的大小写,不再重新创建 string;移除 view_cast 2022-09-06 14:14:44 +08:00
zzyyyl
ddedf824c0 perf: 围绕 AsstHttp 的各种优化 2022-09-06 14:14:22 +08:00
zzyyyl
b822e6a135 perf: 修复不了 string_split_view 传入左值 char_t 时 _pat 悬垂的问题,加个 static_assert 2022-09-06 14:14:13 +08:00
et
71afedd93d perf: 改进Gui指定材料下拉框过滤逻辑 2022-09-06 10:17:56 +08:00
Wallsman
6cc109582d Update 1.1-詳細な説明.md
Japanese text Tweaked(直訳っぽい日本語を調整)/  Unsupported add(未対応部分を注釈追記)
2022-09-06 10:54:59 +09:00
Wallsman
6abb56a7e2 Update README_ja-JP.md
Japanese Tweaked(直訳っぽい日本語を調整)/ Unsupport text add(未対応部分に注釈追加)
2022-09-06 10:22:30 +09:00
Helloworld
f11ec22e4e Merge pull request #1769 from MaaAssistantArknights/fix/copilot/empty-title
feat. 添加对 CopilotData 导入内容的检查
2022-09-06 08:03:10 +08:00
Horror Proton
b46484a069 fix: bypass a linux build error 2022-09-06 01:25:50 +08:00
zzyyyl
41557d7a20 fix: fix linux build error 2022-09-06 01:19:34 +08:00
MistEO
edf722cccb fix: build error 2022-09-05 23:51:17 +08:00
MistEO
c1a01eff61 style: format 2022-09-05 23:36:27 +08:00
MistEO
8c280eaf50 Merge pull request #1765 from dantmnf/dev
chore: win32 improvements
2022-09-05 23:18:10 +08:00
Helloworld
ff41275bf3 feat. 添加发布脚本 2022-09-05 23:03:59 +08:00
Helloworld
6c5203da10 feat. 支持中文选项 2022-09-05 22:56:03 +08:00
Helloworld
a2a10107a2 编译 Copilot 编辑器 2022-09-05 22:42:48 +08:00
Helloworld
12b1d416ca feat. 添加 CopilotData 检查 2022-09-05 22:37:09 +08:00
dantmnf
84a0dac0c5 refactor: extract common GetShortPathNameW invocation 2022-09-05 22:03:06 +08:00
MistEO
083d115f80 fix: 修复作业文件不填写标题和简介时,界面解析失败的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1764
2022-09-05 21:44:17 +08:00
Helloworld
1c0b420e2d Add "required" to properties 2022-09-05 21:31:29 +08:00
MistEO
f3138b2dfd chore: 更新资源文件 2022-09-05 20:58:32 +08:00
Horror Proton
50aa678f97 chore: resolve merge conflict
ref. 1dbdb9730c
2022-09-05 20:16:50 +08:00
Horror Proton
82f3f4af44 fix: prevent copy in logger 2022-09-05 19:37:28 +08:00
dantmnf
62e11b2d48 refactor: move junction util to AsstPlatformWin32 2022-09-05 16:22:46 +08:00
dantmnf
c103875cd9 fix: add variable initialization 2022-09-05 01:54:44 +08:00
dantmnf
90a0621814 chore: add dummy AsstPlatformPosix.h 2022-09-05 01:33:45 +08:00
dantmnf
1e20c03e32 chore: bind socket to port 0
OS will choose an available port
2022-09-05 01:17:56 +08:00
dantmnf
e89e6a955e chore: split platform utils 2022-09-05 01:17:56 +08:00
dantmnf
1585340c01 chore: use overlapped io for win32 subprocess 2022-09-05 01:17:56 +08:00
dantmnf
f79a26d529 chore: use filesystem::path everywhere 2022-09-05 01:17:54 +08:00
dantmnf
bc4663162e chore: proper UTF-8 string marshaling 2022-09-05 01:16:11 +08:00
MistEO
6d2e3f78af Merge pull request #1761 from MaaAssistantArknights/dev
Release v4.4.0-beta.2
2022-09-05 01:10:34 +08:00
MistEO
3a5b69cc1e feat: 优化日志打印 2022-09-05 01:09:47 +08:00
MistEO
b96e250486 docs: CHANGELOG 2022-09-05 00:55:16 +08:00
uye
1577423778 feat: 移除全开放不能使用备选关卡的ToolTip 2022-09-05 00:32:54 +08:00
MistEO
95219c8e17 Merge pull request #1741 from MaaAssistantArknights/perf/uchar
perf: 整理并优化
2022-09-05 00:21:57 +08:00
zzyyyl
fc7d38a381 fix: 暂时不使用 delimiter 为 char 的 string_split 2022-09-05 00:13:05 +08:00
MistEO
ec356ef7b1 perf: 优化Logger小细节 2022-09-04 23:53:16 +08:00
MistEO
28d63e4e81 fix: 修复socket方式截图不可用的问题 2022-09-04 23:21:22 +08:00
MistEO
d4dee77b9c Merge branch 'master' into dev 2022-09-04 17:51:50 +08:00
zzyyyl
2b78208fd7 perf: 以一种更优雅但又不那么优雅的方式实现 ASST_STATIC_ASSERT_FALSE 2022-09-04 17:36:23 +08:00
zzyyyl
1b28dfec97 perf: 按照 review 意见修改
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-09-04 17:36:23 +08:00
zzyyyl
c8e7abcb22 perf: 用 ranges 重构 utils::string_split 2022-09-04 17:36:23 +08:00
zzyyyl
87df064c7b perf: 继续用 utils::string_split 代替 views::split
增加 string_split 的参数 split_count 表示分割次数上限
2022-09-04 17:36:23 +08:00
zzyyyl
cc103b5d54 perf: 用 utils::string_split 代替 views::split 2022-09-04 17:36:23 +08:00
zzyyyl
d10fc79cbf perf: rename string_replace_all_batch -> string_replace_all 2022-09-04 17:36:23 +08:00
zzyyyl
1dbdb9730c style: constexpr static -> static constexpr 2022-09-04 17:36:23 +08:00
zzyyyl
4daed198bd perf: 优化 Utils
string_replace_all 系列支持基础类型不一定为 char 的字符串
load_file_without_bom 小优化
2022-09-04 17:36:23 +08:00
zzyyyl
6889324572 refactor: use std::string instead of std::vector<uchar>
perf: 将 gzip 的接口数据类型改回 string,简化代码

style: format
2022-09-04 17:36:23 +08:00
zzyyyl
0428b109b5 perf: 优化行尾检测 2022-09-04 17:36:14 +08:00
MistEO
48bfc84292 docs: 更新常见问题文档
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1725
2022-09-04 17:17:13 +08:00
MistEO
ad71d853f8 fix: 修复备选关卡/全部开放关卡 选项被disable的问题 2022-09-04 17:09:58 +08:00
MistEO
8f2adc3321 fix: 修复界面上自动战斗平台链接显示错误 2022-09-04 17:04:00 +08:00
MistEO
400ab8dd0e fix: 修复自动战斗干员撤退不了的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1744
2022-09-04 17:01:19 +08:00
MistEO
2e4730a236 Revert "feat: 自动战斗关卡名忽略大小写,顺便格式化一下泰迪的代码"
This reverts commit b858435739.
2022-09-04 16:34:44 +08:00
MistEO
ef6d23b397 Merge pull request #1737 from et2012/feat/activity
feat: 优化Gui关卡选择逻辑
2022-09-04 15:49:09 +08:00
MistEO
7f4aae7b33 fix: 修复刷理智选择部分材料,ui崩溃的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1756
2022-09-04 15:42:13 +08:00
MistEO
b858435739 feat: 自动战斗关卡名忽略大小写,顺便格式化一下泰迪的代码 2022-09-04 15:10:00 +08:00
MistEO
a7540d965e fix: 修复自动战斗不支持的关卡时UI不能正确提示的问题 2022-09-04 14:57:43 +08:00
MistEO
1606fb44a4 fix: 修复copilot读取文件的检查逻辑 2022-09-04 14:32:56 +08:00
MistEO
52a75cf570 fix: 修复Copilot任务传入json路径时的报错 2022-09-04 14:27:01 +08:00
MistEO
c37e3d77b3 fix: 修复日服资源加载错误,修复外服日志文件路径错误 2022-09-04 14:05:22 +08:00
ET
641048a101 feat: 优化Gui关卡选择逻辑 2022-09-04 13:45:27 +08:00
Tastror
d9ec6a8466 docs: 修改多语言文档;调整文件名 2022-09-04 12:57:56 +08:00
MistEO
0ae5107498 Merge pull request #1748 from zzyyyl/docs/clang-format
docs: 整理开发相关文档,增加 clang-format 配置相关文档
2022-09-04 11:55:14 +08:00
MistEO
22af1f8829 Merge pull request #1752 from MaaAssistantArknights/refactor/resource_loader
refactor: 重构 Resource 类
2022-09-04 11:02:55 +08:00
MistEO
b3a0ccbed5 perf: remove useless variable 2022-09-04 03:07:53 +08:00
MistEO
3d491b216a perf: 优化加载资源宏 2022-09-04 02:01:38 +08:00
MistEO
5bda830192 perf: 优化 Singleton concept 的使用方式
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-09-04 01:38:40 +08:00
MistEO
a31802ea6c fix: typo 2022-09-04 01:32:19 +08:00
MistEO
8f8140dc63 perf: 整理满天飞的 get_instance 2022-09-04 01:30:53 +08:00
MistEO
3f4e588e83 perf: 加强读取资源类的约束,增加单例 concept 2022-09-04 00:59:01 +08:00
MistEO
7c8bf92eb4 refactor: 重构 Resource 类
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1541
2022-09-04 00:27:54 +08:00
zzyyyl
8cfdfbd4f0 feat: curl 没有传回 response 而是传回报错信息的时候也允许重试 2022-09-03 17:33:04 +08:00
zzyyyl
a50843d7f5 docs: 整理开发相关文档,增加 clang-format 配置相关文档 2022-09-03 16:48:54 +08:00
MistEO
0749e12e55 Merge branch 'release/v4.3.1' into dev 2022-09-03 13:04:00 +08:00
MistEO
54dc0d60d5 Merge pull request #1745 from MaaAssistantArknights/release/v4.3.1
Release v4.3.1
2022-09-03 12:58:27 +08:00
MistEO
469a72cb18 Merge branch 'release/v4.3.1' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into release/v4.3.1 2022-09-03 12:56:50 +08:00
uye
7292a9a59e fix: 修复自动新增关卡时备选关卡不显示的问题 2022-09-04 04:01:45 +08:00
uye
74e247a5f4 fix: 修复隐藏未开放关卡跨天问题2 2022-09-05 04:04:54 +08:00
MistEO
dea31e52a8 docs: changelog 2022-09-03 12:56:26 +08:00
uye
684a4d51cb style: 优化界面 2022-09-03 11:25:41 +08:00
MistEO
9fad94bd5d fix: 尝试修复基建偶现清空按钮没点上导致的没换人的问题 2022-09-03 11:13:06 +08:00
MistEO
5d62a1aa00 feat: 界面上增加作业网站的链接,修改Q群的布局 2022-09-03 11:13:06 +08:00
MistEO
af38c680e7 feat: 降低控制中枢 “歌蕾蒂娅” 优先级
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1717
2022-09-03 11:13:06 +08:00
MistEO
e4310a7fa7 fix: 修复自动战斗关技能关不掉的问题 2022-09-03 11:03:38 +08:00
MistEO
925643bd41 fix: 修复数据汇报响应检查 2022-09-03 11:03:09 +08:00
uye
c1ed0f26df fix: 修复隐藏未开放关卡时的跨天问题 2022-09-03 11:02:37 +08:00
uye
0fbb6a6f0b feat: 活动结束后实时刷新未开放关卡列表 2022-09-03 11:02:28 +08:00
uye
a1ad23aa5d feat: 修改限时活动功能 2022-09-03 11:02:19 +08:00
uye
f85e0db429 fix: 修复隐藏未开放关卡时的跨天问题 2022-09-03 00:15:47 +08:00
MistEO
3f2fd9751d fix: fix report typo 2022-09-02 23:44:34 +08:00
MistEO
ed66cdfe47 Merge pull request #1742 from MaaAssistantArknights/perf/builder
perf: 优化 MaaBuilder
2022-09-02 23:35:03 +08:00
MistEO
080ccb6de6 fix: 尝试修复基建偶现清空按钮没点上导致的没换人的问题 2022-09-02 23:00:15 +08:00
uye
1ae56209b2 feat: 活动结束后实时刷新未开放关卡列表 2022-09-03 04:03:46 +08:00
Liam Sho
bdc7209210 fix: 修复文件 Identity 不能反应文件位置变化的问题 2022-09-02 16:37:16 +08:00
Liam Sho
fc9c2cd019 chore: 移除编译后产生的 XML 文档 2022-09-02 15:36:11 +08:00
uye
2f42bbb16a feat: 修改限时活动功能 2022-09-02 02:08:39 +08:00
MistEO
6ead7e1cf1 Merge pull request #1731 from MaaAssistantArknights/dev
Release v4.4.0-beta.1
2022-09-02 00:28:37 +08:00
MistEO
e82c7a227b docs: CHANGELOG 2022-09-02 00:27:54 +08:00
MistEO
5e18054600 Merge pull request #1727 from MaaAssistantArknights/chore/git-ignore
style: format json
2022-09-02 00:26:02 +08:00
MistEO
16a61e0603 Merge pull request #1728 from MaaAssistantArknights/fix/lf
fix: 尝试修复部分模拟器行尾变化的问题
2022-09-02 00:25:42 +08:00
MistEO
e31830cc64 docs: 改改CHANGELOG 2022-09-02 00:21:22 +08:00
MistEO
dadd77e11b docs: changelog 2022-09-02 00:18:32 +08:00
MistEO
2a8ae33a79 style: 界面添加一点空格 2022-09-02 00:11:23 +08:00
MistEO
83bad44256 feat: 抄作业自动编队功能支持按职业区分选择
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1136
2022-09-02 00:05:06 +08:00
MistEO
2ceaf7bfdb Merge pull request #1721 from StarWishLXH/dev
feat: 新增在ADB重连失败断开连接时重启模拟器重试的选项,默认关闭
2022-09-01 23:09:32 +08:00
StarWish
b81be5dcf7 fix: 优化UI样式 2022-09-01 22:38:11 +08:00
StarWishLXH
44ba022d72 fix: update i18n, set ReconnectTimes to 20 2022-09-01 17:51:25 +08:00
StarWishLXH
13f28ae34b feat: 新增在ADB重连失败断开连接时重启模拟器重试的选项
feat: 重连失败尝试启动模拟器重连前先关闭当前模拟器

fix: 修改开关默认为关闭,优化日志

fix: 优化文案
2022-09-01 17:51:04 +08:00
zzyyyl
4093a08ab6 feat: 用毫秒统计截图速度 2022-09-01 16:37:22 +08:00
zzyyyl
0a3358fb95 fix: 修复部分模拟器行尾变化的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1719
2022-09-01 16:37:14 +08:00
zzyyyl
0942cfb841 chore: fix typo 2022-09-01 14:35:11 +08:00
zzyyyl
925ea4edf3 chore: Add .git-blame-ignore-revs 2022-09-01 14:20:17 +08:00
zzyyyl
81ea2c4d4f style: format json 2022-09-01 13:51:15 +08:00
zzyyyl
8410a7bfac style: format 2022-09-01 13:03:33 +08:00
MistEO
5d1656b628 feat: 界面上增加作业网站的链接,修改Q群的布局 2022-09-01 00:50:15 +08:00
MistEO
2e89c82e2b chore: fix build error 2022-09-01 00:47:26 +08:00
MistEO
69b2996d09 feat: 调整自动战斗等待条件的逻辑,增加一个cd中干员数量的条件 2022-09-01 00:24:41 +08:00
MistEO
36fb6128f2 chore: 改个任务名防止误解 2022-08-31 23:34:24 +08:00
MistEO
fd97c435ec chore: 调整一下函数顺序 2022-08-31 23:27:05 +08:00
MistEO
50c9a208bc feat: 降低控制中枢 “歌蕾蒂娅” 优先级
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1717
2022-08-31 23:20:26 +08:00
MistEO
6b7a0452ab fix: 尝试修复自动战斗干员撤不掉的问题 2022-08-31 23:17:29 +08:00
MistEO
aabba41a62 fix: 修复自动战斗关技能关不掉的问题 2022-08-31 23:04:14 +08:00
MistEO
3db39cf5ad Merge pull request #1715 from MaaAssistantArknights/refactor/report
refactor: 重构数据汇报模块,新增支持企鹅物流的幂等机制
2022-08-31 22:50:25 +08:00
MistEO
9bb38df7bb chore: 给企鹅上传超时加长点 2022-08-31 22:50:00 +08:00
MistEO
6806763871 perf: 屎上雕花 2022-08-31 22:34:31 +08:00
MistEO
3b7efa4aad feat: 整理数据上报的逻辑 2022-08-31 22:20:16 +08:00
MistEO
960a88ca5a Merge pull request #1720 from zzyyyl/refactor/report
feat: 重构 Response 类
2022-08-31 21:46:26 +08:00
zzyyyl
498fd886f7 feat: AsstHttp! 2022-08-31 21:02:20 +08:00
zzyyyl
3b3246bed1 feat: 加入 lambda 参数来自定义重试条件 2022-08-31 20:48:57 +08:00
zzyyyl
c33f6d8e09 feat, style: 格式优化;增加上传数据重试的回调 2022-08-31 20:32:06 +08:00
zzyyyl
44c6a10f70 feat: [wip] 重构数据上报回调 2022-08-31 19:56:42 +08:00
zzyyyl
78fa529b63 fix: 修复 headers 大小写的问题 2022-08-31 19:56:03 +08:00
zzyyyl
f6ce5111bc feat: 重构 Response 类 2022-08-31 19:55:17 +08:00
uye
c8df25f05a feat: 修改后立刻保存任务列表与基建设置
fix #1714
2022-08-31 03:01:32 +08:00
uye
8a9eea4fa3 feat: 增加一个不改变制造站搓玉计划的功能
fix #1702
2022-08-31 01:07:44 +08:00
MistEO
a0f85b4900 Merge pull request #1709 from horror-proton/test/demangle
perf: 使用 demangle 来获得更准确的类型名称
2022-08-31 01:04:31 +08:00
MistEO
f171c9a8d5 feat: 支持企鹅的重传幂等机制
https://galvingao.notion.site/API-c826a571040f4d239876ea4e78e58be3
2022-08-31 00:51:02 +08:00
MistEO
89f09aab78 refactor: 重构上传数据的逻辑,封装了一个 ReportDataTask 2022-08-31 00:03:02 +08:00
MistEO
552655a424 fix: 修复数据汇报响应检查 2022-08-30 22:35:44 +08:00
zzyyyl
d0a53f10ed style: 修复 clang-format 16 仍存在的部分格式问题 2022-08-30 22:32:47 +08:00
Horror Proton
a4f841eb60 perf: use string_view in demangle 2022-08-30 20:42:17 +08:00
lhhxxxxx
014197c65b docs. re. 最近大陆地区镜像站网页打不开但下载正常,添加一个readme提示 (#1712)
* docs. re. 最近大陆地区镜像站网页打不开但下载正常,添加一个readme提示

* Update README.md

* Update 常见问题.md

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-08-30 20:24:33 +08:00
Horror Proton
541ea4c651 perf: use type name demangle 2022-08-30 19:43:30 +08:00
MistEO
ce4634338f Merge pull request #1710 from MaaAssistantArknights/revert-1705-master
Revert "docs. 最近大陆地区镜像站网页打不开但下载正常,添加一个readme提示"
2022-08-30 19:07:01 +08:00
MistEO
33a02367a4 Revert "docs. 最近大陆地区镜像站网页打不开但下载正常,添加一个readme提示" 2022-08-30 19:04:30 +08:00
uye
1467809638 feat: 添加源石碎片自动补货选框 2022-08-30 13:34:41 +08:00
uye
0f5a938ef0 style: 修改界面布局 2022-08-30 13:26:54 +08:00
uye
90eea5502e fix: 修复检测更新崩溃问题
fix #1704
2022-08-30 11:55:08 +08:00
lhhxxxxx
99cfb755d8 Merge pull request #1705 from lhhxxxxx/master
docs. 最近大陆地区镜像站网页打不开但下载正常,添加一个readme提示
2022-08-30 11:45:44 +08:00
lhhxxxxx
aafa458342 docs. 最近大陆地区镜像站网页打不开但下载正常,添加一个readme提示 2022-08-30 11:40:14 +08:00
zzyyyl
657bd8d7d8 docs: 修改无奖励关卡的文字解释 2022-08-29 23:46:33 +08:00
MistEO
94ea1ddc0b Merge pull request #1701 from MaaAssistantArknights/dev
Release v4.3.0-rc.2
2022-08-29 23:28:39 +08:00
MistEO
01c2fe03bd docs: 更新CHANGELOG 2022-08-29 23:28:28 +08:00
zzyyyl
fa0a63f7f8 feat: 识别到无奖励关卡时自动停止
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/325
2022-08-29 23:15:31 +08:00
MistEO
df85ba2c69 fix: 修复日服关卡名识别错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1696
2022-08-29 22:12:08 +08:00
zzyyyl
2940081012 fix: 修复会客室闪退的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1694
fix 7148230efe
2022-08-29 18:11:34 +08:00
zzyyyl
9d914866b2 perf: 使用 insert_or_assign 2022-08-29 14:42:41 +08:00
zzyyyl
e9f21c0944 style: 优化部分 initializer_list 的格式 2022-08-29 12:25:55 +08:00
_ChingC
84bbe7de1e fix: 修复通用类型定义,提高cmake最低版本以禁用过老的policy 2022-08-29 10:23:08 +08:00
MistEO
963664469e Merge pull request #1688 from MaaAssistantArknights/dev
Release v4.3.0-rc.1
2022-08-28 22:47:14 +08:00
MistEO
01412e7d76 docs: 更新CHANGELOG 2022-08-28 22:46:07 +08:00
MistEO
a93139eedd docs: 补充公招回调文档 2022-08-28 22:33:53 +08:00
MistEO
cab3f507a4 fix: using different recruitment profile in overseas clients
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1528
2022-08-28 22:29:27 +08:00
MistEO
6c6875ac95 docs: 完善上传汇报的文档
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1681
2022-08-28 22:05:15 +08:00
MistEO
209b6e0d6c feat: 确实上传企鹅和一图流的回调结果正确
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1681
2022-08-28 22:02:08 +08:00
zzyyyl
457173c275 chore(issue-checker): 整理 issue-checker 给 PR 加 ambiguous 的机制 2022-08-28 21:03:09 +08:00
MistEO
8cd582bb08 Merge pull request #1686 from Zirun-wang/patch-1
docs: Update 模拟器支持.md
2022-08-28 20:42:37 +08:00
zzyyyl
8816942b4a perf: c# 代码逻辑&格式优化 2022-08-28 19:06:09 +08:00
zzyyyl
ad3e3425bb feat: 未初始化时不显示 修改 按钮 2022-08-28 18:53:29 +08:00
MistEO
355f6e3e28 build: 忽略链接警告 2022-08-28 16:57:07 +08:00
uye
e1d1f205aa style: 优化界面布局 2022-08-28 16:26:22 +08:00
uye
499233e3a8 style: 格式化代码 2022-08-28 16:12:40 +08:00
MistEO
b54bfe2715 feat: py接口新增支持加载外服增量资源 2022-08-28 16:11:18 +08:00
MistEO
d8db9eb3b1 feat: fix python interface 2022-08-28 15:49:24 +08:00
MistEO
d460f52633 feat: python 接口适配 AsstRunning 接口 2022-08-28 15:42:24 +08:00
MistEO
ade71cc670 feat: 新增 running API
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1689
2022-08-28 15:33:24 +08:00
uye
1108f3150a style: 将未初始化时不显示 停止 按钮改为禁用按钮 2022-08-28 13:24:45 +08:00
uye
33e182a3c6 style: 修复周日关卡提示显示不全的问题 2022-08-28 12:57:23 +08:00
zzyyyl
d8ceac8e84 feat: 未初始化时不显示 停止 按钮
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1689
2022-08-28 12:48:11 +08:00
Tastror
188781709c docs: 文本日常更新 2022-08-28 11:41:06 +08:00
MistEO
101d194df1 docs: format markdown 2022-08-28 04:37:14 +08:00
MistEO
48ecb504fb feat: 新增肉鸽通关识别!
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1685
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1561
2022-08-28 04:31:41 +08:00
uye
29bc40bd07 feat: 添加备选关卡与隐藏未开放关卡的鼠标悬停提示 2022-08-28 03:52:02 +08:00
uye
8e7fe38956 feat: 活动关闭提示翻译 2022-08-28 02:57:05 +08:00
uye
e9b4944e1b style: FightSetting模块添加滚轮 2022-08-28 02:47:12 +08:00
Zirun-wang
57f3ea3071 Update 模拟器支持.md
添加了连接手机的一点细节
2022-08-28 01:35:04 +08:00
MistEO
2221c21b0a chore: 略微提高基建温蒂组的优先级
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1651
2022-08-28 01:25:06 +08:00
MistEO
f84dac3d83 chore: 再删点日志 2022-08-28 01:20:24 +08:00
MistEO
e2101a1f0d fix: 修复基建宿舍卡在“未进驻”界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1654
2022-08-28 01:20:17 +08:00
MistEO
93e7915ccd chore: 自动战斗识别干员时加一些日志
ref to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1632
2022-08-28 00:37:29 +08:00
zzyyyl
9b80deba32 style: 优化代码格式 2022-08-28 00:31:29 +08:00
MistEO
c93dd0fe2c chore: 再整理一下日志 2022-08-28 00:02:57 +08:00
MistEO
32a8b858bd chore: 删除一些特别刷屏的日志 2022-08-27 23:48:08 +08:00
MistEO
4bc44f499e Revert "chore: remove editconfig"
This reverts commit 0340e1a424.
2022-08-27 23:40:09 +08:00
MistEO
2a1fdd2d96 fix: 简单的修复一下宿舍信赖识别时的崩溃问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1665
2022-08-27 23:37:35 +08:00
MistEO
5e82c3beaa feat: 为截图反复失败添加错误提示
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1672
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1509
2022-08-27 23:37:35 +08:00
MistEO
41f67244c6 fix: 修复自动战斗冷却中的干员被反复识别的问题 2022-08-27 23:37:18 +08:00
zzyyyl
414507c0db style: 修复 clang-format 14 导致的部分格式问题 2022-08-27 22:41:38 +08:00
zzyyyl
02ede7a336 chore: 更新 clang-formater.py 2022-08-27 22:31:01 +08:00
uye
9e422f8e54 feat: 关卡匹配不上时导航至上一次的关卡 2022-08-27 20:30:14 +08:00
MistEO
0340e1a424 chore: remove editconfig 2022-08-27 20:11:01 +08:00
MistEO
7148230efe fix: 修复基建线索识别失败时不重试的问题 2022-08-27 20:09:39 +08:00
MistEO
5e96206484 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-27 20:09:02 +08:00
uye
1ed7dd0512 feat: 活动关闭后导航至备选关卡 2022-08-27 19:45:56 +08:00
MistEO
11ed072582 Merge pull request #1676 from MaaAssistantArknights/style/code_tidy
style: code tidy
2022-08-27 19:29:08 +08:00
uye
6e763d0693 feat: 活动结束时自动关闭活动导航入口 2022-08-27 19:28:14 +08:00
MistEO
5a8bb76b06 feat: 将 task id 改为进程级唯一 2022-08-27 19:25:09 +08:00
uye
a65e3ebe37 style: 消除警告 2022-08-27 18:25:35 +08:00
uye
9bc6e587b0 feat: 支持两个备选关卡(丑陋预定) 2022-08-27 18:25:35 +08:00
MistEO
ddcde74eaa Merge pull request #1678 from MaaAssistantArknights/docs/ja-jp
docs: 部分翻译更新
2022-08-27 17:58:39 +08:00
Tastror
ef50abed4c docs: 增改日文文档 2022-08-27 13:32:50 +08:00
Tastror
3c06a43ea7 docs: 少量文本更新 2022-08-27 13:11:52 +08:00
Tastror
5d985fe62b fix: 部分与origin无关的英文文本配置文件删除 2022-08-27 12:10:14 +08:00
MistEO
631f1adf5d style: fix space 2022-08-27 02:13:43 +08:00
MistEO
3443a02ee1 style: fix punctuations 2022-08-27 02:07:12 +08:00
MistEO
7bea71bbca Merge pull request #1677 from MaaAssistantArknights/build/v143
build: update to v143
2022-08-27 00:04:31 +08:00
MistEO
aace694e0e docs: update readme 2022-08-26 23:51:18 +08:00
MistEO
7ac13dc774 build: update to v143 2022-08-26 23:48:56 +08:00
MistEO
d47f18d4cb Merge pull request #1664 from MaaAssistantArknights/feat/perf_ui
feat: 优化图形化界面 (fix #1648)
2022-08-26 23:21:07 +08:00
MistEO
22729d0d7d Merge pull request #1667 from MaaAssistantArknights/feat/gui_json
fix: 修复linkstart以后的闪退bug
2022-08-26 22:29:12 +08:00
zzyyyl
d6901ae905 style: 按照 review 意见修改代码格式
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-08-26 21:17:55 +08:00
zzyyyl
8448984868 feat: 简单调整界面
Co-authored-by: uye <2396806385@qq.com>
2022-08-26 19:29:56 +08:00
zzyyyl
290cc30f15 style: 美化部分代码格式 2022-08-26 19:11:42 +08:00
zzyyyl
98f949346e style: clang format 2022-08-26 19:11:34 +08:00
zzyyyl
83546bd466 chore: Add .clang-format 2022-08-26 19:11:26 +08:00
zzyyyl
48273299b8 style: 小优化 2022-08-26 19:11:17 +08:00
zzyyyl
c62599c3fb style: 删除了一些弃置许久的代码 2022-08-26 01:49:37 +08:00
zzyyyl
84b849a0ba perf: 使在非 Windows 下调用 ansi_to_utf8utf8_to_ansi 报错
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-08-26 01:46:27 +08:00
zzyyyl
841b6070ad fix: fix some of the compilation errors #1666
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1666

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-08-26 01:46:19 +08:00
Tastror
69eced2044 fix: 修复linkstart以后的闪退bug 2022-08-25 23:44:09 +08:00
Tastror
d9c9b227b2 feat: 去除部分硬编码 2022-08-25 23:44:09 +08:00
Tastror
366f0311c4 feat: 将旧有配置保存后再删除(中文) 2022-08-25 23:44:09 +08:00
Tastror
044bedca92 feat: 统一gui.json保存的内容,解决本地化不兼容问题 2022-08-25 23:44:09 +08:00
zzyyyl
c0ee9b9a32 feat: 不选中 指定材料 时不显示 刷取数量
总有人误会 `刷取数量` 的意思,那就别显示了(x
2022-08-25 22:37:32 +08:00
zzyyyl
0ff85556b2 feat: 优化 UI
1. 合并 `LinkStart` 和 `停止` 按钮
2. 禁止缩小界面
3. 修复一些语言界面日志显示不全的问题
4. 增加 `修改` 按钮宽度
5. 调整一些 UI 控件
2022-08-25 22:14:50 +08:00
MistEO
511dd8127d Merge pull request #1663 from MaaAssistantArknights/dev
Release v4.3.0-beta.6
2022-08-25 21:37:29 +08:00
MistEO
d319e84a07 docs: 更新CHANGELOG 2022-08-25 21:37:08 +08:00
MistEO
ce147cc2d4 Merge pull request #1662 from MaaAssistantArknights/revert-1652-feat/gui_json
Revert "feat: 统一gui.json保存的内容,解决本地化不兼容问题"
2022-08-25 21:34:07 +08:00
MistEO
2345b10d6a Revert "feat: 统一gui.json保存的内容,解决本地化不兼容问题" 2022-08-25 21:32:56 +08:00
MistEO
de3cb84bdd Merge pull request #1661 from MaaAssistantArknights/dev
Release v4.3.0-beta.5
2022-08-25 20:53:36 +08:00
MistEO
515feda170 docs: 更新CHANGELOG 2022-08-25 20:52:34 +08:00
MistEO
741f53eb95 Merge pull request #1648 from MaaAssistantArknights/feat/perf_ui
feat: 优化图形化界面
2022-08-25 20:42:59 +08:00
MistEO
baf897a6fa Merge pull request #1657 from horror-proton/test/drop_line
perf: 在关卡掉落识别中使用边缘检测判断线条位置
2022-08-25 20:40:34 +08:00
MistEO
1f87efb13f chore: fix typos 2022-08-25 20:40:13 +08:00
MistEO
5f13a2e093 Merge pull request #1643 from et2012/perf/roguelike
perf: 改进肉鸽招募逻辑
2022-08-25 20:35:44 +08:00
MistEO
e24dd8563a Merge pull request #1652 from MaaAssistantArknights/feat/gui_json
feat: 统一gui.json保存的内容,解决本地化不兼容问题
2022-08-25 20:35:08 +08:00
MistEO
5a12e13ae5 Merge pull request #1658 from MaaAssistantArknights/feat/logger
feat: 更新 Logger
2022-08-25 20:34:53 +08:00
MistEO
c9f01a29ff Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-25 20:34:06 +08:00
MistEO
65d654e54b chore: 更新关卡数据、地图数据
屑泰迪摆烂了,这份 levels.json 是手动编码的
2022-08-25 20:34:03 +08:00
uye
220db72271 fix: 修复危机合约开放后夏活导航问题 2022-08-25 20:13:13 +08:00
Tastror
3d5b01ce7e feat: 去除部分硬编码 2022-08-25 17:52:26 +08:00
zzyyyl
0dc9e5e324 feat: Logger 可输出 ranges 2022-08-25 00:34:55 +08:00
Horror Proton
0ba2315187 perf: use sobel derivatives in StageDropsImageAnalyzer::analyze_baseline 2022-08-24 21:13:28 +08:00
et
450a02e674 perf: 改进肉鸽招募滑动逻辑 2022-08-24 19:50:06 +08:00
Tastror
e9ec21adc2 feat: 将旧有配置保存后再删除(中文) 2022-08-24 19:49:21 +08:00
Tastror
02163d504b Merge branch 'master' into dev 2022-08-24 16:00:15 +08:00
et
3d0135aaed perf: 删除肉鸽招募识别结果的默认排序 2022-08-24 15:55:00 +08:00
et
fdc0e7aa49 fix: 微调肉鸽招募界面模板识别匹配率 2022-08-24 15:54:59 +08:00
Tastror
89317859ff feat: 统一gui.json保存的内容,解决本地化不兼容问题 2022-08-24 14:52:01 +08:00
zzyyyl
311431653f perf: fix c# warnings & suggestions 2022-08-24 10:40:44 +08:00
zzyyyl
daebcc23b6 feat: 优化 UI,尤其是缩放后的显示 2022-08-24 02:37:15 +08:00
lhhxxxxx
1744a62327 feat. 彩蛋框架 2022-08-24 00:32:20 +08:00
lhhxxxxx
4d5f24e8e1 feat. 回车后自动加载神秘代码对应文本 2022-08-24 00:24:10 +08:00
MistEO
b0fd895316 Merge pull request #1645 from MaaAssistantArknights/dev
Release v4.3.0-beta.4
2022-08-23 23:42:22 +08:00
MistEO
788cf78fca docs: 更新CHANGELOG 2022-08-23 23:41:56 +08:00
MistEO
51fc1493ac docs: 更新CHANGELOG 2022-08-23 23:39:16 +08:00
MistEO
e705a783ec Merge pull request #1640 from lhhxxxxx/feat/copilot_focus
feat. copilot输入神秘代码后点旁边即可加载相关文本
2022-08-23 23:28:51 +08:00
MistEO
a17ad546a7 Merge pull request #1639 from lhhxxxxx/dev
refactor. 重构fight界面几个字段自动保存的逻辑
2022-08-23 23:28:26 +08:00
Horror Proton
88a8d505c7 fix. remove a misplaced return in pull/1628 2022-08-23 23:21:36 +08:00
zzyyyl
9d5282bde9 feat: 尝试修复掉线重连时次数多减一次的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/987
2022-08-23 21:08:34 +08:00
zzyyyl
6c9c06d6b4 feat: 连续 4 次行动失败时跳过行动任务
close https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1641
2022-08-23 21:08:08 +08:00
zzyyyl
20935d2730 chore: 增加 “减少其他任务的执行次数” 的日志输出 2022-08-23 21:06:20 +08:00
MistEO
03a3602b57 fix: 修复 S 开头的干员名识别不出来的问题 2022-08-23 12:23:44 +08:00
lhhxxxxx
8596d39d89 feat. 输入神秘代码后点旁边即可加载相关文本 2022-08-23 05:19:27 +08:00
lhhxxxxx
6a3f702156 refactor. 重构fight界面几个字段自动保存的逻辑 2022-08-23 04:26:23 +08:00
lhhxxxxx
c91f2c3ad7 fix. re.修复重启后指定材料显示为空
related to commit 483836f120 @ABA2396
@MistEO 修复了一个刚发的版里修复了但没修复的问题
2022-08-23 03:57:03 +08:00
MistEO
eff549a7cb fix: 为老版本作业生成器补充上“无”的方向选项 2022-08-23 01:53:39 +08:00
MistEO
fb3c87241c docs: 更新文档 2022-08-23 00:50:52 +08:00
zzyyyl
b25aa23405 docs: 更新 企鹅物流 公招数据链接 2022-08-23 00:18:07 +08:00
MistEO
2067ec02f0 Merge pull request #1636 from MaaAssistantArknights/dev
Release v4.3.0-beta.3
2022-08-23 00:08:34 +08:00
MistEO
59ba66f10b docs: 更新CHANGELOG 2022-08-23 00:08:08 +08:00
zzyyyl
1ae8dc695b Merge pull request #1634 from MaaAssistantArknights/perf/roguelike
feat: 不再在肉鸽招募 `行商` 干员,加入一些 `傀儡师` 和 `伏击客` 干员
2022-08-23 00:06:46 +08:00
zzyyyl
1f183abdfd feat: 调整一些干员的优先级
Co-authored-by: et <et2002@qq.com>
2022-08-23 00:00:40 +08:00
zzyyyl
8d63856e59 feat: 不再在肉鸽招募 行商 干员,加入一些 傀儡师伏击客 干员
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1633

Co-authored-by: Private233 <108540840+Private233@users.noreply.github.com>
2022-08-23 00:00:32 +08:00
MistEO
e633ab1645 fix: 修复部分特别关注干员名识别问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1617
2022-08-22 23:55:37 +08:00
MistEO
d6378f0a42 fix: 再次修复肉鸽剧目界面卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1631
2022-08-22 23:55:37 +08:00
MistEO
18e36f7490 style: 修改GUI窗口标题 2022-08-22 23:55:37 +08:00
MistEO
5d79c34fb4 Merge pull request #1628 from horror-proton/test/recruitment_task
feat: 公招相关调整
2022-08-22 23:55:11 +08:00
MistEO
d36da51c43 Merge pull request #1625 from MaaAssistantArknights/feat/copilot-tool-vue
feat: 添加新的自动战斗作业生成器
2022-08-22 23:54:40 +08:00
MistEO
ea8ad84674 Merge pull request #1629 from zzyyyl/feat/copilot-tool-vue
chore: 移动旧版作业制作器的位置,打包时不包含新版(开发中)作业制作器
2022-08-22 23:54:30 +08:00
MistEO
ebdf37fb28 feat: 新增 博朗台碎石模式
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1607
2022-08-22 23:26:17 +08:00
zzyyyl
8fcc0581d8 chore: OTA 包含作业制作器 2022-08-22 01:22:55 +08:00
zzyyyl
d0853d236c chore: 移动 html 和 py 作业制作器的位置,打包时不包含 vue 作业制作器 2022-08-22 01:08:04 +08:00
zzyyyl
041e27f90b style: 删除 4f1694b550 带来的临时文件 2022-08-21 23:57:50 +08:00
Horror Proton
1c99a0d8f9 feat: report recruitment tags accordingly to prevent duplicate report 2022-08-21 22:04:09 +08:00
Horror Proton
484b68c65b fix: update recruitment average level calculation 2022-08-21 22:01:30 +08:00
Horror Proton
aed227e3db fix: update recruitment task when using expedited plans 2022-08-21 22:01:30 +08:00
zzyyyl
dc74455424 chore: 修复 issue-checker 评论 Uploading 乱匹配的问题 2022-08-21 21:32:58 +08:00
zzyyyl
4b2518c4d6 chore: 增加 issue-checker 标签 incomplete 2022-08-21 21:32:58 +08:00
uye
e7c261395c style: 修改界面布局 2022-08-21 18:19:14 +08:00
Hydrogina
f8a08385a8 feat:宿舍中识别干员是否有异格在其他设施 (#1592)
* feat:识别信赖值

* fix:检测空信赖

* feat:识别干员是否有异格在其他设施

* fix:清理调试用代码

* fix:清理调试用代码

* feat:添加在宿舍换班前进行未进驻筛选的选项

* feat:可在gui.json中设置是否启用蹭信赖与未进驻筛选

* feat:在gui中添加复选框选项"宿舍空余位置蹭信赖"与“不将已进驻的干员放入宿舍”

* fix: 移除 bool 的 move 操作,格式化代码

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-08-21 17:55:20 +08:00
uye
483836f120 fix: 修复重启后指定材料显示为空 2022-08-21 16:31:19 +08:00
Helloworld
254a25556a feat: 添加新的自动战斗作业生成器 2022-08-21 16:24:36 +08:00
Helloworld
bc60ac6de1 fix: 在读取同一文件时也能响应 2022-08-21 16:17:49 +08:00
Helloworld
f49b82ca69 修复当前版本存在的问题 2022-08-21 16:05:55 +08:00
Helloworld
abd142379b 更改 CopilotData 中的限制以符合文档 2022-08-21 15:39:36 +08:00
uye
1ad3dc43a5 style: 修改描述 2022-08-21 15:13:51 +08:00
Helloworld
ac70848cf2 将 vue 版 copilot designer 移动回来 2022-08-21 15:12:15 +08:00
uye
a249edac71 style: 修改界面布局
fix #1623
2022-08-21 14:26:14 +08:00
MistEO
fe78f5e0d3 docs: fix typos 2022-08-21 00:11:43 +08:00
MistEO
6722bf988f docs: 更新战斗流程文档 2022-08-21 00:09:54 +08:00
Helloworld
f7c48f508b Merge pull request #1618 from MaaAssistantArknights/feature/gui-version-text
feat: 在标题栏上添加版本号
2022-08-20 19:54:53 +08:00
Helloworld
c76cfc023a feat: 删除界面上的版本号 2022-08-20 19:45:06 +08:00
Helloworld
ae050fec89 fix: 版本号不应在构造函数中获取 2022-08-20 19:33:29 +08:00
Helloworld
a7239b3c60 feat: 在标题栏上添加版本号 2022-08-20 19:17:05 +08:00
Helloworld
981ec4cd1d feat: 在界面上添加版本号 2022-08-20 19:16:55 +08:00
zzyyyl
89b603ffbc perf: fix c# warnings & suggestions
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1611
2022-08-20 17:37:53 +08:00
MistEO
e224aecf9f Merge pull request #1613 from AnnoyingFlowers/dev
feat: 新增视频链接可以识别作业文件里BV号的功能
2022-08-20 14:04:48 +08:00
MistEO
02eacf2b05 Merge pull request #1608 from MaaAssistantArknights/docs/upload_recruitment
docs: 更新公招数据自动上传的文档
2022-08-20 13:56:00 +08:00
MistEO
8d75253b69 Merge pull request #1614 from MaaAssistantArknights/styling
格式化,消除警告
2022-08-20 13:54:39 +08:00
Helloworld
9b7a51056d 格式化,消除警告 2022-08-20 13:52:39 +08:00
zzyyyl
0b2746716f docs(docs): 更新 详细介绍 及其他语言翻译 2022-08-20 11:55:20 +08:00
zzyyyl
2e3d6450fa docs(README): 更新 README 及其他语言翻译 2022-08-20 11:55:20 +08:00
zzyyyl
b8c9f7b0e9 docs(docs/ja-jp): 删除部分不可见字符
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1586 c758b2aa5d
2022-08-20 11:55:12 +08:00
zzyyyl
12d646de88 docs: 修改部分英文文档企鹅物流的链接 2022-08-20 11:49:54 +08:00
zzyyyl
2e19ca9518 docs(README): README 格式优化 2022-08-20 11:41:58 +08:00
MiaoYan JY
b8db808e26 feat: 新增视频链接可以识别作业文件里BV号的功能 2022-08-20 10:38:08 +08:00
MistEO
7cfaaa6dbd Merge pull request #1610 from MaaAssistantArknights/dev
fix: 修复编译错误和 typo
2022-08-20 03:20:56 +08:00
MistEO
69a67592a3 fix: 修复编译错误和 typo 2022-08-20 03:17:07 +08:00
MistEO
983e6cb917 Merge pull request #1609 from MaaAssistantArknights/dev
Release v4.3.0-beta.2
2022-08-20 03:04:21 +08:00
MistEO
570c4c30ba docs: 更新CHANGELOG 2022-08-20 02:59:04 +08:00
MistEO
4f1694b550 style: 删除界面上关于自动编队特别关注的提示 2022-08-20 02:42:33 +08:00
MistEO
b47a458b08 feat: 为controller添加退出标记
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1277
2022-08-20 02:40:03 +08:00
MistEO
1cab74cd84 fix: 修复肉鸽掉落剧目集后卡死的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1595
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1480
2022-08-20 02:13:13 +08:00
MistEO
3e87213bca feat: 自动战斗编队时支持“特别关注”干员识别
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/874
2022-08-20 02:09:08 +08:00
MistEO
eb63681425 fix: 调整roi,修复编队干员名识别错误
从潜能大改之后,游戏里编队的干员名被往下挪动了两个像素(sbyj!

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1319
2022-08-20 01:29:38 +08:00
MistEO
e98a5076ec fix: 修复史尔特尔太红了导致自动战斗不上场的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1596
2022-08-20 01:15:26 +08:00
MistEO
43627e2116 feat: 新增支持公招上传一图流带上id,并补充集成文档 2022-08-20 01:01:20 +08:00
MistEO
302c509707 Merge pull request #1591 from MaaAssistantArknights/feat/upload_recruitment
feat: upload recruitment to PenguinStats and YITULIU, and refactoring some code
2022-08-19 23:07:44 +08:00
MistEO
3f781e40be Merge branch 'dev' into feat/upload_recruitment 2022-08-19 23:05:01 +08:00
MistEO
f14143d7fd feat: 仅在自动招募时上传公招结果 2022-08-19 23:04:27 +08:00
MistEO
09c32ecf7e Merge pull request #1599 from Tastror/dev
docs: 添加日文文档「模拟器支持」
2022-08-19 21:31:09 +08:00
zzyyyl
f1b94a2f01 perf: 按照 review 意见修改 2022-08-19 21:18:39 +08:00
MistEO
91c34586c4 Merge pull request #1601 from zzyyyl/feat/upload_recruitment
chore: 修复 Windows 下公招结果上传失败的问题
2022-08-19 21:05:30 +08:00
zzyyyl
fb6fbbc4df perf: utils::utf8_to_unicode_escape 小优化 2022-08-19 14:42:23 +08:00
zzyyyl
f18b7cd514 chore: 修复 Windows 下公招结果上传失败的问题 2022-08-19 14:07:32 +08:00
unknown
29dfcf6f09 style: 微调 docs/ 文件夹与文本内容 2022-08-19 13:18:17 +08:00
unknown
ef030e638f docs: 更新日文模拟器说明内容 2022-08-19 13:17:55 +08:00
uye
ac3f14fe1f doc: 添加4群链接 2022-08-19 11:57:26 +08:00
uye
420e5c23ae feat: 添加一个XML注释 2022-08-19 11:40:52 +08:00
uye
b6885d0710 feat: 添加4群链接 2022-08-19 10:49:04 +08:00
MistEO
1b34381f45 chore: 修改一些公招上传的小问题 2022-08-19 00:19:49 +08:00
MistEO
6b1ae372ba fix: 公招上传功能,按照 review 意见修改 2022-08-18 22:56:43 +08:00
MistEO
d46727db53 Merge pull request #1586 from Tastror/dev
添加日文说明书支持
2022-08-18 20:41:11 +08:00
MistEO
117860c163 chore: 更新资源数据 2022-08-18 20:38:49 +08:00
unknown
c758b2aa5d updata japanese FAQ 2022-08-18 09:18:23 +08:00
zzyyyl
d12e9177f3 docs: 更新 issue-checker 文档 2022-08-18 07:15:10 +08:00
MistEO
c17eaf14e1 feat: 新增支持公招结果上传至“企鹅物流数据统计”和“一图流大数据” 2022-08-18 00:48:43 +08:00
MistEO
a0cb73191c perf: 公招回调整理,更新meojson 2022-08-17 23:38:09 +08:00
MistEO
967dc48acc Merge pull request #1583 from Mangolia-club/master
task.json typo
2022-08-17 22:32:25 +08:00
MistEO
d7d871c9ae chore: 删除对公招小车的特殊化回调 2022-08-17 22:27:20 +08:00
unknown
ce98734e70 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-17 22:19:14 +08:00
unknown
479ba046af 日文说明书 done 2022-08-17 22:18:54 +08:00
MistEO
699db6fdd3 Merge pull request #1585 from MaaAssistantArknights/master
merge: sync master
2022-08-17 22:06:49 +08:00
MistEO
1e4f4c655b Merge pull request #1579 from et2012/fix/roguelike_recruit
fix: 修复肉鸽招募部分问题
2022-08-17 22:05:25 +08:00
MistEO
f3bd0fbf27 Merge pull request #1571 from MaaAssistantArknights/docs/i18n
docs. 更新《模拟器支持》
2022-08-17 21:51:13 +08:00
MistEO
4f86715cda Merge pull request #1580 from Tastror/dev
日语文本修订
2022-08-17 21:51:00 +08:00
unknown
60c1451645 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-17 21:11:09 +08:00
unknown
090829344c update some ja-jp 2022-08-17 21:11:00 +08:00
et
443eb44aa4 fix: 肉鸽招募时检查最低练度 2022-08-17 20:46:34 +08:00
et
fab008c1b6 fix: 修复肉鸽招募有时无法识别干员精英阶段和等级的问题 2022-08-17 20:46:08 +08:00
Mangolia
1fad72b9a6 task.json typo 2022-08-17 19:38:08 +08:00
uye
cfdb45436c style: 调整界面布局 2022-08-17 11:35:42 +08:00
uye
bba90199e6 fix: 修复界面显示不全的问题 2022-08-17 11:29:51 +08:00
uye
66be7a095c fix: 修复界面显示不全的问题 2022-08-17 11:02:47 +08:00
unknown
1157001fd0 日语文本修订 2022-08-17 07:45:45 +08:00
et
00180ea4be fix: 修正肉鸽招募界面无干员时会不断滑动重试的问题 2022-08-17 01:25:26 +08:00
et
c89e710774 fix: 删除多余的判断
编队中已精二的干员不会出现在招募列表
2022-08-17 01:23:03 +08:00
Horror Proton
e370e1f057 fix: update recruit mech 2022-08-16 19:32:08 +08:00
Horror Proton
334d4eaa50 fix: update recruit mech, fix #1574 2022-08-16 19:04:29 +08:00
zzyyyl
a0883fadbf style: 删除冗余文件 2022-08-15 23:52:23 +08:00
Helloworld
494a392efc docs. 更新《模拟器支持》 2022-08-15 23:48:46 +08:00
MistEO
50f5f94dfc Merge pull request #1570 from MaaAssistantArknights/dev
Release v4.3.0-beta.1
2022-08-15 23:30:56 +08:00
MistEO
55e72f1226 docs: 更新 CHANGELOG 2022-08-15 23:28:31 +08:00
MistEO
991be1bb79 Merge pull request #1569 from et2012/feat/roguelike_recruit
feat: 肉鸽招募支持跨职业优先级
2022-08-15 23:12:31 +08:00
uye
dba72b78c8 fix: 修复未勾选备选关卡时使用备选关卡导航的问题 2022-08-15 23:06:58 +08:00
MistEO
3973499499 fix: 修复特别开放的资源关卡导航失败的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1566
2022-08-15 22:50:46 +08:00
et
579e5a5764 perf: 精简最高优先级排序算法 2022-08-15 21:58:44 +08:00
et
0da7fa63f2 fix: 后备招募逻辑无视 required 标志 2022-08-15 21:53:35 +08:00
et
ab11201fe1 style: 为 lambda 加上 const 2022-08-15 21:52:27 +08:00
et
71cbf6ceee perf: 使用重写的 ranges 2022-08-15 21:51:30 +08:00
et
76179ba9a5 style: 为新增的函数添加注释 2022-08-15 21:50:56 +08:00
MistEO
468d60b38e Merge pull request #1564 from zzyyyl/master
chore: 更新 issue-checker
2022-08-15 21:36:30 +08:00
MistEO
b656a914fc Merge pull request #1568 from MaaAssistantArknights/feat/alternative
feat: 增加备选关卡功能
2022-08-15 21:36:11 +08:00
et
9471ebe2eb feat: 肉鸽招募支持跨职业优先级 2022-08-15 21:22:53 +08:00
et
684fe99c09 feat: 添加肉鸽招募界面专用滑动 2022-08-15 18:50:02 +08:00
zzyyyl
973e555ae8 docs: 修改 issue-checker 文档 2022-08-15 15:26:07 +08:00
zzyyyl
898aff99b7 feat: 实时切换关卡备选控件是否显示 2022-08-15 14:33:37 +08:00
zzyyyl
02cac55ec5 docs: 增加 issue-checker 文档 2022-08-15 13:47:10 +08:00
uye
7ab1a2bbf2 feat: 增加关卡备选 2022-08-15 12:45:29 +08:00
zzyyyl
e13921c642 chore: 修改 issue-checker translation required 的判定逻辑
超过 10 个并且不被 ` 分隔的日文再加这个标签再加这个 label
这样有部分日文干员名就不会出问题啦!
(应该没有超过 10 个日文字符的干员名吧?)
2022-08-15 12:36:02 +08:00
zzyyyl
b5cf909bee chore: 增加 issue-checker module: fight 的关键词 刷理智 2022-08-15 10:36:47 +08:00
zzyyyl
92c3ad7252 chore: 更新 issue-checker 关键词 2022-08-15 06:21:38 +08:00
Stardust-Djohn
4ef01f35f5 docs: 补充了安卓手机使用adb连接MAA的说明,以及使用adb临时修改手机分辨率为720p的步骤 (#1560)
* Update 模拟器支持.md

补充了安卓手机使用adb连接MAA的说明,以及使用adb临时修改手机分辨率为720p的步骤

* Update 模拟器支持.md

尝试改回上一次提交时前面部分弄乱的格式
X_X

* Update 模拟器支持.md

* Update 模拟器支持.md

* docs: 整理连接手机的文档,修正格式,加入无线 adb 的连接方法

* docs: 修正格式

* docs: 修正格式 again

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-08-15 01:27:25 +08:00
uye
b34c318415 fix: 修复一个笔误 2022-08-15 00:34:38 +08:00
Horror Proton
aa5e5e2942 perf: change accessibility of derived member function with using keyword 2022-08-14 23:16:03 +08:00
MistEO
072e9827a5 test: 添加掉落识别测试集 2022-08-14 17:25:30 +08:00
MistEO
3b0c34e3e6 fix: 修复一处关卡掉落识别错误
fix #1558
2022-08-14 13:52:27 +08:00
lhhxxxxx
6443e54ee7 fix. 修复空白符导致无法识别的问题 2022-08-14 05:58:28 +08:00
MistEO
05022702ff style: format 2022-08-14 03:06:10 +08:00
MistEO
d6c86cbb2c fix: 修复 C# 的一些warning,删除一些没用的参数 2022-08-14 02:59:25 +08:00
MistEO
fc40fde80e feat: 新增支持对多开蓝叠 HyperV 模拟器的支持(需要自己修改配置)
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1533
2022-08-14 02:17:32 +08:00
MistEO
a7daedcc60 fix: 修复基建宿舍信赖入驻的一些小问题 2022-08-14 02:07:02 +08:00
MistEO
afb565654f Merge pull request #1475 from Hydrogina/dev
feat:dorm

增加宿舍蹭信赖功能。现在如果所有心情未满的干员已进入宿舍,会将信赖未满的干员加入宿舍的空位中。
2022-08-14 01:47:25 +08:00
Hydrogina
700f6ae803 fix:对按钮使用模板匹配,添加说明注释 2022-08-14 00:27:56 +08:00
Hydrogina
33e89ad993 fix:删除检测信赖值 2022-08-13 23:20:28 +08:00
MistEO
86b073ff6d Merge pull request #1548 from horror-proton/test/functional
perf: 简化部分 lambda 表达式的写法
2022-08-13 22:56:07 +08:00
Horror Proton
4f27e3e162 perf: simplify for loops and lambdas, etc 2022-08-13 19:09:25 +08:00
MistEO
1815c83756 style: format 2022-08-13 18:05:02 +08:00
Hydrogina
dc0f045aea fix:对按钮使用模板匹配 2022-08-13 11:26:59 +08:00
uye
4954a590a1 fix: 修复自动编队部分干员识别问题
fix #1543
2022-08-13 11:06:48 +08:00
MistEO
5234ee5c64 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-13 00:13:02 +08:00
MistEO
fc967847a7 feat: 新增了一个暂时用不上的任务,修改一个变量名 2022-08-13 00:12:54 +08:00
zzyyyl
7c5de57f97 Merge branch 'master' into dev 2022-08-12 23:36:07 +08:00
zzyyyl
7fade2b71f chore: 更新 issue-checker 2022-08-12 23:30:49 +08:00
MistEO
84b488974e feat: 界面支持公招三星设置短时间
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1519
2022-08-12 22:57:33 +08:00
Hydrogina
cfbc2c0989 fix:使用未进驻标签进行筛选 2022-08-12 21:47:17 +08:00
MistEO
85d36ee653 Merge pull request #1519 from horror-proton/test/recruit_time
允许自定义公开招募时间
2022-08-12 19:33:52 +08:00
uye
d0085b7ace Merge pull request #1535 from Tastror/dev
修改了部分日文文本
2022-08-12 19:32:03 +08:00
unknown
0788a29b2a 小改 2022-08-12 19:24:26 +08:00
unknown
2000531b73 更新了日语内容 2022-08-12 19:18:55 +08:00
unknown
752483bbaa 修改了部分日文文本 2022-08-12 16:55:05 +08:00
zzyyyl
e2f57aeb2d chore: Update issue template 2022-08-12 15:46:23 +08:00
uye
94142f2636 fix: 修复活动关卡导航失败的问题 2022-08-12 13:47:50 +08:00
Hydrogina
89c39142ed fix:通过ocr干员进驻设施标签,避免将正在控制中枢工作的干员放入宿舍 2022-08-12 12:26:15 +08:00
Horror Proton
973d9e503b feat: update recruit time settings 2022-08-11 23:44:31 +08:00
Hydrogina
91533cf7ba fix:改为使用face_hash来鉴别干员入驻宿舍情况 2022-08-11 22:20:02 +08:00
MistEO
83ba7ba1b8 fix: 修复肉鸽招募识别不到干员的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1523
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1474
2022-08-11 22:10:02 +08:00
Horror Proton
99943a4e3c feat: add json interface for recruitment time 2022-08-11 21:44:17 +08:00
MistEO
f865791a99 Merge pull request #1512 from MaaAssistantArknights/feat/stage_wayfinding
feat: 支持全部主线关卡导航(仅 core 部分)
2022-08-11 21:35:28 +08:00
Horror Proton
968453e4c2 feat: update recruit time adjustment to allow custom time settings 2022-08-11 20:12:25 +08:00
Horror Proton
e253a4605c feat: use ocr to check recruit timer 2022-08-11 20:12:16 +08:00
MistEO
2d4c762de1 Merge pull request #1514 from MaaAssistantArknights/dev
Release v4.2.4
2022-08-11 19:08:59 +08:00
MistEO
8e6ae4df3a docs: 更新CHANGELOG 2022-08-11 19:08:46 +08:00
MistEO
e4068166d8 chore: 开放 IC 关卡导航 2022-08-11 19:08:05 +08:00
MistEO
42c21695b9 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-11 16:46:42 +08:00
MistEO
dee7ccd967 chore: 更新活动关卡掉落数据 2022-08-11 16:46:32 +08:00
MistEO
adbf009652 Merge pull request #1516 from lhhxxxxx/dev
refactor. uniform color style
2022-08-11 10:56:22 +08:00
MistEO
e2a91885cc chore: 更新泰迪仓库里的资源 2022-08-11 10:53:22 +08:00
lhhxxxxx
f1eabc9e5f style. 预览完整setting 2022-08-11 04:17:03 +08:00
lhhxxxxx
0ef76eee4a refactor. uniform color style 2022-08-11 03:48:50 +08:00
zzyyyl
224d51fdbb docs: update changelog 2022-08-11 01:15:53 +08:00
zzyyyl
4a7cf2d018 Merge pull request #1515 from MaaAssistantArknights/master
chore: labeler 相关优化,增加英文议题模板
2022-08-11 01:14:04 +08:00
zzyyyl
80688cc6b8 docs: update changelog 2022-08-11 00:59:35 +08:00
zzyyyl
e90889dec8 chore: 更新公招 傀影, 巫恋, 刻刀 的数据 2022-08-11 00:58:39 +08:00
MistEO
1b27f14a58 docs: update changelog 2022-08-11 00:35:10 +08:00
Horror Proton
a31b6c3cb0 perf: remove an unused function 2022-08-11 00:28:04 +08:00
MistEO
d475f1a591 Merge pull request #1513 from cookie223/patch-3
dev -> add boss stage names in EN
2022-08-11 00:19:21 +08:00
Qi Chu
d2996c64a3 dev -> add boss stage names in EN 2022-08-10 12:17:17 -04:00
MistEO
a16168aff7 Merge pull request #1507 from cglcv/dev
fix. 修复目录带空格时无法自启的问题
2022-08-11 00:13:45 +08:00
MistEO
028f55558e feat: 支持全部主线关卡导航(仅 core 部分) 2022-08-11 00:05:56 +08:00
zzyyyl
5ad6f78474 chore: 增加一些 Issue 模板的描述,调整顺序 2022-08-10 23:32:15 +08:00
zzyyyl
8e7471d1d5 chore: Update issue template
什么叫名字太短啊 kora
2022-08-10 23:32:15 +08:00
zzyyyl
ce47ae41ac chore: Update issue template 2022-08-10 23:32:15 +08:00
uye
eae1ce7a43 feat: 一群又满了(小声) 2022-08-10 20:42:00 +08:00
uye
d83fdaf281 Revert "feat: 一群又满了!" 2022-08-10 20:40:06 +08:00
uye
4547591c49 feat: 一群又满了! 2022-08-10 20:26:54 +08:00
Horror Proton
39f9ce73f3 fix: remove an unused function declaration 2022-08-10 18:59:34 +08:00
cglcv
92628bf9ef fix. 修复目录带空格时无法自启的问题
fix #1505
2022-08-10 17:29:44 +08:00
Hydrogina
bffeaa4acf fix:修复会把一个宿舍的人搬到另一个宿舍的问题 2022-08-10 15:27:21 +08:00
uye
6c3ee2f797 feat: 「理想城:长夏狂欢季」活动导航 2022-08-10 14:24:17 +08:00
uye
d98f1aa33f feat: 移除多索雷斯假日活动关卡导航 2022-08-10 13:47:12 +08:00
Horror Proton
d698937e64 perf: remove an unused template 2022-08-09 21:19:36 +08:00
zzyyyl
ba2b3fca3a chore: 增加 issue-checker module: fight 关键词 剿灭 2022-08-09 15:36:06 +08:00
zzyyyl
2314305385 chore: 使用隐藏功能 push
close #1492
2022-08-09 15:01:58 +08:00
zzyyyl
55606c0aff chore: 更新 zzyyyl/issue-checker, 增加处理 issue_comment 的 fixedduplicate 2022-08-09 15:01:58 +08:00
zzyyyl
5ea51dc58b chore: 修改一些关键词
`base` 也太容易误判了(
2022-08-09 15:01:58 +08:00
liuyiyang
81f087d260 fix: 修复linux下的库依赖顺序 2022-08-09 14:28:38 +08:00
Horror Proton
ac4d125913 fix: add workaround for #1491 2022-08-08 23:10:01 +08:00
uye
9bb8cef902 style: 优化肉鸽设置界面 2022-08-08 23:09:09 +08:00
MistEO
d92cc59ae3 feat: add some space 2022-08-08 22:50:05 +08:00
MistEO
02bfb6b160 fix: fixed the auto IS is stuck after storage full in YoStarEN
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1477
2022-08-08 21:59:38 +08:00
MistEO
bb7ec4be61 feat: 优化界面关于源石锭投资相关行为
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1486
2022-08-08 21:54:27 +08:00
MistEO
bf0b01194e Merge pull request #1486 from et2012/dev
feat: 肉鸽投资开关
2022-08-08 21:37:47 +08:00
et
cc376da1ab feat: 添加肉鸽选项“是否投资源石锭” 2022-08-08 20:50:11 +08:00
ChingC
49537a992d build: 分离windows和其他平台的链接选项 2022-08-08 20:06:04 +08:00
zzyyyl
2891270925 chore: 修复 issue-checker 没有给 PR 打标签权限的问题 2022-08-08 16:47:14 +08:00
Hydrogina
fbd482f417 Merge branch 'MaaAssistantArknights:dev' into dev 2022-08-08 15:51:48 +08:00
zzyyyl
a9f80bfb15 Merge pull request #1488 from zzyyyl/master
chore: 更新 issue-checker
2022-08-08 15:47:35 +08:00
zzyyyl
38e6cb9a39 chore: 测试 author_association 2022-08-08 15:38:43 +08:00
zzyyyl
909a55263f chore: 再加个权限 2022-08-08 14:29:45 +08:00
zzyyyl
9e19ce8da7 chore: 更新 issue-checker 2022-08-08 14:29:21 +08:00
zzyyyl
d910942e3c chore: 给 issue-checker 加个权限,并且处理 pr 2022-08-08 10:19:23 +08:00
MistEO
5e979c277a fix: 修复第一次打剿灭时不会勾选全权委托的问题 2022-08-08 09:44:00 +08:00
MistEO
21cb780d5e Merge pull request #1476 from zzyyyl/master
chore: 使用 zzyyyl/issue-checker
2022-08-08 01:46:25 +08:00
MistEO
da00e8a6fb Merge pull request #1485 from BombaxCeiba/AutoSetWorkingDirectory
feat: 启动UI时自动设置工作目录,避免启动UI时白屏闪退
2022-08-08 01:45:59 +08:00
cglcv
149ee6853a fix: 修改关闭模拟器的逻辑 (#1479) 2022-08-08 01:45:30 +08:00
Dusk_NM02
671e609a18 feat: 启动UI时自动设置工作目录,便于正确加载DLL 2022-08-07 21:58:48 +08:00
Horror Proton
9922c7beea fix: fix a typo in YoStarEN ocr replace rules 2022-08-07 21:17:58 +08:00
Hydrogina
4c85ded813 PlatformToolset 142 2022-08-07 20:41:01 +08:00
Hydrogina
cb276e58e3 fix name 2022-08-07 19:36:09 +08:00
Hydrogina
0a26c9945a Merge branch 'MaaAssistantArknights:dev' into dev 2022-08-07 19:31:58 +08:00
Horror Proton
d7d3b968ff feat: improve compatibility of range-v3 replacement 2022-08-07 19:19:07 +08:00
Horror Proton
9e2a7996d9 chore: update project files 2022-08-07 19:19:07 +08:00
Horror Proton
1d2e7e29ed feat: add C++ ranges library alternatives 2022-08-07 19:19:07 +08:00
zzyyyl
0ed493cfc4 chore: 使用 zzyyyl/issue-checker 2022-08-07 01:36:56 +08:00
Hydrogina
3432e2c967 dorm 2022-08-06 23:30:31 +08:00
MistEO
7e88705627 Merge pull request #1464 from MaaAssistantArknights/dev
Release v4.2.3
2022-08-06 21:34:58 +08:00
MistEO
c21aca7e85 docs: 更新 CHANGELOG 2022-08-06 21:34:29 +08:00
MistEO
e7efd450d2 Merge branch 'master' into dev 2022-08-06 21:28:13 +08:00
zzyyyl
8aaab1fade chore: 增加 labeler 标签 MAA Team,调整格式 2022-08-06 15:54:30 +08:00
zzyyyl
1cabd46896 chore: 把 labeler 日文字符集改用 [\u3040-\u30ff]
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
2022-08-06 15:54:30 +08:00
lhhxxxxx
82e9b702fc Merge pull request #1462 from lhhxxxxx/master
chore. 添加服务器别名
2022-08-05 23:39:31 +08:00
lhhxxxxx
e766763e2c chore. 多了个| 2022-08-05 23:38:37 +08:00
lhhxxxxx
18b5038899 chore. 添加服务器别名 2022-08-05 23:36:05 +08:00
lhhxxxxx
87880a8f42 Merge pull request #1461 from lhhxxxxx/master
chore. 日语字符补齐
2022-08-05 22:56:02 +08:00
lhhxxxxx
52ed6d8373 chore. 日语字符补齐 2022-08-05 22:54:29 +08:00
zzyyyl
097e1c956e Merge pull request #1458 from zzyyyl/master
chore: labeler 大更新
2022-08-05 22:28:09 +08:00
zzyyyl
a14b20d91d chore: 增加 labeler 标签 2022-08-05 22:22:00 +08:00
lhhxxxxx
0a1fcb6ebe fix. 漏了typename 2022-08-05 19:04:36 +08:00
uye
63638867d9 fix: 修复1-7导航问题 2022-08-05 16:59:15 +08:00
zzyyyl
7d0690c98e chore: 增加 labeler module: recruit 关键词 公開募集 2022-08-05 15:10:59 +08:00
zzyyyl
a38795a7d1 chore: 修复 labeler 某些关键词多一些空格的 bug 2022-08-05 14:36:33 +08:00
zzyyyl
b7e6245657 chore: 调整 labeler
增加一个 `Remove all labels`
2022-08-05 14:36:25 +08:00
zzyyyl
102749b3ed chore: 调整 issue-labeler 2022-08-05 14:36:17 +08:00
zzyyyl
97c09814bc chore: 增加 issue-labeler module: fight 关键词 关卡选择 2022-08-05 12:03:55 +08:00
zzyyyl
8612f9531f Merge pull request #1455 from zzyyyl/master
chore: 修复 issue-labeler 的正则表达式
2022-08-05 11:39:09 +08:00
zzyyyl
f501c5fad3 chore: 修复 issue-labeler 的正则表达式
这次总该对了吧?
2022-08-05 11:36:08 +08:00
zzyyyl
a39f374ba0 chore: 修复 issue-labeler 的正则表达式 2022-08-05 11:08:13 +08:00
zzyyyl
cfbb54a7da chore: 尝试修复 issue-labeler 的正则表达式 2022-08-05 10:43:05 +08:00
zzyyyl
25be8dc9c1 chore: 增加 issue-labeler 标签 ambiguous 处理不好好写 issue/pr 的 2022-08-05 03:52:13 +08:00
zzyyyl
b25b2a1050 chore: 调整 issue-labeler 关键词
暂时就先这样,等有人点炒饭的时候再来改就是了(
2022-08-05 03:34:56 +08:00
lhhxxxxx
dd1daca3d9 Merge pull request #1449 from lhhxxxxx/master
chore. 增加多语种翻译
2022-08-05 02:31:53 +08:00
lhhxxxxx
f43a5b5086 Revert "style. 分列处理"
This reverts commit 2d43ada7c5.
2022-08-05 02:23:22 +08:00
lhhxxxxx
2d43ada7c5 style. 分列处理 2022-08-05 02:17:10 +08:00
lhhxxxxx
e44877043a chore. 增加多语种翻译 2022-08-05 02:06:52 +08:00
zzyyyl
ac6fe6ccee Merge pull request #1447 from zzyyyl/master
chore: 更新 issue-labeler 的关键词并同样适用 PR
2022-08-05 01:46:45 +08:00
zzyyyl
5b0a558fda chore: 更新 issue-labeler 关键词 2022-08-05 01:45:12 +08:00
zzyyyl
529405b833 chore: issue-labeler 同样适用 PR 2022-08-05 01:39:08 +08:00
lhhxxxxx
fa67ad35e2 style. use same_as && derived_from 2022-08-05 01:33:41 +08:00
Alisa
9929117642 Merge pull request #1446 from MaaAssistantArknights/fix/checksum-encoding
修复 MaaBuilder 的一些错误
2022-08-05 00:53:28 +08:00
Liam Sho
6bcbea0a9c fix: 修复 MaaBuilder 路径错误
顺便修复一下
2022-08-05 00:31:33 +08:00
Liam Sho
893e1f8731 fix: 修复 checksum.json 编码错误
fix #1444
2022-08-05 00:24:07 +08:00
lhhxxxxx
13c3a37302 perf. 加了应该没问题的[[unlikely]] 2022-08-05 00:13:10 +08:00
MistEO
2ae7a084ae Merge pull request #1439 from zzyyyl/master
chore: 增加 Issue 分类器
2022-08-04 22:30:32 +08:00
lhhxxxxx
2727abcc39 style. 使用字面量时间 2022-08-04 22:26:03 +08:00
zzyyyl
b9860137eb chore: 尝试更新 issue-labeler 版本 2022-08-04 15:00:38 +08:00
uye
f9d7f8c248 feat: 切换语言的弹窗提示由目标语言显示 2022-08-04 14:50:52 +08:00
uye
b71e0e3bf3 style: 优化全屏显示 2022-08-04 14:50:52 +08:00
zzyyyl
b4b4594ad3 chore: test issue labeler 2022-08-04 14:20:53 +08:00
Horror Proton
3a83acf93f fix: fix a typo in YoStarEN ocr replace rules 2022-08-04 00:55:15 +08:00
MistEO
4d202c388b fix: 删掉一些用不上还可能带来问题的函数,修复肉鸽 假日威龙陈 技能选择错误 2022-08-04 00:05:38 +08:00
MistEO
2bb02eb9fc perf: 尝试按照maa的战斗思路优化肉鸽商店购买优先级 2022-08-03 23:09:02 +08:00
MistEO
b73db77cab Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-03 20:50:19 +08:00
MistEO
512c276a8a fix: 修复肉鸽商店弹出额外赠送的藏品后卡住的问题 2022-08-03 20:50:09 +08:00
uye
982a1d7ba9 doc: Update README_en-US.md 2022-08-03 19:45:35 +08:00
uye
b077098a34 doc: Update README_ja-JP.md 2022-08-03 19:44:36 +08:00
uye
29ee372d5a doc: Update README_zh-TW.md 2022-08-03 19:43:04 +08:00
uye
8d06d08c59 doc: Update README.md 2022-08-03 19:41:18 +08:00
MistEO
7db783e6a6 Merge pull request #1426 from MaaAssistantArknights/dev
Release v4.2.2
2022-08-03 19:40:31 +08:00
uye
3724ef7fd3 feat: 一群又不满啦! 2022-08-03 19:39:18 +08:00
MistEO
90a4fdd4c4 perf: 调整了一下肉鸽干员优先级 2022-08-03 19:38:50 +08:00
Horror Proton
64715a8313 fix: fix a recruit iterator issue 2022-08-03 19:09:20 +08:00
uye
9d593d2bbe fix: 修复连续切换语言后的报错 2022-08-03 17:35:07 +08:00
uye
3254282902 feat: 翻译 2022-08-03 17:11:06 +08:00
uye
cbbfa639fb style: 优化全屏显示 2022-08-03 16:08:21 +08:00
zzyyyl
37176ceae3 perf: 优化公招 tags 处理 2022-08-03 13:52:34 +08:00
Horror Proton
fcff27858a fix: fix a recruit iterator issue 2022-08-03 12:50:30 +08:00
uye
b8a76450f0 feat: 修改关卡导航排序 2022-08-03 00:19:07 +08:00
MistEO
019528496a Merge pull request #1420 from MaaAssistantArknights/dev
Release v4.2.2-beta.1
2022-08-02 23:57:33 +08:00
MistEO
b9e7a92d05 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-02 23:56:59 +08:00
MistEO
8185b861c6 docs: 更新 CHANGELOG 2022-08-02 23:56:56 +08:00
uye
6f16a85952 style: 修改肉鸽设置格式 2022-08-02 23:55:44 +08:00
MistEO
56f26deff2 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-02 23:48:12 +08:00
MistEO
2ddfef694f docs: 补充肉鸽新增自动的文档, 修正测试用例 2022-08-02 23:48:08 +08:00
Horror Proton
af750a4302 fix: fix output of auto recruit task when there is senior tag 2022-08-02 23:44:28 +08:00
Horror Proton
2da185f169 perf: change sorting rule of RecruitCombs operator list 2022-08-02 23:44:28 +08:00
MistEO
ab277d08e6 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-02 23:42:28 +08:00
MistEO
a1fcde5cda docs: 更新CHANGELOG 2022-08-02 23:42:22 +08:00
MistEO
89a941ccdd Merge pull request #1409 from lhhxxxxx/dev
perf. 使用ranges及views及<=>及其他一些c++20优化及一般优化
2022-08-02 23:41:39 +08:00
MistEO
d3b4b8fd48 i18n: add i18n of the I.S. core char tip 2022-08-02 23:35:21 +08:00
MistEO
08d8907df1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-02 23:29:40 +08:00
MistEO
402a8429c8 feat: the I.S. custom starting supports YoStarEN and YoStarJP now, and add localized translation 2022-08-02 23:29:37 +08:00
uye
0d2075aaf6 style: 修改切换语言后的ui 2022-08-02 23:24:14 +08:00
MistEO
e00653ce67 fix: 尝试修复部分设备上基建滑动失效导致的干员换班错误 2022-08-02 22:22:05 +08:00
MistEO
e37507277f fix: 修复肉鸽编队偶现少选一个人的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1417
2022-08-02 22:16:00 +08:00
MistEO
d612cabc30 feat: 支持剿灭模式全权委托及掉落识别 2022-08-02 22:01:11 +08:00
MistEO
7797bb11b3 Merge pull request #1412 from horror-proton/test/clang_warnings
修复 Linux 下的部分编译错误和警告
2022-08-02 20:01:16 +08:00
MistEO
e53b31f784 Merge pull request #1402 from zzyyyl/feat/concept
perf: 使用 concept 优化代码
2022-08-02 19:59:30 +08:00
uye
f543b005ea style: 格式化xaml 2022-08-02 18:14:28 +08:00
uye
d0020406df style: 优化全屏显示效果 2022-08-02 18:07:10 +08:00
lhhxxxxx
cc28b1b371 style. 小修一下格式 2022-08-02 17:59:38 +08:00
lhhxxxxx
a37e244c08 perf. 一个std::find的漏网之鱼 2022-08-02 17:46:13 +08:00
lhhxxxxx
102a200cd3 perf. remove std::as_const, add const& to lambda 2022-08-02 17:34:37 +08:00
lhhxxxxx
b1b938bad9 style. 修复一个漏掉的缩进问题 2022-08-02 17:09:50 +08:00
Horror Proton
ad3ddd96a7 fix: fix some of the compilation errors and warnings 2022-08-02 11:45:20 +08:00
Horror Proton
7064023fc7 fix: fix use of incomplete type 2022-08-02 10:56:09 +08:00
zzyyyl
7933658629 chore: 玛丽说多转一次会影响性能 2022-08-02 10:13:43 +08:00
lhhxxxxx
9ed148b642 style. vs这格式化逆大天 2022-08-02 03:16:59 +08:00
lhhxxxxx
daeb4be0d8 style. 格式化 2022-08-02 03:05:40 +08:00
lhhxxxxx
994e16467a style. 格式化 2022-08-02 03:04:06 +08:00
lhhxxxxx
5f8a0e05e0 style. 格式化代码 2022-08-02 02:59:17 +08:00
lhhxxxxx
396acc47d4 perf. 使用ranges及views及<=>及其他一些c++20优化及一般优化 2022-08-02 02:59:17 +08:00
MistEO
fc6b1be975 Merge pull request #1407 from MaaAssistantArknights/dev
Release v4.2.1
2022-08-02 01:15:52 +08:00
MistEO
e55e1567ae fix: 修复肉鸽干员技能选择错误 2022-08-02 01:15:14 +08:00
MistEO
aa306c9f4c docs: Update screenshots of the YoStarJP 2022-08-02 01:15:14 +08:00
zzyyyl
eeb4e2394a fix: revert. 2022-08-02 00:42:36 +08:00
zzyyyl
4bd8bda518 style: 统一 requires 格式 2022-08-02 00:39:55 +08:00
lhhxxxxx
8f23c2ae16 style. 使用宏优化编码 2022-08-02 00:03:41 +08:00
zzyyyl
4976628c06 refactor: 用 concepts 优化 static_assert 2022-08-01 23:49:52 +08:00
zzyyyl
008a151035 feat: 用 concepts 优化 static_assert 使得编译报错信息更加友好 2022-08-01 23:49:43 +08:00
MistEO
1fd01fc0bd Merge pull request #1403 from MaaAssistantArknights/dev
Release v4.2.0
2022-08-01 23:45:12 +08:00
MistEO
d137beef25 docs: 补上信用商店分号分割的CHANGELOG 2022-08-01 23:43:47 +08:00
MistEO
5da85a637f docs: 更新CHANGELOG 2022-08-01 23:41:08 +08:00
MistEO
921fedab18 style: 改改界面提示 2022-08-01 23:34:03 +08:00
MistEO
f25e70b642 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-01 23:29:45 +08:00
MistEO
16f5aed6a1 feat: 肉鸽技能识别不准,所以不识别了.jpg 2022-08-01 23:29:32 +08:00
MistEO
7f9b72e0b7 Merge pull request #1391 from MaaAssistantArknights/feat/c++20
refactor: 升级c++20
2022-08-01 23:20:52 +08:00
MistEO
2a447b4ad2 feat: Change the delimiter for credit store to a semicolon 2022-08-01 22:36:19 +08:00
MistEO
c05176eb6c fix: try to fix the bug that Roguelike1StageTraderInvestSystem and Roguelike1GetDropRecruit of the YoStarEN is not recognized 2022-08-01 22:30:19 +08:00
zzyyyl
927fbd2f08 style: 日志首字母大写 2022-08-01 22:28:37 +08:00
MistEO
4ea91a858b fix: 整理一点肉鸽的日志 2022-08-01 22:25:18 +08:00
MistEO
93fd718438 fix: 尝试修复肉鸽编队不选艾丽妮的问题 2022-08-01 22:17:30 +08:00
MistEO
3c22e6ab06 feat: 调整一下肉鸽战斗中放干员的优先级 2022-08-01 22:17:30 +08:00
MistEO
eec1399126 fix: 修复肉鸽指定干员较靠后时选不到的问题,整理一些日志 2022-08-01 22:17:28 +08:00
zzyyyl
706eef50fa chore: 给肉鸽招募加点日志 2022-08-01 21:57:54 +08:00
MistEO
4964f75646 fix: 修复Deb下的项目配置(C++20) 2022-08-01 20:25:18 +08:00
MistEO
f9a63b3528 refactor: 将 disable cv warning 的宏额外封装了一层头文件 2022-08-01 20:16:58 +08:00
zzyyyl
9ab5fb78a5 feat: 给肉鸽招募加点日志;修改一下 check_core_char 的逻辑 2022-08-01 18:14:13 +08:00
zzyyyl
b09d0509cb chore: 把 Config.hpp 放到 filter 的 Utils 里面 2022-08-01 12:45:13 +08:00
zzyyyl
a2cb5eae1c style: 删掉多的换行 2022-08-01 12:39:40 +08:00
lhhxxxxx
07d2a32fc4 fix. 补上漏掉的重构 2022-08-01 12:36:32 +08:00
MistEO
0ecbab590f fix: 补上漏掉的肉鸽分队
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1399
2022-08-01 12:18:28 +08:00
Horror Proton
b651e8e0ae feat: add Config.hpp 2022-08-01 12:12:30 +08:00
zzyyyl
2f545acedb fix: 尝试修复 clang warnings 2022-08-01 11:29:36 +08:00
Horror Proton
d6b2f47f9a fix: fix recruit slot force skip 2022-08-01 11:17:55 +08:00
MistEO
656e15a806 docs: Update screenshots of the YoStarJP 2022-08-01 00:21:24 +08:00
lhhxxxxx
22edec16c8 fix. 漏了一个 2022-07-31 22:57:40 +08:00
lhhxxxxx
2aa203e08a fix. 紧急修复msvc warning 2022-07-31 22:51:48 +08:00
lhhxxxxx
2a6e2ac9f7 fix. 修复c++17除meojson外的g++ warning
style. 语法修复
2022-07-31 22:27:11 +08:00
zzyyyl
d80f37f4a6 fix: 修复 linux 下的一些 errors 2022-07-31 21:56:48 +08:00
MistEO
023d3685fc Merge pull request #1394 from MaaAssistantArknights/dev
Release v4.2.0-beta.1
2022-07-31 21:41:57 +08:00
MistEO
35e513deda docs: 更新 CHANGELOG 2022-07-31 21:41:33 +08:00
Horror Proton
d0b752d719 fix: suppress -Wdeprecated-enum-enum-conversion in opencv 2022-07-31 21:39:16 +08:00
MistEO
9f9dda00ae perf: 调整肉鸽招募优先级 2022-07-31 21:32:19 +08:00
lhhxxxxx
2199112a39 fix. update .gitignore 2022-07-31 21:16:26 +08:00
lhhxxxxx
0afff07787 style. typo大修正 2022-07-31 20:47:58 +08:00
MistEO
43219f31b9 fix: 修复运行报错 2022-07-31 20:39:48 +08:00
MistEO
9737aa38c5 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-31 20:32:13 +08:00
MistEO
490b4a5da7 feat: 肉鸽商店购物支持按稀有度计算具体的晋升等级,修改相关资源及解析 2022-07-31 20:31:59 +08:00
Helloworld
4cee6f208b Merge pull request #1393 from MaaAssistantArknights/docs/doc
docs: 漏网之鱼
2022-07-31 20:26:13 +08:00
MistEO
3ce039cc87 feat: 召唤不要首选令了 2022-07-31 20:18:42 +08:00
Helloworld
8694ab0c5d docs: 漏网之鱼 2022-07-31 20:18:38 +08:00
MistEO
6f4ca63076 feat: 简单加个肉鸽商店是否买个晋升类物品的判断逻辑 2022-07-31 20:16:26 +08:00
MistEO
13fd3d48b7 Merge pull request #1385 from horror-proton/test/recruit_mech
自动公招相关的调整
2022-07-31 20:11:13 +08:00
Helloworld
b726323c02 Merge pull request #1390 from MaaAssistantArknights/docs/i18n
i18n: 修正笔误
2022-07-31 20:09:43 +08:00
Helloworld
8f1e487548 i18n: 修正笔误 2022-07-31 19:37:07 +08:00
lhhxxxxx
9827d8b78f Merge pull request #1389 from MaaAssistantArknights/docs/doc
添加文档注释
2022-07-31 19:31:24 +08:00
zzyyyl
a6bc997a7d chore: 修改 CMakeLists 的 C++ 标准 2022-07-31 19:28:11 +08:00
Helloworld
022bdb0076 Merge branch 'dev' into docs/doc 2022-07-31 19:24:05 +08:00
zzyyyl
c152a3ddaf docs: 把 README 中的 badge 从 c++17 改为 c++20 2022-07-31 19:22:23 +08:00
lhhxxxxx
93383c3126 Merge remote-tracking branch 'origin/dev' into dev 2022-07-31 18:50:58 +08:00
lhhxxxxx
2d642fc7c5 style. 部分typo修正及翻译修正 2022-07-31 18:50:31 +08:00
uye
eb289b5695 feat: 重新添加源石锭额外掉落藏品的属性 2022-07-31 18:32:19 +08:00
uye
00396b3ca4 feat: 更新肉鸽商店购买列表 2022-07-31 18:23:35 +08:00
Helloworld
cb6d772c85 docs: UserControl 2022-07-31 17:43:00 +08:00
zzyyyl
b58e86263d style: 对齐一下被 code tidy 打乱的注释 2022-07-31 17:39:57 +08:00
Helloworld
29f9d865e4 docs: Bootstrapper 2022-07-31 17:38:16 +08:00
Helloworld
a8afd335ee docs: ViewModels 2022-07-31 17:32:56 +08:00
zzyyyl
64d571ad33 refactor: 升级 c++20! 2022-07-31 16:59:31 +08:00
zzyyyl
221a56062a fix: 修复 c++17 没有但是 c++20 有的 errors 2022-07-31 16:43:45 +08:00
Helloworld
eaec55c0b6 docs: Helper 2022-07-31 16:43:13 +08:00
MistEO
7dfea3d416 perf: 优化肉鸽购物逻辑,将职业改为数组,并新增 chars 字段 2022-07-31 16:20:55 +08:00
Helloworld
83c265d8e0 docs: AsstProxy 2022-07-31 16:13:26 +08:00
Helloworld
adb299a948 修复格式 2022-07-31 15:34:17 +08:00
MistEO
be3d7656ef fix: 增加一下额外滑动距离,不知道对基建误触有没有改善 2022-07-31 15:29:33 +08:00
MistEO
e8c49c6d1b Merge pull request #1387 from et2012/dev
feat: 肉鸽招募券支持翻页
2022-07-31 15:14:58 +08:00
MistEO
22bfecdedd fix: 修复肉鸽干员重复开技能的问题 2022-07-31 14:56:16 +08:00
MistEO
039b3ef3e7 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-31 14:48:28 +08:00
MistEO
512cc97d55 fix: 修复肉鸽信用商店购买完招募相关物品后直接离开商店的问题 2022-07-31 14:48:20 +08:00
lhhxxxxx
f1b676f58e style. use _v instead of ::value 2022-07-31 13:15:35 +08:00
lhhxxxxx
d9039f0dc7 style. typo fix 2022-07-31 13:09:22 +08:00
uye
cd8dcf973c fix: 修复一个笔误引起的提示错误 2022-07-31 12:42:44 +08:00
et
965ac5d525 feat: 肉鸽招募券支持翻页 2022-07-31 12:36:40 +08:00
Horror Proton
683332b3cb fix: update auto recruit mech 2022-07-31 10:53:04 +08:00
Horror Proton
855f214d75 perf: use functional tools in recruit config 2022-07-31 10:51:25 +08:00
lhhxxxxx
de288b8759 Merge pull request #1374 from lhhxxxxx/dev
Code Tidy
2022-07-31 03:20:24 +08:00
MistEO
1f8cad0cc6 Merge pull request #1384 from MaaAssistantArknights/dev
Release v4.2.0-alpha.4
2022-07-31 03:10:27 +08:00
MistEO
ef9069eab8 docs: 更新CHANGELOG 2022-07-31 03:10:07 +08:00
MistEO
5002b7504d style: 傻逼VS怎么又给我瞎格式化 2022-07-31 03:03:10 +08:00
MistEO
3c6b822fc6 feat: 支持肉鸽商店根据当前已有干员区分是否购买;支持购买金酒之杯后不再额外消耗源石锭 2022-07-31 03:01:56 +08:00
MistEO
4efa10a37c fix: 修复肉鸽商店购买收藏品时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1380
2022-07-31 01:04:11 +08:00
MistEO
5056d6a86b perf: 调整肉鸽干员的技能 2022-07-31 01:04:11 +08:00
lhhxxxxx
cdc98eefe8 Merge remote-tracking branch 'myfork/dev' into dev 2022-07-30 18:25:32 +08:00
lhhxxxxx
a579d8b944 perf. c++ code tidy
style. typo fixed
2022-07-30 18:24:31 +08:00
lhhxxxxx
cdb2238e5b Merge remote-tracking branch 'origin/dev' into dev 2022-07-30 18:22:10 +08:00
lhhxxxxx
e7658a83a2 Merge remote-tracking branch 'origin/dev' into dev 2022-07-30 18:21:33 +08:00
Horror Proton
6cf5bf0e01 fix: remove a fake error in auto recruit task 2022-07-30 15:57:20 +08:00
MistEO
5565d5ad0a fix: 修复战斗中干员 cooling 状态偶现识别错误问题 2022-07-30 15:55:17 +08:00
zzyyyl
d134905e4f fix: 修复公招文本 出现错误 的本地化问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1379
2022-07-30 15:45:27 +08:00
uye
9fcedbab66 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-30 10:22:57 +08:00
uye
cf124965d7 feat: 添加连接设置提示 2022-07-30 10:20:05 +08:00
uye
a417152a6b feat: 更新作业群 2022-07-30 10:06:37 +08:00
Horror Proton
874e06ccb8 fix: fix wrong behavior when recruit permit ran out 2022-07-30 10:01:59 +08:00
lhhxxxxx
2f5bc53544 revert. add asst:: 2022-07-30 06:18:55 +08:00
lhhxxxxx
5658a630bd revert. add asst:: 2022-07-30 06:18:47 +08:00
lhhxxxxx
cc17d30e9f revert. add std:: 2022-07-30 06:18:25 +08:00
lhhxxxxx
35b91cd217 revert. delete [[nodiscard]] 2022-07-30 06:11:56 +08:00
lhhxxxxx
8a3c5c37da Merge remote-tracking branch 'origin/dev' into dev_
# Conflicts:
#	src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs
2022-07-30 05:33:11 +08:00
lhhxxxxx
af1c051522 perf. c++ code tidy 2022-07-30 05:31:19 +08:00
MistEO
5168abf0c8 perf: 优化肉鸽压轴登场摆放 2022-07-30 05:04:20 +08:00
MistEO
780e1487fe Merge branch 'dev' 2022-07-30 03:06:49 +08:00
MistEO
b91a3f1812 fix: 修复自选干员重装和术师不选的问题 2022-07-30 03:04:38 +08:00
MistEO
ccd7a34ceb Merge pull request #1372 from MaaAssistantArknights/dev
Release v4.2.0-alpha.2
2022-07-30 02:37:30 +08:00
MistEO
b6c0a7dc6f docs: 更新CHANGELOG 2022-07-30 02:36:47 +08:00
MistEO
147b87c187 fix: 修复界面检查更新错误 2022-07-30 02:36:12 +08:00
zzyyyl
79b26af92c feat: 优化更新时的 Changelog 弹窗样式 (#1373)
* feat: 优化贡献者名字显示

但是好丑

* feat: 换了个玛丽说好看的 Markdown
2022-07-30 02:31:14 +08:00
MistEO
09df3c902f feat: 肉鸽下干员等等费用,不急着下 2022-07-30 02:30:55 +08:00
MistEO
5d2935b005 feat: 肉鸽不在需求内的干员排个序(招精二也要优先招等级高的!) 2022-07-30 01:32:38 +08:00
MistEO
7ae266e245 perf: 调整肉鸽一些阈值参数等 2022-07-30 01:18:51 +08:00
MistEO
94a96f7abc fix: 修复肉鸽干员优先级排序错误 2022-07-30 01:18:36 +08:00
MistEO
519dd4b4e1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-30 00:34:06 +08:00
MistEO
b2cde7665a fix: 修复自定义干员不选的问题,修复临时招募的精二干员不选的问题 2022-07-30 00:33:59 +08:00
MistEO
88fc9ef6fb fix: 修复肉鸽第二次进入商店无法投资时,任务失败的问题 2022-07-30 00:23:37 +08:00
Horror Proton
ba23af1588 fix: fix post processing for recruit min level 2022-07-30 00:10:09 +08:00
lhhxxxxx
61a5d5ba7a Merge pull request #1370 from lhhxxxxx/dev
style. fix typo
2022-07-30 00:05:34 +08:00
lhhxxxxx
1c7ef396c2 perf. c# code tidy
style. typo fixed
2022-07-30 00:00:45 +08:00
MistEO
04e2723611 fix: 将肉鸽商店购买改成子串匹配即可,防止一些识别错误 2022-07-29 23:35:27 +08:00
lhhxxxxx
a39fec7c37 style. fix typo 2022-07-29 23:01:27 +08:00
MistEO
d91a5439dc style: 添加一个界面小提示 2022-07-29 22:59:56 +08:00
MistEO
56ac2ae2aa Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-29 22:40:31 +08:00
MistEO
c1f4e7f33e fix: 尝试修复肉鸽购买收藏品干员时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1364
2022-07-29 22:40:15 +08:00
MistEO
66a1a28d55 fix: 修复肉鸽收藏品购买时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1367
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1363
2022-07-29 22:23:28 +08:00
Helloworld
e03282772c docs: README 居中 2022-07-29 22:01:43 +08:00
Helloworld
c9bdde497e docs: 一些小细节 2022-07-29 22:00:29 +08:00
Helloworld
208200e112 docs: README ja-jp 2022-07-29 21:54:47 +08:00
Helloworld
b8e63a1223 styling: C# 代码格式化 (#1368)
* Add stylecop package

* Reset .editorconfig

* Suppress unnecessary rules

* Replace header

* Fix AsstProxy

* styling: 格式化剩余的文件

* 啊,不对,这才是组织名

* 修复格式
2022-07-29 21:35:35 +08:00
uye
f59f3d5b41 feat: 商店名单支持多种分隔符 2022-07-29 19:34:25 +08:00
uye
576cf6202c style: 修改部分英文描述 2022-07-29 18:20:37 +08:00
MistEO
5fc56281ba Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-29 17:15:35 +08:00
MistEO
89b1a37972 style: fix traslation. 2022-07-29 17:15:13 +08:00
uye
b671be11f4 feat: 更新肉鸽商品购买优先级顺序 2022-07-29 17:13:55 +08:00
MistEO
974933ba73 merge dev 2022-07-29 17:07:45 +08:00
MistEO
c49c61cd08 style: want a drunk? 2022-07-29 17:06:34 +08:00
uye
1ff174084d fix: 修复一个托盘语言设置界面的bug 2022-07-29 16:19:36 +08:00
MistEO
08d16ae05b perf: 优化肉鸽家门替换 2022-07-29 13:38:37 +08:00
uye
9d6079deff style: 稍微糊一下界面 2022-07-29 04:16:07 +08:00
MistEO
2e9ad73b95 fix: 修复肉鸽干员名不全匹配的问题 2022-07-29 02:12:06 +08:00
Liam Sho
94e79032dc chore: revert #1320 2022-07-29 01:46:51 +08:00
MistEO
3e6dbcfc9b Merge pull request #1359 from MaaAssistantArknights/dev
Release v4.2.0-alpha.1
2022-07-29 01:28:40 +08:00
MistEO
209f555a14 Merge pull request #1344 from MaaAssistantArknights/feat/custom_roguelike
feat: custom roguelike
2022-07-29 01:27:36 +08:00
MistEO
985abc7078 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-29 01:27:12 +08:00
MistEO
86ce47b468 docs: update changelog 2022-07-29 01:27:07 +08:00
MistEO
f028e3222b style: add a tip 2022-07-29 01:09:00 +08:00
MistEO
6918225a80 feat: 主页清空按钮也会清掉肉鸽的选择 2022-07-29 01:06:06 +08:00
MistEO
44c599e843 merge: merge dev 2022-07-29 01:05:50 +08:00
MistEO
9ec3b9bb60 feat: 修改界面,适配新肉鸽参数 2022-07-29 00:57:54 +08:00
Alisa
e03f2eed73 Merge pull request #1358 from MaaAssistantArknights/feat/release-simulation
[CI] Release Simulation workflow
2022-07-29 00:55:50 +08:00
MistEO
227a3d2af3 feat: 肉鸽商店支持按优先级购买 2022-07-29 00:37:27 +08:00
bakashigure
6c45b02132 chore: 修改NoAvx包名 2022-07-28 23:53:28 +08:00
Liam Sho
29a1b1fbc3 fix: 修复版本号丢失问题
笨逼操作又来了(
2022-07-28 23:26:05 +08:00
Liam Sho
e8982c78c1 chore: 更新 Workflow 2022-07-28 23:11:43 +08:00
Liam Sho
89381b7926 feat: 支持手动触发构建 Release 包 2022-07-28 23:10:21 +08:00
Helloworld
ece8ec7099 i18n: 修正错字 2022-07-28 22:25:28 +08:00
MistEO
4fa3e60150 perf: 优化肉鸽干员攻击范围计算、及一些部署逻辑等 2022-07-28 22:24:02 +08:00
Helloworld
d090a27275 不好意思忘了加链接了 2022-07-28 21:54:47 +08:00
MistEO
d9837786fb perf: 删除所有肉鸽中不好用的干员 2022-07-28 21:54:42 +08:00
Helloworld
65fa3a89c3 i18n: README zh-TW 2022-07-28 21:50:54 +08:00
Helloworld
3f17fa9027 i18n: 修改README文件后缀 2022-07-28 21:10:38 +08:00
Helloworld
311518a5bf i18n: 一些小修改 2022-07-28 20:52:46 +08:00
Helloworld
4cca3898ae Merge remote-tracking branch 'origin/dev' into dev 2022-07-28 20:47:32 +08:00
Helloworld
aa7502ec5a ko-kr localization (100%) 2022-07-28 20:46:45 +08:00
MistEO
61580ea1c5 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-28 20:36:37 +08:00
MistEO
c9eb0aeb1a fix: 修复会客室传递线索时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1307
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1175
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/768
2022-07-28 20:36:26 +08:00
MistEO
3cdead1ade Merge pull request #1327 from horror-proton/test/recruit_task
重构公招相关的部分代码
2022-07-28 19:03:22 +08:00
MistEO
c58026055d style: fix translation 2022-07-28 18:49:05 +08:00
ABA2396
4f4b36336a feat: 删除无用的模板图片 2022-07-28 18:01:58 +08:00
ABA2396
825aec81b5 feat: 删除不必要的滑动 2022-07-28 17:56:42 +08:00
ABA2396
60d7055eaf Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-28 17:49:36 +08:00
ABA2396
84130ca426 feat: 支持主线全章节导航 2022-07-28 17:41:29 +08:00
Alisa
d8c1414d98 Merge pull request #1345 from MaaAssistantArknights/fix/release-checksum
修改 Checksum 的计算方式
2022-07-28 17:30:07 +08:00
ABA2396
839b5234b5 fix: 修复一个牛牛引起的错误(x) 2022-07-28 16:57:27 +08:00
ABA2396
686836247d feat: Drink drink 2022-07-28 15:34:08 +08:00
uye
3d85a67a00 Update README.md 2022-07-28 12:08:15 +08:00
uye
a4f090d68d Update README-en.md 2022-07-28 12:06:48 +08:00
ABA2396
0bdec005f9 style: 肉鸽任务中的拼写错误 2022-07-28 11:45:36 +08:00
ABA2396
d77392365f style: Format XAML again 2022-07-28 11:14:57 +08:00
ABA2396
5d9f9ede24 style: Fromat XAML 2022-07-28 11:05:54 +08:00
ABA2396
5f7df65b0d style: 更改FightSettings控件布局 2022-07-28 10:55:13 +08:00
Liam Sho
12425d2977 fix: 统一 MD5 校验码大小写 2022-07-28 05:14:38 +08:00
Liam Sho
ba4a05b58a feat: 修改 Checksum 文件
fix: #1341
2022-07-28 04:41:24 +08:00
ABA2396
9250f6d2f4 style: GUISetting 2022-07-28 02:31:20 +08:00
ABA2396
0435c9a3da style: StartSetting 2022-07-28 02:08:41 +08:00
ABA2396
52506a76c3 style: ConnectSetting 2022-07-28 02:02:06 +08:00
ABA2396
d798a1f7b2 style: MallSetting 2022-07-28 01:48:54 +08:00
ABA2396
da7fce722b style: AutoRecruitSetting 2022-07-28 01:39:07 +08:00
ABA2396
938ab1308e style: RougleliekSetting (什么奇怪的拼写) 2022-07-28 01:14:27 +08:00
ABA2396
2a2666a35c style: FightSetting 2022-07-28 00:50:19 +08:00
MistEO
8d0b2b1e85 feat: 完成自定义核心干员选择 2022-07-28 00:37:20 +08:00
MistEO
562ede03bf feat: 添加战斗资源读取 2022-07-27 23:15:39 +08:00
Helloworld
012dc56989 Merge remote-tracking branch 'origin/dev' into dev 2022-07-27 23:01:06 +08:00
Helloworld
1ccbfb4622 ko-kr localization (70%) 2022-07-27 23:01:00 +08:00
MistEO
2602eda49c fix: 修复已修改的语言设置显示不正确的问题 2022-07-27 22:42:10 +08:00
MistEO
a018a63bf4 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 22:39:16 +08:00
MistEO
77cc6cfaec style: 牛牛喝酒 2022-07-27 22:39:10 +08:00
Helloworld
56d4b99ed9 ko-kr localization (60%) 2022-07-27 22:31:55 +08:00
Helloworld
358aa534f5 ko-kr localization (40%) 2022-07-27 21:51:52 +08:00
Helloworld
b04e72892f ko-kr localization (20%) 2022-07-27 21:04:16 +08:00
Liam Sho
c6b7ce97ba chore: 文件整理 2022-07-27 21:03:54 +08:00
Horror Proton
2b5c38b492 fix: add workaround for issues/1336 2022-07-27 20:58:11 +08:00
Horror Proton
74cef5eee7 perf: remove an unused task, etc. 2022-07-27 20:17:12 +08:00
ABA2396
1eb9d65931 style: 修改美服控件格式 2022-07-27 19:43:29 +08:00
ABA2396
2e8c63ae66 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 19:34:00 +08:00
ABA2396
38f11abcaf style: 尝试对齐各版本控件 2022-07-27 19:33:43 +08:00
MistEO
e28ad1744d style: KR, help us! 2022-07-27 19:01:07 +08:00
ABA2396
3a40890603 style: 修改部分翻译描述 2022-07-27 16:52:46 +08:00
ABA2396
ff1a81c3af feat: 添加台服翻譯 2022-07-27 16:17:33 +08:00
ABA2396
5306a54b8f style: 修复copilot界面显示不全的问题 2022-07-27 15:59:26 +08:00
Tastror
0c8d0944bb feat: add ja-jp translation (#1340)
* add ja-jp

* ja-jp debug
2022-07-27 15:40:46 +08:00
MistEO
13088751de Merge pull request #1339 from MistEO/dev-1
fix translation
2022-07-27 14:45:36 +08:00
MistEO
e0330f158f Merge branch 'dev' into dev-1 2022-07-27 14:34:58 +08:00
ABA2396
b2537d0f36 style: en-us 2022-07-27 14:32:56 +08:00
MistEO
befdd26422 style: fix translation 2022-07-27 14:32:02 +08:00
uye
dfc1fdf75f Merge pull request #1338 from cloakWatcher/dev
英文翻译
2022-07-27 14:30:20 +08:00
cloakWatcher
8207b337fa Merge branch 'dev' of https://github.com/cloakWatcher/MaaAssistantArknights into dev 2022-07-27 00:09:08 -06:00
cloakWatcher
8197cde605 添加英文翻译参考 2022-07-27 00:08:27 -06:00
ABA2396
f431303fec style: style了个我也看不懂的东西 2022-07-27 13:58:43 +08:00
ABA2396
4468432c3e fix: xml错误 2022-07-27 13:54:56 +08:00
ABA2396
202bd77b81 fix: 字段名错误 2022-07-27 13:48:02 +08:00
ABA2396
4c67f710ee Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 13:31:52 +08:00
ABA2396
e65308e23e feat: 韩语翻译(完全机翻) 2022-07-27 13:31:36 +08:00
MistEO
a5ee4cc447 docs: fix translation 2022-07-27 13:11:47 +08:00
MistEO
539dda5a7d Merge branch 'feature/doc-i18n' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 13:09:58 +08:00
MistEO
aef7160c54 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 11:26:12 +08:00
MistEO
a6f4bf4d1d style: Add KR and JP language supports, but not complete. And fix some translation 2022-07-27 11:25:54 +08:00
ABA2396
1d5451d3a6 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 11:21:09 +08:00
ABA2396
d497f69fee style: 修改一些描述 2022-07-27 11:21:02 +08:00
MistEO
47a2288c12 style: fix a translation 2022-07-27 11:14:16 +08:00
ABA2396
31661912d1 feat: 更改一些英文翻译 2022-07-27 11:13:47 +08:00
MistEO
f13c7b3f41 style: add space 2022-07-27 11:11:56 +08:00
MistEO
5f6da1991f Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 11:07:02 +08:00
MistEO
290a1ddd9e style: add some space 2022-07-27 11:06:39 +08:00
ABA2396
826e4e9eb1 fix: 修复一个拼写错误 2022-07-27 11:01:08 +08:00
Horror Proton
91c1eb9513 fix: update recruit retry mech 2022-07-27 10:33:35 +08:00
MistEO
56ddba33b6 feat: 新增战斗中的干员数据 2022-07-27 00:08:24 +08:00
MistEO
0807103c43 feat: 完成肉鸽分队自定义 2022-07-27 00:07:55 +08:00
MistEO
d43a2f74cf Merge branch 'master' into dev 2022-07-26 22:26:19 +08:00
MistEO
42862f7218 Merge pull request #1334 from MaaAssistantArknights/release/v4.1.2
chore: 更新复刻活动 `多索雷斯假日` 关卡资源
2022-07-26 22:25:46 +08:00
MistEO
f3a6ddf844 docs: 更新CHANGELOG 2022-07-26 22:25:11 +08:00
MistEO
fcde190373 fix: 再次修复掉落识别错误 2022-07-26 22:21:10 +08:00
MistEO
098726d145 fix: 简单修复一些击杀数识别错误的问题 2022-07-26 22:20:17 +08:00
Alex Zhang
de32d7e2da fix: fixed linux build errors 2022-07-26 21:39:30 +08:00
MistEO
239303b74c Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-26 21:30:32 +08:00
MistEO
a1e9525206 fix: fix build error on linux again 2022-07-26 21:30:24 +08:00
_ChingC
b4da616c8b Merge commit '3ff908f0d4407ee08d80bbb19ea844fe8fe8fe6c' into dev 2022-07-26 21:25:28 +08:00
_ChingC
26139bf776 fix: 修复一些i18n问题 2022-07-26 21:23:48 +08:00
MistEO
3ff908f0d4 fix: fix build error on Linux 2022-07-26 21:11:08 +08:00
_ChingC
5b3edb2b20 fix: 修复格式化字符串错误 2022-07-26 20:25:05 +08:00
MistEO
782f47f366 fix: 调整掉落识别模板匹配阈值为 0.61 2022-07-26 19:51:52 +08:00
ABA2396
598565902b feat: 增加「多索雷斯假日」复刻活动关卡导航 2022-07-26 16:53:25 +08:00
MistEO
55684e987f chore: 更新复刻活动 多索雷斯假日 关卡资源 2022-07-26 16:36:23 +08:00
ChingC
b63aac5765 Merge commit 'cb91ad4f7e1685b90401a847cff2258007de4fb9' into dev 2022-07-26 16:34:34 +08:00
ChingC
03ed2193ab feat: SettingView part translation completed 2022-07-26 16:34:22 +08:00
ABA2396
cb91ad4f7e feat: AutoRecruitSettings translation completed 2022-07-26 16:24:13 +08:00
ABA2396
41e12d9075 feat: AboutUserControl translation completed 2022-07-26 15:33:47 +08:00
ChingC
f615f66c11 Merge commit '47103efa246f69bf1acbd6fc212a2202e7ba2c1c' into dev 2022-07-26 15:03:58 +08:00
ChingC
3bf92330d6 feat: Complete the SettingView module enUS translation 2022-07-26 15:03:08 +08:00
ABA2396
47103efa24 feat: TrayIcon translation completed 2022-07-26 14:54:56 +08:00
ABA2396
2395ded07a Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-26 14:44:29 +08:00
ABA2396
12e691bfa9 feat: AsstProxy translation completed 2022-07-26 14:44:16 +08:00
ChingC
52b2ffdd40 feat: Complete the SettingView module translation 2022-07-26 14:38:30 +08:00
Horror Proton
830d2f3e3c fix: use member variable as recruit counter to allow retrying as AbstractTask 2022-07-26 14:02:21 +08:00
Horror Proton
1be6c4387c fix: make "RecruitTagsRefreshed" count from one 2022-07-26 11:58:26 +08:00
MistEO
289c2ff2e9 style: add some space 2022-07-26 10:38:34 +08:00
MistEO
855336ecb6 Merge pull request #1328 from AkarinVS/patch/stuck-at-reward-claiming
YoStarEN: fix stuck at reward claiming screen
2022-07-26 09:39:04 +08:00
Arkarin
ecae7833a2 fix stuck at reward claiming screen 2022-07-26 09:41:59 +09:00
Horror Proton
6434796522 fix: fix a json value, language tidy 2022-07-26 02:08:39 +08:00
MistEO
78a64efc5a feat: 新增支持部分肉鸽自定义字段(还没做完) 2022-07-26 01:07:10 +08:00
ABA2396
1e01fe5ee8 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-26 00:12:01 +08:00
ABA2396
275463bec5 feat: Complete the CopilotView module translation 2022-07-26 00:11:45 +08:00
ABA2396
94cfcf9cc9 feat: Complete the RecruitView module translation 2022-07-25 22:51:35 +08:00
MistEO
86ded093bc Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-25 22:47:05 +08:00
MistEO
d74faf0692 feat: support switching language in tray menu 2022-07-25 22:47:02 +08:00
ABA2396
07aa6372e6 feat: Hover prompts translation 2022-07-25 22:41:58 +08:00
Helloworld
874c27e0c5 docs: 填上UI对应内容 2022-07-25 22:27:06 +08:00
MistEO
84991f14bd fix: 处理 i18n 的一些特殊 case 2022-07-25 22:19:04 +08:00
MistEO
f66a69d727 feat: 根据用户系统语言设置默认语言,重构小部分代码 2022-07-25 22:11:26 +08:00
MistEO
1237a7caa7 feat: set default language to zh-cn 2022-07-25 21:52:52 +08:00
MistEO
51cb30cfd8 fix: 修复默认关卡不正确的问题 2022-07-25 21:40:32 +08:00
MistEO
bb07197823 feat: 默认关卡改为当前关卡/上次关卡自动识别 2022-07-25 21:38:36 +08:00
Horror Proton
8a2183e4c7 fix: fix calc_only_task 2022-07-25 21:27:16 +08:00
Horror Proton
55f44fe4ec doc: add some comments, etc 2022-07-25 21:27:16 +08:00
Horror Proton
64618e5ebb refactor: clean up, remove unused files 2022-07-25 21:27:16 +08:00
Horror Proton
6fbe265d3d refactor: clean up code 2022-07-25 21:27:16 +08:00
Horror Proton
30e1ba0f44 temp: bypass AutoRecruitTask::calc_and_recruit 2022-07-25 21:27:16 +08:00
Horror Proton
13e54e418a fix: fix recruit min max level 2022-07-25 21:27:06 +08:00
Horror Proton
4e1ce9d6e8 temp: bypass recruit calc only task 2022-07-25 21:27:06 +08:00
Horror Proton
97c10f5206 feat: add miscellaneous functions for recruit calc 2022-07-25 21:27:05 +08:00
ABA2396
6d1a45846a style: rename 2022-07-25 20:11:46 +08:00
ABA2396
6c72b07426 feat: Complete the translation of TaskQueue module except for dropped items 2022-07-25 19:56:54 +08:00
ABA2396
642b6b4deb style: stage renaming 2022-07-25 18:23:30 +08:00
ABA2396
d184491478 feat: stage translation 2022-07-25 18:02:40 +08:00
ABA2396
fbcb3e1b60 feat: Copilot module translation 2022-07-25 17:12:56 +08:00
ABA2396
aa6677df07 feat: RecruitViewModel Module translation 2022-07-25 16:41:31 +08:00
ABA2396
04dccc8ba9 feat: FightSettingsUserContral module translation 2022-07-25 16:00:13 +08:00
ABA2396
71a968d193 feat: TaskQueue module translation 2022-07-25 15:05:02 +08:00
zzyyyl
6ca5cf1a31 chore: 优化识别贡献者名字的正则表达式 2022-07-25 11:01:36 +08:00
yuanyan3060
656bf52c1e feat: 增加rust绑定和http服务器实现捏 (#1321)
* 增加maa-core的rust绑定

* Update Readme.md

* update Readme
2022-07-25 10:30:22 +08:00
MistEO
8f8b05ec32 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-25 00:48:41 +08:00
MistEO
f3543e8521 fix: 修复界面 l10n 的一点小问题 2022-07-25 00:48:33 +08:00
MistEO
148a54ab48 Merge pull request #1320 from zzyyyl/chore/addlink
chore: 使 CHANGELOG 里的贡献者名字自动带上链接
2022-07-25 00:41:43 +08:00
MistEO
8218e7fb4d revert: 回滚错误提交的文件 2022-07-25 00:41:20 +08:00
MistEO
c6b32629f4 fix: 修复 core get接口错误 2022-07-25 00:39:54 +08:00
MistEO
0c366d282c Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-25 00:28:27 +08:00
MistEO
89ff550c89 fix: 修复掉落识别错误,重写部分基线识别算法
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1318
2022-07-25 00:28:14 +08:00
_ChingC
c9bfa8beb1 feat: 添加多语言本地化
- TODO: 需要翻译
2022-07-25 00:03:57 +08:00
zzyyyl
a3990f35bb chore: 给自动带上贡献者链接加个小异常处理 2022-07-24 23:27:26 +08:00
zzyyyl
f31947d049 chore: 给自动带上贡献者链接修个小 bug 2022-07-24 23:15:37 +08:00
zzyyyl
19886d983e chore: 使 CHANGELOG 里的贡献者名字自动带上链接 2022-07-24 23:04:10 +08:00
MistEO
74ec0a43f7 fix: fix build error 2022-07-24 21:40:34 +08:00
MistEO
718a92d798 chore: remove useless macro 2022-07-24 21:30:49 +08:00
MistEO
c6db555f1c feat: core 新增 GetNullSize 接口 2022-07-24 21:29:53 +08:00
MistEO
e830564103 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-24 21:27:28 +08:00
MistEO
f639cc4d3a fix: core 的 get 接口失败时返回 -1 2022-07-24 21:27:23 +08:00
Helloworld
0b85cb8e9e docs. 添加干员术语表生成器 2022-07-24 20:29:08 +08:00
Helloworld
7f6ac1da93 docs. 干员术语表 2022-07-24 19:16:45 +08:00
Helloworld
337c3b7e87 Merge branch 'docs/glossary' into dev 2022-07-24 18:13:08 +08:00
Helloworld
d8ed63e940 docs. 物品术语表 2022-07-24 18:12:51 +08:00
MistEO
a0f65684c1 docs: 移除对中文目录的要求 2022-07-24 17:32:03 +08:00
MistEO
35c41b36fc Merge branch 'master' into dev 2022-07-24 17:31:28 +08:00
MistEO
5f6e7a13a7 feat: 将自动战斗选择作业改成实时更新的 2022-07-24 17:30:44 +08:00
MistEO
d90789bc33 docs: 移除对中文目录的要求 2022-07-24 17:30:11 +08:00
MistEO
ec0d5aa4fb feat: 将自动战斗选择作业改成实时更新的 2022-07-24 17:29:25 +08:00
Helloworld
bd188760af Merge pull request #1316 from MaaAssistantArknights/docs/glossary
添加术语表
2022-07-24 17:25:30 +08:00
Helloworld
f7e49af2fe Merge branch 'dev' into docs/glossary 2022-07-24 17:23:36 +08:00
Helloworld
a46c44d252 docs. 添加物品术语表 2022-07-24 17:23:31 +08:00
MistEO
7ffcc2ca54 Merge pull request #1315 from MaaAssistantArknights/dev
revert: 回滚误提交的 debug 任务相关内容
2022-07-24 17:16:13 +08:00
MistEO
ab0b704352 revert: 回滚误提交的 debug 任务相关内容 2022-07-24 17:15:51 +08:00
MistEO
7740f35f0a Merge pull request #1314 from MaaAssistantArknights/dev
Release v4.1.1
2022-07-24 17:10:28 +08:00
MistEO
ecf16c425d docs: 补充CHANGELOG 2022-07-24 17:08:58 +08:00
MistEO
79fda42106 docs: 更新外服支持相关文档 2022-07-24 17:08:03 +08:00
MistEO
543f25d42c docs: fix typo 2022-07-24 17:00:38 +08:00
MistEO
81378be27e docs: 更新CHANGELOG 2022-07-24 16:57:28 +08:00
MistEO
847270cd78 fix: 修复自动战斗在干员过多(14个及以上)时的崩溃问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1122
2022-07-24 16:51:24 +08:00
MistEO
fc3915a6ed fix: 修复肉鸽凌晨 4 点更新后不能回去接着打的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1260
2022-07-24 16:41:58 +08:00
MistEO
f36e1a7a78 fix: 修复自动战斗选择了删除编队时,编队出错的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1266
2022-07-24 16:37:42 +08:00
MistEO
d2190d6e24 fix: 修复肉鸽编队不能识别精二干员的问题 2022-07-24 16:27:07 +08:00
Helloworld
b4c0209e21 docs. 添加术语表 2022-07-24 16:24:27 +08:00
MistEO
ffededc589 feat: core 新增 GetUUID 和 GetTasksList 接口 2022-07-24 15:59:45 +08:00
Helloworld
707b1f3aa6 docs. 我尽力了,你随意 2022-07-24 15:48:08 +08:00
MistEO
10291bfa3d fix: 修复EN服肉鸽安全屋无法进入的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1302
2022-07-24 15:42:37 +08:00
MistEO
1fd69bb680 fix: 尝试修复肉鸽战斗画面识别错误的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1299
2022-07-24 15:18:47 +08:00
MistEO
4fdd38f4bd fix: 修复肉鸽领取关卡奖励时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1300
2022-07-24 15:05:41 +08:00
MistEO
8393a48f5e fix: 修复肉鸽战斗中掉线后,无法继续的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1303
2022-07-24 14:40:40 +08:00
MistEO
377bd50566 fix: 修复肉鸽重新编队时的排序问题 2022-07-24 04:44:45 +08:00
MistEO
37cbbfac75 fix: 修复肉鸽重新编队时确认按钮点不上的问题 2022-07-24 04:38:56 +08:00
zzyyyl
628af3ea85 docs: 修复需求建议 issue 模板不带 label 的问题 2022-07-23 18:42:51 +08:00
MistEO
1153e63814 fix: 修复掉落识别错误,调整阈值
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1295
2022-07-23 17:39:08 +08:00
MistEO
855706ce39 fix: 再次修复EN服肉鸽卡在招募界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1289
2022-07-23 17:02:33 +08:00
MistEO
a8bf1d970d fix: 再次修复主界面顺序问题导致的崩溃
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1292
2022-07-23 16:54:37 +08:00
MistEO
91c3bc8375 fix: 删除繁中服一些重复的模板图片 2022-07-23 11:47:08 +08:00
MistEO
ca57c495a4 Merge pull request #1276 from rockerhank/dev
Dev feat. 新增繁中服自動公招
2022-07-23 11:42:13 +08:00
MistEO
9c800d8bd1 fix: remove useless seg 2022-07-23 11:41:41 +08:00
MistEO
6cb8bf9bd8 fix: 修复界面调整字段顺序后的崩溃问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1292
2022-07-23 11:37:51 +08:00
MistEO
76052cd59f fix: 尝试修复 EN 肉鸽无法选人的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1289
2022-07-23 11:23:28 +08:00
MistEO
a31ff2429e Merge pull request #1288 from MaaAssistantArknights/dev
Release v4.1.0
2022-07-23 02:11:28 +08:00
MistEO
5389681ba3 fix: 修复CHANGELOG弹窗
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/968
2022-07-23 02:10:05 +08:00
MistEO
7b6de23cd6 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-23 01:32:23 +08:00
MistEO
c0773a3824 Merge branch 'master' into dev 2022-07-23 01:32:14 +08:00
MistEO
f900a8c2f2 docs: 更新CHANGELOG 2022-07-23 01:31:50 +08:00
MistEO
436725e954 Merge pull request #1278 from zzyyyl/feat/rogue_recruit
feat: 修复几个肉鸽干员等级错误,增加新干员的信息
2022-07-23 01:08:09 +08:00
MistEO
b0b11f4d2a style: 肉鸽不无限了x 2022-07-23 01:06:16 +08:00
MistEO
8cbd7f2c79 feat: 肉鸽模式支持设置开始次数、投资次数、投满停止 2022-07-23 01:05:18 +08:00
MistEO
dedd186a0f fix: 修复连接信息uuid为空的问题,并修复一个命名问题 2022-07-23 00:18:51 +08:00
zzyyyl
c4226c6a5e docs: 更新 issue 模板细节 2022-07-22 19:40:16 +08:00
zzyyyl
92e57dc197 style: 统一全角括号 2022-07-22 19:40:16 +08:00
zzyyyl
7f465fc6aa chore: 修改注释,优化代码 2022-07-22 19:18:06 +08:00
zzyyyl
472ed6fb1d chore: 删除一些冗余代码 2022-07-22 15:27:23 +08:00
zzyyyl
f4bfa619c8 chore: 把肉鸽招募数据的生成集成到 ResourceUpdater 里 2022-07-22 15:25:57 +08:00
MistEO
6e257d1870 docs: 再次更新 issue 模板小细节 2022-07-22 14:21:07 +08:00
MistEO
475cc3ab1b docs: 更新 Issue 模板 2022-07-22 14:13:18 +08:00
MistEO
9c4f50c966 docs: 更新 issue 模板 (#1281)
* docs: remove ori template of bug report

* docs: 更新 issue 模板

Thanks for https://github.com/LmeSzinc/AzurLaneAutoScript

* docs: 更新 issue 模板

* docs: 更新 issue 模板

* docs: rename

* docs: 更新 feature request 模板

Thanks for https://github.com/LmeSzinc/AzurLaneAutoScript

* docs: 更新 FQ 模板

* docs: fix typo
2022-07-22 13:52:46 +08:00
zzyyyl
f9e6840e7e feat: 修复几个肉鸽干员等级错误,增加新干员的信息 2022-07-22 12:05:28 +08:00
zzyyyl
d7471c0b1f chore: 优化肉鸽招募数据的生成 2022-07-22 12:04:54 +08:00
zzyyyl
3bd4d40e82 chore: 把生成肉鸽招募数据的乱七八糟的py文件先传一下 2022-07-22 12:04:54 +08:00
ABA2396
8b6e612f14 style: 玛丽的少女心(bushi 2022-07-22 12:00:51 +08:00
ABA2396
8007c61fc3 feat: 添加CopilotView鼠标悬停描述 2022-07-22 11:45:15 +08:00
ABA2396
72c5c05904 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-22 01:34:41 +08:00
ABA2396
8d84609096 feat: 添加鼠标悬停描述 2022-07-22 01:33:59 +08:00
rockerhank
7e981583ca feat: 新增繁中服自動公招功能
task內新增繁中服公招tags的OCR辨識字
2022-07-22 00:51:36 +08:00
rockerhank
24c2a53060 Merge branch 'MaaAssistantArknights:dev' into dev 2022-07-22 00:45:21 +08:00
rockerhank
370c727b12 feat. 繁中服自動公招和公招識別的圖片
新增繁中服自動公招和公招識別功能  這些為功能需求的圖片
2022-07-22 00:44:06 +08:00
rockerhank
5453476f0f create. 新增繁中服公招功能
task內增加繁中服的tags的OCR辨識
2022-07-22 00:33:00 +08:00
MistEO
042e35dceb Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-22 00:30:05 +08:00
MistEO
3c9dff260d docs: 更新文档及CHANGELOG 2022-07-22 00:30:02 +08:00
MistEO
0259b768eb Merge pull request #1275 from natt3/dev
feat: 更新日服刷理智的關卡選擇及自動公招
2022-07-22 00:25:16 +08:00
MistEO
feeb26d9b4 docs: zzzq 2022-07-22 00:22:58 +08:00
MistEO
c128cd8be1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-22 00:22:14 +08:00
MistEO
a2e3edbf18 docs: 更新CHANGELOG 2022-07-22 00:22:00 +08:00
MistEO
663612fb5b Merge pull request #1272 from horror-proton/test/roguelike_battle_task
简化肉鸽干员朝向评分等
2022-07-22 00:21:22 +08:00
natt3
8a5c16db6a Merge branch 'MaaAssistantArknights:dev' into dev 2022-07-22 00:19:29 +08:00
natt3
91e94bc968 feat: 更新日服刷理智的關卡選擇功能及自動公招功能 2022-07-22 00:18:37 +08:00
natt3
c437052772 feat: 更新日服刷理智的關卡選擇功能 2022-07-22 00:17:51 +08:00
natt3
11f2c4c60d fix: 修復日服訪問好友只訪問一次的錯誤 2022-07-22 00:16:24 +08:00
natt3
e9bef1bf51 feat: 更新日服自動公招功能 2022-07-22 00:15:23 +08:00
natt3
8da7549374 fix: 修復日服公招識別自動設置時間錯誤 2022-07-22 00:13:37 +08:00
MistEO
3a8183bf07 feat: 没练度的干员不选了 2022-07-22 00:12:55 +08:00
MistEO
e6bce9fb80 feat: 肉鸽支持从已选择关卡的界面继续任务,调整少部分图的替换家门 2022-07-21 23:59:11 +08:00
MistEO
2124d9022b feat: 肉鸽支持重新编队 2022-07-21 23:58:41 +08:00
MistEO
9ee81133f9 feat: 支持 en 服肉鸽全部关卡名替换 2022-07-21 22:38:07 +08:00
Horror Proton
94ea769238 fix: 简化和调整干员部署操作 2022-07-21 21:13:44 +08:00
Horror Proton
d22c592cd4 feat: 增加 asst::Point 的一些工具函数 2022-07-21 21:13:44 +08:00
Horror Proton
e162ddd4af perf: 简化肉鸽干员朝向评分 2022-07-21 21:13:44 +08:00
Horror Proton
2acd83c714 feat: add binary operators and argumented assignment operators for asst::Point 2022-07-21 21:13:44 +08:00
ABA2396
172db7fa17 doc: update README-en 2022-07-21 16:25:10 +08:00
ABA2396
794758c7f0 style: 修改鼠标悬停描述 2022-07-21 15:09:51 +08:00
ABA2396
ef753491be Merge pull request #1258 from lhhxxxxx/dev
feat. 添加鼠标悬停提示
2022-07-21 14:54:45 +08:00
ABA2396
772f5c8933 Merge pull request #1269 from LeoQ7/dev
fix: 修复关卡选择时间错误
2022-07-21 14:51:52 +08:00
Q7
1a10eeaa92 fix: 修复关卡选择时间错误
Signed-off-by: Q7 <q71998@gmail.com>
2022-07-21 00:25:25 -05:00
zzyyyl
aeb4c83054 fix: 修复B服因图片大小引起的登录错误
bilibili 你瞎改什么 ui
2022-07-21 11:56:41 +08:00
zzyyyl
1ff20bf31c fix: 修复B服卡在隐私协议条款确认界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1257
2022-07-21 11:56:41 +08:00
MistEO
b1caf8b68d docs: update docs about overseas 2022-07-21 11:22:15 +08:00
Qi Chu
d7ae2d552e feat: EN roguelike (#1242)
* Update tasks.json

* add screenshots

* add ^ $ to some operator names

* Add files via upload

* Add files via upload

* Add files via upload
2022-07-21 11:17:22 +08:00
lhhxxxxx
9040072b05 feat. 添加鼠标悬停提示 2022-07-21 03:17:27 +08:00
MistEO
c70cd90040 docs: 更新CHANGELOG 2022-07-21 00:13:05 +08:00
MistEO
21aa232b50 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-21 00:12:08 +08:00
MistEO
598b60c184 fix: 修复肉鸽一直朝右的问题,顺便优化一些代码
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1253

link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1215
2022-07-21 00:12:03 +08:00
ABA2396
66578e8d2b doc: 关闭作业一群加群链接入口 2022-07-20 23:33:33 +08:00
ABA2396
69486dd77c feat: 关闭作业一群加群链接入口 2022-07-20 23:30:27 +08:00
MistEO
b8810f1ef4 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-20 23:27:05 +08:00
MistEO
c2cd025585 docs: 更新CHANGELOG 2022-07-20 23:27:00 +08:00
MistEO
507f34be11 docs: 更新changelog 2022-07-20 23:26:28 +08:00
MistEO
aab6edc314 fix: 删除一个多余的肉鸽识别项
但并没有什么影响
2022-07-20 23:22:01 +08:00
MistEO
15c2b67663 Merge pull request #1256 from horror-proton/test/collect_credit
修复加载信用商店内容卡顿导致的收取信用失败
2022-07-20 23:17:13 +08:00
MistEO
b64b790238 chore: 整理 filter 2022-07-20 23:10:55 +08:00
Horror Proton
7899d89a15 fix: 修复加载信用商店内容卡顿导致的收取信用失败 2022-07-20 23:01:10 +08:00
ABA2396
132428a097 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-20 22:46:41 +08:00
ABA2396
fcf7b3dc0f fix: 修复某些单字替换问题 2022-07-20 22:46:10 +08:00
MistEO
012570916c fix: 修复偶现掉落识别错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1245
2022-07-20 21:42:17 +08:00
Horror Proton
31b2e54fea fix: remove a C++20 constexpr 2022-07-20 18:40:33 +08:00
zzyyyl
5d9821d979 perf: 注释掉一行没用到的代码,修正错别字 2022-07-20 18:15:47 +08:00
ABA2396
36cf3b9449 feat: 增加选择作业后的提示 2022-07-20 16:29:03 +08:00
ABA2396
bbdc106d00 feat: 调整 自动战斗 Beta 的小提示 2022-07-20 16:15:48 +08:00
MistEO
3e85aacdb5 refactor: 调整 TaskData::get 接口返回模板类型
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1243
2022-07-20 14:42:24 +08:00
zzyyyl
2da2533220 fix: 修复日服一些数字识别错误 2022-07-20 11:05:11 +08:00
MistEO
6a1022782e Merge pull request #1241 from zzyyyl/fix/rogue
fix: 修复日服肉鸽一些识别问题
2022-07-20 10:52:17 +08:00
zzyyyl
6201b0823b fix: 修复日服一些 OcrReplace 2022-07-20 10:18:38 +08:00
zzyyyl
9a94562c33 fix: 修复日服一些 OcrReplace 2022-07-20 10:18:38 +08:00
zzyyyl
da5fa2a882 style: Use spaces instead of tabs 2022-07-20 10:17:37 +08:00
MistEO
8387be47e8 fix: 修复一些数字识别错误 2022-07-20 10:11:06 +08:00
MistEO
32b8cfe6d3 fix: 再次修复肉鸽识别干员等级时的崩溃问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1237
2022-07-20 09:57:49 +08:00
ABA2396
c1362597fe fix: 风笛识别错误 2022-07-20 00:07:09 +08:00
MistEO
178f375fd1 docs: 更新CHANGELOG 2022-07-19 23:45:03 +08:00
MistEO
429402fd67 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-19 23:36:19 +08:00
MistEO
57124714a4 Merge branch 'master' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-19 23:36:12 +08:00
natt3
9c3daea477 feat: 更新日服無限刷肉鴿功能 (#1233)
* 更新日服無限刷肉鴿功能

* 更新日服無限刷肉鴿功能

* 更新日服無限刷肉鴿功能

* 更新日服無限刷肉鴿功能
2022-07-19 23:35:31 +08:00
MistEO
4eaaaac7e0 style: make resource formatted 2022-07-19 22:51:54 +08:00
zzyyyl
72edaf786c Revert "feat: 在不勾选吃理智药的情况下不能修改吃石头"
This reverts commit 1d92fd2174.
2022-07-19 21:59:30 +08:00
MistEO
2b9681ea06 sytle: 界面加个小提示 2022-07-19 21:35:38 +08:00
MistEO
320199e5de fix: 再次调整下肉鸽的一个roi 2022-07-19 19:03:55 +08:00
MistEO
ed2854249d fix: 修复一个肉鸽模板roi的问题 2022-07-19 19:01:27 +08:00
ABA2396
ce9dceee07 docs: update readme-en 2022-07-19 17:51:05 +08:00
MistEO
194becd854 Merge pull request #1230 from MaaAssistantArknights/dev
docs: 更新 changelog
2022-07-19 17:28:36 +08:00
MistEO
583c0c13d2 docs: 更新 changelog 2022-07-19 17:27:50 +08:00
MistEO
8edfee98a2 Merge pull request #1228 from MaaAssistantArknights/dev
Release v4.0.8
2022-07-19 17:15:30 +08:00
MistEO
fa03911181 Merge pull request #1229 from MaaAssistantArknights/master
fix merge error
2022-07-19 17:14:45 +08:00
MistEO
5faf195dce Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-19 17:12:01 +08:00
MistEO
f5e722688d chore: 更新 未尽篇章 关卡资源 2022-07-19 17:11:05 +08:00
MistEO
b6b13e292d Merge pull request #1205 from Tastror/master
为不保存至配置文件的选项添加*号
2022-07-19 17:08:13 +08:00
MistEO
f5a3bbe8d2 Merge pull request #1225 from zzyyyl/fix/trayicon
fix: 修复完成任务后的退出不会销毁托盘的问题
2022-07-19 17:06:33 +08:00
Horror Proton
6ca9a691be fix: a const qualifier in asst::Point 2022-07-19 13:48:46 +08:00
zzyyyl
a7f148e193 style: 统一 Application 格式 2022-07-19 13:47:42 +08:00
zzyyyl
1de6843820 feat: 出现异常时也执行 Shutdown 而不是强制停止 2022-07-19 13:47:14 +08:00
ABA2396
2124e8ee37 doc: 添加作业三群加群链接 2022-07-19 13:08:26 +08:00
zzyyyl
1c9ec167d9 fix: 修复完成任务后的退出不会销毁托盘的问题 2022-07-19 12:39:57 +08:00
MistEO
439a375ad0 Merge pull request #1215 from zzyyyl/fix/run
feat: 修复并优化部分肉鸽代码
2022-07-19 11:49:56 +08:00
zzyyyl
9ee471069e style: 代码规范! 2022-07-19 11:07:02 +08:00
MistEO
973130052a fix: 将公招的资源文件读取改为非增量更新 2022-07-19 10:56:17 +08:00
MistEO
0cf3261e1e fix: 修复日服公招 tag 识别错误问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1219
2022-07-19 10:52:37 +08:00
MistEO
a1fefddee7 fix: 修复肉鸽干员等级识别时的崩溃问题,添加一些日志
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1220
2022-07-19 10:51:36 +08:00
ABA2396
f690a39567 feat: 添加作业三群加群链接 2022-07-19 10:05:17 +08:00
ABA2396
663a864bbc fix: 部分干员识别问题 2022-07-19 09:55:58 +08:00
zzyyyl
0bfe3330eb feat: 将方向改为静态成员函数 2022-07-18 18:22:02 +08:00
zzyyyl
f78c05f36f style: 优化代码 2022-07-18 18:08:16 +08:00
ABA2396
cda54a3758 feat: 删除SideStory「绿野幻梦」活动导航入口 2022-07-18 17:40:45 +08:00
ABA2396
39522f1a51 style: 修改 界面设置 描述 2022-07-18 17:38:10 +08:00
ABA2396
4165b28c50 style: 修改 定时执行 描述 2022-07-18 17:24:46 +08:00
zzyyyl
973e3d2347 perf: 简化肉鸽干员基准方向的计算 2022-07-18 16:06:40 +08:00
zzyyyl
e1c9b28c8e perf: 小优化 2022-07-18 15:33:09 +08:00
zzyyyl
bb2e92146e fix: 修复肉鸽笔误 2022-07-18 14:07:11 +08:00
zzyyyl
9167316236 perf: 优化肉鸽部分代码 2022-07-18 14:06:25 +08:00
ABA2396
8184848c4e style: 修改作业分享群样式 2022-07-18 13:50:11 +08:00
ABA2396
b57e95e78d feat: 添加作业二群加群链接 2022-07-18 13:24:07 +08:00
zzyyyl
fcc9404669 style: 对齐! 2022-07-18 10:23:30 +08:00
zzyyyl
a410f88aa9 fix: 修复一个可能导致肉鸽 crash 的问题 2022-07-18 10:20:52 +08:00
MistEO
40c07ee4a7 Merge pull request #1164 from MaaAssistantArknights/dev
Release v4.0.7
2022-07-17 22:33:19 +08:00
MistEO
aeb3294b52 docs: 更新 CHANGELOG 2022-07-17 22:31:43 +08:00
MistEO
bcc68bc9d3 fix: 修复网络卡顿时,肉鸽进入战斗后关卡识别错误的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1063
2022-07-17 22:24:25 +08:00
MistEO
db698dba0b fix: 修复网络卡顿时偶现的信用商店任务失败
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1182
2022-07-17 21:47:22 +08:00
MistEO
2297164dc7 fix: 修复刷理智时时间消耗每次重新设置的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1192
2022-07-17 21:37:48 +08:00
MistEO
8483755866 fix: 进一步限制分辨率,严格要求 16:9
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1203
2022-07-17 21:34:42 +08:00
unknown
e36dd3b5bb update doc 2022-07-17 19:55:52 +08:00
MistEO
0a53a99ff6 fix: fixed some recognition bugs and add docs
thanks for @natt3
2022-07-17 19:50:56 +08:00
natt3
0d82709cb6 新增日服訪問好友及領取日常獎勵(重傳) (#1208)
* Add files via upload

* Add files via upload

新增訪問好友及領取日常獎勵

* 新增訪問好友及領取日常獎勵

* 新增日服訪問好友及收取日常獎勵

* 新增日服訪問好友及收取日常獎勵

* 新增日服訪問好友及收取日常獎勵

* 新增日服訪問好友及收取日常獎勵
2022-07-17 19:40:36 +08:00
unknown
ff522a0f89 *号添加 2022-07-17 19:09:51 +08:00
MistEO
89d1ed64f8 Merge pull request #1206 from MaaAssistantArknights/feature/doc-i18n
更新文档翻译
2022-07-17 19:05:08 +08:00
Helloworld
508f107315 docs. 翻译 模拟器支持 2022-07-17 19:03:30 +08:00
Helloworld
c42e36607b Merge branch 'master' into feature/doc-i18n 2022-07-17 19:00:06 +08:00
Helloworld
986f6a8ad2 docs. 更新 战斗流程协议、详细介绍 翻译 2022-07-17 17:30:44 +08:00
unknown
869b136351 为不保存至配置文件的选项添加*号 2022-07-17 17:27:08 +08:00
Helloworld
79756fe82b docs. 更新 肉鸽战斗流程协议 翻译 2022-07-17 17:25:54 +08:00
Helloworld
be8003cc46 docs. 更新 任务流程协议 翻译 2022-07-17 17:20:51 +08:00
Helloworld
7cfee6dd37 docs. 更新 模拟器支持 翻译 2022-07-17 17:13:58 +08:00
Helloworld
592a429b5b docs. 更新 集成文档 翻译 2022-07-17 17:04:54 +08:00
Helloworld
4b9c717de9 docs. 更新 回调消息协议 翻译 2022-07-17 16:47:49 +08:00
Helloworld
11d6efc86b docs. 更新 常见问题 翻译 2022-07-17 16:18:07 +08:00
ABA2396
deb5da550e fix: 部分干员识别问题 2022-07-16 22:17:09 +08:00
MistEO
41243c253d docs: 更新常见问题排版 2022-07-16 21:38:25 +08:00
ABA2396
fc4157bcfd feat: 删了个大概用不到的托盘功能) 2022-07-16 21:36:06 +08:00
ABA2396
a4bef1b7ca Merge pull request #1194 from BombaxCeiba/TrayIconImpl
任务栏图标支持 开始长草 和 全部停止
2022-07-16 21:23:18 +08:00
ABA2396
e80cd9711e Merge pull request #1196 from Well2333/dev
Update 常见问题.md
2022-07-16 21:20:59 +08:00
Well404
76bab54b9e Update 常见问题.md
对此issue中发现的环境配置方面的补充
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1189
2022-07-16 14:04:13 +08:00
Dusk_NM02
589291513b feat: 任务栏图标支持启动和停止任务 2022-07-16 10:38:44 +08:00
Dusk_NM02
1d751b1b42 refactor: 减轻了传错SetTrayIconInSettingsViewModel参数的后果 2022-07-16 10:35:58 +08:00
ABA2396
0fac2f26c1 fix: 部分干员识别问题 2022-07-15 23:40:20 +08:00
MistEO
db83dce4f7 Merge pull request #1170 from BombaxCeiba/HideTrayIconWhenExit
修复程序退出后任务栏图标残留的问题
2022-07-15 19:27:48 +08:00
MistEO
4c2b297437 fix: 整理了一下干员名字符替换 2022-07-15 15:18:48 +08:00
MistEO
3061fba755 fix: 尝试修复一些正则替换的问题 2022-07-15 11:37:45 +08:00
zzyyyl
40ad29ae59 fix: 修复部分情况下 驯兽小屋 关卡识别错误的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1176
2022-07-15 09:38:30 +08:00
MistEO
dcd606f6d6 Merge pull request #1157 from zzyyyl/feat/string_replace
perf: 优化字符串替换
2022-07-14 21:47:09 +08:00
MistEO
d4cc15a8c8 docs: 不推荐使用雷电模拟器
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1171
2022-07-14 17:21:19 +08:00
zzyyyl
ef0ac7f320 fix: 修复某些情况下公招识别错误的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1161
2022-07-14 15:37:48 +08:00
zzyyyl
3f83d5ee4c perf: 增加一些注释 2022-07-14 14:43:25 +08:00
Dusk_NM02
751dac7c5a feat: 在程序退出时注销任务栏图标 2022-07-14 14:31:06 +08:00
Dusk_NM02
a17b1542a2 perf: 取消了TrayIcon不必要的继承,添加了Close函数清理资源 2022-07-14 14:27:19 +08:00
zzyyyl
42b2eae07b feat: 给字符串替换增加支持一些 map 类型,尽管它们速度较慢
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1157#pullrequestreview-1038260917
2022-07-14 13:56:56 +08:00
zzyyyl
f3ed5aa6b7 perf: 使得不满足生存条件的代码无法通过编译,并且加快速度 2022-07-14 09:35:14 +08:00
MistEO
c3f9146422 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-14 01:29:52 +08:00
MistEO
453d5d234b chore: 修改下demo 2022-07-14 01:29:44 +08:00
Liam Sho
d47a747a28 fix: 修复 checksum.txt 未上传至 Release 的问题 2022-07-14 01:17:35 +08:00
MistEO
7f4e5223a4 Merge branch 'master' into dev 2022-07-14 00:49:38 +08:00
MistEO
42eeea4d5f docs: 更新CHANGELOG 2022-07-14 00:48:45 +08:00
MistEO
b8cdae5402 fix: 修复信用购物黑名单不填写时,不进行购物的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1042
2022-07-14 00:32:41 +08:00
MistEO
15606a9acf fix: 一定程度上修复卡在 今日配给 界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1140
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/974
2022-07-14 00:24:33 +08:00
MistEO
7fe8e5a49c feat: 新增支持肉鸽没选难度的时候自动选择普通难度
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1108
2022-07-13 23:58:10 +08:00
MistEO
1b0d16c7f0 feat: 新增支持肉鸽撤退干员后仍超时时,自动放弃当局战斗
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1134
2022-07-13 23:51:41 +08:00
MistEO
b9321d859b Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-13 23:27:35 +08:00
MistEO
969eaaeec1 fix: 修复基建 bskill_ctrl_lda 技能效率计算错误的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1143
2022-07-13 23:27:01 +08:00
Alisa
ccfed5ef14 Merge pull request #1079 from MaaAssistantArknights/perf/cicd
调整 CI 构建和 Release 发包配置
2022-07-13 22:56:09 +08:00
Liam Sho
21413e30c9 docs: 新增下载防呆提醒 2022-07-13 22:37:43 +08:00
Liam Sho
cace3094be chore: 移除无用的资源文件更新日志 2022-07-13 22:33:34 +08:00
Liam Sho
fc10639710 Merge branch 'dev' into perf/cicd 2022-07-13 22:24:44 +08:00
MistEO
f64381bc2a fix: 修复肉鸽放弃行动时卡住的问题 2022-07-13 21:59:21 +08:00
MistEO
930314267b fix: 修复一个roi错误的问题 2022-07-13 21:51:30 +08:00
MistEO
569958f9b0 fix: 修复任务完成后的休眠选项不可用问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1133
2022-07-13 21:45:55 +08:00
MistEO
3d85713072 perf: 优化一点界面逻辑 2022-07-13 21:42:19 +08:00
MistEO
2c34417b8d fix: 修复部分设备上点开设置界面的崩溃问题 2022-07-13 21:10:23 +08:00
MistEO
e38e8289af fix: 修复基建会上同效果干员的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1156
2022-07-13 19:23:08 +08:00
zzyyyl
1e836d87a3 perf: 优化字符串替换 2022-07-13 16:26:01 +08:00
MistEO
41ef4809f3 feat: 自动公招默认次数改为 4 次
不然总有人问为什么空一个
2022-07-13 11:23:59 +08:00
MistEO
8eac253f2b docs: fix 加群链接 2022-07-12 22:21:39 +08:00
MistEO
c4223e3abc docs: 更新群号 2022-07-12 22:20:16 +08:00
MistEO
a2131785b6 fix: 修复自动战斗编队直接报错的问题 2022-07-12 19:56:10 +08:00
MistEO
ac313cbd6c Merge pull request #1147 from MaaAssistantArknights/dev
Release v4.0.6
2022-07-12 18:21:47 +08:00
MistEO
89c15192cc docs: 更新changelog 2022-07-12 18:19:05 +08:00
MistEO
78c120212b chore: 更新 7/12 资源,绿野幻梦 EX 关卡等 2022-07-12 18:16:24 +08:00
Liam Sho
991c425601 chore: 移除不必要的枚举 2022-07-12 05:54:26 +08:00
Liam Sho
f55a32185c feat: 更新打包工具 2022-07-12 05:42:19 +08:00
Liam Sho
e557609dc3 Merge branch 'dev' into perf/cicd 2022-07-12 02:15:56 +08:00
Horror Proton
b688542b93 style: fix file mode 2022-07-12 00:40:05 +08:00
MistEO
a0c9c54220 chore: 删掉两个没用上的库 2022-07-12 00:31:48 +08:00
Liam Sho
b34d66a6a9 Merge branch 'dev' into perf/cicd 2022-07-11 23:40:01 +08:00
MistEO
a56cdcb30f Merge pull request #1132 from horror-proton/test/logger_template
在 log 函数的参数中支持 range-expression
2022-07-11 20:47:41 +08:00
MistEO
8d6ab22fa5 fix: 修复获取系统版本号的错误 2022-07-11 10:27:28 +08:00
Horror Proton
f441d2d6aa fix: update assertion message 2022-07-11 02:15:50 +08:00
Horror Proton
5a427767b9 feat: support range-expressions in log argument 2022-07-10 22:40:49 +08:00
Horror Proton
09a4f13a78 fix: add a left branch 2022-07-10 21:19:14 +08:00
MistEO
85ef8ea149 Merge pull request #1130 from horror-proton/test/logger_tweak
对 Logger 的一些修改
2022-07-10 14:09:14 +08:00
MistEO
e11b215949 perf: 优化分辨率获取方式
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1105
2022-07-10 14:02:18 +08:00
MistEO
6423465108 fix: 将额外的短程滑动改为向上滑,并重构小部分代码
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1129
2022-07-10 13:38:29 +08:00
Horror Proton
6ab3cd8548 fix. match arg types of printf 2022-07-10 13:32:33 +08:00
MistEO
11d9dd3fbf fix: 修复资源更新工具会让基建技能名重复的问题 2022-07-10 12:23:15 +08:00
Horror Proton
a0e6ea3bb8 fix: remove extra space in log, reopen stream after failure 2022-07-10 11:21:57 +08:00
Horror Proton
5827f9e8ae fix: fix typo 2022-07-10 10:57:24 +08:00
Horror Proton
d5fa39e22c fix: remove trailing space of line for log file 2022-07-10 10:29:49 +08:00
lhhxxxxx
d649366a3c Merge remote-tracking branch 'origin/dev' into dev 2022-07-10 00:01:57 +08:00
lhhxxxxx
7423092679 style. 微调了数个像素喵 2022-07-10 00:01:08 +08:00
ABA2396
78b4e635ef style: 对齐选框 2022-07-10 00:00:16 +08:00
ABA2396
f9d4f90eac style: 修改FightSettingsUserControl格式 2022-07-09 23:43:28 +08:00
lhhxxxxx
f4ece76cae Merge remote-tracking branch 'origin/dev' into dev 2022-07-09 23:19:39 +08:00
lhhxxxxx
39656babfb fixed. 漏改了 2022-07-09 23:19:01 +08:00
ABA2396
e457768e03 Merge pull request #1127 from lhhxxxxx/dev
[feat] 就连玛丽用了都会满意的清空与反选切换喵
2022-07-09 23:05:22 +08:00
lhhxxxxx
48fc9d82c6 feat. 设置中可切换样式喵 2022-07-09 22:48:30 +08:00
lhhxxxxx
7aef9841c9 perf. 删掉多余空格喵 2022-07-09 21:53:52 +08:00
lhhxxxxx
ec4655363c perf. 优化间隔喵 2022-07-09 21:46:56 +08:00
lhhxxxxx
0504df5655 feat. 就连玛丽用了都会满意的清空与反选切换喵 2022-07-09 20:37:11 +08:00
MistEO
5d4fc6c490 Merge pull request #1126 from lhhxxxxx/dev
[perf] 代码清理喵
2022-07-09 20:30:31 +08:00
lhhxxxxx
76b9e77e18 perf. 代码清理喵 2022-07-09 18:09:39 +08:00
MistEO
9e9770116c Merge pull request #1120 from MaaAssistantArknights/refactor/infrast
refactor: 重构基建配置文件,完成配置文件自动更新工具
2022-07-09 16:19:56 +08:00
MistEO
6340a92889 fix: 尝试修复一个奇怪的崩溃问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1119
2022-07-09 03:45:17 +08:00
MistEO
6d7736fb92 fix: 以一种简单粗暴的方法修复了一些掉落识别问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/883
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1118
2022-07-09 03:21:01 +08:00
MistEO
6e2b1bf205 Merge pull request #1114 from cglcv/dev
perf.简化启动模拟器的逻辑
2022-07-09 02:39:39 +08:00
MistEO
a06c2af788 chore: 完成基建数据自动更新工具,并适配新数据的解析 2022-07-09 02:37:35 +08:00
MistEO
66cd190dd8 chore: 整理了一下资源更新器 2022-07-08 23:21:21 +08:00
cglcv
a18cf8ddd1 perf.简化启动模拟器的逻辑 2022-07-08 21:29:29 +08:00
MistEO
ee3c6aee67 Merge pull request #1116 from MaaAssistantArknights/docs/copilot-repourl
docs: update copilot frontend repo url
2022-07-08 21:08:15 +08:00
GalvinGao
04d9ac4212 docs: update copilot frontend repo url 2022-07-08 21:07:27 +08:00
MistEO
71e7faeaa3 docs: update linux tutorial 2022-07-08 20:53:12 +08:00
MistEO
a5b4157b52 docs: fix typo 2022-07-08 20:34:13 +08:00
MistEO
f722aff2e5 docs: update readme en 2022-07-08 20:09:53 +08:00
MistEO
fbbb9d9b8a docs: zzzq 2022-07-08 09:55:15 +08:00
MistEO
8eb0556eb8 fix: 再次修复不结束线索交流的问题 2022-07-07 23:59:44 +08:00
MistEO
c5d4a426bd Merge branch 'dev' 2022-07-07 23:55:57 +08:00
MistEO
8a8cbe9054 fix: 修复基建会客室在线索交流后偶现的各种问题 2022-07-07 23:55:51 +08:00
MistEO
eaf11f68e2 Merge pull request #1109 from MaaAssistantArknights/dev
Release v4.0.5
2022-07-07 23:49:03 +08:00
MistEO
8c444248d4 fix: 为CHANGELOG解析的崩溃问题加一个兜底机制
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/968
2022-07-07 23:39:26 +08:00
MistEO
00692f1045 docs: 更新CHANGELOG 2022-07-07 23:25:43 +08:00
MistEO
3312d92d22 Merge pull request #1082 from MaaAssistantArknights/feat/global_client
feat: Supports ALL clients
2022-07-07 23:10:23 +08:00
MistEO
29f6971f6d docs: 更新文档关于外服支持的内容 2022-07-07 23:10:10 +08:00
MistEO
adcacca1dc feat: 支持繁中服的基本功能 2022-07-07 22:59:54 +08:00
MistEO
a5299caacc fix: 修复肉鸽关卡名识别错误
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1106
2022-07-07 22:44:39 +08:00
MistEO
c65af9b2fa chore: 日志里打印一下线程数 2022-07-07 00:24:11 +08:00
MistEO
0bd26d633c feat: 支持韩服刷理智功能 2022-07-07 00:08:21 +08:00
MistEO
93c007495c feat: 更新NoAVX包,调整外服资源文件目录结构 2022-07-06 23:13:16 +08:00
MistEO
2e677a14f7 Merge pull request #1098 from horror-proton/test/startup_tweak
降低因进入主界面时间太长 StartUp 提前退出的概率
2022-07-06 21:27:36 +08:00
zzyyyl
292cfe0485 fix: 修复登录超时的bug,更换模板图片
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1084
2022-07-06 15:29:07 +08:00
Horror Proton
528820b7bc fix: 降低因进入主界面时间太长 StartUp 提前退出的概率 2022-07-06 13:43:54 +08:00
MistEO
4e3e9e190f Merge pull request #1074 from lhhxxxxx/dev
一些textbox的修改范例
2022-07-06 11:12:35 +08:00
lhhxxxxx
4eaa9776ab Merge branch 'dev' into dev 2022-07-06 00:47:54 +08:00
MistEO
6355b9b077 Merge branch 'dev' 2022-07-06 00:36:58 +08:00
MistEO
f8818c3d50 fix: 修复活动关卡导航卡住的问题 2022-07-06 00:36:36 +08:00
MistEO
b389d9598c Merge pull request #1093 from MaaAssistantArknights/dev
Release v4.0.5-beta.1
2022-07-06 00:26:54 +08:00
MistEO
bb9024db94 Merge pull request #1089 from zzyyyl/feat/zzyyyl-patch-#471
feat: 优化`吃理智药`和`吃石头`的相关选项
2022-07-06 00:20:47 +08:00
MistEO
41ea19694d docs: 更新CHANGELOG 2022-07-06 00:19:51 +08:00
MistEO
b43424c9a5 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-06 00:15:01 +08:00
MistEO
4402014e7a feat: 重构基建名字过滤的逻辑,重新整理基建资源;新增支持多萝西组换班 2022-07-06 00:14:58 +08:00
MistEO
e854641f48 fix: 修复基建遇到不认识技能的干员时,不继续识别后续干员的问题 2022-07-05 22:22:30 +08:00
ABA2396
3353582842 feat: 尝试修复新活动导航问题 2022-07-05 22:17:41 +08:00
MistEO
5086c73688 chore: 更新更新脚本,将基建图标模板纳入管理 2022-07-05 22:06:39 +08:00
MistEO
1cc54c844f fix: 修复不输入而仅用鼠标选择材料时,材料名为null继而导致的crash
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1090
2022-07-05 21:19:12 +08:00
zzyyyl
5d2745686f feat: 取消勾选 吃理智药 就取消 吃石头 2022-07-05 19:18:31 +08:00
MistEO
7dbd3ab148 Merge pull request #1075 from MaaAssistantArknights/perf/ppocr_upgrade
perf: 更新飞桨引擎release/v2.5,模型v3版本
2022-07-05 19:14:41 +08:00
zzyyyl
1d92fd2174 feat: 在不勾选吃理智药的情况下不能修改吃石头 2022-07-05 18:56:27 +08:00
zzyyyl
e292261544 style: fix typos 2022-07-05 17:55:14 +08:00
zzyyyl
76755db794 fix: 修复复选框自动设置时间失效的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1070
2022-07-05 17:54:27 +08:00
MistEO
8c73c6090b Merge pull request #1085 from MaaAssistantArknights/dev
Release v4.0.4
2022-07-05 17:10:13 +08:00
MistEO
ec366ee9a8 fix: 修复一个潜在的崩溃问题 2022-07-05 17:08:23 +08:00
MistEO
a2d2f79854 chore: 更新绿野幻梦活动关卡导航 2022-07-05 17:08:12 +08:00
MistEO
0d1279ca21 chore: 更新地图数据、关卡数据、 2022-07-05 16:45:29 +08:00
MistEO
d6230f103d docs: 更新changelog 2022-07-05 12:20:58 +08:00
MistEO
21bcfe0b79 chore: 更新了更新资源的脚本( 2022-07-05 12:16:15 +08:00
MistEO
41f71617b2 docs: 改下文档 2022-07-05 11:05:56 +08:00
MistEO
1feb56c061 Merge branch 'master' into dev 2022-07-05 11:01:55 +08:00
MistEO
4de09dd67a feat: Suppots ALL client like EN, JP, KR, ZH_TW, Suppots basic function of JP client 2022-07-05 01:12:59 +08:00
Liam Sho
550ba0a7ed refactor: 重构 MaaBuilder 2022-07-04 17:35:45 +08:00
ABA2396
d00639c2a8 doc: 更新预览图 2022-07-04 16:07:34 +08:00
ABA2396
df3c4f86fc feat: 预更新 SideStory「绿野幻梦」活动导航 2022-07-04 15:36:53 +08:00
MistEO
4e255bfd4d perf: 更新飞桨引擎,优化CPU线程数 2022-07-04 01:00:49 +08:00
MistEO
afed50eeec perf: 更新飞桨引擎release/v2.5,模型v3版本 2022-07-04 00:28:37 +08:00
lhhxxxxx
9749a50afd .perf some sample 2022-07-03 23:42:52 +08:00
MistEO
962cfa3f25 docs: 更新文档群号及关联项目部分的排版 2022-07-03 13:40:45 +08:00
MistEO
00461e5ded docs: 更新群号 2022-07-03 13:07:25 +08:00
MistEO
eafac1438c docs: 添加亿点空格 2022-07-02 20:31:06 +08:00
MistEO
fab26987c1 Merge pull request #1060 from lhhxxxxx/dev
[New Feature] 现在Copilot界面支持拖拽文件至面板中任意位置
2022-07-02 16:35:49 +08:00
lhhxxxxx
41012e44a2 feat. now you can drop a file everywhere in the panel 2022-07-02 16:19:12 +08:00
MistEO
539f249f86 Merge pull request #1058 from MaaAssistantArknights/dev
Release v4.0.3
2022-07-02 13:32:55 +08:00
MistEO
9710f741b5 docs: 更新CHANGELOG 2022-07-02 13:26:52 +08:00
MistEO
09b23e52a0 chore: 再调整下界面关卡提示的顺序 2022-07-02 13:21:43 +08:00
MistEO
86e3d5b5fd fix: 修复一个日志打印 2022-07-02 12:20:38 +08:00
MistEO
40b9699cf0 chore: 调整一下界面关卡选项顺序 2022-07-02 11:26:01 +08:00
MistEO
6f55262500 feat: 支持选择关卡列表隔日自动刷新 2022-07-02 11:21:45 +08:00
ABA2396
e8acfd43f3 feat: 支持所有种类芯片导航 2022-07-02 10:53:04 +08:00
MistEO
3121543cb0 fix: fix a build warning 2022-07-02 02:20:37 +08:00
MistEO
194f5bbddd feat: 界面新增支持隐藏当日不开放关卡功能,默认开启 2022-07-02 01:56:40 +08:00
MistEO
fee03bf502 fix: 修复跨天后“每日关卡小提示”不刷新的问题 2022-07-02 00:48:49 +08:00
MistEO
89dddac756 fix: 尝试修复肉鸽超时后无法撤退干员的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/994
2022-07-02 00:27:43 +08:00
MistEO
c20d35dfc5 fix: 修复一些肉鸽部署朝向的问题 2022-07-02 00:19:29 +08:00
MistEO
389113f516 fix: 修复基建干员长得太像被当成同一个人,从而被忽略掉的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1033
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/454
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/384
2022-07-01 23:21:37 +08:00
MistEO
47390861e7 fix: 修复肉鸽结束后点的太快卡在干员招募界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1044
2022-07-01 22:49:15 +08:00
MistEO
a92dbe5c98 perf: 优化连接断开时的重连逻辑 2022-07-01 22:42:57 +08:00
ABA2396
0531f93bed feat: 新增医疗/重装/术士/狙击芯片导航
先锋/辅助/近卫/特种芯片关卡图片需要在开启后截图替换
2022-07-01 16:29:26 +08:00
ABA2396
bbecc9e370 fix: fix typo 2022-07-01 00:36:28 +08:00
ABA2396
bf659e1351 fix:终端界面没有肉鸽入口时进入肉鸽模式失败 2022-07-01 00:09:36 +08:00
MistEO
0f08b5be09 perf: 优化了一个看不懂的逻辑 2022-06-30 00:43:05 +08:00
MistEO
a0fd7283a8 docs: fix typo again 2022-06-30 00:30:53 +08:00
MistEO
e73f0c62d6 Merge pull request #1034 from MaaAssistantArknights/dev
Release v4.0.2
2022-06-30 00:29:26 +08:00
MistEO
bd87da2b35 docs: fix typo 2022-06-30 00:29:02 +08:00
MistEO
83ae55d002 docs: 更新CHANGELOG 2022-06-30 00:24:08 +08:00
MistEO
113be93921 feat: 支持运行期修改关卡导航(刷理智任务未开始之前) 2022-06-30 00:18:17 +08:00
MistEO
05f5abadde perf: 优化了模拟器连接断开后的重连逻辑
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1029
2022-06-30 00:01:45 +08:00
MistEO
64b0cbc7a5 fix: 简单修复一个 的识别错误问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1013
2022-06-29 23:22:44 +08:00
MistEO
ebf1ed0611 fix: 简单修复一下肉鸽干员部署后不设置方向的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/971
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1023
2022-06-29 23:13:51 +08:00
MistEO
5fe7fc20b7 fix: 临时修复肉鸽中干员召唤物部署错误的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1025
2022-06-29 23:12:02 +08:00
MistEO
d42d72b7ba fix: 修复肉鸽开始后又自动退出的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1031
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1027
2022-06-29 23:09:31 +08:00
MistEO
085149a175 feat: 删除通知设置,并添加了一个禁止通知的选项 2022-06-29 23:00:45 +08:00
MistEO
705cd05b2e fix: 修复右键点托盘也会打开界面的问题 2022-06-29 22:37:03 +08:00
MistEO
24097480f2 feat: 保存除关机和休眠外的其他完成后选项
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1001
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/989
2022-06-29 22:26:52 +08:00
MistEO
dc8d8e89e4 fix: 修复托盘设置不保存的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1001
2022-06-29 22:04:49 +08:00
MistEO
2e960ce4ee fix: 修复部分情况下槐琥效率计算的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1005
2022-06-29 22:01:52 +08:00
MistEO
24dd7b3472 Merge pull request #999 from zzyyyl/fix/recruit
fix: 修复公招错误
2022-06-27 19:27:55 +08:00
MistEO
9bac645562 chore: 更新meojson库,重构部分json的调用方式
优雅!实在是太优雅了!
2022-06-27 18:16:18 +08:00
MistEO
93d3216a4f chore: 修复一些项目配置的问题 2022-06-27 16:10:14 +08:00
zzyyyl
d8f5fdce15 fix: 修复公招错误
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/995
2022-06-27 16:07:11 +08:00
MistEO
6b00fe14ad Merge pull request #988 from GalvinGao/dev
feat: add multiple timers support (up to 8)
2022-06-26 23:37:38 +08:00
GalvinGao
a832acdd32 feat: timer UI improvement 2022-06-26 23:22:38 +08:00
GalvinGao
2d5f769b8e feat: add multiple timers support (up to 8) 2022-06-26 22:05:05 +08:00
MistEO
1b95d091e8 Merge pull request #980 from MaaAssistantArknights/dev
Release v4.0.1
2022-06-26 21:38:06 +08:00
MistEO
47206ebb3a docs: 更新文档 2022-06-26 21:28:55 +08:00
MistEO
b4e6a15f34 chore: 调整了更新记录界面的缩放条 2022-06-26 21:28:48 +08:00
MistEO
194e861f66 chore: 不再支持非 16:9 分辨率 2022-06-26 20:14:57 +08:00
MistEO
8d0a6c171e perf: 简单优化肉鸽一些站位 2022-06-26 20:01:33 +08:00
MistEO
7a8ddc9742 fix: 修复第一次使用时,企鹅id不断变化的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/501
2022-06-26 19:01:02 +08:00
MistEO
21738805e8 fix: 修复adb地址修改后不会重连的问题,并添加了一些GUI->core的日志打印
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/969
2022-06-26 18:56:52 +08:00
MistEO
0676d07990 fix: 修复肉鸽拾取战利品时卡住的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/977
2022-06-26 18:41:29 +08:00
MistEO
ea28f54007 fix: 简单修复一个肉鸽解锁藏品后卡住的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/979
2022-06-26 18:37:20 +08:00
MistEO
fe5caf3b68 perf: 以一种更合理的方式完成CloseDown任务
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/984
2022-06-26 18:26:08 +08:00
MistEO
dc428884de feat: 将托盘设置改为实时生效,并修复一些小问题 2022-06-26 18:14:36 +08:00
MistEO
fa5c61028b chore: 自动公招界面提示的一些小改动
没有识别机制,RecruitSlotCompleted 并不可靠
2022-06-26 18:14:36 +08:00
MistEO
658bc3e6b5 Merge pull request #984 from AkagiYui/dev
feat: 增加了任务完成关闭游戏的功能
2022-06-26 18:11:05 +08:00
DESKTOP-9PHO9TI\kenko
57f1af7b5d fix: 修复过程中无法删除'退出游戏'任务的问题 2022-06-26 13:28:35 +08:00
DESKTOP-9PHO9TI\kenko
7efe0da642 add: 增加了任务完成关闭游戏的功能 2022-06-26 00:36:49 +08:00
MistEO
f005578345 Merge pull request #976 from cglcv/dev-tray-winform
feat.托盘
2022-06-25 17:08:43 +08:00
MistEO
a11970b9cf fix: 修复一个设置界面布局的小问题 2022-06-25 17:07:17 +08:00
MistEO
cbed00b581 fix: 修复公招识别及自动战斗不开始的问题 2022-06-25 17:04:18 +08:00
cglcv
9ab225a9a8 fix.删除不该存在的注释 2022-06-25 13:55:54 +08:00
MistEO
bc62fd10e4 refactor: 整理任务完成后的动作,修改为枚举 2022-06-25 02:19:34 +08:00
MistEO
6fb0e44422 chore: 暂时移除肉鸽职业与部署位不对应的干员
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/963
2022-06-25 01:51:50 +08:00
MistEO
87a6b533a8 chore: 更新第十章磨难关卡地图数据 2022-06-25 01:44:24 +08:00
MistEO
c04f3c57cf fix: 修复没有公招券时的崩溃问题;整理公招回调逻辑 2022-06-25 01:43:06 +08:00
cglcv
a517e1d90b feat.托盘 2022-06-24 21:46:30 +08:00
MistEO
cc8f559a29 docs: 更新文档格式 2022-06-24 17:09:16 +08:00
MistEO
26e2264401 Merge pull request #951 from zzyyyl/fix/recruit
fix. 修改公招流程
2022-06-24 08:44:51 +08:00
MistEO
1a6dc9be67 feat: 任务新增支持 enable 字段,可用于占位 2022-06-23 23:52:07 +08:00
MistEO
92b8443e66 feat: 支持运行中修改刷理智设置 2022-06-23 23:32:23 +08:00
zzyyyl
0558da2302 style: 加个注释 2022-06-23 23:09:41 +08:00
zzyyyl
e8b275c965 style: 改个变量名以便理解 2022-06-23 23:04:32 +08:00
zzyyyl
22bcf4e91d fix: 修一下 warning 2022-06-23 22:59:06 +08:00
zzyyyl
978fb6c444 feat: 公招重试次数达到上限时报错并返回 2022-06-23 22:50:24 +08:00
MistEO
3bdb5d0c11 feat: 把界面上的反选按钮改成了清空 2022-06-23 22:47:32 +08:00
MistEO
a3bb62856f Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-23 22:43:38 +08:00
MistEO
f79c567a86 fix: 简单修复一下任务被重复添加的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/943
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/960
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/967
2022-06-23 22:43:30 +08:00
zzyyyl
5765c0466b feat: 给公招每一个槽位设置重试上限 2022-06-23 22:40:30 +08:00
MistEO
7276a71200 Merge pull request #882 from MaaAssistantArknights/feat/depot
feat: 仓库识别
2022-06-23 22:37:49 +08:00
MistEO
0b9cf9f3ab merge: merge dev and resolve conflicts 2022-06-23 22:37:27 +08:00
MistEO
7d787fcd5d perf: 减少载入作业时的文件读写频率 2022-06-23 22:33:24 +08:00
MistEO
bede184f94 fix: 修复作业文件读取失败的问题,并优化掉不必要的读取逻辑 2022-06-23 22:27:56 +08:00
MistEO
4149286ba0 refactor: 重写导入作业功能 2022-06-23 22:06:31 +08:00
Shawnsdaddy
bbe5a9a0d8 feat. 增加用户指南和网站链接 2022-06-23 01:26:45 -07:00
Shawnsdaddy
628b464143 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-23 01:03:28 -07:00
Shawnsdaddy
54e33b5c6f feat. 增加从copilot服务器端拿作业 2022-06-23 01:00:04 -07:00
ABA2396
ac36a45020 feat:移除「尘影余音」活动导航入口 2022-06-23 11:20:23 +08:00
MistEO
72ea71f705 feat: 新增回调 AllTaskCompleted 回调消息 runned_tasks 字段,并修复公招计算、自动战斗完成后也会触发完成后动作的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/955
2022-06-23 02:27:59 +08:00
MistEO
8276c12b7d fix: 手动停止时,不再触发 AllTasksCompleted 回调消息
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/956
2022-06-23 01:59:38 +08:00
zzyyyl
b917404f5b chore: 稍微详细地写一下公招相关的 callback 2022-06-22 18:23:10 +08:00
MistEO
4a9dcf1ca1 Merge branch 'dev' into feat/depot 2022-06-22 00:40:16 +08:00
MistEO
7113dfce6b fix: 修复一个笔误导致的编译错误 2022-06-22 00:39:59 +08:00
MistEO
34054723f0 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into feat/depot 2022-06-22 00:32:13 +08:00
MistEO
315df123fc feat: 完成仓库识别 2022-06-22 00:29:15 +08:00
MistEO
d9fb8fa6bc fix: 修复仓库识别结果中材料位置错误的问题 2022-06-21 23:53:44 +08:00
MistEO
82a6e7e6cc fix: 修复仓库识别的一些小bug, 进整理了一下任务相关代码 2022-06-21 23:44:07 +08:00
zzyyyl
4383d6218c style: for -> while 2022-06-21 23:06:57 +08:00
zzyyyl
0dcb030128 feat: 让日志行内没有影响功能的代码,并对刷新次数上限检测做一个小改进 2022-06-21 23:01:53 +08:00
MistEO
2dcdc48caa chore: 移动arkplanner的默认模板到配置文件中,并简单修改了一下输出json格式 2022-06-21 22:50:00 +08:00
zzyyyl
ff8b10bebf feat: 公招刷新时显示刷新次数,并使刷新次数不超过3 2022-06-21 22:01:48 +08:00
zzyyyl
3710aac4aa perf: 删除冗余任务 2022-06-21 21:46:53 +08:00
zzyyyl
1166cba066 fix: 修改公招流程 2022-06-21 21:46:44 +08:00
lhhxxxxx
5447c31e6e feat: dlx工具函数 (#941)
* add func template

* completed?

* use optional

* refactor constructor

* readability optimization

* rename

* rename

* add link

* use size_t

* add explanatory notes

* add notes

* use template

* little refactor

* remove extra space
2022-06-21 21:43:21 +08:00
MistEO
77238249eb Merge pull request #935 from horror-proton/test/tidy
Code tidy
2022-06-21 21:42:54 +08:00
cglcv
d9cae4a473 feat: 修改linkstart逻辑,增加第一次连接失败时尝试重启模拟器 (#947) 2022-06-21 21:40:32 +08:00
MistEO
228734f8b0 fix: 为肉鸽开不出技能添加一个兜底策略,避免一直卡着 2022-06-20 23:58:47 +08:00
MistEO
c59ad348cc Merge pull request #932 from cglcv/dev
暂时屏蔽待机模式
2022-06-20 21:51:46 +08:00
ABA2396
7bf4ac858d feat:增加任务完成后执行内容描述 2022-06-20 20:23:32 +08:00
MistEO
f417c06eab fix: 修复自动抄作业坐标图片保存错误的问题 2022-06-20 15:57:12 +08:00
Horror Proton
7a282028e8 Replace recursive call in AutoRecruitTask with loop. 2022-06-20 14:45:48 +08:00
Horror Proton
2f797b2b28 Add log items in AutoRecruitTask 2022-06-20 14:38:37 +08:00
Horror Proton
a78c21f2ec Fix typo 2022-06-20 08:59:59 +08:00
MistEO
e99a3c27a0 docs: 更新 issue 模板笔误 2022-06-20 00:13:02 +08:00
MistEO
01b689ea37 Merge pull request #928 from MaaAssistantArknights/dev
Release v4.0.0
2022-06-19 23:03:22 +08:00
MistEO
b8e3eb9c1c fix: 修复一个肉鸽关卡名识别错误
fix #931
2022-06-19 23:02:21 +08:00
cglcv
bc5b39dd27 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-19 23:01:25 +08:00
Horror Proton
b0abcc1bdb Add a FIXME 2022-06-19 23:00:45 +08:00
Horror Proton
cfda9278a6 Improve style and tidiness, simplify nested namespace 2022-06-19 23:00:40 +08:00
cglcv
d55f8a25a5 屏蔽待机功能 2022-06-19 22:56:48 +08:00
Horror Proton
a28220fe08 Remove redundant if, fix some compile errors on linux platform (uncompleted) 2022-06-19 22:52:46 +08:00
MistEO
10522582ab style: 所有代码格式化 2022-06-19 21:24:07 +08:00
MistEO
311f2b7d62 style: 傻逼VS怎么总是乱格式化 2022-06-19 21:08:21 +08:00
MistEO
1572c2c55b docs: update changelog 2022-06-19 20:44:23 +08:00
MistEO
6f6efc04d2 Merge pull request #921 from MaaAssistantArknights/feat/rg_copilot
perf: 优化肉鸽评分表算法及专家系统
2022-06-19 20:41:44 +08:00
MistEO
caa5b53aa5 Merge pull request #918 from zhangweijian97/dev
feat.适配美服访问好友
2022-06-19 20:41:33 +08:00
MistEO
e8e8e58781 Merge pull request #926 from cglcv/dev
修改自动关机UI,新增关闭程序及关闭模拟器
2022-06-19 20:41:22 +08:00
MistEO
998705bd88 perf: 优化肉鸽评分表的值,新增几个地图的家门替换,修复一些小问题 2022-06-19 19:19:01 +08:00
cglcv
5f95193551 Merge pull request #7 from cglcv/dev-taskqueueshow
完成关闭模拟器功能
2022-06-19 13:09:31 +08:00
cglcv
f3c68789c4 完成关闭模拟器功能 2022-06-19 13:04:01 +08:00
cglcv
7df60e562f Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-19 10:13:17 +08:00
cglcv
896ea5c17b Merge pull request #6 from cglcv/dev-taskqueueshow
关闭程序先推过来
2022-06-19 10:13:01 +08:00
cglcv
0ccbdbff97 减少修改 2022-06-19 10:12:03 +08:00
cglcv
2f62a513a4 优化 2022-06-19 10:08:36 +08:00
cglcv
fb0959662e 关闭程序 2022-06-19 09:26:51 +08:00
MistEO
c6647b2748 fix: 修复版本号解析错误
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/901
2022-06-19 00:37:34 +08:00
MistEO
24f8a6000d docs: update changelog 2022-06-18 23:24:13 +08:00
MistEO
3a6176b452 Merge branch 'dev' into feat/rg_copilot 2022-06-18 23:21:07 +08:00
MistEO
21ecbc7f06 feat: 支持一些深入调查模式,支持一些图的 copilot 2022-06-18 23:18:09 +08:00
MistEO
d4e1a32199 feat: 完成肉鸽 copilot 2022-06-18 22:58:46 +08:00
MistEO
68c75b087a chore: remove useless files 2022-06-18 22:02:15 +08:00
MistEO
1c5d044672 docs: update translation 2022-06-18 21:35:23 +08:00
MistEO
75f1b8eef3 docs: update translation 2022-06-18 21:33:47 +08:00
MistEO
23181966ce perf: 优化肉鸽评分表算法 2022-06-18 19:04:46 +08:00
zhangweijian97
4a5836f3d3 fix.参数名更正 2022-06-18 18:30:58 +08:00
zhangweijian97
8a8074a24f Merge branch 'dev' of https://github.com/zhangweijian97/MaaAssistantArknights into dev 2022-06-18 18:26:31 +08:00
zhangweijian97
4553386ef7 Merge branch 'master' of https://github.com/zhangweijian97/MaaAssistantArknights into dev 2022-06-18 18:26:25 +08:00
Zhang Weijian
16d285b142 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-18 18:21:02 +08:00
zhangweijian97
4ccc83f84c feat.适配美服领取任务奖励(已测试)& fix.修复领取奖励任务死循环的问题 2022-06-18 18:20:35 +08:00
MistEO
f97bb1119f Merge branch 'docs/FAQ' 2022-06-18 17:47:58 +08:00
MistEO
b5dfdf3fbe docs: fix grammar 2022-06-18 17:46:41 +08:00
MistEO
9113774a9c Merge pull request #919 from MaaAssistantArknights/dev
Release v3.9.9
2022-06-18 17:18:19 +08:00
zhangweijian97
a5c10fd5cc Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-18 17:15:28 +08:00
MistEO
6d19f9319a Merge branch 'docs/FAQ' into dev 2022-06-18 17:14:51 +08:00
MistEO
da34fb145c docs: 更新CHANGELOG 2022-06-18 17:14:01 +08:00
zhangweijian97
61ee3c3391 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-18 17:11:34 +08:00
zhangweijian97
46ac88f626 feat.适配美服访问好友 2022-06-18 17:11:28 +08:00
zhangweijian97
47476ad332 Revert "fix.刚才忘记add图片了"
This reverts commit 66bf7b47a3.
2022-06-18 17:10:19 +08:00
MistEO
a5cd9602f1 chore: 加一点抄作业的界面提示
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/874
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/904
2022-06-18 17:08:38 +08:00
zhangweijian97
66bf7b47a3 fix.刚才忘记add图片了 2022-06-18 17:07:12 +08:00
MistEO
6206c8a4bb fix: 再次增加肉鸽二倍速的前置延时,增加稳定性 2022-06-18 17:02:10 +08:00
MistEO
d11a1f2135 feat: 抄作业不支持的关卡,新增界面提示 2022-06-18 17:00:27 +08:00
MistEO
0ff6a8f950 docs: 修改一下描述 2022-06-18 16:40:44 +08:00
MistEO
91f0875e7e docs: update FAQ 2022-06-18 15:11:21 +08:00
MistEO
ecccf09d4b Merge pull request #916 from cglcv/dev
尝试解决手动点击更新闪退的问题
2022-06-18 13:49:10 +08:00
cglcv
40d02b79c9 解决点击手动更新直接闪退的问题 2022-06-18 13:05:22 +08:00
cglcv
0ce3b5d9ca Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-18 12:52:52 +08:00
MistEO
4528cf3f59 fix: 再次修复肉鸽不点二倍速的问题 2022-06-18 05:15:58 +08:00
Liam Sho
79e6282415 fix.修复获取 TagName 的逻辑错误 2022-06-18 04:52:54 +08:00
Alisa
f115d1a878 Merge pull request #914 from MaaAssistantArknights/dev
fix. 修复 CI 的一堆问题
2022-06-18 04:34:13 +08:00
Liam Sho
0d3c43dbef Merge branch 'master' into dev 2022-06-18 04:33:17 +08:00
Liam Sho
6f3d8c8b3a fix.修复 Markdown 字符串格式错误 2022-06-18 04:33:12 +08:00
Liam Sho
854ec2560c fix.修复资源文件发布 CI 爆炸的问题 2022-06-18 04:30:40 +08:00
MistEO
8ed81c8476 Merge pull request #913 from MaaAssistantArknights/dev
Release v3.9.9
2022-06-18 04:21:55 +08:00
MistEO
baef964530 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-18 04:20:03 +08:00
MistEO
59e08ab47e fix: 减小定时任务和手动开始冲突的可能性
fix #876
2022-06-18 04:18:53 +08:00
Liam Sho
beb7d51cd3 perf. 区分 prerelease 与 release 的完整更新日志对比版本 2022-06-18 04:16:26 +08:00
MistEO
a9fce8ffb8 perf: 优化肉鸽一些地块的权重,新支持一些地块
fix #900
2022-06-18 04:07:59 +08:00
MistEO
b9e2302608 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-18 03:58:46 +08:00
MistEO
a41438407d chore: replace 美服 to 国际服
fix #875
2022-06-18 03:58:20 +08:00
Liam Sho
a1edca6d9c perf.优化更换完整更新日志链接 2022-06-18 03:57:35 +08:00
MistEO
306b7c57ca chore: fixed cmake error
fix #912
2022-06-18 03:54:52 +08:00
MistEO
b83cdb8cfb docs: 更新CHANGELOG 2022-06-18 03:35:40 +08:00
MistEO
fae0ebc857 chore.增加 builder ota 忽略项 2022-06-18 03:33:30 +08:00
MistEO
0119b160d1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-18 03:30:41 +08:00
MistEO
695e61a6ea perf.设置界面布局调整 2022-06-18 03:21:23 +08:00
MistEO
50600b7abd feat.优化自动更新功能,优先更新OTA包;移除单独OTA资源的逻辑 2022-06-18 03:15:20 +08:00
Liam Sho
08110897f6 Merge branch 'master' into dev 2022-06-18 02:44:26 +08:00
Liam Sho
dc7c872e39 feat.新增打 OTA 包的功能
仅限发布 LegacyBundle 时
2022-06-18 02:43:34 +08:00
Liam Sho
a4da01852e chore.不再维护旧文档的部署 2022-06-18 02:42:15 +08:00
MistEO
4a5dad9446 fix.修复自动战斗和肉鸽部署干员、开技能等的 114514 个 bug 2022-06-18 02:35:42 +08:00
MistEO
c0bef4cb98 chore.改了点有的没的 2022-06-17 22:50:45 +08:00
MistEO
43960bd029 docs.更新CHANGELOG 2022-06-16 22:12:17 +08:00
MistEO
abe3d89cc0 fix.修复部分模拟器上截图失效的问题 2022-06-16 21:53:21 +08:00
ABA2396
7466ec055e fix.修复更新后活动导航失效的问题 2022-06-16 21:53:21 +08:00
ABA2396
8f959a5610 fix.修复更新后活动导航失效的问题 2022-06-16 13:45:09 +08:00
MistEO
fc09e989ae Merge branch 'dev' 2022-06-16 02:19:31 +08:00
MistEO
7d980b7b29 Revert "fix: 修复掉落识别中家具数量小概率识别错的问题"
This reverts commit 3521742fde.
2022-06-16 02:18:21 +08:00
MistEO
ca72f751bf Merge pull request #893 from MaaAssistantArknights/dev
Release v3.9.8
2022-06-16 02:11:07 +08:00
MistEO
d07d6a6221 fix: 修复部分干员名识别错误
fix #877
2022-06-16 02:06:35 +08:00
MistEO
46e8b8b100 docs.更新CHANGELOG 2022-06-16 02:03:19 +08:00
MistEO
b0f350f739 Merge pull request #861 from cglcv/dev
更好的解决带命令启动模拟器及修复系统通知可能产生的bug
2022-06-16 01:59:15 +08:00
MistEO
3521742fde fix: 修复掉落识别中家具数量小概率识别错的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/883
2022-06-16 01:58:31 +08:00
MistEO
e29cbcc5b2 feat.新增支持截图测速,并修复一些连接的问题 2022-06-16 01:20:24 +08:00
MistEO
52a0134830 chore.更新关卡数据 2022-06-16 00:24:31 +08:00
MistEO
edf74e34c8 feat.优化仓库识别速度,新增支持生成arkplanner的json 2022-06-16 00:22:15 +08:00
MistEO
b7ebe1f52d feat.初步完成仓库识别 2022-06-15 01:15:31 +08:00
ABA2396
fbd53b36ea fix.修复未打完活动关卡时使用导航发生错误的问题 2022-06-14 20:56:57 +08:00
MistEO
b37e66d09c Merge pull request #872 from MaaAssistantArknights/dev
Release v3.9.7
2022-06-14 00:40:31 +08:00
MistEO
d5b127bc2c chore: 再改一下截图超时的问题 2022-06-14 00:38:25 +08:00
MistEO
b301db2a50 Merge branch 'master' into dev 2022-06-14 00:33:01 +08:00
MistEO
8550244472 fix: 修复socket超时设置的错误 2022-06-14 00:28:44 +08:00
MistEO
2cb97b8de5 fix: fixed a bug in the recognition of the end of the combat
fix #870
2022-06-14 00:05:36 +08:00
MistEO
ce350a5efc docs: update picture 2022-06-13 16:02:21 +08:00
ABA2396
e53923fb54 feat.模拟器路径 选择 按钮支持选择 .lnk.bat 文件 2022-06-13 12:06:50 +08:00
MistEO
44842352c2 Merge pull request #865 from MaaAssistantArknights/dev
Release v3.9.6
2022-06-13 00:40:07 +08:00
MistEO
ae26e4549b docs: Update CHANGELOG 2022-06-13 00:39:21 +08:00
MistEO
52de688371 docs: update usage of the YoStarEN server 2022-06-13 00:33:10 +08:00
MistEO
134674a524 docs: update links about supports of overseas servers 2022-06-13 00:30:01 +08:00
MistEO
f0e0830991 feat: re-support NA server (YoStarEN) with basic function 2022-06-13 00:20:44 +08:00
cglcv
c25ef2c717 Merge branch 'dev' into dev 2022-06-12 23:58:20 +08:00
MistEO
c1e1e819ff fix.修复干员自动技能重复释放的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/837
2022-06-12 23:31:37 +08:00
MistEO
9f8749f15a fix.修复一个自动战斗编队识别不到人的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/840
2022-06-12 23:15:00 +08:00
MistEO
93db154de7 chore.调整检查更新时,版本号解析的逻辑 2022-06-12 23:10:24 +08:00
MistEO
1f56d807fd fix.修复第十章部分地图识别错误的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/829
2022-06-12 22:30:03 +08:00
MistEO
8da3e1deb3 fix.修复一个掉落识别错误的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/846
2022-06-12 22:15:02 +08:00
MistEO
a932b8a7a3 chore.调整一下界面报错 2022-06-12 22:12:37 +08:00
MistEO
75c22859b8 fix.简单修复一下选关时滑过头的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/845
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/862
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/834
2022-06-12 21:33:31 +08:00
MistEO
37d1b352d6 fix.修复基建贸易站数量识别错误的问题(影响干员清流效率计算)
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/860
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/722
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/217
2022-06-12 21:17:47 +08:00
cglcv
1b454e2a3f 增加附加命令 2022-06-12 20:54:10 +08:00
MistEO
a38ac41abe fix.修复c#退出时不释放asst实例的问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/855
2022-06-12 18:53:10 +08:00
MistEO
f8867e16e1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-12 18:46:42 +08:00
MistEO
fbc9ec9eeb fix.增加一点socket截图的超时时间
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/859
2022-06-12 18:46:33 +08:00
MistEO
3b365ba27a Merge pull request #856 from soundofautumn/dev
chore. 将提示改为注释方式
2022-06-12 18:23:58 +08:00
AutumnSound
d3eadcab9e chore. 将提示改为注释方式 2022-06-12 14:04:40 +08:00
MistEO
6dee9f5a30 fix.调整抄作业滑动的延迟 2022-06-12 09:39:24 +08:00
MistEO
691cac30fd chore.改了些有的没的 2022-06-12 09:14:12 +08:00
cglcv
8f33f1fe52 Update Bootstrapper.cs 2022-06-11 18:56:44 +08:00
cglcv
a73a9ecfb3 简化代码 2022-06-11 12:55:02 +08:00
cgl
309a005fbf 解决不关闭CMD 2022-06-11 10:46:59 +08:00
cgl
5a42ee73f2 尝试解决CMD可能不关闭的问题 2022-06-11 10:05:40 +08:00
MistEO
aa7c6d0def Merge pull request #833 from MaaAssistantArknights/dev
fix.修复socket截图超时设置的错误
2022-06-11 04:52:38 +08:00
MistEO
1c669a5699 fix.修复socket截图超时设置的错误 2022-06-11 04:51:38 +08:00
MistEO
a2e431c869 Merge pull request #832 from MaaAssistantArknights/dev
Release v3.9.5.1
2022-06-11 04:40:54 +08:00
MistEO
1144dbba2f docs.更新文档 2022-06-11 04:31:30 +08:00
MistEO
273b46256c feat.重新加回刷理智的“指定次数”选项 2022-06-11 04:26:01 +08:00
MistEO
d582e38124 feat.勾选启动模拟器后,若客户端版本未选择,则自动设置为官服
fix  https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/818
2022-06-11 04:08:08 +08:00
MistEO
c4ed0ced23 feat.新增抄作业”摆完挂机“和“输出”字段 2022-06-11 04:03:46 +08:00
MistEO
5ef77d4b20 fix. 修复部分模拟器socket截图超时的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/826
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/820
2022-06-11 03:27:01 +08:00
MistEO
3083129cd0 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-11 03:20:37 +08:00
MistEO
e61147472b Merge pull request #831 from MaaAssistantArknights/revert-824-dev
Revert "解决无法带命令启动模拟器"
2022-06-11 03:20:11 +08:00
MistEO
9902d1ee4b Revert "解决无法带命令启动模拟器" 2022-06-11 03:19:57 +08:00
MistEO
9cdc5d8528 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-11 03:10:18 +08:00
MistEO
9e3dcd6ed2 fix. fixed warning 2022-06-11 03:10:13 +08:00
MistEO
86a89cc19a Merge pull request #824 from cglcv/dev
解决无法带命令启动模拟器
2022-06-11 03:09:11 +08:00
cgl
5aa1a897c8 解决无法带命令启动模拟器 2022-06-10 16:19:28 +08:00
MistEO
7ee8eed3e7 chore.再调整下界面提示 2022-06-09 23:37:18 +08:00
MistEO
7db1cc76a0 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-09 23:34:13 +08:00
MistEO
b7ae96b551 feat.添加一些界面提示 2022-06-09 23:34:09 +08:00
MistEO
ad59b280df docs.更新集成文档 2022-06-09 22:49:19 +08:00
MistEO
693df1560c fix.修复抄作业界面的一些小问题 2022-06-09 21:48:46 +08:00
MistEO
8ba2f1f3f4 fix.再次增加自动战斗部署干员的延迟,修复干员放不上去的问题 2022-06-09 21:48:22 +08:00
MistEO
25697214b8 Merge pull request #809 from MaaAssistantArknights/dev
Release v3.9.5
2022-06-09 20:09:02 +08:00
MistEO
ce0d67edfe docs.更新CHANGELOG 2022-06-09 20:08:24 +08:00
MistEO
7983ed84e5 fix.修复了一些界面的性能问题 2022-06-09 19:58:46 +08:00
MistEO
fb13513532 fix.修复自启模拟器后,连接adb错误的问题 2022-06-09 19:38:35 +08:00
MistEO
5bbce8fac6 feat.支持更多资源的OTA升级 2022-06-09 19:18:01 +08:00
MistEO
78f31c26eb chore.更新掉落材料资源 2022-06-09 19:10:00 +08:00
MistEO
f54f1e64a9 fix.修复未知材料没有识别结果的问题 2022-06-09 19:09:22 +08:00
ABA2396
92a0ca4417 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-09 17:43:16 +08:00
ABA2396
8d5c3eeee3 feat.增加了 尘影余音 活动导航 2022-06-09 17:42:58 +08:00
MistEO
2545f56955 chore.更新关卡格子数据 2022-06-09 17:31:16 +08:00
MistEO
12fdd78962 Merge pull request #808 from MaaAssistantArknights/dev
chore.更新活动`尘影余音`关卡数据
2022-06-09 16:58:37 +08:00
MistEO
10abcfb871 chore.更新活动尘影余音关卡数据 2022-06-09 16:54:48 +08:00
MistEO
35ebc244b2 Merge branch 'dev' 2022-06-09 11:25:52 +08:00
ABA2396
36240537c1 Merge pull request #805
feat.优化`指定材料`功能
2022-06-09 03:15:38 +08:00
ABA2396
f1b294d31c Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-09 03:07:30 +08:00
ABA2396
955cba470e feat.活动资源预加载 2022-06-09 03:07:01 +08:00
ABA2396
97b2ebc1d4 feat.删除了覆潮之下导航入口 2022-06-09 02:50:43 +08:00
ABA2396
aab989c503 feat.重新添加声望掉落 2022-06-09 02:38:42 +08:00
MistEO
22f692d963 perf.界面的一些小调整 2022-06-09 01:24:46 +08:00
MistEO
d1bbe6604e Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-09 01:18:25 +08:00
MistEO
539915e62b fix.修复自动执行的一个逻辑判断 2022-06-09 01:18:22 +08:00
lhhxxxxx
1a63f6aa7a Update 回调消息协议.md 2022-06-09 00:55:00 +08:00
MistEO
a6c524e2d5 docs.更新CHANGELOG 2022-06-09 00:53:02 +08:00
MistEO
580a036990 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-09 00:45:00 +08:00
MistEO
8958b400d6 fix.修复自动抄作业不开技能的问题;修复尽可能开技能的干员一直点不上反复点的问题 2022-06-09 00:44:55 +08:00
lhhxxxxx
c26b438608 Update 回调消息协议.md 2022-06-09 00:39:40 +08:00
lhhxxxxx
f2e0a28cbf Update 集成文档.md 2022-06-09 00:20:19 +08:00
MistEO
4e02a633e7 fix.修复一个socket连接问题 2022-06-09 00:20:14 +08:00
MistEO
481f070808 feat.新增自动启动模拟器的功能,增加检查更新的功能。调整了一些界面布局 2022-06-09 00:18:56 +08:00
lhhxxxxx
13556792b1 Update 集成文档.md 2022-06-09 00:12:59 +08:00
MistEO
d42ae998d5 fix.修复首次代理指挥失败后卡住的问题 2022-06-08 22:14:43 +08:00
MistEO
b78af0df1a fix.修复公招弹一大堆通知的问题 2022-06-08 22:06:48 +08:00
MistEO
03743d8068 fix.修复了另一种刷理智中途游戏崩溃的重连机制;并重构了一部分代码 2022-06-08 22:03:09 +08:00
lhhxxxxx
52cef1df06 Merge pull request #799 from lhhxxxxx/feat/drag_and_drop
[New Feature] 允许拖拽导入作业
2022-06-08 18:57:01 +08:00
lhhxxxxx
16cacf45b6 feat. allow drag a file 2022-06-08 18:23:22 +08:00
ABA2396
3e3609837e fix.修复 上一次 作战导航失败 2022-06-08 16:40:57 +08:00
ABA2396
259fdffe9f feat.修改通知显示设置界面布局 2022-06-08 16:13:32 +08:00
ABA2396
6c510b8395 feat.修改了启动设置的布局 2022-06-08 15:50:28 +08:00
ABA2396
f6b0ed74d2 feat.修改了下通知设置界面布局 2022-06-08 14:54:36 +08:00
ABA2396
3d5101408a feat.修改了下启动设置的布局 2022-06-08 14:38:11 +08:00
ABA2396
9ac28f328d feat.关于我们在运行时也可以点击 2022-06-08 14:23:54 +08:00
lhhxxxxx
f0d3324733 Merge pull request #793 from lhhxxxxx/perf/color
[Perf] 改进了颜色
2022-06-08 11:01:51 +08:00
lhhxxxxx
00712aa243 perf. use darkgoldenrod 2022-06-08 10:50:59 +08:00
MistEO
7dab2d218a docs.改改文档 2022-06-08 10:46:41 +08:00
lhhxxxxx
ccc229ea15 [Done][Fix&Perf]MistEO's Fault (#792)
* fix. MistEO's fault with incomplete rename

* perf. code enhance

* fix. callback bug

* perf. use darkred

Co-authored-by: MistEO <mistereo@hotmail.com>
2022-06-08 10:38:57 +08:00
MistEO
fb347cf82e Merge pull request #779 from cglcv/dev
Dev-MAA开机自启
2022-06-08 10:37:58 +08:00
cglcv
bf647d3160 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-08 09:12:41 +08:00
cgl
9654e0d663 去掉通知,修改描述 2022-06-08 09:07:02 +08:00
MistEO
5af2e65521 Merge branch 'dev' 2022-06-08 02:03:17 +08:00
MistEO
ff704cf271 fix.删除多余的关卡选项 2022-06-08 02:02:00 +08:00
MistEO
8558cb2025 Merge pull request #789 from MaaAssistantArknights/dev
Release v3.9.4-beta.4
2022-06-08 01:57:23 +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
ABA2396
6199d7dd92 feat.重新实现模糊识别
但是现在只能通过点击下拉框里的标签才能修改实际的值,就算输入的和标签的内容完全一致也没用。选中材料后DropsList的值好像有点问题,可能是重复的两个当前材料或者干脆是全部材料,不知道是哪里逻辑有问题。
2022-06-07 12:49:02 +08:00
ABA2396
6daf2dc36b feat.删掉了一些不会掉落的材料 2022-06-07 09:08:29 +08:00
ABA2396
63135b4660 feat.自动获取焦点的值 2022-06-07 08:58:12 +08:00
MistEO
09406ff79a Merge pull request #780 from MaaAssistantArknights/dev
Release v3.9.4-beta.2
2022-06-07 02:51:16 +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
cgl
c0e71c4851 改的注释 2022-06-06 22:49:20 +08:00
cglcv
d7f31e51e7 Merge pull request #2 from cglcv/dev-autostart
去除不必要的命名空间
2022-06-06 22:35:40 +08:00
cgl
77431fc6d9 去除不必要的命名空间 2022-06-06 22:33:59 +08:00
lhhxxxxx
23c88e88e0 perf. use false instead of 0 2022-06-06 22:33:39 +08:00
cglcv
17a62de5d1 Merge pull request #1 from cglcv/dev-autostart
自动启动
2022-06-06 21:27:34 +08:00
cgl
e7290bd0ae clear! 2022-06-06 21:12:09 +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
cglcv
672d873ac1 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-06 16:08:01 +08:00
cgl
198dddb9e5 写自动启动
开整!
2022-06-06 14:07:13 +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
c79ee12e6e Merge branch 'dev' 2022-06-06 03:22:28 +08:00
MistEO
23d6d63c90 fix. 修复一个蓝叠多开时连不上的问题 2022-06-06 03:21:56 +08:00
MistEO
6ba945af50 Merge pull request #759 from MaaAssistantArknights/dev
Release v3.9.4-beta.1
2022-06-06 03:18:21 +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
cglcv
ea4098c6f4 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-05 23:39:38 +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
cglcv
87c33bfb8c Update 模拟器支持.md 2022-06-05 14:39:46 +08:00
cglcv
e679237388 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-05 14:32:53 +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
cglcv
f7811287b2 Update 模拟器支持.md 2022-06-04 23:22:19 +08:00
cglcv
8355a8b032 Update 模拟器支持.md 2022-06-04 23:21:32 +08:00
cglcv
9dd301068a Update 模拟器支持.md 2022-06-04 23:20:48 +08:00
cglcv
ba2b1746eb 修改WSA的连接描述,使其更精确
WSA这波更新我愿称之为一言难尽……
2022-06-04 23:19:50 +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
019528cb5d Merge.合并v3.1.3 2022-05-01 00:29:23 +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
bakashigure
3f0c828ae2 Merge pull request #338 from bakashigure/dev
perf: 更换 uuid 获取方式
2022-04-09 17:13:45 +08:00
bakashigure
2ffb5babd8 perf: 更换 uuid 获取方式 2022-04-09 01:35:23 +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
c737b34a3d docs. fix typo 2022-03-29 17:32:57 +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
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
da8d6b0a9d feat.自动抄作业完成干员名-干员组名转换 2022-03-26 18:43:38 +08:00
MistEO
5dd40d93c3 fix.修复自动抄作业撤退干员的识别逻辑 2022-03-26 17:42:48 +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
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
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
MistEO
77c78816af Merge branch 'master' into dev 2022-03-21 11:28:46 +08:00
MistEO
185a75e442 fix.修复自动抄作业的一些bug 2022-03-21 01:18:37 +08:00
MistEO
de59bbf87f feat.完成最基本的抄作业逻辑。重构了一部分代码 2022-03-20 23:09:46 +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
MistEO
918fd70f3c docs.自动战斗流程画饼 2022-03-18 00:12:19 +08:00
MistEO
4ccc3cf9ac feat.新增支持贸易站源石碎片自动补货字段 2022-03-16 22:10:22 +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
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
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
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
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
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
Alaric Gilbert
548fc4c2b8 fix. 修复无法软重启的问题 2022-02-19 23:48:05 +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
3832 changed files with 1161377 additions and 465444 deletions

195
.clang-format Normal file
View File

@@ -0,0 +1,195 @@
Language: Json
ColumnLimit: 1000
IndentWidth: 4
---
Language: Cpp
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AlignArrayOfStructures: None
AlignConsecutiveMacros: None
AlignConsecutiveAssignments: None
AlignConsecutiveBitFields: None
AlignConsecutiveDeclarations: None
AlignEscapedNewlines: Left
AlignOperands: Align
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortEnumsOnASingleLine: false
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true
AttributeMacros:
- __capability
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterCaseLabel: false
AfterClass: true
AfterControlStatement: Never
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: false
AfterExternBlock: true
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
BreakBeforeBinaryOperators: None
BreakBeforeConceptDeclarations: true
BreakBeforeBraces: Custom
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
QualifierAlignment: Leave
CompactNamespaces: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: false
DeriveLineEnding: true
DerivePointerAlignment: false
DisableFormat: false
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: LogicalBlock
ExperimentalAutoDetectBinPacking: false
PackConstructorInitializers: BinPack
BasedOnStyle: ''
ConstructorInitializerAllOnOneLineOrOnePerLine: false
AllowAllConstructorInitializersOnNextLine: true
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IfMacros:
- KJ_IF_MAYBE
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
Priority: 3
SortPriority: 0
CaseSensitive: false
- Regex: '.*'
Priority: 1
SortPriority: 0
CaseSensitive: false
IncludeIsMainRegex: '(Test)?$'
IncludeIsMainSourceRegex: ''
IndentAccessModifiers: false
IndentCaseLabels: false
IndentCaseBlocks: false
IndentGotoLabels: true
IndentPPDirectives: None
IndentExternBlock: AfterExternBlock
IndentRequiresClause: false
IndentWidth: 4
IndentWrappedFunctionNames: false
InsertTrailingCommas: None
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
LambdaBodyIndentation: Signature
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 2
ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakOpenParenthesis: 0
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 1000
PenaltyIndentedWhitespace: 0
PointerAlignment: Left
PPIndentWidth: -1
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
RequiresClausePosition: OwnLine
SeparateDefinitionBlocks: Leave
ShortNamespaceLines: 50
SortIncludes: CaseSensitive
SortJavaStaticImport: Before
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeParensOptions:
AfterControlStatements: true
AfterForeachMacros: true
AfterFunctionDefinitionName: false
AfterFunctionDeclarationName: false
AfterIfMacros: true
AfterOverloadedOperator: false
AfterRequiresInClause: true
AfterRequiresInExpression: true
BeforeNonEmptyParentheses: false
SpaceAroundPointerQualifiers: Default
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: Never
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInLineCommentPrefix:
Minimum: 1
Maximum: -1
SpacesInParentheses: false
SpacesInSquareBrackets: false
SpaceBeforeSquareBrackets: false
BitFieldColonSpacing: Both
Standard: c++20
StatementAttributeLikeMacros:
- Q_EMIT
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 4
UseCRLF: false
UseTab: Never
WhitespaceSensitiveMacros:
- STRINGIZE
- PP_STRINGIZE
- BOOST_PP_STRINGIZE
- NS_SWIFT_NAME
- CF_SWIFT_NAME

29
.git-blame-ignore-revs Normal file
View File

@@ -0,0 +1,29 @@
# Since version 2.23 (released in August 2019), git-blame has a feature
# to ignore or bypass certain commits.
#
# This file contains a list of commits that are not likely what you
# are looking for in a blame, such as mass reformatting or renaming.
# You can set this file as a default ignore file for blame by running
# the following command.
#
# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
# style: clang format
98f949346e93e5a1adaade22cda9841e01b98c0b
290cc30f153a0206bd870a0a58cb6338aa16ea34
# incorrect format of 3rdparty/resource/Arknights-Tile-Pos/levels.json
65d654e54b9d04d1902c9ee9f9fb2679520adafd
81ea2c4d4fce29862f719972ecb32877fc4e654f
# refactor: 为 MaaCore 重新建立文件结构
206df466fd5e3d8ef80387049b0c5011fb58cada
c9b5aa638a97397ab8666031ea646904527afc09
559c913fca0dd0966896396e251be13f76ea3e52
# Re-structure again.
4b3b84df8f487be0ac86506c28dbebc4635f1282
91abbb7f175b93a58368a136acf3799666f770d2
49b3aba96b2dfe1cb187b193d38c436e96e33901
bae271c09bb79e5cc2a7f8491ce882d276ac97b4
3d83b80dd67d996a5f4f1732fe1eb36cacc7605e
21617270bcef2456cb7f89e54560ca6788450711

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

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

View File

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

View File

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

View File

@@ -0,0 +1,50 @@
name: Bug 反馈(使用中文)
description: 识别错误、操作异常、连接错误等
labels: ['bug']
body:
- type: checkboxes
id: checks
attributes:
label: 在提问之前...
options:
- label: 我理解 Issue 是用于反馈和解决问题的,而非吐槽评论区,将尽可能提供更多信息帮助问题解决
required: true
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: true
- label: 我已查看最新测试版本的更新内容,并未提及该 bug 已被修复的情况
required: true
- type: textarea
id: describe
attributes:
label: 问题描述
description: 尽可能详细描述你的问题
validations:
required: true
- type: textarea
id: logs
attributes:
label: 日志文件
description: |
**上传软件目录下的 `asst.log` 日志文件,并说明问题出现的大致时间点**
**请直接将完整的文件拖拽进来,而非自己裁切的片段;若文件体积过大可压缩后再上传**
validations:
required: true
- type: textarea
id: screenshots
attributes:
label: 截图
description: |
如果有,添加屏幕截图以帮助解释你的问题,包括但不限于 MAA 软件截图、游戏画面截图
若是识别相关问题,请帮忙提供模拟器自带的截图工具截取的原图(或通过 adb 截取原图)
`debug` 文件夹下有一些自动截图的错误图片,若有相关的,请一并打包上传
validations:
required: false
- type: textarea
id: others
attributes:
label: 还有别的吗?
description: |
使用的模拟器?操作系统?相关的配置?链接?参考资料?
任何能让我们对你所遇到的问题有更多了解的东西
validations:
required: false

View File

@@ -0,0 +1,32 @@
name: 需求建议(使用中文)
description: 新功能、建议等
labels: ['enhancement']
body:
- type: checkboxes
id: checks
attributes:
label: 在提问之前...
options:
- label: 我填写了简短且清晰明确的标题,以便开发者在翻阅 issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
required: true
- label: 我基本确定这是一个新功能/建议,而不是遇到了 bug不确定的话请附上日志
required: true
- type: textarea
id: describe
attributes:
label: 说说你遇到的问题?
validations:
required: false
- type: textarea
id: solution
attributes:
label: 有什么好的想法?
validations:
required: false
- type: textarea
id: additional
attributes:
label: 其他内容
description: 关于该需求建议的任何其他背景或屏幕截图。
validations:
required: false

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

@@ -0,0 +1,10 @@
name: 其他议题(使用中文)
description: 提出问题,而不是 bug 反馈或需求建议
labels: ['question']
body:
- type: textarea
id: describe
attributes:
label: 说说你遇到的问题?
validations:
required: false

View File

@@ -0,0 +1,76 @@
name: Bug Report (in English)
description: >-
Recognition errors, operation abnormalities,
connection errors, etc.
labels: ['bug']
body:
- type: checkboxes
id: checks
attributes:
label: Before raising the issue...
options:
- label: >-
I understand that Issues are for feedback and problem solving,
not trolling the comments section, and will provide as
much information as possible to help solve the problem.
required: true
- label: >-
I filled in a short, clear title
so that developers could quickly identify the general problem
when going through the issue list.
Instead of "Some suggestions", "Stuck", etc.
required: true
- label: >-
I have checked the latest beta update and there is no mention
of the bug being fixed.
required: true
- type: textarea
id: describe
attributes:
label: Description
description: Describe your problem in as much detail as possible.
validations:
required: true
- type: textarea
id: logs
attributes:
label: Log files
description: >-
**Upload the `asst.log` log file from the software directory and**
**indicate the approximate point in time when the problem occurred.**
**Please drag and drop the full file in, not your own cuttings,**
**compress it before uploading if too large.**
validations:
required: true
- type: textarea
id: screenshots
attributes:
label: Screenshots
description: >-
If available, add screenshots to help explain your problem,
including but not limited to screenshots of MAA software,
screenshots of game screens.
If the problem is recognition related, please help by providing
the original image taken by the emulator's own screenshot tool
(or via adb).
The `debug` folder has some automatic screenshots of the error images,
if you have any,
please upload them together.
validations:
required: false
- type: textarea
id: others
attributes:
label: Anthing else?
description: >-
Emulator used, operating system, related configuration, links,
reference material, etc.
Anything that will give us more insight into the problem
you are having.
validations:
required: false

View File

@@ -0,0 +1,32 @@
name: Feature Request (in English)
description: New features, suggestions, etc.
labels: ['enhancement']
body:
- type: checkboxes
id: checks
attributes:
label: Before raising the issue...
options:
- label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc.
required: true
- label: I'm probably sure this is a new feature/suggestion and not a bug encountered (please attach logs if you're not sure)
required: true
- type: textarea
id: describe
attributes:
label: The problems you have encountered?
validations:
required: false
- type: textarea
id: solution
attributes:
label: Any good ideas?
validations:
required: false
- type: textarea
id: additional
attributes:
label: Additional
description: Any other background, screen shots, etc.
validations:
required: false

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

@@ -0,0 +1,10 @@
name: Others (in English)
description: Ask a question rather than a bug report or feature request.
labels: ['question']
body:
- type: textarea
id: describe
attributes:
label: The problems you have encountered?
validations:
required: false

512
.github/issue-checker.yml vendored Normal file
View File

@@ -0,0 +1,512 @@
default-mode:
add:
remove: [pull_request_target, issues]
labels:
# <!-- [Ss]kip `LABEL` --> 跳过一个 label
# <!-- [Rr]emove `LABEL` --> 去掉一个 label
# skip and remove
- name: skip all
content:
regexes: '[Ss]kip (?:[Aa]ll |)[Ll]abels?'
- name: remove all
content:
regexes: '[Rr]emove (?:[Aa]ll |)[Ll]abels?'
- name: skip module
content:
regexes: '[Ss]kip [Mm]odule [Ll]abels?'
- name: remove module
content:
regexes: '[Rr]emove [Mm]odule [Ll]abels?'
- name: skip client
content:
regexes: '[Ss]kip [Cc]lient [Ll]abels?'
- name: remove client
content:
regexes: '[Rr]emove [Cc]lient [Ll]abels?'
- name: skip copilot
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)(?:module: |)copilot(?:`|)'
- name: remove copilot
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)(?:module: |)copilot(?:`|)'
- name: skip core
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)(?:module: |)core(?:`|)'
- name: remove core
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)(?:module: |)core(?:`|)'
- name: skip depot
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)(?:module: |)depot(?:`|)'
- name: remove depot
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)(?:module: |)depot(?:`|)'
- name: skip drop
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)(?:module: |)drop(?:`|)'
- name: remove drop
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)(?:module: |)drop(?:`|)'
- name: skip fight
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)(?:module: |)fight(?:`|)'
- name: remove fight
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)(?:module: |)fight(?:`|)'
- name: skip GUI
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)(?:module: |)GUI(?:`|)'
- name: remove GUI
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)(?:module: |)GUI(?:`|)'
- name: skip infrast
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)(?:module: |)infrast(?:`|)'
- name: remove infrast
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)(?:module: |)infrast(?:`|)'
- name: skip others
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)(?:module: |)others(?:`|)'
- name: remove others
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)(?:module: |)others(?:`|)'
- name: skip recruit
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)(?:module: |)recruit(?:`|)'
- name: remove recruit
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)(?:module: |)recruit(?:`|)'
- name: skip roguelike
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)(?:module: |)roguelike(?:`|)'
- name: remove roguelike
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)(?:module: |)roguelike(?:`|)'
- name: skip ambiguous
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)ambiguous(?:`|)'
- name: remove ambiguous
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)ambiguous(?:`|)'
- name: skip release
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)release(?:`|)'
- name: remove release
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)release(?:`|)'
- name: skip documentation
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)documentation(?:`|)'
- name: remove documentation
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)documentation(?:`|)'
- name: skip translation required
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)translation required(?:`|)'
- name: remove translation required
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)translation required(?:`|)'
- name: skip client-JP
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)Client: JP(?:`|)'
- name: remove client-JP
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)Client: JP(?:`|)'
- name: skip client-EN
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)Client: EN(?:`|)'
- name: remove client-EN
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)Client: EN(?:`|)'
- name: skip client-KR
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)Client: KR(?:`|)'
- name: remove client-KR
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)Client: KR(?:`|)'
- name: skip client-ZH_TW
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)Client: ZH_TW(?:`|)'
- name: remove client-ZH_TW
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)Client: ZH_TW(?:`|)'
- name: skip macOS
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)macOS(?:`|)'
- name: remove macOS
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)macOS(?:`|)'
- name: skip incomplete
content:
regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)incomplete(?:`|)'
- name: remove incomplete
content:
regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)incomplete(?:`|)'
# `MAA Team`
- name: MAA Team
mode:
add: [pull_request_target, issues]
author_association:
- "MEMBER"
# `module: infrast`
- name: infrast
content: "module: infrast"
regexes:
"基建|换班|贸易站|制造站|发电站|加工站|会客室|训练室|办公室|控制中枢|宿舍|基地|[Ii]nfrast|[Dd]orm"
skip-if:
- skip all
- skip module
- skip infrast
remove-if:
- remove all
- remove module
- remove infrast
# `module: roguelike`
- name: roguelike
content: "module: roguelike"
regexes:
"肉[鸽鴿]|集成战略|[Rr]ogue|ローグ"
skip-if:
- skip all
- skip module
- skip roguelike
remove-if:
- remove all
- remove module
- remove roguelike
# `module: copilot`
- name: copilot1
content: "module: copilot"
regexes: '自动(?:作战|战斗|编队)|自動[戰戦][鬥闘]|[Cc]opilot'
mode: add
skip-if:
- skip all
- skip module
- skip copilot
- roguelike
remove-if:
- remove all
- remove module
- remove copilot
- name: copilot2
content: "module: copilot"
regexes: '作[业業]'
skip-if:
- skip all
- skip module
- skip copilot
- copilot1
- infrast
- roguelike
remove-if:
- remove all
- remove module
- remove copilot
# `module: drop`
- name: drop
content: "module: drop"
regexes:
"掉落物?(?:识别|检测)"
skip-if:
- skip all
- skip module
- skip drop
remove-if:
- remove all
- remove module
- remove drop
# `module: fight`
- name: fight
content: "module: fight"
regexes:
"刷图|刷理智|剿灭|刷.{0,6}材料|关卡选择|战斗|作战|[戰戦][鬥闘]|[Ff]ight|[Bb]attle|[Aa]nihilation"
skip-if:
- skip all
- skip module
- skip fight
- copilot1
- copilot2
- drop
- roguelike
remove-if:
- remove all
- remove module
- remove fight
# `module: depot`
- name: depot
content: "module: depot"
regexes:
"仓库识别|仓库检测|仓检|[Dd]epot"
skip-if:
- skip all
- skip module
- skip depot
remove-if:
- remove all
- remove module
- remove depot
# `module: others`
- name: others
content: "module: others"
regexes:
"信用|拜访|登录|开始唤醒|连接模拟器|[Vv]isit|[Ll]ogin|[Ss]tartup"
skip-if:
- skip all
- skip module
- skip others
remove-if:
- remove all
- remove module
- remove others
# `module: recruit`
- name: recruit
content: "module: recruit"
regexes:
"公招|(?<!肉鸽)招募|公開(?:募集|求人)|[Rr]ecruit"
skip-if:
- skip all
- skip module
- skip recruit
- roguelike
remove-if:
- remove all
- remove module
- remove recruit
# `module: recruit`
- name: GUI
content: "module: GUI"
regexes:
'软件更新|自动下载|图形化?界面|gui(?!\.)|GUI|Gui'
skip-if:
- skip all
- skip module
- skip GUI
remove-if:
- remove all
- remove module
- remove GUI
# `ambiguous`
- name: pr-ambiguous
# 不符合 commitizen 的 PR
content: ambiguous
regexes: '^(?!(?:build|chore|ci|docs?|feat|fix|perf|refactor|rft|style|test)[\:\.\(\,]|[Mm]erge|[Rr]evert|[Rr]elease)'
mode:
pull_request_target:
skip-if:
- skip all
- skip ambiguous
remove-if:
- remove all
- remove ambiguous
- name: ambiguous
# 不符合上面任何一个的分类的 issue
content: ambiguous
mode:
issues:
issue_comment: remove
skip-if:
- pr-ambiguous
- skip all
- skip ambiguous
remove-if:
- remove all
- remove ambiguous
- copilot1
- copilot2
- core
- depot
- drop
- fight
- GUI
- infrast
- others
- recruit
- roguelike
# `release`
- name: release
content: release
regexes: 'Release v(?:\d)+\.(?:\d)+\.(?:\d)+'
mode:
pull_request_target:
skip-if:
- skip all
- skip release
remove-if:
- remove all
- remove release
# `documentation`
- name: pr-documentation
# 不符合 commitizen 的 PR
content: documentation
regexes: '^docs?[\:\.\(\,]'
mode:
pull_request_target:
skip-if:
- skip all
- skip documentation
- release
remove-if:
- remove all
- remove documentation
# `translation required`
- name: translation required
content: translation required
regexes: '(?:(?:(?:[\u3040-\u30ff]|[㍿㍐])[^`]*){10,})'
mode:
pull_request_target:
issues:
skip-if:
- skip all
- skip translation required
remove-if:
- remove all
- remove translation required
# `Client: JP`
- name: "Client: JP"
regexes: '(?:日[文语本]?服|[Yy]o[Ss]tar\-?(?:JP|jp)|(?:JP|jp)[\- ]*(?:[Yy]o[Ss]tar|服|[Cc]lient))'
skip-if:
- skip all
- skip client
- skip client-JP
remove-if:
- remove all
- remove client
- remove client-JP
# `Client: EN`
- name: "Client: EN"
regexes: '(?:英[文语]?服|国际服|美服|[Yy]o[Ss]tar\-?(?:EN|en)|(?:EN|en)[\- ]*(?:[Yy]o[Ss]tar|服|[Cc]lient))'
skip-if:
- skip all
- skip client
- skip client-EN
remove-if:
- remove all
- remove client
- remove client-EN
# `Client: KR`
- name: "Client: KR"
regexes: '(?:韩[文语国]?服|[Yy]o[Ss]tar\-?(?:KR|kr)|(?:KR|kr)[\- ]*(?:[Yy]o[Ss]tar|服|[Cc]lient))'
skip-if:
- skip all
- skip client
- skip client-KR
remove-if:
- remove all
- remove client
- remove client-KR
# `Client: ZH_TW`
- name: "Client: ZH_TW"
regexes: '(?:繁中服|台(?:湾|灣|)服|繁体中文服|[龙龍]成|天下网游|txwy)'
skip-if:
- skip all
- skip client
- skip client-ZH_TW
remove-if:
- remove all
- remove client
- remove client-ZH_TW
# `macOS`
- name: macOS
regexes: '[Mm]ac(?:(?:book|os|OS)|\s*(?:(?:操作|)系统|电脑|版))'
skip-if:
- skip all
- skip macOS
remove-if:
- remove all
- remove macOS
# `fixed`
- name: fixed
regexes:
- "(?:(?:`v\\d+\\.\\d+\\.\\d+(?:-(?:alpha|beta|rc)\\.\\d+|\\.\\d+|)`|\
v\\d+\\.\\d+\\.\\d+(?:-(?:alpha|beta|rc)\\.\\d+|\\.\\d+|)\\s+)|\
\\[(?:`v\\d+\\.\\d+\\.\\d+(?:-(?:alpha|beta|rc)\\.\\d+|\\.\\d+|)`|\
v\\d+\\.\\d+\\.\\d+(?:-(?:alpha|beta|rc)\\.\\d+|\\.\\d+|))\\]\\(\\S*\\)|\
(?:https?\\://(?:[^/\\s]+/){3}commit/|)[0-9a-z]{40})\
\\s*fixed|[Ff]ixed (?:in|at|by)\\s*\
(?:(?:`v\\d+\\.\\d+\\.\\d+(?:-(?:alpha|beta|rc)\\.\\d+|\\.\\d+|)`|\\s+\
v\\d+\\.\\d+\\.\\d+(?:-(?:alpha|beta|rc)\\.\\d+|\\.\\d+|))|\
\\[(?:`v\\d+\\.\\d+\\.\\d+(?:-(?:alpha|beta|rc)\\.\\d+|\\.\\d+|)`|\
v\\d+\\.\\d+\\.\\d+(?:-(?:alpha|beta|rc)\\.\\d+|\\.\\d+|))\\]\\(\\S*\\)|\
(?:https?\\://(?:[^/\\s]+/){3}commit/|)[0-9a-z]{40})"
mode:
issue_comment: add
# `duplicate`
- name: duplicate
regexes:
"[Dd]uplicate of\\s*\\[?`?(?:https?\\://(?:[^/\\s]+/){3}issues/|#)\\d+"
mode:
issue_comment: add
# `outdated`
- name: outdated
regexes:
"[Ss]uperseded by"
mode:
issue_comment: add
# `incomplete`
- name: incomplete
content: incomplete
regexes: '(?:\[Uploading asst(?:.bak|)(?: - 副本|)(?:.log|)(?:.zip|)…\]\(\))'
mode: add
skip-if:
- skip all
- skip incomplete
remove-if:
- remove all
- remove incomplete
- name: complete
content:
regexes: '(?:\[asst(?:.bak|)(?: - 副本|)(?:.log|)(?:.zip|)\]\([^\)]+\))'
- name: remove incomplete
content: incomplete
mode: remove
skip-if:
- skip all
- skip incomplete
- incomplete
remove-if:
- remove all
- remove incomplete
- complete
comments:
- name: Log upload failed
regexes:
- '\[Uploading asst(?:.bak|)(?: - 副本|)(?:.log|)(?:.zip|)…\]\(\)'
content:
"你的日志没有上传成功,请重新上传。\n\n\
Your log did not upload successfully, please re-upload it."
mode: add
- name: Upload failed
regexes:
- "^[^`]*(`[^`]+`[^`]*)*\\[Uploading[^\\]]*…\\]\\(\\)"
content:
"你有一些文件没有上传成功,请重新上传。\n\n\
You have some files that did not upload successfully, please re-upload them."
mode: add
skip-if:
- "Log upload failed"

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

@@ -0,0 +1,70 @@
name: dev-build-linux
on:
push:
branches-ignore:
- master
paths:
- 'src/MaaCore/**'
- '3rdparty/**'
- 'include/**'
- 'resource/**'
- 'cmake/**'
- CMakeLists.txt
pull_request:
branches:
- dev
paths:
- 'src/MaaCore/**'
- '3rdparty/**'
- 'include/**'
- 'resource/**'
- 'cmake/**'
- CMakeLists.txt
jobs:
linux-latest:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Install GCC-12
run: |
sudo apt update
sudo apt upgrade
sudo apt install gcc-12 g++-12
- name: Setup ccache
uses: Chocobo1/setup-ccache-action@v1
with:
remove_stale_cache: false
- name: Build MAA
env:
CC: ccache gcc-12
CXX: ccache g++-12
run: |
mkdir -p build
cmake -B build \
-DINSTALL_THIRD_LIBS=ON \
-DINSTALL_RESOURCE=OFF \
-DINSTALL_PYTHON=OFF
# -DFASTDEPLOY_DIRECTORY=~/fastdeploy \
# -DOPENCV_DIRECTORY=~/opencv/lib/cmake/opencv4 \
cmake --build build --parallel $(nproc --all)
mkdir -p install
cmake --install build --prefix install
- name: tar files
run: |
mkdir -p release
cd install
tar czvf $GITHUB_WORKSPACE/release/MaaAssistantArknights.tar.gz .
- uses: actions/upload-artifact@v3
with:
name: MAA-linux
path: release/*.tar.gz

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

@@ -0,0 +1,56 @@
name: dev-build-mac
on:
push:
branches-ignore:
- master
paths:
- 'src/MaaCore/**'
- 'src/MaaMacGui/**'
- '3rdparty/**'
- 'include/**'
- 'resource/**'
- 'cmake/**'
- CMakeLists.txt
pull_request:
branches:
- dev
paths:
- 'src/MaaCore/**'
- 'src/MaaMacGui/**'
- '3rdparty/**'
- 'include/**'
- 'resource/**'
- 'cmake/**'
- CMakeLists.txt
jobs:
macos-latest:
runs-on: macos-12
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
fetch-depth: 100
- name: Cache Homebrew
uses: actions/cache@v3
with:
path: $(brew --prefix)
key: ${{ runner.os }}-homebrew-${{ hashFiles('.config/brew/Brewfile') }}
- name: Install Dependencies
run: |
brew update --preinstall
brew install ninja range-v3
- name: Configure MaaCore
run: |
mkdir build && cd build
cmake .. -GNinja -DBUILD_XCFRAMEWORK=ON
- name: Build libMaaCore
run: cmake --build build
- name: Build MAA
working-directory: src/MaaMacGui
run: xcodebuild CODE_SIGN_IDENTITY="-" DEVELOPMENT_TEAM="-" -derivedDataPath DerivedData -project MeoAsstMac.xcodeproj -scheme MAA-x86_64
- uses: actions/upload-artifact@v3
with:
name: MAA-macos
path: src/MaaMacGui/DerivedData/Build/Products/Debug

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

@@ -0,0 +1,75 @@
# ------------------------------------------------------------------------------
# <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-win --host GitHubActions
#
# </auto-generated>
# ------------------------------------------------------------------------------
name: dev-build-win
on:
push:
branches-ignore:
- master
paths:
- 'src/MaaCore/**'
- 'src/MaaWpfGui/**'
- '3rdparty/**'
- 'tools/MaaBuilder/**'
- tools/MaaBuilder.sln
- 'include/**'
- 'resource/**'
- MAA.sln
pull_request:
branches:
- dev
paths:
- 'src/MaaCore/**'
- 'src/MaaWpfGui/**'
- '3rdparty/**'
- 'tools/MaaBuilder/**'
- tools/MaaBuilder.sln
- 'include/**'
- 'resource/**'
- MAA.sln
workflow_dispatch:
inputs:
Reason:
description: "Reason"
required: true
ReleaseSimulation:
description: "Release Simulation"
required: true
jobs:
windows-latest:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v3
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 }}
ReleaseSimulation: ${{ github.event.inputs.ReleaseSimulation }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v3
with:
name: MAA-win-x64
path: artifacts

25
.github/workflows/issue-checker.yml vendored Normal file
View File

@@ -0,0 +1,25 @@
name: "Issue Checker"
on:
issues:
types: [opened, edited]
pull_request_target:
types: [opened, edited]
issue_comment:
types: [created, edited]
push:
permissions:
contents: read
issues: write
pull-requests: write
jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: zzyyyl/issue-checker@v1.7
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/issue-checker.yml
not-before: 2022-08-05T00:00:00Z
include-title: 1

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

@@ -0,0 +1,61 @@
name: dev-build-linux
on:
release:
types: [published]
jobs:
linux-latest:
runs-on: ubuntu-latest
steps:
- name: Setup tag info
run: |
GIT_TAG=${GITHUB_REF#refs/*/}
echo "GIT_TAG=${GIT_TAG}" >> $GITHUB_ENV
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Install GCC-12
run: |
sudo apt update
sudo apt upgrade
sudo apt install gcc-12 g++-12
- name: Setup ccache
uses: Chocobo1/setup-ccache-action@v1
with:
remove_stale_cache: false
- name: Build MAA
env:
CC: ccache gcc-12
CXX: ccache g++-12
run: |
mkdir -p build
cmake -B build \
-DINSTALL_THIRD_LIBS=ON \
-DINSTALL_RESOURCE=ON \
-DINSTALL_PYTHON=ON
# -DFASTDEPLOY_DIRECTORY=~/fastdeploy \
# -DOPENCV_DIRECTORY=~/opencv/lib/cmake/opencv4 \
cmake --build build --parallel $(nproc --all)
mkdir -p install
cmake --install build --prefix install
- name: tar files
run: |
mkdir -p release
cd install
tar czvf $GITHUB_WORKSPACE/release/MAA-${{ env.GIT_TAG }}-linux.tar.gz .
- name: Upload image to release
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: 'release/*.tar.gz'
file_glob: true
tag: ${{ env.GIT_TAG }}
overwrite: true

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

@@ -0,0 +1,99 @@
name: release-maa-mac
on:
release:
types: [published]
jobs:
macos-latest:
name: macos-latest
runs-on: macos-12
strategy:
matrix:
arch: [arm64, x86_64]
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- name: 'Install Developer ID Certificate'
uses: apple-actions/import-codesign-certs@v1
with:
p12-file-base64: ${{ secrets.HGUANDL_SIGN_CERT_P12 }}
p12-password: ${{ secrets.HGUANDL_SIGN_CERT_PASSWD }}
- name: Cache Homebrew
uses: actions/cache@v3
with:
path: $(brew --prefix)
key: ${{ runner.os }}-homebrew-${{ hashFiles('.config/brew/Brewfile') }}
- name: Install Dependencies
run: |
brew update --preinstall
brew install ninja range-v3 create-dmg
- name: Configure MaaCore
run: |
mkdir build && cd build
cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_XCFRAMEWORK=ON -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}
- name: Build libMaaCore
run: cmake --build build
- name: Build MAA
working-directory: src/MaaMacGui
run: xcodebuild -project MeoAsstMac.xcodeproj -scheme MAA-${{ matrix.arch }} archive -archivePath MAA.xcarchive -configuration Release-${{ matrix.arch }}
- name: Export MAA
working-directory: src/MaaMacGui
run: xcodebuild -exportArchive -archivePath MAA.xcarchive -exportOptionsPlist ExportOptions.plist -exportPath Export
- name: Create disk image
working-directory: src/MaaMacGui
run: create-dmg --background dmg-bkg.png --window-size 500 300 --icon-size 128 --icon MAA.app 0 120 --hide-extension MAA.app --app-drop-link 270 120 MAA-${{ matrix.arch }}.dmg Export/MAA.app
- name: Archive debug symbols
working-directory: src/MaaMacGui/MAA.xcarchive/dSYMs
run: ditto -c -k --keepParent MAA.app.dSYM MAA-${{ matrix.arch }}.app.dSYM.zip
- name: Place packages
run: |
GIT_TAG=${GITHUB_REF#refs/*/}
APP_DMG=MAA-${GIT_TAG}-macos-${{ matrix.arch }}.dmg
APP_SYM=MAAComponent-DebugSymbol-${GIT_TAG}-macos-${{ matrix.arch }}.zip
mkdir -p release
mv src/MaaMacGui/MAA-${{ matrix.arch }}.dmg release/${APP_DMG}
mv src/MaaMacGui/MAA.xcarchive/dSYMs/MAA-${{ matrix.arch }}.app.dSYM.zip release/${APP_SYM}
- name: Upload products
uses: actions/upload-artifact@v3
with:
name: MAA-macos
path: release
macos-release:
name: macos-release
runs-on: macos-12
needs: [macos-latest]
steps:
- name: 'Setup tag information'
run: |
GIT_TAG=${GITHUB_REF#refs/*/}
echo "GIT_TAG=${GIT_TAG}" >> $GITHUB_ENV
- name: Download artifacts
uses: actions/download-artifact@v3
with:
name: MAA-macos
- name: 'Verify image'
run: |
find . -name "*.dmg" -exec hdiutil verify {} \;
- name: 'Notarize image'
env:
NOTARY_USER: ${{ secrets.HGUANDL_NOTARY_AAPL_ID }}
NOTARY_PASSWD: ${{ secrets.HGUANDL_NOTARY_PASSWD }}
NOTARY_TEAM: ${{ secrets.HGUANDL_SIGN_IDENTITY }}
run: |
find . -name "*.dmg" | while read dmg; do
xcrun notarytool submit --apple-id "$NOTARY_USER" --password "$NOTARY_PASSWD" --team-id "$NOTARY_TEAM" --wait ${dmg}
xcrun stapler staple ${dmg}
done
- name: Upload image to release
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: 'MAA*${{ env.GIT_TAG }}-macos*'
file_glob: true
tag: ${{ env.GIT_TAG }}
overwrite: true

45
.github/workflows/release-maa-win.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-win --host GitHubActions
#
# </auto-generated>
# ------------------------------------------------------------------------------
name: release-maa-win
on:
push:
tags:
- 'v*'
jobs:
windows-latest:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v3
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@v3
with:
name: MAA-win-x64
path: artifacts

View File

@@ -0,0 +1,161 @@
name: release-nightly-ota
on:
workflow_dispatch:
inputs:
ref:
description: 'Commit to build (git checkout)'
type: string
required: true
limit:
description: 'Number of releases to fetch from MaaAssistantArknights'
required: false
default: 30
type: number
limit_2:
description: 'Number of releases to fetch from MaaRelease'
required: false
default: 30
tag_name:
description: 'Tag name to release'
required: false
release_body:
type: string
required: false
jobs:
build-win-nightly:
runs-on: windows-latest
outputs:
tag: ${{ steps.set_tag.outputs.tag }}
steps:
- uses: actions/checkout@v3
with:
# repository: 'MaaAssistantArknights/MaaAssistantArknights'
submodules: recursive
#ref: ${{ inputs.ref }}
fetch-depth: 0
- name: Checkout ref
run: |
git checkout --progress --recurse-submodules ${{ inputs.ref || 'dev' }}
- run: |
npm install --global --progress semver
- name: Set tag
id: set_tag
run: |
if ("${{ inputs.tag_name }}" -ne "") {
echo "tag=${{ inputs.tag_name }}" >> $env:GITHUB_OUTPUT
exit 0
}
$described = $(git describe --tags --long --match 'v*')
$ids = $($described -split "-")
if ($ids.length -eq 3) {
$ver = "v$(semver --increment $ids[0].Substring(1))"
echo "tag=$ver-alpha.0.$($ids[1]).$($ids[2])" >> $env:GITHUB_OUTPUT
exit 0
}
if ($ids.length -eq 4) {
echo "tag=$($ids[0])-$($ids[1]).$($ids[2]).$($ids[3])" >> $env:GITHUB_OUTPUT
exit 0
}
exit 1
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v3
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Run './build.cmd DevBuild'
run: |
$env:GITHUB_WORKFLOW = 'dev-build-win' # pretend this is a dev-build-win workflow
$env:MAA_BUILDER_MAA_VERSION = "${{steps.set_tag.outputs.tag}}"
echo "tag: " $env:MAA_BUILDER_MAA_VERSION
./build.cmd DevBuild
env:
Reason: 'Build nightly version'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v3
with:
name: MAA-win-x64
path: artifacts
make-ota:
needs: build-win-nightly
runs-on: ubuntu-latest
steps:
- run: echo ${{ needs.build-win-nightyl.outputs.tag }}
- name: "Fetch MaaRelease"
uses: actions/checkout@v3
with:
repository: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
path: MaaRelease
fetch-depth: 0
token: ${{ secrets.MAARELEASE_RELEASE }}
- uses: actions/checkout@v3
with:
path: MaaAssistantArknights
- uses: actions/download-artifact@v3
with:
name: MAA-win-x64
path: ${{ format('{0}/{1}', 'build-ota', needs.build-win-nightly.outputs.tag) }}
- name: "Fetch release info"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
mkdir -pv build-ota && cd build-ota
cd ${{ needs.build-win-nightly.outputs.tag }}
mkdir -pv content
unzip -q *.zip -x '*.lib' -x '*.pdb' -x '*.exp' -x '*.config' -x '*.xml' -d content
cd ..
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 30 }} | tee ./release_maa.txt
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit ${{ inputs.limit_2 || 30 }} | tee ./release_mr.txt
echo ${{ needs.build-win-nightly.outputs.tag }} > ./config
cat ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
cat ./release_mr.txt | awk '{ print $1 }' > ./tags_mr.txt
comm <(sort ./tags_maa.txt) <(sort ./tags_mr.txt) | awk '{ print $1 }' >> ./config
echo "config:"
cat ./config
echo "release_tag=$(head -n 1 ./config)" >> $GITHUB_ENV
- name: "Build OTA"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
cd build-ota
$GITHUB_WORKSPACE/MaaAssistantArknights/tools/OTAPacker/build.sh 'MaaAssistantArknights/MaaAssistantArknights' ./config "${{ github.repository_owner }}/MaaRelease"
mv -v ${{ needs.build-win-nightly.outputs.tag }}/*.zip ./MAA-${{ env.release_tag }}-win-x64.zip
- name: "Commit and setup tag"
run: |
cd MaaRelease
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'
git checkout --orphan __temp
git rm -rf .
git commit --allow-empty --message ${{ env.release_tag }}
git tag ${{ env.release_tag }} || exit 0 # do nothing if the tag already exists
git push --tags
- name: "Upload to MaaRelease"
uses: svenstaro/upload-release-action@v2
with:
repo_name: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
repo_token: ${{ secrets.MAARELEASE_RELEASE }}
file_glob: true
file: build-ota/*.zip
tag: ${{ env.release_tag }}
prerelease: true
overwrite: true
body: ${{ inputs.release_body || '' }}
- name: "Upload to server"
uses: appleboy/scp-action@master
with:
host: ${{ secrets.SSH_HOST }}
username: ${{ secrets.SSH_USER }}
key: ${{ secrets.SSH_ID }}
source: "build-ota/*.zip"
strip_components: 1
target: ${{ format('{0}/{1}', 'OTA/MaaAssistantArknights/MaaRelease/releases/download', env.release_tag) }}

97
.github/workflows/release-ota.yml vendored Normal file
View File

@@ -0,0 +1,97 @@
name: release-ota
on:
release:
types: [published]
workflow_dispatch:
inputs:
limit:
description: 'Number of releases to fetch from MaaAssistantArknights, 2 at least'
required: false
default: 31
type: number
limit_2:
description: 'Number of releases to fetch from MaaRelease'
required: false
default: 30
jobs:
make-ota:
runs-on: "ubuntu-latest"
steps:
- name: "Fetch MaaRelease"
uses: actions/checkout@v3
with:
repository: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
path: MaaRelease
fetch-depth: 0
token: ${{ secrets.MAARELEASE_RELEASE }}
- uses: actions/checkout@v3
with:
path: MaaAssistantArknights
- name: "Fetch release info"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
mkdir -pv build-ota && cd build-ota
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit ${{ inputs.limit || 31 }} | tee ./release_maa.txt
gh release list --repo "MaaAssistantArknights/MaaRelease" --limit ${{ inputs.limit_2 || 30 }} | tee ./release_mr.txt
head -n 1 ./release_maa.txt | awk '{ print $1 }' > ./config
tail -n +1 ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
cat ./release_mr.txt | awk '{ print $1 }' > ./tags_mr.txt
comm <(sort ./tags_maa.txt) <(sort ./tags_mr.txt) | awk '{ print $1 }' >> ./config
echo "config:"
cat ./config
echo "prerelease=$([ $(head -n 1 release_maa.txt | awk '{ print $2}') = 'Pre-release' ] && echo true || echo false)" >> $GITHUB_ENV
echo "release_tag=$(head -n 1 ./config)" >> $GITHUB_ENV
- name: "Download latest version for server"
run: |
mkdir -pv build-ota/${{ env.release_tag }}
cd build-ota/${{ env.release_tag }}
mkdir -pv content
gh release download ${{ env.release_tag }} --repo 'MaaAssistantArknights/MaaAssistantArknights' --pattern "MAA-${{ env.release_tag }}-win-x64.zip" --clobber
unzip -q -O gbk -o "*.zip" -d 'content'
mv *.zip ..
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "Build OTA"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
cd build-ota
$GITHUB_WORKSPACE/MaaAssistantArknights/tools/OTAPacker/build.sh 'MaaAssistantArknights/MaaAssistantArknights' ./config 'MaaAssistantArknights/MaaRelease'
- name: "Commit and setup tag"
run: |
cd MaaRelease
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'
git checkout --orphan __temp
git rm -rf .
git commit --allow-empty --message ${{ env.release_tag }}
git tag ${{ env.release_tag }} || exit 0 # do nothing if the tag already exists
git push --tags
env:
PUSH_REMOTE: https://github-actions[bot]:${{ secrets.MAARELEASE_RELEASE }}@github.com/${{ github.repository_owner }}/MaaRelease
- name: "Upload to MaaRelease"
uses: svenstaro/upload-release-action@v2
with:
repo_name: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }}
repo_token: ${{ secrets.MAARELEASE_RELEASE }}
file_glob: true
file: build-ota/*.zip
tag: ${{ env.release_tag }}
prerelease: ${{ env.prerelease }}
overwrite: true
- name: "Upload to server"
uses: appleboy/scp-action@master
with:
host: ${{ secrets.SSH_HOST }}
username: ${{ secrets.SSH_USER }}
key: ${{ secrets.SSH_ID }}
source: "build-ota/*.zip"
strip_components: 1
target: ${{ format('{0}/{1}', 'OTA/MaaAssistantArknights/MaaRelease/releases/download', env.release_tag) }}

11
.gitignore vendored
View File

@@ -1,3 +1,6 @@
# docs
docs/node_modules
docs/.vuepress/.temp
# Prerequisites
*.d
@@ -20,6 +23,7 @@ build
# Fortran module files
*.mod
*.smod
!go.mod
# Compiled Static libraries
*.lai
@@ -71,6 +75,7 @@ bld/
[Oo]bj/
[Ll]og/
[Ll]ogs/
cmake-build-debug/
# Visual Studio 2015/2017 cache/options directory
.vs/
@@ -431,5 +436,9 @@ FodyWeavers.xsd
screen.png
adb_screen.png
tools/**/*.png
resource/infrast
.vscode
!3rdparty/tools/*
enc_temp_folder/*
# Nuke
.nuke/temp/*

6
.gitmodules vendored Normal file
View File

@@ -0,0 +1,6 @@
[submodule "test"]
path = test
url = https://github.com/MaaAssistantArknights/MaaTestSet.git
[submodule "src/MaaMacGui"]
path = src/MaaMacGui
url = https://github.com/MaaAssistantArknights/MaaMacGui.git

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

@@ -0,0 +1,132 @@
{
"$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",
"Bitbucket",
"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",
"DevBuildDefault",
"DevBuildReleaseSimulation",
"ReleaseMaa",
"SetMaaChangeLog",
"SetPackageBundled",
"SetVersion",
"UseClean",
"UseCommitVersion",
"UseMaaChangeLog",
"UseMaaDevBundle",
"UseMaaRelease",
"UsePublishArtifact",
"UsePublishRelease",
"UseRsVersion",
"UseTagVersion",
"WithCompileCoreRelease",
"WithCompileWpfRelease",
"WithSyncRes"
]
}
},
"Target": {
"type": "array",
"description": "List of targets to be invoked. Default is '{default_target}'",
"items": {
"type": "string",
"enum": [
"Default",
"DevBuild",
"DevBuildDefault",
"DevBuildReleaseSimulation",
"ReleaseMaa",
"SetMaaChangeLog",
"SetPackageBundled",
"SetVersion",
"UseClean",
"UseCommitVersion",
"UseMaaChangeLog",
"UseMaaDevBundle",
"UseMaaRelease",
"UsePublishArtifact",
"UsePublishRelease",
"UseRsVersion",
"UseTagVersion",
"WithCompileCoreRelease",
"WithCompileWpfRelease",
"WithSyncRes"
]
}
},
"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/fastdeploy.dll vendored Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
3rdparty/bin/mklml.dll vendored

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

BIN
3rdparty/bin/ppocr.dll vendored

Binary file not shown.

View File

@@ -1,13 +1,15 @@
#pragma once
#include <string>
#include <vector>
#include <cmath>
#include <fstream>
#include <iostream>
#include <string>
#include <vector>
#include <opencv2/core.hpp>
#include <meojson/json.hpp>
#include <opencv2/core.hpp>
#include "TileDef.hpp"
namespace Map
{
@@ -25,22 +27,33 @@ namespace Map
int get_width() const { return width; }
int get_height() const { return height; }
Tile get_item(int y, int x) const { return tiles[y][x]; }
int view = 0;
std::string stageId;
std::string code;
std::string levelId;
std::string name;
std::vector<cv::Point3d> view;
LevelKey key;
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;
TileCalc(int width, int height, const json::array& json);
bool contains(const std::string& any_key);
bool contains(const LevelKey& key);
bool run(const std::string& any_key, bool side, std::vector<std::vector<cv::Point2d>>& out_pos,
std::vector<std::vector<Tile>>& out_tiles) const;
bool run(const LevelKey& key, bool side, std::vector<std::vector<cv::Point2d>>& out_pos,
std::vector<std::vector<Tile>>& out_tiles) const;
private:
bool run(const Level& level, bool side, std::vector<std::vector<cv::Point2d>>& out_pos,
std::vector<std::vector<Tile>>& out_tiles) const;
bool adapter(double& x, double& y) const;
int width = 0;
int height = 0;
const double degree = atan(1.0) * 4 / 180;
@@ -48,10 +61,9 @@ namespace Map
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])
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++)
@@ -60,68 +72,54 @@ namespace Map
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();
Level::view = data.at("view").as_integer();
key.stageId = data.at("stageId").as_string();
key.code = data.at("code").as_string();
key.levelId = data.at("levelId").as_string();
key.name = data.get("name", "null");
this->height = data.at("height").as_integer();
this->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();
this->view.emplace_back(std::move(tmp));
}
for (const json::value& row : data.at("tiles").as_array()) {
std::vector<Tile> tmp;
tmp.reserve(Level::width);
tmp.reserve(this->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()) });
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)
inline TileCalc::TileCalc(int width, int height, const json::array& json)
{
TileCalc::width = width;
TileCalc::height = height;
this->width = width;
this->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);
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(this->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(this->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(this->MatrixY, matrixY);
for (const json::value& item : json) {
this->levels.emplace_back(item);
}
}
@@ -141,96 +139,81 @@ namespace Map
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
inline bool TileCalc::contains(const std::string& any_key)
{
bool runned = false;
double x = 0, y = 0, z = 0;
for (const Map::Level& level : TileCalc::levels) {
if (/*level.code == code_or_name || */
level.name == code_or_name) {
switch (level.view) {
case 0:
x = 0;
y = -4.81;
z = -7.76;
if (side) {
x += 0.5975104570388794;
y -= 0.5;
z -= 0.882108688354492;
}
break;
case 1:
x = 0;
y = -5.60;
z = -8.92;
if (side) {
x += 0.7989424467086792;
y -= 0.5;
z -= 0.86448486328125;
}
break;
case 2:
x = 0;
y = -5.08;
z = -8.04;
if (side) {
x += 0.6461319923400879;
y -= 0.5;
z -= 0.877854309082031;
}
break;
default:
x = 0;
y = -6.1;
z = -9.78;
if (side) {
x += 0.948279857635498;
y -= 0.5;
z -= 0.85141918182373;
}
break;
}
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);
}
runned = true;
break;
}
}
return runned;
auto iter = std::find_if(levels.cbegin(), levels.cend(),
[&any_key](const Level& level) -> bool { return level.key == any_key; });
return iter != levels.cend();
}
}
bool TileCalc::contains(const LevelKey& key)
{
auto iter = std::find_if(levels.cbegin(), levels.cend(),
[&key](const Level& level) -> bool { return level.key == key; });
return iter != levels.cend();
}
inline bool TileCalc::run(const std::string& any_key, bool side, std::vector<std::vector<cv::Point2d>>& out_pos,
std::vector<std::vector<Tile>>& out_tiles) const
{
auto iter = std::find_if(levels.cbegin(), levels.cend(),
[&any_key](const Level& level) -> bool { return level.key == any_key; });
if (iter == levels.cend()) {
return false;
}
return run(*iter, side, out_pos, out_tiles);
}
inline bool TileCalc::run(const LevelKey& key, bool side, std::vector<std::vector<cv::Point2d>>& out_pos,
std::vector<std::vector<Tile>>& out_tiles) const
{
auto iter = std::find_if(levels.cbegin(), levels.cend(),
[&key](const Level& level) -> bool { return level.key == key; });
if (iter == levels.cend()) {
return false;
}
return run(*iter, side, out_pos, out_tiles);
}
inline bool TileCalc::run(const Level& level, bool side, std::vector<std::vector<cv::Point2d>>& out_pos,
std::vector<std::vector<Tile>>& out_tiles) const
{
auto [x, y, z] = level.view[side ? 1 : 0];
double adapter_y = 0, adapter_z = 0;
this->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 = this->MatrixP * this->MatrixX * this->MatrixY * raw;
}
else {
Finall_Matrix = this->MatrixP * this->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) * this->width,
(1 - view_point.at<double>(1, 0)) * this->height);
}
out_pos.emplace_back(tmp_pos);
out_tiles.emplace_back(tmp_tiles);
}
return true;
}
} // namespace Map

View File

@@ -0,0 +1,32 @@
#pragma once
#include <string>
namespace Map
{
struct LevelKey
{
std::string stageId;
std::string code;
std::string levelId;
std::string name;
bool empty_or_equal(const std::string& lhs, const std::string& rhs) const noexcept
{
return (lhs.empty() || rhs.empty()) ? true : lhs == rhs;
}
bool operator==(const LevelKey& other) const noexcept
{
return empty_or_equal(stageId, other.stageId) && empty_or_equal(code, other.code) &&
empty_or_equal(levelId, other.levelId) && empty_or_equal(name, other.name);
}
bool operator==(const std::string& any_key) const noexcept
{
if (any_key.empty()) {
return false;
}
return empty_or_equal(stageId, any_key) || empty_or_equal(code, any_key) ||
empty_or_equal(levelId, any_key) || empty_or_equal(name, any_key);
}
};
}

View File

@@ -1,37 +0,0 @@
#pragma once
// The way how the function is called
#if !defined(OCR_CALL)
#if defined(_WIN32)
#define OCR_CALL __stdcall
#else
#define OCR_CALL
#endif /* _WIN32 */
#endif /* OCR_CALL */
// The function exported symbols
#if defined _WIN32 || defined __CYGWIN__
#define OCR_IMPORT __declspec(dllimport)
#define OCR_EXPORT __declspec(dllexport)
#define OCR_LOCAL
#else
#if __GNUC__ >= 4
#define OCR_IMPORT __attribute__ ((visibility ("default")))
#define OCR_EXPORT __attribute__ ((visibility ("default")))
#define OCR_LOCAL __attribute__ ((visibility ("hidden")))
#else
#define OCR_IMPORT
#define OCR_EXPORT
#define OCR_LOCAL
#endif
#endif
#ifdef OCR_EXPORTS // defined if we are building the DLL (instead of using it)
#define OCRAPI_PORT OCR_EXPORT
#else
#define OCRAPI_PORT OCR_IMPORT
#endif // OCR_EXPORTS
#define OCRAPI OCRAPI_PORT OCR_CALL
#define OCRLOCAL OCR_LOCAL OCR_CALL

View File

@@ -1,56 +0,0 @@
#pragma once
#include "exports.h"
struct paddle_ocr_t;
typedef int OCR_ERROR;
typedef unsigned char uint8_t;
#define OCR_SUCCESS 0
#define OCR_FAILURE 1
#ifdef __cplusplus
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);
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 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 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
}
#endif

View File

@@ -1,310 +0,0 @@
/*
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

@@ -0,0 +1,77 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <iostream>
#include <memory>
#include <string>
#include <vector>
#include "fastdeploy/backends/common/multiclass_nms.h"
#include "fastdeploy/core/fd_tensor.h"
#include "fastdeploy/core/fd_type.h"
namespace fastdeploy {
/*! @brief Information of Tensor
*/
struct TensorInfo {
std::string name; ///< Name of tensor
std::vector<int> shape; ///< Shape of tensor
FDDataType dtype; ///< Data type of tensor
friend std::ostream& operator<<(std::ostream& output,
const TensorInfo& info) {
output << "TensorInfo(name: " << info.name << ", shape: [";
for (size_t i = 0; i < info.shape.size(); ++i) {
if (i == info.shape.size() - 1) {
output << info.shape[i];
} else {
output << info.shape[i] << ", ";
}
}
output << "], dtype: " << Str(info.dtype) << ")";
return output;
}
};
class BaseBackend {
public:
bool initialized_ = false;
BaseBackend() {}
virtual ~BaseBackend() = default;
virtual bool Initialized() const { return initialized_; }
virtual int NumInputs() const = 0;
virtual int NumOutputs() const = 0;
virtual TensorInfo GetInputInfo(int index) = 0;
virtual TensorInfo GetOutputInfo(int index) = 0;
virtual std::vector<TensorInfo> GetInputInfos() = 0;
virtual std::vector<TensorInfo> GetOutputInfos() = 0;
// if copy_to_fd is true, copy memory data to FDTensor
// else share memory to FDTensor(only Paddle、ORT、TRT、OpenVINO support it)
virtual bool Infer(std::vector<FDTensor>& inputs,
std::vector<FDTensor>* outputs,
bool copy_to_fd = true) = 0;
virtual std::unique_ptr<BaseBackend> Clone(void *stream = nullptr,
int device_id = -1) {
FDERROR << "Clone no support" << std::endl;
return nullptr;
}
};
} // namespace fastdeploy

View File

@@ -0,0 +1,45 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <map>
#include <string>
#include <vector>
namespace fastdeploy {
namespace backend {
struct MultiClassNMS {
int64_t background_label = -1;
int64_t keep_top_k = -1;
float nms_eta;
float nms_threshold = 0.7;
int64_t nms_top_k;
bool normalized;
float score_threshold;
std::vector<int32_t> out_num_rois_data;
std::vector<int32_t> out_index_data;
std::vector<float> out_box_data;
void FastNMS(const float* boxes, const float* scores, const int& num_boxes,
std::vector<int>* keep_indices);
int NMSForEachSample(const float* boxes, const float* scores, int num_boxes,
int num_classes,
std::map<int, std::vector<int>>* keep_indices);
void Compute(const float* boxes, const float* scores,
const std::vector<int64_t>& boxes_dim,
const std::vector<int64_t>& scores_dim);
};
} // namespace backend
} // namespace fastdeploy

View File

@@ -0,0 +1,89 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <map>
#include <string>
#include <algorithm>
#include <cmath>
#include "fastdeploy/core/fd_tensor.h"
#include "fastdeploy/utils/utils.h"
#ifndef NON_64_PLATFORM
#include "onnxruntime_cxx_api.h" // NOLINT
#ifdef WITH_GPU
#include "fastdeploy/backends/op_cuda_kernels/adaptive_pool2d_kernel.h"
#endif
namespace fastdeploy {
struct AdaptivePool2dKernel {
protected:
std::string pooling_type_ = "avg";
std::vector<int64_t> output_size_ = {};
Ort::CustomOpApi ort_;
void* compute_stream_;
const char* provider_;
public:
AdaptivePool2dKernel(Ort::CustomOpApi ort,
const OrtKernelInfo* info,
const char* provider)
: ort_(ort) {
GetAttribute(info);
provider_ = provider;
}
void GetAttribute(const OrtKernelInfo* info);
void Compute(OrtKernelContext* context);
void CpuAdaptivePool(const std::vector<int64_t>& input_size,
const std::vector<int64_t>& output_size,
const float* input_data,
float* output_data);
};
struct AdaptivePool2dOp
: Ort::CustomOpBase<AdaptivePool2dOp, AdaptivePool2dKernel> {
explicit AdaptivePool2dOp(const char* provider) : provider_(provider) {}
void* CreateKernel(Ort::CustomOpApi api, const OrtKernelInfo* info) const {
return new AdaptivePool2dKernel(api, info, provider_);
}
const char* GetName() const { return "AdaptivePool2d"; }
size_t GetInputTypeCount() const { return 1; }
ONNXTensorElementDataType GetInputType(size_t index) const {
return ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT;
}
size_t GetOutputTypeCount() const { return 1; }
ONNXTensorElementDataType GetOutputType(size_t index) const {
return ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT;
}
const char* GetExecutionProviderType() const {
return provider_;
}
private:
const char* provider_;
};
} // namespace fastdeploy
#endif

View File

@@ -0,0 +1,81 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <map>
#ifndef NON_64_PLATFORM
#include "onnxruntime_cxx_api.h" // NOLINT
namespace fastdeploy {
struct MultiClassNmsKernel {
protected:
int64_t background_label = -1;
int64_t keep_top_k = -1;
float nms_eta;
float nms_threshold = 0.7;
int64_t nms_top_k;
bool normalized;
float score_threshold;
Ort::CustomOpApi ort_;
public:
MultiClassNmsKernel(Ort::CustomOpApi ort, const OrtKernelInfo* info)
: ort_(ort) {
GetAttribute(info);
}
void GetAttribute(const OrtKernelInfo* info);
void Compute(OrtKernelContext* context);
void FastNMS(const float* boxes, const float* scores, const int& num_boxes,
std::vector<int>* keep_indices);
int NMSForEachSample(const float* boxes, const float* scores, int num_boxes,
int num_classes,
std::map<int, std::vector<int>>* keep_indices);
};
struct MultiClassNmsOp
: Ort::CustomOpBase<MultiClassNmsOp, MultiClassNmsKernel> {
void* CreateKernel(Ort::CustomOpApi api, const OrtKernelInfo* info) const {
return new MultiClassNmsKernel(api, info);
}
const char* GetName() const { return "MultiClassNMS"; }
size_t GetInputTypeCount() const { return 2; }
ONNXTensorElementDataType GetInputType(size_t index) const {
return ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT;
}
size_t GetOutputTypeCount() const { return 3; }
ONNXTensorElementDataType GetOutputType(size_t index) const {
if (index == 0) {
return ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT;
}
return ONNX_TENSOR_ELEMENT_DATA_TYPE_INT32;
}
const char* GetExecutionProviderType() const {
return "CPUExecutionProvider";
}
};
} // namespace fastdeploy
#endif

View File

@@ -0,0 +1,99 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <iostream>
#include <memory>
#include <string>
#include <vector>
#include "fastdeploy/backends/backend.h"
#include "onnxruntime_cxx_api.h" // NOLINT
namespace fastdeploy {
struct OrtValueInfo {
std::string name;
std::vector<int64_t> shape;
ONNXTensorElementDataType dtype;
};
struct OrtBackendOption {
// -1 means default
// 0: ORT_DISABLE_ALL
// 1: ORT_ENABLE_BASIC
// 2: ORT_ENABLE_EXTENDED
// 99: ORT_ENABLE_ALL (enable some custom optimizations e.g bert)
int graph_optimization_level = -1;
int intra_op_num_threads = -1;
int inter_op_num_threads = -1;
// 0: ORT_SEQUENTIAL
// 1: ORT_PARALLEL
int execution_mode = -1;
bool use_gpu = false;
int gpu_id = 0;
void* external_stream_ = nullptr;
// inside parameter, maybe remove next version
bool remove_multiclass_nms_ = false;
std::map<std::string, std::string> custom_op_info_;
};
class OrtBackend : public BaseBackend {
public:
OrtBackend() {}
virtual ~OrtBackend() = default;
void BuildOption(const OrtBackendOption& option);
bool InitFromPaddle(const std::string& model_file,
const std::string& params_file,
const OrtBackendOption& option = OrtBackendOption(),
bool verbose = false);
bool InitFromOnnx(const std::string& model_file,
const OrtBackendOption& option = OrtBackendOption(),
bool from_memory_buffer = false);
bool Infer(std::vector<FDTensor>& inputs,
std::vector<FDTensor>* outputs,
bool copy_to_fd = true) override;
int NumInputs() const override { return inputs_desc_.size(); }
int NumOutputs() const override { return outputs_desc_.size(); }
TensorInfo GetInputInfo(int index) override;
TensorInfo GetOutputInfo(int index) override;
std::vector<TensorInfo> GetInputInfos() override;
std::vector<TensorInfo> GetOutputInfos() override;
static std::vector<OrtCustomOp*> custom_operators_;
void InitCustomOperators();
private:
Ort::Env env_;
Ort::Session session_{nullptr};
Ort::SessionOptions session_options_;
std::shared_ptr<Ort::IoBinding> binding_;
std::vector<OrtValueInfo> inputs_desc_;
std::vector<OrtValueInfo> outputs_desc_;
#ifndef NON_64_PLATFORM
Ort::CustomOpDomain custom_op_domain_ = Ort::CustomOpDomain("Paddle");
#endif
OrtBackendOption option_;
void OrtValueToFDTensor(const Ort::Value& value, FDTensor* tensor,
const std::string& name, bool copy_to_fd);
};
} // namespace fastdeploy

View File

@@ -0,0 +1,39 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <iostream>
#include <memory>
#include <string>
#include <vector>
#include "fastdeploy/backends/backend.h"
#include "onnxruntime_cxx_api.h" // NOLINT
namespace fastdeploy {
// Convert FDDataType to OrtDataType
ONNXTensorElementDataType GetOrtDtype(const FDDataType& fd_dtype);
// Convert OrtDataType to FDDataType
FDDataType GetFdDtype(const ONNXTensorElementDataType& ort_dtype);
// Create Ort::Value
// is_backend_cuda specify if the onnxruntime use CUDAExectionProvider
// While is_backend_cuda = true, and tensor.device = Device::GPU
// Will directly share the cuda data in tensor to OrtValue
Ort::Value CreateOrtValue(FDTensor& tensor, bool is_backend_cuda = false);
} // namespace fastdeploy

View File

@@ -0,0 +1,104 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/backends/backend.h"
#include "fastdeploy/core/fd_tensor.h"
#include "rknn_api.h" // NOLINT
#include "fastdeploy/backends/rknpu/rknpu2/rknpu2_config.h"
#include <cstring>
#include <iostream>
#include <memory>
#include <string>
#include <vector>
namespace fastdeploy {
struct RKNPU2BackendOption {
rknpu2::CpuName cpu_name = rknpu2::CpuName::RK3588;
// The specification of NPU core setting.It has the following choices :
// RKNN_NPU_CORE_AUTO : Referring to automatic mode, meaning that it will
// select the idle core inside the NPU.
// RKNN_NPU_CORE_0 : Running on the NPU0 core
// RKNN_NPU_CORE_1: Runing on the NPU1 core
// RKNN_NPU_CORE_2: Runing on the NPU2 core
// RKNN_NPU_CORE_0_1: Running on both NPU0 and NPU1 core simultaneously.
// RKNN_NPU_CORE_0_1_2: Running on both NPU0, NPU1 and NPU2 simultaneously.
rknpu2::CoreMask core_mask = rknpu2::CoreMask::RKNN_NPU_CORE_AUTO;
};
class RKNPU2Backend : public BaseBackend {
public:
RKNPU2Backend() = default;
virtual ~RKNPU2Backend();
// RKNN API
bool LoadModel(void* model);
bool GetSDKAndDeviceVersion();
bool SetCoreMask(rknpu2::CoreMask& core_mask) const;
bool GetModelInputOutputInfos();
// BaseBackend API
void BuildOption(const RKNPU2BackendOption& option);
bool InitFromRKNN(const std::string& model_file,
const RKNPU2BackendOption& option = RKNPU2BackendOption());
int NumInputs() const override {
return static_cast<int>(inputs_desc_.size());
}
int NumOutputs() const override {
return static_cast<int>(outputs_desc_.size());
}
TensorInfo GetInputInfo(int index) override;
TensorInfo GetOutputInfo(int index) override;
std::vector<TensorInfo> GetInputInfos() override;
std::vector<TensorInfo> GetOutputInfos() override;
bool Infer(std::vector<FDTensor>& inputs,
std::vector<FDTensor>* outputs,
bool copy_to_fd = true) override;
private:
// The object of rknn context.
rknn_context ctx{};
// The structure rknn_sdk_version is used to indicate the version
// information of the RKNN SDK.
rknn_sdk_version sdk_ver{};
// The structure rknn_input_output_num represents the number of
// input and output Tensor
rknn_input_output_num io_num{};
std::vector<TensorInfo> inputs_desc_;
std::vector<TensorInfo> outputs_desc_;
rknn_tensor_attr* input_attrs_ = nullptr;
rknn_tensor_attr* output_attrs_ = nullptr;
rknn_tensor_mem** input_mems_;
rknn_tensor_mem** output_mems_;
bool infer_init = false;
RKNPU2BackendOption option_;
static void DumpTensorAttr(rknn_tensor_attr& attr);
static FDDataType RknnTensorTypeToFDDataType(rknn_tensor_type type);
static rknn_tensor_type FDDataTypeToRknnTensorType(FDDataType type);
};
} // namespace fastdeploy

View File

@@ -0,0 +1,37 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
namespace fastdeploy {
namespace rknpu2 {
typedef enum _rknpu2_cpu_name {
RK356X = 0, /* run on RK356X. */
RK3588 = 1, /* default,run on RK3588. */
UNDEFINED,
} CpuName;
/*! RKNPU2 core mask for mobile device. */
typedef enum _rknpu2_core_mask {
RKNN_NPU_CORE_AUTO = 0, //< default, run on NPU core randomly.
RKNN_NPU_CORE_0 = 1, //< run on NPU core 0.
RKNN_NPU_CORE_1 = 2, //< run on NPU core 1.
RKNN_NPU_CORE_2 = 4, //< run on NPU core 2.
RKNN_NPU_CORE_0_1 =
RKNN_NPU_CORE_0 | RKNN_NPU_CORE_1, //< run on NPU core 1 and core 2.
RKNN_NPU_CORE_0_1_2 =
RKNN_NPU_CORE_0_1 | RKNN_NPU_CORE_2, //< run on NPU core 1 and core 2.
RKNN_NPU_CORE_UNDEFINED,
} CoreMask;
} // namespace rknpu2
} // namespace fastdeploy

View File

@@ -0,0 +1,60 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <memory>
#include <new>
#include <numeric>
#include <string>
#include <vector>
#include "fastdeploy/utils/utils.h"
namespace fastdeploy {
class FASTDEPLOY_DECL FDHostAllocator {
public:
bool operator()(void** ptr, size_t size) const;
};
class FASTDEPLOY_DECL FDHostFree {
public:
void operator()(void* ptr) const;
};
#ifdef WITH_GPU
class FASTDEPLOY_DECL FDDeviceAllocator {
public:
bool operator()(void** ptr, size_t size) const;
};
class FASTDEPLOY_DECL FDDeviceFree {
public:
void operator()(void* ptr) const;
};
class FASTDEPLOY_DECL FDDeviceHostAllocator {
public:
bool operator()(void** ptr, size_t size) const;
};
class FASTDEPLOY_DECL FDDeviceHostFree {
public:
void operator()(void* ptr) const;
};
#endif
} // namespace fastdeploy

View File

@@ -0,0 +1,72 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#ifndef FASTDEPLOY_LIB
/* #undef FASTDEPLOY_LIB */
#endif
#ifndef ENABLE_PADDLE_FRONTEND
/* #undef ENABLE_PADDLE_FRONTEND */
#endif
#ifndef ENABLE_ORT_BACKEND
#define ENABLE_ORT_BACKEND
#endif
#ifndef ENABLE_PADDLE_BACKEND
/* #undef ENABLE_PADDLE_BACKEND */
#endif
#ifndef ENABLE_POROS_BACKEND
/* #undef ENABLE_POROS_BACKEND */
#endif
#ifndef ENABLE_OPENVINO_BACKEND
/* #undef ENABLE_OPENVINO_BACKEND */
#endif
#ifndef WITH_GPU
/* #undef WITH_GPU */
#endif
#ifndef ENABLE_TRT_BACKEND
/* #undef ENABLE_TRT_BACKEND */
#endif
#ifndef ENABLE_VISION
#define ENABLE_VISION
#endif
#ifndef ENABLE_FLYCV
/* #undef ENABLE_FLYCV */
#endif
#ifndef ENABLE_TEXT
/* #undef ENABLE_TEXT */
#endif
#ifndef ENABLE_OPENCV_CUDA
/* #undef ENABLE_OPENCV_CUDA */
#endif
#ifdef ENABLE_VISION
#ifndef ENABLE_VISION_VISUALIZE
#define ENABLE_VISION_VISUALIZE
#endif
#endif
#ifndef ENABLE_FDTENSOR_FUNC
/* #undef ENABLE_FDTENSOR_FUNC */
#endif

View File

@@ -0,0 +1,121 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <cstdint>
#include <limits>
#include "fastdeploy/core/fd_type.h"
#include "fastdeploy/core/float16.h"
namespace fastdeploy {
class Scalar {
public:
// Constructor support implicit
Scalar() : Scalar(0) {}
Scalar(double val) : dtype_(FDDataType::FP64) { // NOLINT
data_.f64 = val;
}
Scalar(float val) : dtype_(FDDataType::FP32) { // NOLINT
data_.f32 = val;
}
Scalar(float16 val) : dtype_(FDDataType::FP16) { // NOLINT
data_.f16 = val;
}
Scalar(int64_t val) : dtype_(FDDataType::INT64) { // NOLINT
data_.i64 = val;
}
Scalar(int32_t val) : dtype_(FDDataType::INT32) { // NOLINT
data_.i32 = val;
}
Scalar(int16_t val) : dtype_(FDDataType::INT16) { // NOLINT
data_.i16 = val;
}
Scalar(int8_t val) : dtype_(FDDataType::INT8) { // NOLINT
data_.i8 = val;
}
Scalar(uint8_t val) : dtype_(FDDataType::UINT8) { // NOLINT
data_.ui8 = val;
}
Scalar(bool val) : dtype_(FDDataType::BOOL) { // NOLINT
data_.b = val;
}
// The compatible method for fliud operators,
// and it will be removed in the future.
explicit Scalar(const std::string& str_value) : dtype_(FDDataType::FP64) {
if (str_value == "inf") {
data_.f64 = std::numeric_limits<double>::infinity();
} else if (str_value == "-inf") {
data_.f64 = -std::numeric_limits<double>::infinity();
} else if (str_value == "nan") {
data_.f64 = std::numeric_limits<double>::quiet_NaN();
} else {
data_.f64 = std::stod(str_value);
}
}
template <typename RT> inline RT to() const {
switch (dtype_) {
case FDDataType::FP32:
return static_cast<RT>(data_.f32);
case FDDataType::FP64:
return static_cast<RT>(data_.f64);
case FDDataType::FP16:
return static_cast<RT>(data_.f16);
case FDDataType::INT32:
return static_cast<RT>(data_.i32);
case FDDataType::INT64:
return static_cast<RT>(data_.i64);
case FDDataType::INT16:
return static_cast<RT>(data_.i16);
case FDDataType::INT8:
return static_cast<RT>(data_.i8);
case FDDataType::UINT8:
return static_cast<RT>(data_.ui8);
case FDDataType::BOOL:
return static_cast<RT>(data_.b);
default:
FDASSERT(false, "Invalid enum scalar data type `%s`.",
Str(dtype_).c_str());
}
}
FDDataType dtype() const { return dtype_; }
private:
FDDataType dtype_;
union data {
bool b;
int8_t i8;
int16_t i16;
int32_t i32;
int64_t i64;
uint8_t ui8;
float16 f16;
float f32;
double f64;
} data_;
};
} // namespace fastdeploy

View File

@@ -0,0 +1,153 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <iostream>
#include <numeric>
#include <string>
#include <vector>
#include "fastdeploy/core/allocate.h"
#include "fastdeploy/core/fd_scalar.h"
#include "fastdeploy/core/fd_type.h"
namespace fastdeploy {
struct FASTDEPLOY_DECL FDTensor {
// std::vector<int8_t> data;
void* buffer_ = nullptr;
std::vector<int64_t> shape = {0};
std::string name = "";
FDDataType dtype = FDDataType::INT8;
// This use to skip memory copy step
// the external_data_ptr will point to the user allocated memory
// user has to maintain the memory, allocate and release
void* external_data_ptr = nullptr;
// The internal data will be on CPU
// Some times, the external data is on the GPU, and we are going to use
// GPU to inference the model
// so we can skip data transfer, which may improve the efficience
Device device = Device::CPU;
// By default the device id of FDTensor is -1, which means this value is
// invalid, and FDTensor is using the same device id as Runtime.
int device_id = -1;
// Whether the data buffer is in pinned memory, which is allocated
// with cudaMallocHost()
bool is_pinned_memory = false;
// if the external data is not on CPU, we use this temporary buffer
// to transfer data to CPU at some cases we need to visit the
// other devices' data
std::vector<int8_t> temporary_cpu_buffer;
// Get data buffer pointer
void* MutableData();
void* Data();
bool IsShared() { return external_data_ptr != nullptr; }
void StopSharing();
const void* Data() const;
// Use this data to get the tensor data to process
// Since the most senario is process data in CPU
// this function will return a pointer to cpu memory
// buffer.
// If the original data is on other device, the data
// will copy to cpu store in `temporary_cpu_buffer`
const void* CpuData() const;
// Set user memory buffer for Tensor, the memory is managed by
// the user it self, but the Tensor will share the memory with user
// So take care with the user buffer
void SetExternalData(const std::vector<int64_t>& new_shape,
const FDDataType& data_type, void* data_buffer,
const Device& new_device = Device::CPU,
int new_device_id = -1);
// Expand the shape of a Tensor. Insert a new axis that will appear
// at the `axis` position in the expanded Tensor shape.
void ExpandDim(int64_t axis = 0);
// Squeeze the shape of a Tensor. Erase the axis that will appear
// at the `axis` position in the squeezed Tensor shape.
void Squeeze(int64_t axis = 0);
// Initialize Tensor
// Include setting attribute for tensor
// and allocate cpu memory buffer
void Allocate(const std::vector<int64_t>& new_shape,
const FDDataType& data_type,
const std::string& tensor_name = "",
const Device& new_device = Device::CPU);
// Total size of tensor memory buffer in bytes
int Nbytes() const;
// Total number of elements in this tensor
int Numel() const;
// Get shape of FDTensor
std::vector<int64_t> Shape() const { return shape; }
// Get dtype of FDTensor
FDDataType Dtype() const { return dtype; }
void Resize(size_t nbytes);
void Resize(const std::vector<int64_t>& new_shape);
void Resize(const std::vector<int64_t>& new_shape,
const FDDataType& data_type, const std::string& tensor_name = "",
const Device& new_device = Device::CPU);
bool Reshape(const std::vector<int64_t>& new_shape);
// Debug function
// Use this function to print shape, dtype, mean, max, min
// prefix will also be printed as tag
void PrintInfo(const std::string& prefix = "TensorInfo: ") const;
bool ReallocFn(size_t nbytes);
void FreeFn();
FDTensor() {}
explicit FDTensor(const std::string& tensor_name);
explicit FDTensor(const char* tensor_name);
// Deep copy
FDTensor(const FDTensor& other);
// Move constructor
FDTensor(FDTensor&& other);
// Deep copy assignment
FDTensor& operator=(const FDTensor& other);
// Move assignment
FDTensor& operator=(FDTensor&& other);
// Scalar to FDTensor
explicit FDTensor(const Scalar& scalar);
~FDTensor() { FreeFn(); }
static void CopyBuffer(void* dst, const void* src, size_t nbytes,
const Device& device = Device::CPU,
bool is_pinned_memory = false);
};
} // namespace fastdeploy

View File

@@ -0,0 +1,80 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <ostream>
#include <sstream>
#include <string>
#include "fastdeploy/core/config.h"
#include "fastdeploy/utils/utils.h"
namespace fastdeploy {
enum FASTDEPLOY_DECL Device { CPU, GPU, RKNPU, IPU, TIMVX};
FASTDEPLOY_DECL std::string Str(const Device& d);
enum FASTDEPLOY_DECL FDDataType {
BOOL,
INT16,
INT32,
INT64,
FP16,
FP32,
FP64,
UNKNOWN1,
UNKNOWN2,
UNKNOWN3,
UNKNOWN4,
UNKNOWN5,
UNKNOWN6,
UNKNOWN7,
UNKNOWN8,
UNKNOWN9,
UNKNOWN10,
UNKNOWN11,
UNKNOWN12,
UNKNOWN13,
UINT8,
INT8
};
FASTDEPLOY_DECL std::ostream& operator<<(std::ostream& out, const Device& d);
FASTDEPLOY_DECL std::ostream& operator<<(std::ostream& out,
const FDDataType& fdt);
FASTDEPLOY_DECL std::string Str(const FDDataType& fdt);
FASTDEPLOY_DECL int32_t FDDataTypeSize(const FDDataType& data_dtype);
template <typename PlainType>
struct FASTDEPLOY_DECL TypeToDataType {
static const FDDataType dtype;
};
/*! Deep learning model format */
enum ModelFormat {
AUTOREC, ///< Auto recognize the model format by model file name
PADDLE, ///< Model with paddlepaddle format
ONNX, ///< Model with ONNX format
RKNN, ///< Model with RKNN format
TORCHSCRIPT, ///< Model with TorchScript format
};
FASTDEPLOY_DECL std::ostream& operator<<(std::ostream& out,
const ModelFormat& format);
} // namespace fastdeploy

View File

@@ -0,0 +1,665 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <stdint.h>
#include <cmath>
#include <iostream>
#include <limits>
#if !defined(_WIN32)
#define FD_ALIGN(x) __attribute__((aligned(x)))
#else
#define FD_ALIGN(x) __declspec(align(x))
#endif
namespace fastdeploy {
struct FD_ALIGN(2) float16 {
public:
uint16_t x;
// The following defaulted special class member functions
// are added to make float16 pass the std::is_trivial test
float16() = default;
float16(const float16& o) = default;
float16& operator=(const float16& o) = default;
float16(float16&& o) = default;
float16& operator=(float16&& o) = default;
~float16() = default;
// Constructors
#ifdef FD_WITH_NATIVE_FP16
// __fp16 is a native half precision data type for arm cpu,
// float16_t is an alias for __fp16
inline explicit float16(const float16_t& h) {
x = *reinterpret_cast<const uint16_t*>(&h);
}
#endif
inline explicit float16(float val) {
#if defined(FD_WITH_NATIVE_FP16)
float32x4_t tmp = vld1q_dup_f32(&val);
float16_t res = vget_lane_f16(vcvt_f16_f32(tmp), 0);
x = *reinterpret_cast<uint16_t*>(&res);
#elif defined(__F16C__)
x = _cvtss_sh(val, 0);
#else
// Conversion routine adapted from
// http://stackoverflow.com/questions/1659440/32-bit-to-16-bit-floating-point-conversion
Bits v, s;
v.f = val;
uint32_t sign = v.si & sigN;
v.si ^= sign;
sign >>= shiftSign; // logical shift
s.si = mulN;
s.si = s.f * v.f; // correct subnormals
v.si ^= (s.si ^ v.si) & -(minN > v.si);
v.si ^= (infN ^ v.si) & -((infN > v.si) & (v.si > maxN));
v.si ^= (nanN ^ v.si) & -((nanN > v.si) & (v.si > infN));
v.ui >>= shift; // logical shift
v.si ^= ((v.si - maxD) ^ v.si) & -(v.si > maxC);
v.si ^= ((v.si - minD) ^ v.si) & -(v.si > subC);
x = v.ui | sign;
#endif
}
inline explicit float16(bool b) : x(b ? 0x3c00 : 0) {}
template <class T>
inline explicit float16(const T& val)
: x(float16(static_cast<float>(val)).x) {}
// Assignment operators
#ifdef FD_WITH_NATIVE_FP16
inline float16& operator=(const float16_t& rhs) {
x = *reinterpret_cast<const uint16_t*>(&rhs);
return *this;
}
#endif
inline float16& operator=(bool b) {
x = b ? 0x3c00 : 0;
return *this;
}
inline float16& operator=(int8_t val) {
x = float16(val).x;
return *this;
}
inline float16& operator=(uint8_t val) {
x = float16(val).x;
return *this;
}
inline float16& operator=(int16_t val) {
x = float16(val).x;
return *this;
}
inline float16& operator=(uint16_t val) {
x = float16(val).x;
return *this;
}
inline float16& operator=(int32_t val) {
x = float16(val).x;
return *this;
}
inline float16& operator=(uint32_t val) {
x = float16(val).x;
return *this;
}
inline float16& operator=(int64_t val) {
x = float16(val).x;
return *this;
}
inline float16& operator=(uint64_t val) {
x = float16(val).x;
return *this;
}
inline float16& operator=(float val) {
x = float16(val).x;
return *this;
}
inline float16& operator=(double val) {
x = float16(val).x;
return *this;
}
// Conversion opertors
#ifdef FD_WITH_NATIVE_FP16
HOSTDEVICE inline explicit operator float16_t() const {
return *reinterpret_cast<const float16_t*>(this);
}
#endif
inline operator float() const {
#if defined(FD_WITH_NATIVE_FP16)
float16x4_t res = vld1_dup_f16(reinterpret_cast<const float16_t*>(this));
return vgetq_lane_f32(vcvt_f32_f16(res), 0);
#elif defined(__F16C__)
return _cvtsh_ss(this->x);
#else
// Conversion routine adapted from
// http://stackoverflow.com/questions/1659440/32-bit-to-16-bit-floating-point-conversion
Bits v;
v.ui = this->x;
int32_t sign = v.si & sigC;
v.si ^= sign;
sign <<= shiftSign;
v.si ^= ((v.si + minD) ^ v.si) & -(v.si > subC);
v.si ^= ((v.si + maxD) ^ v.si) & -(v.si > maxC);
Bits s;
s.si = mulC;
s.f *= v.si;
int32_t mask = -(norC > v.si);
v.si <<= shift;
v.si ^= (s.si ^ v.si) & mask;
v.si |= sign;
return v.f;
#endif
}
inline explicit operator bool() const { return (x & 0x7fff) != 0; }
inline explicit operator int8_t() const {
return static_cast<int8_t>(static_cast<float>(*this));
}
inline explicit operator uint8_t() const {
return static_cast<uint8_t>(static_cast<float>(*this));
}
inline explicit operator int16_t() const {
return static_cast<int16_t>(static_cast<float>(*this));
}
inline explicit operator uint16_t() const {
return static_cast<uint16_t>(static_cast<float>(*this));
}
inline explicit operator int32_t() const {
return static_cast<int32_t>(static_cast<float>(*this));
}
inline explicit operator uint32_t() const {
return static_cast<uint32_t>(static_cast<float>(*this));
}
inline explicit operator int64_t() const {
return static_cast<int64_t>(static_cast<float>(*this));
}
inline explicit operator uint64_t() const {
return static_cast<uint64_t>(static_cast<float>(*this));
}
inline operator double() const {
return static_cast<double>(static_cast<float>(*this));
}
inline bool operator>(const float& other) const {
return this->operator float() > other;
}
inline bool operator>(const double& other) const {
return this->operator double() > other;
}
inline bool operator<(const float& other) const {
return this->operator float() > other;
}
inline bool operator<(const double& other) const {
return this->operator double() > other;
}
template <typename T,
typename std::enable_if<!std::is_same<T, float16>::value,
bool>::type = true>
inline float16& operator+=(const T& other) {
*this = float16(static_cast<T>(*this) + other);
return *this;
}
private:
union Bits {
float f;
int32_t si;
uint32_t ui;
};
static const int shift = 13;
static const int shiftSign = 16;
static const int32_t infN = 0x7F800000;
static const int32_t maxN = 0x477FE000; // max flt16 as flt32
static const int32_t minN = 0x38800000; // min flt16 normal as flt32
static const int32_t sigN = 0x80000000; // sign bit
static constexpr int32_t infC = infN >> shift;
static constexpr int32_t nanN = (infC + 1)
<< shift; // minimum flt16 nan as float32
static constexpr int32_t maxC = maxN >> shift;
static constexpr int32_t minC = minN >> shift;
static constexpr int32_t sigC = sigN >> shiftSign;
static const int32_t mulN = 0x52000000; // (1 << 23) / minN
static const int32_t mulC = 0x33800000; // minN / (1 << (23 - shift))
static const int32_t subC = 0x003FF; // max flt32 subnormal downshifted
static const int32_t norC = 0x00400; // min flt32 normal downshifted
static constexpr int32_t maxD = infC - maxC - 1;
static constexpr int32_t minD = minC - subC - 1;
};
// Arithmetic operators for float16 on ARMv8.2-A CPU
#if defined(FD_WITH_NATIVE_FP16)
inline float16 operator+(const float16& a, const float16& b) {
float16 res;
asm volatile(
"ld1 {v0.h}[0], [%[a_ptr]]\n"
"ld1 {v1.h}[0], [%[b_ptr]]\n"
"fadd h0, h0, h1\n"
"st1 {v0.h}[0], [%[res_ptr]]\n"
: // outputs
: // inputs
[a_ptr] "r"(&(a.x)), [b_ptr] "r"(&(b.x)),
[res_ptr] "r"(&(res.x))
: // clobbers
"memory", "v0", "v1");
return res;
}
inline float16 operator-(const float16& a, const float16& b) {
float16 res;
asm volatile(
"ld1 {v0.h}[0], [%[a_ptr]]\n"
"ld1 {v1.h}[0], [%[b_ptr]]\n"
"fsub h0, h0, h1\n"
"st1 {v0.h}[0], [%[res_ptr]]\n"
: // outputs
: // inputs
[a_ptr] "r"(&(a.x)), [b_ptr] "r"(&(b.x)),
[res_ptr] "r"(&(res.x))
: // clobbers
"memory", "v0", "v1");
return res;
}
inline float16 operator*(const float16& a, const float16& b) {
float16 res;
asm volatile(
"ld1 {v0.h}[0], [%[a_ptr]]\n"
"ld1 {v1.h}[0], [%[b_ptr]]\n"
"fmul h0, h0, h1\n"
"st1 {v0.h}[0], [%[res_ptr]]\n"
: // outputs
: // inputs
[a_ptr] "r"(&(a.x)), [b_ptr] "r"(&(b.x)),
[res_ptr] "r"(&(res.x))
: // clobbers
"memory", "v0", "v1");
return res;
}
inline float16 operator/(const float16& a, const float16& b) {
float16 res;
asm volatile(
"ld1 {v0.h}[0], [%[a_ptr]]\n"
"ld1 {v1.h}[0], [%[b_ptr]]\n"
"fdiv h0, h0, h1\n"
"st1 {v0.h}[0], [%[res_ptr]]\n"
: // outputs
: // inputs
[a_ptr] "r"(&(a.x)), [b_ptr] "r"(&(b.x)),
[res_ptr] "r"(&(res.x))
: // clobbers
"memory", "v0", "v1");
return res;
}
inline float16 operator-(const float16& a) {
float16 res;
asm volatile(
"ld1 {v0.h}[0], [%[a_ptr]]\n"
"fneg h0, h0\n"
"st1 {v0.h}[0], [%[res_ptr]]\n"
: // outputs
: // inputs
[a_ptr] "r"(&(a.x)),
[res_ptr] "r"(&(res.x))
: // clobbers
"memory", "v0");
return res;
}
inline float16& operator+=(float16& a, const float16& b) { // NOLINT
a = a + b;
return a;
}
inline float16& operator-=(float16& a, const float16& b) { // NOLINT
a = a - b;
return a;
}
inline float16& operator*=(float16& a, const float16& b) { // NOLINT
a = a * b;
return a;
}
inline float16& operator/=(float16& a, const float16& b) { // NOLINT
a = a / b;
return a;
}
inline bool operator==(const float16& a, const float16& b) {
uint16_t res;
asm volatile(
"ld1 {v0.h}[0], [%[a_ptr]]\n"
"ld1 {v1.h}[0], [%[b_ptr]]\n"
"fcmeq h0, h0, h1\n"
"st1 {v0.h}[0], [%[res_ptr]]\n"
: // outputs
: // inputs
[a_ptr] "r"(&(a.x)), [b_ptr] "r"(&(b.x)),
[res_ptr] "r"(&res)
: // clobbers
"memory", "v0", "v1");
return (res & 0xffff) != 0;
}
inline bool operator!=(const float16& a, const float16& b) { return !(a == b); }
inline bool operator<(const float16& a, const float16& b) {
uint16_t res;
asm volatile(
"ld1 {v1.h}[0], [%[a_ptr]]\n"
"ld1 {v0.h}[0], [%[b_ptr]]\n"
"fcmgt h0, h0, h1\n"
"st1 {v0.h}[0], [%[res_ptr]]\n"
: // outputs
: // inputs
[a_ptr] "r"(&(a.x)), [b_ptr] "r"(&(b.x)),
[res_ptr] "r"(&res)
: // clobbers
"memory", "v0", "v1");
return (res & 0xffff) != 0;
}
inline bool operator<=(const float16& a, const float16& b) {
uint16_t res;
asm volatile(
"ld1 {v1.h}[0], [%[a_ptr]]\n"
"ld1 {v0.h}[0], [%[b_ptr]]\n"
"fcmge h0, h0, h1\n"
"st1 {v0.h}[0], [%[res_ptr]]\n"
: // outputs
: // inputs
[a_ptr] "r"(&(a.x)), [b_ptr] "r"(&(b.x)),
[res_ptr] "r"(&res)
: // clobbers
"memory", "v0", "v1");
return (res & 0xffff) != 0;
}
inline bool operator>(const float16& a, const float16& b) {
uint16_t res;
asm volatile(
"ld1 {v0.h}[0], [%[a_ptr]]\n"
"ld1 {v1.h}[0], [%[b_ptr]]\n"
"fcmgt h0, h0, h1\n"
"st1 {v0.h}[0], [%[res_ptr]]\n"
: // outputs
: // inputs
[a_ptr] "r"(&(a.x)), [b_ptr] "r"(&(b.x)),
[res_ptr] "r"(&res)
: // clobbers
"memory", "v0", "v1");
return (res & 0xffff) != 0;
}
inline bool operator>=(const float16& a, const float16& b) {
uint16_t res;
asm volatile(
"ld1 {v0.h}[0], [%[a_ptr]]\n"
"ld1 {v1.h}[0], [%[b_ptr]]\n"
"fcmge h0, h0, h1\n"
"st1 {v0.h}[0], [%[res_ptr]]\n"
: // outputs
: // inputs
[a_ptr] "r"(&(a.x)), [b_ptr] "r"(&(b.x)),
[res_ptr] "r"(&res)
: // clobbers
"memory", "v0", "v1");
return (res & 0xffff) != 0;
#else
inline float16 operator+(const float16& a, const float16& b) {
return float16(static_cast<float>(a) + static_cast<float>(b));
}
inline float16 operator-(const float16& a, const float16& b) {
return float16(static_cast<float>(a) - static_cast<float>(b));
}
inline float16 operator*(const float16& a, const float16& b) {
return float16(static_cast<float>(a) * static_cast<float>(b));
}
inline float16 operator/(const float16& a, const float16& b) {
return float16(static_cast<float>(a) / static_cast<float>(b));
}
inline float16 operator-(const float16& a) {
float16 res;
res.x = a.x ^ 0x8000;
return res;
}
inline float16& operator+=(float16& a, const float16& b) { // NOLINT
a = float16(static_cast<float>(a) + static_cast<float>(b));
return a;
}
inline float16& operator-=(float16& a, const float16& b) { // NOLINT
a = float16(static_cast<float>(a) - static_cast<float>(b));
return a;
}
inline float16& operator*=(float16& a, const float16& b) { // NOLINT
a = float16(static_cast<float>(a) * static_cast<float>(b));
return a;
}
inline float16& operator/=(float16& a, const float16& b) { // NOLINT
a = float16(static_cast<float>(a) / static_cast<float>(b));
return a;
}
inline bool operator==(const float16& a, const float16& b) {
return static_cast<float>(a) == static_cast<float>(b);
}
inline bool operator!=(const float16& a, const float16& b) {
return static_cast<float>(a) != static_cast<float>(b);
}
inline bool operator<(const float16& a, const float16& b) {
return static_cast<float>(a) < static_cast<float>(b);
}
inline bool operator<=(const float16& a, const float16& b) {
return static_cast<float>(a) <= static_cast<float>(b);
}
inline bool operator>(const float16& a, const float16& b) {
return static_cast<float>(a) > static_cast<float>(b);
}
inline bool operator>=(const float16& a, const float16& b) {
return static_cast<float>(a) >= static_cast<float>(b);
}
#endif
template <typename T,
typename std::enable_if<std::is_integral<T>::value ||
std::is_same<T, float>::value,
bool>::type = true>
inline T& operator+=(T& a, const float16& b) { // NOLINT
auto c = static_cast<float>(a) + static_cast<float>(b);
a = static_cast<T>(c);
return a;
}
inline double& operator+=(double& a, const float16& b) { // NOLINT
a = a + static_cast<double>(b);
return a;
}
inline float16 raw_uint16_to_float16(uint16_t a) {
float16 res;
res.x = a;
return res;
}
inline bool(isnan)(const float16& a) { return (a.x & 0x7fff) > 0x7c00; }
inline bool(isinf)(const float16& a) { return (a.x & 0x7fff) == 0x7c00; }
inline bool(isfinite)(const float16& a) {
return !((isnan)(a)) && !((isinf)(a));
}
inline float16(abs)(const float16& a) {
return float16(std::abs(static_cast<float>(a)));
}
inline std::ostream& operator<<(std::ostream& os, const float16& a) {
os << static_cast<float>(a);
return os;
}
} // namespace fastdeploy
namespace std {
// Override the std::is_pod::value for float16
// The reason is that different compilers implemented std::is_pod based on
// different C++ standards. float16 class is a plain old data in C++11 given
// that it is both trivial and standard_layout.
// However, std::is_pod in nvcc 8.0 host c++ compiler follows C++0x and is
// more restricted in that you cannot provide any customized
// constructor in float16. Hence, we override is_pod here following C++11
// so that .cu files can be successfully compiled by nvcc.
template <>
struct is_pod<fastdeploy::float16> {
static const bool value = is_trivial<fastdeploy::float16>::value &&
is_standard_layout<fastdeploy::float16>::value;
};
template <>
struct is_floating_point<fastdeploy::float16>
: std::integral_constant<
bool, std::is_same<fastdeploy::float16,
typename std::remove_cv<
fastdeploy::float16>::type>::value> {};
template <>
struct is_signed<fastdeploy::float16> {
static const bool value = true;
};
template <>
struct is_unsigned<fastdeploy::float16> {
static const bool value = false;
};
inline bool isnan(const fastdeploy::float16& a) { return fastdeploy::isnan(a); }
inline bool isinf(const fastdeploy::float16& a) { return fastdeploy::isinf(a); }
template <>
struct numeric_limits<fastdeploy::float16> {
static const bool is_specialized = true;
static const bool is_signed = true;
static const bool is_integer = false;
static const bool is_exact = false;
static const bool has_infinity = true;
static const bool has_quiet_NaN = true;
static const bool has_signaling_NaN = true;
static const float_denorm_style has_denorm = denorm_present;
static const bool has_denorm_loss = false;
static const std::float_round_style round_style = std::round_to_nearest;
static const bool is_iec559 = false;
static const bool is_bounded = false;
static const bool is_modulo = false;
static const int digits = 11;
static const int digits10 = 3;
static const int max_digits10 = 5;
static const int radix = 2;
static const int min_exponent = -13;
static const int min_exponent10 = -4;
static const int max_exponent = 16;
static const int max_exponent10 = 4;
static const bool traps = true;
static const bool tinyness_before = false;
static fastdeploy::float16(min)() {
return fastdeploy::raw_uint16_to_float16(0x400);
}
static fastdeploy::float16 lowest() {
return fastdeploy::raw_uint16_to_float16(0xfbff);
}
static fastdeploy::float16(max)() {
return fastdeploy::raw_uint16_to_float16(0x7bff);
}
static fastdeploy::float16 epsilon() {
return fastdeploy::raw_uint16_to_float16(0x0800);
}
static fastdeploy::float16 round_error() { return fastdeploy::float16(0.5); }
static fastdeploy::float16 infinity() {
return fastdeploy::raw_uint16_to_float16(0x7c00);
}
static fastdeploy::float16 quiet_NaN() {
return fastdeploy::raw_uint16_to_float16(0x7e00);
}
static fastdeploy::float16 signaling_NaN() {
return fastdeploy::raw_uint16_to_float16(0x7e00);
}
static fastdeploy::float16 denorm_min() {
return fastdeploy::raw_uint16_to_float16(0x1);
}
};
inline fastdeploy::float16 abs(const fastdeploy::float16& a) {
return fastdeploy::abs(a);
}
} // namespace std

View File

@@ -0,0 +1,142 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/runtime.h"
namespace fastdeploy {
/*! @brief Base model object for all the vision models
*/
class FASTDEPLOY_DECL FastDeployModel {
public:
/// Get model's name
virtual std::string ModelName() const { return "NameUndefined"; }
/** \brief Inference the model by the runtime. This interface is included in the `Predict()` function, so we don't call `Infer()` directly in most common situation
*/
virtual bool Infer(std::vector<FDTensor>& input_tensors,
std::vector<FDTensor>* output_tensors);
/** \brief Inference the model by the runtime. This interface is using class member reused_input_tensors_ to do inference and writing results to reused_output_tensors_
*/
virtual bool Infer();
RuntimeOption runtime_option;
/** \brief Model's valid cpu backends. This member defined all the cpu backends have successfully tested for the model
*/
std::vector<Backend> valid_cpu_backends = {Backend::ORT};
/** Model's valid gpu backends. This member defined all the gpu backends have successfully tested for the model
*/
std::vector<Backend> valid_gpu_backends = {Backend::ORT};
/** Model's valid ipu backends. This member defined all the ipu backends have successfully tested for the model
*/
std::vector<Backend> valid_ipu_backends = {};
/** Model's valid timvx backends. This member defined all the timvx backends have successfully tested for the model
*/
std::vector<Backend> valid_timvx_backends = {};
/** Model's valid hardware backends. This member defined all the gpu backends have successfully tested for the model
*/
std::vector<Backend> valid_rknpu_backends = {};
/// Get number of inputs for this model
virtual int NumInputsOfRuntime() { return runtime_->NumInputs(); }
/// Get number of outputs for this model
virtual int NumOutputsOfRuntime() { return runtime_->NumOutputs(); }
/// Get input information for this model
virtual TensorInfo InputInfoOfRuntime(int index) {
return runtime_->GetInputInfo(index);
}
/// Get output information for this model
virtual TensorInfo OutputInfoOfRuntime(int index) {
return runtime_->GetOutputInfo(index);
}
/// Check if the model is initialized successfully
virtual bool Initialized() const {
return runtime_initialized_ && initialized;
}
/** \brief This is a debug interface, used to record the time of backend runtime
*
* example code @code
* auto model = fastdeploy::vision::PPYOLOE("model.pdmodel", "model.pdiparams", "infer_cfg.yml");
* if (!model.Initialized()) {
* std::cerr << "Failed to initialize." << std::endl;
* return -1;
* }
* model.EnableRecordTimeOfRuntime();
* cv::Mat im = cv::imread("test.jpg");
* for (auto i = 0; i < 1000; ++i) {
* fastdeploy::vision::DetectionResult result;
* model.Predict(&im, &result);
* }
* model.PrintStatisInfoOfRuntime();
* @endcode After called the `PrintStatisInfoOfRuntime()`, the statistical information of runtime will be printed in the console
*/
virtual void EnableRecordTimeOfRuntime() {
time_of_runtime_.clear();
std::vector<double>().swap(time_of_runtime_);
enable_record_time_of_runtime_ = true;
}
/** \brief Disable to record the time of backend runtime, see `EnableRecordTimeOfRuntime()` for more detail
*/
virtual void DisableRecordTimeOfRuntime() {
enable_record_time_of_runtime_ = false;
}
/** \brief Print the statistic information of runtime in the console, see function `EnableRecordTimeOfRuntime()` for more detail
*/
virtual std::map<std::string, float> PrintStatisInfoOfRuntime();
/** \brief Check if the `EnableRecordTimeOfRuntime()` method is enabled.
*/
virtual bool EnabledRecordTimeOfRuntime() {
return enable_record_time_of_runtime_;
}
/** \brief Release reused input/output buffers
*/
virtual void ReleaseReusedBuffer() {
std::vector<FDTensor>().swap(reused_input_tensors_);
std::vector<FDTensor>().swap(reused_output_tensors_);
}
protected:
virtual bool InitRuntime();
bool initialized = false;
// Reused input tensors
std::vector<FDTensor> reused_input_tensors_;
// Reused output tensors
std::vector<FDTensor> reused_output_tensors_;
private:
bool InitRuntimeWithSpecifiedBackend();
bool InitRuntimeWithSpecifiedDevice();
bool CreateCpuBackend();
bool CreateGpuBackend();
bool CreateIpuBackend();
bool CreateRKNPUBackend();
bool CreateTimVXBackend();
std::shared_ptr<Runtime> runtime_;
bool runtime_initialized_ = false;
// whether to record inference time
bool enable_record_time_of_runtime_ = false;
// record inference time for backend
std::vector<double> time_of_runtime_;
};
} // namespace fastdeploy

View File

@@ -0,0 +1,31 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Cast x to output data type element-wise. Only for float type FDTensor
@param x The input tensor.
@param out The output tensor which stores the result.
@param output_dtype The type of output tensor.
*/
FASTDEPLOY_DECL void Cast(const FDTensor& x, FDTensor* out,
FDDataType output_dtype);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,32 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** This operator clip all elements in input into the range [ min, max ]. Support float32, float64, int32, int64
@param x The input tensor.
@param min The lower bound
@param max The uppper bound
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Clip(const FDTensor& x, double min, double max,
FDTensor* out);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,32 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Excute the concatenate operation for input FDTensor along given axis.
@param x The input tensor.
@param out The output tensor which stores the result.
@param axis Axis which will be concatenated.
*/
FASTDEPLOY_DECL void Concat(const std::vector<FDTensor>& x, FDTensor* out,
int axis = 0);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,29 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Cast the type of the data in GPU buffer.
@param in The input tensor.
@param out The output tensor
@param stream CUDA stream
*/
FASTDEPLOY_DECL void CudaCast(const FDTensor& in, FDTensor* out,
cudaStream_t stream);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,31 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Excute the concatenate operation for input FDTensor along given axis.
@param x The input tensor.
@param out The output tensor which stores the result.
@param axisi Axis which will be concatenated.
*/
FASTDEPLOY_DECL void Cumprod(const FDTensor& x, FDTensor* out, int axis = 0);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,140 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <algorithm>
#include <memory>
#include <vector>
#include "fastdeploy/core/fd_tensor.h"
#include "fastdeploy/utils/axis_utils.h"
#include "unsupported/Eigen/CXX11/Tensor"
namespace fastdeploy {
namespace function {
// EigenDim converts shape into Eigen::DSizes.
template <int D>
struct EigenDim {
using Type = Eigen::DSizes<Eigen::DenseIndex, D>;
static Type From(const std::vector<int64_t>& dims) {
Type ret;
for (int64_t d = 0; d < dims.size(); d++) {
ret[d] = dims[d];
}
return ret;
}
};
// Interpret FDTensor as EigenTensor and EigenConstTensor.
template <typename T, size_t D, int MajorType = Eigen::RowMajor,
typename IndexType = Eigen::DenseIndex>
struct EigenTensor {
using Type = Eigen::TensorMap<Eigen::Tensor<T, D, MajorType, IndexType>>;
using ConstType =
Eigen::TensorMap<Eigen::Tensor<const T, D, MajorType, IndexType>>;
static Type From(FDTensor& tensor,
const std::vector<int64_t>& dims) { // NOLINT
return Type(reinterpret_cast<T*>(tensor.Data()), EigenDim<D>::From(dims));
}
static Type From(FDTensor& tensor) { // NOLINT
return From(tensor, tensor.shape);
} // NOLINT
static ConstType From(const FDTensor& tensor,
const std::vector<int64_t>& dims) {
return ConstType(reinterpret_cast<const T*>(tensor.Data()),
EigenDim<D>::From(dims));
}
static ConstType From(const FDTensor& tensor) {
return From(tensor, tensor.shape);
}
};
template <typename T, int MajorType = Eigen::RowMajor,
typename IndexType = Eigen::DenseIndex>
struct EigenScalar {
// Scalar tensor (implemented as a rank-0 tensor) of scalar type T.
using Type = Eigen::TensorMap<
Eigen::TensorFixedSize<T, Eigen::Sizes<>, MajorType, IndexType>>;
using ConstType = Eigen::TensorMap<
Eigen::TensorFixedSize<const T, Eigen::Sizes<>, MajorType, IndexType>>;
static Type From(FDTensor& tensor) {
return Type(reinterpret_cast<T*>(tensor.Data()));
} // NOLINT
static ConstType From(const FDTensor& tensor) {
return ConstType(reinterpret_cast<const T*>(tensor.Data()));
}
};
template <typename T, int MajorType = Eigen::RowMajor,
typename IndexType = Eigen::DenseIndex>
struct EigenVector : public EigenTensor<T, 1, MajorType, IndexType> {
// Flatten reshapes a Tensor into an EigenVector.
static typename EigenVector::Type Flatten(FDTensor& tensor) { // NOLINT
return EigenVector::From(tensor, {tensor.Numel()});
}
static typename EigenVector::ConstType Flatten(
const FDTensor& tensor) { // NOLINT
return EigenVector::From(tensor, {tensor.Numel()});
}
};
template <typename T, int MajorType = Eigen::RowMajor,
typename IndexType = Eigen::DenseIndex>
struct EigenMatrix : public EigenTensor<T, 2, MajorType, IndexType> {
static typename EigenMatrix::Type Reshape(FDTensor& tensor, // NOLINT
int num_col_dims) {
int rank = tensor.shape.size();
FDASSERT((num_col_dims > 0 && num_col_dims < rank),
"Input dimension number(num_col_dims) must be between 0 and %d, "
"but received number is %d.",
rank, num_col_dims);
const int n = SizeToAxis(num_col_dims, tensor.shape);
const int d = SizeFromAxis(num_col_dims, tensor.shape);
return EigenMatrix::From(tensor, {n, d});
}
static typename EigenMatrix::ConstType Reshape(const FDTensor& tensor,
int num_col_dims) {
int rank = tensor.shape.size();
FDASSERT((num_col_dims > 0 && num_col_dims < rank),
"Input dimension number(num_col_dims) must be between 0 and %d, "
"but received number is %d.",
rank, num_col_dims);
const int n = SizeToAxis(num_col_dims, tensor.shape);
const int d = SizeFromAxis(num_col_dims, tensor.shape);
return EigenMatrix::From(tensor, {n, d});
}
};
class EigenDeviceWrapper {
public:
static std::shared_ptr<EigenDeviceWrapper> GetInstance();
const Eigen::DefaultDevice* GetDevice() const;
private:
Eigen::DefaultDevice device_;
static std::shared_ptr<EigenDeviceWrapper> instance_;
};
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,105 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_scalar.h"
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Excute the add operation for input FDTensors. *out = x + y.
@param x The input tensor.
@param y The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Add(const FDTensor& x, const FDTensor& y, FDTensor* out);
/** Excute the subtract operation for input FDTensors. *out = x - y.
@param x The input tensor.
@param y The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Subtract(const FDTensor& x, const FDTensor& y,
FDTensor* out);
/** Excute the multiply operation for input FDTensors. *out = x * y.
@param x The input tensor.
@param y The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Multiply(const FDTensor& x, const FDTensor& y,
FDTensor* out);
/** Excute the divide operation for input FDTensors. *out = x / y.
@param x The input tensor.
@param y The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Divide(const FDTensor& x, const FDTensor& y,
FDTensor* out);
/** Excute the maximum operation for input FDTensors. *out = max(x, y).
@param x The input tensor.
@param y The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Maximum(const FDTensor& x, const FDTensor& y,
FDTensor* out);
} // namespace function
FASTDEPLOY_DECL FDTensor operator+(const FDTensor& x, const FDTensor& y);
template <typename T> FDTensor operator+(const FDTensor& x, T y) {
return x + FDTensor(Scalar(y));
}
template <typename T> FDTensor operator+(T x, const FDTensor& y) {
return FDTensor(Scalar(x)) + y;
}
FASTDEPLOY_DECL FDTensor operator-(const FDTensor& x, const FDTensor& y);
template <typename T> FDTensor operator-(const FDTensor& x, T y) {
return x - FDTensor(Scalar(y));
}
template <typename T> FDTensor operator-(T x, const FDTensor& y) {
return FDTensor(Scalar(x)) - y;
}
FASTDEPLOY_DECL FDTensor operator*(const FDTensor& x, const FDTensor& y);
template <typename T> FDTensor operator*(const FDTensor& x, T y) {
return x * FDTensor(Scalar(y));
}
template <typename T> FDTensor operator*(T x, const FDTensor& y) {
return FDTensor(Scalar(x)) * y;
}
FASTDEPLOY_DECL FDTensor operator/(const FDTensor& x, const FDTensor& y);
template <typename T> FDTensor operator/(const FDTensor& x, T y) {
return x / FDTensor(Scalar(y));
}
template <typename T> FDTensor operator/(T x, const FDTensor& y) {
return FDTensor(Scalar(x)) / y;
}
} // namespace fastdeploy

View File

@@ -0,0 +1,265 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <algorithm>
#include "fastdeploy/core/fd_tensor.h"
#include "fastdeploy/function/eigen.h"
namespace fastdeploy {
namespace function {
#define DEFINE_ELEMENTWISE_OP(name) \
template <typename T> struct name##RawKernel { \
void operator()(const FDTensor& x, const FDTensor& y, int axis, \
FDTensor* out) { \
if (x.Shape() == y.Shape()) { \
SameDimsElementwiseCompute<SameDims##name##Functor<T>>()(x, y, out); \
} else { \
auto x_dims = x.Shape(); \
auto y_dims = y.Shape(); \
if (x_dims.size() >= y_dims.size()) { \
ElementwiseCompute<name##Functor<T>, T>(x, y, axis, \
name##Functor<T>(), out); \
} else { \
ElementwiseCompute<Inverse##name##Functor<T>, T>( \
x, y, axis, Inverse##name##Functor<T>(), out); \
} \
} \
} \
}
inline void GetMidDims(const std::vector<int64_t>& x_dims,
const std::vector<int64_t>& y_dims, const int axis,
int* pre, int* n, int* post,
int* is_run_common_broadcast) {
*pre = 1;
*n = 1;
*post = 1;
*is_run_common_broadcast = 0;
for (int i = 0; i < axis; ++i) {
(*pre) *= x_dims[i];
}
for (int i = 0; i < y_dims.size(); ++i) {
if (x_dims[i + axis] != y_dims[i]) {
FDASSERT(y_dims[i] == 1 || x_dims[i + axis] == 1,
"Broadcast dimension mismatch. Operands "
"could not be broadcast together with the shape of "
"X = [%s] and the shape of Y = [%s]. Received [%d] "
"in X is not equal to [%d] in Y.",
Str(x_dims).c_str(), Str(y_dims).c_str(), x_dims[i + axis],
y_dims[i]);
*is_run_common_broadcast = 1;
return;
}
(*n) *= y_dims[i];
}
for (int i = axis + y_dims.size(); i < x_dims.size(); ++i) {
(*post) *= x_dims[i];
}
}
inline std::vector<int64_t>
TrimTrailingSingularDims(const std::vector<int64_t>& dims) {
// Remove trailing dimensions of size 1 for y
auto actual_dims_size = dims.size();
for (; actual_dims_size != 0; --actual_dims_size) {
if (dims[actual_dims_size - 1] != 1)
break;
}
if (actual_dims_size == dims.size())
return dims;
std::vector<int64_t> trim_dims;
trim_dims.resize(actual_dims_size);
for (int i = 0; i < actual_dims_size; ++i) {
trim_dims[i] = dims[i];
}
return trim_dims;
}
inline int GetElementwiseIndex(const int64_t* x_dims_array, const int max_dim,
const int64_t* index_array) {
int index_ = 0;
for (int i = 0; i < max_dim; i++) {
if (x_dims_array[i] > 1) {
index_ = index_ * x_dims_array[i] + index_array[i];
}
}
return index_;
}
inline void UpdateElementwiseIndexArray(const int64_t* out_dims_array,
const int max_dim,
int64_t* index_array) {
for (int i = max_dim - 1; i >= 0; --i) {
++index_array[i];
if (index_array[i] >= out_dims_array[i]) {
index_array[i] -= out_dims_array[i];
} else {
break;
}
}
}
inline void GetBroadcastDimsArrays(const std::vector<int64_t>& x_dims,
const std::vector<int64_t>& y_dims,
int64_t* x_dims_array, int64_t* y_dims_array,
int64_t* out_dims_array, const int max_dim,
const int axis) {
FDASSERT(axis >= 0,
"Axis should be great than or equal to 0, but received axis is %d.",
axis);
FDASSERT(axis < max_dim,
"Axis should be less than %d, but received axis is %d.", max_dim,
axis);
if (x_dims.size() > y_dims.size()) {
std::fill(y_dims_array, y_dims_array + axis, 1);
if (axis + y_dims.size() < max_dim) {
std::fill(y_dims_array + axis + y_dims.size(), y_dims_array + max_dim, 1);
}
std::copy(x_dims.data(), x_dims.data() + x_dims.size(), x_dims_array);
std::copy(y_dims.data(), y_dims.data() + y_dims.size(),
y_dims_array + axis);
} else {
std::fill(x_dims_array, x_dims_array + axis, 1);
if (axis + x_dims.size() < max_dim) {
std::fill(x_dims_array + axis + x_dims.size(), x_dims_array + max_dim, 1);
}
std::copy(x_dims.data(), x_dims.data() + x_dims.size(),
x_dims_array + axis);
std::copy(y_dims.data(), y_dims.data() + y_dims.size(), y_dims_array);
}
for (int i = 0; i < max_dim; i++) {
FDASSERT(x_dims_array[i] == y_dims_array[i] || x_dims_array[i] <= 1 ||
y_dims_array[i] <= 1,
"Broadcast dimension mismatch. Operands "
"could not be broadcast together with the shape of "
"X = [%s] and the shape of Y = [%s]. Received [%d] "
"in X is not equal to [%d] in Y.",
Str(x_dims).c_str(), Str(y_dims).c_str(), x_dims[i + axis],
y_dims[i]);
if ((x_dims_array[i] > 1 || y_dims_array[i] > 1) ||
(x_dims_array[i] == 1 && y_dims_array[i] == 1)) {
out_dims_array[i] = (std::max)(x_dims_array[i], y_dims_array[i]);
} else {
out_dims_array[i] = -1;
}
}
}
template <typename Functor, typename T, typename OutType = T>
void CommonForwardBroadcastCPU(const FDTensor& x, const FDTensor& y,
FDTensor* z, int64_t* x_dims_array,
int64_t* y_dims_array, int64_t* out_dims_array,
int max_dim, Functor func,
const bool is_xsize_larger = true) {
std::vector<int64_t> index_array(max_dim, 0);
const T* x_data = reinterpret_cast<const T*>(x.Data());
const T* y_data = reinterpret_cast<const T*>(y.Data());
FDASSERT(x_data != nullptr, "The input X should not be empty.");
FDASSERT(y_data != nullptr, "The input X should not be empty.");
OutType* out_data = reinterpret_cast<OutType*>(z->Data());
const int out_size = std::accumulate(out_dims_array, out_dims_array + max_dim,
1, std::multiplies<int64_t>());
int x_index, y_index;
for (int out_index = 0; out_index < out_size; ++out_index) {
x_index = GetElementwiseIndex(x_dims_array, max_dim, index_array.data());
y_index = GetElementwiseIndex(y_dims_array, max_dim, index_array.data());
if (is_xsize_larger) {
out_data[out_index] = func(x_data[x_index], y_data[y_index]);
} else {
out_data[out_index] = func(y_data[y_index], x_data[x_index]);
}
UpdateElementwiseIndexArray(out_dims_array, max_dim, index_array.data());
}
}
template <typename Functor, typename T, typename OutType = T>
void CommonElementwiseBroadcastForward(const FDTensor& x, const FDTensor& y,
FDTensor* z,
const std::vector<int64_t>& x_dims,
const std::vector<int64_t>& y_dims,
Functor func, int axis,
const bool is_xsize_larger = true) {
int x_dims_size = x_dims.size();
int y_dims_size = y_dims.size();
int max_dim = (std::max)(x_dims_size, y_dims_size);
axis = (axis == -1 ? std::abs(x_dims_size - y_dims_size) : axis);
FDASSERT(axis >= 0,
"Axis should be great than or equal to 0, but received axis is %d.",
axis);
FDASSERT(axis < max_dim,
"Axis should be less than %d, but received axis is %d.", max_dim,
axis);
std::vector<int64_t> x_dims_array(max_dim);
std::vector<int64_t> y_dims_array(max_dim);
std::vector<int64_t> out_dims_array(max_dim);
GetBroadcastDimsArrays(x_dims, y_dims, x_dims_array.data(),
y_dims_array.data(), out_dims_array.data(), max_dim,
axis);
FDTensor tmp;
tmp.Allocate(out_dims_array, TypeToDataType<OutType>::dtype);
CommonForwardBroadcastCPU<Functor, T, OutType>(
x, y, &tmp, x_dims_array.data(), y_dims_array.data(),
out_dims_array.data(), max_dim, func, is_xsize_larger);
*z = std::move(tmp);
}
template <typename Functor, typename T, typename OutType = T>
void ElementwiseCompute(const FDTensor& x, const FDTensor& y, int axis,
Functor func, FDTensor* z) {
auto x_dims = x.Shape();
auto y_dims = y.Shape();
bool is_xsize_larger = true;
int max_dim = x_dims.size();
if (x_dims.size() < y_dims.size()) {
is_xsize_larger = false;
max_dim = y_dims.size();
}
int diff_size = x_dims.size() - y_dims.size();
axis = (axis == -1 ? std::abs(diff_size) : axis);
FDASSERT(axis >= 0,
"Axis should be great than or equal to 0, but received axis is %d.",
axis);
FDASSERT(axis < max_dim,
"Axis should be less than %d, but received axis is %d.", max_dim,
axis);
int pre, n, post, is_run_common_broadcast, axis_trim = 0;
if (is_xsize_larger) {
auto y_dims_trimed = TrimTrailingSingularDims(y_dims);
axis_trim = (y_dims_trimed.size() == 0) ? x_dims.size() : axis;
GetMidDims(x_dims, y_dims_trimed, axis_trim, &pre, &n, &post,
&is_run_common_broadcast);
} else {
auto x_dims_trimed = TrimTrailingSingularDims(x_dims);
axis_trim = (x_dims_trimed.size() == 0) ? y_dims.size() : axis;
GetMidDims(y_dims, x_dims_trimed, axis_trim, &pre, &n, &post,
&is_run_common_broadcast);
}
// special case for common implementation.
// case 1: x=[2,3,1,5], y=[2,1,4,1]
// case 2: x=[2,3,4], y=[1,1,4]
CommonElementwiseBroadcastForward<Functor, T, OutType>(
x, y, z, x_dims, y_dims, func, axis, is_xsize_larger);
}
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,131 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/function/eigen.h"
#include "fastdeploy/function/elementwise.h"
#include "fastdeploy/function/elementwise_base.h"
#include <algorithm>
namespace fastdeploy {
namespace function {
template <typename Functor> struct SameDimsElementwiseCompute {
void operator()(const FDTensor& x, const FDTensor& y, FDTensor* z) {
z->Allocate(x.Shape(), x.Dtype());
Functor()(x, y, z);
}
};
template <typename T> struct SameDimsAddFunctor {
void operator()(const FDTensor& x, const FDTensor& y, FDTensor* z) {
const auto& dev = *EigenDeviceWrapper::GetInstance()->GetDevice();
auto eigen_x = EigenVector<T>::Flatten(x);
auto eigen_y = EigenVector<T>::Flatten(y);
auto eigen_z = EigenVector<T>::Flatten(*z);
eigen_z.device(dev) = eigen_x + eigen_y;
}
};
template <typename T> struct SameDimsSubtractFunctor {
void operator()(const FDTensor& x, const FDTensor& y, FDTensor* z) {
const auto& dev = *EigenDeviceWrapper::GetInstance()->GetDevice();
auto eigen_x = EigenVector<T>::Flatten(x);
auto eigen_y = EigenVector<T>::Flatten(y);
auto eigen_z = EigenVector<T>::Flatten(*z);
eigen_z.device(dev) = eigen_x - eigen_y;
}
};
template <typename T> struct SameDimsMultiplyFunctor {
void operator()(const FDTensor& x, const FDTensor& y, FDTensor* z) {
const auto& dev = *EigenDeviceWrapper::GetInstance()->GetDevice();
auto eigen_x = EigenVector<T>::Flatten(x);
auto eigen_y = EigenVector<T>::Flatten(y);
auto eigen_z = EigenVector<T>::Flatten(*z);
eigen_z.device(dev) = eigen_x * eigen_y;
}
};
template <typename T> struct SameDimsDivideFunctor {
void operator()(const FDTensor& x, const FDTensor& y, FDTensor* z) {
const auto& dev = *EigenDeviceWrapper::GetInstance()->GetDevice();
auto eigen_x = EigenVector<T>::Flatten(x);
auto eigen_y = EigenVector<T>::Flatten(y);
auto eigen_z = EigenVector<T>::Flatten(*z);
eigen_z.device(dev) = eigen_x / eigen_y;
}
};
// Add
template <typename T> struct AddFunctor {
inline T operator()(const T a, const T b) const { return a + b; }
};
template <typename T> struct InverseAddFunctor {
inline T operator()(const T a, const T b) const { return b + a; }
};
// Subtract
template <typename T> struct SubtractFunctor {
inline T operator()(const T a, const T b) const { return a - b; }
};
template <typename T> struct InverseSubtractFunctor {
inline T operator()(const T a, const T b) const { return b - a; }
};
// Multiply
template <typename T> struct MultiplyFunctor {
inline T operator()(const T a, const T b) const { return a * b; }
};
template <> struct MultiplyFunctor<bool> {
inline bool operator()(const bool a, const bool b) const { return a && b; }
};
template <typename T> struct InverseMultiplyFunctor {
inline T operator()(const T a, const T b) const { return b * a; }
};
template <> struct InverseMultiplyFunctor<bool> {
inline bool operator()(const bool a, const bool b) const { return b && a; }
};
// Divide
#define DIV_ERROR_INFO \
"InvalidArgumentError: Integer division by zero encountered in " \
"(floor) divide. Please check the input value."
template <typename T, typename Enable = void> struct DivideFunctor {
inline T operator()(const T a, const T b) const { return a / b; }
};
template <typename T>
struct DivideFunctor<
T, typename std::enable_if<std::is_integral<T>::value>::type> {
inline T operator()(const T a, const T b) const {
// For int32/int64, need to check whether the divison is zero.
FDASSERT(b != 0, DIV_ERROR_INFO);
return a / b;
}
};
template <typename T, typename Enable = void> struct InverseDivideFunctor {
inline T operator()(const T a, const T b) const { return b / a; }
};
// Maximum
template <typename T> struct MaximumFunctor {
inline T operator()(const T a, const T b) const { return a > b ? a : b; }
};
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,44 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_scalar.h"
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Fill the value to tensor
@param value The value to be filled in tensor
@param shape The shape of output tensor.
@param out The output tensor which stores the result.
@param dtype The data type of output tensor. Default to float32
*/
FASTDEPLOY_DECL void Full(const Scalar& value,
const std::vector<int64_t>& shape, FDTensor* out,
FDDataType dtype = FDDataType::FP32);
/** Fill the value to tensor
@param x The input tensor.
@param value The value to be filled in tensor
@param out The output tensor which stores the result.
@param dtype The data type of output tensor. Default to float32
*/
FASTDEPLOY_DECL void FullLike(const FDTensor& x, const Scalar& value,
FDTensor* out,
FDDataType dtype = FDDataType::FP32);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,36 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/function/cast.h"
#include "fastdeploy/function/clip.h"
#include "fastdeploy/function/concat.h"
#include "fastdeploy/function/cumprod.h"
#include "fastdeploy/function/elementwise.h"
#include "fastdeploy/function/full.h"
#include "fastdeploy/function/gather_scatter_along_axis.h"
#include "fastdeploy/function/gaussian_random.h"
#include "fastdeploy/function/isfinite.h"
#include "fastdeploy/function/linspace.h"
#include "fastdeploy/function/math.h"
#include "fastdeploy/function/pad.h"
#include "fastdeploy/function/quantile.h"
#include "fastdeploy/function/reduce.h"
#include "fastdeploy/function/slice.h"
#include "fastdeploy/function/softmax.h"
#include "fastdeploy/function/sort.h"
#include "fastdeploy/function/split.h"
#include "fastdeploy/function/tile.h"
#include "fastdeploy/function/transpose.h"

View File

@@ -0,0 +1,33 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Output is obtained by gathering entries of axis of x indexed by index and
* concatenate them together.
@param x The input tensor.
@param index The index of a tensor to gather.
@param out The output tensor which stores the result.
@param axis Axis which will be gathered.
*/
void GatherAlongAxis(const FDTensor& x, const FDTensor& index, FDTensor* result,
int axis);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,36 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Output is obtained by gathering entries of axis of x indexed by index and
* concatenate them together.
@param shape The output tensor shape.
@param out the output tensor.
@param mean mean value of gaussian random
@param std standard value of gaussian random
@param seed The seed of random generator.
@param dtype The data type of the output Tensor.
*/
void GaussianRandom(const std::vector<int64_t>& shape, FDTensor* out,
FDDataType dtype = FDDataType::FP32, float mean = 0.0f,
float std = 1.0f, int seed = 0);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,47 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Return whether every element of input tensor is NaN or not.
@param x The input tensor.
@param out The output tensor which stores the result.
@param dtype The output data type
*/
FASTDEPLOY_DECL void IsNan(const FDTensor& x, FDTensor* out,
FDDataType dtype = FDDataType::BOOL);
/** Return whether every element of input tensor is Inf or not.
@param x The input tensor.
@param out The output tensor which stores the result.
@param dtype The output data type
*/
FASTDEPLOY_DECL void IsInf(const FDTensor& x, FDTensor* out,
FDDataType dtype = FDDataType::BOOL);
/** Return whether every element of input tensor is finite or not.
@param x The input tensor.
@param out The output tensor which stores the result.
@param dtype The output data type
*/
FASTDEPLOY_DECL void IsFinite(const FDTensor& x, FDTensor* out,
FDDataType dtype = FDDataType::BOOL);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,33 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Return fixed number of evenly spaced values within a given interval.
@param start The input start is start variable of range.
@param end The input stop is start variable of range.
@param num The input num is given num of the sequence.
@param out The output tensor which stores the result.
@param dtype The data type of output tensor, default to float32.
*/
FASTDEPLOY_DECL void Linspace(double start, double end, int num, FDTensor* out,
FDDataType dtype = FDDataType::FP32);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,65 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Calculates the sqrt of the given input Tensor, element-wise. Only for float type FDTensor
@param x The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Sqrt(const FDTensor& x, FDTensor* out);
/** Calculates the natural log of the given input Tensor, element-wise. Only for float type FDTensor
@param x The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Log(const FDTensor& x, FDTensor* out);
/** Rounds the values in the input to the nearest integer value, element-wise. Only for float type FDTensor
@param x The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Round(const FDTensor& x, FDTensor* out);
/** Computes exp of x element-wise with a natural number e as the base, element-wise. Only for float type FDTensor
@param x The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Exp(const FDTensor& x, FDTensor* out);
/** This operator is used to perform elementwise abs for input X. Only for float type FDTensor
@param x The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Abs(const FDTensor& x, FDTensor* out);
/** Computes ceil of x element-wise. Only for float type FDTensor
@param x The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Ceil(const FDTensor& x, FDTensor* out);
/** Computes floor of x element-wise. Only for float type FDTensor
@param x The input tensor.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Floor(const FDTensor& x, FDTensor* out);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,81 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/function/eigen.h"
namespace fastdeploy {
namespace function {
// log(x) = natural logarithm of x
template <typename T> struct LogFunctor {
template <typename Device, typename X, typename Out>
void operator()(Device d, X x, Out out) const {
out.device(d) = x.log();
}
};
// exp functor
// exp(x) = e^x
template <typename T> struct ExpFunctor {
template <typename Device, typename X, typename Out>
void operator()(Device d, X x, Out out) const {
out.device(d) = x.exp();
}
};
// round(x) = [x]
template <typename T> struct RoundFunctor {
template <typename Device, typename X, typename Out>
void operator()(Device d, X x, Out out) const {
out.device(d) = x.round();
}
};
// sqrt(x) = x^(1/2)
template <typename T> struct SqrtFunctor {
template <typename Device, typename X, typename Out>
void operator()(Device d, X x, Out out) const {
out.device(d) = x.sqrt();
}
};
// abs(x) = x if x > 0 else -x
template <typename T> struct AbsFunctor {
template <typename Device, typename X, typename Out>
void operator()(Device d, X x, Out out) const {
out.device(d) =
x.unaryExpr([](T v) { return v > static_cast<T>(0) ? v : -v; });
}
};
// ceil(x) = ceiling(x)
template <typename T> struct CeilFunctor {
template <typename Device, typename X, typename Out>
void operator()(Device d, X x, Out out) const {
out.device(d) = x.ceil();
}
};
// floor(x) = flooring(x)
template <typename T> struct FloorFunctor {
template <typename Device, typename X, typename Out>
void operator()(Device d, X x, Out out) const {
out.device(d) = x.floor();
}
};
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,31 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Excute the pad operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param pads The size of padding for each dimension, for 3-D tensor, the pads should be [1d-left, 1d-right, 2d-left, 2d-right, 3d-left, 3d-right]
@param pad_value The value which will fill into out tensor
*/
FASTDEPLOY_DECL void Pad(const FDTensor& x, FDTensor* out,
const std::vector<int>& pads, float pad_value = 0);
}
} // namespace fastdeploy

View File

@@ -0,0 +1,34 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Compute the quantile of the input along the specified axis. If any values
** in a reduced row are NaN, then the quantiles for that reduction will be NaN.
@param x The input tensor.
@param q The q for calculate quantile, which should be in range [0, 1].
@param axis The axis along which to calculate quantile. axis should be int
or list of int.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Quantile(const FDTensor& x, const std::vector<double>& q,
const std::vector<int>& axis, FDTensor* out);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,127 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Excute the maximum operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param dims The vector of axis which will be reduced.
@param keep_dim Whether to keep the reduced dims, default false.
@param reduce_all Whether to reduce all dims, default false.
*/
FASTDEPLOY_DECL void Max(const FDTensor& x, FDTensor* out,
const std::vector<int64_t>& dims,
bool keep_dim = false, bool reduce_all = false);
/** Excute the minimum operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param dims The vector of axis which will be reduced.
@param keep_dim Whether to keep the reduced dims, default false.
@param reduce_all Whether to reduce all dims, default false.
*/
FASTDEPLOY_DECL void Min(const FDTensor& x, FDTensor* out,
const std::vector<int64_t>& dims,
bool keep_dim = false, bool reduce_all = false);
/** Excute the sum operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param dims The vector of axis which will be reduced.
@param keep_dim Whether to keep the reduced dims, default false.
@param reduce_all Whether to reduce all dims, default false.
*/
FASTDEPLOY_DECL void Sum(const FDTensor& x, FDTensor* out,
const std::vector<int64_t>& dims,
bool keep_dim = false, bool reduce_all = false);
/** Excute the all operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param dims The vector of axis which will be reduced.
@param keep_dim Whether to keep the reduced dims, default false.
@param reduce_all Whether to reduce all dims, default false.
*/
FASTDEPLOY_DECL void All(const FDTensor& x, FDTensor* out,
const std::vector<int64_t>& dims,
bool keep_dim = false, bool reduce_all = false);
/** Excute the any operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param dims The vector of axis which will be reduced.
@param keep_dim Whether to keep the reduced dims, default false.
@param reduce_all Whether to reduce all dims, default false.
*/
FASTDEPLOY_DECL void Any(const FDTensor& x, FDTensor* out,
const std::vector<int64_t>& dims,
bool keep_dim = false, bool reduce_all = false);
/** Excute the mean operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param dims The vector of axis which will be reduced.
@param keep_dim Whether to keep the reduced dims, default false.
@param reduce_all Whether to reduce all dims, default false.
*/
FASTDEPLOY_DECL void Mean(const FDTensor& x, FDTensor* out,
const std::vector<int64_t>& dims,
bool keep_dim = false, bool reduce_all = false);
/** Excute the product operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param dims The vector of axis which will be reduced.
@param keep_dim Whether to keep the reduced dims, default false.
@param reduce_all Whether to reduce all dims, default false.
*/
FASTDEPLOY_DECL void Prod(const FDTensor& x, FDTensor* out,
const std::vector<int64_t>& dims,
bool keep_dim = false, bool reduce_all = false);
/** Excute the argmax operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param axis The axis which will be reduced.
@param output_dtype The data type of output FDTensor, INT64 or INT32,
default to INT64.
@param keep_dim Whether to keep the reduced dims, default false.
@param flatten Whether to flatten FDTensor to get the argmin index, default
false.
*/
FASTDEPLOY_DECL void ArgMax(const FDTensor& x, FDTensor* out, int64_t axis,
FDDataType output_dtype = FDDataType::INT64,
bool keep_dim = false, bool flatten = false);
/** Excute the argmin operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param axis The axis which will be reduced.
@param output_dtype The data type of output FDTensor, INT64 or INT32,
default to INT64.
@param keep_dim Whether to keep the reduced dims, default false.
@param flatten Whether to flatten FDTensor to get the argmin index, default
false.
*/
FASTDEPLOY_DECL void ArgMin(const FDTensor& x, FDTensor* out, int64_t axis,
FDDataType output_dtype = FDDataType::INT64,
bool keep_dim = false, bool flatten = false);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,77 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/function/eigen.h"
namespace fastdeploy {
namespace function {
//////// Max Functor ///////
struct MaxFunctor {
template <typename X, typename Y, typename Dim>
void operator()(const Eigen::DefaultDevice& dev, X* x, Y* y, const Dim& dim) {
y->device(dev) = x->maximum(dim);
}
};
//////// Min Functor ///////
struct MinFunctor {
template <typename X, typename Y, typename Dim>
void operator()(const Eigen::DefaultDevice& dev, X* x, Y* y, const Dim& dim) {
y->device(dev) = x->minimum(dim);
}
};
//////// Sum Functor ///////
struct SumFunctor {
template <typename X, typename Y, typename Dim>
void operator()(const Eigen::DefaultDevice& dev, X* x, Y* y, const Dim& dim) {
y->device(dev) = x->sum(dim);
}
};
//////// All Functor ///////
struct AllFunctor {
template <typename X, typename Y, typename Dim>
void operator()(const Eigen::DefaultDevice& dev, X* x, Y* y, const Dim& dim) {
y->device(dev) = x->all(dim);
}
};
//////// Any Functor ///////
struct AnyFunctor {
template <typename X, typename Y, typename Dim>
void operator()(const Eigen::DefaultDevice& dev, X* x, Y* y, const Dim& dim) {
y->device(dev) = x->any(dim);
}
};
//////// Mean Functor ///////
struct MeanFunctor {
template <typename X, typename Y, typename Dim>
void operator()(const Eigen::DefaultDevice& dev, X* x, Y* y, const Dim& dim) {
y->device(dev) = x->mean(dim);
}
};
//////// Prod Functor ///////
struct ProdFunctor {
template <typename X, typename Y, typename Dim>
void operator()(const Eigen::DefaultDevice& dev, X* x, Y* y, const Dim& dim) {
y->device(dev) = x->prod(dim);
}
};
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,44 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** This operator produces a slice of input along multiple axes.
@param x The input tensor.
@param axes Axes that starts and ends apply to.
@param starts If starts is a list or tuple, the elements of it should be
integers or Tensors with shape [1]. If starts is an Tensor, it should
be an 1-D Tensor. It represents starting indices of corresponding axis
in axes
@param ends If ends is a list or tuple, the elements of it should be
integers or Tensors with shape [1]. If ends is an Tensor, it should
be an 1-D Tensor . It represents ending indices of corresponding axis
in axes.
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Slice(const FDTensor& x, const std::vector<int64_t>& axes,
const std::vector<int64_t>& starts,
const std::vector<int64_t>& ends, FDTensor* out);
FASTDEPLOY_DECL void Slice(const FDTensor& x, const std::vector<int64_t>& axes,
const std::vector<int64_t>& index, FDTensor* out);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,29 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Excute the softmax operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param axis The axis to be computed softmax value.
*/
FASTDEPLOY_DECL void Softmax(const FDTensor& x, FDTensor* out, int axis = -1);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,47 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/**
* @brief Performs sorting on the input tensor along the given axis and outputs
* two tensors, Output(Out) and Output(Indices). They reserve the same
* shape with Input(X), and Output(Out) represents the sorted tensor
* while Output(Indices) gives the sorted order along the given axis
* Attr(axis).
* @param x The input of sort
* @param out The sorted tensor of sort op, with the same shape as
* x
* @param indices The indices of a tensor giving the sorted order, with
* the same shape as x
* @param axis The axis along which to sort the tensor.
* When axis < 0, the actual axis will be the |axis|'th
* counting backwards
* @param descending The descending attribute is a flag to tell
* algorithm how to sort the input data.
* If descending is true, will sort by descending order,
* else if false, sort by ascending order
* @param indices_type The data type of indices, default to int64
*/
FASTDEPLOY_DECL void Sort(const FDTensor& x, FDTensor* out, FDTensor* indices,
int axis = 0, bool descending = false,
FDDataType indices_type = FDDataType::INT64);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,36 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Split the input tensor into multiple sub-Tensors.
@param x The input tensor.
@param num_or_sections f num_or_sections is an int, then num_or_sections
indicates the number of equal sized sub-Tensors that the x will
be divided into.
@param out The output vector tensor which stores the result.
@param axis Axis which will be splitted.
*/
FASTDEPLOY_DECL void Split(const FDTensor& x,
const std::vector<int>& num_or_sections,
std::vector<FDTensor>* out, int axis = 0);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,36 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Construct a new Tensor by repeating x the number of times given by
** repeat_times. After tiling, the value of the ith dimension of the
** output is equal to x.shape[i]*repeat_times[i]. Both the number of
** dimensions of x and the number of elements in repeat_times should
** be less than or equal to 6.Support all data types.
@param x The input tensor.
@param repeat_times The lower bound
@param out The output tensor which stores the result.
*/
FASTDEPLOY_DECL void Tile(const FDTensor& x,
const std::vector<int64_t>& repeat_times,
FDTensor* out);
} // namespace function
} // namespace fastdeploy

View File

@@ -0,0 +1,29 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/fd_tensor.h"
namespace fastdeploy {
namespace function {
/** Excute the transpose operation for input FDTensor along given dims.
@param x The input tensor.
@param out The output tensor which stores the result.
@param dims The vector of axis which the input tensor will transpose.
*/
FASTDEPLOY_DECL void Transpose(const FDTensor& x, FDTensor* out,
const std::vector<int64_t>& dims);
} // namespace function
} // namespace fastdeploy

21
3rdparty/include/fastdeploy/pipeline.h vendored Normal file
View File

@@ -0,0 +1,21 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/config.h"
#ifdef ENABLE_VISION
#include "fastdeploy/pipeline/pptinypose/pipeline.h"
#endif
#include "fastdeploy/vision/visualize/visualize.h"

View File

@@ -0,0 +1,67 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/fastdeploy_model.h"
#include "fastdeploy/vision/common/result.h"
#include "fastdeploy/vision/detection/ppdet/model.h"
#include "fastdeploy/vision/keypointdet/pptinypose/pptinypose.h"
namespace fastdeploy {
/** \brief All pipeline model APIs are defined inside this namespace
*
*/
namespace pipeline {
/*! @brief PPTinyPose Pipeline object used when to load a detection model + pptinypose model
*/
class FASTDEPLOY_DECL PPTinyPose {
public:
/** \brief Set initialized detection model object and pptinypose model object
*
* \param[in] det_model Initialized detection model object
* \param[in] pptinypose_model Initialized pptinypose model object
*/
PPTinyPose(
fastdeploy::vision::detection::PicoDet* det_model,
fastdeploy::vision::keypointdetection::PPTinyPose* pptinypose_model);
/** \brief Predict the keypoint detection result for an input image
*
* \param[in] img The input image data, comes from cv::imread()
* \param[in] result The output keypoint detection result will be writen to this structure
* \return true if the prediction successed, otherwise false
*/
virtual bool Predict(cv::Mat* img,
fastdeploy::vision::KeyPointDetectionResult* result);
/* \brief The score threshold for detectin model to filter bbox before inputting pptinypose model
*/
float detection_model_score_threshold = 0;
protected:
fastdeploy::vision::detection::PicoDet* detector_ = nullptr;
fastdeploy::vision::keypointdetection::PPTinyPose* pptinypose_model_ =
nullptr;
virtual bool Detect(cv::Mat* img,
fastdeploy::vision::DetectionResult* result);
virtual bool KeypointDetect(
cv::Mat* img, fastdeploy::vision::KeyPointDetectionResult* result,
fastdeploy::vision::DetectionResult& detection_result);
};
} // namespace pipeline
} // namespace fastdeploy

471
3rdparty/include/fastdeploy/runtime.h vendored Normal file
View File

@@ -0,0 +1,471 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*! \file runtime.h
\brief A brief file description.
More details
*/
#pragma once
#include <algorithm>
#include <map>
#include <vector>
#include "backends/rknpu/rknpu2/rknpu2_config.h"
#include "fastdeploy/backends/backend.h"
#include "fastdeploy/utils/perf.h"
/** \brief All C++ FastDeploy APIs are defined inside this namespace
*
*/
namespace fastdeploy {
/*! Inference backend supported in FastDeploy */
enum Backend {
UNKNOWN, ///< Unknown inference backend
ORT, ///< ONNX Runtime, support Paddle/ONNX format model, CPU / Nvidia GPU
TRT, ///< TensorRT, support Paddle/ONNX format model, Nvidia GPU only
PDINFER, ///< Paddle Inference, support Paddle format model, CPU / Nvidia GPU
POROS, ///< Poros, support TorchScript format model, CPU / Nvidia GPU
OPENVINO, ///< Intel OpenVINO, support Paddle/ONNX format, CPU only
LITE, ///< Paddle Lite, support Paddle format model, ARM CPU only
RKNPU2, ///< RKNPU2, support RKNN format model, Rockchip NPU only
};
FASTDEPLOY_DECL std::ostream& operator<<(std::ostream& out,
const Backend& backend);
/*! Paddle Lite power mode for mobile device. */
enum LitePowerMode {
LITE_POWER_HIGH = 0, ///< Use Lite Backend with high power mode
LITE_POWER_LOW = 1, ///< Use Lite Backend with low power mode
LITE_POWER_FULL = 2, ///< Use Lite Backend with full power mode
LITE_POWER_NO_BIND = 3, ///< Use Lite Backend with no bind power mode
LITE_POWER_RAND_HIGH = 4, ///< Use Lite Backend with rand high mode
LITE_POWER_RAND_LOW = 5 ///< Use Lite Backend with rand low power mode
};
FASTDEPLOY_DECL std::string Str(const Backend& b);
FASTDEPLOY_DECL std::string Str(const ModelFormat& f);
/**
* @brief Get all the available inference backend in FastDeploy
*/
FASTDEPLOY_DECL std::vector<Backend> GetAvailableBackends();
/**
* @brief Check if the inference backend available
*/
FASTDEPLOY_DECL bool IsBackendAvailable(const Backend& backend);
bool CheckModelFormat(const std::string& model_file,
const ModelFormat& model_format);
ModelFormat GuessModelFormat(const std::string& model_file);
/*! @brief Option object used when create a new Runtime object
*/
struct FASTDEPLOY_DECL RuntimeOption {
/** \brief Set path of model file and parameter file
*
* \param[in] model_path Path of model file, e.g ResNet50/model.pdmodel for Paddle format model / ResNet50/model.onnx for ONNX format model
* \param[in] params_path Path of parameter file, this only used when the model format is Paddle, e.g Resnet50/model.pdiparams
* \param[in] format Format of the loaded model
*/
void SetModelPath(const std::string& model_path,
const std::string& params_path = "",
const ModelFormat& format = ModelFormat::PADDLE);
/// Use cpu to inference, the runtime will inference on CPU by default
void UseCpu();
/// Use Nvidia GPU to inference
void UseGpu(int gpu_id = 0);
void UseRKNPU2(fastdeploy::rknpu2::CpuName rknpu2_name =
fastdeploy::rknpu2::CpuName::RK3588,
fastdeploy::rknpu2::CoreMask rknpu2_core =
fastdeploy::rknpu2::CoreMask::RKNN_NPU_CORE_0);
/// Use TimVX to inference
void UseTimVX();
void SetExternalStream(void* external_stream);
/*
* @brief Set number of cpu threads while inference on CPU, by default it will decided by the different backends
*/
void SetCpuThreadNum(int thread_num);
/// Set ORT graph opt level, default is decide by ONNX Runtime itself
void SetOrtGraphOptLevel(int level = -1);
/// Set Paddle Inference as inference backend, support CPU/GPU
void UsePaddleBackend();
/// Wrapper function of UsePaddleBackend()
void UsePaddleInferBackend() { return UsePaddleBackend(); }
/// Set ONNX Runtime as inference backend, support CPU/GPU
void UseOrtBackend();
/// Set TensorRT as inference backend, only support GPU
void UseTrtBackend();
/// Set Poros backend as inference backend, support CPU/GPU
void UsePorosBackend();
/// Set OpenVINO as inference backend, only support CPU
void UseOpenVINOBackend();
/// Set Paddle Lite as inference backend, only support arm cpu
void UseLiteBackend();
/// Wrapper function of UseLiteBackend()
void UsePaddleLiteBackend() { return UseLiteBackend(); }
/// Set mkldnn switch while using Paddle Inference as inference backend
void SetPaddleMKLDNN(bool pd_mkldnn = true);
/*
* @brief If TensorRT backend is used, EnablePaddleToTrt will change to use Paddle Inference backend, and use its integrated TensorRT instead.
*/
void EnablePaddleToTrt();
/**
* @brief Delete pass by name while using Paddle Inference as inference backend, this can be called multiple times to delete a set of passes
*/
void DeletePaddleBackendPass(const std::string& delete_pass_name);
/**
* @brief Enable print debug information while using Paddle Inference as inference backend, the backend disable the debug information by default
*/
void EnablePaddleLogInfo();
/**
* @brief Disable print debug information while using Paddle Inference as inference backend
*/
void DisablePaddleLogInfo();
/**
* @brief Set shape cache size while using Paddle Inference with mkldnn, by default it will cache all the difference shape
*/
void SetPaddleMKLDNNCacheSize(int size);
/**
* @brief Set device name for OpenVINO, default 'CPU', can also be 'AUTO', 'GPU', 'GPU.1'....
*/
void SetOpenVINODevice(const std::string& name = "CPU");
/**
* @brief Set shape info for OpenVINO
*/
void SetOpenVINOShapeInfo(
const std::map<std::string, std::vector<int64_t>>& shape_info) {
ov_shape_infos = shape_info;
}
/**
* @brief While use OpenVINO backend with intel GPU, use this interface to specify operators run on CPU
*/
void SetOpenVINOCpuOperators(const std::vector<std::string>& operators) {
ov_cpu_operators = operators;
}
/**
* @brief Set optimzed model dir for Paddle Lite backend.
*/
void SetLiteOptimizedModelDir(const std::string& optimized_model_dir);
/**
* @brief Set nnadapter subgraph partition path for Paddle Lite backend.
*/
void SetLiteSubgraphPartitionPath(
const std::string& nnadapter_subgraph_partition_config_path);
/**
* @brief enable half precision while use paddle lite backend
*/
void EnableLiteFP16();
/**
* @brief disable half precision, change to full precision(float32)
*/
void DisableLiteFP16();
/**
* @brief enable int8 precision while use paddle lite backend
*/
void EnableLiteInt8();
/**
* @brief disable int8 precision, change to full precision(float32)
*/
void DisableLiteInt8();
/**
* @brief Set power mode while using Paddle Lite as inference backend, mode(0: LITE_POWER_HIGH; 1: LITE_POWER_LOW; 2: LITE_POWER_FULL; 3: LITE_POWER_NO_BIND, 4: LITE_POWER_RAND_HIGH; 5: LITE_POWER_RAND_LOW, refer [paddle lite](https://paddle-lite.readthedocs.io/zh/latest/api_reference/cxx_api_doc.html#set-power-mode) for more details)
*/
void SetLitePowerMode(LitePowerMode mode);
/** \brief Set shape range of input tensor for the model that contain dynamic input shape while using TensorRT backend
*
* \param[in] input_name The name of input for the model which is dynamic shape
* \param[in] min_shape The minimal shape for the input tensor
* \param[in] opt_shape The optimized shape for the input tensor, just set the most common shape, if set as default value, it will keep same with min_shape
* \param[in] max_shape The maximum shape for the input tensor, if set as default value, it will keep same with min_shape
*/
void SetTrtInputShape(
const std::string& input_name, const std::vector<int32_t>& min_shape,
const std::vector<int32_t>& opt_shape = std::vector<int32_t>(),
const std::vector<int32_t>& max_shape = std::vector<int32_t>());
/// Set max_workspace_size for TensorRT, default 1<<30
void SetTrtMaxWorkspaceSize(size_t trt_max_workspace_size);
/// Set max_batch_size for TensorRT, default 32
void SetTrtMaxBatchSize(size_t max_batch_size);
/**
* @brief Enable FP16 inference while using TensorRT backend. Notice: not all the GPU device support FP16, on those device doesn't support FP16, FastDeploy will fallback to FP32 automaticly
*/
void EnableTrtFP16();
/// Disable FP16 inference while using TensorRT backend
void DisableTrtFP16();
/**
* @brief Set cache file path while use TensorRT backend. Loadding a Paddle/ONNX model and initialize TensorRT will take a long time, by this interface it will save the tensorrt engine to `cache_file_path`, and load it directly while execute the code again
*/
void SetTrtCacheFile(const std::string& cache_file_path);
/**
* @brief Enable pinned memory. Pinned memory can be utilized to speedup the data transfer between CPU and GPU. Currently it's only suppurted in TRT backend and Paddle Inference backend.
*/
void EnablePinnedMemory();
/**
* @brief Disable pinned memory
*/
void DisablePinnedMemory();
/**
* @brief Enable to collect shape in paddle trt backend
*/
void EnablePaddleTrtCollectShape();
/**
* @brief Disable to collect shape in paddle trt backend
*/
void DisablePaddleTrtCollectShape();
/**
* @brief Prevent ops running in paddle trt backend
*/
void DisablePaddleTrtOPs(const std::vector<std::string>& ops);
/*
* @brief Set number of streams by the OpenVINO backends
*/
void SetOpenVINOStreams(int num_streams);
/** \Use Graphcore IPU to inference.
*
* \param[in] device_num the number of IPUs.
* \param[in] micro_batch_size the batch size in the graph, only work when graph has no batch shape info.
* \param[in] enable_pipelining enable pipelining.
* \param[in] batches_per_step the number of batches per run in pipelining.
*/
void UseIpu(int device_num = 1, int micro_batch_size = 1,
bool enable_pipelining = false, int batches_per_step = 1);
/** \brief Set IPU config.
*
* \param[in] enable_fp16 enable fp16.
* \param[in] replica_num the number of graph replication.
* \param[in] available_memory_proportion the available memory proportion for matmul/conv.
* \param[in] enable_half_partial enable fp16 partial for matmul, only work with fp16.
*/
void SetIpuConfig(bool enable_fp16 = false, int replica_num = 1,
float available_memory_proportion = 1.0,
bool enable_half_partial = false);
Backend backend = Backend::UNKNOWN;
// for cpu inference and preprocess
// default will let the backend choose their own default value
int cpu_thread_num = -1;
int device_id = 0;
Device device = Device::CPU;
void* external_stream_ = nullptr;
bool enable_pinned_memory = false;
// ======Only for ORT Backend========
// -1 means use default value by ort
// 0: ORT_DISABLE_ALL 1: ORT_ENABLE_BASIC 2: ORT_ENABLE_EXTENDED 3:
// ORT_ENABLE_ALL
int ort_graph_opt_level = -1;
int ort_inter_op_num_threads = -1;
// 0: ORT_SEQUENTIAL 1: ORT_PARALLEL
int ort_execution_mode = -1;
// ======Only for Paddle Backend=====
bool pd_enable_mkldnn = true;
bool pd_enable_log_info = false;
bool pd_enable_trt = false;
bool pd_collect_shape = false;
int pd_mkldnn_cache_size = 1;
std::vector<std::string> pd_delete_pass_names;
// ======Only for Paddle IPU Backend =======
int ipu_device_num = 1;
int ipu_micro_batch_size = 1;
bool ipu_enable_pipelining = false;
int ipu_batches_per_step = 1;
bool ipu_enable_fp16 = false;
int ipu_replica_num = 1;
float ipu_available_memory_proportion = 1.0;
bool ipu_enable_half_partial = false;
// ======Only for Paddle-Lite Backend=====
// 0: LITE_POWER_HIGH 1: LITE_POWER_LOW 2: LITE_POWER_FULL
// 3: LITE_POWER_NO_BIND 4: LITE_POWER_RAND_HIGH
// 5: LITE_POWER_RAND_LOW
LitePowerMode lite_power_mode = LitePowerMode::LITE_POWER_NO_BIND;
// enable int8 or not
bool lite_enable_int8 = false;
// enable fp16 or not
bool lite_enable_fp16 = false;
// optimized model dir for CxxConfig
std::string lite_optimized_model_dir = "";
std::string lite_nnadapter_subgraph_partition_config_path = "";
bool enable_timvx = false;
// ======Only for Trt Backend=======
std::map<std::string, std::vector<int32_t>> trt_max_shape;
std::map<std::string, std::vector<int32_t>> trt_min_shape;
std::map<std::string, std::vector<int32_t>> trt_opt_shape;
std::string trt_serialize_file = "";
bool trt_enable_fp16 = false;
bool trt_enable_int8 = false;
size_t trt_max_batch_size = 32;
size_t trt_max_workspace_size = 1 << 30;
// ======Only for PaddleTrt Backend=======
std::vector<std::string> trt_disabled_ops_{};
// ======Only for Poros Backend=======
bool is_dynamic = false;
bool long_to_int = true;
bool use_nvidia_tf32 = false;
int unconst_ops_thres = -1;
std::string poros_file = "";
// ======Only for OpenVINO Backend=======
int ov_num_streams = 0;
std::string openvino_device = "CPU";
std::map<std::string, std::vector<int64_t>> ov_shape_infos;
std::vector<std::string> ov_cpu_operators;
// ======Only for RKNPU2 Backend=======
fastdeploy::rknpu2::CpuName rknpu2_cpu_name_ =
fastdeploy::rknpu2::CpuName::RK3588;
fastdeploy::rknpu2::CoreMask rknpu2_core_mask_ =
fastdeploy::rknpu2::CoreMask::RKNN_NPU_CORE_AUTO;
std::string model_file = ""; // Path of model file
std::string params_file = ""; // Path of parameters file, can be empty
// format of input model
ModelFormat model_format = ModelFormat::AUTOREC;
};
/*! @brief Runtime object used to inference the loaded model on different devices
*/
struct FASTDEPLOY_DECL Runtime {
public:
/// Intialize a Runtime object with RuntimeOption
bool Init(const RuntimeOption& _option);
/** \brief Inference the model by the input data, and write to the output
*
* \param[in] input_tensors Notice the FDTensor::name should keep same with the model's input
* \param[in] output_tensors Inference results
* \return true if the inference successed, otherwise false
*/
bool Infer(std::vector<FDTensor>& input_tensors,
std::vector<FDTensor>* output_tensors);
/** \brief No params inference the model.
*
* the input and output data need to pass through the BindInputTensor and GetOutputTensor interfaces.
*/
bool Infer();
/** \brief Compile TorchScript Module, only for Poros backend
*
* \param[in] prewarm_tensors Prewarm datas for compile
* \param[in] _option Runtime option
* \return true if compile successed, otherwise false
*/
bool Compile(std::vector<std::vector<FDTensor>>& prewarm_tensors,
const RuntimeOption& _option);
/** \brief Get number of inputs
*/
int NumInputs() { return backend_->NumInputs(); }
/** \brief Get number of outputs
*/
int NumOutputs() { return backend_->NumOutputs(); }
/** \brief Get input information by index
*/
TensorInfo GetInputInfo(int index);
/** \brief Get output information by index
*/
TensorInfo GetOutputInfo(int index);
/** \brief Get all the input information
*/
std::vector<TensorInfo> GetInputInfos();
/** \brief Get all the output information
*/
std::vector<TensorInfo> GetOutputInfos();
/** \brief Bind FDTensor by name, no copy and share input memory
*/
void BindInputTensor(const std::string& name, FDTensor& input);
/** \brief Get output FDTensor by name, no copy and share backend output memory
*/
FDTensor* GetOutputTensor(const std::string& name);
/** \brief Clone new Runtime when multiple instances of the same model are created
*
* \param[in] stream CUDA Stream, defualt param is nullptr
* \return new Runtime* by this clone
*/
Runtime* Clone(void* stream = nullptr, int device_id = -1);
RuntimeOption option;
private:
void CreateOrtBackend();
void CreatePaddleBackend();
void CreateTrtBackend();
void CreateOpenVINOBackend();
void CreateLiteBackend();
void CreateRKNPU2Backend();
std::unique_ptr<BaseBackend> backend_;
std::vector<FDTensor> input_tensors_;
std::vector<FDTensor> output_tensors_;
};
} // namespace fastdeploy

19
3rdparty/include/fastdeploy/text.h vendored Normal file
View File

@@ -0,0 +1,19 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/config.h"
#ifdef ENABLE_TEXT
#include "fastdeploy/text/uie/model.h"
#endif

View File

@@ -0,0 +1,52 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
namespace fastdeploy {
static inline int CanonicalAxis(const int axis, const int rank) {
if (axis < 0) {
return axis + rank;
}
return axis;
}
static inline int SizeToAxis(const int axis, const std::vector<int64_t>& dims) {
int size = 1;
for (int i = 0; i < axis; i++) {
size *= dims[i];
}
return size;
}
static inline int SizeFromAxis(const int axis,
const std::vector<int64_t>& dims) {
int size = 1;
for (int i = axis; i < dims.size(); i++) {
size *= dims[i];
}
return size;
}
static inline int SizeOutAxis(const int axis,
const std::vector<int64_t>& dims) {
int size = 1;
for (int i = axis + 1; i < dims.size(); i++) {
size *= dims[i];
}
return size;
}
} // namespace fastdeploy

View File

@@ -0,0 +1,74 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <string>
#include <vector>
#include <fstream>
#ifdef _MSC_VER
#define PATH_SEP "\\"
#else
#define PATH_SEP "/"
#endif
namespace fastdeploy {
inline std::string PathJoin(const std::vector<std::string>& paths,
const std::string& sep = PATH_SEP) {
if (paths.size() == 1) {
return paths[0];
}
std::string filepath = "";
for (const auto& path : paths) {
if (filepath == "") {
filepath += path;
continue;
}
if (path[0] == sep[0] || filepath.back() == sep[0]) {
filepath += path;
} else {
filepath += sep + path;
}
}
return filepath;
}
inline std::string PathJoin(const std::string& folder,
const std::string& filename,
const std::string& sep = PATH_SEP) {
return PathJoin(std::vector<std::string>{folder, filename}, sep);
}
inline std::string GetDirFromPath(const std::string& path) {
auto pos = path.find_last_of(PATH_SEP);
if (pos == std::string::npos) {
return "";
}
// The root path in UNIX systems
if (pos == 0) {
return "/";
}
return path.substr(0, pos);
}
inline bool CheckFileExists(const std::string& path) {
std::fstream fin(path, std::ios::in);
if (!fin) {
return false;
}
return true;
}
} // namespace fastdeploy

View File

@@ -0,0 +1,49 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/utils/utils.h"
#include <chrono> // NOLINT
namespace fastdeploy {
class FASTDEPLOY_DECL TimeCounter {
public:
void Start() { begin_ = std::chrono::system_clock::now(); }
void End() { end_ = std::chrono::system_clock::now(); }
double Duration() {
auto duration =
std::chrono::duration_cast<std::chrono::microseconds>(end_ - begin_);
return static_cast<double>(duration.count()) *
std::chrono::microseconds::period::num /
std::chrono::microseconds::period::den;
}
void PrintInfo(const std::string& prefix = "TimeCounter: ",
bool print_out = true) {
if (!print_out) {
return;
}
FDLogger() << prefix << " duration = " << Duration() << "s." << std::endl;
}
private:
std::chrono::time_point<std::chrono::system_clock> begin_;
std::chrono::time_point<std::chrono::system_clock> end_;
};
} // namespace fastdeploy

View File

@@ -0,0 +1,58 @@
/* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#pragma once
#include <memory>
namespace fastdeploy {
namespace utils {
// Trait to select overloads and return types for MakeUnique.
template <typename T>
struct MakeUniqueResult {
using scalar = std::unique_ptr<T>;
};
template <typename T>
struct MakeUniqueResult<T[]> {
using array = std::unique_ptr<T[]>;
};
template <typename T, size_t N>
struct MakeUniqueResult<T[N]> {
using invalid = void;
};
// MakeUnique<T>(...) is an early implementation of C++14 std::make_unique.
// It is designed to be 100% compatible with std::make_unique so that the
// eventual switchover will be a simple renaming operation.
template <typename T, typename... Args>
typename MakeUniqueResult<T>::scalar make_unique(Args &&... args) { // NOLINT
return std::unique_ptr<T>(
new T(std::forward<Args>(args)...)); // NOLINT(build/c++11)
}
// Overload for array of unknown bound.
// The allocation of arrays needs to use the array form of new,
// and cannot take element constructor arguments.
template <typename T>
typename MakeUniqueResult<T>::array make_unique(size_t n) {
return std::unique_ptr<T>(new typename std::remove_extent<T>::type[n]());
}
// Reject arrays of known bound.
template <typename T, typename... Args>
typename MakeUniqueResult<T>::invalid make_unique(Args &&... /* args */) =
delete; // NOLINT
} // namespace utils
} // namespace fastdeploy

View File

@@ -0,0 +1,218 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <cstdio>
#include <stdlib.h>
#include <fstream>
#include <iostream>
#include <numeric>
#include <sstream>
#include <string>
#include <type_traits>
#include <vector>
#ifdef __ANDROID__
#include <android/log.h> // NOLINT
#endif
#if defined(_WIN32)
#ifdef FASTDEPLOY_LIB
#define FASTDEPLOY_DECL __declspec(dllexport)
#else
#define FASTDEPLOY_DECL __declspec(dllimport)
#endif // FASTDEPLOY_LIB
#else
#define FASTDEPLOY_DECL __attribute__((visibility("default")))
#endif // _WIN32
namespace fastdeploy {
class FASTDEPLOY_DECL FDLogger {
public:
FDLogger() {
line_ = "";
prefix_ = "[FastDeploy]";
verbose_ = true;
}
explicit FDLogger(bool verbose, const std::string& prefix = "[FastDeploy]");
template <typename T> FDLogger& operator<<(const T& val) {
if (!verbose_) {
return *this;
}
std::stringstream ss;
ss << val;
line_ += ss.str();
return *this;
}
FDLogger& operator<<(std::ostream& (*os)(std::ostream&));
~FDLogger() {
if (!verbose_ && line_ != "") {
std::cout << line_ << std::endl;
#ifdef __ANDROID__
__android_log_print(ANDROID_LOG_INFO, prefix_.c_str(), "%s",
line_.c_str());
#endif
}
}
private:
std::string line_;
std::string prefix_;
bool verbose_ = true;
};
FASTDEPLOY_DECL bool ReadBinaryFromFile(const std::string& file,
std::string* contents);
#ifndef __REL_FILE__
#define __REL_FILE__ __FILE__
#endif
#define FDERROR \
FDLogger(true, "[ERROR]") \
<< __REL_FILE__ << "(" << __LINE__ << ")::" << __FUNCTION__ << "\t"
#define FDWARNING \
FDLogger(true, "[WARNING]") \
<< __REL_FILE__ << "(" << __LINE__ << ")::" << __FUNCTION__ << "\t"
#define FDINFO \
FDLogger(true, "[INFO]") << __REL_FILE__ << "(" << __LINE__ \
<< ")::" << __FUNCTION__ << "\t"
#define FDASSERT(condition, format, ...) \
if (!(condition)) { \
int n = std::snprintf(nullptr, 0, format, ##__VA_ARGS__); \
std::vector<char> buffer(n + 1); \
std::snprintf(buffer.data(), n + 1, format, ##__VA_ARGS__); \
FDERROR << buffer.data() << std::endl; \
std::abort(); \
}
///////// Basic Marco ///////////
#define FD_PRIVATE_CASE_TYPE_USING_HINT(NAME, enum_type, type, HINT, ...) \
case enum_type: { \
using HINT = type; \
__VA_ARGS__(); \
break; \
}
#define FD_PRIVATE_CASE_TYPE(NAME, enum_type, type, ...) \
FD_PRIVATE_CASE_TYPE_USING_HINT(NAME, enum_type, type, data_t, __VA_ARGS__)
// Visit different data type to match the corresponding function of FDTensor
#define FD_VISIT_ALL_TYPES(TYPE, NAME, ...) \
[&] { \
const auto& __dtype__ = TYPE; \
switch (__dtype__) { \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::UINT8, uint8_t, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::BOOL, bool, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::INT32, int32_t, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::INT64, int64_t, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::FP32, float, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::FP64, double, \
__VA_ARGS__) \
default: \
FDASSERT(false, \
"Invalid enum data type. Expect to accept data " \
"type BOOL, INT32, " \
"INT64, FP32, FP64, but receive type %s.", \
Str(__dtype__).c_str()); \
} \
}()
#define FD_VISIT_INT_FLOAT_TYPES(TYPE, NAME, ...) \
[&] { \
const auto& __dtype__ = TYPE; \
switch (__dtype__) { \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::INT32, int32_t, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::INT64, int64_t, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::FP32, float, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::FP64, double, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::UINT8, uint8_t, \
__VA_ARGS__) \
default: \
FDASSERT(false, \
"Invalid enum data type. Expect to accept data type INT32, " \
"INT64, FP32, FP64, UINT8 but receive type %s.", \
Str(__dtype__).c_str()); \
} \
}()
#define FD_VISIT_FLOAT_TYPES(TYPE, NAME, ...) \
[&] { \
const auto& __dtype__ = TYPE; \
switch (__dtype__) { \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::FP32, float, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::FP64, double, \
__VA_ARGS__) \
default: \
FDASSERT(false, \
"Invalid enum data type. Expect to accept data type FP32, " \
"FP64, but receive type %s.", \
Str(__dtype__).c_str()); \
} \
}()
#define FD_VISIT_INT_TYPES(TYPE, NAME, ...) \
[&] { \
const auto& __dtype__ = TYPE; \
switch (__dtype__) { \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::INT32, int32_t, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::INT64, int64_t, \
__VA_ARGS__) \
FD_PRIVATE_CASE_TYPE(NAME, ::fastdeploy::FDDataType::UINT8, uint8_t, \
__VA_ARGS__) \
default: \
FDASSERT(false, \
"Invalid enum data type. Expect to accept data type INT32, " \
"INT64, UINT8 but receive type %s.", \
Str(__dtype__).c_str()); \
} \
}()
FASTDEPLOY_DECL std::vector<int64_t>
GetStride(const std::vector<int64_t>& dims);
template <typename T, typename std::enable_if<std::is_integral<T>::value,
bool>::type = true>
std::string Str(const std::vector<T>& shape) {
std::ostringstream oss;
oss << "[ " << shape[0];
for (int i = 1; i < shape.size(); ++i) {
oss << " ," << shape[i];
}
oss << " ]";
return oss.str();
}
} // namespace fastdeploy

62
3rdparty/include/fastdeploy/vision.h vendored Normal file
View File

@@ -0,0 +1,62 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/core/config.h"
#ifdef ENABLE_VISION
#include "fastdeploy/vision/classification/contrib/resnet.h"
#include "fastdeploy/vision/classification/contrib/yolov5cls.h"
#include "fastdeploy/vision/classification/ppcls/model.h"
#include "fastdeploy/vision/detection/contrib/nanodet_plus.h"
#include "fastdeploy/vision/detection/contrib/scaledyolov4.h"
#include "fastdeploy/vision/detection/contrib/yolor.h"
#include "fastdeploy/vision/detection/contrib/yolov5/yolov5.h"
#include "fastdeploy/vision/detection/contrib/yolov5lite.h"
#include "fastdeploy/vision/detection/contrib/yolov6.h"
#include "fastdeploy/vision/detection/contrib/yolov7/yolov7.h"
#include "fastdeploy/vision/detection/contrib/yolov7end2end_ort.h"
#include "fastdeploy/vision/detection/contrib/yolov7end2end_trt.h"
#include "fastdeploy/vision/detection/contrib/yolox.h"
#include "fastdeploy/vision/detection/ppdet/model.h"
#include "fastdeploy/vision/facealign/contrib/face_landmark_1000.h"
#include "fastdeploy/vision/facealign/contrib/pfld.h"
#include "fastdeploy/vision/facealign/contrib/pipnet.h"
#include "fastdeploy/vision/facedet/contrib/retinaface.h"
#include "fastdeploy/vision/facedet/contrib/scrfd.h"
#include "fastdeploy/vision/facedet/contrib/ultraface.h"
#include "fastdeploy/vision/facedet/contrib/yolov5face.h"
#include "fastdeploy/vision/faceid/contrib/adaface.h"
#include "fastdeploy/vision/faceid/contrib/arcface.h"
#include "fastdeploy/vision/faceid/contrib/cosface.h"
#include "fastdeploy/vision/faceid/contrib/insightface_rec.h"
#include "fastdeploy/vision/faceid/contrib/partial_fc.h"
#include "fastdeploy/vision/faceid/contrib/vpl.h"
#include "fastdeploy/vision/headpose/contrib/fsanet.h"
#include "fastdeploy/vision/keypointdet/pptinypose/pptinypose.h"
#include "fastdeploy/vision/matting/contrib/modnet.h"
#include "fastdeploy/vision/matting/contrib/rvm.h"
#include "fastdeploy/vision/matting/ppmatting/ppmatting.h"
#include "fastdeploy/vision/ocr/ppocr/classifier.h"
#include "fastdeploy/vision/ocr/ppocr/dbdetector.h"
#include "fastdeploy/vision/ocr/ppocr/ppocr_v2.h"
#include "fastdeploy/vision/ocr/ppocr/ppocr_v3.h"
#include "fastdeploy/vision/ocr/ppocr/recognizer.h"
#include "fastdeploy/vision/ocr/ppocr/utils/ocr_utils.h"
#include "fastdeploy/vision/segmentation/ppseg/model.h"
#include "fastdeploy/vision/sr/ppsr/model.h"
#include "fastdeploy/vision/tracking/pptracking/model.h"
#endif
#include "fastdeploy/vision/visualize/visualize.h"

View File

@@ -0,0 +1,75 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/utils/utils.h"
#include "fastdeploy/vision/common/processors/mat.h"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include <unordered_map>
namespace fastdeploy {
namespace vision {
/*! @brief Enable using FlyCV to process image while deploy vision models.
* Currently, FlyCV in only available on ARM(Linux aarch64/Android), so will
* fallback to using OpenCV in other platform
*/
FASTDEPLOY_DECL void EnableFlyCV();
/// Disable using FlyCV to process image while deploy vision models.
FASTDEPLOY_DECL void DisableFlyCV();
/*! @brief Set the cpu num threads of ProcLib.
*/
FASTDEPLOY_DECL void SetProcLibCpuNumThreads(int threads);
class FASTDEPLOY_DECL Processor {
public:
// default_lib has the highest priority
// all the function in `processor` will force to use
// default_lib if this flag is set.
// DEFAULT means this flag is not set
// static ProcLib default_lib;
virtual std::string Name() = 0;
virtual bool ImplByOpenCV(Mat* mat) {
FDERROR << Name() << " Not Implement Yet." << std::endl;
return false;
}
virtual bool ImplByFlyCV(Mat* mat) {
return ImplByOpenCV(mat);
}
virtual bool ImplByCuda(Mat* mat) {
return ImplByOpenCV(mat);
}
virtual bool operator()(Mat* mat, ProcLib lib = ProcLib::DEFAULT);
protected:
FDTensor* UpdateAndGetReusedBuffer(
const std::vector<int64_t>& new_shape, const int& opencv_dtype,
const std::string& buffer_name, const Device& new_device = Device::CPU,
const bool& use_pinned_memory = false);
private:
std::unordered_map<std::string, FDTensor> reused_buffers_;
};
} // namespace vision
} // namespace fastdeploy

View File

@@ -0,0 +1,39 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/vision/common/processors/base.h"
namespace fastdeploy {
namespace vision {
class FASTDEPLOY_DECL Cast : public Processor {
public:
explicit Cast(const std::string& dtype = "float") : dtype_(dtype) {}
bool ImplByOpenCV(Mat* mat);
#ifdef ENABLE_FLYCV
bool ImplByFlyCV(Mat* mat);
#endif
std::string Name() { return "Cast"; }
static bool Run(Mat* mat, const std::string& dtype,
ProcLib lib = ProcLib::DEFAULT);
std::string GetDtype() const { return dtype_; }
private:
std::string dtype_;
};
} // namespace vision
} // namespace fastdeploy

View File

@@ -0,0 +1,40 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/vision/common/processors/base.h"
namespace fastdeploy {
namespace vision {
class FASTDEPLOY_DECL CenterCrop : public Processor {
public:
CenterCrop(int width, int height) : height_(height), width_(width) {}
bool ImplByOpenCV(Mat* mat);
#ifdef ENABLE_FLYCV
bool ImplByFlyCV(Mat* mat);
#endif
std::string Name() { return "CenterCrop"; }
static bool Run(Mat* mat, const int& width, const int& height,
ProcLib lib = ProcLib::DEFAULT);
private:
int height_;
int width_;
};
} // namespace vision
} // namespace fastdeploy

View File

@@ -0,0 +1,68 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/vision/common/processors/base.h"
namespace fastdeploy {
namespace vision {
class FASTDEPLOY_DECL BGR2RGB : public Processor {
public:
bool ImplByOpenCV(FDMat* mat);
#ifdef ENABLE_FLYCV
bool ImplByFlyCV(FDMat* mat);
#endif
virtual std::string Name() { return "BGR2RGB"; }
static bool Run(FDMat* mat, ProcLib lib = ProcLib::DEFAULT);
};
class FASTDEPLOY_DECL RGB2BGR : public Processor {
public:
bool ImplByOpenCV(FDMat* mat);
#ifdef ENABLE_FLYCV
bool ImplByFlyCV(FDMat* mat);
#endif
std::string Name() { return "RGB2BGR"; }
static bool Run(FDMat* mat, ProcLib lib = ProcLib::DEFAULT);
};
class FASTDEPLOY_DECL BGR2GRAY : public Processor {
public:
bool ImplByOpenCV(FDMat* mat);
#ifdef ENABLE_FLYCV
bool ImplByFlyCV(FDMat* mat);
#endif
virtual std::string Name() { return "BGR2GRAY"; }
static bool Run(FDMat* mat, ProcLib lib = ProcLib::DEFAULT);
};
class FASTDEPLOY_DECL RGB2GRAY : public Processor {
public:
bool ImplByOpenCV(FDMat* mat);
#ifdef ENABLE_FLYCV
bool ImplByFlyCV(FDMat* mat);
#endif
std::string Name() { return "RGB2GRAY"; }
static bool Run(FDMat* mat, ProcLib lib = ProcLib::DEFAULT);
};
} // namespace vision
} // namespace fastdeploy

View File

@@ -0,0 +1,42 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/vision/common/processors/base.h"
namespace fastdeploy {
namespace vision {
class FASTDEPLOY_DECL Convert : public Processor {
public:
Convert(const std::vector<float>& alpha, const std::vector<float>& beta);
bool ImplByOpenCV(Mat* mat);
#ifdef ENABLE_FLYCV
bool ImplByFlyCV(Mat* mat);
#endif
std::string Name() { return "Convert"; }
// Compute `result = mat * alpha + beta` directly by channel.
// The default behavior is the same as OpenCV's convertTo method.
static bool Run(Mat* mat, const std::vector<float>& alpha,
const std::vector<float>& beta,
ProcLib lib = ProcLib::DEFAULT);
private:
std::vector<float> alpha_;
std::vector<float> beta_;
};
} // namespace vision
} // namespace fastdeploy

View File

@@ -0,0 +1,66 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/vision/common/processors/base.h"
namespace fastdeploy {
namespace vision {
class FASTDEPLOY_DECL ConvertAndPermute : public Processor {
public:
ConvertAndPermute(const std::vector<float>& alpha = std::vector<float>(),
const std::vector<float>& beta = std::vector<float>(),
bool swap_rb = false);
bool ImplByOpenCV(FDMat* mat);
#ifdef ENABLE_FLYCV
bool ImplByFlyCV(FDMat* mat);
#endif
std::string Name() { return "ConvertAndPermute"; }
static bool Run(FDMat* mat, const std::vector<float>& alpha,
const std::vector<float>& beta, bool swap_rb = false,
ProcLib lib = ProcLib::DEFAULT);
std::vector<float> GetAlpha() const { return alpha_; }
void SetAlpha(const std::vector<float>& alpha) {
alpha_.clear();
std::vector<float>().swap(alpha_);
alpha_.assign(alpha.begin(), alpha.end());
}
std::vector<float> GetBeta() const { return beta_; }
void SetBeta(const std::vector<float>& beta) {
beta_.clear();
std::vector<float>().swap(beta_);
beta_.assign(beta.begin(), beta.end());
}
bool GetSwapRB() {
return swap_rb_;
}
void SetSwapRB(bool swap_rb) {
swap_rb_ = swap_rb;
}
private:
std::vector<float> alpha_;
std::vector<float> beta_;
bool swap_rb_;
};
} // namespace vision
} // namespace fastdeploy

View File

@@ -0,0 +1,49 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/vision/common/processors/base.h"
namespace fastdeploy {
namespace vision {
class FASTDEPLOY_DECL Crop : public Processor {
public:
Crop(int offset_w, int offset_h, int width, int height) {
offset_w_ = offset_w;
offset_h_ = offset_h;
width_ = width;
height_ = height;
}
bool ImplByOpenCV(Mat* mat);
#ifdef ENABLE_FLYCV
bool ImplByFlyCV(Mat* mat);
#endif
std::string Name() { return "Crop"; }
static bool Run(Mat* mat, int offset_w, int offset_h, int width, int height,
ProcLib lib = ProcLib::DEFAULT);
private:
int offset_w_;
int offset_h_;
int height_;
int width_;
};
} // namespace vision
} // namespace fastdeploy

View File

@@ -0,0 +1,33 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include "fastdeploy/vision/common/processors/base.h"
namespace fastdeploy {
namespace vision {
class FASTDEPLOY_DECL HWC2CHW : public Processor {
public:
bool ImplByOpenCV(Mat* mat);
#ifdef ENABLE_FLYCV
bool ImplByFlyCV(Mat* mat);
#endif
std::string Name() { return "HWC2CHW"; }
static bool Run(Mat* mat, ProcLib lib = ProcLib::DEFAULT);
};
} // namespace vision
} // namespace fastdeploy

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