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 2024-04-11 23:36:01 +08:00
parent 2770feeea7
commit 608ebce6f5
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VPet-Simulator.Core/Display/MainDisplay.cs
View File

@ -556,7 +556,7 @@ namespace VPet_Simulator.Core
/// 查找可用与显示的Border (自动多层切换) /// 查找可用与显示的Border (自动多层切换)
/// </summary> /// </summary>
/// <param name="graph">动画</param> /// <param name="graph">动画</param>
public Border FindDisplayBorder(IGraph graph) public Decorator FindDisplayBorder(IGraph graph)
{ {
DisplayType = graph.GraphInfo; DisplayType = graph.GraphInfo;
var PetGridTag = Dispatcher.Invoke(() => PetGrid.Tag); var PetGridTag = Dispatcher.Invoke(() => PetGrid.Tag);

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

@ -253,9 +253,9 @@ namespace VPet_Simulator.Core
public Image Back; public Image Back;
} }
public void Run(Border parant, Action EndAction = null) => Run(parant, null, EndAction); public void Run(Decorator parant, Action EndAction = null) => Run(parant, null, EndAction);
public void Run(Border parant, ImageSource image, Action EndAction = null) public void Run(Decorator parant, ImageSource image, Action EndAction = null)
{ {
if (PlayState) if (PlayState)
{//如果当前正在运行,重置状态 {//如果当前正在运行,重置状态
@ -273,7 +273,7 @@ namespace VPet_Simulator.Core
{ {
if (FoodGrid.Parent != null) if (FoodGrid.Parent != null)
{ {
((Border)FoodGrid.Parent).Child = null; ((Decorator)FoodGrid.Parent).Child = null;
} }
parant.Child = FoodGrid; parant.Child = FoodGrid;
} }

2
VPet-Simulator.Core/Graph/GraphHelper.cs
View File

@ -42,7 +42,7 @@ namespace VPet_Simulator.Core
/// <param name="parant">显示位置</param> /// <param name="parant">显示位置</param>
/// <param name="EndAction">结束方法</param> /// <param name="EndAction">结束方法</param>
/// <param name="image">额外图片</param> /// <param name="image">额外图片</param>
public static void Run(this IGraph graph, Border parant, ImageSource image, Action EndAction = null) public static void Run(this IGraph graph, Decorator parant, ImageSource image, Action EndAction = null)
{ {
if (graph is IRunImage iri) if (graph is IRunImage iri)
{ {

4
VPet-Simulator.Core/Graph/IGraph.cs
View File

@ -12,7 +12,7 @@ namespace VPet_Simulator.Core
/// <summary> /// <summary>
/// 从0开始运行该动画 /// 从0开始运行该动画
/// </summary> /// </summary>
void Run(Border parant, Action EndAction = null); void Run(Decorator parant, Action EndAction = null);
/// <summary> /// <summary>
/// 当前动画播放状态 /// 当前动画播放状态
/// </summary> /// </summary>
@ -49,7 +49,7 @@ namespace VPet_Simulator.Core
/// <param name="parant">显示位置</param> /// <param name="parant">显示位置</param>
/// <param name="EndAction">结束方法</param> /// <param name="EndAction">结束方法</param>
/// <param name="image">额外图片</param> /// <param name="image">额外图片</param>
void Run(Border parant, ImageSource image, Action EndAction = null); void Run(Decorator parant, ImageSource image, Action EndAction = null);
} }
} }
} }

23
VPet-Simulator.Core/Graph/PNGAnimation.cs
View File

@ -237,23 +237,24 @@ namespace VPet_Simulator.Core
else else
{ {
parent.IsContinue = false; parent.IsContinue = false;
//parent.Dispatcher.Invoke(Hidden); //不运行结束事件
if (parent.DoEndAction) ////parent.Dispatcher.Invoke(Hidden);
EndAction?.Invoke();//运行结束动画时事件 //if (parent.DoEndAction)
parent.StopAction?.Invoke(); // EndAction?.Invoke();//运行结束动画时事件
parent.StopAction = null; //parent.StopAction?.Invoke();
//Task.Run(() => //parent.StopAction = null;
//{ ////Task.Run(() =>
// Thread.Sleep(25); ////{
// parent.Dispatcher.Invoke(Hidden); //// Thread.Sleep(25);
//}); //// parent.Dispatcher.Invoke(Hidden);
////});
} }
} }
} }
/// <summary> /// <summary>
/// 从0开始运行该动画 /// 从0开始运行该动画
/// </summary> /// </summary>
public void Run(Border parant, Action EndAction = null) public void Run(Decorator parant, Action EndAction = null)
{ {
//if(endwilldo != null && nowid != Animations.Count) //if(endwilldo != null && nowid != Animations.Count)
//{ //{

2
VPet-Simulator.Core/Graph/Picture.cs
View File

@ -69,7 +69,7 @@ namespace VPet_Simulator.Core
public bool IsReady => true; public bool IsReady => true;
public void Run(Border parant, Action EndAction = null) public void Run(Decorator parant, Action EndAction = null)
{ {
if (PlayState) if (PlayState)
{ {