diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp index c5b8c82023..bbd89d7384 100644 --- a/src/MeoAssistant/AutoRecruitTask.cpp +++ b/src/MeoAssistant/AutoRecruitTask.cpp @@ -313,7 +313,13 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc // assuming timer would be set to 09:00:00 for (RecruitCombs& rc : result_vec) { - rc.min_level = (std::max)(rc.min_level, 3); + if (rc.min_level < 3) { + // find another min level backwards (assuming operator list reversely sorted by level) + auto sec = std::find_if( + rc.opers.crbegin(), rc.opers.crend(), + [](const RecruitOperInfo& op) -> bool { return op.level >= 3; }); + if (sec != rc.opers.crend()) { rc.min_level = sec->level; } + } } std::sort( diff --git a/src/MeoAsstGui/MeoAsstGui.csproj b/src/MeoAsstGui/MeoAsstGui.csproj index dda5ccfac8..ac51dc518e 100644 --- a/src/MeoAsstGui/MeoAsstGui.csproj +++ b/src/MeoAsstGui/MeoAsstGui.csproj @@ -129,8 +129,8 @@ ConnectSettingsUserControl.xaml - - RogueliekSettingsUserControl.xaml + + RoguelikeSettingsUserControl.xaml MallSettingsUserControl.xaml @@ -199,7 +199,7 @@ Designer MSBuild:Compile - + MSBuild:Compile Designer diff --git a/src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml rename to src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml.cs b/src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml.cs similarity index 92% rename from src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml.cs rename to src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml.cs index 0c73d0e01b..d5afdf5089 100644 --- a/src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml.cs +++ b/src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml.cs @@ -1,4 +1,4 @@ -// +// // MeoAsstGui - A part of the MeoAssistantArknights project // Copyright (C) 2021 MistEO and Contributors //