DR-lin-eng
diff --git a/‎.github/workflows/publish.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/publish.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 1 deletion b/‎.gitignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎BetterGenshinImpact.sln.DotSettings‎
Lines changed: 4 additions & 1 deletion b/‎BetterGenshinImpact.sln.DotSettings‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎BetterGenshinImpact/App.xaml‎
Lines changed: 2 additions & 0 deletions b/‎BetterGenshinImpact/App.xaml‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎BetterGenshinImpact/App.xaml.cs‎
Lines changed: 28 additions & 2 deletions b/‎BetterGenshinImpact/App.xaml.cs‎
Lines changed: 28 additions & 2 deletions
diff --git a/‎BetterGenshinImpact/BetterGenshinImpact.csproj‎
Lines changed: 16 additions & 3 deletions b/‎BetterGenshinImpact/BetterGenshinImpact.csproj‎
Lines changed: 16 additions & 3 deletions
diff --git a/‎BetterGenshinImpact/Core/BgiVision/BvPage.cs‎
Lines changed: 55 additions & 1 deletion b/‎BetterGenshinImpact/Core/BgiVision/BvPage.cs‎
Lines changed: 55 additions & 1 deletion
diff --git a/‎BetterGenshinImpact/Core/Config/AllConfig.cs‎
Lines changed: 22 additions & 1 deletion b/‎BetterGenshinImpact/Core/Config/AllConfig.cs‎
Lines changed: 22 additions & 1 deletion
diff --git a/‎BetterGenshinImpact/Core/Config/HotKeyConfig.cs‎
Lines changed: 15 additions & 1 deletion b/‎BetterGenshinImpact/Core/Config/HotKeyConfig.cs‎
Lines changed: 15 additions & 1 deletion
diff --git a/‎BetterGenshinImpact/Core/Config/MaskWindowConfig.cs‎
Lines changed: 4 additions & 11 deletions b/‎BetterGenshinImpact/Core/Config/MaskWindowConfig.cs‎
Lines changed: 4 additions & 11 deletions
@@ -74,7 +74,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          repository: A-Little-AnQi/bettergi-script-web
+          repository: zaodonganqi/bettergi-script-web
       - uses: actions/setup-node@v4
         with:
           node-version: 20
 
@@ -28,10 +28,11 @@ github_actions_cache/
 
 *.zip
 
-# Rider
+# IDE & AI tools
 .idea
 .trae
 .claude
 CLAUDE.md
+AGENTS.md
 
 __pycache__/
@@ -1,7 +1,10 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=chyan/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=enkanomiya/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kongying/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=mirrorchan/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=onslaugh/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=retcode/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=serenitea/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=steambird/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=steambird/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Teyvat/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
@@ -24,6 +24,8 @@
             <bgivc:NotNullConverter x:Key="NotNullConverter" />
             <bgivc:EnumToKVPConverter x:Key="EnumToKVPConverter" />
             <bgivc:CultureInfoNameToKVPConverter x:Key="CultureInfoNameToKVPConverter" />
+            <bgivc:StringToColorConverter x:Key="StringToColorConverter" />
+            <bgivc:TrConverter x:Key="TrConverter" />
             <Style BasedOn="{StaticResource DefaultTextBoxStyle}" TargetType="{x:Type TextBox}">
                 <Setter Property="behavior:ClipboardInterceptor.EnableSafeClipboard" Value="True" />
             </Style>
 
@@ -21,6 +21,8 @@
 using BetterGenshinImpact.ViewModel;
 using BetterGenshinImpact.ViewModel.Pages;
 using BetterGenshinImpact.ViewModel.Pages.View;
+using LazyCache;
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -34,6 +36,7 @@
 
 // Wine 平台适配
 using BetterGenshinImpact.Platform.Wine;
+using BetterGenshinImpact.Service.Tavern;
 
 namespace BetterGenshinImpact;
 
@@ -83,7 +86,24 @@ public partial class App : Application
                 }
 
                 Log.Logger = loggerConfiguration.CreateLogger();
