Base variable. Default game event.

Author: coryleach

Runtime/Variables/BaseVariable.cs

@@ -0,0 +1,24 @@
+using Gameframe.ScriptableObjects.Events;
+using UnityEngine;
+
+namespace Gameframe.ScriptableObjects.Variables
+{
+    public class BaseVariable : ScriptableObject
+    {
+        [SerializeField]
+        protected GameEvent onValueChanged;
+
+        public GameEvent OnValueChanged
+        {
+            get
+            {
+                if (onValueChanged == null)
+                {
+                    onValueChanged = CreateInstance<GameEvent>();
+                }
+                return onValueChanged;
+            }
+        }
+    }
+}
+

Runtime/Variables/BaseVariable.cs.meta

@@ -1,12 +1,10 @@
-using System.Collections;
-using System.Collections.Generic;
-using Gameframe.ScriptableObjects.Events;
+using Gameframe.ScriptableObjects.Events;
 using UnityEngine;
 
 namespace Gameframe.ScriptableObjects.Variables
 {
   [CreateAssetMenu(menuName=MenuNames.Variables+"Color")]
-  public class ColorVariable : ScriptableObject, IVariable<Color>
+  public class ColorVariable : BaseVariable, IVariable<Color>
   {
     [SerializeField]
     private Color value;
@@ -25,8 +23,5 @@ public Color Value
         }
       }
     }
-
-    [SerializeField]
-    private GameEvent onValueChanged;
   }
 }

Runtime/Variables/ColorVariable.cs

@@ -1,12 +1,9 @@
-using System.Collections;
-using System.Collections.Generic;
-using Gameframe.ScriptableObjects.Events;
-using UnityEngine;
+using UnityEngine;
 
 namespace Gameframe.ScriptableObjects.Variables
 {
   [CreateAssetMenu(menuName=MenuNames.Variables+"Float")]
-  public class FloatVariable : ScriptableObject, IVariable<float>
+  public class FloatVariable : BaseVariable, IVariable<float>
   {
     [SerializeField]
     private float value;
@@ -25,8 +22,5 @@ public float Value
         }
       }
     }
-
-    [SerializeField]
-    private GameEvent onValueChanged;
   }
 }

Runtime/Variables/FloatVariable.cs

@@ -5,21 +5,14 @@
 namespace Gameframe.ScriptableObjects.Variables
 {
   [CreateAssetMenu(menuName=MenuNames.Variables+"GameObject")]
-  public class GameObjectVariable : ScriptableObject, IVariable<GameObject>
+  public class GameObjectVariable : BaseVariable, IVariable<GameObject>
   {
     [SerializeField]
     private bool clearOnEnable = false;
 
     [SerializeField]
     private GameObject gameObject = null;
 
-    [SerializeField]
-    private GameEvent onValueChanged = null;
-
-    [SerializeField]
-    private UnityEvent valueChanged = new UnityEvent();
-    public UnityEvent OnValueChanged => valueChanged;
-
     public GameObject Value
     {
       get => gameObject;
@@ -28,8 +21,10 @@ public GameObject Value
         if (gameObject != value)
         {
           gameObject = value;
-          valueChanged.Invoke();
-          onValueChanged?.Raise();
+          if (onValueChanged != null)
+          {
+            onValueChanged.Raise();
+          }
         }
       }
     }
@@ -41,15 +36,6 @@ private void OnEnable()
         Value = null;
       }
     }
-
-    public void RaisedPropertyChanged()
-    {
-      onValueChanged.Raise();
-    }
-
-    public void Clear()
-    {
-      Value = null;
-    }
+    
   }
 }

Runtime/Variables/GameObjectVariable.cs

@@ -1,12 +1,9 @@
-using System.Collections;
-using System.Collections.Generic;
-using Gameframe.ScriptableObjects.Events;
-using UnityEngine;
+using UnityEngine;
 
 namespace Gameframe.ScriptableObjects.Variables
 {
   [CreateAssetMenu(menuName = MenuNames.Variables+"Int")]
-  public class IntVariable : ScriptableObject, IVariable<int>
+  public class IntVariable : BaseVariable, IVariable<int>
   {
     [SerializeField]
     private int value;
@@ -25,8 +22,5 @@ public int Value
         }
       }
     }
-
-    [SerializeField]
-    private GameEvent onValueChanged;
   }
 }

Runtime/Variables/IntVariable.cs

@@ -1,12 +1,9 @@
-using System.Collections;
-using System.Collections.Generic;
-using Gameframe.ScriptableObjects.Events;
-using UnityEngine;
+using UnityEngine;
 
 namespace Gameframe.ScriptableObjects.Variables
 {
   [CreateAssetMenu(menuName = MenuNames.Variables+"String")]
-  public class StringVariable : ScriptableObject, IVariable<string>
+  public class StringVariable : BaseVariable, IVariable<string>
   {
     [SerializeField]
     private string value;
@@ -25,8 +22,5 @@ public string Value
         }
       }
     }
-
-    [SerializeField]
-    private GameEvent onValueChanged;
   }
 }

Runtime/Variables/StringVariable.cs

@@ -1,12 +1,9 @@
-using System.Collections;
-using System.Collections.Generic;
-using Gameframe.ScriptableObjects.Events;
-using UnityEngine;
+using UnityEngine;
 
 namespace Gameframe.ScriptableObjects.Variables
 {
   [CreateAssetMenu(menuName = MenuNames.Variables+"Vector2")]
-  public class Vector2Variable : ScriptableObject, IVariable<Vector2>
+  public class Vector2Variable : BaseVariable, IVariable<Vector2>
   {
     [SerializeField]
     private Vector2 value;
@@ -25,8 +22,5 @@ public Vector2 Value
         }
       }
     }
-
-    [SerializeField]
-    private GameEvent onValueChanged;
   }
 }

Runtime/Variables/Vector2Variable.cs

@@ -1,10 +1,9 @@
-using Gameframe.ScriptableObjects.Events;
-using UnityEngine;
+using UnityEngine;
 
 namespace Gameframe.ScriptableObjects.Variables
 {
   [CreateAssetMenu(menuName=MenuNames.Variables+"Vector3")]
-  public class Vector3Variable : ScriptableObject, IVariable<Vector3>
+  public class Vector3Variable : BaseVariable, IVariable<Vector3>
   {
     [SerializeField]
     private Vector3 value;
@@ -23,8 +22,5 @@ public Vector3 Value
         }
       }
     }
-
-    [SerializeField]
-    private GameEvent onValueChanged;
   }
 }