Commit Graph

2420 Commits

Author SHA1 Message Date
MistEO
d165843c22 Merge pull request #2400 from gdlcf88/main-window-manager
fix: 引入 `IMainWindowManager` 并修正 #2379 唤起MAA热键失效问题
2022-10-24 21:57:24 +08:00
zzyyyl
ce6f6d29bc fix: 修复笔误 2022-10-24 20:15:09 +08:00
zzyyyl
0c3bd796cc perf: 修改 GUI 更新相关逻辑 2022-10-24 17:20:15 +08:00
zzyyyl
1c302acd45 feat: 退而求其次,改用 enum_to_string() 2022-10-24 16:24:31 +08:00
zzyyyl
a6c556df58 feat: 重载枚举类型 AlgorithmType, ProcessTaskAction 的 std::to_string(), 并在回调与日志输出时使用 std::to_string() 2022-10-24 15:42:05 +08:00
zzyyyl
80495c453e style: fix c# build warnings 2022-10-24 15:32:23 +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
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
9364f067c8 fix: 修复基建宿舍未进驻的逻辑,并尽可能将宿舍的人填满 2022-10-23 01:59:03 +08: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
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
7e58d26c71 fix: test caller 2022-10-22 18:10:46 +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
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
Horror Proton
ac7bd7fbb0 refactor: move Platform 2022-10-21 21:27:33 +08:00
Horror Proton
8c43b77abc refactor: move UserDir 2022-10-21 21:27:33 +08:00
Horror Proton
8b73e1820d refactor: add Locale.hpp 2022-10-21 21:27:33 +08:00
Horror Proton
bd4134189c refactor: move functions to string misc 2022-10-21 21:27:21 +08:00
gdlcf88
005de2edab feat: 实现MAA基础热键 2022-10-21 21:21:43 +08:00
Horror Proton
4626aa5892 refactor: move make_rect 2022-10-21 21:17:49 +08:00
zzyyyl
79fe84d228 perf: 字符串替换的小优化 2022-10-21 16:46:37 +08:00
zzyyyl
98870fb646 fix(TaskData): 修复 syntax_check 检查模板类型时无法确定 algorithm 的问题 2022-10-21 16:39:16 +08:00
zzyyyl
7893bb6d0a fix(TaskData): 修复一个 with_emplace 的 bug 2022-10-21 16:26:38 +08:00
MistEO
2d623aba6a fix: build error 2022-10-21 01:42:14 +08:00
MistEO
388de13d03 feat: 支持企鹅数据的退避策略 2022-10-21 01:29:11 +08:00
DavidWang19
ab4ccc291a Merge pull request #2373 from DavidWang19/feat/logImprove
feat: 合并本次掉落和掉落统计
2022-10-20 18:22:36 +01:00
MistEO
fe03c75164 fix: 修复debug默认下外服加载错误,修复掉落上传服务器错误 2022-10-21 01:08:55 +08:00
MistEO
b3ee61649a fix: 修复肉鸽卡在“误入奇境”的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2367
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2262
2022-10-21 00:53:51 +08:00