fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,056 Commits 60 Branches 1,840 Tags
bf30d62eefb1de61d925708d0ead3ee87ad8d05f
Commit Graph

6056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dantmnf
bf30d62eef chore: exclude vcpkg buildtrees in vscode 2023-02-17 19:40:17 +08:00
dantmnf
57a6ea6e70 chore: check-in adb-lite 
Co-authored-by: Hao Guan <10684225+hguandl@users.noreply.github.com>
 2023-02-17 19:40:17 +08:00
dantmnf
7c2c0729a5 chore: move controller to subdirectory 2023-02-17 19:40:15 +08:00
dantmnf
57c2b108fd chore: windows arm64 ci 2023-02-17 19:38:43 +08:00
dantmnf
06b886aafa chore: inject MaaDeps to CI 2023-02-17 19:38:43 +08:00
dantmnf
732c56b630 feat: add MaaDeps submodule and helpers 2023-02-17 19:38:43 +08:00
dantmnf
7b861b7fc2 feat: load onnx from memory 2023-02-17 19:38:43 +08:00
dantmnf
b5c66addd9 feat: add file reading helper 2023-02-17 19:38:40 +08:00
dantmnf
16c4ca4b6a remove: 3rdparty libraries 2023-02-17 19:37:32 +08:00
dantmnf
fd56ec7011 chore: cmake: modernize and inject MaaDeps 2023-02-17 19:37:32 +08:00
dantmnf
35630f0221 chore: inject MaaDeps to msbuild 2023-02-17 19:37:32 +08:00
dantmnf
bdca355961 feat: Add ARM64 target 2023-02-17 19:37:32 +08:00
dantmnf
6935f80178 feat: new SyncRes 2023-02-17 19:37:32 +08:00
dantmnf
7a243a17ff feat: migrate to .NET Core SDK 2023-02-17 19:37:32 +08:00
uye
402c9e455d chore: 添加剩余理智的悬浮提示 
fix #3376
 2023-02-17 18:47:03 +08:00
MistEO
c42c8e40d9 fix: 调整一下日志等级 2023-02-17 17:37:20 +08:00
MistEO
030b479b7a fix: 为战斗干员头像识别，召唤物使用单独的阈值 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3735
 2023-02-17 17:37:10 +08:00
uye
d6b751b707 Merge pull request #3743 from sakuraxp/dev 
chore: 修改信用商店购物黑名单
 2023-02-17 16:49:13 +08:00
uye
f87b91aa56 style: 格式化代码 2023-02-17 01:55:46 +08:00
_ChingC
57b18dc4c5 fix: TrayIcon不显示的问题 2023-02-17 01:39:58 +08:00
MistEO
f9ddbb4b80 style: format tasks.json 2023-02-16 23:22:29 +08:00
MistEO
8bcafda31d perf: 优化牛牛喝酒 2023-02-16 21:53:57 +08:00
sakuraxp
52718fbd78 chore: 修改信用商店购物黑名单 2023-02-16 21:06:29 +08:00
uye
1346699400 fix: 从 UI 线程更新最近连接地址列表 2023-02-16 20:22:42 +08:00
uye
bed285cb25 chore: 修改中文版本表述 2023-02-16 19:20:35 +08:00
uye
63d4e4fdc7 fix: 修复链接错误 
fix #3726
 2023-02-16 16:06:48 +08:00
uye
f8c5fae9ea Merge pull request #3725 from lanhao34/master 
fix: 修复adb自动检测逻辑
 2023-02-16 13:31:55 +08:00
MistEO
ab7aa2d597 fix: 修复自定义基建不使用无人机的问题 2023-02-16 12:37:15 +08:00
Yifan Liu
7fd13f54ea chore: 调整github issue template中截图部分的提示 2023-02-15 21:08:30 -06:00
lanhao34
efac9af7a6 fix adb auto detect logic 2023-02-15 19:10:59 -05:00
MistEO
f34bc07346 Merge pull request #3723 from MaaAssistantArknights/dev 
Release v4.11.0-alpha.2
v4.11.0-alpha.2 		2023-02-16 01:18:31 +08:00
MistEO
d461336826 docs: changelog 2023-02-16 01:01:23 +08:00
MistEO
3212286c4b fix: 修复自动换班排序错误导致的干员冲突问题 
fix #3721
 2023-02-16 00:59:34 +08:00
MistEO
d53653dbbd Merge pull request #3701 from MaaAssistantArknights/dev 
Release v4.11.0-alpha.1
v4.11.0-alpha.1 		2023-02-15 22:23:17 +08:00
MistEO
a03f7ea412 docs: changelogs 2023-02-15 22:09:17 +08:00
MistEO
08aa4a8f80 Merge pull request #3718 from MaaAssistantArknights/docs/migration 
docs: 删除docs中的文档，readme中的网址换为官网地址
 2023-02-15 21:58:10 +08:00
MistEO
c8eeed8530 Merge pull request #3491 from fearlessxjdx/xjdx 
feat: 复核干员选择是否符合期望
 2023-02-15 21:43:09 +08:00
MistEO
c17137c86c Merge branch 'dev' into xjdx 2023-02-15 21:42:55 +08:00
MistEO
9ece0e64b9 fix: 修复文档链接 2023-02-15 21:29:49 +08:00
MistEO
6d1a18a1af chore: 更新企鹅关卡json 2023-02-15 21:25:30 +08:00
uye
16d048fbee docs: 删除docs中的文档，readme中的网址换为官网地址 2023-02-15 21:17:56 +08:00
uye
e3aa53d19b docs: 删除docs中的文档，readme中的网址换为官网地址 2023-02-15 20:52:01 +08:00
MistEO
99c5a2c5c8 Merge pull request #3688 from ChildeRolando/patch-2 
Update 3.1-集成文档.md
 2023-02-15 18:26:07 +08:00
uye
c5cdc79545 Merge pull request #3684 from bigqiao/dev 
支持设置无限使用48小时内理智药
 2023-02-15 16:37:15 +08:00
uye
0e5b468466 Merge pull request #3704 from WLLEGit/ReclamationAlgorithm 
fix: 生息演算 关卡导航
 2023-02-15 16:26:56 +08:00
Yifan Liu
1fa722ae17 chore: update overseas clients tools 
add a new tool to help locate untranslated texts in json
minor updates to the old ones
rename files so that they are more intuitive
 2023-02-14 23:15:07 -06:00
MistEO
e725e35700 Merge pull request #3709 from cenfusheng/dev 
FIX:重新修复缄默德克萨斯的文字识别问题
 2023-02-15 13:12:34 +08:00
cenfusheng
85697dc50f FIX:重新修复缄默德克萨斯的文字识别问题 
修复缄默德克萨斯识别为威默德克萨斯、感默德克萨斯、默德克萨斯等情况
 2023-02-15 12:59:11 +08:00
lhhxxxxx
21c02b5ba0 Merge pull request #3702 from MaaAssistantArknights/CustomStyle/TextBlock 
chore: TextBlock使用自定义控件
 2023-02-15 02:54:59 +08:00
LambdaLe
4c675ad225 fix: 生息演算 关卡导航 2023-02-14 22:08:46 +08:00