diff --git a/Assets/Prefabs/UI/Panel_AssetLibrary.prefab b/Assets/Prefabs/UI/Panel_AssetLibrary.prefab index d5ea4f1e..413feb0c 100644 --- a/Assets/Prefabs/UI/Panel_AssetLibrary.prefab +++ b/Assets/Prefabs/UI/Panel_AssetLibrary.prefab @@ -741,9 +741,9 @@ RectTransform: - {fileID: 4025239001078294694} m_Father: {fileID: 936738251328364793} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 189, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 378, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4767398228959288287 @@ -932,9 +932,7 @@ MonoBehaviour: onParentChanged: m_PersistentCalls: m_Calls: [] - isExpand: 0 - isDraggable: 0 - isMultiSelectable: 0 + isSiblingEditable: 0 --- !u!1 &3301787329340213833 GameObject: m_ObjectHideFlags: 0 @@ -968,9 +966,9 @@ RectTransform: - {fileID: 6196079402131593365} m_Father: {fileID: 936738251328364793} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 189, y: -69} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 378, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8393933897988015468 @@ -1121,9 +1119,9 @@ RectTransform: m_Father: {fileID: 8977095973089369057} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &6742899340659963023 CanvasRenderer: @@ -1241,7 +1239,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uAC1D\uCCB4 \uB77C\uC774\uBE0C\uB7EC\uB9AC" + m_text: "\uC790\uC0B0 \uBAA9\uB85D\uCC3D" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} @@ -2166,7 +2164,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2790108437195061205 RectTransform: m_ObjectHideFlags: 0 @@ -2733,9 +2731,9 @@ RectTransform: - {fileID: 8977095973089369057} m_Father: {fileID: 936738251328364793} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 189, y: -498} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 378, y: 804} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1884925470734021449 diff --git a/Assets/Scenes/0.20.5.unity b/Assets/Scenes/0.20.5.unity index 1867c58b..7ab72ee6 100644 --- a/Assets/Scenes/0.20.5.unity +++ b/Assets/Scenes/0.20.5.unity @@ -2373,11 +2373,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 735 objectReference: {fileID: 0} - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -42 objectReference: {fileID: 0} - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2409,11 +2409,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3131647868451843046, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3131647868451843046, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6378204672112227407, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_AnchorMax.y @@ -15299,6 +15299,7 @@ GameObject: - component: {fileID: 1602773717} - component: {fileID: 1602773716} - component: {fileID: 1602773715} + - component: {fileID: 1602773719} m_Layer: 5 m_Name: Canvas_SceneGizmo m_TagString: Untagged @@ -15389,6 +15390,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1602773719 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1602773714} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7ba136ec400eea8498140d9abaa63da5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1615364366 PrefabInstance: m_ObjectHideFlags: 0 @@ -29395,6 +29408,42 @@ PrefabInstance: propertyPath: m_Name value: Panel_AssetProperties objectReference: {fileID: 0} + - target: {fileID: 1047865254305374389, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -29457,11 +29506,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} propertyPath: m_AnchoredPosition.x - value: 431 + value: 353 objectReference: {fileID: 0} - target: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -27 objectReference: {fileID: 0} - target: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -29475,6 +29524,78 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7377906147476933673, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7377906147476933673, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_SceneGizmo.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_SceneGizmo.cs new file mode 100644 index 00000000..fc149411 --- /dev/null +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_SceneGizmo.cs @@ -0,0 +1,13 @@ +using UnityEngine; +using XRLib.UI; + +namespace XED +{ + public class Canvas_SceneGizmo : CanvasBase + { + public override void AfterAwake() + { + GetComponent().sortingOrder = -1; + } + } +} diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_SceneGizmo.cs.meta b/Assets/Scripts/Studio/UI/Canvas/Canvas_SceneGizmo.cs.meta new file mode 100644 index 00000000..19d87335 --- /dev/null +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_SceneGizmo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7ba136ec400eea8498140d9abaa63da5 \ No newline at end of file