From dd1b501d0da1ca9b73fa762c744f186f69a5552e Mon Sep 17 00:00:00 2001 From: Lancarus <34369130+Lancarus@users.noreply.github.com> Date: Mon, 16 Oct 2023 18:17:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=82=89=E9=B8=BD=E9=80=82=E9=85=8D?= =?UTF-8?q?=E6=96=B0=E5=B9=B2=E5=91=98=E9=BB=98=E8=AE=A4=E6=8A=80=E8=83=BD?= =?UTF-8?q?=20(#6948)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/roguelike/Mizuki/recruitment.json | 6 +++- resource/roguelike/Phantom/recruitment.json | 16 +++++++++- resource/roguelike/Sami/recruitment.json | 29 +++++++++++++++---- .../Roguelike/RoguelikeBattleTaskPlugin.cpp | 10 +++---- 4 files changed, 49 insertions(+), 12 deletions(-) diff --git a/resource/roguelike/Mizuki/recruitment.json b/resource/roguelike/Mizuki/recruitment.json index b5a4f3b170..8c8122505e 100644 --- a/resource/roguelike/Mizuki/recruitment.json +++ b/resource/roguelike/Mizuki/recruitment.json @@ -2289,6 +2289,10 @@ { "name": "洋灰" }, + { + "name": "赫德雷", + "skill": 1 + }, { "name": "伊内丝" }, @@ -3245,4 +3249,4 @@ "threshold": 1 } ] -} +} \ No newline at end of file diff --git a/resource/roguelike/Phantom/recruitment.json b/resource/roguelike/Phantom/recruitment.json index 15f45bcab2..a95e330725 100644 --- a/resource/roguelike/Phantom/recruitment.json +++ b/resource/roguelike/Phantom/recruitment.json @@ -1540,6 +1540,9 @@ { "name": "絮雨" }, + { + "name": "刺玫" + }, { "name": "微风" }, @@ -2554,6 +2557,10 @@ "name": "白铁", "skill": 2 }, + { + "name": "赫德雷", + "skill": 1 + }, { "name": "银灰" }, @@ -2939,6 +2946,9 @@ { "name": "灰喉" }, + { + "name": "刺玫" + }, { "name": "濯尘芙蓉", "skill": 2 @@ -3631,6 +3641,10 @@ "name": "深靛", "skill": 2 }, + { + "name": "戴菲恩", + "skill": 2 + }, { "name": "爱丽丝", "skill": 2 @@ -3768,4 +3782,4 @@ "threshold": 2 } ] -} +} \ No newline at end of file diff --git a/resource/roguelike/Sami/recruitment.json b/resource/roguelike/Sami/recruitment.json index 8c4ac6e765..1ae171741c 100644 --- a/resource/roguelike/Sami/recruitment.json +++ b/resource/roguelike/Sami/recruitment.json @@ -2418,6 +2418,11 @@ "name": "白铁", "skill": 2 }, + { + "name": "赫德雷", + "skill": 2, + "skill_usage": 2 + }, { "name": "银灰" }, @@ -2747,6 +2752,9 @@ { "name": "亚叶" }, + { + "name": "刺玫" + }, { "name": "濯尘芙蓉" }, @@ -2928,10 +2936,6 @@ { "name": "灰喉" }, - { - "name": "濯尘芙蓉", - "skill": 2 - }, { "name": "稀音" }, @@ -2961,6 +2965,13 @@ { "name": "特米米" }, + { + "name": "刺玫" + }, + { + "name": "濯尘芙蓉", + "skill": 2 + }, { "name": "雪绒" }, @@ -3415,6 +3426,10 @@ "name": "达格达", "skill": 2 }, + { + "name": "维荻", + "skill": 2 + }, { "name": "夜刀", "skill": 0, @@ -3633,6 +3648,10 @@ "name": "爱丽丝", "skill": 2 }, + { + "name": "戴菲恩", + "skill": 2 + }, { "name": "霜华", "skill": 1 @@ -3766,4 +3785,4 @@ "threshold": 1 } ] -} +} \ No newline at end of file diff --git a/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp index 402251b4e0..d53984a75c 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp @@ -326,7 +326,7 @@ bool asst::RoguelikeBattleTaskPlugin::do_best_deploy() } } } - Log.info("No operator needs to be retreated."); + Log.debug("No operator needs to be retreated."); // 构造当前地图的部署指令列表 std::vector deploy_plan_list; // 获取当前肉鸽的分组信息[干员组1名称,干员组2名称,...] @@ -336,7 +336,7 @@ bool asst::RoguelikeBattleTaskPlugin::do_best_deploy() for (const auto& [name, oper] : m_cur_deployment_opers) { // 干员冷却中 if (oper.cooling) { - Log.info("operator", oper.name, "is cooling now."); + Log.debug("operator", oper.name, "is cooling now."); continue; } @@ -349,11 +349,11 @@ bool asst::RoguelikeBattleTaskPlugin::do_best_deploy() for (const auto& group_id : group_ids) { // 当前干员组名,string类型 std::string group_name = groups[group_id]; - Log.trace(m_stage_name, "group_name", group_name); + Log.debug(m_stage_name, "group_name", group_name); if (m_deploy_plan.contains(group_name)) { for (const auto& info : m_deploy_plan[group_name]) { if (m_kills < info.kill_lower_bound || m_kills > info.kill_upper_bound) { - Log.trace(" deploy info", oper.name, "in group", group_name, "is waiting."); + Log.debug(" deploy info", oper.name, "in group", group_name, "is waiting."); is_success = true; // 如果发现了待命干员，此函数最终返回true continue; } @@ -369,7 +369,7 @@ bool asst::RoguelikeBattleTaskPlugin::do_best_deploy() deploy_plan.placed = info.location; deploy_plan.direction = info.direction; deploy_plan_list.emplace_back(deploy_plan); - Log.trace(" deploy info", deploy_plan.oper_name, "is No. ", deploy_plan.oper_order_in_group + 1, + Log.debug(" deploy info", deploy_plan.oper_name, "is No. ", deploy_plan.oper_order_in_group + 1, "in group", group_name, ", with deploy command rank", deploy_plan.rank); } }