自动秘境支持指定树脂刷取次数 #1440 #1116 #692 #426

huiyadanli · huiyadanli · commit 9284a51ce6d9 · 2025-06-22T02:15:36.000+08:00
diff --git a/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainConfig.cs b/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainConfig.cs
@@ -1,5 +1,6 @@
 ﻿using CommunityToolkit.Mvvm.ComponentModel;
 using System;
+using System.Collections.Generic;
 
 namespace BetterGenshinImpact.GameTask.AutoDomain;
 
@@ -51,4 +52,32 @@ public partial class AutoDomainConfig : ObservableObject
     // 周日奖励序号
     [ObservableProperty]
     private string _sundaySelectedValue = string.Empty;
+    
+    // 指定树脂的使用次数
+    [ObservableProperty]
+    private bool _specifyResinUse = false;
+    
+    // 自定义使用树脂优先级
+    [ObservableProperty]
+    private List<string> _resinPriorityList =
+    [
+        "浓缩树脂",
+        "原粹树脂"
+    ];
+    
+    // 使用原粹树脂刷取副本次数
+    [ObservableProperty]
+    private int _originalResinUseCount = 0;
+    
+    //使用浓缩树脂刷取副本次数
+    [ObservableProperty]
+    private int _condensedResinUseCount = 0;
+
+    // 使用须臾树脂刷取副本次数
+    [ObservableProperty]
+    private int _transientResinUseCount = 0;
+    
+    // 使用脆弱树脂刷取副本次数
+    [ObservableProperty]
+    private int _fragileResinUseCount = 0;
 }
diff --git a/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainParam.cs b/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainParam.cs
@@ -1,4 +1,5 @@
-﻿using BetterGenshinImpact.GameTask.Model;
+﻿using System.Collections.Generic;
+using BetterGenshinImpact.GameTask.Model;
 using System.Threading;
 
 namespace BetterGenshinImpact.GameTask.AutoDomain;
@@ -25,6 +26,27 @@ public class AutoDomainParam : BaseTaskParam
     // 1~4
     public string MaxArtifactStar { get; set; } = "4";
 
+    public bool SpecifyResinUse { get; set; } = false;
+    
+    // 使用树脂优先级
+    public List<string> ResinPriorityList { get; set; } = 
+    [
+        "浓缩树脂",
+        "原粹树脂"
+    ];
+
+    // 使用原粹树脂刷取副本次数
+    public int OriginalResinUseCount { get; set; } = 0;
+
+    // 使用浓缩树脂刷取副本次数
+    public int CondensedResinUseCount { get; set; } = 0;
+
+    // 使用须臾树脂刷取副本次数
+    public int TransientResinUseCount { get; set; } = 0;
+
+    // 使用脆弱树脂刷取副本次数
+    public int FragileResinUseCount { get; set; } = 0;
+
     public AutoDomainParam(int domainRoundNum, string path)
     {
         DomainRoundNum = domainRoundNum;
@@ -45,5 +67,11 @@ public void SetDefault()
         SundaySelectedValue = config.SundaySelectedValue;
         AutoArtifactSalvage = config.AutoArtifactSalvage;
         MaxArtifactStar = TaskContext.Instance().Config.AutoArtifactSalvageConfig.MaxArtifactStar;
+        ResinPriorityList = config.ResinPriorityList;
+        OriginalResinUseCount = config.OriginalResinUseCount;
+        CondensedResinUseCount = config.CondensedResinUseCount;
+        TransientResinUseCount = config.TransientResinUseCount;
+        FragileResinUseCount = config.FragileResinUseCount;
+        SpecifyResinUse = config.SpecifyResinUse;
     }
 }
diff --git a/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.cs b/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.cs
@@ -71,6 +71,8 @@ public class AutoDomainTask : ISoloTask
     private readonly string matchingChallengeString;
     private readonly string rapidformationString;
 
