From 6332905b7bcfe3ad6957b6ba796a400cc53e5ba4 Mon Sep 17 00:00:00 2001 From: huiyadanli <15783049+huiyadanli@users.noreply.github.com> Date: Sat, 10 Jan 2026 17:23:24 +0000 Subject: [PATCH 1/3] Update version to 0.54.2-alpha.4 --- BetterGenshinImpact/BetterGenshinImpact.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BetterGenshinImpact/BetterGenshinImpact.csproj b/BetterGenshinImpact/BetterGenshinImpact.csproj index f1b030aa..8204fac4 100644 --- a/BetterGenshinImpact/BetterGenshinImpact.csproj +++ b/BetterGenshinImpact/BetterGenshinImpact.csproj @@ -2,7 +2,7 @@ BetterGI - 0.54.2-alpha.3 + 0.54.2-alpha.4 false WinExe net8.0-windows10.0.22621.0 From 15d6525b14b7cfbaecc03acb6b4b3f569b6c3e2a Mon Sep 17 00:00:00 2001 From: kaedelcb <57870068+kaedelcb@users.noreply.github.com> Date: Mon, 12 Jan 2026 00:20:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=B3=B3?= =?UTF-8?q?=E5=8D=A1=E6=AD=BB=E9=97=AE=E9=A2=98=20(#2616)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GameTask/AutoFight/Model/Avatar.cs | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs b/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs index 3f3a62fe..40c589c8 100644 --- a/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs +++ b/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs @@ -128,28 +128,37 @@ public class Avatar } Logger.LogInformation("游泳检测：尝试回到战斗地点"); - var pathExecutor = new PathExecutor(ct); + var cts = new CancellationTokenSource(); + var pathExecutor = new PathExecutor(cts.Token); + try { - pathExecutor.FaceTo(AutoFightTask.FightWaypoint).Wait(2000, ct); - AutoFightTask.FightWaypoint.MoveMode = MoveModeEnum.Fly.Code;//改为跳飞 + pathExecutor.FaceTo(AutoFightTask.FightWaypoint).Wait(2000,cts.Token); + AutoFightTask.FightWaypoint.MoveMode = MoveModeEnum.Fly.Code; // 改为跳飞 Simulation.SendInput.Mouse.RightButtonDown(); - pathExecutor.MoveTo(AutoFightTask.FightWaypoint).Wait(15000, ct); - AutoFightTask.FightWaypoint = null;//执行后清空，即每次战斗只执行一次，第二次直接去七天神像 + pathExecutor.MoveTo(AutoFightTask.FightWaypoint).Wait(15000,cts.Token); + cts.Cancel(); + AutoFightTask.FightWaypoint = null; Simulation.SendInput.Mouse.RightButtonUp(); } + catch (TaskCanceledException) + { + Logger.LogError("游泳检测：回到战斗地点任务被取消"); + } catch (Exception ex) { - Logger.LogWarning(ex, "游泳检测：回到战斗地点异常"); + Logger.LogError(ex, "游泳检测：回到战斗地点异常"); + } + finally + { + Simulation.ReleaseAllKey(); } - Simulation.ReleaseAllKey(); - - using var ra2 = CaptureToRectArea(); - if (!SwimmingConfirm(ra2)) + using var bitmap2 = CaptureToRectArea(); + if (!SwimmingConfirm(bitmap2)) { Logger.LogInformation("游泳检测：游泳脱困成功"); - return; + return; } Logger.LogWarning("游泳检测：回到战斗地点失败"); From cd3ace0b622870958bfd6cf244dca9e9f9174fbf Mon Sep 17 00:00:00 2001 From: ShadowLemoon <119576779+ShadowLemoon@users.noreply.github.com> Date: Mon, 12 Jan 2026 21:44:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf:=20=E5=87=8F=E5=B0=91=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=8B=89=E5=8F=96=EF=BC=8C=E6=8F=90=E5=8D=87100%=20(#?= =?UTF-8?q?2619)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Core/Script/ScriptRepoUpdater.cs | 33 +++---------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs b/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs index 99f29ed7..d6496a19 100644 --- a/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs +++ b/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs @@ -168,40 +168,17 @@ public class ScriptRepoUpdater : Singleton return; } - // 获取远程分支信息并拉取最新数据 - var remote = repo.Network.Remotes["origin"]; + // 直接获取远程分支的 Commit SHA + var remoteReferences = repo.Network.ListReferences(repoUrl, CreateCredentialsHandler()); + var remoteBranch = remoteReferences.FirstOrDefault(r => r.CanonicalName == "refs/heads/release"); - var fetchOptions = new FetchOptions - { - ProxyOptions = { ProxyType = ProxyType.None }, - Depth = 1, // 浅拉取，只获取最新的提交 - CredentialsProvider = CreateCredentialsHandler(), // 添加凭据处理器 - OnTransferProgress = progress => - { - onCheckoutProgress?.Invoke($"拉取对象 {progress.ReceivedObjects}/{progress.TotalObjects}", progress.ReceivedObjects, progress.TotalObjects); - return true; - } - }; - - // 拉取到远程追踪分支 - string refSpec = $"+refs/heads/release:refs/remotes/origin/release"; - Commands.Fetch(repo, remote.Name, new[] { refSpec }, fetchOptions, "拉取最新更新"); - - // 获取本地和远程commit - var localBranch = repo.Branches["release"]; - if (localBranch == null) - { - throw new Exception("未找到本地release分支"); - } - - var remoteBranch = repo.Branches["origin/release"]; if (remoteBranch == null) { throw new Exception("未找到远程release分支"); } - var currentCommitSha = localBranch.Tip?.Sha; - var remoteCommitSha = remoteBranch.Tip.Sha; + var remoteCommitSha = remoteBranch.TargetIdentifier; + var currentCommitSha = repo.Branches["release"]?.Tip?.Sha; // 比较本地和远程commit if (currentCommitSha == remoteCommitSha)