chore: 调整任务设置界面

src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs

@@ -11,11 +11,11 @@
 // but WITHOUT ANY WARRANTY
 // </copyright>
 
+using System;
 using MaaWpfGui.Constants;
 using MaaWpfGui.Helper;
-using System;
-using Stylet;
 using MaaWpfGui.ViewModels.UI;
+using Stylet;
 
 namespace MaaWpfGui.Models
 {
@@ -84,13 +84,13 @@ namespace MaaWpfGui.Models
             }
 
             EnableAdvancedSettings = false;
-            if (Base || Combat || AutoRoguelike)
+            if (Mission || WakeUp)
             {
-                AdvancedSettingsVisibility = true;
+                AdvancedSettingsVisibility = false;
             }
             else
             {
-                AdvancedSettingsVisibility = false;
+                AdvancedSettingsVisibility = true;
             }
         }
 

src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml

@@ -2,6 +2,7 @@
     x:Class="MaaWpfGui.Views.UserControl.AutoRecruitSettingsUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
     xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dd="urn:gong-wpf-dragdrop"
@@ -16,49 +17,54 @@
     d:DesignWidth="220"
     mc:Ignorable="d">
     <StackPanel>
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource AutoRefresh}"
-            IsChecked="{Binding RefreshLevel3}" />
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource AutoUseExpedited}"
-            IsChecked="{Binding UseExpedited}"
-            ToolTip="{DynamicResource CheckBoxesNotSaved}" />
-        <CheckBox
-            Margin="0,10"
-            HorizontalAlignment="Left"
-            IsChecked="{Binding IsLevel3UseShortTime}"
-            ToolTip="{DynamicResource Level3UseShortTimeTip}">
-            <controls:TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
-        </CheckBox>
-        <hc:NumericUpDown
-            Margin="0,5"
-            hc:InfoElement.Title="{DynamicResource RecruitMaxTimes}"
-            Style="{StaticResource NumericUpDownExtend}"
-            ValueChanged="NumericUpDown_ValueChanged"
-            Value="{Binding RecruitMaxTimes}" />
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource ManuallySelectLevel1}"
-            IsChecked="{Binding NotChooseLevel1}"
-            ToolTip="{DynamicResource Level1Tip}" />
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource AutoSelectLevel3}"
-            IsChecked="{Binding ChooseLevel3}" />
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource AutoSelectLevel4}"
-            IsChecked="{Binding ChooseLevel4}" />
-        <CheckBox
-            Margin="0,10"
-            Content="{DynamicResource AutoSelectLevel5}"
-            IsChecked="{Binding ChooseLevel5}" />
-        <CheckBox
-            Margin="0,10,0,0"
-            Content="{DynamicResource AutoSelectLevel6}"
-            IsChecked="False"
-            IsEnabled="False" />
+        <StackPanel Visibility="{c:Binding !TaskSettingVisibilities.EnableAdvancedSettings}">
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoUseExpedited}"
+                IsChecked="{Binding UseExpedited}"
+                ToolTip="{DynamicResource CheckBoxesNotSaved}" />
+            <hc:NumericUpDown
+                Margin="0,5"
+                hc:InfoElement.Title="{DynamicResource RecruitMaxTimes}"
+                Style="{StaticResource NumericUpDownExtend}"
+                ValueChanged="NumericUpDown_ValueChanged"
+                Value="{Binding RecruitMaxTimes}" />
+        </StackPanel>
+
+        <StackPanel Visibility="{c:Binding TaskSettingVisibilities.EnableAdvancedSettings}">
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoRefresh}"
+                IsChecked="{Binding RefreshLevel3}" />
+            <CheckBox
+                Margin="0,10"
+                HorizontalAlignment="Left"
+                IsChecked="{Binding IsLevel3UseShortTime}"
+                ToolTip="{DynamicResource Level3UseShortTimeTip}">
+                <controls:TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
+            </CheckBox>
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource ManuallySelectLevel1}"
+                IsChecked="{Binding NotChooseLevel1}"
+                ToolTip="{DynamicResource Level1Tip}" />
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoSelectLevel3}"
+                IsChecked="{Binding ChooseLevel3}" />
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoSelectLevel4}"
+                IsChecked="{Binding ChooseLevel4}" />
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoSelectLevel5}"
+                IsChecked="{Binding ChooseLevel5}" />
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AutoSelectLevel6}"
+                IsChecked="False"
+                IsEnabled="False" />
+        </StackPanel>
     </StackPanel>
 </UserControl>

