fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 10:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,460 Commits 60 Branches 1,841 Tags
0f60226522a28ff580ef72b8f684794de95c660e
Commit Graph

4460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DavidWang19
e1740a3b40 fix: 修复了远程/近战位干员无空位时不能部署任何干员的问题 2022-10-11 18:14:54 +01:00
MistEO
5553112db3 feat: 肉鸽通关时截个图 2022-10-12 00:47:51 +08:00
MistEO
a511fd3ffe docs: update changelog 2022-10-12 00:38:33 +08:00
MistEO
321f4d6816 fix: 修复偶现OCR多一个空格的问题 2022-10-11 23:46:20 +08:00
MistEO
aff8b932d6 fix: 修复肉鸽关卡名识别错误 2022-10-11 23:46:10 +08:00
MistEO
d9eb81c6e8 fix: 修复水月肉鸽中，排异反应干员无法识别的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2177
 2022-10-11 23:03:55 +08:00
MistEO
2974fad041 Merge pull request #2282 from MaaAssistantArknights/dev 
Release v4.6.3
 2022-10-11 20:40:55 +08:00
MistEO
66beddc896 fix: 修复肉鸽骰子乱放的问题 2022-10-11 20:40:35 +08:00
MistEO
69969c173f Merge pull request #2281 from MaaAssistantArknights/dev 
Release v4.6.2 fix
 2022-10-11 20:16:08 +08:00
MistEO
0936704e54 fix: 修复肉鸽选技能太快卡在开始行动界面的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2280
 2022-10-11 20:15:28 +08:00
MistEO
5cf4421f29 Merge pull request #2279 from MaaAssistantArknights/dev 
Release v4.6.2
 2022-10-11 20:04:53 +08:00
MistEO
69ed2eb514 docs: update changelog 2022-10-11 20:04:25 +08:00
MistEO
d521015db3 perf: 优化会客室使用线索的逻辑 2022-10-11 19:58:17 +08:00
MistEO
396981e73d fix: 修复会客室不收取线索的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2273
 2022-10-11 19:57:01 +08:00
MistEO
5c2f47a214 docs: 修正肉鸽文档字段 2022-10-11 19:44:14 +08:00
MistEO
1f750ef965 fix: 修复唤醒任务会返回主界面的问题 2022-10-11 19:42:17 +08:00
MistEO
b4c25dcf6c chore: 修改调试代码 2022-10-11 19:32:54 +08:00
MistEO
9a5cb3a7a7 fix: 修复水月肉鸽通关后卡住的问题 2022-10-11 19:32:45 +08:00
MistEO
8979770bf9 chore: 更新掉落识别资源 2022-10-11 19:22:34 +08:00
MistEO
2a75e7b1f1 Merge pull request #2256 from MaaAssistantArknights/perf/roguefight_v2 
perf: I.S. auto fight
 2022-10-11 19:20:38 +08:00
MistEO
23d3190de5 fix: 修复资源错误 2022-10-11 19:02:47 +08:00
MistEO
ce220d6086 merge: dev 2022-10-11 18:56:39 +08:00
MistEO
26433a0ead fix: 修复肉鸽和主线地图名相同时，关卡数据的错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2277
 2022-10-11 18:06:35 +08:00
MistEO
eb17c83ba5 chore: 更新第十一章除企鹅数据外的资源 2022-10-11 16:34:54 +08:00
MistEO
737f39b738 perf: 给调用命令再次加个锁 
This reverts commit 2e11c078fc.
 2022-10-11 11:02:53 +08:00
MistEO
2e11c078fc 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
4c23df7292 Merge pull request #2271 from WWPXX233/perf/roguefight_v2 
新增大量傀影关卡，优化水月特殊环境关卡
 2022-10-11 01:10:01 +08:00
WWPXX
11ffd92c85 新增大量傀儡肉鸽关卡，优化部分水月特殊关卡 2022-10-11 01:05:06 +08:00
MistEO
bdcf884742 perf: 整理肉鸽强制放空的一些结构 2022-10-11 00:49:20 +08:00
WWPXX
7681e94744 新增大量傀影关卡，优化水月特殊环境关卡 2022-10-11 00:44:55 +08:00
MistEO
8400ea43c7 perf: 重构并优化肉鸽战斗时，地面阻挡、对空防御的逻辑 2022-10-11 00:37:13 +08:00
NonX
2474a8b4d8 fix: period设定时间不能准时开始 (#2261) 
* fix: period设定时间不能准时开始

* Update TaskQueueViewModel.cs

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-10 22:37:44 +08:00
MistEO
5b8f39dc90 Merge pull request #2264 from anywugn/master 
修正基建243 1天4换作业bug
 2022-10-10 22:35:37 +08:00
AnyWugn
560bac9a8d 修正基建243 1天4换作业bug 并回滚正义骑士号修改 2022-10-10 04:02:58 -07:00
AnyWugn
947b491c42 修正基建243 1天4换作业bug 2022-10-10 03:25:15 -07:00
DavidWang19
70177d6926 perf: 新增对某点的强制部署方向设置 2022-10-10 01:22:22 +01:00
MistEO
f804b74214 fix: 修复肉鸽战斗中对”近卫阿米娅“、”术师阿米娅“的处理 2022-10-10 01:41:14 +08:00
MistEO
4df0122d27 Merge pull request #2255 from gdlcf88/hide-from-task-switcher 
perf: Hide MAA from the Windows Task Switcher when it is minimized
 2022-10-10 01:00:27 +08:00
MistEO
ce65667b01 feat: 新增支持肉鸽部署职业与高台/地面不同的干员 2022-10-10 00:59:54 +08:00
MistEO
00726f249e docs: 修正语法 2022-10-09 22:35:02 +08:00
MistEO
0a31a6e49e docs: 更新雷电模拟器支持的描述 2022-10-09 22:33:20 +08:00
gdlcf88
b5071aa73e Hide MAA from the Windows Task Switcher when it is minimized 2022-10-09 21:52:00 +08:00
MistEO
40c33edc70 Merge pull request #2251 from dantmnf/dev 
feat: package debug symbols
 2022-10-09 21:10:00 +08:00
dantmnf
fd5324c03a feat: package debug symbols 2022-10-09 21:08:40 +08:00
MistEO
fdfa8f3ff9 perf: 流程任务中不处理disable的任务 2022-10-09 17:27:13 +08:00
MistEO
1713e2784c Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-10-09 17:17:19 +08:00
MistEO
5bb329b612 fix: 修复傀影肉鸽凌晨4点更新后卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2242
 2022-10-09 17:17:00 +08:00
MistEO
1292c0fcbd Merge pull request #2248 from WWPXX233/dev 
perf: 略微优化水月肉鸽4-5层的部分高难度关卡
 2022-10-09 17:11:59 +08:00
MistEO
fc139c5ba9 feat: 新增AsstSetUserDir接口 2022-10-09 15:59:52 +08:00
WWPXX
0dfa406ce0 略微优化4-5层的部分高难度关卡 2022-10-09 15:47:56 +08:00