From 46cdde7e823d30e8b50350eba08d4541ab306be6 Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Fri, 25 Aug 2023 05:37:55 +1000
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=96=E6=B6=88=E7=9D=A1?=
 =?UTF-8?q?=E8=A7=89=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/ToolBar.xaml.cs         | 7 ++++++-
 VPet-Simulator.Windows/WinDesign/TalkSelect.xaml.cs | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/VPet-Simulator.Core/Display/ToolBar.xaml.cs b/VPet-Simulator.Core/Display/ToolBar.xaml.cs
index f48ae72..737d36f 100644
--- a/VPet-Simulator.Core/Display/ToolBar.xaml.cs
+++ b/VPet-Simulator.Core/Display/ToolBar.xaml.cs
@@ -15,6 +15,8 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.TreeView;
 using static VPet_Simulator.Core.GraphHelper;
 using System.ComponentModel;
 using System.Reflection;
+using static System.Windows.Forms.AxHost;
+using static VPet_Simulator.Core.Main;
 
 namespace VPet_Simulator.Core
 {
@@ -73,7 +75,7 @@ namespace VPet_Simulator.Core
                     case Work.WorkType.Play:
                         ps.Add(w);
                         break;
-                }              
+                }
             }
             if (ws.Count == 0)
             {
@@ -424,7 +426,10 @@ namespace VPet_Simulator.Core
             this.Visibility = Visibility.Collapsed;
             if (m.Core.Save.Mode != GameSave.ModeType.Ill)
                 if (m.State == Main.WorkingState.Sleep)
+                {
+                    m.State = WorkingState.Nomal;
                     m.Display(GraphType.Sleep, AnimatType.C_End, m.DisplayNomal);
+                }
                 else if (m.State == Main.WorkingState.Nomal)
                     m.DisplaySleep(true);
                 else
diff --git a/VPet-Simulator.Windows/WinDesign/TalkSelect.xaml.cs b/VPet-Simulator.Windows/WinDesign/TalkSelect.xaml.cs
index 7b780e2..0581305 100644
--- a/VPet-Simulator.Windows/WinDesign/TalkSelect.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/TalkSelect.xaml.cs
@@ -111,6 +111,7 @@ namespace VPet_Simulator.Windows
             {
                 return;
             }
+            mw.Main.ToolBar.Visibility = Visibility.Collapsed;
             var say = textList[tbTalk.SelectedIndex];
             textList.RemoveAt(tbTalk.SelectedIndex);
             //聊天效果