fix private setter handling

cathei · Oct 9, 2020 · 758f604 · 758f604
1 parent 9a8c099
commit 758f604
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/BakingSheet/Src/SheetRow.cs b/BakingSheet/Src/SheetRow.cs
@@ -7,7 +7,7 @@ namespace Cathei.BakingSheet
 {
     public abstract class SheetRow<TKey>
     {
-        public TKey Id { get; set; }
+        public TKey Id { get; internal set; }
 
         public virtual void ConvertFromRaw(SheetConvertingContext context, RawSheetRow row)
         {
@@ -31,7 +31,7 @@ public virtual void VerifyAssets(SheetConvertingContext context)
     public abstract class SheetRowElem
     {
         [JsonIgnore]
-        public int Index { get; set; } 
+        public int Index { get; internal set; } 
 
         public virtual void PostLoad(SheetConvertingContext context)
         {
@@ -51,7 +51,7 @@ public abstract class SheetRowArray<TKey, TElem> : SheetRow<TKey>, IEnumerable<T
         where TElem : SheetRowElem, new()
     {
         [JsonProperty]
-        protected List<TElem> Arr { get; set; }
+        protected List<TElem> Arr { get; private set; }
 
         [JsonIgnore]
         public int Count => Arr.Count;

diff --git a/BakingSheet/Src/SheetUtility.cs b/BakingSheet/Src/SheetUtility.cs
@@ -130,7 +130,9 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
 
                 if (member is PropertyInfo pi)
                 {
-                    var hasSetMethod = pi.SetMethod != null;
+                    var hasSetMethod = pi.GetSetMethod(true) != null;
+
+                    property.Writable = hasSetMethod;
                     property.ShouldSerialize = property.ShouldDeserialize = _ => hasSetMethod;
                 }
 

diff --git a/UnityProject/Assets/Plugins/BakingSheet/BakingSheet.dll b/UnityProject/Assets/Plugins/BakingSheet/BakingSheet.dll
diff --git a/UnityProject/Assets/Plugins/BakingSheet/Editor/Excel/BakingSheet.Importers.Excel.dll b/UnityProject/Assets/Plugins/BakingSheet/Editor/Excel/BakingSheet.Importers.Excel.dll
diff --git a/UnityProject/Assets/Plugins/BakingSheet/Editor/Google/BakingSheet.Importers.Google.dll b/UnityProject/Assets/Plugins/BakingSheet/Editor/Google/BakingSheet.Importers.Google.dll
diff --git a/UnityProject/Assets/Plugins/BakingSheet/Examples/004 - Runtime Usage/SheetLoader.cs b/UnityProject/Assets/Plugins/BakingSheet/Examples/004 - Runtime Usage/SheetLoader.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using UnityEngine;
 
 namespace Cathei.BakingSheet.Examples
@@ -9,12 +10,14 @@ public class SheetLoader : MonoBehaviour
     {
         public SheetContainer Sheet { get; private set; }
 
-        private void Start()
+        private async void Start()
         {
             Sheet = new SheetContainer(new UnityLogger());
-            Sheet.Load(Path.Combine(Application.streamingAssetsPath, "Excel"));
-        }
+            await Sheet.Load(Path.Combine(Application.streamingAssetsPath, "Excel"));
 
+            Debug.Log(Sheet.Constants.Count);
+            Debug.Log(Sheet.Heroes["HERO001"].Count);
+            Debug.Log(Sheet.Items["ITEM_POTION001"].Name);
+        }
     }
-
 }