From 03b47558fafe36bf1cb8caefde21c2c574ee0da6 Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Fri, 13 Jan 2023 22:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=BA=94=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/Main.xaml.cs       | 4 ++--
 VPet-Simulator.Core/Display/MessageBar.xaml.cs | 6 +++++-
 VPet-Simulator.Windows/MainWindow.xaml.cs      | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/VPet-Simulator.Core/Display/Main.xaml.cs b/VPet-Simulator.Core/Display/Main.xaml.cs
index 3cdc133..e936d85 100644
--- a/VPet-Simulator.Core/Display/Main.xaml.cs
+++ b/VPet-Simulator.Core/Display/Main.xaml.cs
@@ -70,7 +70,7 @@ namespace VPet_Simulator.Core
         {
             Core.Controller.MoveWindows(MoveTimerPoint.X, MoveTimerPoint.Y);
         }
-
+        public Action DefaultClickAction;
         bool isPress = false;
         private void MainGrid_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
@@ -97,7 +97,7 @@ namespace VPet_Simulator.Core
                     if (act != null)
                         Dispatcher.Invoke(act.DoAction);
                     else
-                        Dispatcher.Invoke(ToolBar.Show);
+                        DefaultClickAction?.Invoke();
                 }
             });
         }
diff --git a/VPet-Simulator.Core/Display/MessageBar.xaml.cs b/VPet-Simulator.Core/Display/MessageBar.xaml.cs
index 18e4e41..fbb1b82 100644
--- a/VPet-Simulator.Core/Display/MessageBar.xaml.cs
+++ b/VPet-Simulator.Core/Display/MessageBar.xaml.cs
@@ -40,11 +40,14 @@ namespace VPet_Simulator.Core
                 EndTimer.Start();
             }
         }
-
+        public Action EndAction;
         private void EndTimer_Elapsed(object sender, ElapsedEventArgs e)
         {
             if (--timeleft <= 0)
+            {
                 Dispatcher.Invoke(() => this.Visibility = Visibility.Collapsed);
+                EndAction?.Invoke();
+            }
         }
 
         public Timer EndTimer = new Timer() { Interval = 100 };
@@ -75,6 +78,7 @@ namespace VPet_Simulator.Core
         {
             EndTimer.Stop(); ShowTimer.Stop();
             this.Visibility = Visibility.Collapsed;
+            EndAction?.Invoke();
         }
     }
 }
diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs
index a376b82..2d4f205 100644
--- a/VPet-Simulator.Windows/MainWindow.xaml.cs
+++ b/VPet-Simulator.Windows/MainWindow.xaml.cs
@@ -105,8 +105,10 @@ namespace VPet_Simulator.Windows
             Dispatcher.Invoke(new Action(() => {
                 Core.Graph = Pets[0].Graph;
                 LoadingText.Visibility = Visibility.Collapsed;
-                winSetting = new winGameSetting(this);
-                DisplayGrid.Child = new Main(Core);
+                winSetting = new winGameSetting(this);               
+                var main = new Main(Core) {  };
+                main.DefaultClickAction = () => { Dispatcher.Invoke(() => { main.Say("你知道吗? 鼠标右键可以打开菜单栏"); }); };
+                DisplayGrid.Child = main;                
             }));
         }