diff --git a/VPet-Simulator.Core/Display/Main.xaml.cs b/VPet-Simulator.Core/Display/Main.xaml.cs index 4bc36ae..f84fd12 100644 --- a/VPet-Simulator.Core/Display/Main.xaml.cs +++ b/VPet-Simulator.Core/Display/Main.xaml.cs @@ -75,7 +75,12 @@ namespace VPet_Simulator.Core } private void MoveTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) { + string str = DisplayType.ToString(); Core.Controller.MoveWindows(MoveTimerPoint.X, MoveTimerPoint.Y); + if (!str.Contains("Left") && !str.Contains("Right")) + { + MoveTimer.Stop(); + } } public Action DefaultClickAction; bool isPress = false; diff --git a/VPet-Simulator.Core/Display/MainDisplay.cs b/VPet-Simulator.Core/Display/MainDisplay.cs index fa263bb..e05eb04 100644 --- a/VPet-Simulator.Core/Display/MainDisplay.cs +++ b/VPet-Simulator.Core/Display/MainDisplay.cs @@ -41,28 +41,31 @@ namespace VPet_Simulator.Core switch (DisplayType) { case GraphCore.GraphType.Boring_B_Loop: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_C_End, Core.Save.Mode, true), EndAction); + Display(GraphCore.GraphType.Boring_C_End, EndAction); return true; case GraphCore.GraphType.Squat_B_Loop: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_C_End, Core.Save.Mode, true), EndAction); + Display(GraphCore.GraphType.Squat_C_End, EndAction); return true; case GraphType.Crawl_Left_B_Loop: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Crawl_Left_C_End, Core.Save.Mode, true), EndAction); + Display(GraphCore.GraphType.Crawl_Left_C_End, EndAction); return true; case GraphType.Crawl_Right_B_Loop: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Crawl_Right_C_End, Core.Save.Mode, true), EndAction); + Display(GraphCore.GraphType.Crawl_Right_C_End, EndAction); return true; case GraphType.Fall_Left_B_Loop: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Fall_Left_C_End, Core.Save.Mode, true), EndAction); + Display(GraphCore.GraphType.Fall_Left_C_End, EndAction); return true; case GraphType.Fall_Right_B_Loop: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Fall_Right_C_End, Core.Save.Mode, true), EndAction); + Display(GraphCore.GraphType.Fall_Right_C_End, EndAction); return true; case GraphType.Walk_Left_B_Loop: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode, true), EndAction); + Display(GraphCore.GraphType.Walk_Left_C_End, EndAction); return true; case GraphType.Walk_Right_B_Loop: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_C_End, Core.Save.Mode, true), EndAction); + Display(GraphCore.GraphType.Walk_Right_C_End, EndAction); + return true; + case GraphType.Sleep_B_Loop: + Display(GraphCore.GraphType.Sleep_C_End, EndAction); return true; //case GraphType.Climb_Left: //case GraphType.Climb_Right: @@ -95,9 +98,9 @@ namespace VPet_Simulator.Core return; } Core.Graph.RndGraph.Clear(); - Display(Core.Graph.FindGraph(GraphCore.GraphType.Touch_Head_A_Start, Core.Save.Mode, true), () => - Display(Core.Graph.FindGraph(GraphCore.GraphType.Touch_Head_B_Loop, Core.Save.Mode, true), () => - Display(Core.Graph.FindGraph(GraphCore.GraphType.Touch_Head_C_End, Core.Save.Mode, true), DisplayNomal + Display(GraphCore.GraphType.Touch_Head_A_Start, () => + Display(GraphCore.GraphType.Touch_Head_B_Loop, () => + Display(GraphCore.GraphType.Touch_Head_C_End, DisplayNomal ))); } @@ -109,17 +112,17 @@ namespace VPet_Simulator.Core looptimes = 0; CountNomal = 0; Core.Graph.RndGraph.Clear(); - Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_A_Start, Core.Save.Mode, true), DisplayBoringing); + Display(GraphCore.GraphType.Boring_A_Start, DisplayBoringing); } /// /// 显示无聊情况 /// private void DisplayBoringing() { - if (Function.Rnd.Next(++looptimes) > 10) - Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_C_End, Core.Save.Mode, true), DisplayNomal); + if (Function.Rnd.Next(++looptimes) > LoopProMax) + Display(GraphCore.GraphType.Boring_C_End, DisplayNomal); else - Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_B_Loop, Core.Save.Mode, true), DisplayBoringing); + Display(GraphCore.GraphType.Boring_B_Loop, DisplayBoringing); } int looptimes; /// @@ -130,18 +133,49 @@ namespace VPet_Simulator.Core looptimes = 0; CountNomal = 0; Core.Graph.RndGraph.Clear(); - Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_A_Start, Core.Save.Mode, true), DisplaySquating); + Display(GraphCore.GraphType.Squat_A_Start, DisplaySquating); } /// /// 显示蹲下情况 /// public void DisplaySquating() { - if (Function.Rnd.Next(++looptimes) > 10) - Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_C_End, Core.Save.Mode, true), DisplayNomal); + if (Function.Rnd.Next(++looptimes) > LoopProMax) + Display(GraphCore.GraphType.Squat_C_End, DisplayNomal); else - Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_B_Loop, Core.Save.Mode, true), DisplaySquating); + Display(GraphCore.GraphType.Squat_B_Loop, DisplaySquating); } + /// + /// 显示睡觉情况 + /// + public void DisplaySleep(bool force = false) + { + looptimes = 0; + CountNomal = 0; + Core.Graph.RndGraph.Clear(); + if (force) + Display(GraphCore.GraphType.Sleep_A_Start, DisplaySleepingForce); + else + Display(GraphCore.GraphType.Sleep_A_Start, DisplaySleeping); + } + /// + /// 显示睡觉情况 (正常) + /// + public void DisplaySleeping() + { + if (Function.Rnd.Next(++looptimes) > LoopProMax) + Display(GraphCore.GraphType.Sleep_C_End, DisplayNomal); + else + Display(GraphCore.GraphType.Sleep_B_Loop, DisplaySleeping); + } + /// + /// 显示睡觉情况 (强制) + /// + public void DisplaySleepingForce() + {//TODO:如果开启了Function,强制睡觉为永久,否则睡到自然醒+LoopMax + Display(GraphCore.GraphType.Sleep_B_Loop, DisplaySleepingForce); + } + /// /// 显示拖拽情况 /// @@ -930,10 +964,14 @@ namespace VPet_Simulator.Core - - public void Display(GraphType Type, Action EndAction = null, bool StoreRnd = false) + /// + /// 显示动画 + /// + /// 动画类型 + /// 动画结束后操作 + public void Display(GraphType Type, Action EndAction = null)//, bool StoreRnd = false) { - Display(Core.Graph.FindGraph(Type, Core.Save.Mode, StoreRnd), EndAction); + Display(Core.Graph.FindGraph(Type, Core.Save.Mode), EndAction); } bool petgridcrlf = true; /// diff --git a/VPet-Simulator.Core/Display/MainLogic.cs b/VPet-Simulator.Core/Display/MainLogic.cs index 0ccfa2d..249a709 100644 --- a/VPet-Simulator.Core/Display/MainLogic.cs +++ b/VPet-Simulator.Core/Display/MainLogic.cs @@ -13,6 +13,7 @@ namespace VPet_Simulator.Core public const int DistanceMax = 100; public const int DistanceMid = 100; public const int DistanceMin = 50; + public const int LoopProMax = 20; public const int LoopMax = 10; public const int LoopMid = 7; public const int LoopMin = 5; @@ -84,7 +85,7 @@ namespace VPet_Simulator.Core Dispatcher.Invoke(() => TimeUIHandle.Invoke(this)); if (DisplayType == GraphCore.GraphType.Default && !isPress) - switch (Function.Rnd.Next(Math.Max(20, Core.Controller.InteractionCycle - CountNomal))) + switch (17)//Function.Rnd.Next(Math.Max(20, Core.Controller.InteractionCycle - CountNomal))) { case 0: //随机向右 @@ -123,6 +124,10 @@ namespace VPet_Simulator.Core case 11: DisplayCrawl_Right(); break; + case 13: + case 14: + DisplaySleep(); + break; case 15: case 16: DisplayBoring(); @@ -130,7 +135,7 @@ namespace VPet_Simulator.Core case 18: case 17: DisplaySquat(); - break; + break; default: break; } diff --git a/VPet-Simulator.Core/Display/ToolBar.xaml b/VPet-Simulator.Core/Display/ToolBar.xaml index 40c2469..bc8ef2b 100644 --- a/VPet-Simulator.Core/Display/ToolBar.xaml +++ b/VPet-Simulator.Core/Display/ToolBar.xaml @@ -109,7 +109,7 @@ - + diff --git a/VPet-Simulator.Core/Display/ToolBar.xaml.cs b/VPet-Simulator.Core/Display/ToolBar.xaml.cs index eff8c5c..c38745c 100644 --- a/VPet-Simulator.Core/Display/ToolBar.xaml.cs +++ b/VPet-Simulator.Core/Display/ToolBar.xaml.cs @@ -247,5 +247,10 @@ namespace VPet_Simulator.Core closetimer.Dispose(); closePanelTimer.Dispose(); } + + private void Sleep_Click(object sender, RoutedEventArgs e) + { + m.DisplaySleep(true); + } } } diff --git a/VPet-Simulator.Core/Graph/GraphCore.cs b/VPet-Simulator.Core/Graph/GraphCore.cs index 3d2433e..06b955e 100644 --- a/VPet-Simulator.Core/Graph/GraphCore.cs +++ b/VPet-Simulator.Core/Graph/GraphCore.cs @@ -265,9 +265,9 @@ namespace VPet_Simulator.Core /// /// 动画类型 /// 状态类型,找不到就找相同动画类型 - /// 是否储存随机数字典 + ///// 是否储存随机数字典 /// - public IGraph FindGraph(GraphType type, Save.ModeType mode, bool storernd = false) + public IGraph FindGraph(GraphType type, Save.ModeType mode)// { if (Graphs.ContainsKey(type)) { @@ -276,18 +276,18 @@ namespace VPet_Simulator.Core { if (list.Count == 1) return list[0]; - if (storernd) - if (RndGraph.TryGetValue(list.Count, out int index)) - { - return list[index]; - } - else - { - index = Function.Rnd.Next(list.Count); - RndGraph.Add(list.Count, index); - return list[index]; - } - else + //if (storernd) + // if (RndGraph.TryGetValue(list.Count, out int index)) + // { + // return list[index]; + // } + // else + // { + // index = Function.Rnd.Next(list.Count); + // RndGraph.Add(list.Count, index); + // return list[index]; + // } + //else return list[Function.Rnd.Next(list.Count)]; } else diff --git a/VPet-Simulator.Core/Graph/PNGAnimation.xaml.cs b/VPet-Simulator.Core/Graph/PNGAnimation.xaml.cs index 504e80d..3f2e951 100644 --- a/VPet-Simulator.Core/Graph/PNGAnimation.xaml.cs +++ b/VPet-Simulator.Core/Graph/PNGAnimation.xaml.cs @@ -85,10 +85,7 @@ namespace VPet_Simulator.Core Visibility = Visibility.Hidden }; MainGrid.Children.Add(img); - Animations.Add(new Animation(this, time, () => - { - img.Visibility = Visibility.Visible; - }, () => img.Visibility = Visibility.Hidden)); + Animations.Add(new Animation(this, time, () => img.Visibility = Visibility.Visible, () => img.Visibility = Visibility.Hidden)); } //else //{ @@ -196,7 +193,7 @@ namespace VPet_Simulator.Core EndAction?.Invoke();//运行结束动画时事件 parent.StopAction?.Invoke(); parent.StopAction = null; - //重新加载第一帧 + //延时隐藏 Task.Run(() => { Thread.Sleep(25); @@ -213,16 +210,16 @@ namespace VPet_Simulator.Core else { parent.IsContinue = false; - parent.Dispatcher.Invoke(Hidden); + //parent.Dispatcher.Invoke(Hidden); if (parent.DoEndAction) EndAction?.Invoke();//运行结束动画时事件 parent.StopAction?.Invoke(); parent.StopAction = null; - //Task.Run(() => - //{ - // Thread.Sleep(25); - // parent.Dispatcher.Invoke(Hidden); - //}); + Task.Run(() => + { + Thread.Sleep(25); + parent.Dispatcher.Invoke(Hidden); + }); } } } diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_007_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_007_250.png index ed54f75..02befb5 100644 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_007_250.png and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_007_250.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/往地上爬向左_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/往地上爬向左_000_125.png deleted file mode 100644 index 27fbf64..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/往地上爬向左_000_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/往地上爬向左_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/往地上爬向左_001_125.png deleted file mode 100644 index 915beac..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/往地上爬向左_001_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/往地上爬向左_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/往地上爬向左_002_125.png deleted file mode 100644 index 0cc5e72..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/往地上爬向左_002_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/爬行趴地向左_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/爬行趴地向左_000_125.png new file mode 100644 index 0000000..863e6a4 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/爬行趴地向左_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/爬行趴地向左_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/爬行趴地向左_001_125.png new file mode 100644 index 0000000..448691d Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/爬行趴地向左_001_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/爬行趴地向左_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/爬行趴地向左_002_125.png new file mode 100644 index 0000000..bb78af7 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/A_Nomal/爬行趴地向左_002_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_000_125.png new file mode 100644 index 0000000..bb78af7 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_001_125.png new file mode 100644 index 0000000..6761114 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_001_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_002_125.png new file mode 100644 index 0000000..7e3ed2a Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_002_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_003_125.png new file mode 100644 index 0000000..38b78ab Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_003_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_004_125.png new file mode 100644 index 0000000..3d5a498 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_004_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_005_125.png new file mode 100644 index 0000000..3409364 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬行爬起向左_005_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_000_125.png deleted file mode 100644 index 0cc5e72..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_000_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_001_125.png deleted file mode 100644 index 57eec4a..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_001_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_002_125.png deleted file mode 100644 index 0e60cda..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_002_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_003_125.png deleted file mode 100644 index 441d34e..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_003_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_004_125.png deleted file mode 100644 index f535c11..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_004_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_005_125.png deleted file mode 100644 index 7977cc2..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Left/C_Nomal/爬起起来向左_005_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/往地上爬向右_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/往地上爬向右_000_125.png deleted file mode 100644 index 4175394..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/往地上爬向右_000_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/往地上爬向右_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/往地上爬向右_001_125.png deleted file mode 100644 index bbb80c2..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/往地上爬向右_001_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/往地上爬向右_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/往地上爬向右_002_125.png deleted file mode 100644 index fe2e93d..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/往地上爬向右_002_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/爬行趴地向右_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/爬行趴地向右_000_125.png new file mode 100644 index 0000000..9b0b522 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/爬行趴地向右_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/爬行趴地向右_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/爬行趴地向右_001_125.png new file mode 100644 index 0000000..297fd3b Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/爬行趴地向右_001_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/爬行趴地向右_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/爬行趴地向右_002_125.png new file mode 100644 index 0000000..13ee30f Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/A_Nomal/爬行趴地向右_002_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_000_125.png deleted file mode 100644 index fe2e93d..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_000_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_001_125.png deleted file mode 100644 index 128c920..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_001_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_002_125.png deleted file mode 100644 index 61566ba..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_002_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_003_125.png deleted file mode 100644 index 0b801f4..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_003_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_004_125.png deleted file mode 100644 index f7aaadc..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_004_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_005_125.png deleted file mode 100644 index 6c1d774..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬地起身向右_005_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_000_125.png new file mode 100644 index 0000000..13ee30f Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_001_125.png new file mode 100644 index 0000000..c4f1b8e Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_001_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_002_125.png new file mode 100644 index 0000000..8d70bcd Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_002_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_003_125.png new file mode 100644 index 0000000..807a94a Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_003_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_004_125.png new file mode 100644 index 0000000..34a86e2 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_004_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_005_125.png new file mode 100644 index 0000000..93c45c5 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Crawl_Right/C_Nomal/爬行爬起向右_005_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_000_125.png new file mode 100644 index 0000000..5ba3231 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/下蹲_0_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_001_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/下蹲_0_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_001_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/下蹲_1_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_002_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/下蹲_1_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_002_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/下蹲_2_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_003_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/下蹲_2_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_003_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/下蹲_3_500.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_004_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/下蹲_3_500.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_004_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_005_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_005_250.png new file mode 100644 index 0000000..989cf36 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/A_Nomal/蹲下_005_250.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/1/对，就一张图蹲着看_000_375.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/1/对，就一张图蹲着看_000_375.png new file mode 100644 index 0000000..989cf36 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/1/对，就一张图蹲着看_000_375.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_000_125.png new file mode 100644 index 0000000..1a2080a Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_001_375.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_001_375.png new file mode 100644 index 0000000..063e31d Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_001_375.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_002_125.png new file mode 100644 index 0000000..1a2080a Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_002_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_003_125.png new file mode 100644 index 0000000..92f6bbc Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_003_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_004_125.png new file mode 100644 index 0000000..063e31d Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_004_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_005_125.png new file mode 100644 index 0000000..888fc58 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_005_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_006_375.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_006_375.png new file mode 100644 index 0000000..063e31d Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/2/蹲着看笑嘴嘴_006_375.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_000_125.png new file mode 100644 index 0000000..292405c Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_000_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_001_375.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_001_375.png new file mode 100644 index 0000000..7189278 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_001_375.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_002_125.png new file mode 100644 index 0000000..292405c Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_002_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_003_125.png new file mode 100644 index 0000000..7d1f21c Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_003_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_004_125.png new file mode 100644 index 0000000..7189278 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_004_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_005_125.png new file mode 100644 index 0000000..f668a3e Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_005_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_006_375.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_006_375.png new file mode 100644 index 0000000..7189278 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/3/蹲着看张嘴嘴_006_375.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_0_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_0_125.png deleted file mode 100644 index 42b4fd0..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_0_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_1_375.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_1_375.png deleted file mode 100644 index 3bf4eef..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_1_375.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_2_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_2_125.png deleted file mode 100644 index 42b4fd0..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_2_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_3_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_3_125.png deleted file mode 100644 index 86000ca..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_3_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_4_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_4_125.png deleted file mode 100644 index 3bf4eef..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_4_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_5_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_5_125.png deleted file mode 100644 index 282dbd0..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_5_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_6_375.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_6_375.png deleted file mode 100644 index 3bf4eef..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Squat/B_Nomal/下蹲_6_375.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/躺下睡觉和起来.rar b/VPet-Simulator.Windows/mod/0000_core/pet/vup/躺下睡觉和起来.rar deleted file mode 100644 index 3896f86..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/躺下睡觉和起来.rar and /dev/null differ