From 6ba4444ded30d48b40ba242dfd82afccfb425b90 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 18 Jun 2022 17:00:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=8A=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9A=84=E5=85=B3=E5=8D=A1=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=95=8C=E9=9D=A2=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/回调消息协议.md | 3 +++ src/MeoAssistant/BattleProcessTask.cpp | 4 ++++ src/MeoAssistant/CopilotTask.cpp | 4 ++-- src/MeoAsstGui/Helper/AsstProxy.cs | 4 ++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/回调消息协议.md b/docs/回调消息协议.md index ab10908f8a..beccd4c6dd 100644 --- a/docs/回调消息协议.md +++ b/docs/回调消息协议.md @@ -442,3 +442,6 @@ Todo "id": string } ``` + +- `UnsupportedLevel` + 自动抄作业，不支持的关卡名 diff --git a/src/MeoAssistant/BattleProcessTask.cpp b/src/MeoAssistant/BattleProcessTask.cpp index 3a64983666..fb4c396c16 100644 --- a/src/MeoAssistant/BattleProcessTask.cpp +++ b/src/MeoAssistant/BattleProcessTask.cpp @@ -25,6 +25,10 @@ bool asst::BattleProcessTask::_run() bool ret = get_stage_info(); if (!ret) { + json::value info = basic_info_with_what("UnsupportedLevel"); + auto& details = info["details"]; + details["level"] = m_stage_name; + callback(AsstMsg::SubTaskExtraInfo, info); return false; } diff --git a/src/MeoAssistant/CopilotTask.cpp b/src/MeoAssistant/CopilotTask.cpp index 71c6354ef7..8e317f2f3d 100644 --- a/src/MeoAssistant/CopilotTask.cpp +++ b/src/MeoAssistant/CopilotTask.cpp @@ -16,14 +16,14 @@ asst::CopilotTask::CopilotTask(const AsstCallback& callback, void* callback_arg) .set_ignore_error(true); m_subtasks.emplace_back(start_1_tp); - m_subtasks.emplace_back(m_formation_task_ptr)->set_ignore_error(false); + m_subtasks.emplace_back(m_formation_task_ptr)->set_ignore_error(false).set_retry_times(0); auto start_2_tp = std::make_shared(callback, callback_arg, TaskType); start_2_tp->set_tasks({ "BattleStartNormal", "BattleStartRaid", "BattleStartExercise", "BattleStartSimulation" }) .set_ignore_error(false); m_subtasks.emplace_back(start_2_tp); - m_subtasks.emplace_back(m_battle_task_ptr); + m_subtasks.emplace_back(m_battle_task_ptr)->set_retry_times(0); } bool asst::CopilotTask::set_params(const json::value& params) diff --git a/src/MeoAsstGui/Helper/AsstProxy.cs b/src/MeoAsstGui/Helper/AsstProxy.cs index 6973e27f22..d8da517133 100644 --- a/src/MeoAsstGui/Helper/AsstProxy.cs +++ b/src/MeoAsstGui/Helper/AsstProxy.cs @@ -653,6 +653,10 @@ namespace MeoAsstGui // copilotModel.AddLog(subTaskDetails["details"].ToString(), details_color.Length == 0 ? "dark" : details_color); //} break; + + case "UnsupportedLevel": + copilotModel.AddLog("不支持的关卡\n请更新 MAA 软件版本，或检查作业文件", "darkred"); + break; } } From 404515ce0d13ea7a31de29d627ac746cfddc5a2b Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 18 Jun 2022 17:02:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=86=8D=E6=AC=A1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=82=89=E9=B8=BD=E4=BA=8C=E5=80=8D=E9=80=9F=E7=9A=84=E5=89=8D?= =?UTF-8?q?=E7=BD=AE=E5=BB=B6=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=A8=B3?= =?UTF-8?q?=E5=AE=9A=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/tasks.json b/resource/tasks.json index 2de3306c15..5e7ba54f15 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -5094,7 +5094,7 @@ 60, 60 ], - "preDelay": 2000 + "preDelay": 3000 }, "BattleSkillReady": { "roi": [ From 282cf7284d909a23ec6fecb076d4568c751807d9 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 18 Jun 2022 17:08:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E5=8A=A0=E4=B8=80=E7=82=B9?= =?UTF-8?q?=E6=8A=84=E4=BD=9C=E4=B8=9A=E7=9A=84=E7=95=8C=E9=9D=A2=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/874 https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/904 --- src/MeoAsstGui/ViewModels/CopilotViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MeoAsstGui/ViewModels/CopilotViewModel.cs b/src/MeoAsstGui/ViewModels/CopilotViewModel.cs index 0416724cd7..b096781b06 100644 --- a/src/MeoAsstGui/ViewModels/CopilotViewModel.cs +++ b/src/MeoAsstGui/ViewModels/CopilotViewModel.cs @@ -42,7 +42,7 @@ namespace MeoAsstGui _windowManager = windowManager; DisplayName = "自动战斗 Beta"; LogItemViewModels = new ObservableCollection(); - AddLog("小提示：请手动打开游戏有“开始行动”按钮的界面再使用本功能；\n\n如果想借好友助战可以关闭“自动编队”，手动选择好干员后再开始；\n\n模拟悖论则需要关闭“自动编队”，并自己选好技能处于“开始模拟”按钮的界面再开始", "dark"); + AddLog("小提示：请手动打开游戏有“开始行动”按钮的界面再使用本功能；\n\n如果想借好友助战可以关闭“自动编队”，手动选择好干员后再开始；\n\n模拟悖论则需要关闭“自动编队”，并自己选好技能处于“开始模拟”按钮的界面再开始\n\n“特别关注”的干员暂时无法被识别，请取消特别关注或手动编队", "dark"); } public void AddLog(string content, string color = "Gray", string weight = "Regular")