diff --git a/VPet-Simulator.Core/Display/Main.xaml.cs b/VPet-Simulator.Core/Display/Main.xaml.cs index 1c05131..4b4b8b5 100644 --- a/VPet-Simulator.Core/Display/Main.xaml.cs +++ b/VPet-Simulator.Core/Display/Main.xaml.cs @@ -54,10 +54,10 @@ namespace VPet_Simulator.Core UIGrid.Children.Add(MsgBar); Core.TouchEvent.Add(new TouchArea(Core.Graph.GraphConfig.TouchHeadLocate, Core.Graph.GraphConfig.TouchHeadSize, DisplayTouchHead)); Core.TouchEvent.Add(new TouchArea(Core.Graph.GraphConfig.TouchRaisedLocate, Core.Graph.GraphConfig.TouchRaisedSize, DisplayRaised, true)); - var ig = Core.Graph.FindGraph(GraphCore.GraphType.Default, Core.Save.Mode); + var ig = Core.Graph.FindGraph(GraphCore.GraphType.Default, core.Save.Mode); PetGrid.Child = ig.This; ig.Run(DisplayNomal); - + EventTimer.Elapsed += EventTimer_Elapsed; MoveTimer.Elapsed += MoveTimer_Elapsed; @@ -87,7 +87,7 @@ namespace VPet_Simulator.Core { var pth = DateTime.Now.Ticks; presstime = pth; - Thread.Sleep(Core.Controller.PressLength); + Thread.Sleep(Core.Controller.PressLength); Point mp = default; Dispatcher.BeginInvoke(new Action(() => mp = Mouse.GetPosition(MainGrid))).Wait(); if (isPress && presstime == pth) diff --git a/VPet-Simulator.Core/Display/MainDisplay.cs b/VPet-Simulator.Core/Display/MainDisplay.cs index 215d65d..0fa964f 100644 --- a/VPet-Simulator.Core/Display/MainDisplay.cs +++ b/VPet-Simulator.Core/Display/MainDisplay.cs @@ -29,7 +29,7 @@ namespace VPet_Simulator.Core public void DisplayNomal() { CountNomal++; - Display(Core.Graph.FindGraph(GraphCore.GraphType.Default, Core.Save.Mode), DisplayNomal); + Display(GraphCore.GraphType.Default, DisplayNomal); } /// /// 显示结束动画 @@ -59,7 +59,7 @@ namespace VPet_Simulator.Core return; Core.Save.StrengthChange(-1); Core.Save.FeelingChange(1); - if (DisplayType == GraphCore.GraphType.Touch_Head_B_Loop) + if (DisplayType == GraphType.Touch_Head_B_Loop) if (PetGrid.Child is IGraph ig && ig.GraphType == GraphCore.GraphType.Touch_Head_B_Loop) { ig.IsContinue = true; @@ -132,10 +132,10 @@ namespace VPet_Simulator.Core // ((IGraph)PetGrid.Child).IsContinue = true; // return; //} - //Display(Core.Graph.FindGraph(GraphCore.GraphType.Raised_Dynamic, Core.Save.Mode), () => - // Display(Core.Graph.FindGraph(GraphCore.GraphType.Touch_Head_B_Loop, Core.Save.Mode), () => - // Display(Core.Graph.FindGraph(GraphCore.GraphType.Touch_Head_C_End, Core.Save.Mode), () => - // Display(Core.Graph.FindGraph(GraphCore.GraphType.Default, Core.Save.Mode) + //Display(GraphCore.GraphType.Raised_Dynamic, () => + // Display(GraphCore.GraphType.Touch_Head_B_Loop, () => + // Display(GraphCore.GraphType.Touch_Head_C_End, () => + // Display(GraphCore.GraphType.Default //)))); } int rasetype = int.MinValue; @@ -154,13 +154,13 @@ namespace VPet_Simulator.Core case 0: case 1: case 2: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Raised_Dynamic, Core.Save.Mode), DisplayRaising); + Display(GraphCore.GraphType.Raised_Dynamic, DisplayRaising); return; case 3: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Raised_Static_A_Start, Core.Save.Mode), DisplayRaising); + Display(GraphCore.GraphType.Raised_Static_A_Start, DisplayRaising); return; default: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Raised_Static_B_Loop, Core.Save.Mode), DisplayRaising); + Display(GraphCore.GraphType.Raised_Static_B_Loop, DisplayRaising); rasetype = 4; break; } @@ -170,16 +170,16 @@ namespace VPet_Simulator.Core /// public void DisplayFalled_Left() { - Display(Core.Graph.FindGraph(GraphCore.GraphType.Fall_Left_B_End, Core.Save.Mode), - () => Display(Core.Graph.FindGraph(GraphCore.GraphType.Climb_Up_Left, Core.Save.Mode), DisplayNomal)); + Display(GraphCore.GraphType.Fall_Left_C_End, + () => Display(GraphCore.GraphType.Climb_Up_Left, DisplayNomal)); } /// /// 显示掉到地上 从左边 /// public void DisplayFalled_Right() { - Display(Core.Graph.FindGraph(GraphCore.GraphType.Fall_Right_B_End, Core.Save.Mode), - () => Display(Core.Graph.FindGraph(GraphCore.GraphType.Climb_Up_Right, Core.Save.Mode), DisplayNomal)); + Display(GraphCore.GraphType.Fall_Right_C_End, + () => Display(GraphCore.GraphType.Climb_Up_Right, DisplayNomal)); } /// /// 显示向左走 (有判断) @@ -191,7 +191,7 @@ namespace VPet_Simulator.Core { walklength = 0; CountNomal = 0; - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_A_Start, Core.Save.Mode), () => + Display(GraphCore.GraphType.Walk_Left_A_Start, () => { MoveTimerPoint = new Point(-Core.Graph.GraphConfig.SpeedWalk, 0); MoveTimer.Start(); @@ -210,34 +210,55 @@ namespace VPet_Simulator.Core switch (Function.Rnd.Next(3)) { case 0: - DisplayClimb_Left_UP(() => + DisplayFall_Left(() => { MoveTimer.Stop(); - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal); + Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); }); return; case 1: - DisplayClimb_Left_DOWN(() => + DisplayFall_Right(() => { MoveTimer.Stop(); - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal); + Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); }); return; default: MoveTimer.Stop(); - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal); + Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); return; } } //不是:继续右边走or停下 if (Function.Rnd.Next(walklength++) < 5) { - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_B_Loop, Core.Save.Mode), DisplayWalk_Lefting); + Display(GraphCore.GraphType.Walk_Left_B_Loop, DisplayWalk_Lefting); } else {//停下来 - MoveTimer.Stop(); - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal); + switch (Function.Rnd.Next(3)) + { + + case 0: + DisplayFall_Left(() => + { + MoveTimer.Stop(); + Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); + }); + break; + case 1: + DisplayFall_Right(() => + { + MoveTimer.Stop(); + Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); + }); + break; + default: + MoveTimer.Stop(); + Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); + break; + + } } } /// @@ -250,7 +271,7 @@ namespace VPet_Simulator.Core { walklength = 0; CountNomal = 0; - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_A_Start, Core.Save.Mode), () => + Display(GraphCore.GraphType.Walk_Right_A_Start, () => { MoveTimerPoint = new Point(Core.Graph.GraphConfig.SpeedWalk, 0); MoveTimer.Start(); @@ -272,31 +293,52 @@ namespace VPet_Simulator.Core DisplayClimb_Right_UP(() => { MoveTimer.Stop(); - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_C_End, Core.Save.Mode), DisplayNomal); + Display(GraphCore.GraphType.Walk_Right_C_End, DisplayNomal); }); return; case 1: DisplayClimb_Right_DOWN(() => { MoveTimer.Stop(); - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_C_End, Core.Save.Mode), DisplayNomal); + Display(GraphCore.GraphType.Walk_Right_C_End, DisplayNomal); }); return; default: MoveTimer.Stop(); - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_C_End, Core.Save.Mode), DisplayNomal); + Display(GraphCore.GraphType.Walk_Right_C_End, DisplayNomal); return; } } //不是:继续右边走or停下 if (Function.Rnd.Next(walklength++) < 5) { - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_B_Loop, Core.Save.Mode), DisplayWalk_Righting); + Display(GraphCore.GraphType.Walk_Right_B_Loop, DisplayWalk_Righting); } else {//停下来 - MoveTimer.Stop(); - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_C_End, Core.Save.Mode), DisplayNomal); + switch (Function.Rnd.Next(3)) + { + + case 0: + DisplayFall_Left(() => + { + MoveTimer.Stop(); + Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); + }); + break; + case 1: + DisplayFall_Right(() => + { + MoveTimer.Stop(); + Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); + }); + break; + default: + MoveTimer.Stop(); + Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); + break; + + } } } ///// @@ -308,7 +350,7 @@ namespace VPet_Simulator.Core // if (Core.Controller.GetWindowsDistanceLeft() > 400 * Core.Controller.ZoomRatio) // { // walklength = 0; - // Display(Core.Graph.FindGraph(GraphCore.GraphType.Climb_Bottom_Left, Core.Save.Mode), () => + // Display(GraphCore.GraphType.Climb_Bottom_Left, () => // { // MoveTimerPoint = new Point(-20, 0);//TODO:锚定设置 // MoveTimer.Start(); @@ -330,31 +372,31 @@ namespace VPet_Simulator.Core // DisplayClimb_Left_UP(() => // { // MoveTimer.Stop(); - // Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal); + // Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); // }); // return; // case 1: // DisplayClimb_Left_DOWN(() => // { // MoveTimer.Stop(); - // Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal); + // Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); // }); // return; // default: // MoveTimer.Stop(); - // Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal); + // Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); // return; // } // } // //不是:继续右边走or停下 // if (Function.Rnd.Next(walklength++) < 5) // { - // Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_B_Loop, Core.Save.Mode), DisplayWalk_Lefting); + // Display(GraphCore.GraphType.Walk_Left_B_Loop, DisplayWalk_Lefting); // } // else // {//停下来 // MoveTimer.Stop(); - // Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal); + // Display(GraphCore.GraphType.Walk_Left_C_End, DisplayNomal); // } //} /// @@ -368,7 +410,7 @@ namespace VPet_Simulator.Core walklength = 0; CountNomal = 0; Core.Controller.MoveWindows(-Core.Controller.GetWindowsDistanceLeft() / Core.Controller.ZoomRatio - 145, 0);//TODO:锚定设置 - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_A_Start, Core.Save.Mode), () => + Display(GraphCore.GraphType.Walk_Left_A_Start, () => { MoveTimerPoint = new Point(0, -Core.Graph.GraphConfig.SpeedClimb); MoveTimer.Start(); @@ -391,8 +433,9 @@ namespace VPet_Simulator.Core case 0: DisplayClimb_Top_Right(); return; - //case 1://TODO:落下 - // return; + case 1: + DisplayFall_Right(); + return; default: MoveTimer.Stop(); DisplayNomal(); @@ -402,12 +445,20 @@ namespace VPet_Simulator.Core //不是:继续or停下 if (Function.Rnd.Next(walklength++) < 8) { - Display(Core.Graph.FindGraph(GraphCore.GraphType.Climb_Left, Core.Save.Mode), DisplayClimb_Lefting_UP); + Display(GraphCore.GraphType.Climb_Left, DisplayClimb_Lefting_UP); } else {//停下来 - MoveTimer.Stop(); - DisplayNomal(); + switch (Function.Rnd.Next(3)) + { + case 1: + DisplayFall_Right(); + break; + default: + MoveTimer.Stop(); + DisplayNomal(); + break; + } } } /// @@ -422,7 +473,7 @@ namespace VPet_Simulator.Core CountNomal = 0; Core.Controller.MoveWindows(-Core.Controller.GetWindowsDistanceLeft() / Core.Controller.ZoomRatio - 145, 0);//TODO:锚定设置 - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_A_Start, Core.Save.Mode), () => + Display(GraphCore.GraphType.Walk_Left_A_Start, () => { MoveTimerPoint = new System.Windows.Point(0, Core.Graph.GraphConfig.SpeedClimb); MoveTimer.Start(); @@ -446,7 +497,7 @@ namespace VPet_Simulator.Core //不是:继续or停下 if (Function.Rnd.Next(walklength++) < 5) { - Display(Core.Graph.FindGraph(GraphCore.GraphType.Climb_Left, Core.Save.Mode), DisplayClimb_Lefting_DOWN); + Display(GraphCore.GraphType.Climb_Left, DisplayClimb_Lefting_DOWN); } else {//停下来 @@ -466,7 +517,7 @@ namespace VPet_Simulator.Core CountNomal = 0; Core.Controller.MoveWindows(Core.Controller.GetWindowsDistanceRight() / Core.Controller.ZoomRatio + 185, 0);//TODO:锚定设置 - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_A_Start, Core.Save.Mode), () => + Display(GraphCore.GraphType.Walk_Right_A_Start, () => { MoveTimerPoint = new Point(0, -Core.Graph.GraphConfig.SpeedClimb); MoveTimer.Start(); @@ -489,8 +540,9 @@ namespace VPet_Simulator.Core case 0: DisplayClimb_Top_Left(); return; - //case 1://TODO:落下 - // return; + case 1: + DisplayFall_Left(); + return; default: MoveTimer.Stop(); DisplayNomal(); @@ -500,12 +552,20 @@ namespace VPet_Simulator.Core //不是:继续or停下 if (Function.Rnd.Next(walklength++) < 5) { - Display(Core.Graph.FindGraph(GraphCore.GraphType.Climb_Right, Core.Save.Mode), DisplayClimb_Righting_UP); + Display(GraphCore.GraphType.Climb_Right, DisplayClimb_Righting_UP); } else {//停下来 - MoveTimer.Stop(); - DisplayNomal(); + switch (Function.Rnd.Next(3)) + { + case 0: + DisplayFall_Left(); + break; + default: + MoveTimer.Stop(); + DisplayNomal(); + break; + } } } /// @@ -520,7 +580,7 @@ namespace VPet_Simulator.Core CountNomal = 0; Core.Controller.MoveWindows(Core.Controller.GetWindowsDistanceRight() / Core.Controller.ZoomRatio + 185, 0);//TODO:锚定设置 - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_A_Start, Core.Save.Mode), () => + Display(GraphCore.GraphType.Walk_Right_A_Start, () => { MoveTimerPoint = new Point(0, Core.Graph.GraphConfig.SpeedClimb); MoveTimer.Start(); @@ -544,7 +604,7 @@ namespace VPet_Simulator.Core //不是:继续or停下 if (Function.Rnd.Next(walklength++) < 5) { - Display(Core.Graph.FindGraph(GraphCore.GraphType.Climb_Right, Core.Save.Mode), DisplayClimb_Righting_DOWN); + Display(GraphCore.GraphType.Climb_Right, DisplayClimb_Righting_DOWN); } else {//停下来 @@ -582,8 +642,9 @@ namespace VPet_Simulator.Core case 0: DisplayClimb_Right_DOWN(); return; - //case 1://TODO:落下 - // return; + case 1: + DisplayFall_Right(); + return; default: Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio); MoveTimer.Stop(); @@ -594,7 +655,7 @@ namespace VPet_Simulator.Core //不是:继续or停下 if (Function.Rnd.Next(walklength++) < 10) { - Display(Core.Graph.FindGraph(GraphCore.GraphType.Climb_Top_Right, Core.Save.Mode), DisplayClimb_Top_Righting); + Display(GraphType.Climb_Top_Right, DisplayClimb_Top_Righting); } else {//停下来 @@ -609,7 +670,7 @@ namespace VPet_Simulator.Core public void DisplayClimb_Top_Left() { //看看距离是否满足调节 - if (Core.Controller.GetWindowsDistanceUp() < 50 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceLeft() > 400 * Core.Controller.ZoomRatio) + if (Core.Controller.GetWindowsDistanceUp() < 100 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceLeft() > 400 * Core.Controller.ZoomRatio) { walklength = 0; CountNomal = 0; @@ -633,8 +694,9 @@ namespace VPet_Simulator.Core case 0: DisplayClimb_Left_DOWN(); return; - //case 1://TODO:落下 - // return; + case 1: + DisplayFall_Left(); + return; default: Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio); MoveTimer.Stop(); @@ -645,7 +707,7 @@ namespace VPet_Simulator.Core //不是:继续or停下 if (Function.Rnd.Next(walklength++) < 10) { - Display(Core.Graph.FindGraph(GraphCore.GraphType.Climb_Top_Left, Core.Save.Mode), DisplayClimb_Top_Lefting); + Display(GraphCore.GraphType.Climb_Top_Left, DisplayClimb_Top_Lefting); } else {//停下来 @@ -654,14 +716,139 @@ namespace VPet_Simulator.Core DisplayNomal(); } } + /// + /// 显示掉落向左 + /// + public void DisplayFall_Left(Action ifNot = null) + { + //看看距离是否满足调节 + if (Core.Controller.GetWindowsDistanceDown() > 400 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceLeft() > 400 * Core.Controller.ZoomRatio) + { + walklength = 0; + CountNomal = 0; + //Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio - 150); + MoveTimerPoint = new Point(-Core.Graph.GraphConfig.SpeedFallX, Core.Graph.GraphConfig.SpeedFallY); + MoveTimer.Start(); + Display(GraphType.Fall_Left_A_Start, DisplayFall_Lefting); + } + else + ifNot?.Invoke(); + } + /// + /// 显示掉落向左 + /// + private void DisplayFall_Lefting() + { + //看看距离是不是不足 + if (Core.Controller.GetWindowsDistanceLeft() < 50 * Core.Controller.ZoomRatio || Core.Controller.GetWindowsDistanceDown() < 50 * Core.Controller.ZoomRatio) + {//是,停下恢复默认 or向上爬 + switch (Function.Rnd.Next(3)) + { + case 0: + DisplayClimb_Left_UP(() => + { + MoveTimer.Stop(); + DisplayFalled_Left(); + }); + return; + case 1: + DisplayClimb_Left_DOWN(() => + { + MoveTimer.Stop(); + DisplayFalled_Left(); + }); + return; + default: + //Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio); + MoveTimer.Stop(); + DisplayFalled_Left(); + return; + } + } + //不是:继续or停下 + if (Function.Rnd.Next(walklength++) < 7) + { + Display(GraphCore.GraphType.Fall_Left_B_Loop, DisplayFall_Lefting); + } + else + {//停下来 + //Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio); + MoveTimer.Stop(); + DisplayFalled_Left(); + //DisplayNomal(); + } + } + + /// + /// 显示掉落向右 + /// + public void DisplayFall_Right(Action ifNot = null) + { + //看看距离是否满足调节 + if (Core.Controller.GetWindowsDistanceDown() > 400 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceRight() > 400 * Core.Controller.ZoomRatio) + { + walklength = 0; + CountNomal = 0; + //Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio - 150); + MoveTimerPoint = new Point(Core.Graph.GraphConfig.SpeedFallX, Core.Graph.GraphConfig.SpeedFallY); + MoveTimer.Start(); + Display(GraphType.Fall_Right_A_Start, DisplayFall_Righting); + } + else + ifNot?.Invoke(); + } + /// + /// 显示掉落向右 + /// + private void DisplayFall_Righting() + { + //看看距离是不是不足 + if (Core.Controller.GetWindowsDistanceRight() < 50 * Core.Controller.ZoomRatio || Core.Controller.GetWindowsDistanceDown() < 50 * Core.Controller.ZoomRatio) + {//是,停下恢复默认 or向上爬 + switch (Function.Rnd.Next(3)) + { + case 0: + DisplayClimb_Right_UP(() => + { + MoveTimer.Stop(); + DisplayFalled_Right(); + }); + return; + case 1: + DisplayClimb_Right_DOWN(() => + { + MoveTimer.Stop(); + DisplayFalled_Right(); + }); + return; + default: + //Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio); + MoveTimer.Stop(); + DisplayFalled_Right(); + return; + } + } + //不是:继续or停下 + if (Function.Rnd.Next(walklength++) < 7) + { + Display(GraphCore.GraphType.Fall_Right_B_Loop, DisplayFall_Righting); + } + else + {//停下来 + //Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio); + MoveTimer.Stop(); + DisplayFalled_Right(); + //DisplayNomal(); + } + } - - - - + public void Display(GraphType Type, Action EndAction = null, bool StoreRnd = false) + { + Display(Core.Graph.FindGraph(Type, Core.Save.Mode, StoreRnd), EndAction); + } bool petgridcrlf = true; /// /// 显示动画 (自动多层切换) @@ -681,7 +868,7 @@ namespace VPet_Simulator.Core { PetGrid.Visibility = Visibility.Visible; PetGrid2.Visibility = Visibility.Collapsed; - }); + }); graph.Run(EndAction); return; } diff --git a/VPet-Simulator.Core/Display/MainLogic.cs b/VPet-Simulator.Core/Display/MainLogic.cs index ca9eb2c..ebeb396 100644 --- a/VPet-Simulator.Core/Display/MainLogic.cs +++ b/VPet-Simulator.Core/Display/MainLogic.cs @@ -22,44 +22,56 @@ namespace VPet_Simulator.Core //所有Handle TimeHandle?.Invoke(this); - //饮食等乱七八糟的消耗 - if (Core.Save.StrengthFood >= 50) + if (Core.Controller.EnableFunction) { - Core.Save.StrengthChange(1); - } - else if (Core.Save.StrengthFood <= 25) - { - Core.Save.Health -= Function.Rnd.Next(0, 1); - } - if (Core.Save.Strength <= 40) - { - Core.Save.Health -= Function.Rnd.Next(0, 1); - } - Core.Save.StrengthChangeFood(-1); - if (Core.Save.Feeling >= 75) - { - if (Core.Save.Feeling >= 90) + //饮食等乱七八糟的消耗 + if (Core.Save.StrengthFood >= 50) { - Core.Save.Likability++; + Core.Save.StrengthChange(1); + } + else if (Core.Save.StrengthFood <= 25) + { + Core.Save.Health -= Function.Rnd.Next(0, 1); + } + if (Core.Save.Strength <= 40) + { + Core.Save.Health -= Function.Rnd.Next(0, 1); + } + Core.Save.StrengthChangeFood(-1); + if (Core.Save.Feeling >= 75) + { + if (Core.Save.Feeling >= 90) + { + Core.Save.Likability++; + } + Core.Save.Exp++; + Core.Save.Health++; + } + else if (Core.Save.Feeling <= 25) + { + Core.Save.Likability--; + } + if (Core.Save.StrengthDrink <= 25) + { + Core.Save.Health -= Function.Rnd.Next(0, 1); + } + var newmod = Core.Save.CalMode(); + if(Core.Save.Mode != newmod) + { + //TODO:切换逻辑 + Core.Save.Mode = newmod; } - Core.Save.Exp++; - Core.Save.Health++; } - else if (Core.Save.Feeling <= 25) + else { - Core.Save.Likability--; + Core.Save.Mode = Save.ModeType.Happy; } - if (Core.Save.StrengthDrink <= 25) - { - Core.Save.Health -= Function.Rnd.Next(0, 1); - } - //UIHandle Dispatcher.Invoke(() => TimeUIHandle.Invoke(this)); if (DisplayType == GraphCore.GraphType.Default && !isPress) - switch (Function.Rnd.Next(Math.Max(20, 200 - CountNomal))) + switch (9)//Function.Rnd.Next(Math.Max(20, 200 - CountNomal))) { case 0: case 7: @@ -82,6 +94,12 @@ namespace VPet_Simulator.Core case 6: DisplayWalk_Right(); break; + case 8: + DisplayFall_Left(); + break; + case 9: + DisplayFall_Right(); + break; case 10: DisplayClimb_Top_Right(); break; diff --git a/VPet-Simulator.Core/Graph/GraphCore.cs b/VPet-Simulator.Core/Graph/GraphCore.cs index b53775a..051c52a 100644 --- a/VPet-Simulator.Core/Graph/GraphCore.cs +++ b/VPet-Simulator.Core/Graph/GraphCore.cs @@ -90,21 +90,29 @@ namespace VPet_Simulator.Core /// Squat_C_End, /// - /// 下落向左 (开始/循环) + /// 下落向左 (开始) /// - Fall_Left_A_Loop, + Fall_Left_A_Start, + /// + /// 下落向左 (循环) + /// + Fall_Left_B_Loop, /// /// 下落向左 (结束) /// - Fall_Left_B_End, + Fall_Left_C_End, /// /// 下落向右 (开始/循环) /// - Fall_Right_A_Loop, + Fall_Right_A_Start, + /// + /// 下落向右 (开始/循环) + /// + Fall_Right_B_Loop, /// /// 下落向右 (结束) /// - Fall_Right_B_End, + Fall_Right_C_End, /// /// 走路向右 (开始) /// @@ -326,6 +334,14 @@ namespace VPet_Simulator.Core /// public double SpeedCrawl; /// + /// 掉落速度 X轴 + /// + public double SpeedFallX; + /// + /// 掉落速度 Y轴 + /// + public double SpeedFallY; + /// /// 定位爬行左边距离 /// public double LocateClimbLeft; @@ -337,6 +353,8 @@ namespace VPet_Simulator.Core /// 定位爬行上边距离 /// public double LocateClimbTop; + + /// /// 初始化设置 /// @@ -353,6 +371,10 @@ namespace VPet_Simulator.Core SpeedClimb = s[(gdbe)"climb"]; SpeedClimbTop = s[(gdbe)"climbtop"]; SpeedCrawl = s[(gdbe)"crawl"]; + SpeedFallX = s[(gdbe)"fallx"]; + SpeedFallY = s[(gdbe)"fally"]; + + s = lps["locate"]; LocateClimbLeft = s[(gdbe)"climbleft"]; LocateClimbRight = s[(gdbe)"climbright"]; @@ -379,9 +401,11 @@ namespace VPet_Simulator.Core if (s != null) { SpeedWalk = s.GetDouble("walk", SpeedWalk); - SpeedClimb = s.GetDouble("climb", SpeedWalk); - SpeedClimbTop = s.GetDouble("climbtop", SpeedWalk); - SpeedCrawl = s.GetDouble("crawl", SpeedWalk); + SpeedClimb = s.GetDouble("climb", SpeedClimb); + SpeedClimbTop = s.GetDouble("climbtop", SpeedClimbTop); + SpeedCrawl = s.GetDouble("crawl", SpeedCrawl); + SpeedFallX = s.GetDouble("fallx", SpeedFallX); + SpeedFallY = s.GetDouble("fally", SpeedFallY); } s = lps.FindLine("locate"); if (s != null) diff --git a/VPet-Simulator.Core/Handle/IController.cs b/VPet-Simulator.Core/Handle/IController.cs index ef1e681..48e2843 100644 --- a/VPet-Simulator.Core/Handle/IController.cs +++ b/VPet-Simulator.Core/Handle/IController.cs @@ -59,6 +59,9 @@ namespace VPet_Simulator.Core /// 显示面板窗体 /// void ShowPanel(); - + /// + /// 启用计算等数据功能 + /// + bool EnableFunction { get; } } } diff --git a/VPet-Simulator.Windows/Function/MWController.cs b/VPet-Simulator.Windows/Function/MWController.cs index a00b937..3eabfca 100644 --- a/VPet-Simulator.Windows/Function/MWController.cs +++ b/VPet-Simulator.Windows/Function/MWController.cs @@ -62,5 +62,7 @@ namespace VPet_Simulator.Windows public double ZoomRatio => mw.Set.ZoomLevel; public int PressLength => 500; + + public bool EnableFunction => false; } } diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup.lps b/VPet-Simulator.Windows/mod/0000_core/pet/vup.lps index 3b5c91f..7b259e5 100644 --- a/VPet-Simulator.Windows/mod/0000_core/pet/vup.lps +++ b/VPet-Simulator.Windows/mod/0000_core/pet/vup.lps @@ -1,6 +1,6 @@ pet#默认虚拟桌宠:|intor#虚拟主播模拟器默认人物形象:|path#vup:| -touchhead:|px#138:|py#12:|sw#224:|sh#176:| +touchhead:|px#159:|py#16:|sw#189:|sh#178:| touchraised:|px#0:|py#50:|sw#500:|sh#200:| raisepoint:|x#290:|y#128:| -speed:|walk#20:|climb#10:|climbtop#8:|crawl#8:| +speed:|walk#20:|climb#10:|climbtop#8:|crawl#8:|fallx#14:|fally#10:| locate:|climbleft#145:|climbright#185:|climbtop#150:| \ No newline at end of file diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_000_125.png deleted file mode 100644 index 4013a10..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_000_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_001_125.png deleted file mode 100644 index ce76b84..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_001_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_002_125.png deleted file mode 100644 index 1caffcf..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_002_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_004_125.png deleted file mode 100644 index 1caffcf..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_004_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_005_125.png deleted file mode 100644 index ce76b84..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_005_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_006_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_006_125.png deleted file mode 100644 index 1caffcf..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_006_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/开始下落,向左_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/开始下落,向左_000_125.png new file mode 100644 index 0000000..6abcb48 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/开始下落,向左_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/开始下落,向左_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/开始下落,向左_001_125.png new file mode 100644 index 0000000..4d35ad9 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/开始下落,向左_001_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/开始下落,向左_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/开始下落,向左_002_125.png new file mode 100644 index 0000000..cc9beeb Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/开始下落,向左_002_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/开始下落,向左_003_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/下落重复帧_003_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/A_Nomal/开始下落,向左_003_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_000_125.png new file mode 100644 index 0000000..f89f89e Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_001_125.png new file mode 100644 index 0000000..cc9beeb Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_001_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_002_125.png new file mode 100644 index 0000000..70c2778 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_002_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_003_125.png new file mode 100644 index 0000000..cc9beeb Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_003_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_004_125.png new file mode 100644 index 0000000..f89f89e Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_004_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_005_125.png new file mode 100644 index 0000000..cc9beeb Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_005_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_006_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_006_125.png new file mode 100644 index 0000000..70c2778 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_006_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_007_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_007_125.png new file mode 100644 index 0000000..cc9beeb Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/下落向左循环_007_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_000_125.png deleted file mode 100644 index 6cd93d2..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_000_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_001_125.png deleted file mode 100644 index 8062a47..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_001_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_002_125.png deleted file mode 100644 index 7134845..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_002_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_003_125.png deleted file mode 100644 index 42f0152..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_003_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_004_125.png deleted file mode 100644 index a3da605..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_004_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_005_125.png deleted file mode 100644 index 8d6ddf8..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_005_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_006_625.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_006_625.png deleted file mode 100644 index a3da605..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/B_Nomal/落下_006_625.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_000_125.png new file mode 100644 index 0000000..08da6ad Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_001_125.png new file mode 100644 index 0000000..fbe4a69 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_001_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_002_125.png new file mode 100644 index 0000000..180f34b Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_002_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_003_125.png new file mode 100644 index 0000000..a8b7235 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_003_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_004_125.png new file mode 100644 index 0000000..f4b23c6 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_004_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_005_125.png new file mode 100644 index 0000000..fa717d0 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_005_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_006_500.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_006_500.png new file mode 100644 index 0000000..f4b23c6 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Left/C_Nomal/下落落地,向左_006_500.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/开始下落,向右_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/开始下落,向右_000_125.png new file mode 100644 index 0000000..fdc3035 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/开始下落,向右_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/开始下落,向右_001_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_000_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/开始下落,向右_001_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/开始下落,向右_002_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_001_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/开始下落,向右_002_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/开始下落,向右_003_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_002_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/开始下落,向右_003_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_000_125.png new file mode 100644 index 0000000..df59c22 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_001_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_003_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_001_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_002_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_004_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_002_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_003_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/A_Nomal/下落向右,循环_005_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_003_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_004_125.png new file mode 100644 index 0000000..df59c22 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_004_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_005_125.png new file mode 100644 index 0000000..8dff891 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_005_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_006_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_006_125.png new file mode 100644 index 0000000..daf36ef Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_006_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_007_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_007_125.png new file mode 100644 index 0000000..8dff891 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/向右下落循环_007_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_000_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_000_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_000_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_001_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_001_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_001_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_002_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_002_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_002_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_003_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_003_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_003_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_004_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_004_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_004_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_005_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_005_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_005_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_006_625.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_006_375.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/B_Nomal/落地动画_006_625.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Fall_Right/C_Nomal/落地,向右_006_375.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/下落向右.rar b/VPet-Simulator.Windows/mod/0000_core/pet/vup/下落向右.rar new file mode 100644 index 0000000..4d65b13 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/下落向右.rar differ