Merge branch 'implicit-conversion'

Author: SolidAlloy

Editor/AOTGeneration/BuildPreprocessor.cs

@@ -19,7 +19,14 @@ public void OnPreprocessBuild(BuildReport report)
             }
 
 #if UNITY_2021_2_OR_NEWER
-            switch (EditorUserBuildSettings.il2CppCodeGeneration)
+            var codeGeneration =
+    #if UNITY_2022
+                PlayerSettings.GetIl2CppCodeGeneration(NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup));
+    #else
+                EditorUserBuildSettings.il2CppCodeGeneration;
+    #endif
+
+            switch (codeGeneration)
             {
                 case Il2CppCodeGeneration.OptimizeSpeed:
                     AOTAssemblyGenerator.GenerateCreateMethods();
@@ -28,7 +35,7 @@ public void OnPreprocessBuild(BuildReport report)
                     AOTAssemblyGenerator.DeleteGeneratedFolder();
                     break;
                 default:
-                    Debug.LogWarning($"Unknown value of IL2CPP Code Generation: {EditorUserBuildSettings.il2CppCodeGeneration}");
+                    Debug.LogWarning($"Unknown value of IL2CPP Code Generation: {codeGeneration}");
                     break;
             }
 #else

Editor/Drawers/ExtEventDrawer.cs

@@ -6,7 +6,6 @@
     using SolidUtilities.Editor;
     using SolidUtilities.UnityEditorInternals;
     using UnityEditor;
-    using UnityEditorInternal;
     using UnityEngine;
     using UnityEngine.Events;
 

Editor/Drawers/PersistentArgumentDrawer.cs

@@ -58,7 +58,7 @@ public override void OnGUI(Rect fieldRect, SerializedProperty property, GUIConte
             EditorGUI.indentLevel = 0;
 
             if (_showChoiceButton)
-                DrawChoiceButton(buttonRect);
+                DrawChoiceButton(buttonRect, property);
 
             DrawValue(property, valueRect, fieldRect, previousIndent);
 
@@ -96,9 +96,13 @@ public static SerializedProperty GetValueProperty(SerializedProperty argumentPro
         public static void SaveValueProperty(SerializedProperty argumentProperty, SerializedProperty valueProperty)
         {
             valueProperty.serializedObject.ApplyModifiedPropertiesWithoutUndo();
+            LogHelper.RemoveLogEntriesByMode(LogModes.NoScriptAssetWarning);
             var value = valueProperty.GetObject();
             var serializedArgProp = argumentProperty.FindPropertyRelative(nameof(PersistentArgument._serializedArg));
             serializedArgProp.stringValue = PersistentArgument.SerializeValue(value, valueProperty.GetObjectType());
+
+            var argument = argumentProperty.GetObject<PersistentArgument>();
+            argument._initialized = false;
         }
 
         private void DrawValue(SerializedProperty property, Rect valueRect, Rect totalRect, int indentLevel)
@@ -271,11 +275,13 @@ private static void DrawValueInFoldout(SerializedProperty mainProperty, Serializ
             }
         }
 
-        private void DrawChoiceButton(Rect buttonRect)
+        private void DrawChoiceButton(Rect buttonRect, SerializedProperty argumentProperty)
         {
             if (GUI.Button(buttonRect, _isSerialized.boolValue ? "s" : "d", ButtonStyle))
             {
                 _isSerialized.boolValue = !_isSerialized.boolValue;
+                var argument = argumentProperty.GetObject<PersistentArgument>();
+                argument._initialized = false;
             }
         }
     }

Editor/Drawers/PersistentListenerDrawer.cs

