From b562cb8b316a490a9fefbfa1fe8c1c2f38e5ab2e Mon Sep 17 00:00:00 2001
From: B1ackSand <peilanfengfeng@gmail.com>
Date: Thu, 5 Oct 2023 04:14:18 +0800
Subject: [PATCH 1/6] fix a bug of negative mode.

---
 LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs b/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs
index 1950677..675d055 100644
--- a/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs
@@ -85,10 +85,10 @@ private void RandomCommanderInfo()
             BeforeCommander3.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[beforeRandNum[2]]}.png", UriKind.Relative));
             BeforeCommander4.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[beforeRandNum[3]]}.png", UriKind.Relative));
 
-            AfterCommander1.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[afterRandNum[0]]}.png", UriKind.Relative));
-            AfterCommander2.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[afterRandNum[1]]}.png", UriKind.Relative));
-            AfterCommander3.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[afterRandNum[2]]}.png", UriKind.Relative));
-            AfterCommander4.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[afterRandNum[3]]}.png", UriKind.Relative));
+            AfterCommander1.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.afterCommanderInfo[afterRandNum[0]]}.png", UriKind.Relative));
+            AfterCommander2.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.afterCommanderInfo[afterRandNum[1]]}.png", UriKind.Relative));
+            AfterCommander3.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.afterCommanderInfo[afterRandNum[2]]}.png", UriKind.Relative));
+            AfterCommander4.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.afterCommanderInfo[afterRandNum[3]]}.png", UriKind.Relative));
         }
 
         //随机先出和后出指挥官清除显示

From 62811e7c3d350ed064f924f9bd84f3ff223c738b Mon Sep 17 00:00:00 2001
From: B1ackSand <peilanfengfeng@gmail.com>
Date: Thu, 5 Oct 2023 16:13:36 +0800
Subject: [PATCH 2/6] modified style.

---
 LiaoTian_Cup/Mode/DoublesModeWindow.xaml | 88 +++++++++++++-----------
 LiaoTian_Cup/Mode/HubModeWindow.xaml     | 86 ++++++++++++-----------
 LiaoTian_Cup/Mode/USuckModeWindow.xaml   | 88 +++++++++++++-----------
 3 files changed, 142 insertions(+), 120 deletions(-)

diff --git a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
index 1deadca..b71dca7 100644
--- a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
@@ -23,8 +23,7 @@
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
             <RowDefinition Height="160" />
-            <RowDefinition Height="80" />
-            <RowDefinition Height="80" />
+            <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
@@ -161,49 +160,58 @@
         </Grid>
 
         <Grid Grid.Row="3">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
 
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
-                <Image x:Name="SelectFactor2" />
-                <Image x:Name="SelectFactor3" />
-                <Image x:Name="SelectFactor4" />
-                <Image x:Name="SelectFactor5" />
-                <Image x:Name="SelectFactor6" />
-                <Image x:Name="SelectFactor7" />
-                <Image x:Name="SelectFactor8" />
-            </StackPanel>
-        </Grid>
+                <Grid Grid.Row="0">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
 
-        <Grid Grid.Row="4">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+                        <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
+                        <Image x:Name="SelectFactor2" />
+                        <Image x:Name="SelectFactor3" />
+                        <Image x:Name="SelectFactor4" />
+                        <Image x:Name="SelectFactor5" />
+                        <Image x:Name="SelectFactor6" />
+                        <Image x:Name="SelectFactor7" />
+                        <Image x:Name="SelectFactor8" />
+                    </StackPanel>
+                </Grid>
 
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
-                <Image x:Name="BeforeCommander2" />
-                <Image x:Name="BeforeCommander3" />
-                <Image x:Name="BeforeCommander4" />
-                <Image x:Name="BeforeCommander5" />
-                <Image x:Name="BeforeCommander6" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
-                <Image x:Name="AfterCommander2" />
-                <Image x:Name="AfterCommander3" />
-                <Image x:Name="AfterCommander4" />
-            </StackPanel>
+                <Grid Grid.Row="1">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
+
+                        <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="BeforeCommander2" />
+                        <Image x:Name="BeforeCommander3" />
+                        <Image x:Name="BeforeCommander4" />
+                        <Image x:Name="BeforeCommander5" />
+                        <Image x:Name="BeforeCommander6" />
+                        <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="AfterCommander2" />
+                        <Image x:Name="AfterCommander3" />
+                        <Image x:Name="AfterCommander4" />
+                    </StackPanel>
+                </Grid>
+            </Grid>
         </Grid>
 
-        <Grid Grid.Row="5">
+        <Grid Grid.Row="4">
             <Grid.RowDefinitions>
                 <RowDefinition Height="100" />
                 <RowDefinition Height="100" />
diff --git a/LiaoTian_Cup/Mode/HubModeWindow.xaml b/LiaoTian_Cup/Mode/HubModeWindow.xaml
index 4ed7efb..cc49428 100644
--- a/LiaoTian_Cup/Mode/HubModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/HubModeWindow.xaml
@@ -24,8 +24,7 @@
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
             <RowDefinition Height="240" />
-            <RowDefinition Height="80" />
-            <RowDefinition Height="80" />
+            <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
@@ -196,49 +195,56 @@
         </Grid>
 
         <Grid Grid.Row="3">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
 
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
-                <Image x:Name="SelectFactor2" />
-                <Image x:Name="SelectFactor3" />
-                <Image x:Name="SelectFactor4" />
-                <Image x:Name="SelectFactor5" />
-                <Image x:Name="SelectFactor6" />
-                <Image x:Name="SelectFactor7" />
-                <Image x:Name="SelectFactor8" />
-            </StackPanel>
-        </Grid>
+            <Grid Grid.Row="0">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                            <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
+                        </Style>
+                    </StackPanel.Resources>
 
-        <Grid Grid.Row="4">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+                    <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+                    <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
+                    <Image x:Name="SelectFactor2" />
+                    <Image x:Name="SelectFactor3" />
+                    <Image x:Name="SelectFactor4" />
+                    <Image x:Name="SelectFactor5" />
+                    <Image x:Name="SelectFactor6" />
+                    <Image x:Name="SelectFactor7" />
+                    <Image x:Name="SelectFactor8" />
+                </StackPanel>
+            </Grid>
 
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
-                <Image x:Name="BeforeCommander2" />
-                <Image x:Name="BeforeCommander3" />
-                <Image x:Name="BeforeCommander4" />
-                <Image x:Name="BeforeCommander5" />
-                <Image x:Name="BeforeCommander6" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
-                <Image x:Name="AfterCommander2" />
-                <Image x:Name="AfterCommander3" />
-                <Image x:Name="AfterCommander4" />
-            </StackPanel>
+            <Grid Grid.Row="1">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                            <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                        </Style>
+                    </StackPanel.Resources>
+
+                    <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                    <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
+                    <Image x:Name="BeforeCommander2" />
+                    <Image x:Name="BeforeCommander3" />
+                    <Image x:Name="BeforeCommander4" />
+                    <Image x:Name="BeforeCommander5" />
+                    <Image x:Name="BeforeCommander6" />
+                    <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                    <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+                    <Image x:Name="AfterCommander2" />
+                    <Image x:Name="AfterCommander3" />
+                    <Image x:Name="AfterCommander4" />
+                </StackPanel>
+            </Grid>
         </Grid>
 
-        <Grid Grid.Row="5">
+        <Grid Grid.Row="4">
             <Grid.RowDefinitions>
                 <RowDefinition Height="100" />
                 <RowDefinition Height="100" />
diff --git a/LiaoTian_Cup/Mode/USuckModeWindow.xaml b/LiaoTian_Cup/Mode/USuckModeWindow.xaml
index 65d386a..cf29577 100644
--- a/LiaoTian_Cup/Mode/USuckModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/USuckModeWindow.xaml
@@ -23,8 +23,7 @@
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
             <RowDefinition Height="240" />
-            <RowDefinition Height="80" />
-            <RowDefinition Height="80" />
+            <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
@@ -193,49 +192,58 @@
         </Grid>
 
         <Grid Grid.Row="3">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
 
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
-                <Image x:Name="SelectFactor2" />
-                <Image x:Name="SelectFactor3" />
-                <Image x:Name="SelectFactor4" />
-                <Image x:Name="SelectFactor5" />
-                <Image x:Name="SelectFactor6" />
-                <Image x:Name="SelectFactor7" />
-                <Image x:Name="SelectFactor8" />
-            </StackPanel>
-        </Grid>
+                <Grid Grid.Row="0">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
 
-        <Grid Grid.Row="4">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+                        <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
+                        <Image x:Name="SelectFactor2" />
+                        <Image x:Name="SelectFactor3" />
+                        <Image x:Name="SelectFactor4" />
+                        <Image x:Name="SelectFactor5" />
+                        <Image x:Name="SelectFactor6" />
+                        <Image x:Name="SelectFactor7" />
+                        <Image x:Name="SelectFactor8" />
+                    </StackPanel>
+                </Grid>
 
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
-                <Image x:Name="BeforeCommander2" />
-                <Image x:Name="BeforeCommander3" />
-                <Image x:Name="BeforeCommander4" />
-                <Image x:Name="BeforeCommander5" />
-                <Image x:Name="BeforeCommander6" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
-                <Image x:Name="AfterCommander2" />
-                <Image x:Name="AfterCommander3" />
-                <Image x:Name="AfterCommander4" />
-            </StackPanel>
+                <Grid Grid.Row="1">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
+
+                        <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="BeforeCommander2" />
+                        <Image x:Name="BeforeCommander3" />
+                        <Image x:Name="BeforeCommander4" />
+                        <Image x:Name="BeforeCommander5" />
+                        <Image x:Name="BeforeCommander6" />
+                        <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="AfterCommander2" />
+                        <Image x:Name="AfterCommander3" />
+                        <Image x:Name="AfterCommander4" />
+                    </StackPanel>
+                </Grid>
+            </Grid>
         </Grid>
 
-        <Grid Grid.Row="5">
+        <Grid Grid.Row="4">
             <Grid.RowDefinitions>
                 <RowDefinition Height="100" />
                 <RowDefinition Height="100" />

From 35257b61da7e3e8b4ce09af453411e961e4dfcae Mon Sep 17 00:00:00 2001
From: B1ackSand <peilanfengfeng@gmail.com>
Date: Fri, 6 Oct 2023 02:03:19 +0800
Subject: [PATCH 3/6] double mode ui modify.

---
 LiaoTian_Cup/Dictionary/BaseStyle.xaml        |  94 +++----
 LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs |   2 +-
 LiaoTian_Cup/Dictionary/I18n/Lang.resx        |   2 +-
 LiaoTian_Cup/LiaoTian_Cup.csproj              |   1 +
 LiaoTian_Cup/Mode/DoublesModeWindow.xaml      | 253 ++++++++++++------
 LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs   |  26 +-
 6 files changed, 251 insertions(+), 127 deletions(-)

diff --git a/LiaoTian_Cup/Dictionary/BaseStyle.xaml b/LiaoTian_Cup/Dictionary/BaseStyle.xaml
index 1af84b8..fc78f32 100644
--- a/LiaoTian_Cup/Dictionary/BaseStyle.xaml
+++ b/LiaoTian_Cup/Dictionary/BaseStyle.xaml
@@ -1,69 +1,71 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--存储常用的控件Style格式-->
-    
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  存储常用的控件Style格式  -->
+
     <Style x:Key="BaseButton" TargetType="Button">
-        <Setter Property="Width" Value="120"></Setter>
-        <Setter Property="Height" Value="30"></Setter>
-        <Setter Property="VerticalAlignment" Value="Center"></Setter>
-        <Setter Property="HorizontalAlignment" Value="Right"></Setter>
+        <Setter Property="Width" Value="120" />
+        <Setter Property="Height" Value="30" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
-    
+
     <Style x:Key="BaseCheckBox" TargetType="CheckBox">
-        <Setter Property="Width" Value="120"></Setter>
-        <Setter Property="Height" Value="30"></Setter>
-        <Setter Property="VerticalAlignment" Value="Center"></Setter>
-        <Setter Property="HorizontalAlignment" Value="Center"></Setter>
-        <Setter Property="FontSize" Value="16"></Setter>
-        <Setter Property="RenderTransformOrigin" Value="0.5,0.5"></Setter>
+        <Setter Property="Width" Value="120" />
+        <Setter Property="Height" Value="30" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
     </Style>
-    
+
     <Style x:Key="BaseLabel" TargetType="Label">
-        <Setter Property="FontSize" Value="20"></Setter>
-        <Setter Property="FontWeight" Value="Bold"></Setter>
-        <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-        <Setter Property="VerticalAlignment" Value="Center"></Setter>
+        <Setter Property="FontSize" Value="20" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
-    
+
     <Style x:Key="BaseTextBox" TargetType="TextBox">
-        <Setter Property="Focusable" Value="False"></Setter>
-        <Setter Property="FontSize" Value="20"></Setter>
-        <Setter Property="VerticalAlignment" Value="Center"></Setter>
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="FontSize" Value="20" />
+        <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
     <Style x:Key="BaseComboBox" TargetType="ComboBox">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="125"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="HorizontalAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="IsEditable" Value="False"/>
+        <Setter Property="Height" Value="30" />
+        <Setter Property="Width" Value="125" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="IsEditable" Value="False" />
     </Style>
 
     <Style x:Key="GridMinImage" TargetType="Image">
-        <Setter Property="Height" Value="60"/>
-        <Setter Property="Width" Value="60"/>
-        <Setter Property="Margin" Value="15,0,0,0"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="Stretch" Value="Fill"/>
+        <Setter Property="Height" Value="60" />
+        <Setter Property="Width" Value="60" />
+        <Setter Property="Margin" Value="15,0,0,0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Stretch" Value="Fill" />
     </Style>
 
-    <Style x:Key="ClickableImg" TargetType="Image" BasedOn="{StaticResource GridMinImage}">
-        <Setter Property="Cursor" Value="Hand"/>
+    <Style
+        x:Key="ClickableImg"
+        BasedOn="{StaticResource GridMinImage}"
+        TargetType="Image">
+        <Setter Property="Cursor" Value="Hand" />
     </Style>
 
     <Style x:Key="MapImg" TargetType="Image">
-        <Setter Property="Height" Value="85"/>
-        <Setter Property="Width" Value="285"/>
-        <Setter Property="Stretch" Value="UniformToFill"/>
+        <Setter Property="Height" Value="85" />
+        <Setter Property="Width" Value="285" />
+        <Setter Property="Stretch" Value="UniformToFill" />
     </Style>
 
     <Style x:Key="MapName" TargetType="TextBlock">
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="TextAlignment" Value="Center"/>
-        <Setter Property="FontSize" Value="18"/>
-        <Setter Property="Foreground" Value="Red"/>
-        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="Red" />
+        <Setter Property="FontWeight" Value="Bold" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
index a31fdde..91d91a6 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
@@ -268,7 +268,7 @@ public static string HasSelectCommanders {
         }
         
         /// <summary>