+    private List<ResinUseRecord> _resinPriorityListWhenSpecifyUse;
+
     public AutoDomainTask(AutoDomainParam taskParam)
     {
         AutoFightAssets.DestroyInstance();
@@ -81,6 +83,8 @@ public AutoDomainTask(AutoDomainParam taskParam)
 
         _combatScriptBag = CombatScriptParser.ReadAndParse(_taskParam.CombatStrategyPath);
 
+        _resinPriorityListWhenSpecifyUse = ResinUseRecord.BuildFromDomainParam(taskParam);
+
         IStringLocalizer<AutoDomainTask> stringLocalizer =
             App.GetService<IStringLocalizer<AutoDomainTask>>() ?? throw new NullReferenceException();
         CultureInfo cultureInfo = new CultureInfo(TaskContext.Instance().Config.OtherConfig.GameCultureInfoName);
@@ -184,17 +188,9 @@ private async Task DoDomain()
 
             // 5. 快速领取奖励并判断是否有下一轮
             Logger.LogInformation("自动秘境：{Text}", "5. 领取奖励");
-            if (!await GettingTreasure(i == _taskParam.DomainRoundNum - 1))
+            if (!await GettingTreasure())
             {
-                if (i == _taskParam.DomainRoundNum - 1)
-                {
-                    Logger.LogInformation("配置的{Cnt}轮秘境已经完成，结束自动秘境", _taskParam.DomainRoundNum);
-                }
-                else
-                {
-                    Logger.LogInformation("体力已经耗尽，结束自动秘境");
-                }
-
+                Logger.LogInformation("体力耗尽或者设置轮次已达标，结束自动秘境");
                 break;
             }
 
@@ -1011,14 +1007,13 @@ private Task LockCameraToEastTask(CancellationTokenSource cts, Task moveAvatarTa
     /// <summary>
     /// 领取奖励
     /// </summary>
-    /// <param name="isLastTurn">是否最后一轮</param>
-    private async Task<bool> GettingTreasure(bool isLastTurn)
+    private async Task<bool> GettingTreasure()
     {
+        bool isLastTurn = false;
         // 等待窗口弹出
         await Delay(300, _ct);
 
-        // OCR 弹出框
-        var noOriginalResin = false;
+        // 1. OCR 直到确认弹出框弹出
         bool chooseResinPrompt = await NewRetry.WaitForAction(() =>
         {
             using var ra = CaptureToRectArea();
@@ -1028,48 +1023,77 @@ private async Task<bool> GettingTreasure(bool isLastTurn)
             {
                 // 解决水龙王按下左键后没松开，然后后续点击按下就没反应了，界面上点一下
                 // res.Click();
-                noOriginalResin = regionList.Any(t => t.Text.Contains("数量不足") || t.Text.Contains("补充原粹树脂"));
                 return true;
             }
             return false;
         }, _ct, 10, 500);
         Debug.WriteLine("识别到选择树脂页");
         await Delay(800, _ct);
         
-        if (noOriginalResin)
+        // 再 OCR 一次，弹出框，确认当前是否有原粹树脂
+        using var ra2 = CaptureToRectArea();
+        var textListInPrompt = ra2.FindMulti(RecognitionObject.Ocr(ra2.Width * 0.25, ra2.Height * 0.2, ra2.Width * 0.5, ra2.Height * 0.6));
+        if (textListInPrompt.Any(t => t.Text.Contains("数量不足") || t.Text.Contains("补充")))
         {
             // 没有原粹树脂，直接退出秘境
             Logger.LogInformation("自动秘境：原粹树脂已用尽，退出秘境");
-            Simulation.SendInput.Keyboard.KeyPress(VK.VK_ESCAPE);
-            await Delay(500, _ct);
-            Simulation.SendInput.Keyboard.KeyPress(VK.VK_ESCAPE);
-            await Delay(800, _ct);
-            Bv.ClickBlackConfirmButton(CaptureToRectArea());
+            await ExitDomain();
             return false;
         }
 
-        // 如果没有选择树脂的提示，说明只有原粹树脂
-        ResinStatus? resinStatus = null;
         if (chooseResinPrompt)
         {
+            using var ra3 = CaptureToRectArea();
 
-            // 弹出框
-            using var ra2 = CaptureToRectArea();
-            // 识别树脂状况
-            resinStatus = ResinStatus.RecogniseFromRegion(ra2);
-            resinStatus.Print(Logger);
-
-            if (resinStatus.CondensedResinCount > 0)
+            if (!_taskParam.SpecifyResinUse)
             {
-                PressUseResin(ra2, "浓缩树脂");
-                resinStatus.CondensedResinCount -= 1;
+                // 识别树脂状况
+                var resinStatus = ResinStatus.RecogniseFromRegion(ra3);
+                resinStatus.Print(Logger);
+
+                if (resinStatus.CondensedResinCount > 0)
+                {
+                    PressUseResin(ra3, "浓缩树脂");
+                    resinStatus.CondensedResinCount -= 1;
+                }
+                else if (resinStatus.OriginalResinCount >= 20)
+                {
+                    PressUseResin(ra3, "原粹树脂");
+                    resinStatus.OriginalResinCount -= 20;
+                }
+
+                if (resinStatus is { CondensedResinCount: <= 0, OriginalResinCount: < 20 })
+                {
+                    // 没树脂了就是最后一回合了
+                    isLastTurn = true;
+                }
             }
-            else if (resinStatus.OriginalResinCount >= 20)
+            else
             {
-                PressUseResin(ra2, "原粹树脂");
-                resinStatus.OriginalResinCount -= 20;
+                var textListInPrompt2 = ra3.FindMulti(RecognitionObject.Ocr(ra3.Width * 0.25, ra3.Height * 0.2, ra3.Width * 0.5, ra3.Height * 0.6));
+                // 按优先级使用
+                foreach (var record in _resinPriorityListWhenSpecifyUse)
+                {
+                    if (record.RemainCount > 0 && PressUseResin(textListInPrompt2, record.Name))
+                    {
+                        record.RemainCount -= 1;
+                        Logger.LogInformation("自动秘境：{Name} 刷取 {Re}/{Max}", record.Name, record.MaxCount - record.RemainCount, record.MaxCount);
+                        break;
+                    }
+                }
+
+                if (_resinPriorityListWhenSpecifyUse.Sum(o => o.RemainCount) <= 0)
+                {
+                    // 全部刷完
+                    isLastTurn = true;
+                }
             }
         }
+        else
+        {
+            // 如果没有选择树脂的提示，说明只有原粹树脂
+            // 继续向下执行
+        }
 
         Sleep(1000, _ct);
 
@@ -1090,30 +1114,15 @@ private async Task<bool> GettingTreasure(bool isLastTurn)
                         return false;
                     }
                 }
-
-                if (resinStatus != null)
+                else
                 {
-                    // 前面识别了体力的时候
-                    if (resinStatus.CondensedResinCount <= 0 && resinStatus.OriginalResinCount < 20)
-                    {
-                        // 没有体力了退出
-                        var exitRectArea = ra.Find(AutoFightAssets.Instance.ExitRa);
-                        if (!exitRectArea.IsEmpty())
-                        {
-                            exitRectArea.Click();
-                            return false;
-                        }
-                    }
-                    else
+                    if (!chooseResinPrompt)
                     {
-                        // 有体力继续
-                        confirmRectArea.Click();
-                        return true;
+                        // TODO 前面没有弹框的情况下，意味着只有原粹树脂，要再识别一次右上角确认树脂余量，没有余量直接退出
                     }
-                }
-                else
-                {
-                    // 前面没有弹框的情况下，意味着只有原粹树脂，要再识别一次右上角确认树脂余量
+                    // 有体力继续
+                    confirmRectArea.Click();
+                    return true;
                 }
             }
 