@@ -212,10 +212,14 @@ private bool MethodHasChanged(SerializedProperty listenerProperty)
 
         private void DrawComponentDropdown(SerializedProperty listenerProperty, SerializedProperty targetProperty, GameObject gameObject)
         {
-            var components = gameObject.GetComponents<Component>().Where(component => component != null && !component.hideFlags.ContainsFlag(HideFlags.HideInInspector));
-            var dropdownItems = new List<DropdownItem<Component>>();
+            var components = gameObject
+                .GetComponents<Component>()
+                .Where(component => component != null && !component.hideFlags.ContainsFlag(HideFlags.HideInInspector))
+                .Prepend<Object>(gameObject);
 
-            foreach (Component component in components)
+            var dropdownItems = new List<DropdownItem<Object>>();
+
+            foreach (var component in components)
             {
                 var componentType = component.GetType();
                 var componentMenu = componentType.GetCustomAttribute<AddComponentMenu>();
@@ -231,10 +235,10 @@ private void DrawComponentDropdown(SerializedProperty listenerProperty, Serializ
                     componentName = ObjectNames.NicifyVariableName(componentType.Name);
                 }
 
-                dropdownItems.Add(new DropdownItem<Component>(component, componentName, EditorGUIUtility.ObjectContent(component, componentType).image));
+                dropdownItems.Add(new DropdownItem<Object>(component, componentName, EditorGUIUtility.ObjectContent(component, componentType).image));
             }
 
-            var tree = new DropdownMenu<Component>(dropdownItems, component =>
+            var tree = new DropdownMenu<Object>(dropdownItems, component =>
             {
                 targetProperty.objectReferenceValue = component;
                 targetProperty.serializedObject.ApplyModifiedProperties();

Runtime/EventElements/PersistentArgument.cs

@@ -32,20 +32,9 @@ public class PersistentArgument
         [SerializeField] internal bool _canBeDynamic;
 
         private ArgumentHolder _argumentHolder;
-        private bool _initialized;
 
-        private ArgumentHolder GetArgumentHolder(string serializedArg, Type valueType)
-        {
-            if (!_initialized)
-            {
-                // It's important to assign argumentHolder to a field so that it is not cleaned by GC until we stop using PersistentArgument.
-                _initialized = true;
-                var type = typeof(ArgumentHolder<>).MakeGenericType(valueType);
-                _argumentHolder = (ArgumentHolder) JsonUtility.FromJson(serializedArg, type);
-            }
-
-            return _argumentHolder;
-        }
+        // NonSerialized is required here, otherwise Unity will try to serialize the field even though we didn't put SerializeField attribute.
+        [NonSerialized] internal bool _initialized;
 
         internal unsafe void* SerializedValuePointer
         {
@@ -151,5 +140,18 @@ internal static string SerializeValue(object value, Type valueType)
             var argHolder = Activator.CreateInstance(argHolderType, value);
             return JsonUtility.ToJson(argHolder);
         }
+
+        private ArgumentHolder GetArgumentHolder(string serializedArg, Type valueType)
+        {
+            if (!_initialized)
+            {
+                // It's important to assign argumentHolder to a field so that it is not cleaned by GC until we stop using PersistentArgument.
+                _initialized = true;
+                var type = typeof(ArgumentHolder<>).MakeGenericType(valueType);
+                _argumentHolder = (ArgumentHolder) JsonUtility.FromJson(serializedArg, type);
+            }
+
+            return _argumentHolder;
+        }
     }
 }

Runtime/EventElements/PersistentListener.cs

@@ -58,9 +58,7 @@ public partial class PersistentListener
 
         [NonSerialized] internal bool _initializationComplete;
         [NonSerialized] private bool _initializationSuccessful;
-
         private unsafe void*[] _arguments;
-
         private BaseInvokableCall _invokableCall;
 
         private PersistentListener() { }

package.json

@@ -4,7 +4,7 @@
   "displayName": "ExtEvents",
   "description": "UnityEvents, but better.",
   "dependencies": {
-    "com.solidalloy.util": "1.37.1",
+    "com.solidalloy.util": "1.38.0",
     "com.unity.settings-manager": "1.0.3",
     "com.solidalloy.type-references": "2.15.0",
     "com.solidalloy.unity-dropdown": "1.1.1"