fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,135 Commits 61 Branches 1,837 Tags
71d9059c06bebfd19bf09d64ecb6bb59be2859d2
Commit Graph

5135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Clock
8804d3a007 KR resources 2022-12-05 23:13:03 +09:00
MistEO
5b6aa08bef fix: 修复龙舌兰识别错误 2022-12-05 21:56:41 +08:00
MistEO
18274f7761 docs: 修正文档 2022-12-05 15:12:12 +08:00
MistEO
5441531ae4 docs: Update 3.1-集成文档.md (#3009) 
Update 3.1-集成文档.md
 2022-12-05 15:04:31 +08:00
Horror Proton
880a7dafa7 chore: remove a redundant requires 2022-12-05 13:26:27 +08:00
Horror Proton
0f31a5172d feat: updae CMakeLists for installing libraries 2022-12-05 13:08:01 +08:00
Hao Guan
03693667cb Merge pull request #3008 from hguandl/osx/fastdeploy 
feat / macOS: 支持 FastDeploy 和 MaaTouch
 2022-12-05 12:33:08 +10:00
ChildeRolando
c3683724f6 Update 3.1-集成文档.md 
修改了错别字
 2022-12-05 02:27:50 +01:00
Hao Guan
6f938aa104 Mac: support MaaTouch 2022-12-05 05:03:14 +10:00
MistEO
c8dce2e908 feat: 新增仅MaaTouch支持的暂停下干员优化。下的更快！ 2022-12-05 01:17:31 +08:00
Hao Guan
90ab3dacfe feat: macOS support FastDeploy 2022-12-04 20:23:46 +10:00
Mr-Milk
04bf67c9d4 修改可能产生歧义的语句 (#3004) 
* Fixed、

* docs: 修正文档格式

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

* 更新
 2022-12-04 03:36:17 +08:00
uye
f0c1760337 Merge pull request #3000 from 178619/dev 
docs, resources and localization update for KR
 2022-12-04 02:08:56 +08:00
Clock
19652d6ff7 Localization Update 2022-12-04 02:18:30 +09:00
Clock
7662594560 KR resource update 2022-12-04 02:18:30 +09:00
Clock
ee61967f24 KR docs update 2022-12-04 02:18:30 +09:00
uye
16fcc0bf42 fix: 修复信用商店描述错误 2022-12-03 22:44:30 +08:00
MistEO
6f9333f6d3 docs: 更新ts接口链接 2022-12-03 21:29:09 +08:00
MistEO
21e6b33f24 feat: 新增“暂停下干员”选项，默认关闭。调整部署部署干员的参数 2022-12-03 21:02:58 +08:00
MistEO
8f9e317a42 perf: 自动战斗一些没啥用的优化 2022-12-03 20:24:47 +08:00
MistEO
98644d357f fix: 修复自动战斗子弹时间部署不生效的问题 2022-12-03 20:16:09 +08:00
MistEO
99cce23b8e perf: 优化界面一处判断逻辑 2022-12-03 19:27:24 +08:00
Horror Proton
f1a482d8f8 perf: update Assistant::async_call 2022-12-03 17:41:07 +08:00
Horror Proton
d38bd7361e chore: fix typos 2022-12-03 17:35:24 +08:00
MistEO
7e99ab9060 feat: 启动时删除old文件 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2988
 2022-12-03 14:47:10 +08:00
MistEO
f25b9df300 fix: 修复暂停下干员的配置错误 2022-12-03 14:33:18 +08:00