From a948c70bafebd9a34f75dcb9cf58dc0810f7df05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BA=81=E5=8A=A8=E7=9A=84=E6=B0=A8=E6=B0=94?= <131591012+zaodonganqi@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:35:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AE=80=E5=8C=96=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=88=98=E6=96=97=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=20(#2732?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GameTask/AutoFight/AutoFightSeek.cs | 3 ++- .../GameTask/AutoFight/AutoFightTask.cs | 10 ++++++---- .../GameTask/AutoFight/Model/Avatar.cs | 14 ++++++++------ .../GameTask/AutoFight/Script/CombatScriptBag.cs | 5 +++-- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/BetterGenshinImpact/GameTask/AutoFight/AutoFightSeek.cs b/BetterGenshinImpact/GameTask/AutoFight/AutoFightSeek.cs index 06b4f011..322787fd 100644 --- a/BetterGenshinImpact/GameTask/AutoFight/AutoFightSeek.cs +++ b/BetterGenshinImpact/GameTask/AutoFight/AutoFightSeek.cs @@ -320,7 +320,8 @@ namespace BetterGenshinImpact.GameTask.AutoFight if (retryCount == 0) { await Delay(delayTime,ct); - Logger.LogInformation("打开编队界面检查战斗是否结束，延时{detectDelayTime}毫秒检查", detectDelayTime); + // Logger.LogInformation("打开编队界面检查战斗是否结束，延时{detectDelayTime}毫秒检查", detectDelayTime); + Logger.LogInformation("打开编队界面检查战斗是否结束"); Simulation.SendInput.SimulateAction(GIActions.OpenPartySetupScreen); await Delay(detectDelayTime, ct); var ra3 = CaptureToRectArea(); diff --git a/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs b/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs index 47f7a21f..23b0c505 100644 --- a/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs +++ b/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs @@ -444,7 +444,7 @@ public class AutoFightTask : ISoloTask if (_finishDetectConfig.DelayTimes.TryGetValue(command.Name, out var time)) { delayTime = time; - Logger.LogInformation($"{command.Name}结束后，延时检查为{delayTime}毫秒"); + // Logger.LogInformation($"{command.Name}结束后，延时检查为{delayTime}毫秒"); } else { @@ -766,7 +766,8 @@ public class AutoFightTask : ISoloTask if (!_finishDetectConfig.RotateFindEnemyEnabled)await Delay(delayTime, _ct); - Logger.LogInformation("打开编队界面检查战斗是否结束，延时{detectDelayTime}毫秒检查", detectDelayTime); + // Logger.LogInformation("打开编队界面检查战斗是否结束，延时{detectDelayTime}毫秒检查", detectDelayTime); + Logger.LogInformation("打开编队界面检查战斗是否结束"); // 最终方案确认战斗结束 Simulation.SendInput.SimulateAction(GIActions.OpenPartySetupScreen); await Delay(detectDelayTime, _ct); @@ -789,8 +790,9 @@ public class AutoFightTask : ISoloTask return true; } - Logger.LogInformation($"未识别到战斗结束yellow{b3.Item0},{b3.Item1},{b3.Item2}"); - Logger.LogInformation($"未识别到战斗结束white{whiteTile.Item0},{whiteTile.Item1},{whiteTile.Item2}"); + // Logger.LogInformation($"未识别到战斗结束yellow{b3.Item0},{b3.Item1},{b3.Item2}"); + // Logger.LogInformation($"未识别到战斗结束white{whiteTile.Item0},{whiteTile.Item1},{whiteTile.Item2}"); + Logger.LogInformation($"未识别到战斗结束: yellow{b3.Item0},{b3.Item1},{b3.Item2};white{whiteTile.Item0},{whiteTile.Item1},{whiteTile.Item2}"); if (_finishDetectConfig.RotateFindEnemyEnabled) { diff --git a/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs b/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs index 943ecdbe..15536f45 100644 --- a/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs +++ b/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs @@ -254,10 +254,10 @@ public class Avatar // 切换成功 if (CombatScenes.GetActiveAvatarIndex(region, context) == Index) { - if (needLog && i > 0) - { - Logger.LogInformation("成功切换角色:{Name}", Name); - } + // if (needLog && i > 0) + // { + // Logger.LogInformation("成功切换角色:{Name}", Name); + // } return true; } @@ -267,6 +267,8 @@ public class Avatar Sleep(250, Ct); } + + Logger.LogWarning("切换角色失败:{Name}", Name); return false; } @@ -472,8 +474,8 @@ public class Avatar var cd = AfterUseSkill(region); if (cd > 0) { - Logger.LogInformation(hold ? "{Name} 长按元素战技，cd:{Cd} 秒" : "{Name} 点按元素战技，cd:{Cd} 秒", Name, - Math.Round(cd, 2)); + // Logger.LogInformation(hold ? "{Name} 长按元素战技，cd:{Cd} 秒" : "{Name} 点按元素战技，cd:{Cd} 秒", Name, + // Math.Round(cd, 2)); return; } } diff --git a/BetterGenshinImpact/GameTask/AutoFight/Script/CombatScriptBag.cs b/BetterGenshinImpact/GameTask/AutoFight/Script/CombatScriptBag.cs index 9736545e..264d00e1 100644 --- a/BetterGenshinImpact/GameTask/AutoFight/Script/CombatScriptBag.cs +++ b/BetterGenshinImpact/GameTask/AutoFight/Script/CombatScriptBag.cs @@ -28,8 +28,9 @@ public class CombatScriptBag(List combatScripts) } if (matchCount != avatars.Count) continue; - Logger.LogInformation("匹配到战斗脚本：{Name}，共{Cnt}条指令，涉及角色：{Str}", - combatScript.Name, combatScript.CombatCommands.Count, string.Join(",", combatScript.AvatarNames)); + // Logger.LogInformation("匹配到战斗脚本：{Name}，共{Cnt}条指令，涉及角色：{Str}", + // combatScript.Name, combatScript.CombatCommands.Count, string.Join(",", combatScript.AvatarNames)); + Logger.LogInformation("匹配到战斗脚本：{Name}", combatScript.Name); return combatScript.CombatCommands; }