From 95b92e5240d62fd2db117b9b01f9f66e7e68facb Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Fri, 10 Mar 2023 23:22:16 +1100
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=92=8C?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Graph/IGraph.cs           |  4 +-
 .../VPet-Simulator.Core.csproj                |  4 +-
 VPet-Simulator.Core/packages.config           |  2 +-
 .../VPet-Simulator.Windows.csproj             |  4 +-
 .../WinDesign/winGameSetting.xaml             | 52 +++++++++----------
 VPet-Simulator.Windows/packages.config        |  2 +-
 6 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/VPet-Simulator.Core/Graph/IGraph.cs b/VPet-Simulator.Core/Graph/IGraph.cs
index dcc130f..9ebe144 100644
--- a/VPet-Simulator.Core/Graph/IGraph.cs
+++ b/VPet-Simulator.Core/Graph/IGraph.cs
@@ -38,11 +38,11 @@ namespace VPet_Simulator.Core
         ///// </summary>
         //bool StoreMemory { get; }
         /// <summary>
-        /// 该动画UI状态
+        /// 该动画模式
         /// </summary>
         Save.ModeType ModeType { get; }
         /// <summary>
-        /// 该动画UI状态
+        /// 该动画类型
         /// </summary>
         GraphType GraphType { get; }
         /// <summary>
diff --git a/VPet-Simulator.Core/VPet-Simulator.Core.csproj b/VPet-Simulator.Core/VPet-Simulator.Core.csproj
index 0d72d27..52a11ad 100644
--- a/VPet-Simulator.Core/VPet-Simulator.Core.csproj
+++ b/VPet-Simulator.Core/VPet-Simulator.Core.csproj
@@ -74,8 +74,8 @@
     <Reference Include="Panuon.WPF, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\VUPSimulator\packages\Panuon.WPF.1.0.1\lib\net462\Panuon.WPF.dll</HintPath>
     </Reference>
-    <Reference Include="Panuon.WPF.UI, Version=1.1.7.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\VUPSimulator\packages\Panuon.WPF.UI.1.1.7.2\lib\net462\Panuon.WPF.UI.dll</HintPath>
+    <Reference Include="Panuon.WPF.UI, Version=1.1.8.4, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Panuon.WPF.UI.1.1.8.4\lib\net462\Panuon.WPF.UI.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/VPet-Simulator.Core/packages.config b/VPet-Simulator.Core/packages.config
index cbf25e3..7e135af 100644
--- a/VPet-Simulator.Core/packages.config
+++ b/VPet-Simulator.Core/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="LinePutScript" version="1.6.1" targetFramework="net462" />
   <package id="Panuon.WPF" version="1.0.1" targetFramework="net462" />
-  <package id="Panuon.WPF.UI" version="1.1.7.2" targetFramework="net462" />
+  <package id="Panuon.WPF.UI" version="1.1.8.4" targetFramework="net462" />
 </packages>
\ 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 79c0ca4..f6f6359 100644
--- a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
+++ b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
@@ -84,8 +84,8 @@
     <Reference Include="Panuon.WPF, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Panuon.WPF.1.0.1\lib\net48\Panuon.WPF.dll</HintPath>
     </Reference>
-    <Reference Include="Panuon.WPF.UI, Version=1.1.7.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Panuon.WPF.UI.1.1.7.2\lib\net48\Panuon.WPF.UI.dll</HintPath>
+    <Reference Include="Panuon.WPF.UI, Version=1.1.8.4, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Panuon.WPF.UI.1.1.8.4\lib\net48\Panuon.WPF.UI.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
index 6cf80c4..2128181 100644
--- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
@@ -544,33 +544,6 @@
                         <Image x:Name="ImageWHY" Width="38" Margin="208,257,0,0" HorizontalAlignment="Left"
                                 VerticalAlignment="Top" Height="38" Source="/Res/TopLogo2019.PNG" />
                         <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" TextWrapping="WrapWithOverflow">
-                    <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="100,130,0,0">
-                    <Run>杨远洛里斯, 广大MOD作者</Run><LineBreak />
-                    <Run>洛里斯杨远, トニーちゃん</Run> <Hyperlink Click="Git_Click">Git贡献名单</Hyperlink><LineBreak />
-                    <Run>叶书天, 广大MOD作者</Run>
-                    <LineBreak />
-                    <Hyperlink>Panuon.WPF.UI</Hyperlink>
-                    <Hyperlink>LinePutScript</Hyperlink><LineBreak />
-                    <Hyperlink>Facepunch.Steamworks</Hyperlink>
-                    <Hyperlink>查看引用名单</Hyperlink><LineBreak /><LineBreak />
-                    <Hyperlink Click="Steam_Click">访问Steam页面</Hyperlink>
-                    <Hyperlink Click="Github_Click">访问Github页面</Hyperlink>
-                    <LineBreak />                    
-                    <Run FontStyle="Italic" FontSize="8">由于游戏暂未开发完毕,该名单并非完整名单.将在正式版完成前修改</Run><LineBreak />
-                        </TextBlock>
-
-
                         <TextBlock Margin="0,130,0,0" FontWeight="Bold">
                     <Run>游戏策划</Run><LineBreak />
                     <Run>UI&amp;程序</Run><LineBreak />
@@ -591,6 +564,31 @@
                                     Click="Group_Click" FontWeight="Normal">相关群</Hyperlink>
 
                         </TextBlock>
+                        <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" TextWrapping="WrapWithOverflow">
+                    <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="100,130,0,0" VerticalAlignment="Top">
+                    <Run>杨远洛里斯, 广大MOD作者</Run><LineBreak />
+                    <Run>洛里斯杨远, トニーちゃん</Run> <Hyperlink Click="Git_Click">Git贡献名单</Hyperlink><LineBreak />
+                    <Run>叶书天, 广大MOD作者</Run>
+                    <LineBreak />
+                    <Hyperlink>Panuon.WPF.UI</Hyperlink>
+                    <Hyperlink>LinePutScript</Hyperlink><LineBreak />
+                    <Hyperlink>Facepunch.Steamworks</Hyperlink>
+                    <Hyperlink>查看引用名单</Hyperlink><LineBreak /><LineBreak />
+                    <Hyperlink Click="Steam_Click">访问Steam页面</Hyperlink>
+                    <Hyperlink Click="Github_Click">访问Github页面</Hyperlink>
+                    <LineBreak />                    
+                    <Run FontStyle="Italic" FontSize="8">由于游戏暂未开发完毕,该名单并非完整名单.将在正式版完成前修改</Run><LineBreak />
+                        </TextBlock>
                     </Grid>
                 </TabItem>
             </TabControl>
diff --git a/VPet-Simulator.Windows/packages.config b/VPet-Simulator.Windows/packages.config
index 5bc0eb5..6a46328 100644
--- a/VPet-Simulator.Windows/packages.config
+++ b/VPet-Simulator.Windows/packages.config
@@ -4,5 +4,5 @@
   <package id="Facepunch.Steamworks.win32" version="2.3.3" targetFramework="net48" />
   <package id="LinePutScript" version="1.6.1" targetFramework="net48" />
   <package id="Panuon.WPF" version="1.0.1" targetFramework="net48" />
-  <package id="Panuon.WPF.UI" version="1.1.7.2" targetFramework="net48" />
+  <package id="Panuon.WPF.UI" version="1.1.8.4" targetFramework="net48" />
 </packages>
\ No newline at end of file