-        ///   查找类似 Free choice mutators picked: 的本地化字符串。
+        ///   查找类似 Free mutators choiced: 的本地化字符串。
         /// </summary>
         public static string HasSelectFreeMutators {
             get {
diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.resx b/LiaoTian_Cup/Dictionary/I18n/Lang.resx
index 574a56f..423fbbb 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.resx
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.resx
@@ -154,7 +154,7 @@
     <value>Awesome Cmdrs.:</value>
   </data>
   <data name="HasSelectFreeMutators" xml:space="preserve">
-    <value>Free choice mutators picked:</value>
+    <value>Free mutators choiced:</value>
   </data>
   <data name="HasSelectCommanders" xml:space="preserve">
     <value>Commander(s) picked:</value>
diff --git a/LiaoTian_Cup/LiaoTian_Cup.csproj b/LiaoTian_Cup/LiaoTian_Cup.csproj
index 217e629..6960cc1 100644
--- a/LiaoTian_Cup/LiaoTian_Cup.csproj
+++ b/LiaoTian_Cup/LiaoTian_Cup.csproj
@@ -320,6 +320,7 @@
     <PackageReference Include="DeepCloner" Version="0.10.4" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.11" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
index b71dca7..beb994e 100644
--- a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
@@ -17,8 +17,7 @@
         <Style BasedOn="{StaticResource BaseTextBox}" TargetType="TextBox" />
     </Page.Resources>
 
-
-    <Grid ShowGridLines="True">
+    <Grid ShowGridLines="False">
         <Grid.RowDefinitions>
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
@@ -26,51 +25,80 @@
             <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Margin="0,10,10,0"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <ComboBox
-                x:Name="ModeBox"
-                Width="130"
-                IsEditable="False"
-                Style="{StaticResource BaseComboBox}"
-                Text="{Binding Path=modeName}">
-                <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-                <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-            </ComboBox>
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+        <Grid>
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="190"
+                    Margin="0,0,0,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="20,10,10,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <ComboBox
+                    x:Name="ModeBox"
+                    Width="130"
+                    IsEditable="False"
+                    Style="{StaticResource BaseComboBox}"
+                    Text="{Binding Path=modeName}">
+                    <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                    <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                </ComboBox>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
                 x:Name="RandStartBtn"
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="6">
             <Button
                 Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
 
         <Grid Grid.Row="1">
+            <Label x:Name="MapLabel" Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            Grid.ColumnSpan="6">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource MapImg}" TargetType="Image">
@@ -82,10 +110,7 @@
                         <Setter Property="Margin" Value="5,10,0,0" />
                     </Style>
                 </StackPanel.Resources>
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
+
                 <StackPanel>
                     <Image
                         x:Name="MapImg1"
@@ -110,7 +135,26 @@
                 Content="{Binding [ConfirmMapBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
 
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="2" Grid.ColumnSpan="2">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <Grid>
+                    <Label x:Name="NegativeLabel" Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+                <Grid Grid.Row="1">
+                    <Label x:Name="MultilineLabel" Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*" />
@@ -124,10 +168,6 @@
 
                 <Grid Grid.Row="0">
                     <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
                         <Image x:Name="NegativeFactor1" Margin="0,0,0,0" />
                         <Image x:Name="NegativeFactor2" />
                         <Image x:Name="NegativeFactor3" />
@@ -138,28 +178,40 @@
                 </Grid>
                 <Grid Grid.Row="1">
                     <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
                         <Image x:Name="MultiFactor1" Margin="0,0,0,0" />
                         <Image x:Name="MultiFactor2" />
                         <Image x:Name="MultiFactor3" />
                         <Image x:Name="MultiFactor4" />
                         <Image x:Name="MultiFactor5" />
                     </StackPanel>
-                    <Button
-                        x:Name="BaseConfirmBtn"
-                        Margin="0,0,20,0"
-                        Click="Button_BaseConfirm_Click"
-                        Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
-                        IsEnabled="False" />
                 </Grid>
-
             </Grid>
         </Grid>
+        <Grid Grid.Row="2" Grid.Column="6">
+            <Button
+                x:Name="BaseConfirmBtn"
+                Margin="0,0,20,0"
+                Click="Button_BaseConfirm_Click"
+                Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
+                IsEnabled="False" />
+        </Grid>
+
 
-        <Grid Grid.Row="3">
+        <Grid Grid.Row="3" Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+            <Grid Grid.Row="1">
+                <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+        </Grid>
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="5">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*" />
@@ -174,7 +226,6 @@
                             </Style>
                         </StackPanel.Resources>
 
-                        <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
                         <Image x:Name="SelectFactor2" />
                         <Image x:Name="SelectFactor3" />
@@ -194,14 +245,17 @@
                             </Style>
                         </StackPanel.Resources>
 
-                        <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+
                         <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
                         <Image x:Name="BeforeCommander2" />
                         <Image x:Name="BeforeCommander3" />
                         <Image x:Name="BeforeCommander4" />
                         <Image x:Name="BeforeCommander5" />
                         <Image x:Name="BeforeCommander6" />
-                        <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Label
+                            x:Name="NewCmdrLabel"
+                            Margin="18,0,0,0"
+                            Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
                         <Image x:Name="AfterCommander2" />
                         <Image x:Name="AfterCommander3" />
@@ -211,31 +265,46 @@
             </Grid>
         </Grid>
 
-        <Grid Grid.Row="4">
+        <Grid Grid.Row="4" Grid.ColumnSpan="2">
             <Grid.RowDefinitions>
                 <RowDefinition Height="100" />
                 <RowDefinition Height="100" />
                 <RowDefinition Height="80" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
+            <Grid>
+                <Label Margin="0,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+            <Grid Grid.Row="1">
+                <Label Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="2">
+                <Label Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="3">
+                <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+        </Grid>
 
+        <Grid
+            Grid.Row="4"
+            Grid.Column="2"
+            Grid.ColumnSpan="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="100" />
+                <RowDefinition Height="100" />
+                <RowDefinition Height="80" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
             <Grid Grid.Row="0">
-                <Line
-                    Stroke="Gray"
-                    StrokeThickness="6"
-                    X1="0"
-                    X2="1180"
-                    Y1="0"
-                    Y2="0" />
                 <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
-                    <Image
-                        x:Name="HasSelectMap"
-                        Margin="10,0,0,0"
-                        Style="{StaticResource MapImg}" />
+
+                    <Image x:Name="HasSelectMap" Style="{StaticResource MapImg}" />
                     <TextBlock
                         x:Name="MapTip"
-                        Margin="50,0,0,0"
+                        Margin="18,0,0,0"
                         VerticalAlignment="Center"
                         FontSize="20"
                         FontWeight="Bold"
@@ -252,7 +321,7 @@
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
+
                     <Image x:Name="HasSelectBaseFactor1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectBaseFactor2" />
                     <Image x:Name="HasSelectBaseFactor3" />
@@ -267,13 +336,6 @@
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label
-                        Margin="18,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                        FontSize="20"
-                        FontWeight="Bold" />
                     <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectFactor2" />
                     <Image x:Name="HasSelectFactor3" />
@@ -289,7 +351,7 @@
                             <EventSetter Event="MouseLeftButtonDown" Handler="CancelCommander_MouseDown" />
                         </Style>
                     </StackPanel.Resources>
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+
                     <Image x:Name="HasSelectCommander1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectCommander2" />
                     <TextBlock
@@ -307,5 +369,44 @@
                     Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
             </Grid>
         </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="6"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs
index d400cbc..a4f88d2 100644
--- a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs
@@ -6,6 +6,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace LiaoTian_Cup
@@ -22,10 +23,12 @@ public partial class DoublesModeWindow : Page, INotifyPropertyChanged
         private List<Image> hasSelectFactor = new List<Image>();
         private List<Image> hasSelectCommander = new List<Image>(2);
         private Image hasSelectMap = new Image();
+        
 
 
         //初始化工具
         readonly RandomKit rk = new RandomKit();
+        readonly ImageToGray itg = new();
         string factorDir = Dictionary.FilePath.factorDir;
         string mapDir = Dictionary.FilePath.mapDir;
         string commanderDir = Dictionary.FilePath.commanderDir;
@@ -117,6 +120,13 @@ public void ResetFunc()
             hasSelectMap = new Image();
             ClearRandomMaps();
             FlashHasSelectMap();
+
+            MapLabel.Foreground = Brushes.Black;
+            NegativeLabel.Foreground = Brushes.Black;
+            MultilineLabel.Foreground = Brushes.Black;
+            FreeLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
         //开始随机事件响应
@@ -155,6 +165,7 @@ private void ShowRandomMaps()
             MapName1.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[0]]);
             MapName2.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[1]]);
             MapName3.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[2]]);
+            MapLabel.Foreground = Brushes.Red;
         }
 
         //点击地图图片事件响应
@@ -209,6 +220,7 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
                 Warn.Text = Dictionary.I18n.Lang.ResourceManager.GetString("MapWarn");
                 return;
             }
+            MapLabel.Foreground = Brushes.Gray;
             SetRandMapEnable(false);
             ShowBaseNegativeFactor();
             ShowBaseMultiFactor();
@@ -225,6 +237,8 @@ private void ShowBaseNegativeFactor()
             NegativeFactor4.Source = new BitmapImage(new Uri(factorDir + FileData.baseNegativeFactorInfo[3] + ".png", UriKind.Relative));
             NegativeFactor5.Source = new BitmapImage(new Uri(factorDir + FileData.baseNegativeFactorInfo[4] + ".png", UriKind.Relative));
             NegativeFactor6.Source = new BitmapImage(new Uri(factorDir + FileData.baseNegativeFactorInfo[5] + ".png", UriKind.Relative));
+
+            NegativeLabel.Foreground = Brushes.Red;
         }
 
         //多线因子显示
@@ -235,6 +249,8 @@ private void ShowBaseMultiFactor()
             MultiFactor3.Source = new BitmapImage(new Uri(factorDir + FileData.baseMultiFactorInfo[2] + ".png", UriKind.Relative));
             MultiFactor4.Source = new BitmapImage(new Uri(factorDir + FileData.baseMultiFactorInfo[3] + ".png", UriKind.Relative));
             MultiFactor5.Source = new BitmapImage(new Uri(factorDir + FileData.baseMultiFactorInfo[4] + ".png", UriKind.Relative));
+
+            MultilineLabel.Foreground = Brushes.Red;
         }
 
         //点击基础因子(正面和多面)图片事件响应
@@ -296,6 +312,8 @@ private void Button_BaseConfirm_Click(Object sender, RoutedEventArgs e)
                 Warn.Text = Dictionary.I18n.Lang.ResourceManager.GetString("BaseMutatorsWarn");
                 return;
             }
+            NegativeLabel.Foreground = Brushes.Gray;
+            MultilineLabel.Foreground = Brushes.Gray;
             SetBaseFactorEnable(false);
             ShowRandomFactor();
             RandomCommanderInfo();
@@ -351,6 +369,8 @@ private void ShowRandomFactor()
                 SelectFactor7.Source = new BitmapImage(new Uri(factorDir + factorListClone[randNum[6]] + ".png", UriKind.Relative));
                 SelectFactor8.Source = new BitmapImage(new Uri(factorDir + factorListClone[randNum[7]] + ".png", UriKind.Relative));
             }
+
+            FreeLabel.Foreground = Brushes.Red;
         }
 
         //点击自选因子事件响应
@@ -437,6 +457,9 @@ private void RandomCommanderInfo()
             AfterCommander2.Source = new BitmapImage(new Uri(commanderDir + FileData.afterCommanderInfo[afterRandNum[1]] + ".png", UriKind.Relative));
             AfterCommander3.Source = new BitmapImage(new Uri(commanderDir + FileData.afterCommanderInfo[afterRandNum[2]] + ".png", UriKind.Relative));
             AfterCommander4.Source = new BitmapImage(new Uri(commanderDir + FileData.afterCommanderInfo[afterRandNum[3]] + ".png", UriKind.Relative));
+
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
         }
 
         //点击自选指挥官事件响应
@@ -606,9 +629,6 @@ private void clearRandomCommander()
         }
 
 
-
-
-
         //实现绑定响应接口
         private void RaisePropertyChanged(string propertyName)
         {

From 6c84044614e67f7b75b1a635d3367f381f12ebcf Mon Sep 17 00:00:00 2001
From: B1ackSand <peilanfengfeng@gmail.com>
Date: Fri, 6 Oct 2023 18:18:32 +0800
Subject: [PATCH 4/6] Hub's/rand's mode ui modify; Change database;

---
 LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs |   2 +-
 LiaoTian_Cup/Dictionary/I18n/Lang.resx        |   2 +-
 LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs   |   1 -
 LiaoTian_Cup/Mode/HubModeWindow.xaml          | 342 ++++++++++++------
 LiaoTian_Cup/Mode/HubModeWindow.xaml.cs       |  24 +-
 LiaoTian_Cup/Mode/RandomMutationWindow.xaml   | 266 ++++++++++----
 .../Mode/RandomMutationWindow.xaml.cs         |  10 +-
 LiaoTian_Cup/Resources/database.db            | Bin 32768 -> 32768 bytes
 8 files changed, 453 insertions(+), 194 deletions(-)

diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
index 91d91a6..01b2003 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
@@ -340,7 +340,7 @@ public static string MultilineMutators {
         }
         
         /// <summary>
-        ///   查找类似 Weekly mutation name: 的本地化字符串。
+        ///   查找类似 Weekly mutation: 的本地化字符串。
         /// </summary>
         public static string MutationName {
             get {
diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.resx b/LiaoTian_Cup/Dictionary/I18n/Lang.resx
index 423fbbb..be29e3d 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.resx
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.resx
@@ -136,7 +136,7 @@
     <value>Player(s): </value>
   </data>
   <data name="MutationName" xml:space="preserve">
-    <value>Weekly mutation name:</value>
+    <value>Weekly mutation:</value>
   </data>
   <data name="MapName" xml:space="preserve">
     <value>Map name:</value>
diff --git a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs
index a4f88d2..b0a8314 100644
--- a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs
@@ -28,7 +28,6 @@ public partial class DoublesModeWindow : Page, INotifyPropertyChanged
 
         //初始化工具
         readonly RandomKit rk = new RandomKit();
-        readonly ImageToGray itg = new();
         string factorDir = Dictionary.FilePath.factorDir;
         string mapDir = Dictionary.FilePath.mapDir;
         string commanderDir = Dictionary.FilePath.commanderDir;
diff --git a/LiaoTian_Cup/Mode/HubModeWindow.xaml b/LiaoTian_Cup/Mode/HubModeWindow.xaml
index cc49428..f03f1ab 100644
--- a/LiaoTian_Cup/Mode/HubModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/HubModeWindow.xaml
@@ -19,7 +19,7 @@
     </Page.Resources>
 
 
-    <Grid ShowGridLines="True">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
@@ -27,51 +27,80 @@
             <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Margin="0,10,10,0"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <ComboBox
-                x:Name="ModeBox"
-                Width="130"
-                IsEditable="False"
-                Style="{StaticResource BaseComboBox}"
-                Text="{Binding Path=modeName}">
-                <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-                <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-            </ComboBox>
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+        <Grid>
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="190"
+                    Margin="0,0,0,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="20,10,10,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <ComboBox
+                    x:Name="ModeBox"
+                    Width="130"
+                    IsEditable="False"
+                    Style="{StaticResource BaseComboBox}"
+                    Text="{Binding Path=modeName}">
+                    <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                    <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                </ComboBox>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
                 x:Name="RandStartBtn"
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="6">
             <Button
                 Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
+
 
         <Grid Grid.Row="1">
+            <Label x:Name="MapLabel" Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            Grid.ColumnSpan="6">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource MapImg}" TargetType="Image">
@@ -83,10 +112,7 @@
                         <Setter Property="Margin" Value="5,10,0,0" />
                     </Style>
                 </StackPanel.Resources>
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
+
                 <StackPanel>
                     <Image
                         x:Name="MapImg1"
@@ -111,90 +137,118 @@
                 Content="{Binding [ConfirmMapBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
 
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="2" Grid.ColumnSpan="2">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="2*" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <Grid.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Base_MouseDown" />
-                    </Style>
-                </Grid.Resources>
-
-                <Grid
-                    Grid.Row="0"
-                    Margin="0,12,0,0"
-                    VerticalAlignment="Top">
-                    <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-
-                            <Grid Row="0">
-                                <StackPanel Orientation="Horizontal">
-                                    <Image x:Name="NegativeFactor1" Margin="0,0,0,0" />
-                                    <Image x:Name="NegativeFactor2" />
-                                    <Image x:Name="NegativeFactor3" />
-                                    <Image x:Name="NegativeFactor4" />
-                                    <Image x:Name="NegativeFactor5" />
-                                </StackPanel>
-                            </Grid>
-                            <Grid Margin="0,15,0,0" Row="1">
-                                <StackPanel Orientation="Horizontal">
-                                    <Image x:Name="NegativeFactor6" Margin="0,0,0,0" />
-                                    <Image x:Name="NegativeFactor7" />
-                                    <Image x:Name="NegativeFactor8" />
-                                    <Image x:Name="NegativeFactor9" />
-                                    <Image x:Name="NegativeFactor10" />
-                                    <Image x:Name="NegativeFactor11" />
-                                    <Image x:Name="NegativeFactor12" />
-                                    <Image x:Name="NegativeFactor13" />
-                                    <Image x:Name="NegativeFactor14" />
-                                </StackPanel>
-
-                            </Grid>
 
-                        </Grid>
-
-                    </StackPanel>
+                <Grid Grid.Row="0">
+                    <Label x:Name="NegativeLabel" Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}" />
                 </Grid>
 
                 <Grid Grid.Row="1">
-                    <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
-                        <Image x:Name="MultiFactor1" Margin="0,0,0,0" />
-                        <Image x:Name="MultiFactor2" />
-                        <Image x:Name="MultiFactor3" />
-                        <Image x:Name="MultiFactor4" />
-                        <Image x:Name="MultiFactor5" />
-                        <Image x:Name="MultiFactor6" />
-                        <Image x:Name="MultiFactor7" />
-                        <Image x:Name="MultiFactor8" />
-                        <Image x:Name="MultiFactor9" />
-                    </StackPanel>
-                    <Button
-                        x:Name="BaseConfirmBtn"
-                        Margin="0,0,20,0"
-                        Click="Button_BaseConfirm_Click"
-                        Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
-                        IsEnabled="False" />
+                    <Label x:Name="MultilineLabel" Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}" />
                 </Grid>
