From 459dc72900a7c49bc307bcee755bd9ee36dff564 Mon Sep 17 00:00:00 2001 From: milimoe Date: Sun, 13 Apr 2025 19:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=20WPF=20=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E6=8C=81=EF=BC=88=E6=96=B9=E4=BE=BF=E6=A8=A1=E7=BB=84?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=20WPF=20=E7=95=8C=E9=9D=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FunGame.Desktop/UI/Main/Main.cs | 2 +- FunGame.Desktop/UI/Start.cs | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/FunGame.Desktop/UI/Main/Main.cs b/FunGame.Desktop/UI/Main/Main.cs index 8a0925d..890e1fb 100644 --- a/FunGame.Desktop/UI/Main/Main.cs +++ b/FunGame.Desktop/UI/Main/Main.cs @@ -1052,7 +1052,7 @@ namespace Milimoe.FunGame.Desktop.UI private void ShowFunGameInfo() { WritelnGameInfo(FunGameInfo.GetInfo(Constant.FunGameType)); - Title.Text = FunGameInfo.FunGame_Desktop + " " + FunGameInfo.FunGame_Version + " " + FunGameInfo.FunGame_VersionPatch; + Title.Text = FunGameInfo.FunGame_Desktop + " v" + FunGameInfo.FunGame_Version; } /// diff --git a/FunGame.Desktop/UI/Start.cs b/FunGame.Desktop/UI/Start.cs index 2244f09..cc8b0b7 100644 --- a/FunGame.Desktop/UI/Start.cs +++ b/FunGame.Desktop/UI/Start.cs @@ -17,8 +17,19 @@ namespace Milimoe.FunGame.Desktop.UI break; } } + // ³õʼ»¯ WinForms ÅäÖà ApplicationConfiguration.Initialize(); + + // ³õʼ»¯ WPF Application + System.Windows.Application wpfApp = new() + { + ShutdownMode = System.Windows.ShutdownMode.OnExplicitShutdown + }; + wpfApp.Dispatcher.Invoke(() => { }); + Application.Run(new Main()); + + wpfApp.Shutdown(); } } } \ No newline at end of file