fix: from collectable

Bruno Mikoski · Bruno Mikoski · commit 87ccc1753e2e · 2020-08-11T08:10:53.000+01:00
diff --git a/Scripts/Runtime/CollectableIndirectReference.cs b/Scripts/Runtime/CollectableIndirectReference.cs
@@ -16,12 +16,6 @@ public class CollectableIndirectReference
 
         [SerializeField]
         protected string collectionGUID;
-        
-        public virtual void FromCollectable(CollectableScriptableObject collectableScriptableObject)
-        {
-            collectableGUID = collectableScriptableObject.GUID;
-            collectionGUID = collectableScriptableObject.Collection.GUID;
-        }
     }
     
     [Serializable]
@@ -55,9 +49,10 @@ public TObject Ref
             }
         }
 
-        public override void FromCollectable(CollectableScriptableObject collectableScriptableObject)
+        public void FromCollectable(CollectableScriptableObject collectableScriptableObject)
         {
-            base.FromCollectable(collectableScriptableObject);
+            collectableGUID = collectableScriptableObject.GUID;
+            collectionGUID = collectableScriptableObject.Collection.GUID;
 #if UNITY_EDITOR
             editorAsset = collectableScriptableObject as TObject;
 #endif

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,6 @@ public class CollectableIndirectReference`
`16`	`16`
`17`	`17`	`[SerializeField]`
`18`	`18`	`protected string collectionGUID;`
`19`		`-`
`20`		`- public virtual void FromCollectable(CollectableScriptableObject collectableScriptableObject)`
`21`		`- {`
`22`		`- collectableGUID = collectableScriptableObject.GUID;`
`23`		`- collectionGUID = collectableScriptableObject.Collection.GUID;`
`24`		`- }`
`25`	`19`	`}`
`26`	`20`
`27`	`21`	`[Serializable]`
`@@ -55,9 +49,10 @@ public TObject Ref`
`55`	`49`	`}`
`56`	`50`	`}`
`57`	`51`
`58`		`- public override void FromCollectable(CollectableScriptableObject collectableScriptableObject)`
	`52`	`+ public void FromCollectable(CollectableScriptableObject collectableScriptableObject)`
`59`	`53`	`{`
`60`		`- base.FromCollectable(collectableScriptableObject);`
	`54`	`+ collectableGUID = collectableScriptableObject.GUID;`
	`55`	`+ collectionGUID = collectableScriptableObject.Collection.GUID;`
`61`	`56`	`#if UNITY_EDITOR`
`62`	`57`	`editorAsset = collectableScriptableObject as TObject;`
`63`	`58`	`#endif`