fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,164 Commits 61 Branches 1,836 Tags
cf1ce8dc22bef338410ee1293eefead4c366d2e6
Commit Graph

5164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
cf1ce8dc22 revert: 回滚charOCR 2022-12-12 23:33:02 +08:00
uye
accddb04bf feat: 将HelpUri移入MaaUrls 2022-12-11 23:47:19 +08:00
uye
ffbb68b402 style: 隐藏已满员的Q群 2022-12-11 23:47:19 +08:00
MistEO
8dc28d0e74 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
f3fc0fd169 fix: build error 2022-12-11 14:04:08 +08:00
MistEO
e423f00415 fix: 修复潜在的非法关卡名检测错误 2022-12-11 13:55:04 +08:00
MistEO
cb263bf598 chore: 删除一些日志 2022-12-11 13:47:38 +08:00
MistEO
5b46462f4e chore: 删除char ocr模型 2022-12-11 13:45:46 +08:00
MistEO
4dc878967c feat: 升级12/11飞桨中文模型 2022-12-11 13:35:45 +08:00
shxyke
017c9d18e9 Merge pull request #3042 from MaaAssistantArknights/feat/cmake_libraries 
feat: Add checksums for download libs
 2022-12-11 10:15:13 +08:00
shxyke
5e66946c10 feat: Add checksums for download libs 2022-12-11 01:24:37 +00:00
uye
01becb8f88 feat: 支持16点界面与关卡选择热更新 2022-12-10 23:54:18 +08:00
Horror Proton
cc63067551 fix: update tools/global_servers 2022-12-10 17:30:40 +08:00
Yifan Liu
3d635873cf 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
0a06688e0d 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
11a2c1435a 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
71d9059c06 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
6ac939907d 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
82e0d09b7e 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
355e2a2dab 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
c7f328bd81 fix: 修复提示框按钮显示不全 2022-12-10 01:38:06 +08:00
uye
983c012d3a feat: 添加9群链接 2022-12-10 00:31:54 +08:00
Horror Proton
5a83a90324 fix: update workflow trigger for linux 2022-12-09 18:51:39 +08:00
Horror Proton
cd1dbfbe9b fix: update FastDeploy version for linux 2022-12-09 18:49:01 +08:00
Horror Proton
9aa86fcbbd fix: update linux 3rdparty repos 2022-12-09 18:44:07 +08:00
MistEO
19a8812b69 chore: 修复fastdeploy头文件版本错误 2022-12-08 21:39:15 +08:00
MistEO
660011ae4a fix: 修复OCR参数错误 2022-12-08 21:24:59 +08:00
MistEO
e6bb43d705 chore: 更新fastdeploy 
83824f7969
 2022-12-08 21:00:19 +08:00
Horror Proton
f242e611fd Merge pull request #2939 from MaaAssistantArknights/chore/linux_build 
feat: 增加编译 Linux 版本的 workflow
 2022-12-08 12:39:22 +08:00
Horror Proton
101d0eb1d9 chore: download files with cmake in gh workflow, clean up 2022-12-08 12:24:23 +08:00
Yifan Liu
230b5025c5 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
aa9dfac943 feat: 热键设置界面enable不与运行绑定 2022-12-08 00:18:46 +08:00
MistEO
9aaad10787 feat: 移除对切换OCR后端功能的支持 2022-12-08 00:18:46 +08:00
Horror Proton
63341e0409 chore: add release body for nightly workflow 2022-12-07 22:41:43 +08:00
MistEO
3d3fbf30be Merge branch 'master' into dev 2022-12-07 22:21:14 +08:00
MistEO
dac39e2ca1 perf: 更新模型，优化中文识别 2022-12-07 22:20:26 +08:00
MistEO
fd9b39ec17 chore: 重命名ocr keys文件 2022-12-07 20:35:43 +08:00
MistEO
83432093d7 chore: 重命名部分文件，修复task检查错误 2022-12-07 20:33:33 +08:00
MistEO
f65832564d fix: build error 2022-12-07 19:52:45 +08:00
Horror Proton
2cb1767c46 chore: fix release-ota 2022-12-07 19:10:01 +08:00
uye
c902716025 fix: 修复主线关卡导航 2022-12-07 16:09:06 +08:00
MistEO
fb9c717647 Merge pull request #2982 from MaaAssistantArknights/dev 
Release v4.8.0-beta.3
 2022-12-07 14:46:56 +08:00
MistEO
c3edad2e4e docs: update changelog 2022-12-07 14:46:06 +08:00
MistEO
e53f816284 Merge pull request #2994 from horror-proton/test/patch_rust 
feat: 更新 Rust ffi
 2022-12-07 11:49:55 +08:00
Horror Proton
e34929d12e fix: update rust ffi 2022-12-06 23:39:34 +08:00
Horror Proton
9da2acc7e9 chore: fix typos in src/Rust 2022-12-06 23:39:34 +08:00
MistEO
cc9a13fc56 Merge pull request #3014 from MaaAssistantArknights/perf/api_type 
perf: 明确api参数及返回值类型，并兼容原先接口
 2022-12-06 20:30:45 +08:00
Hao Guan
eafd5df01a fix: mac API upgrade 2022-12-06 18:10:52 +08:00
MistEO
2335e279b4 perf: 明确api参数及返回值类型，并兼容原先接口 2022-12-06 18:10:52 +08:00
MistEO
ccc779bd7e Merge pull request #3013 from 178619/dev 
update resources for KR Client
 2022-12-05 22:59:19 +08:00