com.soosvet_games.common_tools 1.1.7 → 1.1.8

package/Editor/HierarchyActivationTool.cs

@@ -1,4 +1,7 @@
-using UnityEditor;
+using System;
+using System.Linq.Expressions;
+using System.Reflection;
+using UnityEditor;
 using UnityEngine;
 
 namespace SoosvetGames.CommonTools.Extensions.Editor
@@ -6,63 +9,164 @@ namespace SoosvetGames.CommonTools.Extensions.Editor
     [ InitializeOnLoad ]
     internal static class HierarchyActivationTool
     {
+        private static FieldInfo _callbackField;
+        private static Delegate _callback;
+
         static HierarchyActivationTool()
         {
-#if UNITY_6000_5_OR_NEWER
-            EditorApplication.hierarchyWindowItemByEntityIdOnGUI -= HierarchyWindowOnGui;
-            EditorApplication.hierarchyWindowItemByEntityIdOnGUI += HierarchyWindowOnGui;
-#else
-            EditorApplication.hierarchyWindowItemOnGUI -= HierarchyWindowOnGui;
-            EditorApplication.hierarchyWindowItemOnGUI += HierarchyWindowOnGui;
-#endif
-        }
+            Install();
 
-#if UNITY_6000_5_OR_NEWER
+            AssemblyReloadEvents.beforeAssemblyReload += Uninstall;
+        }
 
-        // Unity 6000.5+
-        // ВАЖНО: здесь EntityId, никаких int / InstanceID.
-        private static void HierarchyWindowOnGui(
-            EntityId entityId,
-            Rect selectionRect)
+        private static void Install()
         {
-            GameObject obj =
-                EditorUtility.EntityIdToObject(entityId) as GameObject;
+            const BindingFlags flags = BindingFlags.Public | BindingFlags.Static;
 
-            DrawToggle(obj, selectionRect);
-        }
+            // Unity 6.5 / 6.6+
+            _callbackField = typeof(EditorApplication).GetField( "hierarchyWindowItemByEntityIdOnGUI", flags );
+
+            // Старые версии Unity
+            if ( _callbackField == null )
+            {
+                _callbackField = typeof(EditorApplication).GetField( "hierarchyWindowItemOnGUI", flags );
+            }
+
+            if ( _callbackField == null )
+            {
+                Debug.LogWarning( "[HierarchyActivationTool] " + "Hierarchy callback was not found." );
+
+                return;
+            }
+
+            Type delegateType = _callbackField.FieldType;
+
+            MethodInfo invokeMethod = delegateType.GetMethod( "Invoke" );
+
+            if ( invokeMethod == null )
+                return;
+
+            ParameterInfo[] parameters = invokeMethod.GetParameters();
+
+            if ( parameters.Length != 2 )
+                return;
+
+            Type idType = parameters[ 0 ].ParameterType;
+            Type rectType = parameters[ 1 ].ParameterType;
+
+            if ( rectType != typeof(Rect) )
+                return;
+
+            // В новой Unity это EntityIdToObject(EntityId).
+            // В старой — InstanceIDToObject(int).
+            string converterName = idType == typeof(int) ? "InstanceIDToObject" : "EntityIdToObject";
+
+            MethodInfo converterMethod = FindConverterMethod( converterName, idType );
+
+            if ( converterMethod == null )
+            {
+                Debug.LogWarning( $"[HierarchyActivationTool] " + $"{converterName} was not found." );
+
+                return;
+            }
+
+            /*
+             * Здесь динамически создаётся callback правильного типа:
+             *
+             * Старые Unity:
+             *     (int instanceId, Rect rect)
+             *
+             * Новые Unity:
+             *     (EntityId entityId, Rect rect)
+             *
+             * Поэтому EntityId вообще не фигурирует в исходном коде
+             * и старые Unity тоже могут его скомпилировать.
+             */
 
-#else
+            ParameterExpression idParameter = Expression.Parameter( idType, "id" );
 
-        // Старые версии Unity
-        private static void HierarchyWindowOnGui( int instanceId, Rect selectionRect )
+            ParameterExpression rectParameter = Expression.Parameter( typeof(Rect), "selectionRect" );
+
+            MethodCallExpression objectCall = Expression.Call( converterMethod, idParameter );
+
+            UnaryExpression gameObject = Expression.TypeAs( objectCall, typeof(GameObject) );
+
+            MethodInfo drawMethod = typeof(HierarchyActivationTool).GetMethod( nameof(DrawToggle), BindingFlags.NonPublic | BindingFlags.Static );
+
+            MethodCallExpression drawCall = Expression.Call( drawMethod, gameObject, rectParameter );
+
+            _callback = Expression.Lambda( delegateType, drawCall, idParameter, rectParameter ).Compile();
+
+            Delegate currentCallback = _callbackField.GetValue( null ) as Delegate;
+
+            Delegate newCallback = Delegate.Combine( currentCallback, _callback );
+
+            _callbackField.SetValue( null, newCallback );
+        }
+
+        private static MethodInfo FindConverterMethod( string methodName, Type idType )
         {
-            GameObject obj = EditorUtility.InstanceIDToObject( instanceId ) as GameObject;
+            const BindingFlags flags = BindingFlags.Public | BindingFlags.Static;
+
+            MethodInfo[] methods = typeof(EditorUtility).GetMethods( flags );
+
+            foreach ( MethodInfo method in methods )
+            {
+                if ( method.Name != methodName )
+                    continue;
 
-            DrawToggle( obj, selectionRect );
+                ParameterInfo[] parameters = method.GetParameters();
+
+                if ( parameters.Length != 1 )
+                    continue;
+
+                if ( parameters[ 0 ].ParameterType != idType )
+                    continue;
+
+                return method;
+            }
+
+            return null;
         }
 
-#endif
+        private static void Uninstall()
+        {
+            if ( _callbackField == null || _callback == null )
+            {
+                return;
+            }
+
+            Delegate currentCallback = _callbackField.GetValue( null ) as Delegate;
+
+            Delegate newCallback = Delegate.Remove( currentCallback, _callback );
+
+            _callbackField.SetValue( null, newCallback );
+
+            _callback = null;
+        }
 
         private static void DrawToggle( GameObject obj, Rect selectionRect )
         {
             if ( obj == null )
                 return;
 
-            // Располагаем toggle относительно объекта,
-            // а не по абсолютному x = 35.
-            Rect toggleRect = new Rect( selectionRect.x - 18f, selectionRect.y, 16f, selectionRect.height );
+            // Сохраняем расположение как в твоём
+            // оригинальном инструменте.
+            Rect rect = new Rect( selectionRect ) { x = 35, width = 18 };
 
             bool previousValue = obj.activeSelf;
 
-            bool newValue = GUI.Toggle( toggleRect, previousValue, GUIContent.none );
+            bool newValue = GUI.Toggle( rect, previousValue, GUIContent.none );
 
             if ( newValue == previousValue )
                 return;
 
-            Undo.RecordObject( obj, newValue ? $"Activate {obj.name}" : $"Deactivate {obj.name}" );
+            Undo.RecordObject( obj, $"Set Active {obj.name}" );
 
             obj.SetActive( newValue );
 
+            EditorUtility.SetDirty( obj );
+
             EditorApplication.RepaintHierarchyWindow();
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name" : "com.soosvet_games.common_tools",
     "displayName" : "Soosvet Games Common Tools",
-    "version" : "1.1.7",
+    "version" : "1.1.8",
     "author" : "Soosvet Games",
     "description" : "Common tools for Unity.",
     "repository": {