fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,236 Commits 60 Branches 1,840 Tags
ce3c338ceed4efc8888ced2b49cd0d91c039e7f5
Commit Graph

4236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
NonX
d13134dd4a fix: period设定时间不能准时开始 (#2261) 
* fix: period设定时间不能准时开始

* Update TaskQueueViewModel.cs

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-10 22:37:44 +08:00
MistEO
2892b45631 Merge pull request #2264 from anywugn/master 
修正基建243 1天4换作业bug
 2022-10-10 22:35:37 +08:00
AnyWugn
dfcbcad066 修正基建243 1天4换作业bug 并回滚正义骑士号修改 2022-10-10 04:02:58 -07:00
AnyWugn
f97c68dbe2 修正基建243 1天4换作业bug 2022-10-10 03:25:15 -07:00
DavidWang19
199967f948 perf: 新增对某点的强制部署方向设置 2022-10-10 01:22:22 +01:00
MistEO
134d91fb06 fix: 修复肉鸽战斗中对”近卫阿米娅“、”术师阿米娅“的处理 2022-10-10 01:41:14 +08:00
MistEO
450953f711 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
719a169a66 feat: 新增支持肉鸽部署职业与高台/地面不同的干员 2022-10-10 00:59:54 +08:00
MistEO
7421179be0 docs: 修正语法 2022-10-09 22:35:02 +08:00
MistEO
886eec5e66 docs: 更新雷电模拟器支持的描述 2022-10-09 22:33:20 +08:00
gdlcf88
1d782c6a35 Hide MAA from the Windows Task Switcher when it is minimized 2022-10-09 21:52:00 +08:00
MistEO
8104e7f17c Merge pull request #2251 from dantmnf/dev 
feat: package debug symbols
 2022-10-09 21:10:00 +08:00
dantmnf
9aee5bd4e2 feat: package debug symbols 2022-10-09 21:08:40 +08:00
MistEO
43a205c2d5 perf: 流程任务中不处理disable的任务 2022-10-09 17:27:13 +08:00
MistEO
3847bf216d Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-10-09 17:17:19 +08:00
MistEO
deb35c8f6f fix: 修复傀影肉鸽凌晨4点更新后卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2242
 2022-10-09 17:17:00 +08:00
MistEO
dd2fd782c1 Merge pull request #2248 from WWPXX233/dev 
perf: 略微优化水月肉鸽4-5层的部分高难度关卡
 2022-10-09 17:11:59 +08:00
MistEO
965dfb7a09 feat: 新增AsstSetUserDir接口 2022-10-09 15:59:52 +08:00
WWPXX
93eca2df02 略微优化4-5层的部分高难度关卡 2022-10-09 15:47:56 +08:00
MistEO
e070db97ed fix: 修复战斗中将“能天使”认为是cooling的问题 
oper_cooling_analyze | 804
 2022-10-09 14:31:38 +08:00
MistEO
26457b7234 chore: update l10n 2022-10-09 13:48:27 +08:00
MistEO
d68cf0f091 Merge pull request #2235 from MaaAssistantArknights/dev 
Release v4.6.1-alpha.1
v4.6.1-alpha.1 		2022-10-09 01:21:44 +08:00
zzyyyl
03cbeec5d0 style: format 2022-10-09 01:09:23 +08:00
zzyyyl
8a71c873c4 Merge pull request #2167 from MaaAssistantArknights/perf/roguefight 
perf: 优化肉鸽自动战斗逻辑
 2022-10-09 01:07:57 +08:00