diff --git a/VPet-Simulator.Core/Display/Main.xaml.cs b/VPet-Simulator.Core/Display/Main.xaml.cs index 90481fa..1c05131 100644 --- a/VPet-Simulator.Core/Display/Main.xaml.cs +++ b/VPet-Simulator.Core/Display/Main.xaml.cs @@ -79,8 +79,7 @@ namespace VPet_Simulator.Core CountNomal = 0; if (DisplayType != GraphCore.GraphType.Default) {//不是nomal! 可能会卡timer,所有全部timer清空下 - MoveTimer.Stop(); - MainGrid.MouseMove -= MainGrid_MouseMove; + CleanState(); if (DisplayStopMove(DisplayNomal)) return; } @@ -140,10 +139,20 @@ namespace VPet_Simulator.Core MoveTimer.Stop(); EventTimer.Dispose(); MoveTimer.Dispose(); + MsgBar.Dispose(); + ToolBar.Dispose(); if (PetGrid.Child is IGraph g) - g.Stop(); + g.Stop(true); if (PetGrid2.Child is IGraph g2) - g2.Stop(); + g2.Stop(true); + } + /// + /// 清理所有状态 + /// + public void CleanState() + { + MoveTimer.Stop(); + MainGrid.MouseMove -= MainGrid_MouseMove; } } } diff --git a/VPet-Simulator.Core/Display/MainDisplay.cs b/VPet-Simulator.Core/Display/MainDisplay.cs index f3c1148..215d65d 100644 --- a/VPet-Simulator.Core/Display/MainDisplay.cs +++ b/VPet-Simulator.Core/Display/MainDisplay.cs @@ -41,10 +41,10 @@ namespace VPet_Simulator.Core switch (DisplayType) { case GraphCore.GraphType.Boring_B_Loop: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_C_End, Core.Save.Mode), EndAction); + Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_C_End, Core.Save.Mode, true), EndAction); return true; case GraphCore.GraphType.Squat_B_Loop: - Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_C_End, Core.Save.Mode), EndAction); + Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_C_End, Core.Save.Mode, true), EndAction); return true; } return false; @@ -70,9 +70,10 @@ namespace VPet_Simulator.Core ig2.IsContinue = true; return; } - Display(Core.Graph.FindGraph(GraphCore.GraphType.Touch_Head_A_Start, 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), DisplayNomal + 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 ))); } @@ -83,7 +84,8 @@ namespace VPet_Simulator.Core { looptimes = 0; CountNomal = 0; - Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_A_Start, Core.Save.Mode), DisplayBoringing); + Core.Graph.RndGraph.Clear(); + Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_A_Start, Core.Save.Mode, true), DisplayBoringing); } /// /// 显示无聊情况 @@ -91,9 +93,9 @@ namespace VPet_Simulator.Core private void DisplayBoringing() { if (Function.Rnd.Next(++looptimes) > 10) - Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_C_End, Core.Save.Mode), DisplayNomal); + Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_C_End, Core.Save.Mode, true), DisplayNomal); else - Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_B_Loop, Core.Save.Mode), DisplayBoringing); + Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_B_Loop, Core.Save.Mode, true), DisplayBoringing); } int looptimes; /// @@ -103,7 +105,8 @@ namespace VPet_Simulator.Core { looptimes = 0; CountNomal = 0; - Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_A_Start, Core.Save.Mode), DisplaySquating); + Core.Graph.RndGraph.Clear(); + Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_A_Start, Core.Save.Mode, true), DisplaySquating); } /// /// 显示蹲下情况 @@ -111,9 +114,9 @@ namespace VPet_Simulator.Core public void DisplaySquating() { if (Function.Rnd.Next(++looptimes) > 10) - Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_C_End, Core.Save.Mode), DisplayNomal); + Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_C_End, Core.Save.Mode, true), DisplayNomal); else - Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_B_Loop, Core.Save.Mode), DisplaySquating); + Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_B_Loop, Core.Save.Mode, true), DisplaySquating); } /// /// 显示拖拽情况 @@ -383,7 +386,7 @@ namespace VPet_Simulator.Core //看看距离是不是不足 if (Core.Controller.GetWindowsDistanceUp() < 100 * Core.Controller.ZoomRatio) {//是,停下恢复默认 or/爬上面的墙 - switch (0)//Function.Rnd.Next(3)) + switch (Function.Rnd.Next(3)) { case 0: DisplayClimb_Top_Right(); @@ -481,7 +484,7 @@ namespace VPet_Simulator.Core //看看距离是不是不足 if (Core.Controller.GetWindowsDistanceUp() < 100 * Core.Controller.ZoomRatio) {//是,停下恢复默认 or/爬上面的墙 - switch (3)//Function.Rnd.Next(3)) + switch (Function.Rnd.Next(3)) { case 0: DisplayClimb_Top_Left(); @@ -574,7 +577,7 @@ namespace VPet_Simulator.Core //看看距离是不是不足 if (Core.Controller.GetWindowsDistanceRight() < 50 * Core.Controller.ZoomRatio) {//是,停下恢复默认 or向下爬or掉落 - switch (3)//Function.Rnd.Next(3)) + switch (Function.Rnd.Next(3)) { case 0: DisplayClimb_Right_DOWN(); @@ -625,7 +628,7 @@ namespace VPet_Simulator.Core //看看距离是不是不足 if (Core.Controller.GetWindowsDistanceLeft() < 50 * Core.Controller.ZoomRatio) {//是,停下恢复默认 or向下爬 - switch (3)//Function.Rnd.Next(3)) + switch (Function.Rnd.Next(3)) { case 0: DisplayClimb_Left_DOWN(); @@ -678,8 +681,8 @@ namespace VPet_Simulator.Core { PetGrid.Visibility = Visibility.Visible; PetGrid2.Visibility = Visibility.Collapsed; - }); - ((IGraph)(PetGrid.Child)).Run(EndAction); + }); + graph.Run(EndAction); return; } else if (PetGrid2.Child == graph.This) @@ -689,7 +692,7 @@ namespace VPet_Simulator.Core PetGrid2.Visibility = Visibility.Visible; PetGrid.Visibility = Visibility.Collapsed; }); - ((IGraph)(PetGrid2.Child)).Run(EndAction); + graph.Run(EndAction); return; } graph.Run(EndAction); diff --git a/VPet-Simulator.Core/Display/MessageBar.xaml.cs b/VPet-Simulator.Core/Display/MessageBar.xaml.cs index 3079a8c..c0be33a 100644 --- a/VPet-Simulator.Core/Display/MessageBar.xaml.cs +++ b/VPet-Simulator.Core/Display/MessageBar.xaml.cs @@ -19,7 +19,7 @@ namespace VPet_Simulator.Core /// /// MessageBar.xaml 的交互逻辑 /// - public partial class MessageBar : UserControl + public partial class MessageBar : UserControl, IDisposable { public MessageBar() { @@ -98,5 +98,12 @@ namespace VPet_Simulator.Core this.Visibility = Visibility.Collapsed; EndAction?.Invoke(); } + + public void Dispose() + { + EndTimer.Dispose(); + ShowTimer.Dispose(); + CloseTimer.Dispose(); + } } } diff --git a/VPet-Simulator.Core/Display/ToolBar.xaml.cs b/VPet-Simulator.Core/Display/ToolBar.xaml.cs index 7dac8d9..4155920 100644 --- a/VPet-Simulator.Core/Display/ToolBar.xaml.cs +++ b/VPet-Simulator.Core/Display/ToolBar.xaml.cs @@ -22,12 +22,12 @@ namespace VPet_Simulator.Core /// /// ToolBar.xaml 的交互逻辑 /// - public partial class ToolBar : UserControl + public partial class ToolBar : UserControl, IDisposable { Main m; Timer closetimer; bool onFocus = false; - DispatcherTimer closePanelTimer; + Timer closePanelTimer; public ToolBar(Main m) { @@ -40,11 +40,8 @@ namespace VPet_Simulator.Core Enabled = false }; closetimer.Elapsed += Closetimer_Elapsed; - closePanelTimer = new DispatcherTimer() - { - Interval = TimeSpan.FromSeconds(0.1), - }; - closePanelTimer.Tick += ClosePanelTimer_Tick; + closePanelTimer = new Timer(); + closePanelTimer.Elapsed += ClosePanelTimer_Tick; m.TimeUIHandle += M_TimeUIHandle; } @@ -70,13 +67,16 @@ namespace VPet_Simulator.Core private void ClosePanelTimer_Tick(object sender, EventArgs e) { - if (BdrPanel.IsMouseOver - || MenuPanel.IsMouseOver) + Dispatcher.Invoke(() => { - closePanelTimer.Stop(); - return; - } - BdrPanel.Visibility = Visibility.Collapsed; + if (BdrPanel.IsMouseOver + || MenuPanel.IsMouseOver) + { + closePanelTimer.Stop(); + return; + } + BdrPanel.Visibility = Visibility.Collapsed; + }); } private void Closetimer_Elapsed(object sender, ElapsedEventArgs e) @@ -227,7 +227,14 @@ namespace VPet_Simulator.Core private void MenuDIY_Click(object sender, RoutedEventArgs e) { - m.Say("您好,我是萝莉斯, 让我来帮您熟悉并掌握使用vos系统,成为永世流传的虚拟主播."); + //m.Say("您好,我是萝莉斯, 让我来帮您熟悉并掌握使用vos系统,成为永世流传的虚拟主播."); + } + + public void Dispose() + { + m = null; + closetimer.Dispose(); + closePanelTimer.Dispose(); } } } diff --git a/VPet-Simulator.Core/Graph/IEyeTracking.xaml b/VPet-Simulator.Core/Graph/EyeTracking.xaml similarity index 89% rename from VPet-Simulator.Core/Graph/IEyeTracking.xaml rename to VPet-Simulator.Core/Graph/EyeTracking.xaml index 893cb49..b5da593 100644 --- a/VPet-Simulator.Core/Graph/IEyeTracking.xaml +++ b/VPet-Simulator.Core/Graph/EyeTracking.xaml @@ -1,4 +1,4 @@ - /// IEyeTracking.xaml 的交互逻辑 /// - public partial class IEyeTracking : UserControl + public partial class EyeTracking : UserControl { - public IEyeTracking() + public EyeTracking() { InitializeComponent(); } diff --git a/VPet-Simulator.Core/Graph/FoodAnimation.xaml b/VPet-Simulator.Core/Graph/FoodAnimation.xaml new file mode 100644 index 0000000..1964273 --- /dev/null +++ b/VPet-Simulator.Core/Graph/FoodAnimation.xaml @@ -0,0 +1,11 @@ + + + + + diff --git a/VPet-Simulator.Core/Graph/FoodAnimation.xaml.cs b/VPet-Simulator.Core/Graph/FoodAnimation.xaml.cs new file mode 100644 index 0000000..76bdd09 --- /dev/null +++ b/VPet-Simulator.Core/Graph/FoodAnimation.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace VPet_Simulator.Core.Graph +{ + /// + /// FoodAnimation.xaml 的交互逻辑 + /// + public partial class FoodAnimation : UserControl + { + public FoodAnimation() + { + InitializeComponent(); + } + } +} diff --git a/VPet-Simulator.Core/Graph/GraphCore.cs b/VPet-Simulator.Core/Graph/GraphCore.cs index 89b17a8..b53775a 100644 --- a/VPet-Simulator.Core/Graph/GraphCore.cs +++ b/VPet-Simulator.Core/Graph/GraphCore.cs @@ -221,19 +221,38 @@ namespace VPet_Simulator.Core AddGraph(new PNGAnimation(paths, modetype, graphtype, storemem), graphtype); } /// + /// 随机数字典(用于确保随机动画不会错位) + /// + public Dictionary RndGraph = new Dictionary(); + /// /// 查找动画 /// /// 动画类型 /// 状态类型,找不到就找相同动画类型 + /// 是否储存随机数字典 /// - public IGraph FindGraph(GraphType type, Save.ModeType mode) + public IGraph FindGraph(GraphType type, Save.ModeType mode, bool storernd = false) { if (Graphs.ContainsKey(type)) { var list = Graphs[type].FindAll(x => x.ModeType == mode); if (list.Count > 0) { - return list[Function.Rnd.Next(list.Count)]; + 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 + 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 3ef6bb4..839e6d8 100644 --- a/VPet-Simulator.Core/Graph/PNGAnimation.xaml.cs +++ b/VPet-Simulator.Core/Graph/PNGAnimation.xaml.cs @@ -44,6 +44,10 @@ namespace VPet_Simulator.Core /// 是否循环播放 /// public bool IsContinue { get; set; } = false; + ///// + ///// 是否重置状态从0开始播放 + ///// + //public bool IsResetPlay { get; set; } = false; /// /// 是否储存到内存以支持快速显示 /// @@ -53,8 +57,10 @@ namespace VPet_Simulator.Core public Save.ModeType ModeType { get; private set; } public GraphCore.GraphType GraphType { get; private set; } - - //private Action endwilldo; + /// + /// 动画停止时运行的方法 + /// + private Action StopAction; int nowid; /// /// 新建 PNG 动画 @@ -188,13 +194,14 @@ namespace VPet_Simulator.Core //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); + }); return; } //要下一步,现在就隐藏图层 @@ -209,6 +216,8 @@ namespace VPet_Simulator.Core parent.Dispatcher.Invoke(Hidden); if (parent.DoEndAction) EndAction?.Invoke();//运行结束动画时事件 + parent.StopAction?.Invoke(); + parent.StopAction = null; //Task.Run(() => //{ // Thread.Sleep(25); @@ -227,6 +236,13 @@ namespace VPet_Simulator.Core // endwilldo.Invoke(); // endwilldo = null; //} + if (PlayState) + {//如果当前正在运行,重置状态 + //IsResetPlay = true; + Stop(true); + StopAction = () => Run(EndAction); + return; + } nowid = 0; PlayState = true; DoEndAction = true; @@ -237,6 +253,7 @@ namespace VPet_Simulator.Core { DoEndAction = !StopEndAction; PlayState = false; + //IsResetPlay = false; } } diff --git a/VPet-Simulator.Core/VPet-Simulator.Core.csproj b/VPet-Simulator.Core/VPet-Simulator.Core.csproj index 918490a..1193ee3 100644 --- a/VPet-Simulator.Core/VPet-Simulator.Core.csproj +++ b/VPet-Simulator.Core/VPet-Simulator.Core.csproj @@ -121,7 +121,11 @@ Designer MSBuild:Compile - + + Designer + MSBuild:Compile + + Designer MSBuild:Compile @@ -143,9 +147,12 @@ ToolBar.xaml + + FoodAnimation.xaml + - - IEyeTracking.xaml + + EyeTracking.xaml diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs index 9983d37..ad214bf 100644 --- a/VPet-Simulator.Windows/MainWindow.xaml.cs +++ b/VPet-Simulator.Windows/MainWindow.xaml.cs @@ -17,6 +17,12 @@ using System.Windows.Navigation; using System.Windows.Shapes; using VPet_Simulator.Core; using static VPet_Simulator.Core.GraphCore; +using Microsoft.Win32; +using System.Windows.Forms; +using MessageBox = System.Windows.MessageBox; +using ContextMenu = System.Windows.Forms.ContextMenu; +using MenuItem = System.Windows.Forms.MenuItem; +using Application = System.Windows.Application; namespace VPet_Simulator.Windows { @@ -25,7 +31,7 @@ namespace VPet_Simulator.Windows /// public partial class MainWindow : Window { - + private NotifyIcon notifyIcon; public MainWindow() { //判断是不是Steam用户,因为本软件会发布到Steam @@ -102,19 +108,52 @@ namespace VPet_Simulator.Windows //加载游戏内容 Core.Controller = new MWController(this); Core.Save = new Save("萝莉斯"); - Dispatcher.Invoke(new Action(() => { + Dispatcher.Invoke(new Action(() => + { Core.Graph = Pets[0].Graph(Set.StoreInMemory); LoadingText.Visibility = Visibility.Collapsed; - winSetting = new winGameSetting(this); - var main = new Main(Core) { }; + winSetting = new winGameSetting(this); + var main = new Main(Core) { }; main.DefaultClickAction = () => { Dispatcher.Invoke(() => { main.Say("你知道吗? 鼠标右键可以打开菜单栏"); }); }; - DisplayGrid.Child = main; + DisplayGrid.Child = main; + main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.DIY, "退出桌宠", () => { Close(); }); + + //加载图标 + notifyIcon = new NotifyIcon(); + ContextMenu m_menu; + + m_menu = new ContextMenu(); + m_menu.MenuItems.Add(new MenuItem("重置", (x, y) => { + main.CleanState(); + main.DisplayNomal(); + })); + m_menu.MenuItems.Add(new MenuItem("居中", (x, y) => + { + Left = (SystemParameters.PrimaryScreenWidth - Width) / 2; + Top = (SystemParameters.PrimaryScreenHeight - Height) / 2; + })); + m_menu.MenuItems.Add(new MenuItem("设置", (x, y) => Core.Controller.ShowSetting())); + m_menu.MenuItems.Add(new MenuItem("退出", (x, y) => Close())); + notifyIcon.ContextMenu = m_menu; + + var streamResourceInfo = Application.GetResourceStream(new Uri("pack://application:,,,/vpeticon.ico")); + if (streamResourceInfo != null) + notifyIcon.Icon = new System.Drawing.Icon(streamResourceInfo.Stream); + + notifyIcon.Visible = true; + + //notifyIcon.ShowBalloonTip(5, "你好 " + Environment.UserName, + // "Press Alt+C to show Clock\nRight Click on Tray to Close", ToolTipIcon.Info); })); + } + private void Window_Closed(object sender, EventArgs e) { ((Main)DisplayGrid.Child).Dispose(); + notifyIcon.Dispose(); + System.Environment.Exit(0); } //public void DEBUGValue() diff --git a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj index 620a37f..cbec8b9 100644 --- a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj +++ b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj @@ -91,6 +91,8 @@ + + diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup.lps b/VPet-Simulator.Windows/mod/0000_core/pet/vup.lps index 9ca6c3b..3b5c91f 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:| -touchraised:|px#0:|py#0:|sw#500:|sh#180:| +touchraised:|px#0:|py#50:|sw#500:|sh#200:| raisepoint:|x#290:|y#128:| speed:|walk#20:|climb#10:|climbtop#8:|crawl#8:| locate:|climbleft#145:|climbright#185:|climbtop#150:| \ No newline at end of file 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 d18656e..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/下蹲向右.rar 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 115aa71..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/下蹲向左.rar 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 new file mode 100644 index 0000000..c6487e3 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/往地上爬向右.rar differ 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..2ed35fb Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/往地上爬向左.rar differ 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..1e4a3c4 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/爬地起来向右.rar differ 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..8f17c74 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/爬地起来向左.rar differ 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..3896f86 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/躺下睡觉和起来.rar differ