-                services.AddLogging(c => c.AddSerilog());
+                services.AddSingleton<IMissingTranslationReporter, SupabaseMissingTranslationReporter>();
+                services.AddSingleton<ITranslationService, JsonTranslationService>();
+                
+                if ("zh-Hans".Equals(all.OtherConfig.UiCultureInfoName, StringComparison.OrdinalIgnoreCase))
+                {
+                    services.AddLogging(c => c.AddSerilog());
+                }
+                else
+                {
+                    services.AddLogging(logging =>
+                    {
+                        logging.ClearProviders();
+                        logging.SetMinimumLevel(LogLevel.Debug);
+                        logging.AddFilter("Microsoft", LogLevel.Warning);
+                        logging.AddFilter("Microsoft.Hosting.Lifetime", LogLevel.Warning);
+                        logging.Services.AddSingleton<ILoggerProvider, TranslatingSerilogLoggerProvider>();
+                    });
+                }
 
                 services.AddLocalization();
 
@@ -139,6 +159,12 @@ public partial class App : Application
                 services.AddSingleton<HutaoNamedPipe>();
                 services.AddSingleton<BgiOnnxFactory>();
                 services.AddSingleton<OcrFactory>();
+                services.AddMemoryCache();
+                services.AddSingleton<IAppCache, CachingService>();
+                services.AddSingleton<MemoryFileCache>();
+                services.AddSingleton<IMihoyoMapApiService, MihoyoMapApiService>();
+                services.AddSingleton<IKongyingTavernApiService, KongyingTavernApiService>();
+                services.AddSingleton<IMaskMapPointService, MaskMapPointService>();
 
                 services.AddSingleton(TimeProvider.System);
                 services.AddSingleton<IServerTimeProvider, ServerTimeProvider>();
@@ -324,4 +350,4 @@ private static void HandleException(Exception e)
         // log
         GetLogger<App>().LogDebug(e, "UnHandle Exception");
     }
-}
+}
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<AssemblyName>BetterGI</AssemblyName>
-		<Version>0.55.1-alpha.4</Version>
+		<Version>0.57.1-alpha.3</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
@@ -45,17 +45,19 @@
 		<PackageReference Include="BetterGI.VCRuntime" Version="14.44.35208" />
 		<PackageReference Include="BetterGI.Assets.Map" Version="1.0.17" />
         <PackageReference Include="BetterGI.Assets.Model" Version="1.0.18" />
-		<PackageReference Include="BetterGI.Assets.Other" Version="1.0.10" />
+		<PackageReference Include="BetterGI.Assets.Other" Version="1.0.12" />
 
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="DeviceId" Version="6.9.0" />
 		<PackageReference Include="DeviceId.Windows" Version="6.9.0" />
 		<PackageReference Include="DeviceId.Windows.Wmi" Version="6.9.0" />
 		<PackageReference Include="Emoji.Wpf" Version="0.3.4" />
 		<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
+		<PackageReference Include="LazyCache" Version="2.4.0" />
 		<PackageReference Include="MailKit" Version="4.14.0" />
 		<PackageReference Include="Meziantou.Framework.Win32.CredentialManager" Version="1.7.4" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
 		<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.4" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
@@ -82,16 +84,18 @@
 		<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
 		<PackageReference Include="Serilog.Sinks.RichTextBoxEx.Wpf" Version="1.1.0.1" />
+<!--		<PackageReference Include="supabase-csharp" Version="0.16.2" />-->
 		<PackageReference Include="System.Drawing.Common" Version="10.0.0" />
 		<PackageReference Include="System.IO.Hashing" Version="9.0.4" />
 		<PackageReference Include="TorchSharp" Version="0.105.0" />
 		<PackageReference Include="Vanara.PInvoke.NtDll" Version="4.1.3" />
 		<PackageReference Include="Vanara.PInvoke.SHCore" Version="4.1.3" />
 		<PackageReference Include="Vanara.PInvoke.User32" Version="4.1.3" />
+		<PackageReference Include="XamlAnimatedGif" Version="2.3.1" />
 		<PackageReference Include="WPF-UI" Version="4.2.0" />
 		<PackageReference Include="WPF-UI.DependencyInjection" Version="4.2.0" />
 		<PackageReference Include="WPF-UI.Tray" Version="4.2.0" />
-		<PackageReference Include="WPF-UI.Violeta" Version="4.2.0" />
+		<PackageReference Include="WPF-UI.Violeta" Version="4.2.0.1" />
 		<PackageReference Include="gong-wpf-dragdrop" Version="3.2.1" />
 		<PackageReference Include="YamlDotNet" Version="16.3.0" />
 		<PackageReference Include="YoloSharp" Version="6.0.3" />
@@ -125,6 +129,9 @@
 		<None Update="GameTask\AutoFishing\Assets\1920x1080\**">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
+		<None Update="GameTask\AutoLeyLineOutcrop\Assets\**">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
 		<None Update="GameTask\LogParse\Assets\**">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
