diff --git a/VPet.ModMaker/App.xaml b/VPet.ModMaker/App.xaml index 038ab02..db655e0 100644 --- a/VPet.ModMaker/App.xaml +++ b/VPet.ModMaker/App.xaml @@ -6,8 +6,10 @@ + + diff --git a/VPet.ModMaker/Models/ClickTextModel.cs b/VPet.ModMaker/Models/ClickTextModel.cs index 0df8ded..b4eeda0 100644 --- a/VPet.ModMaker/Models/ClickTextModel.cs +++ b/VPet.ModMaker/Models/ClickTextModel.cs @@ -2,6 +2,7 @@ using LinePutScript.Converter; using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -11,15 +12,31 @@ namespace VPet.ModMaker.Models; public class ClickTextModel : I18nModel { - public ObservableValue Name { get; } = new(); - public ObservableValue Mode { get; } = new(); + public static ObservableCollection ModeTypes { get; } = + new(Enum.GetValues(typeof(ClickText.ModeType)).Cast()); + public static ObservableCollection DayTimes { get; } = + new(Enum.GetValues(typeof(ClickText.DayTime)).Cast()); + public static ObservableCollection WorkingStates { get; } = + new( + Enum.GetValues(typeof(VPet_Simulator.Core.Main.WorkingState)) + .Cast() + ); + public ObservableValue Name { get; } = new(); public ObservableValue Working { get; } = new(); - public ObservableValue LikeMin { get; } = new(); - public ObservableValue LikeMax { get; } = new(); + public ObservableValue Mode { get; } = new(); public ObservableValue WorkingState { get; } = new(); public ObservableValue DayTime { get; } = new(); + public ObservableRange Like { get; } = new(0, int.MaxValue); + public ObservableRange Health { get; } = new(0, int.MaxValue); + public ObservableRange Level { get; } = new(0, int.MaxValue); + public ObservableRange Money { get; } = new(int.MinValue, int.MaxValue); + public ObservableRange Food { get; } = new(0, int.MaxValue); + public ObservableRange Drink { get; } = new(0, int.MaxValue); + public ObservableRange Feel { get; } = new(0, int.MaxValue); + public ObservableRange Strength { get; } = new(0, int.MaxValue); + public ClickTextModel() { } public ClickTextModel(ClickTextModel clickText) @@ -29,9 +46,15 @@ public class ClickTextModel : I18nModel Mode.Value = clickText.Mode.Value; Working.Value = clickText.Working.Value; WorkingState.Value = clickText.WorkingState.Value; - LikeMax.Value = clickText.LikeMax.Value; - LikeMin.Value = clickText.LikeMin.Value; DayTime.Value = clickText.DayTime.Value; + Like = clickText.Like.Copy(); + Health = clickText.Health.Copy(); + Level = clickText.Level.Copy(); + Money = clickText.Money.Copy(); + Food = clickText.Food.Copy(); + Drink = clickText.Drink.Copy(); + Feel = clickText.Feel.Copy(); + Strength = clickText.Strength.Copy(); foreach (var item in clickText.I18nDatas) { I18nDatas[item.Key] = new(); @@ -48,8 +71,14 @@ public class ClickTextModel : I18nModel Working.Value = clickText.Working; WorkingState.Value = clickText.State; DayTime.Value = clickText.DaiTime; - LikeMax.Value = clickText.LikeMax; - LikeMin.Value = clickText.LikeMin; + Like.SetValue(clickText.LikeMin, clickText.LikeMax); + Health.SetValue(clickText.HealthMin, clickText.HealthMax); + Level.SetValue(clickText.LevelMin, clickText.LevelMax); + Money.SetValue(clickText.MoneyMin, clickText.MoneyMax); + Food.SetValue(clickText.FoodMin, clickText.FoodMax); + Drink.SetValue(clickText.DrinkMin, clickText.DrinkMax); + Feel.SetValue(clickText.FeelMin, clickText.FeelMax); + Strength.SetValue(clickText.StrengthMin, clickText.StrengthMax); } public ClickText ToClickText() @@ -60,9 +89,23 @@ public class ClickTextModel : I18nModel Mode = Mode.Value, Working = Working.Value, State = WorkingState.Value, - LikeMax = LikeMax.Value, - LikeMin = LikeMin.Value, DaiTime = DayTime.Value, + LikeMax = Like.Max.Value, + LikeMin = Like.Min.Value, + HealthMin = Health.Min.Value, + HealthMax = Health.Max.Value, + LevelMin = Level.Min.Value, + LevelMax = Level.Max.Value, + MoneyMin = Money.Min.Value, + MoneyMax = Money.Max.Value, + FoodMin = Food.Min.Value, + FoodMax = Food.Max.Value, + DrinkMin = Drink.Min.Value, + DrinkMax = Drink.Max.Value, + FeelMin = Feel.Min.Value, + FeelMax = Feel.Max.Value, + StrengthMin = Strength.Min.Value, + StrengthMax = Strength.Max.Value, }; } } diff --git a/VPet.ModMaker/Models/FoodModel.cs b/VPet.ModMaker/Models/FoodModel.cs index 2a245fc..8c43081 100644 --- a/VPet.ModMaker/Models/FoodModel.cs +++ b/VPet.ModMaker/Models/FoodModel.cs @@ -1,6 +1,7 @@ using HKW.HKWViewModels.SimpleObservable; using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.IO; using System.Linq; using System.Text; @@ -12,6 +13,9 @@ namespace VPet.ModMaker.Models; public class FoodModel : I18nModel { + public static ObservableCollection FoodTypes { get; } = + new(Enum.GetValues(typeof(Food.FoodType)).Cast()); + public ObservableValue Name { get; } = new(); public ObservableValue Description { get; } = new(); public ObservableValue Type { get; } = new(); diff --git a/VPet.ModMaker/Models/LowTextModel.cs b/VPet.ModMaker/Models/LowTextModel.cs index 7429519..3c39ad0 100644 --- a/VPet.ModMaker/Models/LowTextModel.cs +++ b/VPet.ModMaker/Models/LowTextModel.cs @@ -1,6 +1,7 @@ using HKW.HKWViewModels.SimpleObservable; using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -11,6 +12,13 @@ namespace VPet.ModMaker.Models; public class LowTextModel : I18nModel { + public static ObservableCollection ModeTypes { get; } = + new(Enum.GetValues(typeof(LowText.ModeType)).Cast()); + public static ObservableCollection LikeTypes { get; } = + new(Enum.GetValues(typeof(LowText.LikeType)).Cast()); + public static ObservableCollection StrengthTypes { get; } = + new(Enum.GetValues(typeof(LowText.StrengthType)).Cast()); + public ObservableValue Name { get; } = new(); public ObservableValue Mode { get; } = new(); public ObservableValue Strength { get; } = new(); diff --git a/VPet.ModMaker/Models/ModInfoModel.cs b/VPet.ModMaker/Models/ModInfoModel.cs index 0b94132..a925e10 100644 --- a/VPet.ModMaker/Models/ModInfoModel.cs +++ b/VPet.ModMaker/Models/ModInfoModel.cs @@ -29,6 +29,7 @@ public class ModInfoModel : I18nModel public ObservableCollection Foods { get; } = new(); public ObservableCollection ClickTexts { get; } = new(); public ObservableCollection LowTexts { get; } = new(); + public ObservableCollection SelectTexts { get; } = new(); public ObservableValue SourcePath { get; } = new(); public Dictionary> OtherI18nDatas { get; } = new(); diff --git a/VPet.ModMaker/Models/ModMakerHistory.cs b/VPet.ModMaker/Models/ModMakerHistory.cs index 3319f6f..144713e 100644 --- a/VPet.ModMaker/Models/ModMakerHistory.cs +++ b/VPet.ModMaker/Models/ModMakerHistory.cs @@ -33,6 +33,8 @@ public class ModMakerHistory public string LastTimeString => LastTime.ToString("yyyy/MM/dd HH:mm:ss"); + public string InfoFile => Path.Combine(SourcePath, "info.lps"); + [Line(ignoreCase: true)] public DateTime LastTime { get; set; } } diff --git a/VPet.ModMaker/Models/ObservableRange.cs b/VPet.ModMaker/Models/ObservableRange.cs new file mode 100644 index 0000000..9844d99 --- /dev/null +++ b/VPet.ModMaker/Models/ObservableRange.cs @@ -0,0 +1,39 @@ +using HKW.HKWViewModels.SimpleObservable; + +namespace VPet.ModMaker.Models; + +public class ObservableRange +{ + public ObservableValue Min { get; } = new(); + public ObservableValue Max { get; } = new(); + + public ObservableValue Info { get; } = new(); + + public ObservableRange() + { + Min.ValueChanged += ValueChanged; + Max.ValueChanged += ValueChanged; + } + + private void ValueChanged(T value) + { + Info.Value = $"({Min.Value}, {Max.Value})"; + } + + public ObservableRange(T min, T max) + : this() + { + SetValue(min, max); + } + + public void SetValue(T min, T max) + { + Min.Value = min; + Max.Value = max; + } + + public ObservableRange Copy() + { + return new(Min.Value, Max.Value); + } +} diff --git a/VPet.ModMaker/Models/PetModel.cs b/VPet.ModMaker/Models/PetModel.cs index 377f6b2..0997e4f 100644 --- a/VPet.ModMaker/Models/PetModel.cs +++ b/VPet.ModMaker/Models/PetModel.cs @@ -16,9 +16,6 @@ public class PetModel : I18nModel public ObservableValue TouchHeadRect { get; } = new(new()); public ObservableValue TouchRaisedRect { get; } = new(new()); public ObservableValue RaisePoint { get; } = new(new()); - - public ObservableValue CurrentI18nData { get; } = new(); - public Dictionary I18nDatas { get; } = new(); } public class I18nPetInfoModel diff --git a/VPet.ModMaker/Models/SelectTextModel.cs b/VPet.ModMaker/Models/SelectTextModel.cs new file mode 100644 index 0000000..31b76c3 --- /dev/null +++ b/VPet.ModMaker/Models/SelectTextModel.cs @@ -0,0 +1,26 @@ +using HKW.HKWViewModels.SimpleObservable; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using VPet.ModMaker.Models; + +namespace VPet.ModMaker.Models; + +public class SelectTextModel : ClickTextModel +{ + public ObservableValue Exp { get; } = new(); + public ObservableValue Money { get; } = new(); + public ObservableValue Strength { get; } = new(); + public ObservableValue StrengthFood { get; } = new(); + public ObservableValue StrengthDrink { get; } = new(); + public ObservableValue Feeling { get; } = new(); + public ObservableValue Health { get; } = new(); + public ObservableValue Likability { get; } = new(); + public ObservableValue Tags { get; } = new(); + public ObservableValue ToTags { get; } = new(); + + public SelectTextModel() { } +} diff --git a/VPet.ModMaker/Properties/Resources.Designer.cs b/VPet.ModMaker/Properties/Resources.Designer.cs index 0244ef5..9ac3669 100644 --- a/VPet.ModMaker/Properties/Resources.Designer.cs +++ b/VPet.ModMaker/Properties/Resources.Designer.cs @@ -1,24 +1,25 @@ //------------------------------------------------------------------------------ // // 此代码由工具生成。 -// 运行时版本: 4.0.30319.42000 +// 运行时版本:4.0.30319.42000 // -// 对此文件的更改可能导致不正确的行为,如果 -// 重新生成代码,则所做更改将丢失。 +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 // //------------------------------------------------------------------------------ namespace VPet.ModMaker.Properties { + using System; /// - /// 强类型资源类,用于查找本地化字符串等。 + /// 一个强类型的资源类,用于查找本地化的字符串等。 /// // 此类是由 StronglyTypedResourceBuilder // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen // (以 /str 作为命令选项),或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -32,12 +33,12 @@ namespace VPet.ModMaker.Properties { } /// - /// 返回此类使用的缓存 ResourceManager 实例。 + /// 返回此类使用的缓存的 ResourceManager 实例。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { - if ((resourceMan == null)) { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VPet.ModMaker.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } diff --git a/VPet.ModMaker/Properties/Settings.Designer.cs b/VPet.ModMaker/Properties/Settings.Designer.cs index ef386ca..34e9d17 100644 --- a/VPet.ModMaker/Properties/Settings.Designer.cs +++ b/VPet.ModMaker/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 // //------------------------------------------------------------------------------ -namespace VPet.ModMaker.Properties -{ +namespace VPet.ModMaker.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - public static Settings Default - { - get - { + public static Settings Default { + get { return defaultInstance; } } diff --git a/VPet.ModMaker/Templates.xaml b/VPet.ModMaker/Templates.xaml new file mode 100644 index 0000000..aade582 --- /dev/null +++ b/VPet.ModMaker/Templates.xaml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VPet.ModMaker/VPet.ModMaker.csproj b/VPet.ModMaker/VPet.ModMaker.csproj index 1e9c85b..955df78 100644 --- a/VPet.ModMaker/VPet.ModMaker.csproj +++ b/VPet.ModMaker/VPet.ModMaker.csproj @@ -6,8 +6,8 @@ AnyCPU {8F804A27-A57E-4799-801C-4DE96BA153BC} WinExe - VPet.Plugin.ModMaker - VPet.Plugin.ModMaker + VPet.ModMaker + VPet.ModMaker v4.6.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -99,7 +99,9 @@ + + @@ -159,6 +161,12 @@ PetPage.xaml + + SelectTextPage.xaml + + + SelectTextEditWindow.xaml + ModMakerWindow.xaml @@ -181,6 +189,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -221,6 +233,14 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -242,6 +262,8 @@ false - + + + \ No newline at end of file diff --git a/VPet.ModMaker/ViewModels/ModEdit/ClickTextEdit/ClickTextEditWindowVM.cs b/VPet.ModMaker/ViewModels/ModEdit/ClickTextEdit/ClickTextEditWindowVM.cs index 747eb30..5515aac 100644 --- a/VPet.ModMaker/ViewModels/ModEdit/ClickTextEdit/ClickTextEditWindowVM.cs +++ b/VPet.ModMaker/ViewModels/ModEdit/ClickTextEdit/ClickTextEditWindowVM.cs @@ -16,22 +16,6 @@ public class ClickTextEditWindowVM public ClickTextModel OldClickText { get; set; } public ObservableValue ClickText { get; } = new(new()); - public ObservableCollection ModeTypes { get; } = new(); - public ObservableCollection DayTimes { get; } = new(); - public ObservableCollection WorkingStates { get; } = - new(); #endregion - public ClickTextEditWindowVM() - { - foreach (ClickText.ModeType item in Enum.GetValues(typeof(ClickText.ModeType))) - ModeTypes.Add(item); - foreach (ClickText.DayTime item in Enum.GetValues(typeof(ClickText.DayTime))) - DayTimes.Add(item); - foreach ( - VPet_Simulator.Core.Main.WorkingState item in Enum.GetValues( - typeof(VPet_Simulator.Core.Main.WorkingState) - ) - ) - WorkingStates.Add(item); - } + public ClickTextEditWindowVM() { } } diff --git a/VPet.ModMaker/ViewModels/ModEdit/FoodEdit/FoodEditWindowVM.cs b/VPet.ModMaker/ViewModels/ModEdit/FoodEdit/FoodEditWindowVM.cs index 043094e..ab21b8a 100644 --- a/VPet.ModMaker/ViewModels/ModEdit/FoodEdit/FoodEditWindowVM.cs +++ b/VPet.ModMaker/ViewModels/ModEdit/FoodEdit/FoodEditWindowVM.cs @@ -19,7 +19,6 @@ public class FoodEditWindowVM #region Value public FoodModel OldFood { get; set; } public ObservableValue Food { get; } = new(new()); - public ObservableCollection FoodTypes { get; } = new(); #endregion #region Command @@ -36,13 +35,7 @@ public class FoodEditWindowVM public void Close() { } - private void InitializeFoodTypes() - { - foreach (Food.FoodType foodType in Enum.GetValues(typeof(Food.FoodType))) - { - FoodTypes.Add(foodType); - } - } + private void InitializeFoodTypes() { } private void AddImage() { diff --git a/VPet.ModMaker/ViewModels/ModEdit/LowTextEdit/LowTextEditWindowVM.cs b/VPet.ModMaker/ViewModels/ModEdit/LowTextEdit/LowTextEditWindowVM.cs index 19cf6eb..e3a32b3 100644 --- a/VPet.ModMaker/ViewModels/ModEdit/LowTextEdit/LowTextEditWindowVM.cs +++ b/VPet.ModMaker/ViewModels/ModEdit/LowTextEdit/LowTextEditWindowVM.cs @@ -16,18 +16,7 @@ public class LowTextEditWindowVM public LowTextModel OldLowText { get; set; } public ObservableValue LowText { get; } = new(new()); - public ObservableCollection ModeTypes { get; } = new(); - public ObservableCollection LikeTypes { get; } = new(); - public ObservableCollection StrengthTypes { get; } = new(); #endregion - public LowTextEditWindowVM() - { - foreach (LowText.ModeType mode in Enum.GetValues(typeof(LowText.ModeType))) - ModeTypes.Add(mode); - foreach (LowText.LikeType mode in Enum.GetValues(typeof(LowText.LikeType))) - LikeTypes.Add(mode); - foreach (LowText.StrengthType mode in Enum.GetValues(typeof(LowText.StrengthType))) - StrengthTypes.Add(mode); - } + public LowTextEditWindowVM() { } } diff --git a/VPet.ModMaker/ViewModels/ModEdit/ModEditWindowVM.cs b/VPet.ModMaker/ViewModels/ModEdit/ModEditWindowVM.cs index 44217b9..44a5436 100644 --- a/VPet.ModMaker/ViewModels/ModEdit/ModEditWindowVM.cs +++ b/VPet.ModMaker/ViewModels/ModEdit/ModEditWindowVM.cs @@ -77,10 +77,6 @@ public class ModEditWindowVM } ModEditWindow = window; - - I18nHelper.Current.AddLang += I18nData_AddLang; - I18nHelper.Current.RemoveLang += I18nData_RemoveLang; - I18nHelper.Current.ReplaceLang += I18nData_ReplaceLang; CurrentLang.ValueChanged += CurrentLang_ValueChanged; AddImageCommand.ExecuteAction += AddImage; @@ -92,23 +88,6 @@ public class ModEditWindowVM SaveToCommand.ExecuteAction += SaveTo; } - private void I18nData_AddLang(string lang) - { - ModInfo.Value.I18nDatas.Add(lang, new()); - } - - private void I18nData_RemoveLang(string lang) - { - ModInfo.Value.I18nDatas.Remove(lang); - } - - private void I18nData_ReplaceLang(string oldLang, string newLang) - { - var info = ModInfo.Value.I18nDatas[oldLang]; - ModInfo.Value.I18nDatas.Remove(oldLang); - ModInfo.Value.I18nDatas.Add(newLang, info); - } - private void CurrentLang_ValueChanged(string value) { if (value is null) diff --git a/VPet.ModMaker/ViewModels/ModMakerWindowVM.cs b/VPet.ModMaker/ViewModels/ModMakerWindowVM.cs index 9ff91a0..4c01a96 100644 --- a/VPet.ModMaker/ViewModels/ModMakerWindowVM.cs +++ b/VPet.ModMaker/ViewModels/ModMakerWindowVM.cs @@ -24,16 +24,16 @@ public class ModMakerWindowVM public ModEditWindow ModEditWindow { get; private set; } - public ObservableValue ModFilterText { get; } = new(); + public ObservableValue HistoriesFilterText { get; } = new(); - public ObservableCollection ShowMods { get; set; } public ObservableCollection Mods { get; } = new(); - + public ObservableValue> ShowHistories { get; } = new(); public ObservableCollection Histories { get; } = new(); #endregion #region Command public ObservableCommand CreateNewModCommand { get; } = new(); public ObservableCommand LoadModFromFileCommand { get; } = new(); + public ObservableCommand ClearHistoriesCommand { get; } = new(); #endregion public ModMakerWindowVM() { } @@ -41,10 +41,11 @@ public class ModMakerWindowVM { LoadHistories(); ModMakerWindow = window; - ShowMods = Mods; + ShowHistories.Value = Histories; CreateNewModCommand.ExecuteAction = CreateNewMod; LoadModFromFileCommand.ExecuteAction = LoadModFromFile; - ModFilterText.ValueChanged += ModFilterText_ValueChanged; + ClearHistoriesCommand.ExecuteAction = ClearHistories; + HistoriesFilterText.ValueChanged += ModFilterText_ValueChanged; } private void LoadHistories() @@ -96,9 +97,9 @@ public class ModMakerWindowVM private void ModFilterText_ValueChanged(string value) { if (string.IsNullOrEmpty(value)) - ShowMods = Mods; + ShowHistories.Value = Histories; else - ShowMods = new(Mods.Where(i => i.Name.Value.Contains(value))); + ShowHistories.Value = new(Histories.Where(i => i.Name.Contains(value))); } public void CreateNewMod() @@ -117,6 +118,12 @@ public class ModMakerWindowVM }; } + private void ClearHistories() + { + ShowHistories.Value.Clear(); + Histories.Clear(); + } + public void LoadModFromFile() { OpenFileDialog openFileDialog = diff --git a/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextEditWindow.xaml b/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextEditWindow.xaml index 9d8dd0d..af23025 100644 --- a/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextEditWindow.xaml +++ b/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextEditWindow.xaml @@ -21,8 +21,26 @@ + + + + + + + + + + - + - diff --git a/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextPage.xaml b/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextPage.xaml index 5735f5e..4fae193 100644 --- a/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextPage.xaml +++ b/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextPage.xaml @@ -109,31 +109,85 @@ diff --git a/VPet.ModMaker/Views/ModEdit/ModEditWindow.xaml b/VPet.ModMaker/Views/ModEdit/ModEditWindow.xaml index ee8b3a4..f27a5c4 100644 --- a/VPet.ModMaker/Views/ModEdit/ModEditWindow.xaml +++ b/VPet.ModMaker/Views/ModEdit/ModEditWindow.xaml @@ -148,7 +148,25 @@ Tag="{ll:Str 食物}"> - + + + + + + + + + diff --git a/VPet.ModMaker/Views/ModEdit/SelectTextEdit/SelectTextEditWindow.xaml b/VPet.ModMaker/Views/ModEdit/SelectTextEdit/SelectTextEditWindow.xaml new file mode 100644 index 0000000..77edc9c --- /dev/null +++ b/VPet.ModMaker/Views/ModEdit/SelectTextEdit/SelectTextEditWindow.xaml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +