From 458ec315f0fe91267d970f36c31bfbd0547deedc Mon Sep 17 00:00:00 2001 From: ZouJin Date: Sat, 18 Feb 2023 13:46:08 +1100 Subject: [PATCH] =?UTF-8?q?MOD=E6=94=AF=E6=8C=81+=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=E6=96=87=E5=AD=97=E5=AE=A0=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VPet-Simulator.Windows/Function/Setting.cs | 8 ++++++++ VPet-Simulator.Windows/MainWindow.xaml.cs | 5 +++-- .../WinDesign/winGameSetting.xaml | 11 ++++++++-- .../WinDesign/winGameSetting.xaml.cs | 19 +++++++++++++++++- .../mod/1000_FontPet/icon.png | Bin 0 -> 172182 bytes .../mod/1000_FontPet/info.lps | 4 ++++ .../mod/1000_FontPet/pet/font.lps | 6 ++++++ .../Boring/A_Nomal/无聊开始_000_125.png | Bin 0 -> 197230 bytes .../Boring/B_Nomal/无聊循环_000_1500.png | Bin 0 -> 197573 bytes .../Boring/C_Nomal/无聊结束_000_125.png | Bin 0 -> 81079 bytes .../A_Nomal/向左爬上_000_375.png | Bin 0 -> 77938 bytes .../B_Nomal/从左边爬_000_1000.png | Bin 0 -> 87499 bytes .../A_Nomal/从右爬上_000_325.png | Bin 0 -> 77529 bytes .../B_Nomal/从右边爬_000_1000.png | Bin 0 -> 86118 bytes .../Nomal/从上向左爬_000_1500.png | Bin 0 -> 76709 bytes .../Nomal/从上向右爬_000_1500.png | Bin 0 -> 188354 bytes .../Nomal/爬起向左_000_1500.png | Bin 0 -> 99122 bytes .../Nomal/爬起向右_000_1500.png | Bin 0 -> 98799 bytes .../A_Nomal/爬行趴地向左_000_375.png | Bin 0 -> 97027 bytes .../B_Nomal/爬行向左_000_1500.png | Bin 0 -> 98541 bytes .../C_Nomal/爬行爬起向左_000_375.png | Bin 0 -> 97361 bytes .../A_Nomal/爬行趴地向左_000_375.png | Bin 0 -> 97027 bytes .../B_Nomal/爬行向左_000_1500.png | Bin 0 -> 98541 bytes .../C_Nomal/爬行爬起向左_000_375.png | Bin 0 -> 97361 bytes .../font/Default/Nomal/呼吸_000_1500.png | Bin 0 -> 236346 bytes .../A_Nomal/下落向左_000_500.png | Bin 0 -> 99060 bytes .../B_Nomal/下落向左循环_000_750.png | Bin 0 -> 100450 bytes .../C_Nomal/下落落地,向左_000_500.png | Bin 0 -> 99374 bytes .../A_Nomal/开始下落,向右_000_500.png | Bin 0 -> 99106 bytes .../B_Nomal/向右下落循环_000_750.png | Bin 0 -> 100476 bytes .../C_Nomal/落地,向右_000_500.png | Bin 0 -> 99311 bytes .../StateONE/A_Nomal/往地上坐_000_500.png | Bin 0 -> 116421 bytes .../坐地上眨眼循环_000_2000.png | Bin 0 -> 117846 bytes .../C_Nomal/从坐着起身_000_500.png | Bin 0 -> 116553 bytes .../坐着的时候躺下待机_000_500.png | Bin 0 -> 122453 bytes .../B_Nomal/躺着循环_000_2000.png | Bin 0 -> 117221 bytes .../C_Nomal/躺着的时候起身_000_500.png | Bin 0 -> 117228 bytes .../Raised_Dynamic/Nomal/摇晃_001_500.png | Bin 0 -> 123136 bytes .../A_Nomal/被提起来_000_500.png | Bin 0 -> 201277 bytes .../Raised_Static/B_Nomal/眨眼_000_500.png | Bin 0 -> 205188 bytes .../Say/A_Nomal/说话前抱胸_000_500.png | Bin 0 -> 217519 bytes .../B_Nomal/说话啊吧啊吧_000_500.png | Bin 0 -> 190110 bytes .../font/Say/C_Nomal/放下抱胸_000_500.png | Bin 0 -> 189230 bytes .../pet/font/Sleep/A_Nomal/躺下_000_500.png | Bin 0 -> 160528 bytes .../Sleep/B_Nomal/睡觉循环_000_2000.png | Bin 0 -> 86271 bytes .../pet/font/Sleep/C_Nomal/起床_000_500.png | Bin 0 -> 152197 bytes .../pet/font/Squat/A_Nomal/蹲下_000_500.png | Bin 0 -> 85506 bytes .../下蹲向左眨眼循环1_000_1500.png | Bin 0 -> 86655 bytes .../pet/font/Squat/C_Nomal/下蹲_0_500.png | Bin 0 -> 173913 bytes .../font/Touch_Head/A_Nomal/摸头_0_500.png | Bin 0 -> 94202 bytes .../Touch_Head/B_Nomal/摸头_000_1500.png | Bin 0 -> 95334 bytes .../font/Touch_Head/C_Nomal/摸头_0_500.png | Bin 0 -> 94519 bytes .../A_Nomal/走路向左_000_500.png | Bin 0 -> 76015 bytes .../B_Nomal/走路向左_000_500.png | Bin 0 -> 77130 bytes .../C_Nomal/走路向左_000_500.png | Bin 0 -> 174251 bytes .../A_Nomal/走路向右_000_500.png | Bin 0 -> 206296 bytes .../B_Nomal/走路向右_000_500.png | Bin 0 -> 155716 bytes .../C_Nomal/走路向右_000_500.png | Bin 0 -> 168312 bytes .../mod/1000_MatchPet/icon.png | Bin 468294 -> 0 bytes .../mod/1000_MatchPet/info.lps | 2 -- .../mod/1000_MatchPet/pet/matchmen.lps | 6 ------ .../mod/1000_MatchPet/pet/vup.lps | 6 ------ VPet-Simulator.Windows/mod/icon.png | Bin 0 -> 172182 bytes 63 files changed, 48 insertions(+), 19 deletions(-) create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/icon.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/info.lps create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font.lps create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Boring/A_Nomal/无聊开始_000_125.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Boring/B_Nomal/无聊循环_000_1500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Boring/C_Nomal/无聊结束_000_125.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Climb_Left/A_Nomal/向左爬上_000_375.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Climb_Left/B_Nomal/从左边爬_000_1000.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Climb_Right/A_Nomal/从右爬上_000_325.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Climb_Right/B_Nomal/从右边爬_000_1000.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Climb_Top_Left/Nomal/从上向左爬_000_1500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Climb_Top_Right/Nomal/从上向右爬_000_1500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Climb_Up_Left/Nomal/爬起向左_000_1500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Climb_Up_Right/Nomal/爬起向右_000_1500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Crawl_Left/A_Nomal/爬行趴地向左_000_375.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Crawl_Left/B_Nomal/爬行向左_000_1500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Crawl_Left/C_Nomal/爬行爬起向左_000_375.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Crawl_Right/A_Nomal/爬行趴地向左_000_375.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Crawl_Right/B_Nomal/爬行向左_000_1500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Crawl_Right/C_Nomal/爬行爬起向左_000_375.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Default/Nomal/呼吸_000_1500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Fall_Left/A_Nomal/下落向左_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Fall_Left/B_Nomal/下落向左循环_000_750.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Fall_Left/C_Nomal/下落落地,向左_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Fall_Right/A_Nomal/开始下落,向右_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Fall_Right/B_Nomal/向右下落循环_000_750.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Fall_Right/C_Nomal/落地,向右_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Idel/StateONE/A_Nomal/往地上坐_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Idel/StateONE/B_Nomal/坐地上眨眼循环_000_2000.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Idel/StateONE/C_Nomal/从坐着起身_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Idel/StateTWO/A_Nomal/坐着的时候躺下待机_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Idel/StateTWO/B_Nomal/躺着循环_000_2000.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Idel/StateTWO/C_Nomal/躺着的时候起身_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Raised_Dynamic/Nomal/摇晃_001_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Raised_Static/A_Nomal/被提起来_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Raised_Static/B_Nomal/眨眼_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Say/A_Nomal/说话前抱胸_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Say/B_Nomal/说话啊吧啊吧_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Say/C_Nomal/放下抱胸_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Sleep/A_Nomal/躺下_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Sleep/B_Nomal/睡觉循环_000_2000.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Sleep/C_Nomal/起床_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Squat/A_Nomal/蹲下_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Squat/B_Nomal/下蹲向左眨眼循环1_000_1500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Squat/C_Nomal/下蹲_0_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Touch_Head/A_Nomal/摸头_0_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Touch_Head/B_Nomal/摸头_000_1500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Touch_Head/C_Nomal/摸头_0_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Walk_Left/A_Nomal/走路向左_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Walk_Left/B_Nomal/走路向左_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Walk_Left/C_Nomal/走路向左_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Walk_Right/A_Nomal/走路向右_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Walk_Right/B_Nomal/走路向右_000_500.png create mode 100644 VPet-Simulator.Windows/mod/1000_FontPet/pet/font/Walk_Right/C_Nomal/走路向右_000_500.png delete mode 100644 VPet-Simulator.Windows/mod/1000_MatchPet/icon.png delete mode 100644 VPet-Simulator.Windows/mod/1000_MatchPet/info.lps delete mode 100644 VPet-Simulator.Windows/mod/1000_MatchPet/pet/matchmen.lps delete mode 100644 VPet-Simulator.Windows/mod/1000_MatchPet/pet/vup.lps create mode 100644 VPet-Simulator.Windows/mod/icon.png 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" /> +