diff --git a/BetterGenshinImpact/Core/Recorder/KeyMouseRecorderJsonLine.cs b/BetterGenshinImpact/Core/Recorder/KeyMouseRecorderJsonLine.cs index bd31a583..ef09ea05 100644 --- a/BetterGenshinImpact/Core/Recorder/KeyMouseRecorderJsonLine.cs +++ b/BetterGenshinImpact/Core/Recorder/KeyMouseRecorderJsonLine.cs @@ -72,7 +72,7 @@ public class KeyMouseRecorderJsonLine _consumerTask = Task.Run(async () => await ConsumeEventsAsync(_path)); } - + public KeyMouseRecorderJsonLine Start() { StartTick = Kernel32.GetTickCount(); @@ -124,6 +124,11 @@ public class KeyMouseRecorderJsonLine public void KeyDown(KeyEventArgsExt e) { var time = e.Timestamp - StartTick; + if (e.KeyCode == Keys.F) + { + TaskControl.Logger.LogInformation($"{DateTime.Now:HH:mm:ss.ffff}按下F"); + } + AddEvent(_macroEventsChannel, new MacroEvent { Type = MacroEventType.KeyDown, @@ -196,12 +201,12 @@ public class KeyMouseRecorderJsonLine Time = time }); } - + public void MouseMoveBy(MouseState state, uint tick, bool save = false) { User32.GetCursorPos(out var p); - + var mEvent = new MacroEvent { Type = MacroEventType.MouseMoveBy, diff --git a/BetterGenshinImpact/View/Pages/HomePage.xaml b/BetterGenshinImpact/View/Pages/HomePage.xaml index 39d544e0..2b7e59b7 100644 --- a/BetterGenshinImpact/View/Pages/HomePage.xaml +++ b/BetterGenshinImpact/View/Pages/HomePage.xaml @@ -510,5 +510,8 @@ + 启动时间 + 当前时间 + tickCount \ No newline at end of file diff --git a/BetterGenshinImpact/View/Pages/HomePage.xaml.cs b/BetterGenshinImpact/View/Pages/HomePage.xaml.cs index 025bd0dd..f4a849e2 100644 --- a/BetterGenshinImpact/View/Pages/HomePage.xaml.cs +++ b/BetterGenshinImpact/View/Pages/HomePage.xaml.cs @@ -1,4 +1,7 @@ -using BetterGenshinImpact.ViewModel.Pages; +using System; +using System.Threading.Tasks; +using BetterGenshinImpact.ViewModel.Pages; +using Vanara.PInvoke; namespace BetterGenshinImpact.View.Pages { @@ -12,6 +15,27 @@ namespace BetterGenshinImpact.View.Pages InitializeComponent(); // hotKeyPageViewModel 放在这里是为了在首页就初始化热键 + + Task.Run(async () => + { + bool first = true; + // 显示当前时间 + while (true) + { + Dispatcher.Invoke(() => + { + if (first) + { + first = false; + ClockStartBlock.Text = DateTime.Now.ToString("HH:mm:ss.fff") + " | " + Kernel32.GetTickCount().ToString(); + } + + ClockBlock.Text = DateTime.Now.ToString("HH:mm:ss.fff"); + TickBlock.Text = Kernel32.GetTickCount().ToString(); + }); + await Task.Delay(10); + } + }); } } } \ No newline at end of file