src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml

@@ -20,62 +20,8 @@
     d:DesignWidth="220"
     mc:Ignorable="d">
     <StackPanel>
-        <StackPanel Visibility="{c:Binding !TaskSettingVisibilities.EnableAdvancedSettings}">
-            <ComboBox
-                Margin="0,5"
-                hc:InfoElement.Title="{DynamicResource DroneUsage}"
-                DisplayMemberPath="Display"
-                ItemsSource="{Binding UsesOfDronesList}"
-                SelectedValue="{Binding UsesOfDrones}"
-                SelectedValuePath="Value"
-                Style="{StaticResource ComboBoxExtend}" />
-            <ComboBox
-                Margin="0,5"
-                VerticalContentAlignment="Center"
-                hc:InfoElement.Title="{DynamicResource CustomInfrastPlan}"
-                DataContext="{Binding CustomInfrastPlanDataContext}"
-                DisplayMemberPath="Display"
-                IsHitTestVisible="{c:Binding !InfrastTaskRunning}"
-                ItemsSource="{Binding CustomInfrastPlanList}"
-                SelectedValue="{Binding CustomInfrastPlanIndex}"
-                SelectedValuePath="Value"
-                Style="{StaticResource ComboBoxExtend}"
-                Visibility="{c:Binding CustomInfrastEnabled}" />
-            <ListBox
-                Margin="0,5"
-                dd:DragDrop.IsDragSource="True"
-                dd:DragDrop.IsDropTarget="True"
-                ItemsSource="{Binding Path=InfrastItemViewModels}"
-                SelectionChanged="{s:Action InfrastOrderSelectionChanged}"
-                ToolTip="{DynamicResource LabelSequenceTip}">
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel Orientation="Horizontal">
-                            <!--<maa:TextBlock  Text="{Binding ID}" />
-                            <maa:TextBlock  Text=". " />-->
-                            <CheckBox Content="{Binding Name}" IsChecked="{Binding IsChecked}" />
-                        </StackPanel>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
-        </StackPanel>
-
+        <!--  只放在高级设置的部分  -->
         <StackPanel Visibility="{c:Binding TaskSettingVisibilities.EnableAdvancedSettings}">
-            <StackPanel Margin="0">
-                <TextBlock
-                    Margin="0,5"
-                    HorizontalAlignment="Stretch"
-                    Block.TextAlignment="Center"
-                    Foreground="{DynamicResource PrimaryTextBrush}"
-                    Text="{Binding DormThresholdLabel}"
-                    TextWrapping="Wrap" />
-                <Slider
-                    Margin="0,5"
-                    Maximum="100"
-                    Minimum="0"
-                    ToolTip="{DynamicResource InfrastThresholdTip}"
-                    Value="{Binding DormThreshold}" />
-            </StackPanel>
             <CheckBox
                 Margin="0,10"
                 Content="{DynamicResource DormTrustEnabled}"
@@ -123,5 +69,64 @@
                     Text="{Binding CustomInfrastFile}" />
             </StackPanel>
         </StackPanel>
