Merge branch 'main' into d-v3

# Conflicts:
#	BetterGenshinImpact/ViewModel/Pages/ScriptControlViewModel.cs
This commit is contained in:
辉鸭蛋
2025-11-16 00:59:24 +08:00
157 changed files with 8077 additions and 1784 deletions

View File

@@ -120,7 +120,7 @@ public partial class ScriptControlViewModel : ViewModel
private void ClearTasks()
{
// 确认?
var result = MessageBox.Show("是否清空所有任务?", "清空任务", MessageBoxButton.YesNo, MessageBoxImage.Question);
var result = ThemedMessageBox.Question("是否清空所有任务?", "清空任务", MessageBoxButton.YesNo, System.Windows.MessageBoxResult.No);
if (result != System.Windows.MessageBoxResult.Yes)
{
return;
@@ -1559,6 +1559,7 @@ public partial class ScriptControlViewModel : ViewModel
private List<FileInfo> LoadAllKmScripts()
{
var folder = KeyMouseRecordPageViewModel.ScriptPath;
Directory.CreateDirectory(folder);
// 获取所有脚本项目
var files = Directory.GetFiles(folder, "*.*",
SearchOption.AllDirectories);
@@ -2006,13 +2007,17 @@ public partial class ScriptControlViewModel : ViewModel
//
// await uiMessageBox.ShowDialogAsync();
var dialogWindow = new Window
var dialogWindow = new FluentWindow
{
Title = "配置组设置",
Content = new ScriptGroupConfigView(new ScriptGroupConfigViewModel(TaskContext.Instance().Config, SelectedScriptGroup.Config)),
SizeToContent = SizeToContent.WidthAndHeight,
ResizeMode = ResizeMode.NoResize,
WindowStartupLocation = WindowStartupLocation.CenterOwner,
ExtendsContentIntoTitleBar = true,
WindowBackdropType = WindowBackdropType.Auto,
};
dialogWindow.SourceInitialized += (s, e) => WindowHelper.TryApplySystemBackdrop(dialogWindow);
// var dialogWindow = new WpfUiWindow(new ScriptGroupConfigView(SelectedScriptGroup.Config))
// {