From 9d852bb64566ddd7eb70ba29f1fac1123682fbdc Mon Sep 17 00:00:00 2001 From: Hakoyu Date: Tue, 23 Apr 2024 23:52:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VPet.ModMaker/Models/ModModel/ClickTextModel.cs | 2 +- VPet.ModMaker/Models/ModModel/FoodModel.cs | 2 +- VPet.ModMaker/Models/ModModel/LowTextModel.cs | 2 +- VPet.ModMaker/Models/ModModel/ModInfoModel.cs | 2 +- VPet.ModMaker/Models/ModModel/PetModel.cs | 2 ++ VPet.ModMaker/Models/ModModel/SelectTextModel.cs | 2 +- VPet.ModMaker/Models/ModModel/WorkModel.cs | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/VPet.ModMaker/Models/ModModel/ClickTextModel.cs b/VPet.ModMaker/Models/ModModel/ClickTextModel.cs index 28b8e5c..b5801e7 100644 --- a/VPet.ModMaker/Models/ModModel/ClickTextModel.cs +++ b/VPet.ModMaker/Models/ModModel/ClickTextModel.cs @@ -137,7 +137,7 @@ public class ClickTextModel : ObservableObjectX public void InitializeI18nResource() { - I18nResource.I18nObjectInfos.Add( + I18nResource?.I18nObjectInfos.Add( this, new(this, OnPropertyChanged, [(nameof(ID), ID, nameof(Text), true),]) ); diff --git a/VPet.ModMaker/Models/ModModel/FoodModel.cs b/VPet.ModMaker/Models/ModModel/FoodModel.cs index d23aa91..99b406d 100644 --- a/VPet.ModMaker/Models/ModModel/FoodModel.cs +++ b/VPet.ModMaker/Models/ModModel/FoodModel.cs @@ -125,7 +125,7 @@ public class FoodModel : ObservableObjectX public void InitializeI18nResource() { - I18nResource.I18nObjectInfos.Add( + I18nResource?.I18nObjectInfos.Add( this, new( this, diff --git a/VPet.ModMaker/Models/ModModel/LowTextModel.cs b/VPet.ModMaker/Models/ModModel/LowTextModel.cs index b59abd0..e45aa62 100644 --- a/VPet.ModMaker/Models/ModModel/LowTextModel.cs +++ b/VPet.ModMaker/Models/ModModel/LowTextModel.cs @@ -85,7 +85,7 @@ public class LowTextModel : ObservableObjectX public void InitializeI18nResource() { - I18nResource.I18nObjectInfos.Add( + I18nResource?.I18nObjectInfos.Add( this, new(this, OnPropertyChanged, [(nameof(ID), ID, nameof(Text), true)]) ); diff --git a/VPet.ModMaker/Models/ModModel/ModInfoModel.cs b/VPet.ModMaker/Models/ModModel/ModInfoModel.cs index 083c341..5f5c760 100644 --- a/VPet.ModMaker/Models/ModModel/ModInfoModel.cs +++ b/VPet.ModMaker/Models/ModModel/ModInfoModel.cs @@ -36,7 +36,7 @@ public class ModInfoModel : ObservableObjectX Pets.CollectionChanged += Pets_CollectionChanged; I18nResource.PropertyChanged += I18nResource_PropertyChanged; I18nResource.Cultures.SetChanged += Cultures_SetChanged; - I18nResource.I18nObjectInfos.Add( + I18nResource?.I18nObjectInfos.Add( this, new( this, diff --git a/VPet.ModMaker/Models/ModModel/PetModel.cs b/VPet.ModMaker/Models/ModModel/PetModel.cs index 21282f4..4349ba6 100644 --- a/VPet.ModMaker/Models/ModModel/PetModel.cs +++ b/VPet.ModMaker/Models/ModModel/PetModel.cs @@ -212,6 +212,8 @@ public class PetModel : ObservableObjectX ] ) ); + foreach (var work in Works) + work.I18nResource = I18nResource; if (FromMain) { foreach (var cultureName in LocalizeCore.AvailableCultures) diff --git a/VPet.ModMaker/Models/ModModel/SelectTextModel.cs b/VPet.ModMaker/Models/ModModel/SelectTextModel.cs index 8ac4dce..8070c4a 100644 --- a/VPet.ModMaker/Models/ModModel/SelectTextModel.cs +++ b/VPet.ModMaker/Models/ModModel/SelectTextModel.cs @@ -141,7 +141,7 @@ public class SelectTextModel : ObservableObjectX public void InitializeI18nResource() { - I18nResource.I18nObjectInfos.Add( + I18nResource?.I18nObjectInfos.Add( this, new( this, diff --git a/VPet.ModMaker/Models/ModModel/WorkModel.cs b/VPet.ModMaker/Models/ModModel/WorkModel.cs index 8aed4cb..0f6417d 100644 --- a/VPet.ModMaker/Models/ModModel/WorkModel.cs +++ b/VPet.ModMaker/Models/ModModel/WorkModel.cs @@ -141,7 +141,7 @@ public class WorkModel : ObservableObjectX public void InitializeI18nResource() { - I18nResource.I18nObjectInfos.Add( + I18nResource?.I18nObjectInfos.Add( this, new(this, OnPropertyChanged, [(nameof(ID), ID, nameof(Name), true),]) );