From ea192221348fd6b7d7a4a4ffcf3cac2c590bef1e Mon Sep 17 00:00:00 2001 From: Mikhail <99481254+DCFApixels@users.noreply.github.com> Date: Sat, 9 Mar 2024 23:09:14 +0800 Subject: [PATCH] update --- src/Connectors/EcsEntityConnect.cs | 1 - .../Editor/AutoEntityCreatorEditor.cs | 2 +- .../Editor/EcsEntityConnectEditor.cs | 5 ++-- .../Editor/EcsWorldProviderBaseEditor.cs | 2 +- .../SOWrappers/UnityObjEditorWrapper.cs | 29 ------------------- .../SOWrappers/UnityObjEditorWrapper.cs.meta | 11 ------- 6 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 src/Internal/Editor/SOWrappers/UnityObjEditorWrapper.cs delete mode 100644 src/Internal/Editor/SOWrappers/UnityObjEditorWrapper.cs.meta diff --git a/src/Connectors/EcsEntityConnect.cs b/src/Connectors/EcsEntityConnect.cs index 073c5f4..895b867 100644 --- a/src/Connectors/EcsEntityConnect.cs +++ b/src/Connectors/EcsEntityConnect.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Runtime.CompilerServices; using UnityEditor; using UnityEngine; -using static UnityEngine.GraphicsBuffer; namespace DCFApixels.DragonECS { diff --git a/src/Connectors/Editor/AutoEntityCreatorEditor.cs b/src/Connectors/Editor/AutoEntityCreatorEditor.cs index 91d27d8..402618d 100644 --- a/src/Connectors/Editor/AutoEntityCreatorEditor.cs +++ b/src/Connectors/Editor/AutoEntityCreatorEditor.cs @@ -7,7 +7,7 @@ namespace DCFApixels.DragonECS.Unity.Editors { [CustomEditor(typeof(AutoEntityCreator))] [CanEditMultipleObjects] - public class AutoEntityCreatorEditor : Editor + internal class AutoEntityCreatorEditor : Editor { private AutoEntityCreator Target => (AutoEntityCreator)target; diff --git a/src/Connectors/Editor/EcsEntityConnectEditor.cs b/src/Connectors/Editor/EcsEntityConnectEditor.cs index e103e54..ae099a9 100644 --- a/src/Connectors/Editor/EcsEntityConnectEditor.cs +++ b/src/Connectors/Editor/EcsEntityConnectEditor.cs @@ -1,5 +1,4 @@ #if UNITY_EDITOR -using Codice.CM.Client.Differences; using DCFApixels.DragonECS.Unity.Internal; using UnityEditor; using UnityEngine; @@ -8,7 +7,7 @@ namespace DCFApixels.DragonECS.Unity.Editors { [CustomEditor(typeof(EcsEntityConnect))] [CanEditMultipleObjects] - public class EcsEntityConnectEditor : Editor + internal class EcsEntityConnectEditor : Editor { private bool _isInit = false; private EcsEntityConnect Target => (EcsEntityConnect)target; @@ -75,7 +74,7 @@ namespace DCFApixels.DragonECS.Unity.Editors target.AutosetCascade_Editor(); } } - buttonRect = RectUtility.Move(buttonRect , - height, 0); + buttonRect = RectUtility.Move(buttonRect, -height, 0); if (EcsGUI.AutosetButton(buttonRect)) { foreach (var target in targets) diff --git a/src/Connectors/Editor/EcsWorldProviderBaseEditor.cs b/src/Connectors/Editor/EcsWorldProviderBaseEditor.cs index aba9bfe..4e53ce5 100644 --- a/src/Connectors/Editor/EcsWorldProviderBaseEditor.cs +++ b/src/Connectors/Editor/EcsWorldProviderBaseEditor.cs @@ -6,7 +6,7 @@ namespace DCFApixels.DragonECS.Unity.Editors { [CustomEditor(typeof(EcsWorldProviderBase), true)] [CanEditMultipleObjects] - public class EcsWorldProviderBaseEditor : Editor + internal class EcsWorldProviderBaseEditor : Editor { private EcsWorldProviderBase Target => (EcsWorldProviderBase)target; diff --git a/src/Internal/Editor/SOWrappers/UnityObjEditorWrapper.cs b/src/Internal/Editor/SOWrappers/UnityObjEditorWrapper.cs deleted file mode 100644 index fdb96d6..0000000 --- a/src/Internal/Editor/SOWrappers/UnityObjEditorWrapper.cs +++ /dev/null @@ -1,29 +0,0 @@ -#if UNITY_EDITOR -using System; -using System.Runtime.CompilerServices; -using UnityEngine; - -namespace DCFApixels.DragonECS.Unity.Editors -{ - [Serializable] - internal class UnityObjEditorWrapper : WrapperBase - { - [SerializeField] - public UnityEngine.Object data; - - public override object Data - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - get { return data; } - } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static UnityObjEditorWrapper Take(UnityEngine.Object data) - { - var result = Take(); - result.data = data; - result.SO.Update(); - return result; - } - } -} -#endif diff --git a/src/Internal/Editor/SOWrappers/UnityObjEditorWrapper.cs.meta b/src/Internal/Editor/SOWrappers/UnityObjEditorWrapper.cs.meta deleted file mode 100644 index 8960b1f..0000000 --- a/src/Internal/Editor/SOWrappers/UnityObjEditorWrapper.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7060bf63683c82a4a8a6cf54255c4139 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: