From 11e3215bef0bc1bf7bd2344fbcb5351e855979af Mon Sep 17 00:00:00 2001 From: ZouJin Date: Thu, 18 Apr 2024 21:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=89=8D=E6=99=AF=E8=89=B2?= =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E4=B8=BB=E9=A2=98=20fix=20#328?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VPet-Simulator.Windows/MainWindow.xaml | 2 +- VPet-Simulator.Windows/MutiPlayer/winMPBetterBuy.xaml | 2 +- VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml | 2 +- VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml | 2 +- VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml | 2 +- VPet-Simulator.Windows/WinDesign/winConsole.xaml | 2 +- VPet-Simulator.Windows/WinDesign/winGameSetting.xaml | 2 +- VPet-Simulator.Windows/WinDesign/winInputBox.xaml | 2 +- VPet-Simulator.Windows/WinDesign/winMoveArea.xaml | 2 +- VPet-Simulator.Windows/WinDesign/winReport.xaml | 2 +- VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/VPet-Simulator.Windows/MainWindow.xaml b/VPet-Simulator.Windows/MainWindow.xaml index 2b500c6..e8e6a15 100644 --- a/VPet-Simulator.Windows/MainWindow.xaml +++ b/VPet-Simulator.Windows/MainWindow.xaml @@ -5,7 +5,7 @@ xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" ShowInTaskbar="False" xmlns:local="clr-namespace:VPet_Simulator.Windows" mc:Ignorable="d" WindowStyle="None" Title="MainWindow" - Closed="Window_Closed" pu:WindowXCaption.Height="0" SizeToContent="WidthAndHeight" + Closed="Window_Closed" pu:WindowXCaption.Height="0" SizeToContent="WidthAndHeight" Foreground="{StaticResource PrimaryText}" Loaded="Window_SourceInitialized" LocationChanged="WindowX_LocationChanged" Background="{x:Null}"> diff --git a/VPet-Simulator.Windows/MutiPlayer/winMPBetterBuy.xaml b/VPet-Simulator.Windows/MutiPlayer/winMPBetterBuy.xaml index f9cdc47..df470e9 100644 --- a/VPet-Simulator.Windows/MutiPlayer/winMPBetterBuy.xaml +++ b/VPet-Simulator.Windows/MutiPlayer/winMPBetterBuy.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Topmost="True" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" Foreground="{StaticResource PrimaryText}" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:pu="https://opensource.panuon.com/wpf-ui" xmlns:local="clr-namespace:VPet_Simulator.Windows" mc:Ignorable="d" Height="550" Width="800" FontSize="14" WindowStartupLocation="CenterScreen" diff --git a/VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml b/VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml index f20cec4..cfc8000 100644 --- a/VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml +++ b/VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml @@ -4,7 +4,7 @@ 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="https://opensource.panuon.com/wpf-ui" + xmlns:pu="https://opensource.panuon.com/wpf-ui" Foreground="{StaticResource PrimaryText}" xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF" Title="{ll:Str 访客表}" MinHeight="400" Height="400" Width="660" Closed="Window_Closed" Style="{DynamicResource BaseWindowXStyle}" Background="{DynamicResource PrimaryLighter}" diff --git a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml index a9dd004..515269c 100644 --- a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml +++ b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Topmost="True" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" Foreground="{StaticResource PrimaryText}" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:pu="https://opensource.panuon.com/wpf-ui" xmlns:local="clr-namespace:VPet_Simulator.Windows" mc:Ignorable="d" Height="550" Width="800" FontSize="14" diff --git a/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml b/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml index 148ef94..fc17544 100644 --- a/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml +++ b/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF" - xmlns:local="clr-namespace:VPet_Simulator.Windows" + xmlns:local="clr-namespace:VPet_Simulator.Windows" Foreground="{StaticResource PrimaryText}" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" Title="面板" Width="500" Height="500" Style="{DynamicResource BaseWindowXStyle}" WindowStartupLocation="CenterScreen" mc:Ignorable="d" diff --git a/VPet-Simulator.Windows/WinDesign/winConsole.xaml b/VPet-Simulator.Windows/WinDesign/winConsole.xaml index bceae68..2369914 100644 --- a/VPet-Simulator.Windows/WinDesign/winConsole.xaml +++ b/VPet-Simulator.Windows/WinDesign/winConsole.xaml @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF" - xmlns:local="clr-namespace:VPet_Simulator.Windows" + xmlns:local="clr-namespace:VPet_Simulator.Windows" Foreground="{StaticResource PrimaryText}" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" Width="450" Height="450" FontSize="16" mc:Ignorable="d" Closed="Window_Closed"> diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml index 95ff98f..539d0a6 100644 --- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml +++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF" - xmlns:local="clr-namespace:VPet_Simulator.Windows" + xmlns:local="clr-namespace:VPet_Simulator.Windows" Foreground="{StaticResource PrimaryText}" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" d:DesignHeight="1000" xmlns:system="clr-namespace:System;assembly=mscorlib" Width="{ll:Dbe SettingWidth, DefValue=650}" Height="550" diff --git a/VPet-Simulator.Windows/WinDesign/winInputBox.xaml b/VPet-Simulator.Windows/WinDesign/winInputBox.xaml index 5c1ecab..892f7f4 100644 --- a/VPet-Simulator.Windows/WinDesign/winInputBox.xaml +++ b/VPet-Simulator.Windows/WinDesign/winInputBox.xaml @@ -1,6 +1,6 @@