From df0ac8ee50d8bbaaaf375e45dc4ff52b6a87d1ce Mon Sep 17 00:00:00 2001 From: Hakoyu Date: Thu, 17 Aug 2023 23:38:28 +0800 Subject: [PATCH] =?UTF-8?q?AddFood=E9=A1=B5=E9=9D=A2=E8=A7=84=E5=88=92?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VPet.Plugin.DemoClock.csproj | 8 +- VPet.Plugin.DemoClock/packages.config | 6 +- .../VPet.Plugin.VPetTTS.csproj | 8 +- VPet.Plugin.EdgeTTS/packages.config | 6 +- VPet.Plugin.ModMaker/App.xaml | 2 +- VPet.Plugin.ModMaker/ModInfo.cs | 21 + VPet.Plugin.ModMaker/ModMaker.cs | 4 +- .../{winModMaker.xaml => ModMakerWindow.xaml} | 17 +- VPet.Plugin.ModMaker/ModMakerWindow.xaml.cs | 42 ++ VPet.Plugin.ModMaker/Utils.cs | 25 ++ .../VPet.Plugin.ModMaker.csproj | 28 +- .../WinModEdit/AddFoodWindow.xaml | 176 +++++++++ .../WinModEdit/AddFoodWindow.xaml.cs | 69 ++++ .../WinModEdit/ModEditWindow.cs | 35 ++ .../WinModEdit/ModEditWindow.xaml | 374 ++++++++++++++++++ .../WinModEdit/ModEditWindow.xaml.cs | 151 +++++++ VPet.Plugin.ModMaker/packages.config | 4 +- VPet.Plugin.ModMaker/winModInfo.xaml | 92 ----- VPet.Plugin.ModMaker/winModInfo.xaml.cs | 27 -- VPet.Plugin.ModMaker/winModMaker.xaml.cs | 30 -- 20 files changed, 937 insertions(+), 188 deletions(-) create mode 100644 VPet.Plugin.ModMaker/ModInfo.cs rename VPet.Plugin.ModMaker/{winModMaker.xaml => ModMakerWindow.xaml} (87%) create mode 100644 VPet.Plugin.ModMaker/ModMakerWindow.xaml.cs create mode 100644 VPet.Plugin.ModMaker/Utils.cs create mode 100644 VPet.Plugin.ModMaker/WinModEdit/AddFoodWindow.xaml create mode 100644 VPet.Plugin.ModMaker/WinModEdit/AddFoodWindow.xaml.cs create mode 100644 VPet.Plugin.ModMaker/WinModEdit/ModEditWindow.cs create mode 100644 VPet.Plugin.ModMaker/WinModEdit/ModEditWindow.xaml create mode 100644 VPet.Plugin.ModMaker/WinModEdit/ModEditWindow.xaml.cs delete mode 100644 VPet.Plugin.ModMaker/winModInfo.xaml delete mode 100644 VPet.Plugin.ModMaker/winModInfo.xaml.cs delete mode 100644 VPet.Plugin.ModMaker/winModMaker.xaml.cs diff --git a/VPet.Plugin.DemoClock/VPet.Plugin.DemoClock.csproj b/VPet.Plugin.DemoClock/VPet.Plugin.DemoClock.csproj index ba7f4bc..9b2c6ef 100644 --- a/VPet.Plugin.DemoClock/VPet.Plugin.DemoClock.csproj +++ b/VPet.Plugin.DemoClock/VPet.Plugin.DemoClock.csproj @@ -41,8 +41,8 @@ ..\packages\Panuon.WPF.1.0.2\lib\net462\Panuon.WPF.dll - - ..\packages\Panuon.WPF.UI.1.1.15.4\lib\net462\Panuon.WPF.UI.dll + + ..\packages\Panuon.WPF.UI.1.1.15.6\lib\net462\Panuon.WPF.UI.dll @@ -56,10 +56,10 @@ 4.0 - ..\packages\VPet-Simulator.Core.0.5.0\lib\net462\VPet-Simulator.Core.dll + ..\packages\VPet-Simulator.Core.1.0.0\lib\net462\VPet-Simulator.Core.dll - ..\packages\VPet-Simulator.Windows.Interface.0.5.0\lib\net462\VPet-Simulator.Windows.Interface.dll + ..\packages\VPet-Simulator.Windows.Interface.1.0.0\lib\net462\VPet-Simulator.Windows.Interface.dll diff --git a/VPet.Plugin.DemoClock/packages.config b/VPet.Plugin.DemoClock/packages.config index d863a17..a3e78cf 100644 --- a/VPet.Plugin.DemoClock/packages.config +++ b/VPet.Plugin.DemoClock/packages.config @@ -3,7 +3,7 @@ - - - + + + \ No newline at end of file diff --git a/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj b/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj index 9d5979c..88e18c3 100644 --- a/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj +++ b/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj @@ -46,8 +46,8 @@ ..\packages\Panuon.WPF.1.0.2\lib\net462\Panuon.WPF.dll - - ..\packages\Panuon.WPF.UI.1.1.15.4\lib\net462\Panuon.WPF.UI.dll + + ..\packages\Panuon.WPF.UI.1.1.15.6\lib\net462\Panuon.WPF.UI.dll @@ -67,10 +67,10 @@ - ..\packages\VPet-Simulator.Core.0.5.0\lib\net462\VPet-Simulator.Core.dll + ..\packages\VPet-Simulator.Core.1.0.0\lib\net462\VPet-Simulator.Core.dll - ..\packages\VPet-Simulator.Windows.Interface.0.5.0\lib\net462\VPet-Simulator.Windows.Interface.dll + ..\packages\VPet-Simulator.Windows.Interface.1.0.0\lib\net462\VPet-Simulator.Windows.Interface.dll diff --git a/VPet.Plugin.EdgeTTS/packages.config b/VPet.Plugin.EdgeTTS/packages.config index 9084d7a..4767a90 100644 --- a/VPet.Plugin.EdgeTTS/packages.config +++ b/VPet.Plugin.EdgeTTS/packages.config @@ -5,9 +5,9 @@ - + - - + + \ No newline at end of file diff --git a/VPet.Plugin.ModMaker/App.xaml b/VPet.Plugin.ModMaker/App.xaml index ac5d3a2..8717b5f 100644 --- a/VPet.Plugin.ModMaker/App.xaml +++ b/VPet.Plugin.ModMaker/App.xaml @@ -2,7 +2,7 @@ x:Class="VPet.Plugin.ModMaker.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - StartupUri="winModMaker.xaml"> + StartupUri="ModMakerWindow.xaml"> diff --git a/VPet.Plugin.ModMaker/ModInfo.cs b/VPet.Plugin.ModMaker/ModInfo.cs new file mode 100644 index 0000000..321c51a --- /dev/null +++ b/VPet.Plugin.ModMaker/ModInfo.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using VPet_Simulator.Windows.Interface; + +namespace VPet.Plugin.ModMaker; + +public class ModInfo +{ + public string Name { get; set; } = string.Empty; + public string Author { get; set; } = string.Empty; + public string GameVersion { get; set; } = string.Empty; + public string ModVersion { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; + + public List Foods { get; set; } = new(); + public List ClickTexts { get; set; } = new(); + public List LowTexts { get; set; } = new(); +} diff --git a/VPet.Plugin.ModMaker/ModMaker.cs b/VPet.Plugin.ModMaker/ModMaker.cs index 3ec3310..877f472 100644 --- a/VPet.Plugin.ModMaker/ModMaker.cs +++ b/VPet.Plugin.ModMaker/ModMaker.cs @@ -36,13 +36,13 @@ namespace VPet.Plugin.ModMaker } public override string PluginName => "ModMaker"; - public WinModMaker Maker; + public ModMakerWindow Maker; public override void Setting() { if (Maker == null) { - Maker = new WinModMaker(); + Maker = new ModMakerWindow(); Maker.ModMaker = this; Maker.Show(); } diff --git a/VPet.Plugin.ModMaker/winModMaker.xaml b/VPet.Plugin.ModMaker/ModMakerWindow.xaml similarity index 87% rename from VPet.Plugin.ModMaker/winModMaker.xaml rename to VPet.Plugin.ModMaker/ModMakerWindow.xaml index 7e546a7..cb0b522 100644 --- a/VPet.Plugin.ModMaker/winModMaker.xaml +++ b/VPet.Plugin.ModMaker/ModMakerWindow.xaml @@ -1,5 +1,5 @@