From 653cdd31eee983fcac4e083a3f19eb69e847ed00 Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Mon, 11 Sep 2023 14:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AA=97=E5=8F=A3=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B6=E9=80=BB=E8=BE=91=20Fix#20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Windows.Interface/GameSaves.cs  | 18 ++++++++++++++++++
 VPet-Simulator.Windows/MainWindow.xaml.cs      |  4 ----
 .../WinDesign/winBetterBuy.xaml                |  2 +-
 .../WinDesign/winBetterBuy.xaml.cs             |  3 +--
 4 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 VPet-Simulator.Windows.Interface/GameSaves.cs

diff --git a/VPet-Simulator.Windows.Interface/GameSaves.cs b/VPet-Simulator.Windows.Interface/GameSaves.cs
new file mode 100644
index 0000000..896ffc4
--- /dev/null
+++ b/VPet-Simulator.Windows.Interface/GameSaves.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VPet_Simulator.Core;
+
+namespace VPet_Simulator.Windows.Interface
+{
+    /// <summary>
+    /// 游戏存档
+    /// </summary>
+    public class GameSaves
+    {
+        Dictionary<string, GameSave> Saves = new Dictionary<string, GameSave>();
+    }
+}
diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs
index 9ddca02..3d59b99 100644
--- a/VPet-Simulator.Windows/MainWindow.xaml.cs
+++ b/VPet-Simulator.Windows/MainWindow.xaml.cs
@@ -516,7 +516,6 @@ namespace VPet_Simulator.Windows
                 m.Click += (x, y) =>
                 {
                     Main.ToolBar.Visibility = Visibility.Collapsed;
-                    Topmost = false;
                     winSetting.MainTab.SelectedIndex = 5;
                     winSetting.Show();
                 };
@@ -600,7 +599,6 @@ namespace VPet_Simulator.Windows
                 Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Setting, "设置面板".Translate(), () =>
                 {
                     Main.ToolBar.Visibility = Visibility.Collapsed;
-                    Topmost = false;
                     winSetting.Show();
                 });
 
@@ -674,7 +672,6 @@ namespace VPet_Simulator.Windows
 
                 m_menu.MenuItems.Add(new MenuItem("设置面板".Translate(), (x, y) =>
                 {
-                    Topmost = false;
                     winSetting.Show();
                 }));
                 m_menu.MenuItems.Add(new MenuItem("退出桌宠".Translate(), (x, y) => Close()));
@@ -688,7 +685,6 @@ namespace VPet_Simulator.Windows
                 notifyIcon.Visible = true;
                 notifyIcon.BalloonTipClicked += (a, b) =>
                 {
-                    Topmost = false;
                     winSetting.Show();
                 };
 
diff --git a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
index 27ab9d5..f0b1f9d 100644
--- a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
@@ -1,7 +1,7 @@
 <pu:WindowX x:Class="VPet_Simulator.Windows.winBetterBuy"
         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"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Topmost="True"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:pu="https://opensource.panuon.com/wpf-ui" xmlns:local="clr-namespace:VPet_Simulator.Windows"
diff --git a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs
index 576bd24..1cdc109 100644
--- a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs
@@ -49,7 +49,6 @@ namespace VPet_Simulator.Windows
         Run rMoney;
         public void Show(Food.FoodType type)
         {
-            mw.Topmost = false;
             showeatanm = true;//逃出
             if (_searchTextBox != null)
                 _searchTextBox.Text = "";
@@ -280,7 +279,7 @@ namespace VPet_Simulator.Windows
         public void TryClose()
         {
             IcCommodity.ItemsSource = null;
-            mw.Topmost = mw.Set.TopMost;
+            //mw.Topmost = mw.Set.TopMost;
             Hide();
         }
         private void WindowX_Closing(object sender, System.ComponentModel.CancelEventArgs e)