fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,996 Commits 61 Branches 1,838 Tags
c9182e23799e79dfdd176aa6299c10ec3ce2bedd
Commit Graph

5996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
c9182e2379 Merge pull request #3743 from sakuraxp/dev 
chore: 修改信用商店购物黑名单
 2023-02-17 16:49:13 +08:00
uye
2ba9602b10 style: 格式化代码 2023-02-17 01:55:46 +08:00
_ChingC
dd5890ffa7 fix: TrayIcon不显示的问题 2023-02-17 01:39:58 +08:00
MistEO
5e78c414ee style: format tasks.json 2023-02-16 23:22:29 +08:00
MistEO
a4ae8cd4d7 perf: 优化牛牛喝酒 2023-02-16 21:53:57 +08:00
sakuraxp
946d6fbeab chore: 修改信用商店购物黑名单 2023-02-16 21:06:29 +08:00
uye
d3aee23c1a fix: 从 UI 线程更新最近连接地址列表 2023-02-16 20:22:42 +08:00
uye
09a5c518e3 chore: 修改中文版本表述 2023-02-16 19:20:35 +08:00
uye
eab7d1a53d fix: 修复链接错误 
fix #3726
 2023-02-16 16:06:48 +08:00
uye
796edbd51d Merge pull request #3725 from lanhao34/master 
fix: 修复adb自动检测逻辑
 2023-02-16 13:31:55 +08:00
MistEO
bc7aafa548 fix: 修复自定义基建不使用无人机的问题 2023-02-16 12:37:15 +08:00
Yifan Liu
8fcea259b6 chore: 调整github issue template中截图部分的提示 2023-02-15 21:08:30 -06:00
lanhao34
e7117bf0b1 fix adb auto detect logic 2023-02-15 19:10:59 -05:00
MistEO
3e331cf7f1 Merge pull request #3723 from MaaAssistantArknights/dev 
Release v4.11.0-alpha.2
 2023-02-16 01:18:31 +08:00
MistEO
fc8d83df8d docs: changelog 2023-02-16 01:01:23 +08:00
MistEO
d702bf848e fix: 修复自动换班排序错误导致的干员冲突问题 
fix #3721
 2023-02-16 00:59:34 +08:00
MistEO
9a5a25d4a8 Merge pull request #3701 from MaaAssistantArknights/dev 
Release v4.11.0-alpha.1
 2023-02-15 22:23:17 +08:00
MistEO
f28e30c4d7 docs: changelogs 2023-02-15 22:09:17 +08:00
MistEO
0459b83475 Merge pull request #3718 from MaaAssistantArknights/docs/migration 
docs: 删除docs中的文档，readme中的网址换为官网地址
 2023-02-15 21:58:10 +08:00
MistEO
89e7c7b1cd Merge pull request #3491 from fearlessxjdx/xjdx 
feat: 复核干员选择是否符合期望
 2023-02-15 21:43:09 +08:00
MistEO
927591e1d7 Merge branch 'dev' into xjdx 2023-02-15 21:42:55 +08:00
MistEO
686e84a98a fix: 修复文档链接 2023-02-15 21:29:49 +08:00
uye
15cf74fe44 docs: 删除docs中的文档，readme中的网址换为官网地址 2023-02-15 21:17:56 +08:00
uye
1af7289bfe docs: 删除docs中的文档，readme中的网址换为官网地址 2023-02-15 20:52:01 +08:00
MistEO
0fac73fcc4 Merge pull request #3688 from ChildeRolando/patch-2 
Update 3.1-集成文档.md
 2023-02-15 18:26:07 +08:00
uye
ebf3bb6f34 Merge pull request #3684 from bigqiao/dev 
支持设置无限使用48小时内理智药
 2023-02-15 16:37:15 +08:00
uye
894838adfb Merge pull request #3704 from WLLEGit/ReclamationAlgorithm 
fix: 生息演算 关卡导航
 2023-02-15 16:26:56 +08:00
Yifan Liu
f340b2ec0f 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
3b43be484c Merge pull request #3709 from cenfusheng/dev 
FIX:重新修复缄默德克萨斯的文字识别问题
 2023-02-15 13:12:34 +08:00
cenfusheng
4cb919aba7 FIX:重新修复缄默德克萨斯的文字识别问题 
修复缄默德克萨斯识别为威默德克萨斯、感默德克萨斯、默德克萨斯等情况
 2023-02-15 12:59:11 +08:00
lhhxxxxx
84215c23bc Merge pull request #3702 from MaaAssistantArknights/CustomStyle/TextBlock 
chore: TextBlock使用自定义控件
 2023-02-15 02:54:59 +08:00
LambdaLe
d70ef870ec fix: 生息演算 关卡导航 2023-02-14 22:08:46 +08:00
lhhxxxxx
90c3331264 fix. build warning 2023-02-14 21:01:02 +08:00
zzyyyl
b87b20fff3 fix: 修复 copilot 神秘代码无法使用的问题 2023-02-14 20:10:30 +08:00
zzyyyl
29146e8baa fix: 修复奇怪的合并冲突 
fix 0e5eae1060
 2023-02-14 20:10:22 +08:00
Horror Proton
96f5a90859 chore: remove unnecessary upgrade in Linux action 2023-02-14 19:53:24 +08:00
uye
2de572c2a8 chore: TextBlock使用自定义控件 2023-02-14 17:58:40 +08:00
MistEO
0e5eae1060 Merge branch 'stable' into dev 2023-02-14 16:21:07 +08:00
MistEO
75549cd5d9 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-02-14 16:17:34 +08:00
MistEO
5095c477bd Merge branch 'master' into dev 2023-02-14 16:17:16 +08:00
MistEO
7dde63a875 Merge branch 'stable' into dev 2023-02-14 16:16:58 +08:00
MistEO
933487219b Merge pull request #3700 from MaaAssistantArknights/release/4.10.9 
Release v4.10.9
 2023-02-14 16:15:25 +08:00
MistEO
14f2117866 docs: changelogs 2023-02-14 16:14:28 +08:00
MistEO
dcde2e5125 chore: 更新游戏数据 2023/2/14 2023-02-14 16:13:11 +08:00
MistEO
844b92f321 docs: changelogs 2023-02-14 14:45:52 +08:00
MistEO
b12bd92f70 Merge tag 'v4.10.7' into stable 2023-02-14 14:38:33 +08:00
MistEO
a60271d223 docs: update changelog 2023-02-14 14:34:53 +08:00
uye
5c14fc864f docs: 更新文档 23/02/12 2023-02-14 14:32:22 +08:00
uye
5025afae29 docs: 更新文档 23/02/12 2023-02-14 14:32:09 +08:00
Yifan Liu
443ffa509b feat: update JP templates 2023-02-14 14:30:52 +08:00