fix master data load issue

moonheart · Oct 20, 2024 · 5a5df36 · 5a5df36
1 parent 1d42168
commit 5a5df36
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/MementoMori.Ortega/Share/Master/Data/CharacterCollectionMB.cs b/MementoMori.Ortega/Share/Master/Data/CharacterCollectionMB.cs
@@ -23,7 +23,7 @@ public class CharacterCollectionMB : MasterBookBase, IHasJstStartEndTime
 
         [SerializationConstructor]
         public CharacterCollectionMB(long id, bool? isIgnore, string memo, string nameKey, IReadOnlyList<long> requiredCharacterIds, long requiredPartyLv, string startTimeFixJST, string endTimeFixJST)
-            : base(0L, null, null)
+            : base(id, isIgnore, memo)
         {
             this.NameKey = nameKey;
             this.RequiredCharacterIds = requiredCharacterIds;

diff --git a/MementoMori.Ortega/Share/Master/Data/CollabMissionMB.cs b/MementoMori.Ortega/Share/Master/Data/CollabMissionMB.cs
@@ -68,8 +68,22 @@ public class CollabMissionMB : MasterBookBase, IHasStartEndTimeZone
 
 		[SerializationConstructor]
 		public CollabMissionMB(long id, bool? isIgnore, string memo, StartEndTimeZoneType startEndTimeZoneType, string startTime, string endTime, int imageId, float imageX, float imageY, float imageSize, string descriptionTextKey, string titleTextKey, IReadOnlyList<long> targetMissionIdList, string url1, string url2, long characterId, MypageIconDisplayLocationType mypageIconDisplayLocationType)
-			: base(0L, null, null)
+			: base(id, isIgnore, memo)
 		{
+            this.StartEndTimeZoneType = startEndTimeZoneType;
+            this.StartTime = startTime;
+            this.EndTime = endTime;
+            this.ImageId = imageId;
+            this.ImageX = imageX;
+            this.ImageY = imageY;
+            this.ImageSize = imageSize;
+            this.DescriptionTextKey = descriptionTextKey;
+            this.TitleTextKey = titleTextKey;
+            this.TargetMissionIdList = targetMissionIdList;
+            this.Url1 = url1;
+            this.Url2 = url2;
+            this.CharacterId = characterId;
+            this.MypageIconDisplayLocationType = mypageIconDisplayLocationType;
 		}
 
 		public CollabMissionMB()

diff --git a/MementoMori.Ortega/Share/Master/Data/EquipmentMB.cs b/MementoMori.Ortega/Share/Master/Data/EquipmentMB.cs
@@ -97,7 +97,7 @@ public class EquipmentMB : MasterBookBase
 
 		[SerializationConstructor]
 		public EquipmentMB(long id, bool? isIgnore, string memo, long additionalParameterTotal, long afterLevelEvolutionEquipmentId, long afterRarityEvolutionEquipmentId, BattleParameterChangeInfo battleParameterChangeInfo, EquipmentCategory category, long compositeId, long equipmentEvolutionId, long equipmentExclusiveSkillDescriptionId, long equipmentLv, long equipmentSetId, JobFlags equippedJobFlags, long exclusiveEffectId, long goldRequiredToOpeningFirstSphereSlot, long goldRequiredToTraining, long iconId, string nameKey, long performancePoint, long equipmentForgeId, int qualityLv, EquipmentRarityFlags rarityFlags, EquipmentSlotType slotType)
-			: base(0L, null, null)
+			: base(id, isIgnore, memo)
 		{
             this.AdditionalParameterTotal = additionalParameterTotal;
             this.AfterLevelEvolutionEquipmentId = afterLevelEvolutionEquipmentId;

diff --git a/MementoMori.Ortega/Share/Master/Data/EquipmentReinforcementMaterialMB.cs b/MementoMori.Ortega/Share/Master/Data/EquipmentReinforcementMaterialMB.cs
@@ -27,7 +27,7 @@ public class EquipmentReinforcementMaterialMB : MasterBookBase
 
         [SerializationConstructor]
         public EquipmentReinforcementMaterialMB(long id, bool? isIgnore, string memo, long reinforcementLevel, IReadOnlyList<UserItem> weaponRequiredItemList, IReadOnlyList<UserItem> othersRequiredItemList)
-            : base(0L, null, null)
+            : base(id, isIgnore, memo)
         {
             this.ReinforcementLevel = reinforcementLevel;
             this.WeaponRequiredItemList = weaponRequiredItemList;

diff --git a/MementoMori.Ortega/Share/Master/Data/EquipmentSetMaterialMB.cs b/MementoMori.Ortega/Share/Master/Data/EquipmentSetMaterialMB.cs
@@ -43,7 +43,7 @@ public class EquipmentSetMaterialMB : MasterBookBase
 
         [SerializationConstructor]
         public EquipmentSetMaterialMB(long id, bool? isIgnore, string memo, string descriptionKey, long iconId, ItemRarityFlags itemRarityFlags, long lv, string nameKey, string displayNameKey, IReadOnlyList<long> questIdList, long treasureChestId)
-            : base(0L, null, null)
+            : base(id, isIgnore, memo)
         {
             this.DescriptionKey = descriptionKey;
             this.IconId = iconId;

diff --git a/MementoMori.Ortega/Share/Master/Data/LuckyChanceMB.cs b/MementoMori.Ortega/Share/Master/Data/LuckyChanceMB.cs
@@ -54,7 +54,7 @@ public class LuckyChanceMB : MasterBookBase, IHasStartEndTimeZone
 
 		[SerializationConstructor]
 		public LuckyChanceMB(long id, bool? isIgnore, string memo, StartEndTimeZoneType startEndTimeZoneType, string startTime, string endTime, string inputFormEndTime, MypageIconDisplayLocationType mypageIconDisplayLocationType, string titleTextKey, IReadOnlyList<long> luckyChanceButtonIdList, int limitUserDrawCount, UserItem consumeItem, string canDeletePersonalInfoTime)
-			: base(0L, null, null)
+			: base(id, isIgnore, memo)
 		{
 		}
 

diff --git a/MementoMori.Ortega/Share/Master/Data/NewCharacterMissionMB.cs b/MementoMori.Ortega/Share/Master/Data/NewCharacterMissionMB.cs
@@ -63,7 +63,7 @@ public class NewCharacterMissionMB : MasterBookBase, IHasJstStartEndTime
         public NewCharacterMissionMB(long id, bool? isIgnore, string memo, string startTimeFixJST, string endTimeFixJST, string forceStartTime, int characterImageId, float characterImageX,
             float characterImageY, float characterImageSize, string titleTextKey, IReadOnlyList<long> targetMissionIdList, string youTubeUrl, string twitterUrl,
             MypageIconDisplayLocationType mypageIconDisplayLocationType)
-            : base(0L, null, null)
+            : base(id, isIgnore, memo)
         {
             this.StartTimeFixJST = startTimeFixJST;
             this.EndTimeFixJST = endTimeFixJST;