diff --git a/VPet-Simulator.Windows/Function/Setting.cs b/VPet-Simulator.Windows/Function/Setting.cs index 8ebe875..de23e79 100644 --- a/VPet-Simulator.Windows/Function/Setting.cs +++ b/VPet-Simulator.Windows/Function/Setting.cs @@ -267,5 +267,13 @@ namespace VPet_Simulator.Windows get => !this["gameconfig"].GetBool("startbootsteam"); set => this["gameconfig"].SetBool("startbootsteam", !value); } + /// + /// 桌宠选择内容 + /// + public string PetGraph + { + get => this["gameconfig"].GetString("petgraph", "默认虚拟桌宠"); + set => this["gameconfig"].SetString("petgraph", value); + } } } diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs index 5cdaeb5..519830f 100644 --- a/VPet-Simulator.Windows/MainWindow.xaml.cs +++ b/VPet-Simulator.Windows/MainWindow.xaml.cs @@ -157,7 +157,8 @@ namespace VPet_Simulator.Windows Dispatcher.Invoke(new Action(() => { LoadingText.Content = "尝试加载动画和生成缓存"; - Core.Graph = Pets[0].Graph(); + var pl = Pets.Find(x => x.Name == Set.PetGraph); + Core.Graph = pl == null ? Pets[0].Graph() : pl.Graph(); LoadingText.Content = "正在加载游戏"; winSetting = new winGameSetting(this); Main = new Main(Core) { }; @@ -224,7 +225,7 @@ namespace VPet_Simulator.Windows { Set["SingleTips"].SetDateTime("update", DateTime.Now); notifyIcon.ShowBalloonTip(10, "更新通知 02/17", - "现在使用缓存机制,不仅占用小,而且再也不会有那种闪闪的问题了!\n现已支持开机启动功能,前往设置设置开机启动", ToolTipIcon.Info); + "现在使用缓存机制,不仅占用小,而且再也不会有那种闪闪的问题了!\n现已支持开机启动功能,前往设置设置开机启动", ToolTipIcon.Info); } })); } diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml index 6ac4302..6fac83f 100644 --- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml +++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml @@ -39,7 +39,8 @@ - + + + + Style="{DynamicResource StandardComboBoxStyle}" Margin="0,3,0,2" SelectionChanged="PetBox_SelectionChanged" /> +