修复动画确实和宠物在关闭移动时位移的错误 Fix #147 #29

VPet-Simulator.Core/Graph/GraphHelper.cs

@@ -443,25 +443,27 @@ namespace VPet_Simulator.Core
                 m.CountNomal = 0;
                 m.Display(Graph, AnimatType.A_Start, () =>
                 {
-                    switch (LocateType)
+                    if (m.MoveTimerSmartMove)
                     {
-                        case DirectionType.Top:
-                            m.Core.Controller.MoveWindows(0, -m.Core.Controller.GetWindowsDistanceUp() / m.Core.Controller.ZoomRatio - LocateLength);
-                            break;
-                        case DirectionType.Bottom:
-                            m.Core.Controller.MoveWindows(0, m.Core.Controller.GetWindowsDistanceDown() / m.Core.Controller.ZoomRatio + LocateLength);
-                            break;
-                        case DirectionType.Left:
-                            m.Core.Controller.MoveWindows(-m.Core.Controller.GetWindowsDistanceLeft() / m.Core.Controller.ZoomRatio - LocateLength, 0);
-                            break;
-                        case DirectionType.Right:
-                            m.Core.Controller.MoveWindows(m.Core.Controller.GetWindowsDistanceRight() / m.Core.Controller.ZoomRatio + LocateLength, 0);
-                            break;
+                        switch (LocateType)
+                        {
+                            case DirectionType.Top:
+                                m.Core.Controller.MoveWindows(0, -m.Core.Controller.GetWindowsDistanceUp() / m.Core.Controller.ZoomRatio - LocateLength);
+                                break;
+                            case DirectionType.Bottom:
+                                m.Core.Controller.MoveWindows(0, m.Core.Controller.GetWindowsDistanceDown() / m.Core.Controller.ZoomRatio + LocateLength);
+                                break;
+                            case DirectionType.Left:
+                                m.Core.Controller.MoveWindows(-m.Core.Controller.GetWindowsDistanceLeft() / m.Core.Controller.ZoomRatio - LocateLength, 0);
+                                break;
+                            case DirectionType.Right:
+                                m.Core.Controller.MoveWindows(m.Core.Controller.GetWindowsDistanceRight() / m.Core.Controller.ZoomRatio + LocateLength, 0);
+                                break;
+                        }
+                        m.MoveTimerPoint = new Point(SpeedX, SpeedY);
+                        m.MoveTimer.Interval = Interval;
+                        m.MoveTimer.Start();
                     }
-
-                    m.MoveTimerPoint = new Point(SpeedX, SpeedY);
-                    m.MoveTimer.Interval = Interval;
-                    m.MoveTimer.Start();
                     Displaying(m);
                 });
             }

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

@@ -20,9 +20,9 @@ move:|graph#fall.right:|TriggerBottom#200:|TriggerRight#200:|TriggerType#160:|Ch
 move:|graph#walk.left:|TriggerLeft#200:|TriggerType#16:|CheckLeft#100:|CheckType#16:|SpeedX#-14:|Distance#7:|ModeType#12:|
 move:|graph#walk.right:|TriggerRight#200:|TriggerType#32:|CheckRight#100:|CheckType#32:|SpeedX#14:|Distance#7:|ModeType#12:|
 move:|graph#walk.left.faster:|TriggerLeft#200:|TriggerType#16:|CheckLeft#100:|CheckType#16:|SpeedX#-20:|Distance#5:|ModeType#2:|
-move:|graph#walk.left.slow:|TriggerLeft#200:|TriggerType#16:|CheckLeft#100:|CheckType#16:|SpeedX#-10:|Distance#5:|ModeType#2:|
+move:|graph#walk.left.slow:|TriggerLeft#200:|TriggerType#16:|CheckLeft#100:|CheckType#16:|SpeedX#-10:|Distance#5:|ModeType#8:|
 move:|graph#walk.right.faster:|TriggerRight#200:|TriggerType#32:|CheckRight#100:|CheckType#32:|SpeedX#20:|Distance#5:|ModeType#2:|
-move:|graph#walk.right.slow:|TriggerRight#200:|TriggerType#32:|CheckRight#100:|CheckType#32:|SpeedX#10:|Distance#5:|ModeType#2:|
+move:|graph#walk.right.slow:|TriggerRight#200:|TriggerType#32:|CheckRight#100:|CheckType#32:|SpeedX#10:|Distance#5:|ModeType#8:|
 move:|graph#crawl.left:|TriggerLeft#200:|TriggerType#16:|CheckLeft#100:|CheckType#16:|SpeedX#-10:|Distance#8:|ModeType#14:|
 move:|graph#crawl.right:|TriggerRight#200:|TriggerType#32:|CheckRight#100:|CheckType#32:|SpeedX#10:|Distance#8:|ModeType#14:|
 duration:|state#10:|squat#20:|boring#20:|sleep#20:|