添加喝水口渴睡觉等动画

VPet-Simulator.Core/Display/Main.xaml.cs

@@ -66,8 +66,6 @@ namespace VPet_Simulator.Core
             UIGrid.Children.Add(MsgBar);
             
 
-
-
             if (loadtouchevent)
             {
                 LoadTouchEvent();

VPet-Simulator.Core/Graph/FoodAnimation.cs

@@ -323,12 +323,14 @@ namespace VPet_Simulator.Core
                 }
                 IImageRun FL = (IImageRun)GraphCore.FindCOMMGraph(Front_Lay, ModeType);
                 IImageRun BL = (IImageRun)GraphCore.FindCOMMGraph(Back_Lay, ModeType);
-                var t1 = FL.Run(FoodGrid.Front);
+                var t1 = FL?.Run(FoodGrid.Front);
-                var t2 = BL.Run(FoodGrid.Back);
+                var t2 = BL?.Run(FoodGrid.Back);
                 FoodGrid.Food.Source = image;
                 Task.Run(() => Animations[0].Run(FoodGrid.Food, EndAction));
-                Task.Run(t1.Start);
+                if (t1 != null)
-                Task.Run(t2.Start);
+                    Task.Run(t1.Start);
+                if (t2 != null)
+                    Task.Run(t2.Start);
             });
         }
 

VPet-Simulator.Core/Handle/PetLoader.cs

@@ -81,7 +81,8 @@ namespace VPet_Simulator.Core
                     }
                     else
                     {
-                        MessageBox.Show("未知的图像类型: " + line.Name.ToLower());
+                        if (!string.IsNullOrEmpty(line.Name))
+                            MessageBox.Show("未知的图像类型: " + line.Name.ToLower());
                     }
                 }
             }

VPet-Simulator.Windows/MainWindow.cs

@@ -238,7 +238,7 @@ namespace VPet_Simulator.Windows
                         txt = txt.FindAll(x => x.Strength == LowText.StrengthType.S);
                         Main.Say(txt[Function.Rnd.Next(txt.Count)].Text, GraphCore.Helper.SayType.None);
                     }
-                    Task.Run(() => Main.Display(GraphCore.GraphType.Switch_Thirsty, Main.DisplayToNomal));
+                    Task.Run(() => Main.Display(GraphCore.GraphType.Switch_Hunger, Main.DisplayToNomal));
                     return;
                 }
                 if (Core.Save.StrengthDrink < 75 && Function.Rnd.Next(lowstrengthAskCountDrink--) == 0)
@@ -286,7 +286,7 @@ namespace VPet_Simulator.Windows
                         txt = txt.FindAll(x => x.Strength == LowText.StrengthType.S);
                         Main.Say(txt[Function.Rnd.Next(txt.Count)].Text, GraphCore.Helper.SayType.None);
                     }
-                    Task.Run(() => Main.Display(GraphCore.GraphType.Switch_Thirsty, Main.DisplayToNomal));
+                    Task.Run(() => Main.Display(GraphCore.GraphType.Switch_Hunger, Main.DisplayToNomal));
                     return;
                 }
                 if (Core.Save.StrengthDrink < 60 && Function.Rnd.Next(lowstrengthAskCountDrink--) == 0)

VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs

@@ -175,9 +175,17 @@ namespace VPet_Simulator.Windows
             }
             if (!_puswitch.IsChecked.Value)
                 TryClose();
-            IRunImage eat = (IRunImage)mw.Core.Graph.FindGraph(GraphType.Eat, mw.Core.Save.Mode);
+            var ig = mw.Core.Graph.FindGraph(item.Type == Food.FoodType.Drink ? GraphType.Drink : GraphType.Eat, mw.Core.Save.Mode);
-            var b = mw.Main.FindDisplayBorder(eat);
+            if (ig is IRunImage iri)
-            eat.Run(b, item.ImageSource, mw.Main.DisplayToNomal);
+            {
+                var b = mw.Main.FindDisplayBorder(iri);
+                iri.Run(b, item.ImageSource, mw.Main.DisplayToNomal);
+            }
+            else
+            {
+                mw.Main.Display(ig, mw.Main.DisplayToNomal);
+            }
+
         }
 
         private void BtnSearch_Click(object sender, RoutedEventArgs e)

VPet-Simulator.Windows/mod/0000_core/pet/vup/Drink/info.lps

@@ -0,0 +1,9 @@
+PNGAnimation#drink_back_lay:|path#Happy\back_lay:|mode#Happy:|graph#Not_Able:|
+///PNGAnimation#drink_front_lay:|path#Happy\front_lay:|mode#Happy:|graph#Not_Able:|
+PNGAnimation#drink_back_lay:|path#Nomal\back_lay:|mode#Nomal:|graph#Not_Able:|
+///PNGAnimation#drink_front_lay:|path#Nomal\front_lay:|mode#Nomal:|graph#Not_Able:|
+PNGAnimation#drink_back_lay:|path#PoorCondition\back_lay:|mode#PoorCondition:|graph#Not_Able:|
+///PNGAnimation#drink_front_lay:|path#PoorCondition\front_lay:|mode#PoorCondition:|graph#Not_Able:|
+FoodAnimation:|mode#Happy:|graph#drink:|a0#1000:|a1#125,268,286,77,60:|a2#125,167,164,78:|a3#125,198,160,78:|a4#125,199,163,78:|a5#125,199,160,78:|a6#125,199,163,78:|a7#125,199,160,78:|a8#125,169,164,78:|a9#125,268,286,77,60:|a10#625:|front_lay#drink_front_lay:|back_lay#drink_back_lay:|
+FoodAnimation:|mode#nomal:|graph#drink:|a0#1000:|a1#125,268,286,77,60:|a2#125,167,164,78:|a3#125,198,160,78:|a4#125,199,163,78:|a5#125,199,160,78:|a6#125,199,163,78:|a7#125,199,160,78:|a8#125,169,164,78:|a9#125,268,286,77,60:|a10#625:|front_lay#drink_front_lay:|back_lay#drink_back_lay:|
+FoodAnimation:|mode#PoorCondition:|graph#drink:|a0#1000:|a1#125,268,286,77,60:|a2#125,167,164,78:|a3#125,198,160,78:|a4#125,199,163,78:|a5#125,199,160,78:|a6#125,199,163,78:|a7#125,199,160,78:|a8#125,169,164,78:|a9#125,268,286,77,60:|a10#625:|front_lay#drink_front_lay:|back_lay#drink_back_lay:|