+
+        <!--  不开自定义基建计划时，放在常规设置的部分  -->
+        <StackPanel Visibility="{c:Binding (CustomInfrastEnabled and TaskSettingVisibilities.EnableAdvancedSettings) or (!CustomInfrastEnabled and !TaskSettingVisibilities.EnableAdvancedSettings)}">
+            <StackPanel Margin="0">
+                <TextBlock
+                    Margin="0,5"
+                    HorizontalAlignment="Stretch"
+                    Block.TextAlignment="Center"
+                    Foreground="{DynamicResource PrimaryTextBrush}"
+                    Text="{Binding DormThresholdLabel}"
+                    TextWrapping="Wrap" />
+                <Slider
+                    Margin="0,5"
+                    Maximum="100"
+                    Minimum="0"
+                    ToolTip="{DynamicResource InfrastThresholdTip}"
+                    Value="{Binding DormThreshold}" />
+            </StackPanel>
+            <ComboBox
+                Margin="0,5"
+                hc:InfoElement.Title="{DynamicResource DroneUsage}"
+                DisplayMemberPath="Display"
+                ItemsSource="{Binding UsesOfDronesList}"
+                SelectedValue="{Binding UsesOfDrones}"
+                SelectedValuePath="Value"
+                Style="{StaticResource ComboBoxExtend}" />
+            <ListBox
+                Margin="0,5"
+                dd:DragDrop.IsDragSource="True"
+                dd:DragDrop.IsDropTarget="True"
+                ItemsSource="{Binding Path=InfrastItemViewModels}"
+                SelectionChanged="{s:Action InfrastOrderSelectionChanged}"
+                ToolTip="{DynamicResource LabelSequenceTip}">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <!--<maa:TextBlock  Text="{Binding ID}" />
+                            <maa:TextBlock  Text=". " />-->
+                            <CheckBox Content="{Binding Name}" IsChecked="{Binding IsChecked}" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+        </StackPanel>
+
+        <!--  开自定义基建计划时，放在常规设置的部分  -->
+        <StackPanel Visibility="{c:Binding CustomInfrastEnabled and !TaskSettingVisibilities.EnableAdvancedSettings}">
+            <ComboBox
+                Margin="0,4"
+                VerticalContentAlignment="Center"
+                hc:InfoElement.Title="{DynamicResource CustomInfrastPlan}"
+                DataContext="{Binding CustomInfrastPlanDataContext}"
+                DisplayMemberPath="Display"
+                IsHitTestVisible="{c:Binding !InfrastTaskRunning}"
+                ItemsSource="{Binding CustomInfrastPlanList}"
+                SelectedValue="{Binding CustomInfrastPlanIndex}"
+                SelectedValuePath="Value"
+                Style="{StaticResource ComboBoxExtend}" />
+        </StackPanel>
     </StackPanel>
 </UserControl>

src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml

@@ -2,6 +2,7 @@
     x:Class="MaaWpfGui.Views.UserControl.MallSettingsUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
     xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dd="urn:gong-wpf-dragdrop"
@@ -16,39 +17,47 @@
     d:DesignWidth="220"
     mc:Ignorable="d">
     <StackPanel>
-        <CheckBox
-            Margin="0,10"
-            Block.TextAlignment="Left"
-            Content="{DynamicResource SocialPtShop}"
-            IsChecked="{Binding CreditShopping}" />
-        <CheckBox Margin="0,10" IsChecked="{Binding CreditForceShoppingIfCreditFull}">
-            <TextBlock
+        <StackPanel Visibility="{c:Binding !TaskSettingVisibilities.EnableAdvancedSettings}">
+            <CheckBox
+                Margin="0,10"
                 Block.TextAlignment="Left"
-                Text="{DynamicResource ForceShoppingIfCreditFull}"
-                TextWrapping="Wrap" />
-        </CheckBox>
-        <CheckBox
-            Margin="0,10"
-            Block.TextAlignment="Left"
-            IsChecked="{Binding CreditFightTaskEnabledDisplay}"
-            ToolTip="{DynamicResource CreditFightTip}">
-            <TextBlock
+                Content="{DynamicResource SocialPtShop}"
+                IsChecked="{Binding CreditShopping}" />
+        </StackPanel>
+
+        <StackPanel Visibility="{c:Binding TaskSettingVisibilities.EnableAdvancedSettings}">
+            <CheckBox
+                Margin="0,10"
                 Block.TextAlignment="Left"
