diff --git a/VPet-Simulator.Core/VPet-Simulator.Core.csproj b/VPet-Simulator.Core/VPet-Simulator.Core.csproj index 815cd7c..9645348 100644 --- a/VPet-Simulator.Core/VPet-Simulator.Core.csproj +++ b/VPet-Simulator.Core/VPet-Simulator.Core.csproj @@ -69,13 +69,13 @@ - ..\..\VUP-Simulator\packages\LinePutScript.1.6.1\lib\net462\LinePutScript.dll + ..\packages\LinePutScript.1.6.1\lib\net462\LinePutScript.dll - ..\..\VUP-Simulator\packages\Panuon.WPF.1.0.1\lib\net462\Panuon.WPF.dll + ..\packages\Panuon.WPF.1.0.1\lib\net462\Panuon.WPF.dll - ..\..\VUP-Simulator\packages\Panuon.WPF.UI.1.1.7.2\lib\net462\Panuon.WPF.UI.dll + ..\packages\Panuon.WPF.UI.1.1.7.2\lib\net462\Panuon.WPF.UI.dll diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs index 099ac72..0776cf8 100644 --- a/VPet-Simulator.Windows/MainWindow.xaml.cs +++ b/VPet-Simulator.Windows/MainWindow.xaml.cs @@ -13,6 +13,7 @@ using MenuItem = System.Windows.Forms.MenuItem; using Application = System.Windows.Application; using System.Timers; using LinePutScript; +using System.Diagnostics; namespace VPet_Simulator.Windows { @@ -181,6 +182,7 @@ namespace VPet_Simulator.Windows ContextMenu m_menu; m_menu = new ContextMenu(); + m_menu.MenuItems.Add(new MenuItem("操作教程", (x, y) => { Process.Start(AppDomain.CurrentDomain.BaseDirectory + @"\Tutorial.html"); })); m_menu.MenuItems.Add(new MenuItem("重置状态", (x, y) => { Main.CleanState(); @@ -208,14 +210,20 @@ namespace VPet_Simulator.Windows winSetting.Show(); }; + if (Set["SingleTips"].GetDateTime("tutorial") <= new DateTime(2023, 2, 23)) + { + Set["SingleTips"].SetDateTime("tutorial", DateTime.Now); + Process.Start(AppDomain.CurrentDomain.BaseDirectory + @"\Tutorial.html"); + } if (!Set["SingleTips"].GetBool("helloworld")) { - Set["SingleTips"].SetBool("helloworld", true); - notifyIcon.ShowBalloonTip(10, "你好 " + (IsSteamUser ? Steamworks.SteamClient.Name : Environment.UserName), - "欢迎使用虚拟桌宠模拟器!\n如果遇到桌宠爬不见了,可以在我这里设置居中或退出桌宠", ToolTipIcon.Info); Task.Run(() => { - Thread.Sleep(1000); + Thread.Sleep(2000); + Set["SingleTips"].SetBool("helloworld", true); + notifyIcon.ShowBalloonTip(10, "你好 " + (IsSteamUser ? Steamworks.SteamClient.Name : Environment.UserName), + "欢迎使用虚拟桌宠模拟器!\n如果遇到桌宠爬不见了,可以在我这里设置居中或退出桌宠", ToolTipIcon.Info); + Thread.Sleep(2000); Main.Say("欢迎使用虚拟桌宠模拟器\n这是个早期的测试版,若有bug请多多包涵\n欢迎在菜单栏-管理-反馈中提交bug或建议"); }); } @@ -228,8 +236,8 @@ namespace VPet_Simulator.Windows notifyIcon.ShowBalloonTip(10, "更新通知 02/20", "现已支通过抚摸(鼠标左右移动)进行摸头", ToolTipIcon.Info); Set["SingleTips"].SetDateTime("update", DateTime.Now); - } + Save(); })); } diff --git a/VPet-Simulator.Windows/Res/TopLogo2018.PNG b/VPet-Simulator.Windows/Res/TopLogo2018.PNG deleted file mode 100644 index 59c030f..0000000 Binary files a/VPet-Simulator.Windows/Res/TopLogo2018.PNG and /dev/null differ diff --git a/VPet-Simulator.Windows/Res/TopLogo2019.png b/VPet-Simulator.Windows/Res/TopLogo2019.png new file mode 100644 index 0000000..7330a40 Binary files /dev/null and b/VPet-Simulator.Windows/Res/TopLogo2019.png differ diff --git a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj index e4fbf25..a351b2e 100644 --- a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj +++ b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj @@ -206,7 +206,7 @@ PreserveNewest - + PreserveNewest diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml index 180a880..d7cf064 100644 --- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml +++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml @@ -193,7 +193,7 @@ Background="{x:Null}" /> - + @@ -481,7 +481,9 @@ - + + 用户名 @@ -508,8 +510,7 @@ 由于游戏暂未开发完毕,该名单并非完整名单.将在正式版完成前修改 - + 游戏策划 diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs index cb1d87b..d4a9662 100644 --- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs +++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs @@ -30,7 +30,13 @@ namespace VPet_Simulator.Windows public winGameSetting(MainWindow mw) { this.mw = mw; + //Console.WriteLine(DateTime.Now.ToString("mm:ss.fff")); InitializeComponent(); + //Console.WriteLine(DateTime.Now.ToString("mm:ss.fff")); + //var bit = new BitmapImage(new Uri("pack://application:,,,/Res/TopLogo2019.png")); + //Console.WriteLine(DateTime.Now.ToString("mm:ss.fff")); + ////ImageWHY.Source = bit; + //Console.WriteLine(DateTime.Now.ToString("mm:ss.fff")); TopMostBox.IsChecked = mw.Set.TopMost; if (mw.Set.IsBiggerScreen) {