fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 肉鸽适配新干员默认技能 (#6948)

Browse Source
This commit is contained in:
Lancarus
2023-10-16 18:17:26 +08:00
committed by GitHub
parent ccf91ccbaa
commit dd1b501d0d
4 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resource/roguelike/Mizuki/recruitment.json
View File

@@ -2289,6 +2289,10 @@
{
"name": "洋灰"
},
{
"name": "赫德雷",
"skill": 1
},
{
"name": "伊内丝"
},
@@ -3245,4 +3249,4 @@
"threshold": 1
}
]
}
}

16
resource/roguelike/Phantom/recruitment.json
View File

@@ -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
}
]
}
}

29
resource/roguelike/Sami/recruitment.json
View File

@@ -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
}
]
}
}

10
src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp
View File

@@ -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<DeployPlanInfo> 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);
}
}