Merge pull request #1229 from MaaAssistantArknights/master

fix merge error

docs/en/USER_MANUAL.md

@@ -74,6 +74,7 @@ Welcome to QQ Group: 912322156
 ### Miscellaneous
 
 - Tasks order can be changed on the UI. So can the shifting order in the infrastructure.
+- Almost all configuration changes will be saved automatically, except for options containing an *.
 - All clicking event is randomized within a region, following Poisson distribution (higher probability at the center, lower probability around).
 - Developed in C++, the core algorithm supports multi-level cache, in order to reduce CPU and memory usage as much as possible.
 - Our software supports auto-update ✿✿ヽ(°▽°)ノ✿ Beta-testers can try beta versions, which updates faster and less buggy (maybe).

docs/详细介绍.md

@@ -74,6 +74,7 @@
 ### 其他乱七八糟的说明
 
 - 主界面上要执行的任务，是可以拖动改变顺序的。同样设置中基建换班的顺序，也是可以拖动改变的。
+- 主界面和设置中更改的配置一般都会自动保存，含有*号的选项除外。
 - 所有点击操作，都是点击按钮内随机位置，并模拟泊松分布（按钮偏中间位置点的概率大，越往旁边点到的概率越小）。
 - 底层算法纯 C++ 开发，并设计了多重的缓存技术，最大限度降低 CPU 和内存占用。
 - 软件支持自动更新 ✿✿ヽ(°▽°)ノ✿ 推荐非杠精的同学使用测试版，一般来说更新快且 bug 少（什么 MIUI (╯‵□′)╯︵┻━┻

src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml

@@ -16,7 +16,7 @@
         </Grid.ColumnDefinitions>
         <StackPanel Grid.Column="0" VerticalAlignment="Center" Margin="10">
             <CheckBox IsChecked="{Binding RefreshLevel3}" Content="自动刷新3星Tags" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10" />
-            <CheckBox IsChecked="{Binding UseExpedited}" Content="自动使用加急许可" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10" />
+            <CheckBox IsChecked="{Binding UseExpedited}" Content="自动使用加急许可*" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10" />
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0, 10">
                 <TextBlock Style="{StaticResource TextBlockDefault}" Block.TextAlignment="Center"
                    Text="每次执行时&#xA;最大招募次数" Margin="5" VerticalAlignment="Center" />

src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml

@@ -31,7 +31,7 @@
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" Grid.Row="1" VerticalAlignment="Center">
-            <CheckBox IsChecked="{Binding UseStone}" IsEnabled="{Binding UseMedicine}" Content="吃石头　" Margin="10" />
+            <CheckBox IsChecked="{Binding UseStone}" IsEnabled="{Binding UseMedicine}" Content="吃源石*" Margin="10 10 16.5 10" />
             <hc:TextBox Text="{Binding StoneNumber}" TextWrapping="Wrap" Margin="10"
                         Width="50" InputMethod.IsInputMethodEnabled="False" 
                         TextType="Int"/>
@@ -39,7 +39,7 @@
             <!--<TextBlock Style="{StaticResource TextBlockDefaultBold}" Text="{Binding StoneInfo}" Margin="30, 0, 0, 0" VerticalAlignment="Center" />-->
         </StackPanel>
         <StackPanel Orientation="Horizontal" Grid.Row="2" VerticalAlignment="Center">
-            <CheckBox IsChecked="{Binding HasTimesLimited}" Content="指定次数" Margin="10" />
+            <CheckBox IsChecked="{Binding HasTimesLimited}" Content="指定次数*" Margin="10 10 4.5 10" />
             <hc:TextBox Text="{Binding MaxTimes}" TextWrapping="Wrap" Margin="10"
                         Width="50" InputMethod.IsInputMethodEnabled="False" 
                         TextType="Int"/>

src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs

@@ -138,8 +138,8 @@ namespace MeoAsstGui
                 new GenericCombData<ActionType>{ Display="关闭模拟器",Value=ActionType.ExitEmulator },
                 new GenericCombData<ActionType>{ Display="退出并关闭模拟器",Value=ActionType.ExitEmulatorAndSelf },
                 //new GenericCombData<ActionTypeAfterCompleted>{ Display="待机",Value=ActionTypeAfterCompleted.Suspend },
-                new GenericCombData<ActionType>{ Display="休眠",Value=ActionType.Hibernate },
-                new GenericCombData<ActionType>{ Display="关机",Value=ActionType.Shutdown },
+                new GenericCombData<ActionType>{ Display="休眠*",Value=ActionType.Hibernate },
+                new GenericCombData<ActionType>{ Display="关机*",Value=ActionType.Shutdown },
             };
             var temp_order_list = new List<DragItemViewModel>(new DragItemViewModel[task_list.Length]);
             int order_offset = 0;