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
4,260 Commits 60 Branches 1,840 Tags
2cfccc28bf7b48def40e18cfc8a068363a54d929
Commit Graph

4260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
2cfccc28bf fix: 修复战斗中部分干员cooling识别错误的问题 
能天使 oper_cooling_analyze | 870
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2313
 2022-10-15 02:11:45 +08:00
MistEO
c21b14847b perf: 优化肉鸽一个没啥用的逻辑 2022-10-15 01:49:52 +08:00
MistEO
7c37b51e40 Merge pull request #2297 from DavidWang19/fix/removeNL 
fix: 移除长夜临光关卡选择
 2022-10-15 00:55:52 +08:00
MistEO
12d05841be Merge pull request #2307 from JiHongYuan/patch-2 
docs: Update 3.2-回调消息协议.md
 2022-10-15 00:50:36 +08:00
zzyyyl
d40952f519 fix: 修复嵯峨 ocr 识别错误的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2317
 2022-10-14 15:20:33 +08:00
uye
245692f531 fix: 修复11章开启后自定义导航无法进入第9/10章 2022-10-14 01:37:14 +08:00
Horror Proton
7a40588606 fix: 公开招募 tag 识别失败后跳过 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2299
 2022-10-13 22:22:25 +08:00
JiHongYuan
b1d1d5beaf Update 3.2-回调消息协议.md 
完善消息类型信息
 2022-10-13 21:58:33 +08:00
zzyyyl
96545be6c1 Merge pull request #2285 from MaaAssistantArknights/fix/task_name 
fix: 修复 reduce_other_times 不能正常工作的问题
 2022-10-13 15:49:23 +08:00
zzyyyl
b995fdc81a fix: 处理 verify 问题 2022-10-13 14:30:32 +08:00
zzyyyl
4da88f326a fix: 修复 reduce_other_times 不能正常工作的问题 
perf: 优化回调处理

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-13 14:30:24 +08:00
zzyyyl
7eb1a55b8c style: format 2022-10-13 14:15:46 +08:00
Horror Proton
c42c40df83 fix: add ocr replace for recruit tag 王员 手员 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2299
 2022-10-13 13:28:07 +08:00
DavidWang19
75cd67b18d fix: 移除长夜临光关卡选择 2022-10-12 22:51:49 +01:00
MistEO
35906ec920 fix: 修复肉鸽战斗中一直点能天使的问题 2022-10-12 21:51:27 +08:00
MistEO
db1650a9d6 Merge pull request #2288 from MaaAssistantArknights/dev 
Release v4.6.4
v4.6.4 		2022-10-12 01:34:14 +08:00
MistEO
275494af3f docs: update changelog 2022-10-12 01:33:42 +08:00
zzyyyl
3110fac2c6 feat: 更新 changelog 2022-10-12 01:26:22 +08:00
MistEO
4b1665edd5 Merge pull request #2289 from DavidWang19/fix/roguefight 
fix: 修复了远程/近战位干员无空位时不能部署任何干员的问题
 2022-10-12 01:20:55 +08:00
DavidWang19
251c5d66dc fix: 修复了远程/近战位干员无空位时不能部署任何干员的问题 2022-10-11 18:14:54 +01:00
MistEO
1203361a74 feat: 肉鸽通关时截个图 2022-10-12 00:47:51 +08:00
MistEO
270d766ed3 docs: update changelog 2022-10-12 00:38:33 +08:00
MistEO
b8c616a074 fix: 修复偶现OCR多一个空格的问题 2022-10-11 23:46:20 +08:00
MistEO
61bc27d57e fix: 修复肉鸽关卡名识别错误 2022-10-11 23:46:10 +08:00
MistEO
ce3c338cee fix: 修复水月肉鸽中，排异反应干员无法识别的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2177
 2022-10-11 23:03:55 +08:00
MistEO
ada43862ad Merge pull request #2282 from MaaAssistantArknights/dev 
Release v4.6.3
v4.6.3 		2022-10-11 20:40:55 +08:00
MistEO
de0ceebba6 fix: 修复肉鸽骰子乱放的问题 2022-10-11 20:40:35 +08:00
MistEO
159700b2df Merge pull request #2281 from MaaAssistantArknights/dev 
Release v4.6.2 fix
v4.6.2 		2022-10-11 20:16:08 +08:00
MistEO
d89db93145 fix: 修复肉鸽选技能太快卡在开始行动界面的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2280
 2022-10-11 20:15:28 +08:00
MistEO
3e8b2e9b16 Merge pull request #2279 from MaaAssistantArknights/dev 
Release v4.6.2
 2022-10-11 20:04:53 +08:00
MistEO
19010e9ce8 docs: update changelog 2022-10-11 20:04:25 +08:00
MistEO
74dd879953 perf: 优化会客室使用线索的逻辑 2022-10-11 19:58:17 +08:00
MistEO
b63c763c09 fix: 修复会客室不收取线索的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2273
 2022-10-11 19:57:01 +08:00
MistEO
a399b7cea0 docs: 修正肉鸽文档字段 2022-10-11 19:44:14 +08:00
MistEO
de9e2b2f64 fix: 修复唤醒任务会返回主界面的问题 2022-10-11 19:42:17 +08:00
MistEO
2c9fa536ab chore: 修改调试代码 2022-10-11 19:32:54 +08:00
MistEO
fe54e6c85a fix: 修复水月肉鸽通关后卡住的问题 2022-10-11 19:32:45 +08:00
MistEO
ce9ac86ef5 chore: 更新掉落识别资源 2022-10-11 19:22:34 +08:00
MistEO
9454424a06 Merge pull request #2256 from MaaAssistantArknights/perf/roguefight_v2 
perf: I.S. auto fight
 2022-10-11 19:20:38 +08:00
MistEO
3405ed878f fix: 修复资源错误 2022-10-11 19:02:47 +08:00
MistEO
1ae8b563d6 merge: dev 2022-10-11 18:56:39 +08:00
MistEO
6ade08b8d9 fix: 修复肉鸽和主线地图名相同时，关卡数据的错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2277
 2022-10-11 18:06:35 +08:00
MistEO
4110d233ac chore: 更新第十一章除企鹅数据外的资源 2022-10-11 16:34:54 +08:00
MistEO
d2528b6f70 perf: 给调用命令再次加个锁 
This reverts commit 019f219ef8.
 2022-10-11 11:02:53 +08:00
MistEO
019f219ef8 fix: 修复一个死锁问题 
by socket 时，这行逻辑会引发死锁

           if (is_reconnect_success) {
                auto recall_ret = call_command(cmd, timeout, false /* 禁止重连避免无限递归 */, recv_by_socket);
 2022-10-11 02:16:44 +08:00
MistEO
c3d6a33966 Merge pull request #2271 from WWPXX233/perf/roguefight_v2 
新增大量傀影关卡，优化水月特殊环境关卡
 2022-10-11 01:10:01 +08:00
WWPXX
1688ff4daa 新增大量傀儡肉鸽关卡，优化部分水月特殊关卡 2022-10-11 01:05:06 +08:00
MistEO
eb484b1950 perf: 整理肉鸽强制放空的一些结构 2022-10-11 00:49:20 +08:00
WWPXX
0de7eece6d 新增大量傀影关卡，优化水月特殊环境关卡 2022-10-11 00:44:55 +08:00
MistEO
6d583f4ac3 perf: 重构并优化肉鸽战斗时，地面阻挡、对空防御的逻辑 2022-10-11 00:37:13 +08:00