Merge pull request #51 from AkiKurisu/dev/v0.6.2

Merge Dev v0.6.2

Author: AkiKurisu

Editor/Core/Editors/CeresSettings.cs

@@ -1,5 +1,4 @@
 using System;
-using Chris.Configs.Editor;
 using Chris.Editor;
 using Chris.Serialization;
 using UnityEditor;
@@ -9,6 +8,7 @@
 
 namespace Ceres.Editor
 {
+    [BaseConfig]
     public class CeresSettings : ConfigSingleton<CeresSettings>
     {
         public enum GraphEditorDisplayMode
@@ -49,10 +49,9 @@ public enum GraphEditorDisplayMode
         public static void SaveSettings()
         {
             Instance.Save(true);
-            var serializer = ConfigsEditorUtils.GetConfigSerializer();
             var config = CeresConfig.Get();
             config.logLevel = Instance.logLevel;
-            config.Save(serializer);
+            Serialize(config);
         }
 
         internal static void AddPreservedType(Type type)

Editor/Flow/Editors/FlowSettings.cs

@@ -1,13 +1,13 @@
 using System.Linq;
 using Ceres.Graph.Flow;
-using Chris.Configs.Editor;
 using Chris.Editor;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace Ceres.Editor
 {
+    [BaseConfig]
     public class FlowSettings : ConfigSingleton<FlowSettings>
     {
         private static FlowSettings _setting;
@@ -21,11 +21,10 @@ public class FlowSettings : ConfigSingleton<FlowSettings>
         public static void SaveSettings()
         {
             Instance.Save(true);
-            var serializer = ConfigsEditorUtils.GetConfigSerializer();
             var config = FlowConfig.Get();
             config.logExecutableReflection = Instance.logExecutableReflection;
             config.alwaysIncludedAssemblyWildcards = Instance.alwaysIncludedAssemblyWildcards;
-            config.Save(serializer);
+            Serialize(config);
         }
     }
 

Runtime/Core/Models/Graph/CeresGraph.cs

@@ -819,8 +819,8 @@ protected void ReadFromLinkedNodes(CeresGraph graph)
             /* Must serialize node data after clear references */
             nodeData = nodes.Select(node => node.GetSerializedData()).ToArray();
 #if UNITY_EDITOR
-            nodeGroups = graph.nodeGroups.ToArray();
-            relayNodes = graph.relayNodes.ToArray();
+            nodeGroups = graph.nodeGroups?.ToArray() ?? Array.Empty<NodeGroup>();
+            relayNodes = graph.relayNodes?.ToArray() ?? Array.Empty<RelayNode>();
 #endif
         }
     }

Runtime/Core/Models/Graph/Variables/GlobalVariables.cs

@@ -36,7 +36,11 @@ public GlobalVariables(List<SharedVariable> sharedVariables, IVariableScope pare
 
         private static GlobalVariables FindOrCreateDefault()
         {
+#if UNITY_6000_0_OR_NEWER
+            var scope = UObject.FindFirstObjectByType<SceneVariableScope>();
+#else
             var scope = UObject.FindObjectOfType<SceneVariableScope>();
+#endif
             if (scope != null)
             {
                 scope.Initialize();

Runtime/Flow/Models/Libraries/UnityExecutableLibrary.cs

@@ -37,15 +37,19 @@ public static void Flow_Destroy([NotNull] UObject uObject)
         }
 
         /// <summary>
-        /// Returns the first active loaded object of Type type.
+        /// Retrieves the first active loaded object of Type type.
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
         [ExecutableFunction]
         public static UObject Flow_FindObjectOfType(
             [ResolveReturn] SerializedType<UObject> type)
         {
+#if UNITY_6000_0_OR_NEWER
+            return UObject.FindFirstObjectByType(type);
+#else
             return UObject.FindObjectOfType(type);
+#endif
         }
 
         #endregion UObject