기모지 버그 수정, 간섭 객체 목록 기능 복구 #44

Merged
UVCXR merged 6 commits from pgd/20250410 into main 2025-04-14 09:22:50 +09:00
7 changed files with 11 additions and 50 deletions

View File

@@ -59,7 +59,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1 m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:

View File

@@ -369,50 +369,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 157621255} m_GameObject: {fileID: 157621255}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &183140327
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 183140328}
- component: {fileID: 183140329}
m_Layer: 0
m_Name: InterferedObjectManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &183140328
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 183140327}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1093055756}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &183140329
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 183140327}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0c728344b2bbf5746b1a41daa8ff51b0, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &205918190 --- !u!1 &205918190
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4337,7 +4293,6 @@ Transform:
- {fileID: 538683123} - {fileID: 538683123}
- {fileID: 617235297} - {fileID: 617235297}
- {fileID: 1801579273} - {fileID: 1801579273}
- {fileID: 183140328}
- {fileID: 749092880} - {fileID: 749092880}
- {fileID: 1683270824} - {fileID: 1683270824}
m_Father: {fileID: 0} m_Father: {fileID: 0}

View File

@@ -108,6 +108,8 @@ namespace XED.RuntimeGizmo
objectRotationGizmo.SetTargetObjects(selectedObjects); objectRotationGizmo.SetTargetObjects(selectedObjects);
objectScaleGizmo.SetTargetObjects(selectedObjects); objectScaleGizmo.SetTargetObjects(selectedObjects);
objectUniversalGizmo.SetTargetObjects(selectedObjects); objectUniversalGizmo.SetTargetObjects(selectedObjects);
workGizmo.Gizmo.SetEnabled(selectedObjects.Count != 0);
} }
private void OnGizmoDragBegin(Gizmo gizmo, int t) private void OnGizmoDragBegin(Gizmo gizmo, int t)
{ {

View File

@@ -73,7 +73,7 @@ namespace XED.Util
Show(); Show();
} }
OnOverlabBegin?.Invoke(GetComponent<TwinObject>(), other.GetComponent<TwinObject>()); OnOverlabBegin?.Invoke(GetComponent<TwinObject>(), other.gameObject.GetComponent<TwinObject>());
} }
private void OnTriggerExit(Collider other) private void OnTriggerExit(Collider other)
{ {
@@ -91,7 +91,7 @@ namespace XED.Util
} }
} }
OnOverlabEnd?.Invoke(GetComponent<TwinObject>(), other.GetComponent<TwinObject>()); OnOverlabEnd?.Invoke(GetComponent<TwinObject>(), other.gameObject.GetComponent<TwinObject>());
} }
public void OnPointerEnter(PointerEventData eventData) public void OnPointerEnter(PointerEventData eventData)
{ {

View File

@@ -260,7 +260,7 @@ namespace XED.Util
if (selectedRenderObjects.Count == 0) if (selectedRenderObjects.Count == 0)
return; return;
ManagerHub.instance.Get<CustomAssetConnector>().OnCopyObject(copyRenderObjects); ManagerHub.instance.Get<CustomAssetConnector>().OnCopyObject(selectedRenderObjects);
} }
public void SaveItemsToCopy() public void SaveItemsToCopy()
{ {

View File

@@ -50,6 +50,7 @@ namespace XED.Manage
var customAssetConnector = ManagerHub.instance.Get<CustomAssetConnector>(); var customAssetConnector = ManagerHub.instance.Get<CustomAssetConnector>();
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>(); var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
var projectManager = ManagerHub.instance.Get<ProjectManager>(); var projectManager = ManagerHub.instance.Get<ProjectManager>();
var interferedObjectManager = ManagerHub.instance.Get<InterferedObjectManager>();
FBXFileManager fbxFileManager = ManagerHub.instance.Get<FBXFileManager>(); FBXFileManager fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
GameObject componentWindow = canvas_Popup.panel_hierarchy.gameObject; GameObject componentWindow = canvas_Popup.panel_hierarchy.gameObject;
@@ -71,6 +72,9 @@ namespace XED.Manage
rayCaster.onUIHoverEvent += canvas_Popup.panel_tooltip.ActivateTooltip; rayCaster.onUIHoverEvent += canvas_Popup.panel_tooltip.ActivateTooltip;
rayCaster.onUIHoverExitEvent += canvas_Popup.panel_tooltip.DeactivateTooltip; rayCaster.onUIHoverExitEvent += canvas_Popup.panel_tooltip.DeactivateTooltip;
//rayCaster.AddEvent(Raycaster.EventType.FirstRightClickOnly, typeof(TwinObject), canvas_Popup.panel_propertyviewer.Activate); //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; InputHandler defaultInputHandler;

View File

@@ -6,7 +6,7 @@ using XED.Core;
namespace XED namespace XED
{ {
public class UpdateRunner : UnitySingleton<SystemMain> public class UpdateRunner : UnitySingleton<UpdateRunner>
{ {
private static List<Action> updateActions = new List<Action>(); private static List<Action> updateActions = new List<Action>();