From bf917282840937224c4b70ea2e2ed98ee642f8eb Mon Sep 17 00:00:00 2001 From: ZouJin Date: Tue, 24 Jan 2023 15:55:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=8D=E9=A6=88=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VPet-Simulator.Windows/App.xaml.cs | 7 +- VPet-Simulator.Windows/MainWindow.xaml.cs | 11 +- .../VPet-Simulator.Windows.csproj | 8 ++ .../WinDesign/winReport.xaml | 45 ++++++ .../WinDesign/winReport.xaml.cs | 131 ++++++++++++++++++ 5 files changed, 196 insertions(+), 6 deletions(-) create mode 100644 VPet-Simulator.Windows/WinDesign/winReport.xaml create mode 100644 VPet-Simulator.Windows/WinDesign/winReport.xaml.cs diff --git a/VPet-Simulator.Windows/App.xaml.cs b/VPet-Simulator.Windows/App.xaml.cs index 786b2d6..a999989 100644 --- a/VPet-Simulator.Windows/App.xaml.cs +++ b/VPet-Simulator.Windows/App.xaml.cs @@ -28,8 +28,11 @@ namespace VPet_Simulator.Windows MessageBox.Show(errstr, "游戏致命性错误"); return; } - MainWindow mw = ((MainWindow)MainWindow); - + else + { + new winReport(((MainWindow)MainWindow), errstr).Show(); + return; + } } } } diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs index d2bb917..9999fb0 100644 --- a/VPet-Simulator.Windows/MainWindow.xaml.cs +++ b/VPet-Simulator.Windows/MainWindow.xaml.cs @@ -134,11 +134,12 @@ namespace VPet_Simulator.Windows Main.DefaultClickAction = () => { Dispatcher.Invoke(() => { Main.Say("你知道吗? 鼠标右键可以打开菜单栏"); }); }; DisplayGrid.Child = Main; Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Setting, "退出桌宠", () => { Close(); }); + Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Setting, "反馈中心", () => { new winReport(this).Show(); }); Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Setting, "设置面板", () => - { - Topmost = false; - winSetting.Show(); - }); + { + Topmost = false; + winSetting.Show(); + }); Main.SetMoveMode(Set.AllowMove, Set.SmartMove, Set.SmartMoveInterval * 1000); Main.SetLogicInterval((int)(Set.LogicInterval * 1000)); @@ -157,6 +158,8 @@ namespace VPet_Simulator.Windows Left = (SystemParameters.PrimaryScreenWidth - Width) / 2; Top = (SystemParameters.PrimaryScreenHeight - Height) / 2; })); + m_menu.MenuItems.Add(new MenuItem("反馈中心", (x, y) => { new winReport(this).Show(); })); + m_menu.MenuItems.Add(new MenuItem("设置面板", (x, y) => { Topmost = false; diff --git a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj index 865142c..b38e268 100644 --- a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj +++ b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj @@ -92,6 +92,7 @@ + @@ -120,6 +121,9 @@ winGameSetting.xaml + + winReport.xaml + Designer MSBuild:Compile @@ -145,6 +149,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + diff --git a/VPet-Simulator.Windows/WinDesign/winReport.xaml b/VPet-Simulator.Windows/WinDesign/winReport.xaml new file mode 100644 index 0000000..806ab20 --- /dev/null +++ b/VPet-Simulator.Windows/WinDesign/winReport.xaml @@ -0,0 +1,45 @@ + + +