支持更多动画和动画优化

VPet-Simulator.Core/Display/MainDisplay.cs

@@ -69,6 +69,12 @@ namespace VPet_Simulator.Core
                 case GraphType.Sleep_B_Loop:
                     Display(GraphCore.GraphType.Sleep_C_End, EndAction);
                     return true;
+                case GraphType.Idel_StateONE_B_Loop:
+                    Display(GraphCore.GraphType.Idel_StateONE_C_End, EndAction);
+                    return true;
+                case GraphType.Idel_StateTWO_B_Loop:
+                    Display(GraphCore.GraphType.Idel_StateTWO_C_End, () => Display(GraphCore.GraphType.Idel_StateONE_C_End, EndAction));
+                    return true;
                     //case GraphType.Climb_Left:
                     //case GraphType.Climb_Right:
                     //case GraphType.Climb_Top_Left:
@@ -105,6 +111,73 @@ namespace VPet_Simulator.Core
             )));
         }
 
+        /// <summary>
+        /// 显示待机(模式1)情况
+        /// </summary>
+        public void DisplayIdel_StateONE()
+        {
+            looptimes = 0;
+            CountNomal = 0;
+            Display(GraphCore.GraphType.Idel_StateONE_A_Start, DisplayIdel_StateONEing);
+        }
+        /// <summary>
+        /// 显示待机(模式1)情况
+        /// </summary>
+        private void DisplayIdel_StateONEing()
+        {
+            if (Function.Rnd.Next(++looptimes) > LoopMax)
+                switch (Function.Rnd.Next(2 + CountNomal))
+                {
+                    case 0:
+                        DisplayIdel_StateTWO();
+                        break;
+                    default:
+                        Display(GraphCore.GraphType.Idel_StateONE_C_End, DisplayNomal);
+                        break;
+                }
+            else
+                Display(GraphCore.GraphType.Idel_StateONE_B_Loop, DisplayIdel_StateONEing);
+        }
+        /// <summary>
+        /// 显示待机(模式2)情况
+        /// </summary>
+        public void DisplayIdel_StateTWO()
+        {
+            looptimes = 0;
+            CountNomal++;
+            Display(GraphCore.GraphType.Idel_StateTWO_A_Start, DisplayIdel_StateTWOing);
+        }
+        /// <summary>
+        /// 显示待机(模式2)情况
+        /// </summary>
+        private void DisplayIdel_StateTWOing()
+        {
+            if (Function.Rnd.Next(++looptimes) > LoopMax)
+                Display(GraphCore.GraphType.Idel_StateTWO_C_End, DisplayIdel_StateONEing);
+            else
+                Display(GraphCore.GraphType.Idel_StateTWO_B_Loop, DisplayIdel_StateTWOing);
+        }
+
+        int looptimes;
+        /// <summary>
+        /// 显示蹲下情况
+        /// </summary>
+        public void DisplaySquat()
+        {
+            looptimes = 0;
+            CountNomal = 0;
+            Display(GraphCore.GraphType.Squat_A_Start, DisplaySquating);
+        }
+        /// <summary>
+        /// 显示蹲下情况
+        /// </summary>
+        private void DisplaySquating()
+        {
+            if (Function.Rnd.Next(++looptimes) > LoopProMax)
+                Display(GraphCore.GraphType.Squat_C_End, DisplayNomal);
+            else
+                Display(GraphCore.GraphType.Squat_B_Loop, DisplaySquating);
+        }
         /// <summary>
         /// 显示无聊情况
         /// </summary>
@@ -124,26 +197,8 @@ namespace VPet_Simulator.Core
             else
                 Display(GraphCore.GraphType.Boring_B_Loop, DisplayBoringing);
         }
-        int looptimes;
+
-        /// <summary>
+
-        /// 显示蹲下情况
-        /// </summary>
-        public void DisplaySquat()
-        {
-            looptimes = 0;
-            CountNomal = 0;
-            Display(GraphCore.GraphType.Squat_A_Start, DisplaySquating);
-        }
-        /// <summary>
-        /// 显示蹲下情况
-        /// </summary>
-        public void DisplaySquating()
-        {
-            if (Function.Rnd.Next(++looptimes) > LoopProMax)
-                Display(GraphCore.GraphType.Squat_C_End, DisplayNomal);
-            else
-                Display(GraphCore.GraphType.Squat_B_Loop, DisplaySquating);
-        }
         /// <summary>
         /// 显示睡觉情况
         /// </summary>
@@ -159,7 +214,7 @@ namespace VPet_Simulator.Core
         /// <summary>
         /// 显示睡觉情况 (正常)
         /// </summary>