@@ -1123,9 +1132,23 @@ private async Task<bool> GettingTreasure(bool isLastTurn)
         throw new NormalEndException("未检测到秘境结束，可能是背包物品已满。");
     }
 
+    private async Task ExitDomain()
+    {
+        Simulation.SendInput.Keyboard.KeyPress(VK.VK_ESCAPE);
+        await Delay(500, _ct);
+        Simulation.SendInput.Keyboard.KeyPress(VK.VK_ESCAPE);
+        await Delay(800, _ct);
+        Bv.ClickBlackConfirmButton(CaptureToRectArea());
+    }
+
     private bool PressUseResin(ImageRegion ra, string resinName)
     {
         var regionList = ra.FindMulti(RecognitionObject.Ocr(ra.Width * 0.25, ra.Height * 0.2, ra.Width * 0.5, ra.Height * 0.6));
+        return PressUseResin(regionList, resinName);
+    }
+
+    private bool PressUseResin(List<Region> regionList, string resinName)
+    {
         var resinKey = regionList.FirstOrDefault(t => t.Text.Contains(resinName));
         if (resinKey != null)
         {
@@ -1134,7 +1157,8 @@ private bool PressUseResin(ImageRegion ra, string resinName)
             if (useList.Count != 0)
             {
                 // 找到使用按键
-                var useKey = useList.FirstOrDefault(t => t.X > ra.Width / 2 && IsHeightOverlap(t, resinKey));
+                var useKey = useList.FirstOrDefault(t => t.X > TaskContext.Instance().SystemInfo.CaptureAreaRect.Width / 2
+                                                         && IsHeightOverlap(t, resinKey));
                 if (useKey != null)
                 {
                     // 点击使用
diff --git a/BetterGenshinImpact/GameTask/AutoDomain/Model/ResinUseRecord.cs b/BetterGenshinImpact/GameTask/AutoDomain/Model/ResinUseRecord.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+
+namespace BetterGenshinImpact.GameTask.AutoDomain.Model;
+
+/// <summary>
+/// 树脂使用记录
+/// 用于自动秘境指定树脂刷取次数时候，计算剩余刷取次数
+/// </summary>
+public class ResinUseRecord
+{
+    public string Name { get; set; }
+    
+    public int RemainCount { get; set; }
+    
+    public int MaxCount { get; set; }
+
+    public ResinUseRecord(string name, int maxCount)
+    {
+        Name = name;
+        RemainCount = maxCount;
+        MaxCount = maxCount;
+    }
+
+    public static List<ResinUseRecord> BuildFromDomainParam(AutoDomainParam taskParam)
+    {
+        List<ResinUseRecord> list = [];
+        if (taskParam.SpecifyResinUse)
+        {
+            if (taskParam.CondensedResinUseCount > 0)
+            {
+                list.Add(new ResinUseRecord("浓缩树脂", taskParam.CondensedResinUseCount));
+            }
+            if (taskParam.OriginalResinUseCount > 0)
+            {
+                list.Add(new ResinUseRecord("原粹树脂", taskParam.OriginalResinUseCount));
+            }
+            if (taskParam.TransientResinUseCount > 0)
+            {
+                list.Add(new ResinUseRecord("须臾树脂", taskParam.TransientResinUseCount));
+            }
+            if (taskParam.FragileResinUseCount > 0)
+            {
+                list.Add(new ResinUseRecord("脆弱树脂", taskParam.FragileResinUseCount));
+            }
+
+            if (list.Count == 0)
+            {
+                throw new Exception("你选择了指定树脂刷取次数，请至少配置一种树脂的刷取次数！");
+            }
+        }
+
+        return list;
+    }
+}
diff --git a/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml b/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml
@@ -335,11 +335,16 @@
 
 
                     <!--  自动秘境  -->
-                    <TextBlock Margin="4,0,0,4"
-                               FontSize="14"
-                               Foreground="{DynamicResource SystemAccentColorPrimaryBrush}"
-                               Text="自动秘境" />
-
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="4,0,0,4">
+                        <TextBlock FontSize="14"
+                                   Foreground="{DynamicResource SystemAccentColorPrimaryBrush}"
+                                   Text="自动秘境" />
+                        <TextBlock Margin="4,0,0,0"
+                                   VerticalAlignment="Center"
+                                   FontSize="11"
+                                   Text="（此处未覆盖的配置可在 独立任务-自动秘境 中配置）" />
+                    </StackPanel>
+ 
 
                     <ui:CardExpander Margin="0,0,0,12" ContentPadding="0">
                         <ui:CardExpander.Icon>
diff --git a/BetterGenshinImpact/View/Pages/TaskSettingsPage.xaml b/BetterGenshinImpact/View/Pages/TaskSettingsPage.xaml
diff --git a/BetterGenshinImpact/ViewModel/Pages/TaskSettingsPageViewModel.cs b/BetterGenshinImpact/ViewModel/Pages/TaskSettingsPageViewModel.cs
