diff --git a/VPet.ModMaker/Models/ModMaker.cs b/VPet.ModMaker/Models/ModMaker.cs index 8041211..0110c0f 100644 --- a/VPet.ModMaker/Models/ModMaker.cs +++ b/VPet.ModMaker/Models/ModMaker.cs @@ -40,9 +40,12 @@ public class ModMaker : MainPlugin Application.Current.Resources.MergedDictionaries.Add(ModMakerInfo.NativeStyles); } + public I18nResource I18nResource { get; } = + new() { FillDefaultValueForNewCulture = true, DefaultValue = string.Empty }; + public override void Setting() { - if (Maker == null) + if (Maker is null) { // 载入ModMaker资源 Maker = new ModMakerWindow(); @@ -52,7 +55,7 @@ public class ModMaker : MainPlugin foreach (var pet in MW.Pets) ModMakerInfo.MainPets.TryAdd( pet.Name, - new(pet, true) { I18nResource = ModInfoModel.Current.I18nResource } + new(pet, true) { I18nResource = I18nResource } ); //Maker.ModMaker = this; Maker.Show(); diff --git a/VPet.ModMaker/Models/ModMakerInfo.cs b/VPet.ModMaker/Models/ModMakerInfo.cs index 17ec79f..9fb59f1 100644 --- a/VPet.ModMaker/Models/ModMakerInfo.cs +++ b/VPet.ModMaker/Models/ModMakerInfo.cs @@ -31,7 +31,7 @@ public static class ModMakerInfo /// /// 游戏版本 /// - public static int GameVersion { get; set; } = 100; + public static int GameVersion { get; set; } = 11000; /// /// 本体的宠物 diff --git a/VPet.ModMaker/Models/ModModel/AnimeTypeModel.cs b/VPet.ModMaker/Models/ModModel/AnimeTypeModel.cs index ea31d38..495e5c3 100644 --- a/VPet.ModMaker/Models/ModModel/AnimeTypeModel.cs +++ b/VPet.ModMaker/Models/ModModel/AnimeTypeModel.cs @@ -515,7 +515,6 @@ public class AnimeTypeModel : ObservableObjectX /// 保存为 样式 /// /// 路径 - /// 模型 void SaveRaised(string path) { var animePath = Path.Combine(path, "Raise"); @@ -530,7 +529,6 @@ public class AnimeTypeModel : ObservableObjectX /// 保存为 /// /// 路径 - /// 模型 void SaveSwitch(string path) { var animePath = Path.Combine(path, "Switch"); @@ -543,7 +541,6 @@ public class AnimeTypeModel : ObservableObjectX /// 保存成默认样式 /// /// - /// void SaveDefault(string path) { var animePath = Path.Combine(path, GraphType.ToString()); @@ -555,7 +552,6 @@ public class AnimeTypeModel : ObservableObjectX /// 保存成多类型样式 /// /// - /// void SaveMultiType(string path) { var animePath = Path.Combine(path, GraphType.ToString()); @@ -567,7 +563,6 @@ public class AnimeTypeModel : ObservableObjectX /// 保存为 Happy/A/0 的路径样式 /// /// - /// void SaveWithModeType(string path) { if (HappyAnimes.Count > 0) @@ -628,7 +623,6 @@ public class AnimeTypeModel : ObservableObjectX /// 保存为 Happy/0 的路径样式 /// /// - /// void SaveWithAnimeType(string animePath) { if (HappyAnimes.Count > 0) diff --git a/VPet.ModMaker/VPet.ModMaker.csproj b/VPet.ModMaker/VPet.ModMaker.csproj index 3a76fe5..586afe8 100644 --- a/VPet.ModMaker/VPet.ModMaker.csproj +++ b/VPet.ModMaker/VPet.ModMaker.csproj @@ -13,6 +13,15 @@ enable Debug;Release;Test + + embedded + + + embedded + + + embedded +