@@ -191,6 +198,12 @@
 		<None Update="GameTask\Common\Element\Assets\1920x1080\in_domain.png">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
+		<None Update="GameTask\AutoDomain\Assets\1920x1080\**">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="User\I18n\en.json">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 	</ItemGroup>
 
 	<ItemGroup>
 
@@ -2,7 +2,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using BetterGenshinImpact.Core.Recognition;
+using BetterGenshinImpact.Core.Recognition.OCR;
 using BetterGenshinImpact.Core.Simulator;
+using BetterGenshinImpact.GameTask;
 using BetterGenshinImpact.GameTask.Common;
 using BetterGenshinImpact.GameTask.Model.Area;
 using Fischless.WindowsInput;
@@ -118,4 +120,56 @@ public void Click(double x, double y)
     {
         GameCaptureRegion.GameRegion1080PPosClick(x, y);
     }
-}
+
+    /// <summary>
+    /// 使用模糊匹配判断截图中是否包含目标文字。
+    /// 通过 <see cref="OcrFactory.PaddleMatch"/> 自动选择最佳实现（DP 模糊匹配或普通 OCR + 字符串比较）。
+    /// </summary>
+    /// <param name="target">目标字符串</param>
+    /// <param name="rect">感兴趣区域，default 表示全屏</param>
+    /// <param name="threshold">匹配阈值 (0~1)，null 使用配置中的默认阈值</param>
+    /// <returns>是否匹配成功</returns>
+    public bool OcrMatch(string target, Rect rect = default, double? threshold = null)
+    {
+        var matchService = OcrFactory.PaddleMatch;
+        var actualThreshold = threshold
+                              ?? TaskContext.Instance().Config.OtherConfig.OcrConfig.OcrMatchDefaultThreshold;
+
+        var screen = TaskControl.CaptureToRectArea();
+        try
+        {
+            var roi = rect == default ? null : screen.DeriveCrop(rect);
+            try
+            {
+                var score = matchService.OcrMatch((roi ?? screen).SrcMat, target);
+                return score >= actualThreshold;
+            }
+            finally
+            {
+                roi?.Dispose();
+            }
+        }
+        finally
+        {
+            screen.Dispose();
+        }
+    }
+
+    /// <summary>
+    /// 重复截图并使用模糊匹配，等待目标文字出现。
+    /// 超时返回 false 而非抛异常。
+    /// </summary>
+    /// <param name="target">目标字符串</param>
+    /// <param name="rect">感兴趣区域，default 表示全屏</param>
+    /// <param name="threshold">匹配阈值 (0~1)，null 使用配置中的默认阈值</param>
+    /// <param name="timeout">超时时间（毫秒），null 使用 DefaultTimeout</param>
+    /// <returns>是否在超时前匹配成功</returns>
+    public async Task<bool> WaitForOcrMatch(string target, Rect rect = default, double? threshold = null, int? timeout = null)
+    {
+        var actualTimeout = timeout ?? DefaultTimeout;
+        var retryCount = DefaultRetryInterval > 0 ? actualTimeout / DefaultRetryInterval : 1;
+
+        return await NewRetry.WaitForAction(() => OcrMatch(target, rect, threshold),
+            _cancellationToken, retryCount, DefaultRetryInterval);
+    }
+}
@@ -22,6 +22,9 @@
 using BetterGenshinImpact.GameTask.AutoStygianOnslaught;
 using BetterGenshinImpact.GameTask.GetGridIcons;
 using BetterGenshinImpact.GameTask.AutoEat;
+using BetterGenshinImpact.GameTask.AutoLeyLineOutcrop;
+using BetterGenshinImpact.GameTask.MapMask;
+using BetterGenshinImpact.GameTask.SkillCd;
 using BetterGenshinImpact.GameTask.UseRedeemCode;
 
 namespace BetterGenshinImpact.Core.Config;
@@ -171,7 +174,22 @@ public partial class AllConfig : ObservableObject
     ///     自动吃药配置
     /// </summary>
     public AutoEatConfig AutoEatConfig { get; set; } = new();
+
+    /// <summary>
+    ///     自动地脉花配置
+    /// </summary>
+    public AutoLeyLineOutcropConfig AutoLeyLineOutcropConfig { get; set; } = new();
 
