diff --git a/Assets/Prefabs/UI/ButtonDropdownItem.prefab b/Assets/Prefabs/UI/ButtonDropdownItem.prefab index 784402ca..8b951c3e 100644 --- a/Assets/Prefabs/UI/ButtonDropdownItem.prefab +++ b/Assets/Prefabs/UI/ButtonDropdownItem.prefab @@ -195,7 +195,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -386,7 +386,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Prefabs/UI/Panel_TopBar.prefab b/Assets/Prefabs/UI/Panel_TopBar.prefab index 7ac9b042..4f92dadf 100644 --- a/Assets/Prefabs/UI/Panel_TopBar.prefab +++ b/Assets/Prefabs/UI/Panel_TopBar.prefab @@ -1121,7 +1121,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1241,17 +1241,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eeb29fdb1a9fc134aa57e1efd67b4848, type: 3} m_Name: m_EditorClassIdentifier: - Button_NewProject: {fileID: 0} - Button_SaveProject: {fileID: 0} - Button_LoadProject: {fileID: 0} - Button_DownloadLayout: {fileID: 0} - Button_ExportAGVPath: {fileID: 0} - Button_ImportAGVPath: {fileID: 0} - Button_LoadAssets: {fileID: 0} - Button_AssetWindow: {fileID: 0} - Button_ComponentWindow: {fileID: 0} - Button_Tools: {fileID: 0} - button_Icon: {fileID: 0} + Button_NewProject: {fileID: 8845531612634989544} + Button_SaveProject: {fileID: 7896083598485264292} + Button_LoadProject: {fileID: 198223961060221410} + Button_DownloadLayout: {fileID: 6398619867125381537} + Button_ExportAGVPath: {fileID: 5335094302430846695} + Button_ImportAGVPath: {fileID: 4147750155540767454} + Button_LoadAssets: {fileID: 1572705195072342980} + Button_AssetWindow: {fileID: 9118390163350013474} + Button_HierarchyWindow: {fileID: 0} + Button_Tools: {fileID: 6255786153821147911} + Button_InterferedListWindow: {fileID: 0} + button_Icon: {fileID: 3577280054402309687} --- !u!1 &3034319458232227286 GameObject: m_ObjectHideFlags: 0 @@ -1737,7 +1738,7 @@ RectTransform: m_GameObject: {fileID: 3375801220601729173} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8294441913557132553} @@ -1748,7 +1749,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 108, y: -32} - m_SizeDelta: {x: 307, y: 154} + m_SizeDelta: {x: 307, y: 203} m_Pivot: {x: 0.5, y: 1} --- !u!222 &139751343822457032 CanvasRenderer: @@ -1772,7 +1773,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.16862746, g: 0.1764706, b: 0.24705882, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -4309,6 +4310,7 @@ RectTransform: - {fileID: 8688116085078439031} - {fileID: 4147382167238274784} - {fileID: 5821008458756972882} + - {fileID: 5512206668012317612} m_Father: {fileID: 8294441913557132553} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -4398,7 +4400,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -4406,11 +4408,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -4446,11 +4448,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -74 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4528,7 +4530,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -4536,11 +4538,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -4576,11 +4578,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -121 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4616,6 +4618,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} m_PrefabInstance: {fileID: 547219611680456040} m_PrefabAsset: {fileID: 0} +--- !u!114 &6255786153821147911 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + m_PrefabInstance: {fileID: 547219611680456040} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &686077476744845262 PrefabInstance: m_ObjectHideFlags: 0 @@ -4694,7 +4707,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -4702,11 +4715,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -4742,11 +4755,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4809,11 +4822,144 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} +--- !u!114 &6398619867125381537 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + m_PrefabInstance: {fileID: 686077476744845262} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &6833388731803765748 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} m_PrefabInstance: {fileID: 686077476744845262} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1958845721738098582 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6851815559567896889} + m_Modifications: + - target: {fileID: 1009026706481275526, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_Name + value: Button_InterferedListWindow + objectReference: {fileID: 0} + - target: {fileID: 2264174928851290062, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2264174928851290062, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2961650650638036762, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2961650650638036762, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_SizeDelta.y + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8232947906609958833, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_text + value: Interfered List + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} +--- !u!224 &5512206668012317612 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + m_PrefabInstance: {fileID: 1958845721738098582} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1964423804417470600 PrefabInstance: m_ObjectHideFlags: 0 @@ -4892,7 +5038,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -4900,11 +5046,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -4940,11 +5086,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -215 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5007,6 +5153,17 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} +--- !u!114 &5335094302430846695 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + m_PrefabInstance: {fileID: 1964423804417470600} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &5481852742840888498 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} @@ -5024,6 +5181,22 @@ PrefabInstance: propertyPath: m_Name value: Button_NewProject objectReference: {fileID: 0} + - target: {fileID: 2264174928851290062, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2264174928851290062, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2961650650638036762, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2961650650638036762, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -5038,7 +5211,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -5046,11 +5219,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -5086,11 +5259,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -27 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5109,6 +5282,17 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} +--- !u!114 &8845531612634989544 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + m_PrefabInstance: {fileID: 3136965122067459463} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &8996151517581488573 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} @@ -5168,7 +5352,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -5176,11 +5360,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -5216,11 +5400,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -27 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5256,6 +5440,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} m_PrefabInstance: {fileID: 3441346602397263949} m_PrefabAsset: {fileID: 0} +--- !u!114 &9118390163350013474 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + m_PrefabInstance: {fileID: 3441346602397263949} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4385836676027955659 PrefabInstance: m_ObjectHideFlags: 0 @@ -5334,7 +5529,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -5342,11 +5537,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -5382,11 +5577,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -74 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5454,6 +5649,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} m_PrefabInstance: {fileID: 4385836676027955659} m_PrefabAsset: {fileID: 0} +--- !u!114 &7896083598485264292 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + m_PrefabInstance: {fileID: 4385836676027955659} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4943340508714165675 PrefabInstance: m_ObjectHideFlags: 0 @@ -5532,7 +5738,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -5540,11 +5746,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -5580,11 +5786,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -309 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5652,6 +5858,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} m_PrefabInstance: {fileID: 4943340508714165675} m_PrefabAsset: {fileID: 0} +--- !u!114 &1572705195072342980 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + m_PrefabInstance: {fileID: 4943340508714165675} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6019380511333486477 PrefabInstance: m_ObjectHideFlags: 0 @@ -5730,7 +5947,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -5738,11 +5955,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -5778,11 +5995,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -121 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5845,6 +6062,17 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} +--- !u!114 &198223961060221410 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + m_PrefabInstance: {fileID: 6019380511333486477} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &349415598094472119 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} @@ -5928,7 +6156,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -5936,11 +6164,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -5976,11 +6204,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -262 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6043,6 +6271,17 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} +--- !u!114 &4147750155540767454 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5857240323948162671, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} + m_PrefabInstance: {fileID: 7549965645376523441} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &4582026471169970315 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} @@ -6090,7 +6329,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -6098,11 +6337,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -6138,11 +6377,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -74 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6220,7 +6459,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -6228,11 +6467,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.y @@ -6268,11 +6507,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -27 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Scripts/Studio/Managers/EventConnector.cs b/Assets/Scripts/Studio/Managers/EventConnector.cs index 01888430..eec19d04 100644 --- a/Assets/Scripts/Studio/Managers/EventConnector.cs +++ b/Assets/Scripts/Studio/Managers/EventConnector.cs @@ -36,7 +36,8 @@ namespace XED.Manage GameObject assetWindow = canvas_Popup.panel_assetlibrary.gameObject; SaveLoadFBXData saveLoadFBXData = customAssetConnector.saveLoadFBXData; GameObject componentWindow = canvas_Popup.panel_hierarchy.gameObject; - + GameObject interferedobjectlistWindow = canvas_Popup.panel_interferedobjectlist.gameObject; + UIConnection(); StatusConnection(); ManagerConnection(); @@ -95,6 +96,7 @@ namespace XED.Manage canvas_static.panel_topbar.onClickLoadAssets += saveLoadFBXData.LoadLocalFBXDirectory; canvas_static.panel_topbar.onClickAssetWindow += (() => assetWindow.SetActive(!assetWindow.activeSelf)); canvas_static.panel_topbar.onClickComponentWindow += (() => componentWindow.SetActive(!componentWindow.activeSelf)); + canvas_static.panel_topbar.onClickInterferedListWindow += (() => interferedobjectlistWindow.SetActive(!interferedobjectlistWindow.activeSelf)); //Panel Toolbar canvas_static.panel_toolbar.onClickMove += renderObjectHandler.SetRTGMove; diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index 8387de9c..7eeb1cb9 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -14,6 +14,7 @@ namespace XED public Panel_Hierarchy panel_hierarchy; public Panel_AssetLibrary panel_assetlibrary; public Panel_InterworkingDataList panel_interworkingdatalist; + public Panel_InterferedObjectList panel_interferedobjectlist; public Panel_AssetProperties panel_assetproperties; public Panel_PredefinedType panel_predefinedtype; public Panel_ObjectInfo panel_objectinfo; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs b/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs index d5ed99ab..ac27c424 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs @@ -1,6 +1,7 @@ using UnityEngine.UI; using System; using XRLib.UI; +using System.Diagnostics; namespace XED.UI { public class Panel_TopBar : PanelBase @@ -15,6 +16,7 @@ namespace XED.UI public Button Button_AssetWindow; public Button Button_HierarchyWindow; public Button Button_Tools; + public Button Button_InterferedListWindow; public Button button_Icon; public event Action onClickNewProject; @@ -26,7 +28,8 @@ namespace XED.UI public event Action onClickLoadAssets; public event Action onClickAssetWindow; public event Action onClickComponentWindow; - public event Action onClickTools; + public event Action onClickTools; + public event Action onClickInterferedListWindow; public event Action onClickIcon; public override void AfterAwake() { @@ -40,6 +43,7 @@ namespace XED.UI Button_AssetWindow.onClick.AddListener(OnClickAssetWindow); Button_HierarchyWindow.onClick.AddListener(OnClickHierarchyWindow); Button_Tools.onClick.AddListener(OnClickTools); + Button_InterferedListWindow.onClick.AddListener(OnClickInterferedListWindow); button_Icon.onClick.AddListener(OnClickIcon); } @@ -87,5 +91,9 @@ namespace XED.UI { onClickTools?.Invoke(); } + void OnClickInterferedListWindow() + { + onClickInterferedListWindow?.Invoke(); + } } }