diff --git a/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainConfig.cs b/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainConfig.cs index 65f879a5..eb00859a 100644 --- a/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainConfig.cs +++ b/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainConfig.cs @@ -8,7 +8,7 @@ public partial class AutoDomainConfig : ObservableObject { /// - /// 战斗结束后延迟几秒再开始寻找石化古树 + /// 战斗结束后延迟几秒再开始寻找石化古树,秒 /// - [ObservableProperty] private int _fightEndDelay = 5000; + [ObservableProperty] private double _fightEndDelay = 5; } \ No newline at end of file diff --git a/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.cs b/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.cs index 5d439e29..33383d4c 100644 --- a/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.cs +++ b/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.cs @@ -103,7 +103,7 @@ public class AutoDomainTask } catch (Exception e) { - Logger.LogInformation(e.Message); + Logger.LogError(e.Message); Logger.LogDebug(e.StackTrace); } finally @@ -296,11 +296,11 @@ public class AutoDomainTask return; } - var ms = TaskContext.Instance().Config.AutoDomainConfig.FightEndDelay; - if (ms > 0) + var s = TaskContext.Instance().Config.AutoDomainConfig.FightEndDelay; + if (s > 0) { - Sleep(1000, _taskParam.Cts); - Logger.LogInformation("战斗结束后等待 {Ms} 毫秒", ms); + Logger.LogInformation("战斗结束后等待 {Second} 秒", s); + Sleep((int)(s * 1000), _taskParam.Cts); } } diff --git a/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs b/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs index fbfa5376..5c893443 100644 --- a/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs +++ b/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs @@ -67,7 +67,8 @@ public class AutoFightTask } catch (Exception e) { - Logger.LogInformation(e.Message); + Logger.LogError(e.Message); + Logger.LogDebug(e.StackTrace); } finally { diff --git a/BetterGenshinImpact/GameTask/AutoGeniusInvokation/Model/Duel.cs b/BetterGenshinImpact/GameTask/AutoGeniusInvokation/Model/Duel.cs index abb624c2..e8ec809a 100644 --- a/BetterGenshinImpact/GameTask/AutoGeniusInvokation/Model/Duel.cs +++ b/BetterGenshinImpact/GameTask/AutoGeniusInvokation/Model/Duel.cs @@ -306,7 +306,7 @@ public class Duel catch (System.Exception ex) { _logger.LogError(ex.Message); - Debug.WriteLine(ex.StackTrace); + _logger.LogDebug(ex.StackTrace); if (TaskContext.Instance().Config.DetailedErrorLogs) { _logger.LogError(ex.StackTrace); diff --git a/BetterGenshinImpact/GameTask/AutoWood/AutoWoodTask.cs b/BetterGenshinImpact/GameTask/AutoWood/AutoWoodTask.cs index 7ad1cead..40b880d4 100644 --- a/BetterGenshinImpact/GameTask/AutoWood/AutoWoodTask.cs +++ b/BetterGenshinImpact/GameTask/AutoWood/AutoWoodTask.cs @@ -86,7 +86,8 @@ public class AutoWoodTask } catch (Exception e) { - Logger.LogInformation(e.Message); + Logger.LogError(e.Message); + Logger.LogDebug(e.StackTrace); System.Windows.MessageBox.Show("自动伐木时异常:" + e.Source + "\r\n--" + Environment.NewLine + e.StackTrace + "\r\n---" + Environment.NewLine + e.Message); } finally diff --git a/BetterGenshinImpact/View/Pages/TaskSettingsPage.xaml b/BetterGenshinImpact/View/Pages/TaskSettingsPage.xaml index ae8bfd6e..2fdb9b95 100644 --- a/BetterGenshinImpact/View/Pages/TaskSettingsPage.xaml +++ b/BetterGenshinImpact/View/Pages/TaskSettingsPage.xaml @@ -457,7 +457,7 @@