diff --git a/Runtime/Agoxandr.Utils.asmdef b/Runtime/Agoxandr.Utils.asmdef index f15a942..c3ef18b 100644 --- a/Runtime/Agoxandr.Utils.asmdef +++ b/Runtime/Agoxandr.Utils.asmdef @@ -14,6 +14,11 @@ "name": "com.unity.modules.physics", "expression": "", "define": "COM_UNITY_MODULES_PHYSICS" + }, + { + "name": "com.unity.netcode.gameobjects", + "expression": "", + "define": "COM_UNITY_NETCODE_GAMEOBJECTS" } ], "noEngineReferences": false diff --git a/Runtime/DefaultScriptableObjectEditor.cs b/Runtime/DefaultScriptableObjectEditor.cs deleted file mode 100644 index 0cf178a..0000000 --- a/Runtime/DefaultScriptableObjectEditor.cs +++ /dev/null @@ -1,34 +0,0 @@ -#if UNITY_EDITOR -using UnityEditor; -using UnityEngine; - -namespace Utils -{ - [CustomEditor(typeof(ScriptableObject), true)] - public class DefaultScriptableObjectEditor : Editor - { - private bool hideScriptField; - - private void OnEnable() - { - hideScriptField = target.GetType().GetCustomAttributes(typeof(HideScriptField), false).Length > 0; - } - - public override void OnInspectorGUI() - { - if (hideScriptField) - { - serializedObject.Update(); - EditorGUI.BeginChangeCheck(); - DrawPropertiesExcluding(serializedObject, "m_Script"); - if (EditorGUI.EndChangeCheck()) - serializedObject.ApplyModifiedProperties(); - } - else - { - base.OnInspectorGUI(); - } - } - } -} -#endif \ No newline at end of file diff --git a/Runtime/DefaultScriptableObjectEditor.cs.meta b/Runtime/DefaultScriptableObjectEditor.cs.meta deleted file mode 100644 index 4abe201..0000000 --- a/Runtime/DefaultScriptableObjectEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cf2664ad6bca36847b220c7a796fda2f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/DefaultMonoBehaviourEditor.cs b/Runtime/HiddenScriptFieldInspector.cs similarity index 63% rename from Runtime/DefaultMonoBehaviourEditor.cs rename to Runtime/HiddenScriptFieldInspector.cs index fe01bb0..d477bc0 100644 --- a/Runtime/DefaultMonoBehaviourEditor.cs +++ b/Runtime/HiddenScriptFieldInspector.cs @@ -1,36 +1,53 @@ -#if UNITY_EDITOR -using UnityEditor; -using UnityEngine; - -namespace Utils -{ - [CustomEditor(typeof(MonoBehaviour), true)] - public class DefaultMonoBehaviourEditor : Editor - { - private bool hideScriptField; - - private void OnEnable() - { - hideScriptField = target.GetType().GetCustomAttributes(typeof(HideScriptField), false).Length > 0; - } - - public override void OnInspectorGUI() - { - if (hideScriptField) - { - serializedObject.Update(); - EditorGUI.BeginChangeCheck(); - DrawPropertiesExcluding(serializedObject, "m_Script"); - if (EditorGUI.EndChangeCheck()) - { - serializedObject.ApplyModifiedProperties(); - } - } - else - { - base.OnInspectorGUI(); - } - } - } -} +#if UNITY_EDITOR +using Unity.Netcode; +using UnityEditor; +using UnityEngine; + +namespace Utils +{ + public abstract class HiddenScriptFieldInspector : Editor + { + private bool hideScriptField; + + private void OnEnable() + { + hideScriptField = target.GetType().GetCustomAttributes(typeof(HideScriptField), false).Length > 0; + } + + public override void OnInspectorGUI() + { + if (hideScriptField) + { + serializedObject.Update(); + EditorGUI.BeginChangeCheck(); + DrawPropertiesExcluding(serializedObject, "m_Script"); + if (EditorGUI.EndChangeCheck()) + { + serializedObject.ApplyModifiedProperties(); + } + } + else + { + base.OnInspectorGUI(); + } + } + } + + [CustomEditor(typeof(MonoBehaviour), true)] + public class DefaultMonoBehaviourEditor : HiddenScriptFieldInspector + { + } + + [CustomEditor(typeof(ScriptableObject), true)] + public class DefaultScriptableObjectEditor : HiddenScriptFieldInspector + { + } + +#if COM_UNITY_NETCODE_GAMEOBJECTS + [CustomEditor(typeof(NetworkBehaviour), true)] + public class DefaultNetworkBehaviourEditor : HiddenScriptFieldInspector + { + } +#endif +} #endif \ No newline at end of file diff --git a/Runtime/DefaultMonoBehaviourEditor.cs.meta b/Runtime/HiddenScriptFieldInspector.cs.meta similarity index 83% rename from Runtime/DefaultMonoBehaviourEditor.cs.meta rename to Runtime/HiddenScriptFieldInspector.cs.meta index 6469c1b..95534de 100644 --- a/Runtime/DefaultMonoBehaviourEditor.cs.meta +++ b/Runtime/HiddenScriptFieldInspector.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eb81e1373aff45646b4be5eaacc2d20f +guid: bd71dcc30125e161ca9c7faddd531ca2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package.json b/package.json index e1a6dbe..5da03af 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ru.shazbot.utils", - "version": "3.1.1", + "version": "3.1.2", "displayName": "Utils", "description": "Utility useful for almost any project.", "licensesUrl": "https://git.shazbot.ru/Utils.git/tree/LICENSE.md",