mirror of
https://github.com/LorisYounger/VPet.git
synced 2024-08-30 18:42:36 +00:00
修复第一次切换动画时会发生动画冲突
This commit is contained in:
parent
c5fdab3647
commit
cf79bd2f8c
@ -84,7 +84,14 @@ namespace VPet_Simulator.Core
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 显示关机动画
|
||||
/// </summary>
|
||||
public void DisplayClose(Action EndAction)
|
||||
{
|
||||
CountNomal++;
|
||||
Display(GraphCore.GraphType.Shutdown, EndAction);
|
||||
}
|
||||
/// <summary>
|
||||
/// 显示摸头情况
|
||||
/// </summary>
|
||||
@ -1080,6 +1087,7 @@ namespace VPet_Simulator.Core
|
||||
DisplayType = graph.GraphType;
|
||||
if (PetGrid.Child == graph.This)
|
||||
{
|
||||
petgridcrlf = true;
|
||||
((IGraph)(PetGrid2.Child)).Stop(true);
|
||||
Dispatcher.Invoke(() =>
|
||||
{
|
||||
@ -1091,6 +1099,7 @@ namespace VPet_Simulator.Core
|
||||
}
|
||||
else if (PetGrid2.Child == graph.This)
|
||||
{
|
||||
petgridcrlf = false;
|
||||
((IGraph)(PetGrid.Child)).Stop(true);
|
||||
Dispatcher.Invoke(() =>
|
||||
{
|
||||
@ -1101,8 +1110,6 @@ namespace VPet_Simulator.Core
|
||||
return;
|
||||
}
|
||||
graph.Run(EndAction);
|
||||
|
||||
|
||||
if (petgridcrlf)
|
||||
{
|
||||
((IGraph)(PetGrid.Child)).Stop(true);
|
||||
|
Loading…
Reference in New Issue
Block a user