From 00facd5bef0757e70993fd4031303d41dee59899 Mon Sep 17 00:00:00 2001 From: ZouJin Date: Mon, 4 Sep 2023 13:01:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BD=AE=E9=A1=B6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E9=94=99=E8=AF=AF=20Fix=20#175?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VPet-Simulator.Windows/Function/CoreMOD.cs | 4 ++-- VPet-Simulator.Windows/MainWindow.xaml | 4 ++-- VPet-Simulator.Windows/MainWindow.xaml.cs | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/VPet-Simulator.Windows/Function/CoreMOD.cs b/VPet-Simulator.Windows/Function/CoreMOD.cs index d28e5ab..70ec9cc 100644 --- a/VPet-Simulator.Windows/Function/CoreMOD.cs +++ b/VPet-Simulator.Windows/Function/CoreMOD.cs @@ -18,8 +18,8 @@ namespace VPet_Simulator.Windows { public static HashSet LoadedDLL { get; } = new HashSet() { - "ChatGPT.API.Framework.dll","Panuon.WPF.dll","steam_api.dll","Panuon.WPF.UI.dll","steam_api64.dll", - "LinePutScript.dll","Newtonsoft.Json.dll","Facepunch.Steamworks.Win32.dll", "Facepunch.Steamworks.Win64.dll", + "Panuon.WPF.dll","steam_api.dll","Panuon.WPF.UI.dll","steam_api64.dll", + "LinePutScript.dll","Facepunch.Steamworks.Win32.dll", "Facepunch.Steamworks.Win64.dll", "VPet-Simulator.Core.dll","VPet-Simulator.Windows.Interface.dll","LinePutScript.Localization.WPF.dll", "CSCore.dll" }; diff --git a/VPet-Simulator.Windows/MainWindow.xaml b/VPet-Simulator.Windows/MainWindow.xaml index 0977a57..7d541e8 100644 --- a/VPet-Simulator.Windows/MainWindow.xaml +++ b/VPet-Simulator.Windows/MainWindow.xaml @@ -5,8 +5,8 @@ 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" - Width="250" Topmost="True" Closed="Window_Closed" pu:WindowXCaption.Height="0" - SizeToContent="Height" Loaded="Window_SourceInitialized" LocationChanged="WindowX_LocationChanged" Background="{x:Null}"> + Width="250" Closed="Window_Closed" pu:WindowXCaption.Height="0" SizeToContent="Height" + Loaded="Window_SourceInitialized" LocationChanged="WindowX_LocationChanged" Background="{x:Null}"> diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs index 31667e2..b7db9ae 100644 --- a/VPet-Simulator.Windows/MainWindow.xaml.cs +++ b/VPet-Simulator.Windows/MainWindow.xaml.cs @@ -115,6 +115,11 @@ namespace VPet_Simulator.Windows var point = Set.StartRecordPoint; Left = point.X; Top = point.Y; } + if (Set.TopMost) + { + Topmost= true; + } + //不存在就关掉 var modpath = new DirectoryInfo(ModPath + @"\0000_core\pet\vup");