diff --git a/VPet.ModMaker/Models/ModModel/ModInfoModel.cs b/VPet.ModMaker/Models/ModModel/ModInfoModel.cs index da65a49..1ccd71e 100644 --- a/VPet.ModMaker/Models/ModModel/ModInfoModel.cs +++ b/VPet.ModMaker/Models/ModModel/ModInfoModel.cs @@ -244,10 +244,10 @@ public class ModInfoModel : I18nModel /// private void LoadI18nData() { - foreach (var lang in I18nDatas) + foreach (var lang in I18nDatas.Keys.Union(OtherI18nDatas.Keys)) { - if (I18nHelper.Current.CultureNames.Contains(lang.Key) is false) - I18nHelper.Current.CultureNames.Add(lang.Key); + if (I18nHelper.Current.CultureNames.Contains(lang) is false) + I18nHelper.Current.CultureNames.Add(lang); } if (I18nHelper.Current.CultureNames.Count > 0) { diff --git a/VPet.ModMaker/ViewModels/ModEdit/PetEdit/PetPageVM.cs b/VPet.ModMaker/ViewModels/ModEdit/PetEdit/PetPageVM.cs index cce1231..21fc73d 100644 --- a/VPet.ModMaker/ViewModels/ModEdit/PetEdit/PetPageVM.cs +++ b/VPet.ModMaker/ViewModels/ModEdit/PetEdit/PetPageVM.cs @@ -62,7 +62,7 @@ public class PetPageVM public void Edit(PetModel model) { - if (model.IsSimplePetModel.Value) + if (model.IsSimplePetModel) { MessageBox.Show("这是本体自带的宠物, 无法编辑".Translate()); return; @@ -88,7 +88,7 @@ public class PetPageVM private void Remove(PetModel model) { - if (model.IsSimplePetModel.Value) + if (model.IsSimplePetModel) { MessageBox.Show("这是本体自带的宠物, 无法删除".Translate()); return; diff --git a/VPet.ModMaker/Views/ModEdit/AnimeEdit/AnimeEditWindow.xaml b/VPet.ModMaker/Views/ModEdit/AnimeEdit/AnimeEditWindow.xaml index 6925120..1f7cd72 100644 --- a/VPet.ModMaker/Views/ModEdit/AnimeEdit/AnimeEditWindow.xaml +++ b/VPet.ModMaker/Views/ModEdit/AnimeEdit/AnimeEditWindow.xaml @@ -32,15 +32,15 @@ + Header="{ll:Str 添加图片}" /> + Header="{ll:Str 清空图片}" /> + Header="{ll:Str 删除此项}" /> @@ -50,7 +50,7 @@ - + @@ -88,7 +88,7 @@ + Header="{ll:Str 删除图片}" /> @@ -113,7 +113,7 @@ -