diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs index 95018510..4034fd86 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs @@ -73,7 +73,7 @@ namespace XED.Util Show(); } - OnOverlabBegin?.Invoke(GetComponent(), other.GetComponent()); + OnOverlabBegin?.Invoke(GetComponent(), other.gameObject.GetComponent()); } private void OnTriggerExit(Collider other) { @@ -91,7 +91,7 @@ namespace XED.Util } } - OnOverlabEnd?.Invoke(GetComponent(), other.GetComponent()); + OnOverlabEnd?.Invoke(GetComponent(), other.gameObject.GetComponent()); } public void OnPointerEnter(PointerEventData eventData) { diff --git a/Assets/Scripts/Studio/Managers/EventConnector.cs b/Assets/Scripts/Studio/Managers/EventConnector.cs index c7b5023e..e55bffbb 100644 --- a/Assets/Scripts/Studio/Managers/EventConnector.cs +++ b/Assets/Scripts/Studio/Managers/EventConnector.cs @@ -50,6 +50,7 @@ namespace XED.Manage var customAssetConnector = ManagerHub.instance.Get(); var renderObjectHandler = ManagerHub.instance.Get(); var projectManager = ManagerHub.instance.Get(); + var interferedObjectManager = ManagerHub.instance.Get(); FBXFileManager fbxFileManager = ManagerHub.instance.Get(); GameObject componentWindow = canvas_Popup.panel_hierarchy.gameObject; @@ -71,6 +72,9 @@ namespace XED.Manage rayCaster.onUIHoverEvent += canvas_Popup.panel_tooltip.ActivateTooltip; rayCaster.onUIHoverExitEvent += canvas_Popup.panel_tooltip.DeactivateTooltip; //rayCaster.AddEvent(Raycaster.EventType.FirstRightClickOnly, typeof(TwinObject), canvas_Popup.panel_propertyviewer.Activate); + + interferedObjectManager.OnAddInterferedPair += canvas_Popup.panel_interferedobjectlist.CreateContentButton; + interferedObjectManager.OnRemoveInterferedPair += canvas_Popup.panel_interferedobjectlist.RemoveContentButton; } InputHandler defaultInputHandler;