Fun/better-genshin-impact
1
0
Fork 0
mirror of https://github.com/babalae/better-genshin-impact.git synced 2026-03-15 07:43:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改二次拾取，使万叶能再次拾取。 (#2760)

Browse Source
This commit is contained in:
this-Fish
2026-02-13 22:24:27 +08:00
committed by GitHub
parent 908294e2fe
commit 0d466e5022
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs
View File

@@ -607,7 +607,12 @@ public class AutoFightTask : ISoloTask
if (picker.Name == "枫原万叶")
{
var time = TimeSpan.FromSeconds(picker.GetSkillCdSeconds());
if (!(lastFightName == picker.Name && time.TotalSeconds > 3))
// 如果配置了二次拾取，或者不满足跳过条件（上次是万叶且冷却时间>3秒），则执行拾取
bool shouldSkip = lastFightName == picker.Name && time.TotalSeconds > 3;
bool forcePickup = _taskParam.QinDoublePickUp;
if (forcePickup || !shouldSkip)
{
Logger.LogInformation("使用 枫原万叶-长E 拾取掉落物");
await Delay(200, ct);

4
BetterGenshinImpact/View/Pages/TaskSettingsPage.xaml
View File

@@ -1067,7 +1067,7 @@
FontSize="10"
FontTypography="Body"
VerticalAlignment="Bottom"
Text="(琴二次拾取：首次拾取空,再次拾取)"
Text="(二次拾取：琴首次拾取空,再次拾取。万叶即使刚使用过技能，也会强制再次拾取。)"
TextWrapping="Wrap" />
<ui:TextBlock Grid.Row="1"
@@ -1096,7 +1096,7 @@
Foreground="{ui:ThemeResource TextFillColorTertiaryBrush}"
Margin="0,0,38,26"
FontTypography="Body"
Text="琴二次拾取"
Text="二次拾取"
TextWrapping="Wrap" />
</Grid>
<Separator Margin="-18,0"

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

@@ -1450,7 +1450,7 @@
FontSize="10"
FontTypography="Body"
VerticalAlignment="Bottom"
Text="(琴二次拾取：首次拾取空,再次拾取)"
Text="(二次拾取：琴首次拾取空,再次拾取。即使万叶刚使用过技能，也会强制再次拾取。)"
TextWrapping="Wrap" />
<ui:TextBlock Grid.Row="1"
@@ -1479,7 +1479,7 @@
Foreground="{ui:ThemeResource TextFillColorTertiaryBrush}"
Margin="0,0,38,26"
FontTypography="Body"
Text="琴二次拾取"
Text="二次拾取"
TextWrapping="Wrap" />
</Grid>
<Grid Margin="16">