From 1936301fa818ae7871958912de619612916247fa Mon Sep 17 00:00:00 2001 From: ZouJin Date: Sun, 3 Sep 2023 18:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=85=E6=A8=A1=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=AE=A1=E7=AE=97=E6=9C=AA=E5=9B=9E=E6=AD=A3=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VPet-Simulator.Core/Graph/FoodAnimation.cs | 2 ++ VPet-Simulator.Windows.Interface/Mod/Food.cs | 2 +- VPet-Simulator.Windows/MainWindow.xaml.cs | 22 +++++++++++++------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/VPet-Simulator.Core/Graph/FoodAnimation.cs b/VPet-Simulator.Core/Graph/FoodAnimation.cs index 4936c9b..35c2685 100644 --- a/VPet-Simulator.Core/Graph/FoodAnimation.cs +++ b/VPet-Simulator.Core/Graph/FoodAnimation.cs @@ -235,6 +235,8 @@ namespace VPet_Simulator.Core { Width = 500; Height = 500; + VerticalAlignment = VerticalAlignment.Top; + HorizontalAlignment = HorizontalAlignment.Left; Front = new Image(); Back = new Image(); Food = new Image diff --git a/VPet-Simulator.Windows.Interface/Mod/Food.cs b/VPet-Simulator.Windows.Interface/Mod/Food.cs index 2057a4c..bf35925 100644 --- a/VPet-Simulator.Windows.Interface/Mod/Food.cs +++ b/VPet-Simulator.Windows.Interface/Mod/Food.cs @@ -149,7 +149,7 @@ namespace VPet_Simulator.Windows.Interface /// [Line(ignoreCase: true)] public string Image; - private bool? isoverload = null; + public bool? isoverload = null; /// /// 当前物品推荐价格 /// diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs index cd37cbd..a901a88 100644 --- a/VPet-Simulator.Windows/MainWindow.xaml.cs +++ b/VPet-Simulator.Windows/MainWindow.xaml.cs @@ -364,6 +364,7 @@ namespace VPet_Simulator.Windows if (f.IsOverLoad()) { f.Price = Math.Max((int)f.RealPrice, 1); + f.isoverload = false; } } } @@ -596,20 +597,25 @@ namespace VPet_Simulator.Windows // } //); Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Feed, "吃饭".Translate(), () => - { - winBetterBuy.Show(Food.FoodType.Meal); - } - ); + { + winBetterBuy.Show(Food.FoodType.Meal); + }); Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Feed, "喝水".Translate(), () => { winBetterBuy.Show(Food.FoodType.Drink); - } - ); + }); + Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Feed, "收藏".Translate(), () => + { + winBetterBuy.Show(Food.FoodType.Star); + }); Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Feed, "药品".Translate(), () => { winBetterBuy.Show(Food.FoodType.Drug); - } - ); + }); + Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Feed, "礼品".Translate(), () => + { + winBetterBuy.Show(Food.FoodType.Gift); + }); Main.SetMoveMode(Set.AllowMove, Set.SmartMove, Set.SmartMoveInterval * 1000); Main.SetLogicInterval((int)(Set.LogicInterval * 1000)); if (Set.MessageBarOutside)