fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,958 Commits 61 Branches 1,836 Tags
416c05bca1009cc82be60bd312f4bcacd2e1600c
Commit Graph

4958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
MistEO
c361426dc0 fix: 修复VS上编辑器的红线 
其实是把红线换了个地方
 2022-11-24 17:26:36 +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
Wallsman
7f3d1ae1b8 Doc: hotfix 2022-11-24 13:09:22 +09: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
v4.7.1 		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
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
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