+            </Grid>
+        </Grid>
+        <Grid
+            Grid.Row="2"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="2*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid.Resources>
+                <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                    <EventSetter Event="MouseLeftButtonDown" Handler="Base_MouseDown" />
+                </Style>
+            </Grid.Resources>
+
+            <Grid
+                Grid.Row="0"
+                Margin="0,12,0,0"
+                VerticalAlignment="Top">
+                <StackPanel Orientation="Horizontal">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+
+                        <Grid Row="0">
+                            <StackPanel Orientation="Horizontal">
+                                <Image x:Name="NegativeFactor1" Margin="0,0,0,0" />
+                                <Image x:Name="NegativeFactor2" />
+                                <Image x:Name="NegativeFactor3" />
+                                <Image x:Name="NegativeFactor4" />
+                                <Image x:Name="NegativeFactor5" />
+                            </StackPanel>
+                        </Grid>
+                        <Grid Margin="0,15,0,0" Row="1">
+                            <StackPanel Orientation="Horizontal">
+                                <Image x:Name="NegativeFactor6" Margin="0,0,0,0" />
+                                <Image x:Name="NegativeFactor7" />
+                                <Image x:Name="NegativeFactor8" />
+                                <Image x:Name="NegativeFactor9" />
+                                <Image x:Name="NegativeFactor10" />
+                                <Image x:Name="NegativeFactor11" />
+                                <Image x:Name="NegativeFactor12" />
+                                <Image x:Name="NegativeFactor13" />
+                                <Image x:Name="NegativeFactor14" />
+                            </StackPanel>
+                        </Grid>
+                    </Grid>
+                </StackPanel>
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <StackPanel Orientation="Horizontal">
+
+                    <Image x:Name="MultiFactor1" Margin="0,0,0,0" />
+                    <Image x:Name="MultiFactor2" />
+                    <Image x:Name="MultiFactor3" />
+                    <Image x:Name="MultiFactor4" />
+                    <Image x:Name="MultiFactor5" />
+                    <Image x:Name="MultiFactor6" />
+                    <Image x:Name="MultiFactor7" />
+                    <Image x:Name="MultiFactor8" />
+                    <Image x:Name="MultiFactor9" />
+                </StackPanel>
+            </Grid>
+        </Grid>
+        <Grid Grid.Row="2" Grid.Column="6">
+            <Button
+                x:Name="BaseConfirmBtn"
+                Margin="0,0,20,0"
+                Click="Button_BaseConfirm_Click"
+                Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
+                IsEnabled="False" />
+        </Grid>
+
+        <Grid Grid.Row="3" Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="0">
+                <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
 
+            <Grid Grid.Row="1">
+                <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
             </Grid>
         </Grid>
 
-        <Grid Grid.Row="3">
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="5">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
                 <RowDefinition Height="*" />
@@ -208,7 +262,6 @@
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
                     <Image x:Name="SelectFactor2" />
                     <Image x:Name="SelectFactor3" />
@@ -228,14 +281,16 @@
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
                     <Image x:Name="BeforeCommander2" />
                     <Image x:Name="BeforeCommander3" />
                     <Image x:Name="BeforeCommander4" />
                     <Image x:Name="BeforeCommander5" />
                     <Image x:Name="BeforeCommander6" />
-                    <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                    <Label
+                        x:Name="NewCmdrLabel"
+                        Margin="18,0,0,0"
+                        Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
                     <Image x:Name="AfterCommander2" />
                     <Image x:Name="AfterCommander3" />
@@ -244,7 +299,28 @@
             </Grid>
         </Grid>
 
-        <Grid Grid.Row="4">
+        <Grid Grid.Row="4" Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="100" />
+                <RowDefinition Height="100" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="0">
+                <Label Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+            <Grid Grid.Row="1">
+                <Label Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+            <Grid Grid.Row="2">
+                <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="2"
+            Grid.ColumnSpan="5">
             <Grid.RowDefinitions>
                 <RowDefinition Height="100" />
                 <RowDefinition Height="100" />
@@ -260,7 +336,6 @@
                     Y1="0"
                     Y2="0" />
                 <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image
                         x:Name="HasSelectMap"
                         Margin="10,0,0,0"
@@ -285,7 +360,6 @@
                             </Style>
                         </StackPanel.Resources>
 
-                        <Label Margin="18,0,0,0" Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="HasSelectBaseFactor1" Margin="0,0,0,0" />
                         <Image x:Name="HasSelectBaseFactor2" />
                         <Image x:Name="HasSelectBaseFactor3" />
@@ -298,13 +372,7 @@
                             </Style>
                         </StackPanel.Resources>
 
-                        <Label
-                            Margin="18,0,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            FontSize="20"
-                            FontWeight="Bold" />
+                        <Label Margin="18,0,0,0" Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
                         <Image x:Name="HasSelectFactor2" />
                         <Image x:Name="HasSelectFactor3" />
@@ -312,19 +380,15 @@
                         <Image x:Name="HasSelectFactor5" />
                     </StackPanel>
                 </StackPanel>
-
             </Grid>
 
-            <Grid Grid.Row="2" />
-
-            <Grid Grid.Row="3">
+            <Grid Grid.Row="2">
                 <StackPanel Orientation="Horizontal">
                     <StackPanel.Resources>
                         <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                             <EventSetter Event="MouseLeftButtonDown" Handler="CancelCommander_MouseDown" />
                         </Style>
                     </StackPanel.Resources>
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="HasSelectCommander1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectCommander2" />
                     <TextBlock
@@ -342,5 +406,43 @@
                     Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
             </Grid>
         </Grid>
+        <Grid
+            Grid.Row="4"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="6"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs b/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs
index c56abe9..a48611f 100644
--- a/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs
@@ -3,18 +3,11 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Force.DeepCloner;
 
 namespace LiaoTian_Cup.Mode
@@ -126,6 +119,13 @@ public void ResetFunc()
             hasSelectMap = new Image();
             ClearRandomMaps();
             FlashHasSelectMap();
+
+            MapLabel.Foreground = Brushes.Black;
+            NegativeLabel.Foreground = Brushes.Black;
+            MultilineLabel.Foreground = Brushes.Black;
+            FreeLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
         //开始随机事件响应
@@ -164,6 +164,7 @@ private void ShowRandomMaps()
             MapName1.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[0]]);
             MapName2.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[1]]);
             MapName3.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[2]]);
+            MapLabel.Foreground = Brushes.Red;
         }
 
         //点击地图图片事件响应
@@ -218,6 +219,7 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
                 Warn.Text = Dictionary.I18n.Lang.ResourceManager.GetString("MapWarn");
                 return;
             }
+            MapLabel.Foreground = Brushes.Gray;
             SetRandMapEnable(false);
             ShowBaseNegativeFactor();
             ShowBaseMultiFactor();
@@ -227,6 +229,7 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
         //正面因子显示
         private void ShowBaseNegativeFactor()
         {
+            NegativeLabel.Foreground = Brushes.Red;
             //相对路径URI指定因子图片来源
             NegativeFactor1.Source = new BitmapImage(new Uri(factorDir + FileData.hubNegativeFactorInfo[0] + ".png", UriKind.Relative));
             NegativeFactor2.Source = new BitmapImage(new Uri(factorDir + FileData.hubNegativeFactorInfo[1] + ".png", UriKind.Relative));
@@ -247,6 +250,7 @@ private void ShowBaseNegativeFactor()
         //多线因子显示
         private void ShowBaseMultiFactor()
         {
+            MultilineLabel.Foreground = Brushes.Red;
             MultiFactor1.Source = new BitmapImage(new Uri(factorDir + FileData.hubMultiFactorInfo[0] + ".png", UriKind.Relative));
             MultiFactor2.Source = new BitmapImage(new Uri(factorDir + FileData.hubMultiFactorInfo[1] + ".png", UriKind.Relative));
             MultiFactor3.Source = new BitmapImage(new Uri(factorDir + FileData.hubMultiFactorInfo[2] + ".png", UriKind.Relative));
@@ -317,9 +321,15 @@ private void Button_BaseConfirm_Click(Object sender, RoutedEventArgs e)
                 Warn.Text = Dictionary.I18n.Lang.ResourceManager.GetString("BaseMutatorsWarn");
                 return;
             }
+            NegativeLabel.Foreground = Brushes.Gray;
+            MultilineLabel.Foreground = Brushes.Gray;
+
             SetBaseFactorEnable(false);
             ShowRandomFactor();
             RandomCommanderInfo();
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
+            FreeLabel.Foreground = Brushes.Red;
         }
 
         //刷新已选基础因子事件
diff --git a/LiaoTian_Cup/Mode/RandomMutationWindow.xaml b/LiaoTian_Cup/Mode/RandomMutationWindow.xaml
index a050e55..77a0108 100644
--- a/LiaoTian_Cup/Mode/RandomMutationWindow.xaml
+++ b/LiaoTian_Cup/Mode/RandomMutationWindow.xaml
@@ -20,7 +20,7 @@
         <Style BasedOn="{StaticResource BaseTextBox}" TargetType="TextBox" />
     </Page.Resources>
 
-    <Grid ShowGridLines="True">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="80" />
             <RowDefinition Height="100" />
@@ -29,72 +29,130 @@
             <RowDefinition Height="120" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <CheckBox
-                x:Name="ChkDoubles"
-                Content="{Binding [DoublesMode], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isDoubles, Mode=TwoWay}" />
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+        <Grid Grid.Column="0">
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="230"
+                    Margin="0,0,10,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="0,10,0,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <CheckBox
+                    x:Name="ChkDoubles"
+                    Margin="0,10,0,0"
+                    Content="{Binding [DoublesMode], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isDoubles, Mode=TwoWay}" />
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="3">
             <Button
-                Margin="10,0,35,0"
+                x:Name="RandStartBtn"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
-                Margin="0,0,35,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
-                Margin="0,0,35,0"
+                Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="2">
+            <Label Content="{Binding [MutationName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
 
+        <Grid Grid.Row="1" Grid.Column="2">
+            <TextBox
+                x:Name="MutationBox"
+                Width="360"
+                HorizontalAlignment="Left"
+                TextWrapping="Wrap" />
+        </Grid>
 
+        <Grid Grid.Row="1" Grid.Column="3">
+            <Label Content="{Binding [MapName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
 
-        <Grid Grid.Row="1">
-            <StackPanel Orientation="Horizontal">
-                <Label Margin="30,0,0,0" Content="{Binding [MutationName], Source={x:Static local:LanguageManager.Instance}}" />
-                <TextBox
-                    x:Name="MutationBox"
-                    Width="367"
-                    TextWrapping="Wrap" />
-                <Label Margin="50,0,0,0" Content="{Binding [MapName], Source={x:Static local:LanguageManager.Instance}}" />
-                <TextBox x:Name="MapBox" Width="217" />
-            </StackPanel>
+        <Grid
+            Grid.Row="1"
+            Grid.Column="4"
+            Grid.ColumnSpan="2">
+            <TextBox
+                x:Name="MapBox"
+                Width="240"
+                HorizontalAlignment="Left" />
         </Grid>
 
-        <Grid Grid.Row="2">
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="2">
+            <Label Content="{Binding [BaseMutator], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Row="2" Grid.Column="2">
             <StackPanel Orientation="Horizontal">
-                <Label Margin="30,0,0,0" Content="{Binding [BaseMutator], Source={x:Static local:LanguageManager.Instance}}" />
                 <Image x:Name="Factor1" Margin="0,0,0,0" />
                 <Image x:Name="Factor2" />
                 <Image x:Name="Factor3" />
-                <Image
-                    x:Name="MapImg"
-                    Margin="115,0,0,0"
-                    RenderTransformOrigin="0.5,0.5"
-                    Style="{StaticResource MapImg}" />
             </StackPanel>
         </Grid>
 
-        <Grid Grid.Row="3">
+        <Grid
+            Grid.Row="2"
+            Grid.Column="3"
+            Grid.ColumnSpan="3">
+            <Image
+                x:Name="MapImg"
+                Margin="0,0,90,0"
+                RenderTransformOrigin="0.5,0.5"
+                Style="{StaticResource MapImg}" />
+        </Grid>
+
+        <Grid Grid.Row="3" Grid.ColumnSpan="2">
+            <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="3">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
@@ -102,7 +160,6 @@
                     </Style>
                 </StackPanel.Resources>
 
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
                 <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
                 <Image x:Name="SelectFactor2" />
                 <Image x:Name="SelectFactor3" />
@@ -113,36 +170,99 @@
                 <Image x:Name="SelectFactor8" />
             </StackPanel>
         </Grid>
-        <Grid Grid.Row="4">
+
+        <Grid Grid.Row="4" Grid.ColumnSpan="2">
+            <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Row="4" Grid.Column="2">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                         <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
                     </Style>
                 </StackPanel.Resources>
-
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
                 <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
                 <Image x:Name="BeforeCommander2" />
                 <Image x:Name="BeforeCommander3" />
                 <Image x:Name="BeforeCommander4" />
                 <Image x:Name="BeforeCommander5" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+            </StackPanel>
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="3"
+            Grid.ColumnSpan="2">
+            <Label
+                x:Name="NewCmdrLabel"
+                HorizontalAlignment="Left"
+                Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="4"
+            Grid.ColumnSpan="2">
+            <StackPanel Orientation="Horizontal">
+                <StackPanel.Resources>
+                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                    </Style>
+                </StackPanel.Resources>
+                <Image x:Name="AfterCommander1" Margin="40,0,0,0" />
                 <Image x:Name="AfterCommander2" />
                 <Image x:Name="AfterCommander3" />
             </StackPanel>
         </Grid>
-        <Grid Grid.Row="5">
-            <StackPanel>
-                <StackPanel Margin="0,18,0,0" Orientation="Horizontal">
+
+        <Grid Grid.Row="5" Grid.ColumnSpan="7">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="240" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Grid Row="0">
+                <Label Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Row="1">
+                <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid ColumnSpan="2" Row="2">
+                <Label
+                    Margin="30,0,0,30"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="bottom"
+                    Content="{Binding [RandomMutationTip], Source={x:Static local:LanguageManager.Instance}}"
+                    FontSize="16" />
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="5"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="0">
+                <StackPanel Orientation="Horizontal">
                     <StackPanel.Resources>
                         <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                             <EventSetter Event="MouseLeftButtonDown" Handler="CancelFactor_MouseDown" />
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectFactor2" />
                     <Image x:Name="HasSelectFactor3" />
@@ -152,16 +272,16 @@
                     <Image x:Name="HasSelectFactor7" />
                     <Image x:Name="HasSelectFactor8" />
                 </StackPanel>
+            </Grid>
 
-
-                <StackPanel Margin="0,58,0,0" Orientation="Horizontal">
+            <Grid Grid.Row="1">
+                <StackPanel Orientation="Horizontal">
                     <StackPanel.Resources>
                         <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                             <EventSetter Event="MouseLeftButtonDown" Handler="CancelCommander_MouseDown" />
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="HasSelectCommander1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectCommander2" />
                     <TextBlock
@@ -173,19 +293,41 @@
                         Foreground="Red"
                         Text="" />
                 </StackPanel>
-            </StackPanel>
+            </Grid>
+        </Grid>
 
-            <Label
-                Margin="18,0,0,30"
-                VerticalAlignment="bottom"
-                Content="{Binding [RandomMutationTip], Source={x:Static local:LanguageManager.Instance}}"
-                FontSize="16" />
+        <Grid Grid.Row="5" Grid.Column="5">
             <Button
-                Margin="0,0,33,28"
-                HorizontalAlignment="Right"
+                Margin="0,0,20,28"
                 VerticalAlignment="Bottom"
                 Click="Button_Confirm_Click"
                 Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="5"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="6"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/RandomMutationWindow.xaml.cs b/LiaoTian_Cup/Mode/RandomMutationWindow.xaml.cs
index da713c0..3704bff 100644
--- a/LiaoTian_Cup/Mode/RandomMutationWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/RandomMutationWindow.xaml.cs
@@ -5,6 +5,7 @@
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace LiaoTian_Cup
@@ -90,6 +91,9 @@ private void RandomMutationFunc()
             Random8Factor(randMutationInfo);
             //随机先出和后出指挥官
             RandomCommanderInfo();
+            FreeLabel.Foreground = Brushes.Red;
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
         }
 
         //随机8因子选择处理逻辑
@@ -137,7 +141,6 @@ private void RandomCommanderInfo()
         }
 
         
-        
         //是否随机AI的处理逻辑
         private string IsRandAIFunc()
         {
@@ -151,7 +154,6 @@ private string IsRandAIFunc()
         }
 
         
-
         //开始随机事件响应
         private void Button_Random_Click(object sender, RoutedEventArgs e)
         {
@@ -341,6 +343,10 @@ public void ResetFunc()
             AfterCommander1.Source = new BitmapImage();
             AfterCommander2.Source = new BitmapImage();
             AfterCommander3.Source = new BitmapImage();
+
+            FreeLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
         //实现绑定响应接口
diff --git a/LiaoTian_Cup/Resources/database.db b/LiaoTian_Cup/Resources/database.db
index 78a231ccd5b8ced0ec4f7216e45ba90b197ca45e..82680eef8dabcc57492c198a1554324c1642602a 100644
GIT binary patch
delta 28
kcmZo@U}|V!njp=%c%qCm<Km48iR{czc1+uRgx#hB0FlB9$N&HU

delta 28
kcmZo@U}|V!njp>CJW<A(v3X-cB0KZbJ^h=Hu-jAs0F9gqh5!Hn


From b4fd8516aff96a64f2175a9c87fc88206a54e8e8 Mon Sep 17 00:00:00 2001
From: B1ackSand <peilanfengfeng@gmail.com>
Date: Fri, 6 Oct 2023 21:38:02 +0800
Subject: [PATCH 5/6] Modify ui.

---
 LiaoTian_Cup/Mode/DoublesModeWindow.xaml      |  12 +-
 LiaoTian_Cup/Mode/NegativeFactorWindow.xaml   | 282 +++++++++++----
 .../Mode/NegativeFactorWindow.xaml.cs         |  18 +
 LiaoTian_Cup/Mode/SingleModeWindow.xaml       | 300 +++++++++++-----
 LiaoTian_Cup/Mode/SingleModeWindow.xaml.cs    |  12 +
 LiaoTian_Cup/Mode/USuckModeWindow.xaml        | 332 ++++++++++++------
 LiaoTian_Cup/Mode/USuckModeWindow.xaml.cs     |  18 +
 7 files changed, 721 insertions(+), 253 deletions(-)

diff --git a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
index beb994e..1a9990c 100644
--- a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
@@ -6,7 +6,7 @@
     xmlns:local="clr-namespace:LiaoTian_Cup.Dictionary.I18n"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="1180"
-    Height="890"
+    Height="880"
     Background="#ACFFFFFF"
     mc:Ignorable="d">
 
@@ -371,12 +371,12 @@
         </Grid>
 
         <Grid
-            Grid.Row="4"
+            Grid.Row="2"
             Grid.Column="0"
             Grid.ColumnSpan="7">
             <Line
                 Stroke="Gray"
-                StrokeThickness="6"
+                StrokeThickness="1"
                 X1="0"
                 X2="1180"
                 Y1="0"
@@ -384,7 +384,7 @@
         </Grid>
 
         <Grid
-            Grid.Row="2"
+            Grid.Row="3"
             Grid.Column="0"
             Grid.ColumnSpan="7">
             <Line
@@ -397,12 +397,12 @@
         </Grid>
 
         <Grid
-            Grid.Row="3"
+            Grid.Row="4"
             Grid.Column="0"
             Grid.ColumnSpan="7">
             <Line
                 Stroke="Gray"
-                StrokeThickness="1"
+                StrokeThickness="6"
                 X1="0"
                 X2="1180"
                 Y1="0"
diff --git a/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml b/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml
index df98520..ad06a81 100644
--- a/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml
+++ b/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml
@@ -17,7 +17,7 @@
         <Style BasedOn="{StaticResource BaseTextBox}" TargetType="TextBox" />
     </Page.Resources>
 
-    <Grid ShowGridLines="True">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="80" />
             <RowDefinition Height="140" />
@@ -26,52 +26,80 @@
             <RowDefinition Height="120" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Margin="0,10,10,0"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <ComboBox
-                x:Name="ModeBox"
-                Width="130"
-                IsEditable="False"
-                Style="{StaticResource BaseComboBox}"
-                Text="{Binding Path=modeName}">
-                <ComboBoxItem Content="{Binding [ThreeMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-                <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-            </ComboBox>
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+        <Grid>
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="190"
+                    Margin="0,0,0,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="20,10,10,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <ComboBox
+                    x:Name="ModeBox"
+                    Width="130"
+                    IsEditable="False"
+                    Style="{StaticResource BaseComboBox}"
+                    Text="{Binding Path=modeName}">
+                    <ComboBoxItem Content="{Binding [ThreeMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                    <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                </ComboBox>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="3">
             <Button
                 x:Name="RandStartBtn"
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
                 Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
 
 
         <Grid Grid.Row="1">
+            <Label x:Name="MapLabel" Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            Grid.ColumnSpan="5">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource MapImg}" TargetType="Image">
@@ -84,41 +112,45 @@
                     </Style>
                 </StackPanel.Resources>
 
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
                 <StackPanel>
-                    <Image x:Name="MapImg1" Margin="0,10,0,0" />
+                    <Image
+                        x:Name="MapImg1"
+                        Margin="0,10,0,0"
+                        RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName1" Margin="0,10,0,0" />
                 </StackPanel>
                 <StackPanel>
-                    <Image x:Name="MapImg2" />
+                    <Image x:Name="MapImg2" RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName2" />
                 </StackPanel>
                 <StackPanel>
-                    <Image x:Name="MapImg3" />
+                    <Image x:Name="MapImg3" RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName3" />
                 </StackPanel>
             </StackPanel>
             <Button
                 x:Name="MapConfirmBtn"
                 Margin="0,0,20,0"
+                HorizontalAlignment="Right"
                 Click="Button_MapConfirm_Click"
                 Content="{Binding [ConfirmMapBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
 
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="2" Grid.ColumnSpan="2">
+            <Label x:Name="BaseLabel" Content="{Binding [BaseMutator], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="2"
+            Grid.ColumnSpan="2">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                         <EventSetter Event="MouseLeftButtonDown" Handler="Base_MouseDown" />
                     </Style>
                 </StackPanel.Resources>
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [BaseMutator], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
+
                 <Image x:Name="Factor1" Margin="0,0,0,0" />
                 <Image x:Name="Factor2" />
                 <Image x:Name="Factor3" />
@@ -126,23 +158,32 @@
                 <Image x:Name="Factor5" />
                 <Image x:Name="Factor6" />
             </StackPanel>
+        </Grid>
+
+        <Grid Grid.Row="2" Grid.Column="5">
             <Button
                 x:Name="BaseConfirmBtn"
                 Margin="0,0,20,0"
-                HorizontalAlignment="Right"
                 Click="Button_BaseConfirm_Click"
                 Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
                 IsEnabled="False" />
         </Grid>
 
-        <Grid Grid.Row="3">
+        <Grid Grid.Row="3" Grid.ColumnSpan="2">
+            <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="3">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                         <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
                     </Style>
                 </StackPanel.Resources>
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+
                 <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
                 <Image x:Name="SelectFactor2" />
                 <Image x:Name="SelectFactor3" />
@@ -154,7 +195,11 @@
             </StackPanel>
         </Grid>
 
-        <Grid Grid.Row="4">
+        <Grid Grid.Row="4" Grid.ColumnSpan="2">
+            <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Row="4" Grid.Column="2">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
@@ -162,27 +207,79 @@
                     </Style>
                 </StackPanel.Resources>
 
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
                 <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
                 <Image x:Name="BeforeCommander2" />
                 <Image x:Name="BeforeCommander3" />
                 <Image x:Name="BeforeCommander4" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+            </StackPanel>
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="2"
+            Grid.ColumnSpan="2">
+            <Label
+                x:Name="NewCmdrLabel"
+                Margin="0,0,50,0"
+                HorizontalAlignment="Right"
+                HorizontalContentAlignment="Right"
+                Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+        <Grid
+            Grid.Row="4"
+            Grid.Column="3"
+            Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <StackPanel.Resources>
+                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                    </Style>
+                </StackPanel.Resources>
+
+                <Image x:Name="AfterCommander1" Margin="150,0,0,0" />
                 <Image x:Name="AfterCommander2" />
                 <Image x:Name="AfterCommander3" />
                 <Image x:Name="AfterCommander4" />
             </StackPanel>
         </Grid>
 
-        <Grid Grid.Row="5">
-            <StackPanel>
+        <Grid Grid.Row="5" Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="0">
+                <Label Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <Label Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="2">
+                <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="5"
+            Grid.Column="2"
+            Grid.ColumnSpan="3">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Grid Grid.ColumnSpan="2">
                 <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
-                    <Image
-                        x:Name="HasSelectMap"
-                        Margin="10,15,0,0"
-                        Style="{StaticResource MapImg}" />
+                    <Image x:Name="HasSelectMap" Style="{StaticResource MapImg}" />
                     <TextBlock
                         x:Name="MapTip"
                         Margin="50,10,0,0"
@@ -192,30 +289,46 @@
                         Foreground="Red"
                         Text="" />
                 </StackPanel>
-                <StackPanel Margin="0,30,0,0" Orientation="Horizontal">
+            </Grid>
+
+            <Grid Grid.Row="1" Grid.ColumnSpan="2">
+                <StackPanel Orientation="Horizontal">
                     <StackPanel.Resources>
                         <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image" />
                     </StackPanel.Resources>
 
-                    <!--  此处单独处理事件Handler  -->
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image
                         x:Name="HasSelectBaseFactor1"
                         Margin="0,0,0,0"
                         MouseLeftButtonDown="CancelBase_MouseDown" />
                     <Image x:Name="HasSelectBaseFactor2" MouseLeftButtonDown="CancelBase_MouseDown" />
-                    <Label Margin="30,0,0,0" Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </StackPanel>
+                <Label
+                    Margin="0,0,50,0"
+                    HorizontalAlignment="Right"
+                    HorizontalContentAlignment="Right"
+                    Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid
+                Grid.Row="1"
+                Grid.Column="1"
+                Grid.ColumnSpan="2">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image" />
+                    </StackPanel.Resources>
+
                     <Image
                         x:Name="HasSelectFactor1"
-                        Margin="0,0,0,0"
+                        Margin="150,0,0,0"
                         MouseLeftButtonDown="CancelFactor_MouseDown" />
                     <Image x:Name="HasSelectFactor2" MouseLeftButtonDown="CancelFactor_MouseDown" />
                     <Image x:Name="HasSelectFactor3" MouseLeftButtonDown="CancelFactor_MouseDown" />
                 </StackPanel>
-
-
-                <StackPanel Margin="0,30,0,0" Orientation="Horizontal">
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+            <Grid Grid.Row="2" Grid.ColumnSpan="3">
+                <StackPanel Orientation="Horizontal">
                     <Image
                         x:Name="HasSelectCommander"
                         Margin="0,0,0,0"
@@ -230,8 +343,10 @@
                         Foreground="Red"
                         Text="" />
                 </StackPanel>
+            </Grid>
+        </Grid>
 
-            </StackPanel>
+        <Grid Grid.Row="5" Grid.Column="5">
             <Button
                 Margin="0,0,20,30"
                 HorizontalAlignment="Right"
@@ -239,5 +354,44 @@
                 Click="Button_Confirm_Click"
                 Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
+
+        <Grid
+            Grid.Row="5"
+            Grid.Column="0"
+            Grid.ColumnSpan="6">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="5"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="6">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="6">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs b/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs
index 675d055..6e19e3f 100644
--- a/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs
@@ -6,6 +6,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace LiaoTian_Cup
@@ -133,6 +134,8 @@ private void ShowRandomMaps()
             MapName1.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[0]]);
             MapName2.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[1]]);
             MapName3.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[2]]);
+
+            MapLabel.Foreground = Brushes.Red;
         }
 
         //随机地图显示清除
@@ -167,6 +170,7 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
                 MapTip.Text = Dictionary.I18n.Lang.ResourceManager.GetString("MapWarn");
                 return;
             }
+            MapLabel.Foreground = Brushes.Gray;
             SetRandMapEnable(false);
             ShowBaseFactor();
         }
@@ -230,6 +234,7 @@ private void SetRandMapEnable(bool enable)
         //基础因子显示
         private void ShowBaseFactor()
         {
+            BaseLabel.Foreground = Brushes.Red;
             //相对路径URI指定因子图片来源
             Factor1.Source = new BitmapImage(new Uri(factorDir + FileData.baseNegativeFactorInfo[0] + ".png", UriKind.Relative));
             Factor2.Source = new BitmapImage(new Uri(factorDir + FileData.baseNegativeFactorInfo[1] + ".png", UriKind.Relative));
@@ -296,6 +301,7 @@ private void CancelBase_MouseDown(Object sender, RoutedEventArgs e)
             FlashSelectBase();
         }
 
+        // 基础因子确认按钮
         private void Button_BaseConfirm_Click(Object sender, RoutedEventArgs e)
         {
             Warn.Text = "";
@@ -309,9 +315,15 @@ private void Button_BaseConfirm_Click(Object sender, RoutedEventArgs e)
                 Warn.Text = Dictionary.I18n.Lang.ResourceManager.GetString("BaseMutatorsWarn");
                 return;
             }
+            MapLabel.Foreground = Brushes.Gray;
             SetBaseFactorEnable(false);
             ShowRandomFactor();
             RandomCommanderInfo();
+
+            BaseLabel.Foreground = Brushes.Gray;
+            FreeLabel.Foreground = Brushes.Red;
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
         }
 
         //刷新已选基础因子事件
@@ -532,6 +544,12 @@ public void ResetFunc()
             hasSelectMap = new Image();
             ClearRandomMaps();
             FlashHasSelectMap();
+
+            MapLabel.Foreground = Brushes.Black;
+            FreeLabel.Foreground = Brushes.Black;
+            BaseLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
         //实现绑定响应接口
diff --git a/LiaoTian_Cup/Mode/SingleModeWindow.xaml b/LiaoTian_Cup/Mode/SingleModeWindow.xaml
index e65a9cc..aa4bd19 100644
--- a/LiaoTian_Cup/Mode/SingleModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/SingleModeWindow.xaml
@@ -6,7 +6,7 @@
     xmlns:local="clr-namespace:LiaoTian_Cup.Dictionary.I18n"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="1180"
-    Height="910"
+    Height="880"
     Background="#ACFFFFFF"
     mc:Ignorable="d">
 
@@ -17,57 +17,85 @@
         <Style BasedOn="{StaticResource BaseTextBox}" TargetType="TextBox" />
     </Page.Resources>
 
-    <Grid ShowGridLines="True">
-
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="80" />
             <RowDefinition Height="150" />
             <RowDefinition Height="220" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Margin="0,10,10,0"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <ComboBox
-                x:Name="ModeBox"
-                Width="130"
-                IsEditable="False"
-                Style="{StaticResource BaseComboBox}"
-                Text="{Binding Path=modeName}">
-                <ComboBoxItem Content="{Binding [ThreeMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-                <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-            </ComboBox>
+        <Grid>
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="190"
+                    Margin="0,0,0,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="20,10,10,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <ComboBox
+                    x:Name="ModeBox"
+                    Width="130"
+                    IsEditable="False"
+                    Style="{StaticResource BaseComboBox}"
+                    Text="{Binding Path=modeName}">
+                    <ComboBoxItem Content="{Binding [ThreeMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                    <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                </ComboBox>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="3">
             <Button
                 x:Name="RandStartBtn"
-                Margin="55,0,35,0"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
-                Margin="0,0,35,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
-                Margin="0,0,35,0"
+                Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
 
         <Grid Grid.Row="1">
+            <Label x:Name="MapLabel" Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            Grid.ColumnSpan="5">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource MapImg}" TargetType="Image">
@@ -80,38 +108,65 @@
                     </Style>
                 </StackPanel.Resources>
 
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
                 <StackPanel>
-                    <Image x:Name="MapImg1" Margin="0,10,0,0" />
+                    <Image
+                        x:Name="MapImg1"
+                        Margin="0,10,0,0"
+                        RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName1" Margin="0,10,0,0" />
                 </StackPanel>
                 <StackPanel>
-                    <Image x:Name="MapImg2" />
+                    <Image x:Name="MapImg2" RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName2" />
                 </StackPanel>
                 <StackPanel>
-                    <Image x:Name="MapImg3" />
+                    <Image x:Name="MapImg3" RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName3" />
                 </StackPanel>
             </StackPanel>
             <Button
                 x:Name="MapConfirmBtn"
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 HorizontalAlignment="Right"
                 Click="Button_MapConfirm_Click"
                 Content="{Binding [ConfirmMapBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
-        <Grid Grid.Row="2">
+
+        <Grid Grid.Row="2" Grid.ColumnSpan="2">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <Grid Row="0">
+                    <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+
+                <Grid Grid.Row="1">
+                    <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
+
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="80" />
+                    <RowDefinition Height="*" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
 
-                <Grid Grid.Row="0">
+                <Grid Grid.Row="0" Grid.ColumnSpan="3">
                     <StackPanel Orientation="Horizontal">
                         <StackPanel.Resources>
                             <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
@@ -119,7 +174,6 @@
                                 <EventSetter Event="MouseRightButtonDown" Handler="Ban_MouseDown" />
                             </Style>
                         </StackPanel.Resources>
-                        <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
                         <Image x:Name="SelectFactor2" />
                         <Image x:Name="SelectFactor3" />
@@ -133,6 +187,21 @@
                     </StackPanel>
                 </Grid>
 
+                <Grid
+                    Grid.Row="0"
+                    Grid.Column="2"
+                    Grid.ColumnSpan="2">
+                    <TextBlock
+                        Margin="0,0,20,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        FontSize="20"
+                        FontWeight="Bold"
+                        Foreground="Red"
+                        Text="{Binding [BanTip], Source={x:Static local:LanguageManager.Instance}}"
+                        TextAlignment="Right" />
+                </Grid>
+
                 <Grid Grid.Row="1">
                     <StackPanel Orientation="Horizontal">
                         <StackPanel.Resources>
