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