Merge branch 'main' into d-v3

# Conflicts:
#	BetterGenshinImpact/App.xaml.cs
This commit is contained in:
辉鸭蛋
2026-04-06 21:34:59 +08:00
161 changed files with 7102 additions and 3258 deletions

View File

@@ -12,6 +12,7 @@ using BetterGenshinImpact.Model;
using BetterGenshinImpact.Service.Interface;
using BetterGenshinImpact.View.Controls.Webview;
using BetterGenshinImpact.View.Pages.View;
using BetterGenshinImpact.View.Behavior;
using BetterGenshinImpact.View.Windows;
using BetterGenshinImpact.View.Windows.Editable;
using BetterGenshinImpact.ViewModel.Pages.View;
@@ -884,7 +885,15 @@ public partial class ScriptControlViewModel : ViewModel
var stackPanel = await CreatePathingScriptSelectionPanelAsync(root.Children);
// 显示选择对话框
var result = PromptDialog.Prompt("请选择需要添加的地图追踪任务", "请选择需要添加的地图追踪任务", stackPanel, new Size(600, 720));
var result = PromptDialog.Prompt(
"请选择需要添加的地图追踪任务",
"请选择需要添加的地图追踪任务",
stackPanel,
new Size(600, 720),
new PromptDialogConfig
{
DisableAutoTranslate = true
});
if (!string.IsNullOrEmpty(result))
{
@@ -1666,6 +1675,7 @@ public partial class ScriptControlViewModel : ViewModel
Owner = Application.Current.MainWindow,
WindowStartupLocation = WindowStartupLocation.CenterOwner,
};
AutoTranslateInterceptor.SetEnableAutoTranslate(uiMessageBox, false);
uiMessageBox.ShowDialogAsync();
// 由于 JsScriptSettingsObject 的存在,这里只能手动再次保存配置
@@ -1937,7 +1947,7 @@ public partial class ScriptControlViewModel : ViewModel
[RelayCommand]
public void OnGoToScriptGroupUrl()
{
Process.Start(new ProcessStartInfo("https://bettergi.com/feats/autos/dispatcher.html") { UseShellExecute = true });
Process.Start(new ProcessStartInfo("https://www.bettergi.com/feats/autos/dispatcher.html") { UseShellExecute = true });
}
[RelayCommand]