修复UI报错问题

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

@@ -82,6 +82,9 @@ namespace VPet_Simulator.Core
             PetGrid2.Visibility = Visibility.Collapsed;
             Task.Run(() =>
             {
+                EventTimer.Elapsed += (s, e) => EventTimer_Elapsed();
+                MoveTimer.Elapsed += MoveTimer_Elapsed;
+                SmartMoveTimer.Elapsed += SmartMoveTimer_Elapsed;
                 //while (!ig.IsReady)
                 //{
                 //    Thread.Sleep(100);
@@ -111,10 +114,6 @@ namespace VPet_Simulator.Core
                     DisplayNomal();
                 });
             });
-
-            EventTimer.Elapsed += (s, e) => EventTimer_Elapsed();
-            MoveTimer.Elapsed += MoveTimer_Elapsed;
-            SmartMoveTimer.Elapsed += SmartMoveTimer_Elapsed;
         }
 
         private void Labledisplaytimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)

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

@@ -43,7 +43,7 @@ namespace VPet_Simulator.Core
             closePanelTimer = new Timer();
             closePanelTimer.Elapsed += ClosePanelTimer_Tick;
             m.TimeUIHandle += M_TimeUIHandle;
-            LoadWork();
+            //LoadWork();
         }
         public void LoadClean()
         {

VPet-Simulator.Windows/MutiPlayer/MPFriends.xaml.cs

@@ -314,13 +314,20 @@ public partial class MPFriends : WindowX
     /// </summary>
     public void Quit()
     {
-        Main.Display(GraphType.Shutdown, AnimatType.Single, () => Dispatcher.Invoke(Close));
+        try
-        Task.Run(() =>
         {
-            Thread.Sleep(5000);
+            Main.Display(GraphType.Shutdown, AnimatType.Single, () => Dispatcher.Invoke(Close));
-            if (Loaded)
+            Task.Run(() =>
-                Dispatcher.Invoke(Close);
+            {
-        });
+                Thread.Sleep(5000);
+                if (Loaded)
+                    Dispatcher.Invoke(Close);
+            });
+        }
+        catch
+        {
+            Close();
+        }
     }
 
     /// <summary>
@@ -420,16 +427,20 @@ public partial class MPFriends : WindowX
             msg.Type = MSGType.Chat;
             msg.SetContent(new Chat() { Content = cont, ChatType = (Chat.Type)talktype, SendName = SteamClient.Name });
             msg.To = SteamClient.SteamId;
+
             switch (talktype)
             {
                 case 0:
                     wmp.SendMessage(friend.Id, msg);
+                    mw.Main.Say("{0} 悄悄地对你说: {1}".Translate(SteamClient.Name, cont));
                     break;
                 case 1:
                     wmp.SendMessageALL(msg);
+                    mw.Main.Say("{0} 对你说: {1}".Translate(SteamClient.Name, cont));
                     break;
                 case 2:
                     wmp.SendMessageALL(msg);
+                    mw.Main.Say("{0} 对大家说: {1}".Translate(SteamClient.Name, cont));
                     break;
             }
         });

VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml.cs

@@ -199,14 +199,18 @@ public partial class winMutiPlayer : Window
             }
         }
     }
-
+    GraphInfo lastgraph = new GraphInfo() { Type = GraphType.Common };
     private void Main_GraphDisplayHandler(GraphInfo info)
     {
         if (info.Type == GraphType.Shutdown || info.Type == GraphType.Common || info.Type == GraphType.Move
-            || info.Type == GraphType.Raised_Dynamic || info.Type == GraphType.Raised_Static || info.Type == GraphType.Default)
+            || info.Type == GraphType.Raised_Dynamic || info.Type == GraphType.Raised_Static)
         {
             return;
         }
+        //如果是同一个动画就不发送
+        if (lastgraph.Type == info.Type && lastgraph.Animat == info.Animat && info.Name == lastgraph.Name)
+            return;
+        lastgraph = info;
         MPMessage msg = new MPMessage();
         msg.Type = MSGType.DispayGraph;
         msg.SetContent(info);
@@ -260,36 +264,35 @@ public partial class winMutiPlayer : Window
     }
     private void LoopP2PPacket()
     {
-        try
+        while (isOPEN)
-        {
+            try
-            while (SteamNetworking.IsP2PPacketAvailable())
             {
-                var packet = SteamNetworking.ReadP2PPacket();
+                while (SteamNetworking.IsP2PPacketAvailable())
-                if (packet.HasValue)
                 {
-                    var From = packet.Value.SteamId;
+                    var packet = SteamNetworking.ReadP2PPacket();
-                    var MSG = ConverTo(packet.Value.Data);
+                    if (packet.HasValue)
-                    var To = MPFriends.Find(x => x.friend.Id == MSG.To);
-                    switch (MSG.Type)
                     {
-                        case MSGType.DispayGraph:
+                        var From = packet.Value.SteamId;
-                            To.DisplayGraph(MSG.GetContent<GraphInfo>());
+                        var MSG = ConverTo(packet.Value.Data);
-                            break;
+                        var To = MPFriends.Find(x => x.friend.Id == MSG.To);
-                        case MSGType.Chat:
+                        switch (MSG.Type)
-                            To.DisplayMessage(MSG.GetContent<Chat>());
+                        {
-                            break;
+                            case MSGType.DispayGraph:
+                                To.DisplayGraph(MSG.GetContent<GraphInfo>());
+                                break;
+                            case MSGType.Chat:
+                                To.DisplayMessage(MSG.GetContent<Chat>());
+                                break;
+                        }
                     }
+                    Thread.Sleep(100);
                 }
-                Thread.Sleep(100);
+                Thread.Sleep(1000);
             }
-            Thread.Sleep(1000);
+            catch
-            if (isOPEN)
+            {
-                LoopP2PPacket();
-        }
-        catch
-        {
 
-        }
+            }
     }
     private void Window_Closed(object sender, EventArgs e)
     {