diff --git a/BetterGenshinImpact/Core/Config/OneDragonFlowConfig.cs b/BetterGenshinImpact/Core/Config/OneDragonFlowConfig.cs index db09a4c9..620b03db 100644 --- a/BetterGenshinImpact/Core/Config/OneDragonFlowConfig.cs +++ b/BetterGenshinImpact/Core/Config/OneDragonFlowConfig.cs @@ -34,6 +34,11 @@ public partial class OneDragonFlowConfig : ObservableObject [ObservableProperty] private bool _weeklyDomainEnabled = false; + + // 领取每日奖励的好感队伍名称 + [ObservableProperty] + private string _dailyRewardPartyName = string.Empty; + #region 每周秘境配置 diff --git a/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs b/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs index 8885efcd..5b339c75 100644 --- a/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs +++ b/BetterGenshinImpact/Core/Script/ScriptRepoUpdater.cs @@ -451,7 +451,7 @@ public class ScriptRepoUpdater : Singleton { _webWindow = new WebpageWindow { - Title = "enshin Copilot Scripts | BetterGI 脚本本地中央仓库", + Title = "Genshin Copilot Scripts | BetterGI 脚本本地中央仓库", Width = 1366, Height = 768, }; diff --git a/BetterGenshinImpact/GameTask/Common/Job/GoToAdventurersGuildTask.cs b/BetterGenshinImpact/GameTask/Common/Job/GoToAdventurersGuildTask.cs index caa03fd8..7c064cf5 100644 --- a/BetterGenshinImpact/GameTask/Common/Job/GoToAdventurersGuildTask.cs +++ b/BetterGenshinImpact/GameTask/Common/Job/GoToAdventurersGuildTask.cs @@ -24,13 +24,19 @@ public class GoToAdventurersGuildTask private readonly ChooseTalkOptionTask _chooseTalkOptionTask = new(); - public async Task Start(string country, CancellationToken ct) + public async Task Start(string country, CancellationToken ct, string? dailyRewardPartyName = null) { Logger.LogInformation("→ {Name} 开始", Name); for (int i = 0; i < _retryTimes; i++) { try { + // 如果有好感队伍名称,先切换到好感队伍 + if (!string.IsNullOrEmpty(dailyRewardPartyName)) + { + await new SwitchPartyTask().Start(dailyRewardPartyName, ct); + } + await DoOnce(country, ct); break; } diff --git a/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml b/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml index db9d69ab..1fa53de7 100644 --- a/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml +++ b/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml @@ -504,6 +504,37 @@ SelectedItem="{Binding SelectedConfig.AdventurersGuildCountry, Mode=TwoWay}" ItemsSource="{Binding AdventurersGuildCountry}" /> + + + + + + + + + + + + + + + + + diff --git a/BetterGenshinImpact/View/Pages/TaskSettingsPage.xaml b/BetterGenshinImpact/View/Pages/TaskSettingsPage.xaml index 5d4b5d00..056568c6 100644 --- a/BetterGenshinImpact/View/Pages/TaskSettingsPage.xaml +++ b/BetterGenshinImpact/View/Pages/TaskSettingsPage.xaml @@ -117,8 +117,8 @@ Grid.Column="1" Margin="0,0,12,0" Content="脚本仓库" - Command="{Binding OpenLocalScriptRepoCommand}" - Icon="{ui:SymbolIcon Archive24}"/> + Command="{Binding OpenLocalScriptRepoCommand}" + Icon="{ui:SymbolIcon Archive24}" /> + Command="{Binding OpenLocalScriptRepoCommand}" + Icon="{ui:SymbolIcon Archive24}" /> - - - - - - - - - - - - - + + + - - @@ -493,49 +466,49 @@ - - - - - - - - - - - - + + + + + + + + + + - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -565,92 +538,94 @@ Text="{Binding Config.AutoFightConfig.FinishDetectConfig.FastCheckParams, Mode=TwoWay}" TextWrapping="Wrap" /> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + @@ -668,7 +643,7 @@ + Grid.Column="0" + FontTypography="Body" + Text="战斗超时(秒)" + TextWrapping="Wrap" /> + Grid.Column="0" + Foreground="{ui:ThemeResource TextFillColorTertiaryBrush}" + Text="当战斗超过一定时间后,自动停止战斗" + TextWrapping="Wrap" /> + Grid.RowSpan="2" + Grid.Column="1" + Margin="0,0,36,0" + MinWidth="120" + Text="{Binding Config.AutoFightConfig.Timeout}" /> + + + + + + + + + + + + + - @@ -799,8 +802,8 @@ Grid.Column="1" Margin="0,0,12,0" Content="脚本仓库" - Command="{Binding OpenLocalScriptRepoCommand}" - Icon="{ui:SymbolIcon Archive24}"/> + Command="{Binding OpenLocalScriptRepoCommand}" + Icon="{ui:SymbolIcon Archive24}" />