From c9d9ec72d607c3cfa92e698c79443addb10c7d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=AB=E5=9F=8Evia?= <mochengvia@panuon.com>
Date: Wed, 28 Dec 2022 17:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/ToolBar.xaml      |  93 +----
 VPet-Simulator.Windows/App.xaml               |   7 +-
 .../Design/Theme/basestyle.xaml               |  75 ++++
 .../Design/Theme/default.xaml                 |  77 ++++
 .../VPet-Simulator.Windows.csproj             |  15 +-
 VPet-Simulator.Windows/winSetting.xaml        | 345 ------------------
 VPet-Simulator.Windows/winSetting.xaml.cs     |  27 --
 7 files changed, 184 insertions(+), 455 deletions(-)
 create mode 100644 VPet-Simulator.Windows/Design/Theme/basestyle.xaml
 create mode 100644 VPet-Simulator.Windows/Design/Theme/default.xaml
 delete mode 100644 VPet-Simulator.Windows/winSetting.xaml
 delete mode 100644 VPet-Simulator.Windows/winSetting.xaml.cs

diff --git a/VPet-Simulator.Core/Display/ToolBar.xaml b/VPet-Simulator.Core/Display/ToolBar.xaml
index a917d68..430ba3c 100644
--- a/VPet-Simulator.Core/Display/ToolBar.xaml
+++ b/VPet-Simulator.Core/Display/ToolBar.xaml
@@ -8,80 +8,23 @@
         <ResourceDictionary Source="Theme.xaml" />
     </UserControl.Resources>
     <Grid>
-        <pu:ContentControlX BorderBrush="{DynamicResource DARKPrimaryDarker}" Background="{DynamicResource Secondary}"
-                BorderThickness="2" CornerRadius="5" Height="200" Width="300" VerticalAlignment="Bottom"
-                HorizontalAlignment="Left" Margin="0,0,0,50">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*" />
-                    <RowDefinition Height="10" />
-                    <RowDefinition Height="1*" />
-                    <RowDefinition Height="10" />
-                    <RowDefinition Height="1*" />
-                    <RowDefinition Height="10" />
-                    <RowDefinition Height="1*" />
-                    <RowDefinition Height="10" />
-                    <RowDefinition Height="1*" />
-                </Grid.RowDefinitions>
-                <Button Background="Transparent" Content="投喂" FontSize="24" Foreground="{DynamicResource PrimaryText}"
-                        BorderBrush="Transparent" pu:ButtonHelper.HoverBackground="{DynamicResource Secondary}" />
-                <Button Background="Transparent" Content="面板" FontSize="24" Foreground="{DynamicResource PrimaryText}"
-                        BorderBrush="Transparent" pu:ButtonHelper.HoverBackground="{DynamicResource Secondary}"
-                        Grid.Row="4" Margin="0,-1,0,0" />
-                <Button Background="Transparent" Content="打工" FontSize="24" Foreground="{DynamicResource PrimaryText}"
-                        BorderBrush="Transparent" pu:ButtonHelper.HoverBackground="{DynamicResource Secondary}"
-                        Grid.Row="2" Margin="0,-1,0,0" />
-                <Button Background="Transparent" Content="睡觉" FontSize="24" Foreground="{DynamicResource PrimaryText}"
-                        BorderBrush="Transparent" pu:ButtonHelper.HoverBackground="{DynamicResource Secondary}"
-                        Grid.Row="6" Margin="0,-1,0,0" />
-                <Button Background="Transparent" Content="设置" FontSize="24" Foreground="{DynamicResource PrimaryText}"
-                        BorderBrush="Transparent" pu:ButtonHelper.HoverBackground="{DynamicResource Secondary}"
-                        Grid.Row="8" Margin="0,-4,0,0" />
-                <Rectangle Grid.Row="1" Fill="{DynamicResource SecondaryDarker}" Height="2" VerticalAlignment="Center" />
-                <Rectangle Grid.Row="3" Fill="{DynamicResource SecondaryDarker}" Height="2" VerticalAlignment="Center" />
-                <Rectangle Grid.Row="5" Fill="{DynamicResource SecondaryDarker}" Height="2" VerticalAlignment="Center" />
-                <Rectangle Grid.Row="7" Fill="{DynamicResource SecondaryDarker}" Height="2" VerticalAlignment="Center" />
-            </Grid>
-        </pu:ContentControlX>
-        <pu:ContentControlX BorderBrush="{DynamicResource DARKPrimaryDarker}"
-                Background="{DynamicResource SecondaryLight}" BorderThickness="2" CornerRadius="5" Height="50"
-                Width="500" VerticalAlignment="Bottom">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="1*" />
-                </Grid.ColumnDefinitions>
-                <Button Background="Transparent" Content="投喂" FontSize="24" Foreground="{DynamicResource PrimaryText}"
-                        BorderBrush="Transparent" pu:ButtonHelper.HoverBackground="{DynamicResource Secondary}" />
-                <Button Background="Transparent" Content="面板" FontSize="24" Foreground="{DynamicResource PrimaryText}"
-                        BorderBrush="Transparent" pu:ButtonHelper.HoverBackground="{DynamicResource Secondary}"
-                        Grid.Column="4" />
-                <Button Background="Transparent" Content="打工" FontSize="24" Foreground="{DynamicResource PrimaryText}"
-                        BorderBrush="Transparent" pu:ButtonHelper.HoverBackground="{DynamicResource Secondary}"
-                        Grid.Column="2" />
-                <Button Background="Transparent" Content="睡觉" FontSize="24" Foreground="{DynamicResource PrimaryText}"
-                        BorderBrush="Transparent" pu:ButtonHelper.HoverBackground="{DynamicResource Secondary}"
-                        Grid.Column="6" />
-                <Button Background="Transparent" Content="设置" FontSize="24" Foreground="{DynamicResource PrimaryText}"
-                        BorderBrush="Transparent" pu:ButtonHelper.HoverBackground="{DynamicResource Secondary}"
-                        Grid.Column="8" />
-                <Rectangle Grid.Column="1" Width="2" Fill="{DynamicResource SecondaryDarker}"
-                        HorizontalAlignment="Center" Margin="0,6,0,6" />
-                <Rectangle Grid.Column="3" Width="2" Fill="{DynamicResource SecondaryDarker}"
-                        HorizontalAlignment="Center" Margin="0,6,0,6" />
-                <Rectangle Grid.Column="5" Width="2" Fill="{DynamicResource SecondaryDarker}"
-                        HorizontalAlignment="Center" Margin="0,6,0,6" />
-                <Rectangle Grid.Column="7" Width="2" Fill="{DynamicResource SecondaryDarker}"
-                        HorizontalAlignment="Center" Margin="0,6,0,6" />
-
-            </Grid>
-        </pu:ContentControlX>
+        <Menu Width="500"
+              VerticalAlignment="Bottom"
+              Style="{DynamicResource ToolBarMenuStyle}">
+            <Menu.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <UniformGrid Columns="5"/>
+                </ItemsPanelTemplate>
+            </Menu.ItemsPanel>
+            <MenuItem Header="投喂">
+                <MenuItem Header="食物" />
+                <MenuItem Header="饮料" />
+                <MenuItem Header="药品" />
+            </MenuItem>
+            <MenuItem Header="面板" />
+            <MenuItem Header="打工" />
+            <MenuItem Header="睡觉" />
+            <MenuItem Header="设置" />
+        </Menu>
     </Grid>
 </UserControl>
diff --git a/VPet-Simulator.Windows/App.xaml b/VPet-Simulator.Windows/App.xaml
index 9e0cf2b..93aaf24 100644
--- a/VPet-Simulator.Windows/App.xaml
+++ b/VPet-Simulator.Windows/App.xaml
@@ -4,6 +4,11 @@
              xmlns:local="clr-namespace:VPet_Simulator.Windows"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-         
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/VPet-Simulator.Windows;component/Design/Theme/default.xaml" />
+                <ResourceDictionary Source="/VPet-Simulator.Windows;component/Design/Theme/basestyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/VPet-Simulator.Windows/Design/Theme/basestyle.xaml b/VPet-Simulator.Windows/Design/Theme/basestyle.xaml
new file mode 100644
index 0000000..344c5e4
--- /dev/null
+++ b/VPet-Simulator.Windows/Design/Theme/basestyle.xaml
@@ -0,0 +1,75 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
+                    xmlns:pucore="clr-namespace:Panuon.WPF;assembly=Panuon.WPF">
+    <ResourceDictionary.MergedDictionaries>
+        <pucore:SharedResourceDictionary Source="/Panuon.WPF.UI;component/Control.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="ToolBarMenuStyle"
+           TargetType="Menu"
+           BasedOn="{StaticResource {x:Type Menu}}">
+        <Setter Property="Height"
+                Value="55" />
+        <Setter Property="FontSize"
+                Value="24" />
+        <Setter Property="VerticalContentAlignment"
+                Value="Center" />
+        <Setter Property="pu:MenuHelper.TopLevelDropDownVerticalOffset"
+                Value="-20" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource DARKPrimaryDarker}" />
+        <Setter Property="Background"
+                Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="pu:MenuHelper.CornerRadius"
+                Value="5" />
+        <Setter Property="pu:MenuHelper.TopLevelDropDownPlacement"
+                Value="TopRight" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsPadding"
+                Value="20,0" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsCornerRadius"
+                Value="7" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsBackground"
+                Value="Transparent" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsHoverBackground"
+                Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsHoverForeground"
+                Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsOpenedBackground"
+                Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:MenuHelper.TopLevelItemsOpenedForeground"
+                Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsPadding"
+                Value="20,0" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsHeight"
+                Value="55" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsIconWidth"
+                Value="NaN" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsWidth"
+                Value="200" />
+        <Setter Property="pu:DropDownHelper.CornerRadius"
+                Value="5" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsBackground"
+                Value="Transparent" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsHoverBackground"
+                Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsHoverForeground"
+                Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsOpenedBackground"
+                Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsOpenedForeground"
+                Value="{DynamicResource DARKPrimaryText}" />
+
+        <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorVisibility"
+                Value="Visible" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorBrush"
+                Value="#CCCECF" />
+        <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorMargin"
+                Value="10,0" />
+        <Setter Property="pu:ShadowHelper.Opacity"
+                Value="0.7" />
+        <Setter Property="pu:ShadowHelper.BlurRadius"
+                Value="15" />
+    </Style>
+    
+</ResourceDictionary>
\ No newline at end of file
diff --git a/VPet-Simulator.Windows/Design/Theme/default.xaml b/VPet-Simulator.Windows/Design/Theme/default.xaml
new file mode 100644
index 0000000..47c7804
--- /dev/null
+++ b/VPet-Simulator.Windows/Design/Theme/default.xaml
@@ -0,0 +1,77 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:VPet_Simulator.Windows">
+    <!--
+        注释: 主题中的部分颜色是根据计算算出来的,比如说Trans
+    -->
+    <SolidColorBrush x:Key="Primary"
+                     Color="#FF81d4fa" />
+    <SolidColorBrush x:Key="PrimaryTrans"
+                     Color="#CC81d4fa" />
+    <SolidColorBrush x:Key="PrimaryTrans4"
+                     Color="#4481d4fa" />
+    <SolidColorBrush x:Key="PrimaryTransA"
+                     Color="#AA81d4fa" />
+    <SolidColorBrush x:Key="PrimaryTransE"
+                     Color="#EE81d4fa" />
+
+    <SolidColorBrush x:Key="PrimaryLight"
+                     Color="#FFA3E2FF" />
+    <SolidColorBrush x:Key="PrimaryLighter"
+                     Color="#FFC1EBFF" />
+    <SolidColorBrush x:Key="PrimaryDark"
+                     Color="#FF5CBEEA" />
+    <SolidColorBrush x:Key="PrimaryDarker"
+                     Color="#FF3CA9DB" />
+    <SolidColorBrush x:Key="PrimaryText"
+                     Color="#FF000000" />
+    <SolidColorBrush x:Key="PrimaryHover"
+                     Color="#FFA4D4F9"/>
+
+
+    <SolidColorBrush x:Key="Secondary"
+                     Color="#FF90caf9" />
+    <SolidColorBrush x:Key="SecondaryTrans"
+                     Color="#CC90caf9" />
+    <SolidColorBrush x:Key="SecondaryTrans4"
+                     Color="#4490caf9" />
+    <SolidColorBrush x:Key="SecondaryTransA"
+                     Color="#AA90caf9" />
+    <SolidColorBrush x:Key="SecondaryTransE"
+                     Color="#EE90caf9" />
+    
+    <SolidColorBrush x:Key="SecondaryLight"
+                     Color="#FFADD7F9" />
+    <SolidColorBrush x:Key="SecondaryLighter"
+                     Color="#FFCBE4F9" />
+    <SolidColorBrush x:Key="SecondaryDark"
+                     Color="#FF6BB1E9" />
+    <SolidColorBrush x:Key="SecondaryDarker"
+                     Color="#FF4999DA" />
+    <SolidColorBrush x:Key="SecondaryText"
+                     Color="#FF000000" />
+
+
+    <SolidColorBrush x:Key="DARKPrimary"
+                     Color="#FF039be5" />
+    <SolidColorBrush x:Key="DARKPrimaryTrans"
+                     Color="#CC039be5" />
+    <SolidColorBrush x:Key="DARKPrimaryTrans4"
+                     Color="#44039be5" />
+    <SolidColorBrush x:Key="DARKPrimaryTransA"
+                     Color="#AA039be5" />
+    <SolidColorBrush x:Key="DARKPrimaryTransE"
+                     Color="#EE039be5" />
+    
+    <SolidColorBrush x:Key="DARKPrimaryLight"
+                     Color="#FF1FA9EC" />
+    <SolidColorBrush x:Key="DARKPrimaryLighter"
+                     Color="#FF3DB8F4" />
+    <SolidColorBrush x:Key="DARKPrimaryDark"
+                     Color="#FF0290D5" />
+    <SolidColorBrush x:Key="DARKPrimaryDarker"
+                     Color="#FF0286C6" />
+    <SolidColorBrush x:Key="DARKPrimaryText" Color="#FFffffff" />
+
+    <Color x:Key="ShadowColor">#90CAF9</Color>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
index 81d6324..a911ac3 100644
--- a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
+++ b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
@@ -104,9 +104,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="winSetting.xaml.cs">
-      <DependentUpon>winSetting.xaml</DependentUpon>
-    </Compile>
+    <Page Include="Design\Theme\basestyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Design\Theme\default.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -120,10 +125,6 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="winSetting.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup Condition="'$(Platform)' == 'x86'">
     <Reference Include="Facepunch.Steamworks.Win32, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/VPet-Simulator.Windows/winSetting.xaml b/VPet-Simulator.Windows/winSetting.xaml
deleted file mode 100644
index a32ff90..0000000
--- a/VPet-Simulator.Windows/winSetting.xaml
+++ /dev/null
@@ -1,345 +0,0 @@
-<Window x:Class="VPet_Simulator.Windows.winSetting"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:VPet_Simulator.Windows"
-        mc:Ignorable="d"
-        xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" mc:Ignorable="d" Height="420" Width="400">
-    <Grid>
-        <TabControl Margin="5" BorderThickness="0" pu:TabControlHelper.ItemsHeight="NaN"
-                pu:TabControlHelper.ItemsFontSize="14" Background="Transparent" pu:TabControlHelper.ItemsPadding="10,7"
-                pu:TabControlHelper.ItemsCornerRadius="4"
-                pu:TabControlHelper.ItemsHoverBackground="{DynamicResource PrimaryLight}"
-                pu:TabControlHelper.ItemsSelectedBackground="{DynamicResource PrimaryDark}"
-                pu:TabControlHelper.ItemsSelectedForeground="{DynamicResource DARKPrimaryText}"
-                Foreground="{DynamicResource PrimaryText}">
-            <TabControl.ContentTemplate>
-                <DataTemplate>
-                    <Border Margin="5,10,5,20" CornerRadius="15" Background="{DynamicResource DARKPrimaryText}">
-                        <ContentControl Content="{Binding}" Margin="15" />
-                    </Border>
-                </DataTemplate>
-            </TabControl.ContentTemplate>
-            <TabItem Header="系统" Foreground="{DynamicResource PrimaryText}"
-                    BorderBrush="{DynamicResource PrimaryDarker}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="15" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="35" />
-                        <RowDefinition Height="35" />
-                        <RowDefinition Height="35" />
-                        <RowDefinition Height="35" />
-                        <RowDefinition Height="35" />
-                        <RowDefinition Height="169*" />
-                    </Grid.RowDefinitions>
-                    <TextBlock Text="自动保存" VerticalAlignment="Center" FontSize="14" />
-                    <ComboBox x:Name="ResolutionBox" Grid.Column="2" Style="{DynamicResource StandardComboBoxStyle}"
-                            SelectedIndex="0" SelectionChanged="ResolutionBox_SelectionChanged" Margin="0,2,0,3">
-                        <!--1.77-->
-                        <ComboBoxItem Content="1280x720" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="1280x800" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="1280x960" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="1440x810" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="1440x900" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="1440x1080" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="1600x900" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="1600x1000" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="1600x1200" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="1680x945" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="1680x1050" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="1680x1260" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="1920x1080" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="1920x1200" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="1920x1440" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="2048x1152" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="2048x1260" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="2048x1536" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="2056x1440" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="2056x1600" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="2056x1920" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="3840x2160" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="3840x2400" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="3840x2880" />
-                    </ComboBox>
-                    <TextBlock Grid.Row="1" Text="互动频率" VerticalAlignment="Center" FontSize="14" />
-                    <ComboBox Grid.Row="1" Grid.Column="2"  Style="{DynamicResource StandardComboBoxStyle}"
-                            SelectedIndex="0" SelectionChanged="ResolutionBox_SelectionChanged" Margin="0,2,0,3">
-                        <!--1.77-->
-                        <ComboBoxItem Content="1280x720" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="1280x800" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="1280x960" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="1440x810" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="1440x900" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="1440x1080" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="1600x900" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="1600x1000" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="1600x1200" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="1680x945" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="1680x1050" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="1680x1260" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="1920x1080" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="1920x1200" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="1920x1440" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="2048x1152" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="2048x1260" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="2048x1536" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="2056x1440" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="2056x1600" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="2056x1920" />
-                        <!--1.77-->
-                        <ComboBoxItem Content="3840x2160" />
-                        <!--1.6-->
-                        <ComboBoxItem Content="3840x2400" />
-                        <!--1.33-->
-                        <ComboBoxItem Content="3840x2880" />
-                    </ComboBox>
-                   
-                    <TextBlock Grid.Row="2" Text="缩放等级" VerticalAlignment="Center" FontSize="14" />
-
-                    <Grid Grid.Column="2" Grid.Row="2">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Slider Thumb.DragCompleted="ZoomSlider_DragCompleted" TickFrequency="1"
-                                IsSnapToTickEnabled="True" x:Name="ZoomSlider"
-                                Style="{DynamicResource StandardSliderStyle}" VerticalAlignment="Center" Maximum="100"
-                                SmallChange="1" PreviewMouseLeftButtonUp="ZoomSlider_MouseLeftButtonUp" Minimum="50"
-                                LargeChange="10" Value="75" />
-                        <TextBlock Grid.Column="1" Margin="15,0,0,0" VerticalAlignment="Center"
-                                Text="{Binding ElementName=ZoomSlider,Path=Value}" FontSize="16"
-                                Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" Background="{x:Null}" />
-                    </Grid>
-                    <TextBlock Grid.Row="3" Text="主题" VerticalAlignment="Center" FontSize="14" />
-                    <ComboBox x:Name="ThemeBox" Grid.Row="3" Grid.Column="2"
-                            SelectionChanged="ThemeBox_SelectionChanged" Style="{DynamicResource StandardComboBoxStyle}"
-                            Margin="0,3,0,2" />
-
-                    <TextBlock Grid.Row="4" Text="字体" VerticalAlignment="Center" FontSize="14" />
-                    <ComboBox x:Name="FontBox" Grid.Row="4" Grid.Column="2" SelectionChanged="FontBox_SelectionChanged"
-                            Style="{DynamicResource StandardComboBoxStyle}" Margin="0,3,0,2" />
-
-                </Grid>
-            </TabItem>            
-            <TabItem Header="诊断" BorderBrush="{DynamicResource PrimaryDarker}">
-                <StackPanel>
-                    <TextBlock HorizontalAlignment="Left" FontSize="11" VerticalAlignment="Top" Background="{x:Null}"
-                            TextWrapping="Wrap">
-                                        <Run FontWeight="Bold" FontSize="16">诊断与反馈</Run><LineBreak />
-                    <Run>选择要发送给 LBGame 的诊断数据,诊断数据用于保护和及时更新 虚拟桌宠模拟器, 解决问题并改进产品.</Run><LineBreak />
-                    <Run>无论选择哪个选项,设备都可以安全正常地运行.</Run> <Hyperlink Click="hyper_moreInfo">获取有关这些设置的更多信息</Hyperlink>
-                    </TextBlock>
-                    <RadioButton x:Name="RBDiagnosisYES" Style="{DynamicResource StandardRadioButtonStyle}"
-                            Content="发送诊断数据: 发送有关该设备的存档, 包括购买的游戏,盈&#13;利,体力,状态等各种系统内数据" HorizontalAlignment="Left"
-                            Margin="10,10,10,0" VerticalAlignment="Top" GroupName="diagnosis"
-                            Checked="RBDiagnosisYES_Checked" />
-                    <RadioButton x:Name="RBDiagnosisNO" Style="{DynamicResource StandardRadioButtonStyle}"
-                            Content="不发送诊断数据: 适用于启用修改器,修改过游戏数据等不&#13;符合分析数据条件. 或不希望提供游戏数据的玩家" HorizontalAlignment="Left"
-                            Margin="10,10,10,0" VerticalAlignment="Top" GroupName="diagnosis"
-                            Checked="RBDiagnosisNO_Checked" />
-                    <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,15,0,0"
-                            Background="{x:Null}" TextWrapping="Wrap">
-                    <Run FontWeight="Bold" FontSize="14">反馈频率</Run><LineBreak />
-                    <Run>虚拟桌宠模拟器 应寻求我反馈按以下频率</Run>
-                    </TextBlock>
-                    <ComboBox x:Name="CBDiagnosis" SelectedIndex="1" VerticalAlignment="Top" Margin="10,5,0,0"
-                            HorizontalAlignment="Left" Style="{DynamicResource StandardComboBoxStyle}" Width="200"
-                            SelectionChanged="CBDiagnosis_SelectionChanged">
-                        <ComboBoxItem>每周一次</ComboBoxItem>
-                        <ComboBoxItem>每2周一次</ComboBoxItem>
-                        <ComboBoxItem>每月一次</ComboBoxItem>
-                        <ComboBoxItem>每2个月一次</ComboBoxItem>
-                        <ComboBoxItem>每3个月一次</ComboBoxItem>
-                    </ComboBox>
-                </StackPanel>
-            </TabItem>
-            <TabItem Header="MOD管理" BorderBrush="{DynamicResource PrimaryDarker}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="120" />
-                        <ColumnDefinition Width="15" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <ListBox x:Name="ListMod" BorderThickness="0" Background="Transparent"
-                            Style="{DynamicResource SideMenuListBoxStyle}" VerticalAlignment="Top" FontSize="12"
-                            SelectionChanged="ListMod_SelectionChanged" SelectionMode="Single" />
-                    <StackPanel Grid.Column="2">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="7" />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <Image x:Name="ImageMOD" HorizontalAlignment="Right" Height="85" Margin="0,5,0,0"
-                                    VerticalAlignment="Top" Width="85" Stretch="Fill" />
-                            <StackPanel Grid.Column="2">
-                                <Label x:Name="LabelModName" Content="Core" HorizontalAlignment="Left" Margin="-5,2,0,0"
-                                        VerticalAlignment="Top" FontWeight="Bold" FontSize="18" Background="{x:Null}"
-                                        Foreground="{DynamicResource PrimaryText}" />
-                                <TextBlock Margin="0,0,0,0" TextWrapping="Wrap" FontSize="12">
-                                <Run Text="模组作者: " /><LineBreak />
-                                <Run x:Name="runMODAuthor" Text="LorisYounger" />
-                                <LineBreak /><Run Text="模组版本: " /><Run x:Name="runMODVer" Text="1.0" />
-                                <LineBreak /><Run Text="游戏版本: " /><Run x:Name="runMODGameVer" Text="1.0" />
-                                </TextBlock>
-                            </StackPanel>
-                        </Grid>
-                        <ScrollViewer VerticalScrollBarVisibility="Auto" Height="60" Margin="0,7,0,0"
-                                pu:ScrollViewerHelper.ScrollBarThickness="10" HorizontalAlignment="Left"
-                                VerticalAlignment="Top">
-                            <TextBlock x:Name="GameInfo" FontSize="12" TextWrapping="Wrap"
-                                    Text="这里是MOD的介绍内容,你的介绍就是你的介绍&#xA;" VerticalAlignment="Top" />
-                        </ScrollViewer>
-                        <Grid Height="140">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <StackPanel>
-                                <Label Content="MOD介绍" HorizontalAlignment="Left" Margin="-5,0,0,0"
-                                        VerticalAlignment="Center" FontSize="18" FontWeight="Bold" Background="{x:Null}" />
-                                <ScrollViewer VerticalScrollBarVisibility="Auto" Height="140" Margin="0,0,0,0"
-                                        pu:ScrollViewerHelper.ScrollBarThickness="10" HorizontalAlignment="Left"
-                                        VerticalAlignment="Top">
-                                    <TextBlock x:Name="GameHave" FontSize="12" TextWrapping="Wrap"
-                                            Text="该mod有许多功能&#xA;比如说功能1&#xA;比如说功能1&#xA;比如说功能1&#xA;比如说功能1&#xA;比如说功能1"
-                                            HorizontalAlignment="Left" VerticalAlignment="Top" />
-                                </ScrollViewer>
-                            </StackPanel>
-                            <StackPanel Grid.Column="1">
-                                <Label Content="内容" HorizontalAlignment="Left" Margin="-5,0,0,0" VerticalAlignment="Top"
-                                        FontSize="18" FontWeight="Bold" Background="{x:Null}" />
-                                <TextBlock x:Name="ButtonOpenModFolder" Cursor="Hand" HorizontalAlignment="Left"
-                                        Margin="0,0,0,0" TextWrapping="Wrap" Text="所在文件夹" VerticalAlignment="Top"
-                                        FontSize="12" Foreground="{DynamicResource DARKPrimaryDarker}"
-                                        TextDecorations="Underline" MouseDown="ButtonOpenModFolder_MouseDown" />
-                                <TextBlock x:Name="ButtonEnable" HorizontalAlignment="Left" Margin="0,2,0,0"
-                                        TextWrapping="Wrap" Text="启用该模组" VerticalAlignment="Top" FontSize="12"
-                                        Width="62" Foreground="{DynamicResource DARKPrimaryDarker}"
-                                        TextDecorations="Underline" Cursor="Hand" MouseDown="ButtonEnable_MouseDown" />
-                                <TextBlock x:Name="ButtonDisEnable" HorizontalAlignment="Left" Margin="0,2,0,0"
-                                        TextWrapping="Wrap" Text="停用该模组" VerticalAlignment="Top" FontSize="12"
-                                        Width="62" Foreground="{DynamicResource DARKPrimaryDarker}"
-                                        TextDecorations="Underline" Cursor="Hand" MouseDown="ButtonDisEnable_MouseDown" />
-                                <TextBlock x:Name="ButtonPublish" HorizontalAlignment="Left" Margin="0,2,0,0"
-                                        TextWrapping="Wrap" Text="更新至Steam" VerticalAlignment="Top" FontSize="12"
-                                        Width="74" Foreground="DimGray" TextDecorations="Underline" Cursor="Hand"
-                                        IsEnabled="False" MouseDown="ButtonPublish_MouseDown" />
-                                <TextBlock x:Name="ButtonSteam" HorizontalAlignment="Left" Margin="0,2,0,0"
-                                        TextWrapping="Wrap" Text="创意工坊页面" VerticalAlignment="Top" FontSize="12"
-                                        Width="72" Foreground="DimGray" TextDecorations="Underline" Cursor="Hand"
-                                        IsEnabled="False" MouseDown="ButtonSteam_MouseDown" />
-                                <ProgressBar x:Name="ProgressBarUpload" Margin="0,2,0,0" Visibility="Collapsed"
-                                        pu:ProgressBarHelper.CornerRadius="2" VerticalAlignment="Top" Height="30"
-                                        Value="60" Background="{DynamicResource Primary}"
-                                        BorderBrush="{DynamicResource PrimaryDarker}"
-                                        pu:ProgressBarHelper.IsPercentVisible="True"
-                                        Foreground="{DynamicResource DARKPrimary}" BorderThickness="2" />
-                                <Button x:Name="ButtonAllow" Content="启用代码插件" HorizontalAlignment="Left"
-                                        VerticalAlignment="Top" Background="#FFFF2C2C" Foreground="White" FontSize="10"
-                                        ToolTip="启用该模组的代码内容,不能保证系统安全性" Click="ButtonAllow_Click" />
-                            </StackPanel>
-                            <Button x:Name="ButtonRestart" Content="重启软件以应用更改" Margin="0,2,0,0"
-                                    VerticalAlignment="Bottom" Background="{DynamicResource DARKPrimary}"
-                                    Visibility="Collapsed" Foreground="{DynamicResource DARKPrimaryText}"
-                                    Click="ButtonRestart_Click" Grid.ColumnSpan="2" />
-                        </Grid>
-                    </StackPanel>
-                </Grid>
-            </TabItem>
-            <TabItem Header="关于" BorderBrush="{DynamicResource PrimaryDarker}"
-                    Foreground="{DynamicResource PrimaryText}">
-                <Grid HorizontalAlignment="Left" VerticalAlignment="Top">
-                    <TextBlock Margin="0,0,0,0" Text="虚拟桌宠模拟器" FontSize="20" FontWeight="Bold" />
-                    <TextBlock Margin="0,30,0,0" FontWeight="Bold">
-                    <Run>用户名</Run><LineBreak />
-                    <Run>版本</Run><LineBreak />
-                    <Run>激活</Run><LineBreak />
-                    </TextBlock>
-                    <TextBlock VerticalAlignment="Top" Margin="100,30,0,0">
-                    <Run x:Name="runUserName">杨远洛里斯</Run><LineBreak />
-                    <Run x:Name="runabVer">v1.0 (100)</Run><LineBreak />
-                    <Run x:Name="runActivate">已通过Steam[uid]激活服务注册</Run><LineBreak />
-                    </TextBlock>
-                    <TextBlock Margin="0,100,0,0" Text="制作组名单" FontSize="20" FontWeight="Bold" />
-                    <TextBlock Margin="0,130,0,0" FontWeight="Bold">
-                    <Run>游戏策划</Run><LineBreak />
-                    <Run>UI&amp;程序</Run><LineBreak />
-                    <Run>主要美术</Run><LineBreak />
-                    <Run>桌宠动画</Run><LineBreak />
-                    <Run>开源项目</Run><LineBreak />
-                    <LineBreak /><LineBreak />
-                    <LineBreak /><Run xml:space="preserve">Power By        </Run>
-                    <Run TextDecorations="Underline">exLB.net</Run>
-                    <Run> </Run>
-                    <Run TextDecorations="Underline">LBGame</Run>
-                    </TextBlock>
-                    <TextBlock Margin="100,130,0,0">
-                    <Run>杨远洛里斯</Run><LineBreak />
-                    <Run>洛里斯杨远, トニーちゃん</Run><LineBreak />
-                    <Run>叶书天</Run><LineBreak />
-                    <Run>叶书天, 广大MOD作者</Run><LineBreak />
-                    <Hyperlink>Panuon.WPF.UI</Hyperlink>
-                    <Hyperlink>LinePutScript</Hyperlink><LineBreak />
-                    <Hyperlink>Facepunch.Steamworks</Hyperlink>
-                    <Hyperlink>查看引用名单</Hyperlink>
-                    <LineBreak />                    
-                    <Run FontStyle="Italic" FontSize="8">由于游戏暂未开发完毕,该名单并非完整名单.将在正式版完成前修改</Run><LineBreak />
-                    </TextBlock>
-                    <Image Source="Res/TopLogo2018.PNG" Width="38"
-                            Margin="99,334,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
-                </Grid>
-            </TabItem>
-        </TabControl>
-        <Label x:Name="GameVerison" Content="版本v1.0 (655366666)" HorizontalAlignment="Left" Margin="0,398,0,-1"
-                VerticalAlignment="Top" FontSize="10" Foreground="Green" Background="{x:Null}" />
-    </Grid>
-</Window>
diff --git a/VPet-Simulator.Windows/winSetting.xaml.cs b/VPet-Simulator.Windows/winSetting.xaml.cs
deleted file mode 100644
index 2d27027..0000000
--- a/VPet-Simulator.Windows/winSetting.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-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.Shapes;
-
-namespace VPet_Simulator.Windows
-{
-    /// <summary>
-    /// winSetting.xaml 的交互逻辑
-    /// </summary>
-    public partial class winSetting : Window
-    {
-        public winSetting()
-        {
-            InitializeComponent();
-        }
-    }
-}