+    /// <summary>
+    ///   地图遮罩
+    /// </summary>
+    public MapMaskConfig MapMaskConfig { get; set; } = new();
+
+    /// <summary>
+    /// 技能 CD 提示
+    /// </summary>
+    public SkillCdConfig SkillCdConfig { get; set; } = new();
+
     /// <summary>
     /// 自动使用
     /// </summary>
@@ -261,12 +279,15 @@ public void InitEvent()
         AutoArtifactSalvageConfig.PropertyChanged += OnAnyPropertyChanged;
         AutoRedeemCodeConfig.PropertyChanged += OnAnyPropertyChanged;
         AutoEatConfig.PropertyChanged += OnAnyPropertyChanged;
+        AutoLeyLineOutcropConfig.PropertyChanged += OnAnyPropertyChanged;
+        MapMaskConfig.PropertyChanged += OnAnyPropertyChanged;
         AutoMusicGameConfig.PropertyChanged += OnAnyPropertyChanged;
         TpConfig.PropertyChanged += OnAnyPropertyChanged;
         ScriptConfig.PropertyChanged += OnAnyPropertyChanged;
         PathingConditionConfig.PropertyChanged += OnAnyPropertyChanged;
         DevConfig.PropertyChanged += OnAnyPropertyChanged;
         HardwareAccelerationConfig.PropertyChanged += OnAnyPropertyChanged;
+        SkillCdConfig.PropertyChanged += OnAnyPropertyChanged;
     }
 
     public void OnAnyPropertyChanged(object? sender, EventArgs args)
@@ -279,4 +300,4 @@ public void OnNotificationPropertyChanged(object? sender, PropertyChangedEventAr
     {
         NotificationService.Instance().RefreshNotifiers();
     }
-}
+}
@@ -1,4 +1,4 @@
-using BetterGenshinImpact.Model;
+using BetterGenshinImpact.Model;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 
@@ -100,6 +100,13 @@ public partial class HotKeyConfig : ObservableObject
 
     [ObservableProperty]
     private string _quickTeleportTickHotkeyType = HotKeyTypeEnum.KeyboardMonitor.ToString();
+    
+    // 技能CD提示开关
+    [ObservableProperty]
+    private string _skillCdEnabledHotkey = "";
+
+    [ObservableProperty]
+    private string _skillCdEnabledHotkeyType = HotKeyTypeEnum.KeyboardMonitor.ToString();
 
     // 截图
     [ObservableProperty]
@@ -237,4 +244,11 @@ public partial class HotKeyConfig : ObservableObject
 
     [ObservableProperty]
     private string _onedragonHotkeyType = HotKeyTypeEnum.KeyboardMonitor.ToString();
+
+    // 地图遮罩开关
+    [ObservableProperty]
+    private string _mapMaskEnabledHotkey = "";
+
+    [ObservableProperty]
+    private string _mapMaskEnabledHotkeyType = HotKeyTypeEnum.KeyboardMonitor.ToString();
 }
@@ -63,13 +63,6 @@ public partial class MaskWindowConfig : ObservableObject
     [ObservableProperty]
     private bool _showFps = false;
 
-    /// <summary>
-    /// 作为原神子窗体
-    /// 有些bug没解决
-    /// </summary>
-    [ObservableProperty]
-    private bool _useSubform = false;
-
     /// <summary>
     /// 遮罩文本透明度 (0.0-1.0)
     /// </summary>
@@ -83,10 +76,10 @@ public partial class MaskWindowConfig : ObservableObject
     private double _logTextBoxLeftRatio = 20.0 / 1920;
 
     [ObservableProperty]
-    private double _logTextBoxTopRatio = 832.0 / 1080;
+    private double _logTextBoxTopRatio = 822.0 / 1080;
 
     [ObservableProperty]
-    private double _logTextBoxWidthRatio = 477.0 / 1920;
+    private double _logTextBoxWidthRatio = 480.0 / 1920;
 
     [ObservableProperty]
     private double _logTextBoxHeightRatio = 188.0 / 1080;
@@ -95,10 +88,10 @@ public partial class MaskWindowConfig : ObservableObject
     private double _statusListLeftRatio = 20.0 / 1920;
 
     [ObservableProperty]
-    private double _statusListTopRatio = 807.0 / 1080;
+    private double _statusListTopRatio = 790.0 / 1080;
 
     [ObservableProperty]
-    private double _statusListWidthRatio = 477.0 / 1920;
+    private double _statusListWidthRatio = 480.0 / 1920;
 
     [ObservableProperty]
     private double _statusListHeightRatio = 24.0 / 1080;