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

4460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzyyyl
80495c453e style: fix c# build warnings 2022-10-24 15:32:23 +08:00
zzyyyl
03df17518b feat: 用 baseTask 字段简化 tasks.json 2022-10-23 22:19:22 +08:00
zzyyyl
d187b6a511 style: 肉鸽相关 Task 按照字典序排序 2022-10-23 22:19:14 +08:00
zzyyyl
57fdf31a56 feat: baseTask @ # 任务同时使用的例子 2022-10-23 22:19:06 +08:00
zzyyyl
b67f8520f6 feat: 新增字段 baseTask 用来直接继承（模板任务的变体） 
refactor: 重构模板任务相关的生成逻辑
 2022-10-23 22:18:58 +08:00
zzyyyl
39292ddb2e feat: 用 "#" 型任务简化 tasks.json 2022-10-23 22:18:01 +08:00
zzyyyl
2fa5e9b991 feat: 拓扑排序检查 "#" 型任务是否循环依赖 2022-10-23 22:18:01 +08:00
zzyyyl
6a7fb0ab55 feat: 增加 "#" 型任务 
```json
{
    "A": {
        "next": ["B"]
    },
    "C": {
        "next": ["A#next"]
    }
}
```
可以得到 "C" 的 next 是 "B"
 2022-10-23 22:17:53 +08:00
zzyyyl
b1aba865ca fix: 修复下载新版本失败导致闪退的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2394
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2397
 2022-10-23 21:01:46 +08:00
DavidWang19
a1579d7449 perf: 新增强制部署时禁用医疗干员的选项 2022-10-23 10:27:14 +01:00
uye
089e16aa17 style: 修改热键界面布局 2022-10-23 16:39:19 +08:00
uye
d89589ef92 style: 修改符号 2022-10-23 16:26:17 +08:00
uye
49ba1a760d feat: 修改今日关卡小提示 2022-10-23 16:23:01 +08:00
uye
831d545e4e feat: 更新自定义导航提示信息的日语翻译 2022-10-23 15:27:08 +08:00
uye
4d71534456 feat: 修改自定义导航提示信息描述 (Modify the description of the custom stage prompt) 2022-10-23 14:21:30 +08:00
gdlcf88
5879d40e47 Introduce IMainWindowManager and fix the bug of the hotkey not working 2022-10-23 14:14:45 +08:00
MistEO
936b40b087 Merge pull request #2393 from MaaAssistantArknights/dev 
docs: update changelog
 2022-10-23 02:25:44 +08:00
MistEO
6d15e3818f docs: update changelog 2022-10-23 02:25:02 +08:00
MistEO
9273ed4a15 Merge pull request #2392 from MaaAssistantArknights/dev 
Release v4.6.5-beta.1
 2022-10-23 02:21:33 +08:00
MistEO
448e6606bb docs: update changelog 2022-10-23 02:20:57 +08:00
MistEO
9364f067c8 fix: 修复基建宿舍未进驻的逻辑，并尽可能将宿舍的人填满 2022-10-23 01:59:03 +08:00
DavidWang19
809f066d2e feat: 修改回调消息文档 2022-10-22 18:43:39 +01:00
DavidWang19
872fa2b905 feat: 修改回调消息文档 2022-10-22 18:42:21 +01:00
Horror Proton
1cbbc4b153 feat: allow empty confirm list in non-calc_only_task 
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2334
 2022-10-23 00:24:34 +08:00
WWPXX
d07e912a3b perf: 优化肉鸽部署顺序以及位置 (#2388) 
* 优化部署顺序以及位置

* 提高了带有控制技能的干员优先度

* 优化部署方向位置顺序

* Update roguelike_copilot.json

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-23 00:12:01 +08:00
MistEO
007f4b15f1 feat: support roguelike shopping, more stages, more opers for JP and EN client 2022-10-23 00:10:56 +08:00
zzyyyl
5a83408fca fix: 修复关卡 溟痕乐园 识别错误的问题 2022-10-22 23:31:16 +08:00
MistEO
bd844d04a3 feat: 略微延长肉鸽撤退的时间 2022-10-22 21:22:56 +08:00
uye
f80a15c7b5 feat: DropsItemName默认改为不选择 2022-10-22 21:12:40 +08:00
MistEO
031ebd6908 fix: 尝试修复外服肉鸽等级识别错误时不招人的问题 2022-10-22 20:59:55 +08:00
uye
b478261fff feat: 添加肉鸽主题提示/更新翻译 2022-10-22 20:54:16 +08:00
MistEO
2d8f6334eb chore: Some clients do not upload drops data to PenguinStats 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2363
 2022-10-22 20:25:52 +08:00
MistEO
c865c4333e Merge pull request #2380 from gdlcf88/hotkeys 
feat: 实现MAA基础热键
 2022-10-22 20:12:44 +08:00
MistEO
8a54f78439 feat: support drops rec for EN client 2022-10-22 20:04:27 +08:00
Horror Proton
658030bc1f feat: add nodiscard 2022-10-22 19:35:14 +08:00
MistEO
679b5cbf92 chore: update test caller 2022-10-22 18:15:45 +08:00
MistEO
7e58d26c71 fix: test caller 2022-10-22 18:10:46 +08:00
MistEO
d96820a590 chore: 更新游戏数据 2022-10-22 17:55:01 +08:00
MistEO
373c161b4d Merge pull request #2355 from horror-proton/test/cmake_version_from_vcs 
chore: 使 CMake 能自动定义 `MAA_VERSION`
 2022-10-22 16:48:58 +08:00
MistEO
40018bcd5c Merge pull request #2353 from MaaAssistantArknights/refactor/break_utils 
refactor: 拆分 `AsstUtils.hpp`
 2022-10-22 16:48:46 +08:00
MistEO
63508cbfcb fix: 自定义一键强制改变菲亚梅塔的位置，修复技能不生效的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2260
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2335
 2022-10-22 16:46:45 +08:00
MistEO
21c68787d7 fix: 修复基建会客室随时弹出来的线索交流结束导致卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2244
 2022-10-22 16:09:10 +08:00
MistEO
58f77037a3 Merge pull request #2382 from wallsman/dev 
doc : Add operator
 2022-10-22 13:25:39 +08:00
MistEO
5e369f8f16 perf: 优化肉鸽地图部署 2022-10-22 13:20:24 +08:00
Wallsman
fad8e6b3a3 Update operators.md 2022-10-22 08:55:38 +09:00
Wallsman
0dbe984bb1 doc : Add operator 
Chapter 10(JP & EN) & 狂人号(JP wirte only)
 2022-10-22 08:55:08 +09:00
DavidWang19
6b08bfc655 fix: 回退为旧版回调函数以提高兼容性 2022-10-21 14:53:20 +01:00
gdlcf88
a1a499c0bf 增加热键修改的 Tips 2022-10-21 21:51:21 +08:00
Horror Proton
00326bb42e refactor: remove AsstUtils 2022-10-21 21:30:04 +08:00
Horror Proton
5ff15cbaf3 refactor: add Time 2022-10-21 21:27:33 +08:00