From 763bcaa9c4ae172d92e3e489aec41791738f155d Mon Sep 17 00:00:00 2001 From: huiyadanli <15783049+huiyadanli@users.noreply.github.com> Date: Sat, 9 Aug 2025 08:47:09 +0000 Subject: [PATCH 1/4] Update version to 0.48.1-alpha.1 --- BetterGenshinImpact/BetterGenshinImpact.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BetterGenshinImpact/BetterGenshinImpact.csproj b/BetterGenshinImpact/BetterGenshinImpact.csproj index 81bfc847..f490004a 100644 --- a/BetterGenshinImpact/BetterGenshinImpact.csproj +++ b/BetterGenshinImpact/BetterGenshinImpact.csproj @@ -2,7 +2,7 @@ BetterGI - 0.48.0 + 0.48.1-alpha.1 false WinExe net8.0-windows10.0.22621.0 From 981018262f5fd5d8ecb81db2c83c3e7d56fcc7e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= Date: Sat, 9 Aug 2025 16:33:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=A0=E9=80=81?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=A7=98=E5=A2=83=E7=AD=89=E5=BE=85=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=BF=87=E7=9F=AD=E7=9A=84=E9=97=AE=E9=A2=98=20#2031?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GameTask/AutoStygianOnslaught/AutoStygianOnslaughtTask.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BetterGenshinImpact/GameTask/AutoStygianOnslaught/AutoStygianOnslaughtTask.cs b/BetterGenshinImpact/GameTask/AutoStygianOnslaught/AutoStygianOnslaughtTask.cs index f95c7338..37007952 100644 --- a/BetterGenshinImpact/GameTask/AutoStygianOnslaught/AutoStygianOnslaughtTask.cs +++ b/BetterGenshinImpact/GameTask/AutoStygianOnslaught/AutoStygianOnslaughtTask.cs @@ -239,7 +239,8 @@ public class AutoStygianOnslaughtTask : ISoloTask .ClickUntilDisappears(); _logger.LogInformation($"{Name}：进入秘境"); - await page.Locator(ElementAssets.Instance.LeylineDisorderIconRo).WaitFor(); + await Delay(2000, _ct); + await page.Locator(ElementAssets.Instance.LeylineDisorderIconRo).WaitFor(60000); await Delay(1000, _ct); _logger.LogInformation($"{Name}：步行前往钥匙"); From a004304061c926a1d916f176b75f7a7ae795e211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= Date: Sat, 9 Aug 2025 17:15:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=91=E6=8D=A2?= =?UTF-8?q?=E7=A0=81=E4=BD=BF=E7=94=A8=E5=90=8E=E4=B8=8D=E5=86=8D=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=AD=A4=E5=89=AA=E5=88=87=E6=9D=BF=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E7=9A=84=E5=85=91=E6=8D=A2=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UseRedeemCode/RedeemCodeManager.cs | 14 ++++++++ .../Helpers/Security/MD5Helper.cs | 35 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 BetterGenshinImpact/Helpers/Security/MD5Helper.cs diff --git a/BetterGenshinImpact/GameTask/UseRedeemCode/RedeemCodeManager.cs b/BetterGenshinImpact/GameTask/UseRedeemCode/RedeemCodeManager.cs index 6a43e593..4dadade8 100644 --- a/BetterGenshinImpact/GameTask/UseRedeemCode/RedeemCodeManager.cs +++ b/BetterGenshinImpact/GameTask/UseRedeemCode/RedeemCodeManager.cs @@ -4,6 +4,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; +using BetterGenshinImpact.Helpers.Security; using BetterGenshinImpact.View.Windows; using TextBox = Wpf.Ui.Controls.TextBox; @@ -11,8 +12,16 @@ namespace BetterGenshinImpact.GameTask.UseRedeemCode; public class RedeemCodeManager { + public static HashSet CancelClipboardHash { get; } = []; + public static async Task ImportFromClipboard(string clipboardText) { + var md5Hash = MD5Helper.ComputeMD5(clipboardText); + if (CancelClipboardHash.Contains(md5Hash)) + { + return; + } + var codes = ExtractAllCodes(clipboardText); if (codes.Count == 0) { @@ -36,6 +45,11 @@ public class RedeemCodeManager if (p.DialogResult != true) { + if (CancelClipboardHash.Count > 10) + { + CancelClipboardHash.Clear(); + } + CancelClipboardHash.Add(md5Hash); return; } diff --git a/BetterGenshinImpact/Helpers/Security/MD5Helper.cs b/BetterGenshinImpact/Helpers/Security/MD5Helper.cs new file mode 100644 index 00000000..732d2e8f --- /dev/null +++ b/BetterGenshinImpact/Helpers/Security/MD5Helper.cs @@ -0,0 +1,35 @@ +using System.Security.Cryptography; +using System.Text; + +namespace BetterGenshinImpact.Helpers.Security; + +public static class MD5Helper +{ + /// + /// 计算字符串的MD5哈希值 + /// + /// 输入字符串 + /// 字符编码，默认为UTF-8 + /// 32位小写MD5哈希值 + public static string ComputeMD5(string input, Encoding encoding = null) + { + if (string.IsNullOrEmpty(input)) + return string.Empty; + + encoding = encoding ?? Encoding.UTF8; + + using (var md5 = MD5.Create()) + { + byte[] inputBytes = encoding.GetBytes(input); + byte[] hashBytes = md5.ComputeHash(inputBytes); + + // 将字节数组转换为十六进制字符串 + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < hashBytes.Length; i++) + { + sb.Append(hashBytes[i].ToString("x2")); + } + return sb.ToString(); + } + } +} \ No newline at end of file From 9090f461052c2af9ecc6a88e7214928b7b9f4218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= Date: Sat, 9 Aug 2025 17:21:48 +0800 Subject: [PATCH 4/4] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 13b2273e..7d6ad956 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,8 @@ BetterGI · 更好的原神， 一个基于计算机视觉技术，意图让原 > > 不知道下载哪个？第一次使用？请看：[快速上手](https://bettergi.com/quickstart.html) ， 遇到问题请先看：[常见问题](https://bettergi.com/faq.html) -最新编译版本可以从自动构建中获取： [![](https://github.com/babalae/better-genshin-impact/actions/workflows/publish.yml/badge.svg)](https://github.com/babalae/better-genshin-impact/actions/workflows/publish.yml) +最新测试版本可以从自动构建中获取： [![](https://github.com/babalae/better-genshin-impact/actions/workflows/publish.yml/badge.svg)](https://github.com/babalae/better-genshin-impact/actions/workflows/publish.yml) +或者从CNB上直接下载（速度快）：[CNB Releases](https://cnb.cool/bettergi/better-genshin-impact/-/releases) ## 使用方法 由于图像识别比较吃性能，低配置电脑可能无法正常使用部分功能。