@@ -141,49 +210,85 @@
                             </Style>
                         </StackPanel.Resources>
 
-                        <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
                         <Image x:Name="BeforeCommander2" />
                         <Image x:Name="BeforeCommander3" />
                         <Image x:Name="BeforeCommander4" />
-                        <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                        <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
-                        <Image x:Name="AfterCommander2" />
                     </StackPanel>
-                    <TextBlock
-                        Margin="0,0,30,0"
+                </Grid>
+
+                <Grid ColumnSpan="2" Row="1">
+                    <Label
+                        x:Name="NewCmdrLabel"
+                        Margin="18,0,0,0"
                         HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        FontSize="20"
-                        FontWeight="Bold"
-                        Foreground="Red"
-                        Text="{Binding [BanTip], Source={x:Static local:LanguageManager.Instance}}" />
+                        HorizontalContentAlignment="Right"
+                        Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+
+                <Grid Grid.Row="1" Grid.Column="2">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
+
+                        <Image x:Name="AfterCommander1" Margin="36,0,0,0" />
+                        <Image x:Name="AfterCommander2" />
+                    </StackPanel>
                 </Grid>
             </Grid>
         </Grid>
 
-        <Grid Grid.Row="3">
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid>
+                <Label Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <Label Content="{Binding [HasBanMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="2">
+                <Label Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="3">
+                <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
             <Grid.RowDefinitions>
-                <RowDefinition Height="120" />
-                <RowDefinition Height="80" />
-                <RowDefinition Height="100" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
 
-            <Grid Grid.Row="0">
-                <Line
-                    Stroke="Gray"
-                    StrokeThickness="6"
-                    X1="0"
-                    X2="1180"
-                    Y1="0"
-                    Y2="0" />
+            <Grid Grid.Row="0" Grid.ColumnSpan="2">
                 <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
-                    <Image
-                        x:Name="HasSelectMap"
-                        Margin="10,0,0,0"
-                        Style="{StaticResource MapImg}" />
+                    <Image x:Name="HasSelectMap" Style="{StaticResource MapImg}" />
                     <TextBlock
                         x:Name="MapTip"
                         Margin="50,0,0,0"
@@ -203,7 +308,6 @@
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="18,0,0,0" Content="{Binding [HasBanMutators], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="HasSelectBanFactor1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectBanFactor2" />
                     <Image x:Name="HasSelectBanFactor3" />
@@ -228,14 +332,21 @@
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectFactor2" />
                     <Image x:Name="HasSelectFactor3" />
                     <Image x:Name="HasSelectFactor4" />
                     <Image x:Name="HasSelectFactor5" />
+                </StackPanel>
+            </Grid>
+
+            <Grid
+                Grid.Row="2"
+                Grid.Column="2"
+                Grid.ColumnSpan="2">
+                <StackPanel Orientation="Horizontal">
                     <TextBlock
-                        Margin="10,0,0,0"
+                        Margin="20,0,0,0"
                         VerticalAlignment="Center"
                         FontSize="20"
                         FontWeight="Bold"
@@ -251,21 +362,46 @@
                 </StackPanel>
             </Grid>
 
-
             <Grid Grid.Row="3">
-                <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
-                    <Image
-                        x:Name="HasSelectCommander"
-                        Margin="0,0,0,0"
-                        MouseLeftButtonDown="CancelCommander_MouseDown"
-                        Style="{StaticResource ClickableImg}" />
-                </StackPanel>
+                <Image
+                    x:Name="HasSelectCommander"
+                    Margin="0,0,0,0"
+                    MouseLeftButtonDown="CancelCommander_MouseDown"
+                    Style="{StaticResource ClickableImg}" />
+            </Grid>
+
+            <Grid Grid.Row="3" Grid.Column="3">
                 <Button
-                    Margin="0,0,30,0"
+                    Margin="0,10,20,0"
                     Click="Button_Confirm_Click"
                     Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
             </Grid>
         </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="6">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="6"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="6">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/SingleModeWindow.xaml.cs b/LiaoTian_Cup/Mode/SingleModeWindow.xaml.cs
index e650c28..dcf608e 100644
--- a/LiaoTian_Cup/Mode/SingleModeWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/SingleModeWindow.xaml.cs
@@ -7,6 +7,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace LiaoTian_Cup
@@ -129,6 +130,11 @@ public void ResetFunc()
             hasSelectMap = new Image();
             ClearRandomMaps();
             FlashHasSelectMap();
+
+            MapLabel.Foreground = Brushes.Black;
+            FreeLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
 
@@ -169,6 +175,7 @@ private void ShowRandomMaps()
             MapName1.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[0]]);
             MapName2.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[1]]);
             MapName3.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[2]]);
+            MapLabel.Foreground = Brushes.Red;
         }
 
         //点击地图图片事件响应
@@ -226,6 +233,11 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
             SetRandMapEnable(false);
             ShowRandomFactor();
             RandomCommanderInfo();
+
+            MapLabel.Foreground = Brushes.Gray;
+            FreeLabel.Foreground = Brushes.Red;
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
         }
 
         //显示最多10个随机选择因子
diff --git a/LiaoTian_Cup/Mode/USuckModeWindow.xaml b/LiaoTian_Cup/Mode/USuckModeWindow.xaml
index cf29577..cfb4d04 100644
--- a/LiaoTian_Cup/Mode/USuckModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/USuckModeWindow.xaml
@@ -6,7 +6,7 @@
     xmlns:local="clr-namespace:LiaoTian_Cup.Dictionary.I18n"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="1180"
-    Height="890"
+    Height="880"
     Background="#ACFFFFFF"
     mc:Ignorable="d">
 
@@ -18,7 +18,7 @@
     </Page.Resources>
 
 
-    <Grid ShowGridLines="True">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
@@ -26,51 +26,78 @@
             <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Margin="0,10,10,0"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <ComboBox
-                x:Name="ModeBox"
-                Width="130"
-                IsEditable="False"
-                Style="{StaticResource BaseComboBox}"
-                Text="{Binding Path=modeName}">
-                <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-                <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-            </ComboBox>
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+        <Grid>
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="190"
+                    Margin="0,0,0,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="20,10,10,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <ComboBox
+                    x:Name="ModeBox"
+                    Width="130"
+                    IsEditable="False"
+                    Style="{StaticResource BaseComboBox}"
+                    Text="{Binding Path=modeName}">
+                    <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                    <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                </ComboBox>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="3">
             <Button
                 x:Name="RandStartBtn"
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
                 Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
 
         <Grid Grid.Row="1">
+            <Label x:Name="MapLabel" Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            Grid.ColumnSpan="6">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource MapImg}" TargetType="Image">
@@ -82,10 +109,7 @@
                         <Setter Property="Margin" Value="5,10,0,0" />
                     </Style>
                 </StackPanel.Resources>
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
+
                 <StackPanel>
                     <Image
                         x:Name="MapImg1"
@@ -110,12 +134,37 @@
                 Content="{Binding [ConfirmMapBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
 
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="2" Grid.ColumnSpan="2">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="2*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Grid Row="0">
+                    <Label x:Name="NegativeLabel" Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+
+                <Grid Row="1">
+                    <Label x:Name="MultilineLabel" Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="2"
+            ColumnSpan="4">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="2*" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
                 <Grid.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                         <EventSetter Event="MouseLeftButtonDown" Handler="Base_MouseDown" />
@@ -124,13 +173,10 @@
 
                 <Grid
                     Grid.Row="0"
+                    Grid.ColumnSpan="3"
                     Margin="0,12,0,0"
                     VerticalAlignment="Top">
                     <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="*" />
@@ -158,20 +204,13 @@
                                     <Image x:Name="NegativeFactor13" />
                                     <Image x:Name="NegativeFactor14" />
                                 </StackPanel>
-
                             </Grid>
-
                         </Grid>
-
                     </StackPanel>
                 </Grid>
 
-                <Grid Grid.Row="1">
+                <Grid Grid.Row="1" Grid.ColumnSpan="2">
                     <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
                         <Image x:Name="MultiFactor1" Margin="0,0,0,0" />
                         <Image x:Name="MultiFactor2" />
                         <Image x:Name="MultiFactor3" />
@@ -180,6 +219,9 @@
                         <Image x:Name="MultiFactor6" />
                         <Image x:Name="MultiFactor7" />
                     </StackPanel>
+                </Grid>
+
+                <Grid Grid.Row="1" Grid.Column="3">
                     <Button
                         x:Name="BaseConfirmBtn"
                         Margin="0,0,20,0"
@@ -187,11 +229,30 @@
                         Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
                         IsEnabled="False" />
                 </Grid>
+            </Grid>
+        </Grid>
 
+        <Grid Grid.Row="3" Grid.ColumnSpan="2">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <Grid Grid.Row="0">
+                    <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+
+                <Grid Row="1">
+                    <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
             </Grid>
         </Grid>
 
-        <Grid Grid.Row="3">
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*" />
@@ -206,7 +267,6 @@
                             </Style>
                         </StackPanel.Resources>
 
-                        <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
                         <Image x:Name="SelectFactor2" />
                         <Image x:Name="SelectFactor3" />
@@ -226,14 +286,17 @@
                             </Style>
                         </StackPanel.Resources>
 
-                        <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+
                         <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
                         <Image x:Name="BeforeCommander2" />
                         <Image x:Name="BeforeCommander3" />
                         <Image x:Name="BeforeCommander4" />
                         <Image x:Name="BeforeCommander5" />
                         <Image x:Name="BeforeCommander6" />
-                        <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Label
+                            x:Name="NewCmdrLabel"
+                            Margin="18,0,0,0"
+                            Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
                         <Image x:Name="AfterCommander2" />
                         <Image x:Name="AfterCommander3" />
@@ -243,27 +306,47 @@
             </Grid>
         </Grid>
 
-        <Grid Grid.Row="4">
+        <Grid Grid.Row="4" Grid.ColumnSpan="2">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <Grid Row="0">
+                    <Label Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+
+                <Grid Row="1">
+                    <Label Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+
+                <Grid Row="2">
+                    <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
             <Grid.RowDefinitions>
-                <RowDefinition Height="100" />
-                <RowDefinition Height="100" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
 
-            <Grid Grid.Row="0">
-                <Line
-                    Stroke="Gray"
-                    StrokeThickness="6"
-                    X1="0"
-                    X2="1180"
-                    Y1="0"
-                    Y2="0" />
+            <Grid Grid.Row="0" Grid.ColumnSpan="2">
                 <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
-                    <Image
-                        x:Name="HasSelectMap"
-                        Margin="10,0,0,0"
-                        Style="{StaticResource MapImg}" />
+                    <Image x:Name="HasSelectMap" Style="{StaticResource MapImg}" />
                     <TextBlock
                         x:Name="MapTip"
                         Margin="50,0,0,0"
@@ -277,53 +360,58 @@
 
             <Grid Grid.Row="1">
                 <StackPanel Orientation="Horizontal">
-                    <StackPanel Orientation="Horizontal">
-                        <StackPanel.Resources>
-                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                                <EventSetter Event="MouseLeftButtonDown" Handler="CancelBase_MouseDown" />
-                            </Style>
-                        </StackPanel.Resources>
-
-                        <Label Margin="18,0,0,0" Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
-                        <Image x:Name="HasSelectBaseFactor1" Margin="0,0,0,0" />
-                        <Image x:Name="HasSelectBaseFactor2" />
-                        <Image x:Name="HasSelectBaseFactor3" />
-                    </StackPanel>
-
-                    <StackPanel Orientation="Horizontal">
-                        <StackPanel.Resources>
-                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                                <EventSetter Event="MouseLeftButtonDown" Handler="CancelFactor_MouseDown" />
-                            </Style>
-                        </StackPanel.Resources>
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                            <EventSetter Event="MouseLeftButtonDown" Handler="CancelBase_MouseDown" />
+                        </Style>
+                    </StackPanel.Resources>
 
-                        <Label
-                            Margin="18,0,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            FontSize="20"
-                            FontWeight="Bold" />
-                        <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
-                        <Image x:Name="HasSelectFactor2" />
-                        <Image x:Name="HasSelectFactor3" />
-                        <Image x:Name="HasSelectFactor4" />
-                        <Image x:Name="HasSelectFactor5" />
-                    </StackPanel>
+                    <Image x:Name="HasSelectBaseFactor1" Margin="0,0,0,0" />
+                    <Image x:Name="HasSelectBaseFactor2" />
+                    <Image x:Name="HasSelectBaseFactor3" />
                 </StackPanel>
+            </Grid>
 
+            <Grid
+                Grid.Row="1"
+                Grid.Column="0"
+                Grid.ColumnSpan="2">
+                <Label
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    HorizontalContentAlignment="Right"
+                    Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}"
+                    FontSize="20"
+                    FontWeight="Bold" />
             </Grid>
 
-            <Grid Grid.Row="2" />
+            <Grid
+                Grid.Row="1"
+                Grid.Column="2"
+                Grid.ColumnSpan="2">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                            <EventSetter Event="MouseLeftButtonDown" Handler="CancelFactor_MouseDown" />
+                        </Style>
+                    </StackPanel.Resources>
+
+                    <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
+                    <Image x:Name="HasSelectFactor2" />
+                    <Image x:Name="HasSelectFactor3" />
+                    <Image x:Name="HasSelectFactor4" />
+                    <Image x:Name="HasSelectFactor5" />
+                </StackPanel>
+            </Grid>
 
-            <Grid Grid.Row="3">
+            <Grid Grid.Row="2" ColumnSpan="4">
                 <StackPanel Orientation="Horizontal">
                     <StackPanel.Resources>
                         <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                             <EventSetter Event="MouseLeftButtonDown" Handler="CancelCommander_MouseDown" />
                         </Style>
                     </StackPanel.Resources>
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+
                     <Image x:Name="HasSelectCommander1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectCommander2" />
                     <TextBlock
@@ -335,11 +423,53 @@
                         Foreground="Red"
                         Text="" />
                 </StackPanel>
+            </Grid>
+
+            <Grid Grid.Row="2" Grid.Column="3">
                 <Button
                     Margin="0,0,20,0"
                     Click="Button_Confirm_Click"
                     Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
             </Grid>
         </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="6"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/USuckModeWindow.xaml.cs b/LiaoTian_Cup/Mode/USuckModeWindow.xaml.cs
index 50dcae9..63ab0ee 100644
--- a/LiaoTian_Cup/Mode/USuckModeWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/USuckModeWindow.xaml.cs
@@ -6,6 +6,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using LiaoTian_Cup.Overview;
 
@@ -119,6 +120,13 @@ public void ResetFunc()
             hasSelectMap = new Image();
             ClearRandomMaps();
             FlashHasSelectMap();
+
+            MapLabel.Foreground = Brushes.Black;
+            NegativeLabel.Foreground = Brushes.Black;
+            MultilineLabel.Foreground = Brushes.Black;
+            FreeLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
         //开始随机事件响应
@@ -157,6 +165,7 @@ private void ShowRandomMaps()
             MapName1.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[0]]);
             MapName2.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[1]]);
             MapName3.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[2]]);
+            MapLabel.Foreground = Brushes.Red;
         }
 
         //点击地图图片事件响应
@@ -214,12 +223,14 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
             SetRandMapEnable(false);
             ShowBaseNegativeFactor();
             ShowBaseMultiFactor();
