cz.xprees.variables 1.0.20 → 1.0.22

package/Runtime/Base/ReferenceBase.cs

@@ -3,6 +3,7 @@
 // ------------------------------------------------------------------------------------------------------
 
 using System;
+using UnityEngine;
 using UnityEngine.Events;
 using Xprees.Core;
 using Xprees.Variables.Utils;
@@ -14,14 +15,35 @@ namespace Xprees.Variables.Base
     /// </summary>
     /// <typeparam name="T">Unity Serializable</typeparam>
     [Serializable]
-    public class ReferenceBase<T> : IResettable
+    public class ReferenceBase<T> : IResettable, ISerializationCallbackReceiver
     {
+        private bool _hasCapturedBaseline; // Used to check if baseline has been captured
         private T _defaultInlinedValue; // Used to reset state of inlined value
 
         public bool useInlined = true;
         public T inlinedValue;
         public VariableBaseSO<T> variable;
 
+        public void OnBeforeSerialize()
+        {
+        }
+
+        public void OnAfterDeserialize()
+        {
+            if (!PlayModeStateTracker.IsPlaying)
+            {
+                _defaultInlinedValue = CloningTools.Clone(inlinedValue);
+                _hasCapturedBaseline = false;
+                return;
+            }
+
+            if (!_hasCapturedBaseline)
+            {
+                _defaultInlinedValue = CloningTools.Clone(inlinedValue);
+                _hasCapturedBaseline = true;
+            }
+        }
+
         // Internal event for inlined value changes, since VariableBaseSO already has its own onValueChanged event.
         private UnityAction<T> _onInlinedValueChanged;
 
@@ -31,7 +53,7 @@ namespace Xprees.Variables.Base
         {
             add
             {
-                var shouldRedirectToVarEvent = !useInlined && variable != null;
+                var shouldRedirectToVarEvent = !useInlined && variable;
                 if (shouldRedirectToVarEvent)
                 {
                     variable.onValueChanged += value;
@@ -43,7 +65,7 @@ namespace Xprees.Variables.Base
 
             remove
             {
-                var shouldRedirectToVarEvent = !useInlined && variable != null;
+                var shouldRedirectToVarEvent = !useInlined && variable;
                 if (shouldRedirectToVarEvent)
                 {
                     variable.onValueChanged -= value;
@@ -63,6 +85,7 @@ namespace Xprees.Variables.Base
             useInlined = true;
             inlinedValue = value;
             _defaultInlinedValue = value;
+            _hasCapturedBaseline = true;
         }
 
         public T Value
@@ -89,6 +112,7 @@ namespace Xprees.Variables.Base
             if (!useInlined) return; // Variables does that by themselves
 
             _defaultInlinedValue = CloningTools.Clone(inlinedValue);
+            _hasCapturedBaseline = true;
         }
 
         public virtual void ResetState()

package/Runtime/Base/VariableBaseSO.cs

@@ -43,6 +43,13 @@ namespace Xprees.Variables.Base
             get => currentValue;
             set
             {
+#if UNITY_EDITOR
+                // If not already captured in Editor capture before changing the value
+                if (PlayModeStateTracker.IsPlaying)
+                {
+                    StateSnapshotService.EnsureCaptured(this);
+                }
+#endif
                 currentValue = value;
                 onValueChanged?.Invoke(value);
             }

package/Runtime/Base/VariableModifierBaseSO.cs

@@ -38,9 +38,14 @@ namespace Xprees.Variables.Base
 
         public override void ResetState()
         {
-            base.ResetState();
-            variable?.ResetState();
+            if (protectedDontReset) return;
+            ForceResetState();
+        }
+
+        public override void ForceResetState()
+        {
             disableWrite?.ResetState();
+            variable?.ResetState();
         }
     }
 }

package/Runtime/Utils/CloningTools.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Runtime.CompilerServices;
 using UnityEngine;
@@ -24,6 +24,13 @@ namespace Xprees.Variables.Utils
             var canReturnAsIs = typeof(T).IsValueType && !RuntimeHelpers.IsReferenceOrContainsReferences<T>();
             if (canReturnAsIs) return value;
 
+            // Strings are immutable in .NET, so return directly without JsonUtility
+            if (typeof(T) == typeof(string)) return value;
+
+            // UnityEngine.Object references (ScriptableObjects, MonoBehaviours, Assets, GameObjects)
+            // are reference-assigned; we must not deep-clone or call CreateInstance during serialization.
+            if (typeof(Object).IsAssignableFrom(typeof(T)) || value is Object) return value;
+
             if (value is ICloneable cloneable) return (T) cloneable.Clone();
 
             // Handle collections (List<T>, arrays, etc.) - JsonUtility doesn't support them directly
@@ -96,6 +103,9 @@ namespace Xprees.Variables.Utils
             // Value types are copied by value
             if (itemType.IsValueType) return item;
 
+            // Strings are immutable
+            if (item is string) return item;
+
             // ICloneable
             if (item is ICloneable cloneable) return cloneable.Clone();
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cz.xprees.variables",
   "displayName": "Variables",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "unity": "2021.3",
   "description": "This package contains a system for creating variables based on ScriptableObjects in Editor.",
   "license": "Apache-2.0",