Mirrored_Repos/VPet
1
0
Fork 0
mirror of https://github.com/LorisYounger/VPet.git synced 2024-08-30 18:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复食物(夹层)动画显示错位的问题

Browse Source
This commit is contained in:
ZouJin 2023-09-03 17:23:53 +08:00
parent 5ee11c937c
commit c23eb52bc2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
VPet-Simulator.Core/Graph/FoodAnimation.cs
View File

@ -142,8 +142,8 @@ namespace VPet_Simulator.Core
IsVisiable = false; IsVisiable = false;
else else
{//1,2: Margin X,Y {//1,2: Margin X,Y
MarginWI = new Thickness(double.Parse(strs[1]), double.Parse(strs[2]), 0, 0);
Width = double.Parse(strs[3]);//3:Width Width = double.Parse(strs[3]);//3:Width
MarginWI = new Thickness(double.Parse(strs[1]), double.Parse(strs[2]), 0, 0);
if (strs.Length > 4) if (strs.Length > 4)
{ {
Rotate = double.Parse(strs[4]);//Rotate Rotate = double.Parse(strs[4]);//Rotate
@ -165,8 +165,9 @@ namespace VPet_Simulator.Core
This.Visibility = Visibility.Visible; This.Visibility = Visibility.Visible;
This.Margin = MarginWI; This.Margin = MarginWI;
This.LayoutTransform = new RotateTransform(Rotate); This.LayoutTransform = new RotateTransform(Rotate);
This.Opacity = 1; This.Opacity = Opacity;
This.Width = Width; This.Width = Width;
This.Height = Width;
} }
else else
{ {
@ -192,6 +193,7 @@ namespace VPet_Simulator.Core
//parent.endwilldo = () => parent.Dispatcher.Invoke(Hidden); //parent.endwilldo = () => parent.Dispatcher.Invoke(Hidden);
//parent.Dispatcher.Invoke(Hidden); //parent.Dispatcher.Invoke(Hidden);
parent.PlayState = false; parent.PlayState = false;
//等待其他两个动画完成
if (parent.DoEndAction) if (parent.DoEndAction)
EndAction?.Invoke();//运行结束动画时事件 EndAction?.Invoke();//运行结束动画时事件
parent.StopAction?.Invoke(); parent.StopAction?.Invoke();
@ -280,11 +282,11 @@ namespace VPet_Simulator.Core
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; FoodGrid.Food.Source = image;
Task.Run(() => Animations[0].Run(FoodGrid.Food, EndAction));
if (t1 != null) if (t1 != null)
Task.Run(t1.Start); t1.Start();
if (t2 != null) if (t2 != null)
Task.Run(t2.Start); t2.Start();
Task.Run(() => Animations[0].Run(FoodGrid.Food, EndAction));
}); });
} }