+            MapLabel.Foreground = Brushes.Gray;
         }
 
 
         //正面因子显示
         private void ShowBaseNegativeFactor()
         {
+            NegativeLabel.Foreground = Brushes.Red;
             //相对路径URI指定因子图片来源
             NegativeFactor1.Source = new BitmapImage(new Uri(factorDir + FileData.usuckNegativeFactorInfo[0] + ".png", UriKind.Relative));
             NegativeFactor2.Source = new BitmapImage(new Uri(factorDir + FileData.usuckNegativeFactorInfo[1] + ".png", UriKind.Relative));
@@ -240,6 +251,7 @@ private void ShowBaseNegativeFactor()
         //多线因子显示
         private void ShowBaseMultiFactor()
         {
+            MultilineLabel.Foreground = Brushes.Red;
             MultiFactor1.Source = new BitmapImage(new Uri(factorDir + FileData.usuckMultiFactorInfo[0] + ".png", UriKind.Relative));
             MultiFactor2.Source = new BitmapImage(new Uri(factorDir + FileData.usuckMultiFactorInfo[1] + ".png", UriKind.Relative));
             MultiFactor3.Source = new BitmapImage(new Uri(factorDir + FileData.usuckMultiFactorInfo[2] + ".png", UriKind.Relative));
@@ -311,6 +323,12 @@ private void Button_BaseConfirm_Click(Object sender, RoutedEventArgs e)
             SetBaseFactorEnable(false);
             ShowRandomFactor();
             RandomCommanderInfo();
+
+            NegativeLabel.Foreground = Brushes.Gray;
+            MultilineLabel.Foreground = Brushes.Gray;
+            FreeLabel.Foreground = Brushes.Red;
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
         }
 
         //刷新已选基础因子事件

From 972c0ebb000ef503de143b9352d99fa3961b337d Mon Sep 17 00:00:00 2001
From: B1ackSand <peilanfengfeng@gmail.com>
Date: Fri, 6 Oct 2023 21:40:25 +0800
Subject: [PATCH 6/6] Modify UI.

---
 LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs   |   2 +-
 LiaoTian_Cup/Dictionary/I18n/Lang.resx          |   2 +-
 LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx       |   2 +-
 LiaoTian_Cup/LiaoTian_Cup.csproj                |   2 +-
 ...264\345\221\275\344\274\231\344\274\264.png" | Bin 15097 -> 0 bytes
 5 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 "LiaoTian_Cup/Resources/\350\207\264\345\221\275\344\274\231\344\274\264.png"

diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
index 01b2003..9bfdd5d 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
@@ -304,7 +304,7 @@ public static string LangBtn {
         }
         
         /// <summary>
-        ///   查找类似 聊天杯 LiaoTian_Cup v0.2.4 - Programmed by B1ackSand 的本地化字符串。
+        ///   查找类似 聊天杯 LiaoTian_Cup v0.2.5 - Programmed by B1ackSand 的本地化字符串。
         /// </summary>
         public static string MainWindowTitle {
             get {
diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.resx b/LiaoTian_Cup/Dictionary/I18n/Lang.resx
index be29e3d..e14f88b 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.resx
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.resx
@@ -196,7 +196,7 @@
     <value>you need to pick commander</value>
   </data>
   <data name="MainWindowTitle" xml:space="preserve">
-    <value>聊天杯 LiaoTian_Cup v0.2.4 - Programmed by B1ackSand</value>
+    <value>聊天杯 LiaoTian_Cup v0.2.5 - Programmed by B1ackSand</value>
   </data>
   <data name="ThreeMutatorsMode" xml:space="preserve">
     <value>3 mutators mode</value>
diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx b/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx
index ef598fc..8e0de20 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx
@@ -196,7 +196,7 @@
     <value>未选择指挥官</value>
   </data>
   <data name="MainWindowTitle" xml:space="preserve">
-    <value>聊天杯 LiaoTian_Cup v0.2.4 - Programmed by B1ackSand</value>
+    <value>聊天杯 LiaoTian_Cup v0.2.5 - Programmed by B1ackSand</value>
   </data>
   <data name="ThreeMutatorsMode" xml:space="preserve">
     <value>3因子模式</value>
diff --git a/LiaoTian_Cup/LiaoTian_Cup.csproj b/LiaoTian_Cup/LiaoTian_Cup.csproj
index 6960cc1..4476570 100644
--- a/LiaoTian_Cup/LiaoTian_Cup.csproj
+++ b/LiaoTian_Cup/LiaoTian_Cup.csproj
@@ -9,7 +9,7 @@
 	  <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 	  <UseWPF>true</UseWPF>
 	  <ApplicationIcon>Resources\Logo\icon.ico</ApplicationIcon>
-	  <Version>0.2.4</Version>
+	  <Version>0.2.5</Version>
 	  <Authors>B1ackSand</Authors>
 	  <ApplicationManifest>app.manifest</ApplicationManifest>
 	  <PackageReadmeFile>README.md</PackageReadmeFile>
diff --git "a/LiaoTian_Cup/Resources/\350\207\264\345\221\275\344\274\231\344\274\264.png" "b/LiaoTian_Cup/Resources/\350\207\264\345\221\275\344\274\231\344\274\264.png"
deleted file mode 100644
index ba0cff032157d64c665c5ce663d7b17036705062..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15097
zcmV<VItImwP)<h;3K|Lk000e1NJLTq002w?002w~1^@s6$Cptn00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>DI*v(1K~#8N?Yvi%
zT<3Wu3UsKhoO8}OS9Mi&&N(M^?gqM%Gl(1s5KJIJ5{#xOlFEs)EZfpZR+c47mPpA;
zwk&(bo_p7Qnwd50u9>xFUiaPqX;P9c0=n}&^YE>zuC8#-{`a@Pz0WySyLQ*rL+MV#
z+I;}wqn}3P*k}Jw{ay)7tUU*bQ3e95T>>mqZ5ghaoA4|>1^e(BSi1JZ(z)+{?;-{Q
z3xSEiMqngB+a;Lgn!XA5{9`b;u0kEEKyD48$?UsNd4F3nQ5N2JdZCK>p-u&%j<Wng
zXagbW!x5=;!7y|IR*3gSiO0g?@38bdQR2Qn9OZK((D*`7Is;I<gVKGeynK#741;)%
zczukoPwte`7l7Qpvwd=_4@$cqD#v>z?z7aqFY33C|FLq0p$S(dOx*L2N*GzY4`P>~
zoOkJI=^rwU6%Dc`)YsSjVKvmDfmL6>`?s~bZa3<hcB9cz55tfO)<rEW16tS%dU%Rv
zgxVYkcexO#+TknP;IG-?Z?z-PVMnmT0e_1P-ewEDWitZ2AMNrY)Z&ISWrD$@h9#`y
zeIx7%R@?|*!H#&B4*|Zff0XaH$eOpqkkO*aD3i8Pp>BlM&;+AdE|uQY1cSK=CaWA~
zyBsDPAGf?$?>$E<@i(6%N<3GqmqV^rqfujrxn-3YJtej0F43os;fJ6OR?yg_U^Spo
zMsON`SB;|hn5=21r2DM;hF#drs?+X*x+H^jQ-k0g6XK^G$Zz{mUI`;T=|^@tfWn?2
zN^236Rw5`YhLD{LAT#AfaWRM@|CbnWp)?;vVJ3ihkCQ;@5v*B}=yxN^zeQ!o{b*f}
zqw7E#m3?7k4|tKi=12ab52+0Yyfqz6UWEjT<@d@;pqy?c{2?_0VKqE{6&x-l>`sML
zPLC39pHg~Ulz5)YtA@d%MuS|#uB#HGGm@rBfQf#U+d>4U9!*X4kjusG?*I~yNslXb
zN_t!XR!_i0DRx0cz?>(vNPXUp($jua&qmO)6-V=W1l7G!wCs<e^>6~U?KsMOthf?F
z^F|nLhf-)ekVIk5hmHd=v~5L^BanVFFVXKpVb)L31+W3MZb#8~DueM$CG?-ppn5QZ
z#6dU8*8=Fg9YFtOH=0-NNDf-aR1-oK6QWh#=Jas-R0u{ih$OU9c>`(*BvHN~K_ZX>
zOi{t88orPQ76$=qQnKA65=OrRj3Otu_z1)fAPQvzlq`j!K?3jnQYd-LlF7+DIonc{
znk{LsgK<=ezzs8spYx*jL>Sd$QB=sN_9F?j9gd^rKpfSr7|N>=<QD=gvgKeL9Y?e1
zIGjNX8Poqz3f;#OWSpPvY(sjKtXm{QXT5xG7(Hha=sTCf(1jdE&KJ<Rm4GK_M0DDQ
z?i)UAeLjkfPbM&aCx-Tu5p*2ldmiP2&AMUtE8!wIfruKhq!yv57XBcCAz0!u0g?dA
z8z6{YC0VCpd#X?`Q=-WdfTd&a2Lq-cU}|*(G};EJH4RYlzEUN?+hJCtf~6(ny!?NG
z+Aywy@1hBbyAG7@`O$GZftI6DRQItqqhwSJH3C)P{qky9VqAf3n42SDWL@|16#CAv
z9!g;B;R*&X7E#*_Bi?62e#V9Bh9AWxF2aEz+K)vDepCXnlZ()MJc-nxllsTcAGV<D
zgcl3X1hM`~6nkHaWBd6yPQ04L(xo6GB|UT|8H_B^cH#IA+oG&kS|^nN%;u0w`>oc>
zpj68r3|JFcq!Oa3+bNB<QTkf|CYaZxr)P`sLkGADhxLeDwIchZ8<m#>Xn8J-_D5pq
z;Lf)nNuzCl60K}WQPm9rRs`kc2rA;1+Sa@lB4bh*zLLerwJe4%r7&{689k?R5+I2o
z8;T1q)b@GNyy-^&`7ow#Co%hI2AxO4WLg44mv@*M?Xn@*Vy4D9(0#~<kuyO|o(p02
zd=&eiNnq((2$^m(^kx}Us(OmNOk$g0RWzkVJfo9tMSE&>GKm<X%M>aOzy|{+m?eWw
zFO$GhYj(g=5^<%q0lGZJbB_**+jdkw#Z_ht^n5IVuDc0zTp~C}cG%Q?GLLSyTKm2P
z+V@ho)??I`D4O2`tYu$}Y)E1Jb_vr@He>pUBF1iJF?b~}X<c&E!Lm}f9Au~))dOzK
zKb6G(*NfPGjnBOn!|2T<CLYgW=t`QvdI_2pkyZ<GBW@H%-6)QFP@(?KT!~`#N(j{n
zPCJ)ek`<M@o|CYN?WdAh79&`pm<Bcu00ER3Y7$_|Cc1|E0H&aS5l_+?WYDt&vqUKf
zn9AM=QzuvCq8ZI^1~B@UdCb1mjPaL?=)RIdc{79@H7Paaqd*7HcQS{8<5_fWkX?&W
z3V9N3+etJpMNlK#de3Aq^<)LhueM|H#TM+jSH;px6%1cZkcn=Dx{XLrSx{WIQ}<kG
zIp)HlH;Op%$qE*pV*8#7uzlm$^FkhbUMyhXQUZl}FKverv2Fs_W<{uKL!#G-(F-BW
z-wLC5!v#lB$yOsNbPbZ#aI-Z-F)iCu%QjWRL~9`kA_kr`_~f!b0+_0iV9~b_Fu^d5
zxe?}y3f@fv;*Z-f@X-twKi`J6&vaqzsUq4>#c36UT?k4Oua#4-ms4!`Ob&xb*g9)*
z<R<*+C4iH+tC)DWjFo3waQKZLoO^2+m;ZbW$3D@EwU=sSSsp#7!^rP(Akt?<Zk8>%
z;y??h;PAB|4t*+*r8@~^2ibZ<CN4?<E3cGr^b5V1f1$wV`QWP<5ULqD2=uVWbo6gJ
z^c-<w^Z6hSzf5LNyWoxM>AC3B=+9gfcQHAGWS5uXZ+9sqAO%Tev{wy{jrVU!2{1BB
zZ`?6@I;#xk9N%!;h{7vQbbi&3g|C*e_EtOQU#y{@+S7J4Ax*m8b7>4-&9bcun0lm)
z!4p~ZA55W#%&M>zN3WH!^n5#(pKrtdH@k8AvxB($#WCFY;y6xyyq6$W(0`V8W7UJ?
zxE1kX69<Ex+T}#oX&+ygz>&}7u;;Nb%A-b%ANFAJ@dWmMw2IST9mSqMDWLVJ2Z442
zO|k(#3cNF|g@Kc?Fl)lxZ68j4GKq!jNpvju5G@#Bbtv8we+oZaGC)1^2+-ULX!MPe
zJk>W4uto(Fg#Ql#Q`#6Es9#3mifyc*9R4Le%J-ZY`bH27KZ|1iuTvQP6hV44gpM0Y
z^xrCA^64s;Kir1(k9J`7wKmML)%uR6(S3leb0UL*ivq-EEZnK?6raETd@ByV(uqSa
zbzzf?o22NMSG-IGOb1;?q^8-9Yj(7<6~}IeaQv-2PJgb5Bd=w!^-LUhzuk%(UvI_X
zKWoFGzZk~&UAFrH8^V2hgxmFq^_Zz?W>|%vs_M{8rp`Y>(BCLy?;Xm;x*uM_ELw|X
zR*!7SK+rfPqZ+AA&D1v~yG>$Pqx?RAF>mP@F9cwE0%nXVkUVe2!e4}N`d2CJ|5*Zy
z??y5HHmBQHeW-kdqIxHYj%x{w+$v(vORd=WNGCQ~%P+QJ;$~G6|LWd2MVStsHljjX
z(Z;szJQPPKO=y+&B2QDA9At#*Ff%SugV=7lWh+_^J2CM@0Q*0k!qxBAaOdqYJpY3g
zyzu=^-1=T8u6?%yXaA}T8y{~*|8+ldt0n|`IFLpRh!MCziw>TG4&IWE6V!mzuocrc
z(^!8hkGWGZ#Hn`)f|V&6kSnv51z4PtqAhJ?pN`TbS1@kf4=@opMV_*Y$PiY+*{VU;
z%N`thJBDk&PUHAHNgV!Z413>=VD<+=bbW=>>r)<7Uks3K2@Kw#PCZt}+%q+dUgt14
znMH*YGCLDQYRrT57-P(IkhhF6BW%4P7oy#E0!3zYTDg;qL1HqJSv}`HSbHIcGk==J
z#jg}_@U0B4eQg>qzk3;<_|@|``nh&I^rdE8`9>StGKI>P4Zcn~_ZBts%VuQQhQSVM
zSW*o~N&`oNMYB3^A%?YQvsk_oL#AdyoPZ^BI;5F>!xVov(}0yeOvEWM05m!|MW29K
zJ^(P0<V6M(eH<W-W2<H?eJO-<KTqJ{UnX(($4OlJNfPJYjpN`CBbfZI4?W-Xpyki$
zlV}zzCn@>|WAs*ODGCYSRa|D?o8jtDGw(4^=BC4l_3mUtksT8QPNYX%eB8~9>5??7
zn_$ho6vp{~m&eU-mT>NiSxh|Z!=cX&;>owK;Ps!rj=4J}9R5Ta*S}uD+ACos$Mi5K
zX?e;j<hk92HMZmsb7e>YOGF7Xr=yY1z4LewYtJRHb%z6B%!y=~DS?JHk=04|!p98h
z^z1N95Jx!uMj18iL4Y|)%P57l;~5W5{v?K5|Cq#Mf1i{<yY{z9T>WVRm*0tF^RH+Q
zzve^lH|WB@=tJ&;57}k5-FgV^hZ5YlBsxzp7BLzXMcAI;|0ldOuR)qw5nE_-nFYH~
zFdx!j4qT3)?~<RINT>ek7&bo_!^}$o3_b3_D7R(v^EsUT&M>ZiYY7AA0yyw`3YWjk
zVR6#IHfHO!GAs5_xXH5k1Y2$12wReX#gs7l70{D8xmgF6pAO;tXX9ADmO_o5EtVCn
zNx;a!2*p3fVG*MCi57KuH1`Kgw4{MFGzAriZ<sLomqA?nO&m}CO9D^-V*-!=I)Pii
zAaFlR;s!xG_MHe;zaGTIHv;JWb^zt4#1R7z5`%7Tm>*?2`4%#+n~W2av_%-&V@U!e
z@*;1U83*a^#~-05yOU<cIDKQ7dpS%I_tUa4#BW(p*lR}Rh#6ydgP4CcjfIzTn0Ypc
zt&efhUX3F)Zs7B*sGhK)v~7Z?#>v;GWm_5$?4%h@ktseo874=N6SVh$2V3_TnO@6d
z{oypmwwO>x9LO-JCpkUSoUmeQdYLm#WLU!k0TYKpxKhPyR&2Zz#_fNO<7w6%0{8ge
z$8k%vCs}r#t$Bvpw*Acr_Ix9R(I1A;_7OkQN9c13G>+X4Nw*4%0V#ZUu)2<k%$P$L
z6F>_GL51F}`$UY9C{7a^qa|VVVQ8OxDuCffJ!n17EV;&vIK!zou0?5|70rii1kZwn
z*VtMg4PoLjPSyb(x~{m;_lOJGRfEJde=7s_ASd7??L|QaQ-Hd}_H<FtGJ`gH#2_~B
zB(eQ;1{=3hm^%?h_ly(G-4<jxF@?pjQT#P}ktOe^VJ^0$TaNIy0ezoz<JhmGxcyI2
zJoXPUJo2kJ9{FV)*U79a?<8>PM+uz%egX%-9mm?YVwk3;4Sbmsj~i|Y8Ki@U!8RM>
z)TzRJ05xh_E1iCIJ&pWq9PxfHLhTlU>fi)*qPpf{8gO!o+R$~<iK%D&SRx<;H=M}s
z(Zk!KgrmfPRFosotHRVh59VL?V(7Y)B5%P6+1+{30Xw5xpo?u;QNmMF(gYJgGR_j0
z!;xnG&1v9orU_?^DowgDc-W8Sha)(0FNqDB<H03Hvb<h8ex_wSRHz;>CDmR67FQtm
zs1=Lf3E<&>AIFVfMRD_2zXMF@*9C(0(A!BI|85cozm>%1w-Q+RVH}g+VUB#<2XmML
zERK{?8^WCq<S6?2X@=j?5dD##K)DfYwei->_O&51&eq#wN83RcTUV3=9mnh#f7Fe>
z%MMibn~|Ji&>z&$HmDKiZRc4lMsGVYMpkuE!v?Q8(0YNNx4#kP>uRLe`8-a|?7SX9
z0_bI033X`@?Pt678tB!G@Kf-^Oa+AzD~1`^_dgZJ^ifXktXhgr;y^@W(*t~%IuwA3
zD_MEjhOKvlc<Mh;+<z9qm7m4%@Gnw$>{mtH{zWs}v4rzK%;MDdSbtr>@$VP0@uLhD
zevm@vy#U-rBMqaDD{7R0Ne)xj2E3e(9u_C#pbP17GH;HyWW&ce<>gL$(SONDYvM=u
zSw6mPK?|!!4HNgP2QA327*ONw@O2Nm&)G5hs1tL~c`$avgPG@?*z*w!R{vCs1K-qR
z<~2QP$7vU)X-3;ci>eSG(J}9uIJM1)^&7dJVjH;#6`J!|JJ#-mu>1(6g^ah-ysGKL
znv@S>Sd@Sbs8D&shV7pcFbe(opG0thlk(;-a=82JZankrK0N-5E?j-5g0pWIap8wm
zoO`Dg``#%KFuMB}gHo%x^Je(UR>?kO#(l_4`jMITA-~|IH}g}|I2q3|HBdh$@5C|v
zY!uV?sE4mbF!fx3)`G3NWJG?>faY}*0kWZX$js-vvHz_&hHknr@r(;gANFC9?YsR2
zFRuQr2e18S7e4l1UAXyoHq3s)g!G(-Lx2&es$}HSp+fMRsfC$o6MU`gf&#r;S%cVs
z5u;apSbZ*r#YdTsX*mKpBa99W0b`ale?XR0g#*xcD3N>Bg5@9kar4)4oPH;Qt3T(Y
z{7o4z{?izq`-gEn@yh{Rf43Fq-X>@S>^Q-jdnd*C6hrk1KY|q-f;H+_KYbN_*zlz?
z4K1DjW6YnIQ|P^v#4z*b?7c3myk5oH$2hI%sWv{H#Gx;xaQMqfY`sMQX(hT&Sy9<E
zqK#lxw@i#m7W7fqh8|-Ic-DnIAM)bBXJWYcHzB<Ae~0k({~p8N|BoEL_+Nr}=m#cL
zPYJuBfHT9%&sMG-HlyVj%`q1t)X)Fb2pHSd*FnQe_KjWk;NWX99DO~9=?ihBd!1;M
z-zR)41Ab`pO-MXz!ua>SI7R(B{gWsj|N8`9{^vZN{!Ke>{=5wre_X+dALMZ0hZ(H>
zO$sv<|DLagB*&jU>_w!5x<!*(U5_vVB{&)L=)X`v--Qf19}1)6p&+MV9!m`2`#;}~
zqkmb&iLVrK>T5aN_<kO@ewf3>@1(Ky*$}4hx+TzZ(|S%@3xl`~Z6~bgzhTF~Ejy;3
zb>rlhX?cE@!VCXb7$5#mPJHjbh4IP%?8NaO>(FwUE!m}{p2`vFQ=z;?#vWi>E-?zx
zdU&gXVFav=8rQ9%)|zNLTv)gk#>}}es#7jBsg#ggKL{|2zAh$1^a&&SzU{`|Uxsmt
z?RfiFN!<MnUG*=sWL$<oC9(R0DCT|?#o*V1sC|rv^bt4GhdoHmdyyIOqGdCVjsrBU
z+c9bpUG;u?vO_ei$EjJ=tDb97Oy0|5?Gr^D{dZ+t`d$m}yxWTp{Zdpro_@E8lV6Ep
z^-UVrtF$PiTKYB%hA8g+{JZyx4IO7J)I2-Ej^W9l=JCuwrEvQ{y7A)w<G}Ubm^i(4
z=(}S=bXWyfPEJ6S1WJeOiXQPPtu#%Y1y0|*0zT@TPuLLx7^&&eJZ3{TlSgUT2Dw`G
z!GMV=X=dP#-lEI@8b$Qy0UUcLijzO4$@?*lDyQQ<0=4iXw%Jbt=zQCc;)f{Yv;&?Z
zb6}qb#knA=j707G>9bZCi>5rBR22Aiw&wviT26S-em;QKQ@qdC7<}A?b+**?w>$B<
zf7-&A{&@p`@gFAfkzdtt{_6>BemsCNPQw!Qtdngy`IrkUe607ngJxB<s2N*-#)<xe
zBJTXW1vh`mEc-Wn-!B_5@<}TeKH^4pRtqNq^HXkO<D8V^Y6SXeF<Kd!*in{ZlVnxG
zy=qzxX3wY!_MiqqPEj9??0o^#5HNd;Xdlv|{Bav*{x*Q4e;XyEVp#cp6pKHOVC?%r
zwx1uhPf@^cc#+y-h@SRH!d_lrTM{gBL_$<~B}n5+!Jl;@HEly`)`A>;*5utTY<+4k
z4u9?__Pkoc;>V&m{G~LW_)#}rr9OW6@4E5AFUq+2qZ|c3j8W=UmB}MJLD60{Vu%_x
z##XHntnywHR^OmreS;zW2L+t?CX>MDycqcqS$M~W&Px_VhE#CUzxg`}*r*2Kel>h#
zn}1D-_Inz1KgUQk#m9Rn{%wp#6&+krEm8xtJ$>ds0vLT*V2i!{ng#to@?!ZXA<VrU
z!q7K^==(|#?Vq7Gy&OR4;Q)#U8KxH)tfv@*_JkzB#7Wq!I4UveMS&BsyzWEg0GYVK
zmYw6&9MNO+@fr?%dOsfe^UK)&Og9Z`oE5~OKTY5qb?nOb^0@ML2Isz;B75lkpLe76
zkcC!2OA~Cs1pV2b5Bo8A%Y~MsR`i~8V3VL9{VH|uD@iPTf*Sdp8|_!DC>$^%K<#o@
z6bO<<Q3B@gAb>3jgpVk&^)(X?{}s1uNh7sns9B3divj+E4$XTw9Of+d*D$r8UPFlE
zaV_$1(EEJLiN3$~qlaL%f03>Bp&%-chEO>hM(uz&F&js-I3h6@LWy9dM?4gKI|9vI
z)h;_T9@}Q!jn4By76ILIQ)qP*{Qwr8?Zbf&uVeG|c1%4V#n4?B#$R$_?oAI?-wI&g
zm%>>8LKtgb2x0zBA9^m@kr>l5PMNU$iXZzw8^+3;VGKS(26MU%U-gi!Va$JqUGOJ<
zbUy4r;h+(*c`ZEcY`>Zk;UThUSOZsC32U|qk%Mv$7aOkqwG*KgW=?9EGtSm5)7%c|
z(Q(+uj<KRq!72GcfQgGqj3Wv}?&^?#%YyP-4%9wL&-9@vdY(z4hn}hPTpXPz6X;|v
zEU&~Eb3(|IVWpWM!mV~VlLpu#I=Jcb#ks=hkeNbjLHjwH(<?z{K`(X3O&1@h>CDsr
zm=T_$5T7xk`wa(%UUXve6*p!-;>9e7$-*ZH?neWdeZ_|o+p@H5#N;(ME`1?^vtQ0)
z<Krpm;9;BrJUF05cHM~R#12T7OcQir8H~{;IEo5{2B}fqDp*r;=tGTg%{F4;&y869
zk`>-j2JM(!y3D|x*CKb=gf6Cu(ws>;^ZkLgLY)Y}Jgr8GQ>g7;2z@Ul(f@n~!_Ve1
z`eXsaH}cX+*1ppPbREf|Wg~%>HL`3Wj6@fOKVyQ8k;oR(vNW(KG#uGliB<Ux3py@Q
zTka;%%LzGgmu>iF0z<dS;OC7P{=6D1Kek}<>vZxI>%n_=4AH$0-f{6YZZeMxcgBVs
zjcjS!h@-E@aD=a4dpS<VG1#A@mU8D@G^mzz6ZFAGXgrNjvvffjtZ6ws^kX868bUH?
zy$#%F8M5anKj*m3%$){5f%NcsoRlN?Z0NgUVM5W-xZdZOzAhDpe}S!dCX9iHb9B`u
zjNT|>^kLSG0!A*gE;eKMtT+bMjNZcqbZn+jnF%4)W=FDSN0jc~modW<&@hCn7(LW%
z0W~KR1)KSB^w}7O?<6pBFOEHL#<1^;865hN59j~IihKXXg)9Hjg^h39(EqXtZP(4H
z95<nMlJ?;#X3SF-#Az?wITc1ZZKp5#F?A`3rKjVJNkNpi?F{HjiBVcF0dqAFv<Bz{
zGMM8{Y`G>FA~I;){GYo4=0X#!6n_gnm@z1a(JO}~!48|yVCB;eMl=)SlluOES<=D^
zM5qUOjNKxW&ZW_HEP-}${lh^r<9Hf_r}@8&70le|#Q6D6v@WEO>vEx+Vn4N&#OQhg
z#XdLO2|b+Rm{LgxdrC=HtwoycRNPNCJsrf*(;@WU3SjlM3?6y6gg^VQMf}VEOyQUR
zBZCk9GvDir%za12^kRq}(IB~?LwttsN53R?&Y4sr!wDvGU+aRMCfSa{8q>wB37$5!
z#3&<~r6a=x+f4MA=C}-MM*~#02IvT=H6w>Pq=4Qfht|cm<pM{Bw5VP(V)K)BlvZ_o
zzWn}x=_3((5t_tFdZ!t2{N0Pv9t!<3P3L+To%>_xJCee{ku3W5=TV!Bp_76?yDy1L
z5BK5r)1x?gz73^*=CHgGp^6cyK`YWzoL00G*=3Wo^Vu~<ol6c3KI=vABOWY%Dul~F
zjo}mjZxmntZ*jc(pM2Q+H+m$u=)!3QoMerYLhWwZxfLuB?c<EA5h@#yXf+~I)k}xf
zeKjrYS^6vLk&(>Oxf-D*qXgr0Y(oK-hL0J7WLt<D=OG&%J7o{3kljQ7_JS2Fud!n|
zAR48^JNE%h6AQsHXn=Rd1pky7{s9Z8g+n@7ksD`dCU|X}imi+ET9cfXV?GSgoE|t=
z#Pcsr;qD7lIC{1nMF#G4Cnw~%2Oax@=sq1`;B_N5V&Klm;o^u-Ei&p{WuU%nMb{II
zI3IQ6==XiN_G=%`{eugO-!vn=UkgW-;Bd$FJ{e4GHA_-KrYNDdQ-`?vCO@5eObuH=
z2|F3$OsFN+h*N}8o3Yf6Mkp-}P`?M3j_)VH(zsbRwkS*Ql+%N%P}*n2)N3{jQx3c(
z1?n3b?hlwc8Gvb)G2)~Sp5uDB7FhjyilvcZ+JY2=Xnxp(+yFgQryXsReoSmeaqwIL
zPd+<<v)4K>znMd+$BTCATHn4nhEI`^7gNaZal%{C!06}H;?BFcG4WX)$`6@QJk9Ax
zy=Z&fitf+QSAE`!&X=vo?q^$9xWjfb!_1v!JL$aKIkHP_WqaAk47QWOOTp$2o7@W6
zf+`q11dO0rDFuRUT9*uRLxTjGK0s!L70~(k9(=vVB2HL0!RRJ?saLgQ1WbJPf(8a|
zXI<R`08<A2P&YTheVVc083O{(8Q{6Bhm|5|OfoJ+Y5K&qSXC=h?RMn59B5^39GDMc
zY%z$AVJ~X^^gt67;jJ_}7o&)GIAMvfwK%FH;soue1?~b_5N=}I&<jz-GaCkEX)u%f
z^hj^971wl#PHW&{Xtw4#xu``d?ySOC&mFIag5Vh_(6$5(X@Q25ZRv<<VD?e)y?kGS
z;ccPk8s}p3))<yc*M=x9Vi52?fl`^MYXsKHHWbIcOdcho)Y%>;gYoBVk`0mT8XgRo
z!sUa4)5ATZMC3Gg@CJ3^Nv`q{4NRRXXsldK2Y13x0Ae}>QU*lwCd7(670EHa)LiHq
zkD)po;N+wsESQmMv7&F4pdO2&Yuk&2ICz&=afcP~R8;g&+&P+3-++pOEp&?Gzo3Al
znYYw0ar#Wn9Tue{Af_m{A;DJ6DW%toGu_n%7s|5^_!(`Yy?P`j4Tw$C4_4T&e6BbN
zA{ZrsWoA2@De^()MrKB9K+TD+rYSaH=sFor&;+|=ih49OJ^(Pe%?G)*p595p4^tz-
zOc{Mfhwu}6cn@l!<K)qBwY5Id+OL2m%$?z?nw>l43hEIn*iq>XAe6BnkTxMl=Rdt2
z!$De<{f`zgbU1**gcXray(G}$(25Xs0g&)d1~J*#b~?7MImH&s3ty#xmf~y(iZ&yt
zj4vU+-rqqMau9f%RTw$t$K)02>IU8UmJQ{7l#qEn9DKclt!a%Zse_z`LgcAk;tZ05
z%(qeZY;^a&RxSD;qJ6n&L1B-cZMt)rSCcsNeZR9t3Ie7e4PD&8IHy_e5L@I00}7v_
z&b-M1aFH##%GDU;hf`a06mX57I>6P^nkkxI9sDsfB54~uQ6sWs*!X%3XXxcl(e$pL
zilb+b8--!E^dN)n5LwyBouaSOlR2X8L@C*FqV2@>Xj(pQpdJaZY?K8@R!zY4Xx(O>
zT_K}7)dZm)ZR<8#od723`g_j1X=HcK1vs)~DF=lkO-Ugmoy|KZQiR(VAetj&c?-q<
zkO7mAS<$w|!4wx)TeG#rmDC0b|NQ_{I{cCV`uOH?#*8#IrSPm7HICSpm+i<rZbs~u
z0b#ak@G2Ai87+)M3Mf4?D8)rAHtK;(E0s4&cC|XuI~BmpI=$T-o%)y?r6C9ML(G{2
zWLcL9j*K{k&(;tc86z+PIIgZ-Pryt<=;_)6WFMJj<#hCvsCnZwz!#I~IvPM?#0Ybg
zLnNc*A{glzoyg8xr87wd=FZrl4w*3%(i5~a<3iV%DaUC}XB5b6tI<N2KX}`SnP)9%
z<B;(aP^GS3Ite1KL{zCCa0Q~;NfbG4f^_H69&xFF9<|5p=(^)X$4&0&1+wBSwc#Se
z>BD-2p3=j<&J`9KLxvgb)CxP<VqtrR_`EzfocXfI6p*c2kgV|a)U!l~72z6VOoovp
zOg&7BVM6gHdn{y<mX<+bXr##Rh_oR>u((a8kdiyZZCZ6>;&L2A=R(pI)2?PRo<7SG
zl_Szkp=TWPQOgn&27>Cu$OW?Qv>T}vt#sr<9NGy^D3Ls=Liw5&ZC7+?rQ~=y@KokH
z?5^8|M%ixZs&Scg*62POrg8bDla~SRK&VrP&=M2-RkGxw3mpfz({nV4bi%=5HG+!-
z^%k{lzYZ1(tC<2Su3a!XSvG2eM+YZ0%`Hy1`8DuzNchtRve!spj08#py+Z+KgkUid
z1TzfG{9NIyG;9YYg;~MU@o#gS6ELc#5G$nXzN#xO44&{|{Bi*OXS@gx>-ii4?d0>h
z;Ck+ZupWU9Etc=mCw?rAxn~&P2$;BRK+oxDrnXs^l&~$*hIGo&XxuG*-(c6S-!JjS
zjR*NK!7%QGiz^!F(jl?ejNXUb=sw~^Wyy^A5C=dX!DQ+W%`&oFpm6Wg!O^baBq9U2
zb4GCihm-eNW*5t?;y_TrLNKj9{_W-8EQ6C?$j0o(`!*jR<5<`6vz63Cg+VZkWfB8G
z2@_c;-dpllyme)@Xy0^W`eqo@kA_j)w8F`$tD~43gtg#vB*5A<*myCF6Q4<A;Z6|V
zUK(B}S<5yzXSqFd+@3uuXuAoRjo`@s7XjP3+^LCfnWLU!oLsXIC@Y%h&B&47u^z2-
z`aL$Lp$2e5ZEIkkXB)M0hq-b_PELcDt4k(`5@KzN(&KOviJcV}gJ`LdVo0cr)II&q
zcozdhZEB)!QM<H_XnL;{e2$K6G1JA15@3nkr(?x?%osWoz@Dd~=(*sL&i)97N$lZ*
z3&4csSiTp)_M6mDc8M|0_cT$TXe}&E2bOkbPA<H4iQ6|u?MgSI!BmG`Y{~y$fW3b~
zor9|t9@Qg5RwW5stc#wkTZ1SoN#Tr7sNv_Nw2W~lMp(TBtVCcayhc$47BiozmCxxS
zyE@pWYymwTwpd*aK~s@E0x%_oRiP6=afEAFyp@Z;37(oQsdsZ?QP)ISf;)hT*P3|0
zvf#iBSvK})2*GwOwU3#R?JTCB@N43liuvdLn19BH+J;%0zQT-(MKjZ|nj&n;9yMI6
zTDXq0UH7P=smUR8(y%HBmh@e!KLVJVfZ4fPN$OSWIt7|w37cV0H8GfT63ueb5G-Si
z8&~FJ<kWHO)xy8m0N0`xHbx5TvIcHW91m@Yi(XD_jB_vBc9bnZKt&cbg}JJ19~C!V
z5_p0nv5qAfOYXQ}thlzzN~0<~pD5w*RU8IQ$~ySy@>};hG4@yxAxelwm|Hq{0j|zT
zz_{=Wulvz=*@jrZ1}ZLsC?N$x7W6jm2c^I&PUbSEdCyT}&l}-l(oltEXi(Mv5y04z
zBBMDw)W|NH&`H3eq^%=K3P;Gif(+q)rU0gRe-A-nd<kwDkvL&P<`7-|9tKvnu7Ape
z!a*NWYc6;>_MIa-*cq>EQ>6bmTcMl46-679eJsHiJ#(OzJ0i-!`{DvPQR31oGnr`@
z9*p+GOp75vQ4=%^jcAMpcHq2EGQtK|6VwFXB;<g=I_d8^9&#Z)!)>5u=`3t#kyfam
zW@@V5#^>?AiS2IXgtl{^TyxCPn+7;}t7h1*Z+ZY=3QkECgQ`maHg7=t3XNqu!+5p{
zwiJOZH6b@`LS@sA!af@k`^?B5v7`Bf2hCePq^BM9MGoZXy@t<J(XyI?pH{+|r+r}X
zwh|}{StiQdz0<}vZm1*6|HakNbK^xBse@)(2(cqZ?!1+t1{r@m1-1<V(-0J`Md)86
ztOPVSWtFbV(UFw`Ff*BHBQu>D4yJw+132@f2<RM0qO6QV?xX>3MmsMjw>QgaULeEx
z8NLxNILQ(?Y=WK%q(S)rTcL3Kp=5@#*OZ7e+chuf5$>Q_q(AZ0nh<5?8#o!n_{}&v
zuLO|Wb`U5p+P6b!S)?Z#^Pw^xMfXMxYq$4cV7mjsf)%bf13dGZ5Px%?VD<6-2$@As
zWM<pAXhvNO=fXCK!z_Yf0<8DTO`uB4E`(Z*uu%9_;`;++nTqCCl%CAeFj%VymSCQZ
z!^TCUE6lKt;Hx;u)MS@|tP<rSNHIpX?64cfaSsaOG~g<`<RBNEzAiLrfq%;c9d)-}
z@kant5HMR!f$)$TX--2=iPMH)MFx~8&00{~M>cJHkXhjePT5gg@}p}rg6doV&EpZY
zE>tjdd<N@JY@%;p2mDzx+yu-S(ZWveWu-+h3ky;sSc9w{?m#C^V~r6>FoB>6hS})5
z+<5~6EsR)G4vbvQAT#PDbJS39IEWHo=MlGZai3x?^hshEbE273(j<zE6gET4$=Jkf
zsOG>hxGDA#wqBk_dfbKL2|p^&u%7fId&Py|0W&2;3nlaH?gt$YQ+UX*5L>THf#3k!
zfK$%Nc62p2!q>x5K5ay1nJu^ML2<!{j^z-#*COaxi4m|kYI9jW)`Ee91DH6~kJ?O{
zl&6St;~XJs7+b;OCt%_$DiUbav=L6JK5l#q2LxH>p)vI}8xd?_cph@1IPXE*fiOm|
zm$-m#wyFv;Wj)jc$H~DFtr?K&7t`DXZ(bt-ChUucDIz^&Mf*NClFY0Y4vq#{9ep8(
z6wR`oX4%TX?OQb=d&7g?H<D<3IfC?c7o5w~uUHcrG=EI=eST=DRi0ioqXpf1nA(+O
zi*gz|y5w+=>X2G;p+-ja?oDI#KpMU40;njO2~K4uN073pO(n^;0OE{9f?akxeVeEN
zOFE;(jU|BA6h(G|+B8T#Az)4#(&UH}xfw6D(u>M!5Uu;dXxomWWnY5n!^RzFTd@Ug
zv;{fl(f)&e>SYl9C&dY6t29}KWyq6_(~M7BucXj<zy)zhlg!vatz)Wa=QQl+BF+)8
z<3{8k^<qqXljOMwA}4Kh{)!!2v3vJ}kB6y)ewZpu_60Lppoc<R4_&kYHZsmLDUMee
z(Y6`G)Y)b%U9MqZBZ2Bf0NH*Y%a3@gi!I1NEe;h&wOmOZwTl7WK}$e4?~F0a<tV5u
z@w`Bp;dsu5;HWrpLE+_aDDLs1b$<jc0;IhWWXHYmmCZD(!cs7{RdgsXFuV`i(Z1os
z(6J!O<IJpcR;2h|Q3msHmj#m##c}$L3RZ8#XuNH3wK9s)8#-w({L9S3$IVEcv7^d7
z+Iu;Tkz0A>FM8md)<NNKkYdsw1x!f|Q&Yn<Ruz;c1r*MDSlZ<9)5Ioc94OC*v3R~2
z8&|6sBfF|(QL@c}NSS`E-GNZii~w6OL@+`O-r<T3p%xq58D`F+N&5bFRD40cXknQV
zZL=ad&)1Fc?=F+{^}YNYHFBLGu+sBxY8$5&y^=7tZcfzfxEXDGUC7V6k>*5>_wh67
z!73+xXt^4qz40Q&ZJoan$FV=ja}Ze(>L7!A+48g(0j8JqF&A2|vdy2$WAIWIore>g
z{9(i?`Zf+WnXMkX>UR;W-48ydFAgBe*tbm-P^CCM#p&o{%Oq#*Xjuwj{!|&;H(IfD
zriixbAhO*q#A`MrTkI&0c#-LLN&qH1TuAh>D5&vC2Rz(hPdhcH!@^eQ)XbAnEODM7
zGDe0CTNuTdReNnnjXRN<aU(VDX4{zP*BE)i;=rFwIv|jprj;R^Vtk#q#{_q`9+7zq
zIv$Rq>xm@tj7x<L4;CLw;P5LMq{Rg#qjscMJjfpNp~Uv>zLvn$6D6!X*NVO)X%wde
z$V_+<S!2t0s?n&glNcs`L7`FhfGH_{hoY`=Hx%C8Fm}k`Ue;3NU8wE}Vr)B&%P)6h
z<4OsAYf)r-+{kn~(LCry_d*2YN7LxrWQ)#ol{u<YD^4Ufxw<O`*!wB))I@!mW1eQx
zn5OurXlBVgM+<$>Alp+ECt|3Z%<Qql-)V)dO5fE%-DBW)i_lM|`v-Keh^wN7KjdNx
zR&+cTN6+;HTF*t1J03vwP!NlEQaJp27X2rD7`TwY(8GBQ-6~@IkrI~fwqo=7PRw7g
zqA=`7uxw*i4j{a2mj+S2ip(Mo;_KYv`;zxPfGBtQ(B!7C=_9jN4JhuX$68}nJDkSS
z`6AXXl`wlei?RJl3{!+B*p_P-OW1d-N-g2or(q3_+7Kp4>0<_DkL!`x&@egBCxw|0
zy&U@)`k`h5R;0cqbuiJe+BmIjZS-M5Ia~$3B<`_6CI<o+8D-neIT2s7Bf7!`V4Co=
zwc_h`w4M)R@OB2>=Td0iWDBp5)msj<91CFeZVJa<%cAG7mn|1Y@7WY4ZkMqAN*6Zn
zwqx{U9+_SbrGwjBqD30@Avn*W!9}g7;MX_omad|H;2~;p$)@<ydzeAB?OYI37qeKp
zP{jI`W~^K&VPs!i0&GQktc>}G3Yb2b!_dJb(o+=YA-3EMC+QKbbk@3bQilSwq_0N?
zU9cWXS3L~*Cb)%_;FJ=e84~njOabO*HFV;-2JzjWJ_lQqEM;ZqeJHL6xOh94SCx+j
z(RL<+F#<L9xVU^Fi{|AZGP52;XT*<wm{6vfp12gj;>`%!nKjc~#8^K;ned={ZwzgV
zv=2QVcw*GFlm*ciF3N-xo>3#TDLLcN4#ReSUEu*=VOB?iu=Fy}o(N#!kpd1r-ii}X
zcVPdm8s<*q&_3nI6nlQ{Qdz40?G#1WM@wLWficH9tU`>8DxcIMzsaO<M2G4rYRtGC
zwtNFD=?3`w<w$KZ!0#c$Iyga#S^~!VWmZfaxU?cY?v{R{p|l)8Z7Yn9<8gGKO=Exp
zJ#n*$J$I|L3+<S_QAGQCgnCJb&R7<lvA{m4LvqrF%90aps}7WAtdirG4oHf_MGW0W
z;RC&7c0h+<iIcV8A?067t6I`-AxkoXCjFX%`T>CHV_}3x=xq+gX&cyTH>+5^T*eH+
z>R*ph*gcYsC=U4$t=i$p8K7qbQPbS&S`~<{X;3&!-CNZlKBXaO1ni`qtwJEDnfW%<
z=zG-2R$??+(ZfuKZ?0+K6c@0ynHiud<^wdw^M14*ilIyV;=ru}=I&Lo{#qOMztM@U
z4|iha`4$YHPNO{ILyT>k9CjkINb4|bgub02no-KjxE11ihg)@0dT0{A6d(>I+2v3%
zdg(;qPBTApDEK%?>_b|p0x~pegwXGXQdPI}iwc?t0A`FvknDG2hHbZXqeg*mM&EJ-
z<slCev;)FBxe|KV5@beN1#Mahb*f3a^4dPAM0UTHp<D}phk^hok(kt=v|lGx?X(_U
zH%u6~V?lO{o@<yfh~CJ|a<>@~rr4*&wec-xsV)7j76y677Mj=gqjB^-l*G`vG`bJR
z8PVwZ#P=*)IUs07qEnohdrYuV4h%Hi22NHJEr^Y`&My94mP4Imo}|ar^Z&+SH7w%{
z{S!Jk$Mn*HM5V7$`Ynz|c^$QDr^NTZ#m_J_$W$K;m^l(ffkL=&Jdd^WWsL4iN|!Nt
zQv@k0j;m{+p)jkM0F-gAR#*mQLPq;R?HN-cv#y~B;)bNf_j=?AcJr|%>eyZ#I<K10
z|0Ku%b&B@52Bu~e^aXBwl{?jDK&aQsp+QGpGDyeC#8FWr1G^(j4_6c4)U`;U`gz~Z
zVPT6iP7&B(AA|CY8MYA)5PB#hC$fRoz`*u0ax$CxlpJDm=%iwppWwh*WYS<aSZ6hS
zo<agkwBgQVBv{n0I{Gl_S7MZMf~X~6l&gOWm^B(h%Rm5=`_kxNj3Qbx!xH3&i$l-i
z6j(E<%n#7epDCjBC)zqrz6KauXl}=u>nP@-4kdR;4ogH1Z$*jts5nAPT|8w##}yMY
z+rkzQkf;LM7=^yXY}vvL+0Dr}Vuz=B2QYE;wO&!TQ%V+FL}p-kb}?A<b#?({rxCs}
z1FQ_n`XVh0S#NAp!8S`k7swo@6MYX^HAo-V-2@e-LzCv;%*cj56;vE>4Tiek9>cGD
z|7;Q2wR<;xnD`wcg%UEg1#)Zn12oJZrc1Xl19H^TXgWB(EG=RqxJm*jet;s<0GXp+
z0;^tEN2)UfPbm;zR>8{+aU_+}5n3w&v&ES|OA5pYWcxV-S}z&NL^afcnO?4VLIYif
ztIP>$VQado2C`fYjZ+S#l`M9$jiOBigA35kg&<>XohpWAva&}D*C^u`7sSv)a~q*V
zgt?t1YSS<Q8z5j@2z`!=%(S8^Qp2odj8z5|w@o9io$zzf>ABtqOn@YQ;;Vs{Li{Z*
z6KGN}?5k}b44B#%WFY272wy~63!rp00#)S3CmJE6EvVNsls54L=!6>?olHG!y-gL;
zt2C0#YT{&tEy@b9EfaDC2x9X-J=)G2kv&9>Vf)I=+;DNif?(+dXxvGCRl$kLohI|t
ze62dhouX&cH}gFSl4DSVAdPfngF?Q_OuD3ndrl4OAelvLqVe#x{A_)Jfc5BMWtcZJ
z%$vDj#xA~BsZnB6BO{iAsX<Nq(Bx(-(sTW5z=XqpA27i%1sWAbG+9G`2$;$rfL>gT
z)*}w?DWR?Gv|gjF4s|NN>2J@b@XZOBBGCZnEXDn>28kI4+dSFmqi(P){wBsBT8IfX
z`fr+1rs#XvwsPOj35F&+qgRoD(Mo8t1c_~~Vauz@2z7z&N`V%o<02SnCQVfp0t?hg
z`nuc+9pZ;H2ypt^2e_Rfwz!*si9_8*2K{#GS&q{&u7SOatQ;0?C_{t2UOHqWchNvo
zHsrJr^~!$@Si^fdwoAHC8Ibci_nVSR7mX{?*N9X9HnyH<JMNrxf|GCX{u_(?b&6fk
z)EeR6P$GR$4R^ClI`m?qw=o9vP+J<|$jFdhRHNe-rywnbrX)k1mK(@bY;q8=GUF0=
zN<~H~la0`}6C^TCBTY3q6mGVXlatt`gu=ze3owPG8sVzR5t~;dDf}F7P4roYAcqJ)
zUjSyRXrbdm=t5-X00E=-(^t6gJ_5!`C>JM7qJIdO&@egmOZYDdJdq{EnePt-tb0F{
z?l5<h=8k<X4go7g5U1!0Arw@7|BZJyvK=jTu+osm4ych@qgxL*NaqbL5k2fFGqmDl
zN}hm`1%<OZIJnB<=d%P@0&tnQbctqHm(*}du{{`@RBT~Ikc-7BtVxhLKJK_r2d!5F
z1$9kk=OXfR73Mk^sHN7bjFF09M94xhoRTau(ZIZ_VS8#gJZxS39~Vj$=W9bkd+VuX
z+_zv8n#i<&+mgbtDph<Qw^RBF!$vN$2;a7U^Mh;RC;haMDwH~IsDVb5u2^dj#!Yw;
z0!NyPH<aF(Z`wpXbBXK72uO%iNMo&&j&xdr4An`Kbj_%fLK~Y?!M`X%H!~R-`~Jo?
zS~&4I95iHw(6dG}1=hw}9dEg48d?fN*a&0D2%TRC1>d`Y+P7PXwAc=zp#)Ar;Z_k$
zjhov|(buxQHNy6gkxDXDPgziKp=5S0JQ-G}rq|-MmAk|cpghQb2bd_KUm`;a{Ssh_
z99h@IK^3gRG4$R~`iUPx{QVz|lq=~?)TFIASE$)3IZa%hII$@Xs_{dbI4SL&a@eb!
zVt#HA$G$kPsIzmUozx`)W)X+CyQoR@YSQ@T>v!?>qUzQ3J6vHocdU_Y7AxN%tb~#~
z#Lrbas7C=hcfS!Dmj*HuSDLTcMYc=tA%3h<*bP0OPe(4($k3#hL2l-IiW9ar-Z}^h
z7e+i!Fsa@|!055+Nq|OugERnkQ>WhFruVC^zCrpjL!(@SMy25oe>773sH^y$Quo}W
z{KpDcsKN~n?_4kTUdgRq>F|%t^#0F~`j|bbc|jkehFAK(c%C@7DSl2=DgN*C@xA<9
zVL#dP-fQ14K3^Oik&cjvpA+S4o2>7Z_)I6?#~tK*i=QVAQg{5)Yown+{k`{)UMIHC
z=HDp??~CH+OU3(Qd!=m_pCf)F?Y++s^{?LVz1sQdRq=jNXhJm!EP;){NMN-~{Ftk$
zwjw>?S$zM8Z?`3p``@~Vft_tAF!|jN-=@hz>8F)5(vP|d%85SxKlQs3nC$$tavHnq
b>hb>pQ2c{xry;sN00000NkvXXu0mjf9pRLT