From 6f6ddf129bac6b71e969d48fee72583c90893fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E4=BA=91?= <physligl@gmail.com>
Date: Wed, 5 Mar 2025 05:34:28 +0800
Subject: [PATCH] feat: add _autoPickEnabled to script group

---
 .../Core/Config/PathingPartyConfig.cs         |  5 +++-
 .../Core/Script/Group/ScriptGroupProject.cs   |  9 +++----
 .../Pages/View/ScriptGroupConfigView.xaml     | 25 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/BetterGenshinImpact/Core/Config/PathingPartyConfig.cs b/BetterGenshinImpact/Core/Config/PathingPartyConfig.cs
index f30a3e86..c62e84fd 100644
--- a/BetterGenshinImpact/Core/Config/PathingPartyConfig.cs
+++ b/BetterGenshinImpact/Core/Config/PathingPartyConfig.cs
@@ -13,7 +13,10 @@ public partial class PathingPartyConfig : ObservableObject
     // 配置是否启用，不启用会使用路径追踪内的条件配置
     [ObservableProperty]
     private bool _enabled = false;
-
+    
+    // 是否启用自动拾取
+    [ObservableProperty]
+    private bool _autoPickEnabled = true;
     // 切换到队伍的名称
     [ObservableProperty]
     private string _partyName = string.Empty;
diff --git a/BetterGenshinImpact/Core/Script/Group/ScriptGroupProject.cs b/BetterGenshinImpact/Core/Script/Group/ScriptGroupProject.cs
index 9fd0d7ad..a9a3168e 100644
--- a/BetterGenshinImpact/Core/Script/Group/ScriptGroupProject.cs
+++ b/BetterGenshinImpact/Core/Script/Group/ScriptGroupProject.cs
@@ -157,15 +157,14 @@ public partial class ScriptGroupProject : ObservableObject
         {
             // 加载并执行
             var task = PathingTask.BuildFromFilePath(Path.Combine(MapPathingViewModel.PathJsonPath, FolderName, Name));
-            TaskTriggerDispatcher.Instance().AddTrigger("AutoPick", null);
             var pathingTask = new PathExecutor(CancellationContext.Instance.Cts.Token);
             pathingTask.PartyConfig = GroupInfo?.Config.PathingConfig;
+            if (pathingTask.PartyConfig is null || pathingTask.PartyConfig.AutoPickEnabled)
+            {
+                TaskTriggerDispatcher.Instance().AddTrigger("AutoPick", null);
+            }
             await pathingTask.Pathing(task);
         }
-        else
-        {
-            //throw new Exception("不支持的脚本类型");
-        }
     }
 
     partial void OnTypeChanged(string value)
diff --git a/BetterGenshinImpact/View/Pages/View/ScriptGroupConfigView.xaml b/BetterGenshinImpact/View/Pages/View/ScriptGroupConfigView.xaml
index 97fceb7a..52b718a9 100644
--- a/BetterGenshinImpact/View/Pages/View/ScriptGroupConfigView.xaml
+++ b/BetterGenshinImpact/View/Pages/View/ScriptGroupConfigView.xaml
@@ -49,7 +49,30 @@
                     </Grid>
                 </ui:CardExpander.Header>
                 <StackPanel>
-
+                    <Grid Margin="16">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ui:TextBlock Grid.Row="0"
+                                      Grid.Column="0"
+                                      FontTypography="Body"
+                                      Text="是否开启自动拾取"
+                                      TextWrapping="Wrap" />
+                        <ui:TextBlock Grid.Row="1"
+                                      Grid.Column="0"
+                                      Foreground="{ui:ThemeResource TextFillColorTertiaryBrush}"
+                                      Text="推荐开启以拾取路线中的掉落物、采集物"
+                                      TextWrapping="Wrap" />
+                        <ui:ToggleSwitch Grid.Row="0"
+                                         Grid.RowSpan="2"
+                                         Grid.Column="1"
+                                         IsChecked="{Binding PathingConfig.AutoPickEnabled}"/>
+                    </Grid>
                     <Grid Margin="16">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />