diff --git a/BetterGenshinImpact/Core/Simulator/Simulation.cs b/BetterGenshinImpact/Core/Simulator/Simulation.cs index 01ea60ec..1bcaf93b 100644 --- a/BetterGenshinImpact/Core/Simulator/Simulation.cs +++ b/BetterGenshinImpact/Core/Simulator/Simulation.cs @@ -28,6 +28,9 @@ public class Simulation SendInput.Keyboard.KeyUp(key); } } + SendInput.Mouse.LeftButtonUp(); + SendInput.Mouse.RightButtonUp(); + SendInput.Mouse.MiddleButtonUp(); } public static bool IsKeyDown(User32.VK key) diff --git a/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs b/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs index c62cb57d..625e271b 100644 --- a/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs +++ b/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs @@ -684,7 +684,12 @@ public class AutoFightTask : ISoloTask picker.UseSkill(true); await Delay(50, ct); Simulation.SendInput.SimulateAction(GIActions.NormalAttack); + await Delay(100, ct); + Simulation.SendInput.SimulateAction(GIActions.NormalAttack); + await Delay(100, ct); + Simulation.SendInput.SimulateAction(GIActions.NormalAttack); await Delay(1500, ct); + picker.AfterUseSkill(); } } else diff --git a/BetterGenshinImpact/GameTask/AutoLeyLineOutcrop/AutoLeyLineOutcropTask.cs b/BetterGenshinImpact/GameTask/AutoLeyLineOutcrop/AutoLeyLineOutcropTask.cs index 4e3b0578..bf2ba068 100644 --- a/BetterGenshinImpact/GameTask/AutoLeyLineOutcrop/AutoLeyLineOutcropTask.cs +++ b/BetterGenshinImpact/GameTask/AutoLeyLineOutcrop/AutoLeyLineOutcropTask.cs @@ -1084,6 +1084,10 @@ public class AutoLeyLineOutcropTask : ISoloTask kazuha.UseSkill(true); await Delay(50, _ct); Simulation.SendInput.SimulateAction(GIActions.NormalAttack); + await Delay(100, _ct); + Simulation.SendInput.SimulateAction(GIActions.NormalAttack); + await Delay(100, _ct); + Simulation.SendInput.SimulateAction(GIActions.NormalAttack); await Delay(1500, _ct); kazuha.AfterUseSkill(); _logger.LogInformation("战后聚集拾取:万叶长E动作完成,等待拾取动作结束"); diff --git a/BetterGenshinImpact/GameTask/AutoPathing/Handler/PickUpCollectHandler.cs b/BetterGenshinImpact/GameTask/AutoPathing/Handler/PickUpCollectHandler.cs index 1c8c9055..5328eb7e 100644 --- a/BetterGenshinImpact/GameTask/AutoPathing/Handler/PickUpCollectHandler.cs +++ b/BetterGenshinImpact/GameTask/AutoPathing/Handler/PickUpCollectHandler.cs @@ -25,8 +25,8 @@ public class PickUpCollectHandler : IActionHandler /// public static readonly string[] PickUpActions = [ - "枫原万叶-长E keydown(E),wait(0.7),keyup(E),attack(0.2),wait(0.5)", - "枫原万叶-短E e,attack(0.15)", + "枫原万叶-长E attack(0.08),keydown(E),wait(1),keyup(E),attack(0.5)", + "枫原万叶-短E attack(0.08),keydown(E),wait(0.47),keyup(E),attack(0.5)", "琴-短E wait(0.1),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle)", "琴-长E wait(0.1),click(middle),keydown(E),click(middle),wait(0.4),moveby(500,0),wait(0.1),moveby(500,0),wait(0.1)," + "moveby(500,0),wait(0.1),moveby(500,0),wait(0.1),moveby(500,0),wait(0.1),moveby(500,0),wait(0.1),moveby(500,0),wait(0.1)," +