fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,400 Commits 62 Branches 1,839 Tags
24d1dfd3e82a3fbd272454d2af0ef35ce33b99d6
Commit Graph

4400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
24d1dfd3e8 Merge pull request #2412 from MaaAssistantArknights/feat/enum_to_string 
feat: 为部分枚举类型增加与字符串类型的互转函数
 2022-10-24 22:00:51 +08:00
MistEO
d2b5191ca7 Merge pull request #2381 from MaaAssistantArknights/feat/sharp_task 
feat: 增加 `#` 型任务 和 `baseTask` 字段
 2022-10-24 21:58:17 +08:00
MistEO
a2b26cf426 Merge pull request #2400 from gdlcf88/main-window-manager 
fix: 引入 `IMainWindowManager` 并修正 #2379 唤起MAA热键失效问题
 2022-10-24 21:57:24 +08:00
zzyyyl
71135979d8 fix: 修复没有信赖提升标志时跳过掉落识别的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2360
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2348
 2022-10-24 21:25:35 +08:00
zzyyyl
a9780d51dc fix: 修复笔误 2022-10-24 20:15:09 +08:00
zzyyyl
99bae5c1a3 feat: 增加加载界面图片 
不知道有没有修了，暂时不打 fix

https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2414
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2374
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2378
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2294
 2022-10-24 19:55:14 +08:00
lhhxxxxx
d4c026be2f fix. 修复官方153作业红云组,泡泡组断暖机的问题，优化了换班前后各组顺序 2022-10-24 19:51:39 +08:00
zzyyyl
e4e6bf074e perf: 修改 GUI 更新相关逻辑 2022-10-24 17:20:15 +08:00
zzyyyl
633301f365 feat: 退而求其次，改用 enum_to_string() 2022-10-24 16:24:31 +08:00
zzyyyl
fd4dfbf6ce feat: 重载枚举类型 AlgorithmType, ProcessTaskAction 的 std::to_string(), 并在回调与日志输出时使用 std::to_string() 2022-10-24 15:42:05 +08:00
zzyyyl
5236543d3d style: fix c# build warnings 2022-10-24 15:32:23 +08:00
zzyyyl
d04ef3f4f4 feat: 用 baseTask 字段简化 tasks.json 2022-10-23 22:19:22 +08:00
zzyyyl
cc24509cdd style: 肉鸽相关 Task 按照字典序排序 2022-10-23 22:19:14 +08:00
zzyyyl
aa189aed40 feat: baseTask @ # 任务同时使用的例子 2022-10-23 22:19:06 +08:00
zzyyyl
b977ae03cf feat: 新增字段 baseTask 用来直接继承（模板任务的变体） 
refactor: 重构模板任务相关的生成逻辑
 2022-10-23 22:18:58 +08:00
zzyyyl
ceb62f91c1 feat: 用 "#" 型任务简化 tasks.json 2022-10-23 22:18:01 +08:00
zzyyyl
c03b7389e9 feat: 拓扑排序检查 "#" 型任务是否循环依赖 2022-10-23 22:18:01 +08:00
zzyyyl
0d82787073 feat: 增加 "#" 型任务 
```json
{
    "A": {
        "next": ["B"]
    },
    "C": {
        "next": ["A#next"]
    }
}
```
可以得到 "C" 的 next 是 "B"
 2022-10-23 22:17:53 +08:00
zzyyyl
75200911cf 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
uye
1d1a7be644 style: 修改热键界面布局 2022-10-23 16:39:19 +08:00
uye
1c95de7214 style: 修改符号 2022-10-23 16:26:17 +08:00
uye
8aadb7b0f5 feat: 修改今日关卡小提示 2022-10-23 16:23:01 +08:00
uye
e99de1ba6a feat: 更新自定义导航提示信息的日语翻译 2022-10-23 15:27:08 +08:00
uye
066e8e0034 feat: 修改自定义导航提示信息描述 (Modify the description of the custom stage prompt) 2022-10-23 14:21:30 +08:00
gdlcf88
951fa75e15 Introduce IMainWindowManager and fix the bug of the hotkey not working 2022-10-23 14:14:45 +08:00
MistEO
989c844f56 Merge pull request #2393 from MaaAssistantArknights/dev 
docs: update changelog
v4.6.5-beta.1 		2022-10-23 02:25:44 +08:00
MistEO
cd49d0733f docs: update changelog 2022-10-23 02:25:02 +08:00
MistEO
25f86b0a31 Merge pull request #2392 from MaaAssistantArknights/dev 
Release v4.6.5-beta.1
 2022-10-23 02:21:33 +08:00
MistEO
f7f72e9f56 docs: update changelog 2022-10-23 02:20:57 +08:00
MistEO
33a14dd378 fix: 修复基建宿舍未进驻的逻辑，并尽可能将宿舍的人填满 2022-10-23 01:59:03 +08:00
DavidWang19
00794ab032 feat: 修改回调消息文档 2022-10-22 18:43:39 +01:00
DavidWang19
c5039fa7c3 feat: 修改回调消息文档 2022-10-22 18:42:21 +01:00
Horror Proton
973d64a113 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
b8a66f2229 perf: 优化肉鸽部署顺序以及位置 (#2388) 
* 优化部署顺序以及位置

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

* 优化部署方向位置顺序

* Update roguelike_copilot.json

Co-authored-by: MistEO <mistereo@hotmail.com>
 2022-10-23 00:12:01 +08:00
MistEO
2acf75e7b1 feat: support roguelike shopping, more stages, more opers for JP and EN client 2022-10-23 00:10:56 +08:00
zzyyyl
5a12c7eaf4 fix: 修复关卡 溟痕乐园 识别错误的问题 2022-10-22 23:31:16 +08:00
MistEO
19f4ff80ec feat: 略微延长肉鸽撤退的时间 2022-10-22 21:22:56 +08:00
uye
24b53619b9 feat: DropsItemName默认改为不选择 2022-10-22 21:12:40 +08:00
MistEO
b7c7a43083 fix: 尝试修复外服肉鸽等级识别错误时不招人的问题 2022-10-22 20:59:55 +08:00
uye
125ccb8962 feat: 添加肉鸽主题提示/更新翻译 2022-10-22 20:54:16 +08:00
MistEO
a8f57a2a09 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
89ded9f2c1 Merge pull request #2380 from gdlcf88/hotkeys 
feat: 实现MAA基础热键
 2022-10-22 20:12:44 +08:00
MistEO
2ddba7f54d feat: support drops rec for EN client 2022-10-22 20:04:27 +08:00
Horror Proton
fbe3b4b3e4 feat: add nodiscard 2022-10-22 19:35:14 +08:00
MistEO
e5564dd81c chore: update test caller 2022-10-22 18:15:45 +08:00
MistEO
9120427650 fix: test caller 2022-10-22 18:10:46 +08:00
MistEO
b67cb2d19e chore: 更新游戏数据 2022-10-22 17:55:01 +08:00
MistEO
612da61223 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
ad8cc9e0a4 Merge pull request #2353 from MaaAssistantArknights/refactor/break_utils 
refactor: 拆分 `AsstUtils.hpp`
 2022-10-22 16:48:46 +08:00
MistEO
a206754575 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