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

Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev

Browse Source
This commit is contained in:
MistEO
2022-07-30 00:34:06 +08:00
parent b2cde7665a ba23af1588
commit 519dd4b4e1
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/MeoAssistant/AutoRecruitTask.cpp
View File

@@ -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(

6
src/MeoAsstGui/MeoAsstGui.csproj
View File

@@ -129,8 +129,8 @@
<Compile Include="UserControl\ConnectSettingsUserControl.xaml.cs">
<DependentUpon>ConnectSettingsUserControl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\RogueliekSettingsUserControl.xaml.cs">
<DependentUpon>RogueliekSettingsUserControl.xaml</DependentUpon>
<Compile Include="UserControl\RoguelikeSettingsUserControl.xaml.cs">
<DependentUpon>RoguelikeSettingsUserControl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\MallSettingsUserControl.xaml.cs">
<DependentUpon>MallSettingsUserControl.xaml</DependentUpon>
@@ -199,7 +199,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\RogueliekSettingsUserControl.xaml">
<Page Include="UserControl\RoguelikeSettingsUserControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>

0
src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml → src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml
View File

2
src/MeoAsstGui/UserControl/RogueliekSettingsUserControl.xaml.cs → src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml.cs
View File

@@ -1,4 +1,4 @@
// <copyright file="RogueliekSettingsUserControl.xaml.cs" company="MaaAssistantArknights">
// <copyright file="RoguelikeSettingsUserControl.xaml.cs" company="MaaAssistantArknights">
// MeoAsstGui - A part of the MeoAssistantArknights project
// Copyright (C) 2021 MistEO and Contributors
//