-                Text="{DynamicResource CreditFight}"
-                TextWrapping="Wrap" />
-        </CheckBox>
-        <TextBox
-            Margin="0,10"
-            hc:InfoElement.Title="{DynamicResource Blacklist}"
-            IsEnabled="{Binding CreditShopping}"
-            Style="{StaticResource TextBoxExtend}"
-            Text="{Binding CreditBlackList}" />
-        <TextBox
-            Margin="0,10"
-            hc:InfoElement.Title="{DynamicResource HighPriority}"
-            IsEnabled="{Binding CreditShopping}"
-            Style="{StaticResource TextBoxExtend}"
-            Text="{Binding CreditFirstList}"
-            ToolTip="{DynamicResource Drink}" />
+                IsChecked="{Binding CreditFightTaskEnabledDisplay}"
+                ToolTip="{DynamicResource CreditFightTip}">
+                <TextBlock
+                    Block.TextAlignment="Left"
+                    Text="{DynamicResource CreditFight}"
+                    TextWrapping="Wrap" />
+            </CheckBox>
+            <CheckBox
+                Margin="0,10"
+                IsChecked="{Binding CreditForceShoppingIfCreditFull}"
+                IsEnabled="{Binding CreditShopping}">
+                <TextBlock
+                    Block.TextAlignment="Left"
+                    Text="{DynamicResource ForceShoppingIfCreditFull}"
+                    TextWrapping="Wrap" />
+            </CheckBox>
+            <TextBox
+                Margin="0,10"
+                hc:InfoElement.Title="{DynamicResource Blacklist}"
+                IsEnabled="{Binding CreditShopping}"
+                Style="{StaticResource TextBoxExtend}"
+                Text="{Binding CreditBlackList}" />
+            <TextBox
+                Margin="0,10"
+                hc:InfoElement.Title="{DynamicResource HighPriority}"
+                IsEnabled="{Binding CreditShopping}"
+                Style="{StaticResource TextBoxExtend}"
+                Text="{Binding CreditFirstList}"
+                ToolTip="{DynamicResource Drink}" />
+        </StackPanel>
     </StackPanel>
 </UserControl>

src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml

@@ -35,16 +35,6 @@
                 SelectedValue="{Binding RoguelikeMode}"
                 SelectedValuePath="Value"
                 Style="{StaticResource ComboBoxExtend}" />
-            <hc:NumericUpDown
-                Margin="0,5"
-                hc:InfoElement.Title="{DynamicResource StartTimesLimit}"
-                Style="{StaticResource NumericUpDownExtend}"
-                ValueChanged="NumericUpDown_ValueChanged"
-                Value="{Binding RoguelikeStartsCount}" />
-            <CheckBox
-                Margin="0,10"
-                Content="{DynamicResource RefreshTraderWithDice}"
-                IsChecked="{Binding RoguelikeRefreshTraderWithDice}" />
             <ComboBox
                 Margin="0,5"
                 hc:InfoElement.Title="{DynamicResource StartingSquad}"
@@ -55,18 +45,13 @@
                 SelectedValue="{Binding RoguelikeSquad}"
                 SelectedValuePath="Value"
                 Style="{StaticResource ComboBoxExtend}" />
-            <ComboBox
-                Margin="0,5"
-                hc:InfoElement.Title="{DynamicResource StartingRoles}"
-                DisplayMemberPath="Display"
-                IsHitTestVisible="{Binding Idle}"
-                ItemsSource="{Binding RoguelikeRolesList}"
-                SelectedValue="{Binding RoguelikeRoles}"
-                SelectedValuePath="Value"
-                Style="{StaticResource ComboBoxExtend}" />
         </StackPanel>
 
         <StackPanel Visibility="{c:Binding TaskSettingVisibilities.EnableAdvancedSettings}">
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource RefreshTraderWithDice}"
+                IsChecked="{Binding RoguelikeRefreshTraderWithDice}" />
             <CheckBox
                 Margin="0,10"
                 Content="{DynamicResource InvestmentEnabled}"
@@ -87,8 +72,23 @@
                     Text="{DynamicResource StopOnGoldLimit}"
                     TextWrapping="Wrap" />
             </CheckBox>
+            <hc:NumericUpDown
+                Margin="0,5"
+                hc:InfoElement.Title="{DynamicResource StartTimesLimit}"
+                Style="{StaticResource NumericUpDownExtend}"
+                ValueChanged="NumericUpDown_ValueChanged"
+                Value="{Binding RoguelikeStartsCount}" />
+            <ComboBox
+                Margin="0,5"
+                hc:InfoElement.Title="{DynamicResource StartingRoles}"
+                DisplayMemberPath="Display"
+                IsHitTestVisible="{Binding Idle}"
+                ItemsSource="{Binding RoguelikeRolesList}"
+                SelectedValue="{Binding RoguelikeRoles}"
+                SelectedValuePath="Value"
+                Style="{StaticResource ComboBoxExtend}" />
             <TextBlock
-                Margin="8,10,8,0"
+                Margin="8,5,8,0"
                 HorizontalAlignment="Left"
                 Block.TextAlignment="Center"
                 Foreground="{DynamicResource PrimaryTextBrush}"