Fun/better-genshin-impact
1
0
Fork 0
mirror of https://github.com/babalae/better-genshin-impact.git synced 2026-05-21 09:45:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1240 from physligl/main

Browse Source 
feat: add _autoPickEnabled to script group
This commit is contained in:
辉鸭蛋
2025-03-05 09:55:42 +08:00
committed by GitHub
parent 4e44bb0e78 6f6ddf129b
commit 612474e367
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BetterGenshinImpact/Core/Config/PathingPartyConfig.cs
View File

@@ -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;

9
BetterGenshinImpact/Core/Script/Group/ScriptGroupProject.cs
View File

@@ -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)

25
BetterGenshinImpact/View/Pages/View/ScriptGroupConfigView.xaml
View File

@@ -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" />