-        public void DisplaySleeping()
+        private void DisplaySleeping()
         {
             if (Function.Rnd.Next(++looptimes) > LoopProMax)
                 Display(GraphCore.GraphType.Sleep_C_End, DisplayNomal);
@@ -169,7 +224,7 @@ namespace VPet_Simulator.Core
         /// <summary>
         /// 显示睡觉情况 (强制)
         /// </summary>
-        public void DisplaySleepingForce()
+        private void DisplaySleepingForce()
         {//TODO:如果开启了Function,强制睡觉为永久,否则睡到自然醒+LoopMax
             Display(GraphCore.GraphType.Sleep_B_Loop, DisplaySleepingForce);
         }
@@ -528,7 +583,7 @@ namespace VPet_Simulator.Core
                 walklength = 0;
                 CountNomal = 0;
                 Core.Controller.MoveWindows(-Core.Controller.GetWindowsDistanceLeft() / Core.Controller.ZoomRatio - Core.Graph.GraphConfig.LocateClimbLeft, 0);
-                Display(GraphCore.GraphType.Walk_Left_A_Start, () =>
+                Display(GraphCore.GraphType.Climb_Left_A_Start, () =>
                 {
                     MoveTimerPoint = new Point(0, -Core.Graph.GraphConfig.SpeedClimb);
                     MoveTimer.Start();
@@ -563,7 +618,7 @@ namespace VPet_Simulator.Core
             //不是:继续or停下
             if (Function.Rnd.Next(walklength++) < LoopMid)
             {
-                Display(GraphCore.GraphType.Climb_Left, DisplayClimb_Lefting_UP);
+                Display(GraphCore.GraphType.Climb_Left_B_Loop, DisplayClimb_Lefting_UP);
             }
             else
             {//停下来
@@ -591,7 +646,7 @@ namespace VPet_Simulator.Core
                 CountNomal = 0;
 
                 Core.Controller.MoveWindows(-Core.Controller.GetWindowsDistanceLeft() / Core.Controller.ZoomRatio - Core.Graph.GraphConfig.LocateClimbLeft, 0);
-                Display(GraphCore.GraphType.Walk_Left_A_Start, () =>
+                Display(GraphCore.GraphType.Climb_Left_A_Start, () =>
                 {
                     MoveTimerPoint = new System.Windows.Point(0, Core.Graph.GraphConfig.SpeedClimb);
                     MoveTimer.Start();
@@ -615,7 +670,7 @@ namespace VPet_Simulator.Core
             //不是:继续or停下
             if (Function.Rnd.Next(walklength++) < LoopMin)
             {
-                Display(GraphCore.GraphType.Climb_Left, DisplayClimb_Lefting_DOWN);
+                Display(GraphCore.GraphType.Climb_Left_B_Loop, DisplayClimb_Lefting_DOWN);
             }
             else
             {//停下来
@@ -635,7 +690,7 @@ namespace VPet_Simulator.Core
                 CountNomal = 0;
 
                 Core.Controller.MoveWindows(Core.Controller.GetWindowsDistanceRight() / Core.Controller.ZoomRatio + Core.Graph.GraphConfig.LocateClimbRight, 0);
-                Display(GraphCore.GraphType.Walk_Right_A_Start, () =>
+                Display(GraphCore.GraphType.Climb_Right_A_Start, () =>
                 {
                     MoveTimerPoint = new Point(0, -Core.Graph.GraphConfig.SpeedClimb);
                     MoveTimer.Start();
@@ -670,7 +725,7 @@ namespace VPet_Simulator.Core
             //不是:继续or停下
             if (Function.Rnd.Next(walklength++) < LoopMin)
             {
-                Display(GraphCore.GraphType.Climb_Right, DisplayClimb_Righting_UP);
+                Display(GraphCore.GraphType.Climb_Right_B_Loop, DisplayClimb_Righting_UP);
             }
             else
             {//停下来
@@ -698,7 +753,7 @@ namespace VPet_Simulator.Core
                 CountNomal = 0;
 
                 Core.Controller.MoveWindows(Core.Controller.GetWindowsDistanceRight() / Core.Controller.ZoomRatio + Core.Graph.GraphConfig.LocateClimbRight, 0);
-                Display(GraphCore.GraphType.Walk_Right_A_Start, () =>
+                Display(GraphCore.GraphType.Climb_Right_A_Start, () =>
                 {
                     MoveTimerPoint = new Point(0, Core.Graph.GraphConfig.SpeedClimb);
                     MoveTimer.Start();
@@ -722,7 +777,7 @@ namespace VPet_Simulator.Core
             //不是:继续or停下
             if (Function.Rnd.Next(walklength++) < LoopMin)
             {
-                Display(GraphCore.GraphType.Climb_Right, DisplayClimb_Righting_DOWN);
+                Display(GraphCore.GraphType.Climb_Right_B_Loop, DisplayClimb_Righting_DOWN);
             }
             else
             {//停下来
@@ -766,7 +821,7 @@ namespace VPet_Simulator.Core
                     default:
                         Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio);
                         MoveTimer.Stop();
-                        DisplayNomal();
+                        DisplayFalled_Right();
                         return;
                 }
             }
@@ -779,7 +834,7 @@ namespace VPet_Simulator.Core
             {//停下来
                 Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio);
                 MoveTimer.Stop();
-                DisplayNomal();
+                DisplayFalled_Right();
             }
         }
         /// <summary>
@@ -818,7 +873,7 @@ namespace VPet_Simulator.Core
                     default:
                         Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio);
                         MoveTimer.Stop();
-                        DisplayNomal();
+                        DisplayFalled_Right();
                         return;
                 }
             }
@@ -831,7 +886,7 @@ namespace VPet_Simulator.Core
             {//停下来
                 Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio);
                 MoveTimer.Stop();
-                DisplayNomal();
+                DisplayFalled_Right();
             }
         }
         /// <summary>

VPet-Simulator.Core/Display/MainLogic.cs

@@ -157,6 +157,11 @@ namespace VPet_Simulator.Core
                     case 17:
                         DisplaySquat();
                         break;
+                    case 12:
+                    case 19:
+                    case 20:
+                        DisplayIdel_StateONE();
+                            break;
                     default:
                         break;
                 }

VPet-Simulator.Core/Display/MessageBar.xaml.cs

@@ -51,7 +51,9 @@ namespace VPet_Simulator.Core
         {
             if (outputtext.Count > 0)
             {
-                Dispatcher.Invoke(() => { TText.Text += outputtext[0]; outputtext.RemoveAt(0); });
+                var str = outputtext[0];
+                outputtext.RemoveAt(0);
+                Dispatcher.Invoke(() => { TText.Text += str; });
             }
             else
             {
@@ -59,7 +61,7 @@ namespace VPet_Simulator.Core
                 {
                     Thread.Sleep(timeleft * 50);
                     if (m.DisplayType == GraphCore.GraphType.Default || m.DisplayType.ToString().Contains("Say"))
-                        m.Display(GraphCore.GraphType.Say_C_End, m.DisplayNomal);                  
+                        m.Display(GraphCore.GraphType.Say_C_End, m.DisplayNomal);
                 });
                 ShowTimer.Stop();
                 EndTimer.Start();
@@ -92,14 +94,14 @@ namespace VPet_Simulator.Core
             timeleft = text.Length + 5;
             ShowTimer.Start(); EndTimer.Stop(); CloseTimer.Stop();
             this.Visibility = Visibility.Visible;
-            Opacity = 1;
+            Opacity = .8;
         }
 
         private void Border_MouseEnter(object sender, MouseEventArgs e)
         {
             EndTimer.Stop();
             CloseTimer.Stop();
-            this.Opacity = 1;
+            this.Opacity = .8;
         }
 
         private void Border_MouseLeave(object sender, MouseEventArgs e)

VPet-Simulator.Core/Display/ToolBar.xaml

@@ -114,8 +114,9 @@
                 <MenuItem Header="说话" HorizontalContentAlignment="Center" />
                 <MenuItem Header="学习" HorizontalContentAlignment="Center" />
             </MenuItem>
-            <MenuItem x:Name="MenuDIY" Header="自定" HorizontalContentAlignment="Center" Click="MenuDIY_Click" />
+            <MenuItem x:Name="MenuDIY" Header="自定" HorizontalContentAlignment="Center" Click="MenuDIY_Click"
-            <MenuItem x:Name="MenuSetting" Header="管理" HorizontalContentAlignment="Center" />
+                    x:FieldModifier="public" />
+            <MenuItem x:Name="MenuSetting" Header="系统" HorizontalContentAlignment="Center" />
         </Menu>
     </Grid>
 </UserControl>

VPet-Simulator.Core/Graph/GraphCore.cs

@@ -46,13 +46,21 @@ namespace VPet_Simulator.Core
             /// </summary>
             Climb_Up_Left,
             /// <summary>
+            /// 从右边爬 (开始)
+            /// </summary>
+            Climb_Right_A_Start,
+            /// <summary>
+            /// 从左边爬 (开始)
+            /// </summary>
+            Climb_Left_A_Start,
+            /// <summary>
             /// 从右边爬 (循环)
             /// </summary>
-            Climb_Right,
+            Climb_Right_B_Loop,
             /// <summary>
             /// 从左边爬 (循环)
             /// </summary>
-            Climb_Left,
+            Climb_Left_B_Loop,
             /// <summary>
             /// 呼吸 (循环)
             /// </summary>
@@ -190,17 +198,29 @@ namespace VPet_Simulator.Core
             /// </summary>
             Say_C_End,
             /// <summary>
-            /// 待机 (开始) (自动保持一致性)
+            /// 待机 模式1 (开始)
             /// </summary>
-            Idel_A_Start,
+            Idel_StateONE_A_Start,
             /// <summary>
-            /// 待机 (循环) (自动保持一致性)
+            /// 待机 模式1 (循环)
             /// </summary>
-            Idel_B_Loop,
+            Idel_StateONE_B_Loop,
             /// <summary>
-            /// 待机 (结束) (自动保持一致性)
+            /// 待机 模式1 (结束)
             /// </summary>
-            Idel_C_End,
+            Idel_StateONE_C_End,
+            /// <summary>
+            /// 待机 模式2 (开始)
+            /// </summary>
+            Idel_StateTWO_A_Start,
+            /// <summary>
+            /// 待机 模式2 (循环)
+            /// </summary>
+            Idel_StateTWO_B_Loop,
+            /// <summary>
+            /// 待机 模式2 (结束)
+            /// </summary>
+            Idel_StateTWO_C_End,
         }
         ///// <summary> loop 应该被取缔
         ///// 动画类型默认设置 前文本|是否循环|是否常用

VPet-Simulator.Core/Graph/PNGAnimation.xaml.cs

@@ -170,7 +170,7 @@ namespace VPet_Simulator.Core
             public void Run(Action EndAction = null)
             {
                 //先显示该图层
-                parent.Dispatcher.BeginInvoke(Visible);
+                parent.Dispatcher.Invoke(Visible);
                 //然后等待帧时间毫秒
                 Thread.Sleep(Time);
                 //判断是否要下一步
@@ -186,8 +186,8 @@ namespace VPet_Simulator.Core
                         }
                         else
                         {
-                            //parent.endwilldo = () => parent.Dispatcher.BeginInvoke(Hidden);
+                            //parent.endwilldo = () => parent.Dispatcher.Invoke(Hidden);
-                            //parent.Dispatcher.BeginInvoke(Hidden);
+                            //parent.Dispatcher.Invoke(Hidden);
                             parent.PlayState = false;
                             if (parent.DoEndAction)
                                 EndAction?.Invoke();//运行结束动画时事件
@@ -197,20 +197,20 @@ namespace VPet_Simulator.Core
                             Task.Run(() =>
                             {
                                 Thread.Sleep(25);
-                                parent.Dispatcher.BeginInvoke(Hidden);
+                                parent.Dispatcher.Invoke(Hidden);
                             });
                             return;
                         }
                     //要下一步,现在就隐藏图层
                     //隐藏该图层
-                    parent.Dispatcher.BeginInvoke(Hidden);
+                    parent.Dispatcher.Invoke(Hidden);
                     parent.Animations[parent.nowid].Run(EndAction);
                     return;
                 }
                 else
                 {
                     parent.IsContinue = false;
-                    //parent.Dispatcher.BeginInvoke(Hidden);
+                    //parent.Dispatcher.Invoke(Hidden);
                     if (parent.DoEndAction)
                         EndAction?.Invoke();//运行结束动画时事件
                     parent.StopAction?.Invoke();
@@ -218,7 +218,7 @@ namespace VPet_Simulator.Core
                     Task.Run(() =>
                     {
                         Thread.Sleep(25);
-                        parent.Dispatcher.BeginInvoke(Hidden);
+                        parent.Dispatcher.Invoke(Hidden);
                     });
                 }
             }

VPet-Simulator.Windows/MainWindow.xaml.cs

@@ -24,6 +24,7 @@ using ContextMenu = System.Windows.Forms.ContextMenu;
 using MenuItem = System.Windows.Forms.MenuItem;
 using Application = System.Windows.Application;
 using System.Timers;
+using System.Windows.Forms.VisualStyles;
 
 namespace VPet_Simulator.Windows
 {
@@ -68,9 +69,9 @@ namespace VPet_Simulator.Windows
 
             InitializeComponent();
 
-            this.Height = 1000 * Set.ZoomLevel;
+            this.Height = 500 * Set.ZoomLevel;
-            this.Width = 1000 * Set.ZoomLevel;
+            this.Width = 500 * Set.ZoomLevel;
-            
+
             //不存在就关掉
             var modpath = new DirectoryInfo(ModPath + @"\0000_core\pet\vup");
             if (!modpath.Exists)
@@ -81,6 +82,19 @@ namespace VPet_Simulator.Windows
             }
             Task.Run(GameLoad);
         }
+        private string[] rndtext = new string[]
+        {
+            "你知道吗? 鼠标右键可以打开菜单栏",
+            "如果你觉得目前功能太少,那就多挂会机. 宠物会自己动的",
+            "你知道吗? 你可以在设置里面修改游戏的缩放比例",
+            "想要宠物不乱动? 设置里可以设置智能移动或者关闭移动",
+            "有建议/游玩反馈? 来 菜单-系统-反馈中心 反馈吧",
+            "你现在乱点说话是说话系统的一部分,不过还没做,在做了在做了ing",
+            "你添加了虚拟主播模拟器和虚拟桌宠模拟器到愿望单了吗? 快去加吧",
+            "这游戏开发这么慢,都怪画师太咕了.\n记得多催催画师(@叶书天)画桌宠, 催的越快更新越快!",
+            "长按脑袋拖动桌宠到你喜欢的任意位置",
+            "欢迎加入 虚拟主播模拟器群 430081239",
+        };
         private long lastclicktime;
         public void GameLoad()
         {
@@ -137,11 +151,12 @@ namespace VPet_Simulator.Windows
                 LoadingText.Visibility = Visibility.Collapsed;
                 winSetting = new winGameSetting(this);
                 Main = new Main(Core) { };
-                Main.DefaultClickAction = () => {
+                Main.DefaultClickAction = () =>
-                    if (new TimeSpan(DateTime.Now.Ticks - lastclicktime).TotalMinutes > 1)
+                {
+                    if (new TimeSpan(DateTime.Now.Ticks - lastclicktime).TotalSeconds > 20)
                     {
                         lastclicktime = DateTime.Now.Ticks;
-                        Dispatcher.Invoke(() => { Main.Say("你知道吗? 鼠标右键可以打开菜单栏"); });
+                        Dispatcher.Invoke(() => Main.Say(rndtext[Function.Rnd.Next(rndtext.Length)]));
                     }
                 };
                 DisplayGrid.Child = Main;

VPet-Simulator.Windows/WinDesign/winConsole.xaml

@@ -20,10 +20,7 @@
                     <ListBoxItem Content="DisplayTouchHead" />
                     <ListBoxItem Content="DisplayBoring" />
                     <ListBoxItem Content="DisplaySquat" />
-                    <ListBoxItem Content="DisplaySquating" />
                     <ListBoxItem Content="DisplaySleep" />
-                    <ListBoxItem Content="DisplaySleeping" />
-                    <ListBoxItem Content="DisplaySleepingForce" />
                     <ListBoxItem Content="DisplayRaised" />
                     <ListBoxItem Content="DisplayFalled_Left" />
                     <ListBoxItem Content="DisplayFalled_Right" />
@@ -39,6 +36,8 @@
                     <ListBoxItem Content="DisplayClimb_Top_Left" />
                     <ListBoxItem Content="DisplayFall_Left" />
                     <ListBoxItem Content="DisplayFall_Right" />
+                    <ListBoxItem Content="DisplayIdel_StateONE" />
+                    <ListBoxItem Content="DisplayIdel_StateTWO" />
                 </ListBox>
             </Grid>
         </TabItem>

VPet-Simulator.Windows/WinDesign/winConsole.xaml.cs

@@ -62,18 +62,9 @@ namespace VPet_Simulator.Windows
                 case "DisplaySquat":
                     mw.Main.DisplaySquat();
                     break;
-                case "DisplaySquating":
-                    mw.Main.DisplaySquating();
-                    break;
                 case "DisplaySleep":
                     mw.Main.DisplaySleep();
                     break;
-                case "DisplaySleeping":
-                    mw.Main.DisplaySleeping();
-                    break;
-                case "DisplaySleepingForce":
-                    mw.Main.DisplaySleepingForce();
-                    break;
                 case "DisplayRaised":
                     mw.Main.DisplayRaised();
                     break;
@@ -119,6 +110,12 @@ namespace VPet_Simulator.Windows
                 case "DisplayFall_Right":
                     mw.Main.DisplayFall_Right();
                     break;
+                case "DisplayIdel_StateONE":
+                    mw.Main.DisplayIdel_StateONE();
+                    break;
+                case "DisplayIdel_StateTWO":
+                    mw.Main.DisplayIdel_StateTWO();
+                    break;
             }
         }