diff --git a/VPet-Simulator.Core/Item/Drink.cs b/VPet-Simulator.Core/Item/Drink.cs
deleted file mode 100644
index e710737..0000000
--- a/VPet-Simulator.Core/Item/Drink.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace VPet_Simulator.Core
-{
- internal class Drink
- {
- }
-}
diff --git a/VPet-Simulator.Core/Item/Food.cs b/VPet-Simulator.Core/Item/Food.cs
deleted file mode 100644
index 793cb57..0000000
--- a/VPet-Simulator.Core/Item/Food.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace VPet_Simulator.Core
-{
- internal class Food
- {
- }
-}
diff --git a/VPet-Simulator.Core/Item/Item.cs b/VPet-Simulator.Core/Item/Item.cs
deleted file mode 100644
index 84bb074..0000000
--- a/VPet-Simulator.Core/Item/Item.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace VPet_Simulator.Core
-{
- internal class Item
- {
- }
-}
diff --git a/VPet-Simulator.Core/VPet-Simulator.Core.csproj b/VPet-Simulator.Core/VPet-Simulator.Core.csproj
index bd24c5f..4d313ae 100644
--- a/VPet-Simulator.Core/VPet-Simulator.Core.csproj
+++ b/VPet-Simulator.Core/VPet-Simulator.Core.csproj
@@ -43,7 +43,6 @@
DEBUG;TRACE
full
x64
-
prompt
@@ -52,7 +51,6 @@
true
pdbonly
x64
-
prompt
@@ -61,7 +59,6 @@
DEBUG;TRACE
full
x86
-
prompt
@@ -70,7 +67,6 @@
true
pdbonly
x86
-
prompt
@@ -159,9 +155,6 @@
-
-
-
Code
diff --git a/VPet-Simulator.Windows.Interface/IMainWindow.cs b/VPet-Simulator.Windows.Interface/IMainWindow.cs
index 2838be4..c09ec6e 100644
--- a/VPet-Simulator.Windows.Interface/IMainWindow.cs
+++ b/VPet-Simulator.Windows.Interface/IMainWindow.cs
@@ -44,7 +44,10 @@ namespace VPet_Simulator.Windows.Interface
/// 所有三方插件
///
List Plugins { get; }
-
+ ///
+ /// 所有食物
+ ///
+ List- Items { get; }
///
/// 设置游戏缩放倍率
///
diff --git a/VPet-Simulator.Windows.Interface/Item.cs b/VPet-Simulator.Windows.Interface/Item.cs
new file mode 100644
index 0000000..0b8b5a5
--- /dev/null
+++ b/VPet-Simulator.Windows.Interface/Item.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VPet_Simulator.Windows.Interface
+{
+ public class Item
+ {
+
+ }
+}
diff --git a/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj b/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
index f60241d..90a248f 100644
--- a/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
+++ b/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
@@ -112,6 +112,7 @@
+
diff --git a/VPet-Simulator.Windows/MainWindow.cs b/VPet-Simulator.Windows/MainWindow.cs
index 2593bfd..713b4b3 100644
--- a/VPet-Simulator.Windows/MainWindow.cs
+++ b/VPet-Simulator.Windows/MainWindow.cs
@@ -27,6 +27,7 @@ namespace VPet_Simulator.Windows
/// 所有三方插件
///
public List Plugins { get; } = new List();
+ public List- Items { get; } = new List
- ();
///
/// 版本号
///
diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs
index 66e9fa4..8495fe1 100644
--- a/VPet-Simulator.Windows/MainWindow.xaml.cs
+++ b/VPet-Simulator.Windows/MainWindow.xaml.cs
@@ -273,13 +273,18 @@ namespace VPet_Simulator.Windows
//this.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Res/TopLogo2019.PNG")));
Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Feed, "喂食测试", () =>
- {
- Main.ToolBar.Visibility = Visibility.Collapsed;
- IRunImage eat = (IRunImage)Core.Graph.FindGraph(GraphType.Eat, GameSave.ModeType.Nomal);
- var b = Main.FindDisplayBorder(eat);
- eat.Run(b, new BitmapImage(new Uri("pack://application:,,,/Res/tony.bmp")), Main.DisplayToNomal);
- }
+ {
+ Main.ToolBar.Visibility = Visibility.Collapsed;
+ IRunImage eat = (IRunImage)Core.Graph.FindGraph(GraphType.Eat, GameSave.ModeType.Nomal);
+ var b = Main.FindDisplayBorder(eat);
+ eat.Run(b, new BitmapImage(new Uri("pack://application:,,,/Res/tony.bmp")), Main.DisplayToNomal);
+ }
);
+ Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Feed, "给不二一测试用的窗口", () =>
+ {
+ new winBetterBuy(this).Show();
+ }
+ );
Main.SetMoveMode(Set.AllowMove, Set.SmartMove, Set.SmartMoveInterval * 1000);
Main.SetLogicInterval((int)(Set.LogicInterval * 1000));
diff --git a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
index 6aa7864..9dc9ed4 100644
--- a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
+++ b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
@@ -113,6 +113,9 @@
MSBuild:Compile
Designer
+
+ winBetterBuy.xaml
+
TalkBoxAPI.xaml
@@ -139,6 +142,10 @@
winReport.xaml
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer
diff --git a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
new file mode 100644
index 0000000..c489c2d
--- /dev/null
+++ b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs
new file mode 100644
index 0000000..a74b1f6
--- /dev/null
+++ b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace VPet_Simulator.Windows
+{
+ ///
+ /// winBetterBuy.xaml 的交互逻辑
+ ///
+ public partial class winBetterBuy : Window
+ {
+ public winBetterBuy(MainWindow mw)
+ {
+ InitializeComponent();
+ }
+ }
+}