diff --git a/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab b/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab index 1fcf88da..fe2181e1 100644 --- a/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab +++ b/Assets/Prefabs/AAA/Panel_StudioTopbar.prefab @@ -307,10 +307,10 @@ RectTransform: - {fileID: 2641865167890791995} m_Father: {fileID: 8236132945779869188} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 110, y: -22} - m_SizeDelta: {x: 210, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3489228134480339777 CanvasRenderer: @@ -1090,10 +1090,10 @@ RectTransform: - {fileID: 6894040108453440889} m_Father: {fileID: 5106551296758095294} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -124} - m_SizeDelta: {x: 290, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5212800262809355448 CanvasRenderer: @@ -1467,10 +1467,10 @@ RectTransform: - {fileID: 6467883027692677993} m_Father: {fileID: 6340558249613605857} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100.0695, y: -56} - m_SizeDelta: {x: 190.139, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1981890397451977413 CanvasRenderer: @@ -3282,10 +3282,10 @@ RectTransform: - {fileID: 6668256650124147009} m_Father: {fileID: 5106551296758095294} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -22} - m_SizeDelta: {x: 290, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7527628306696851762 CanvasRenderer: @@ -3862,10 +3862,10 @@ RectTransform: - {fileID: 3488610485283054401} m_Father: {fileID: 3612353324306706568} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 120, y: -56} - m_SizeDelta: {x: 230, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7519002699685595081 CanvasRenderer: @@ -4810,10 +4810,10 @@ RectTransform: - {fileID: 7631676095961012699} m_Father: {fileID: 3612353324306706568} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 120, y: -22} - m_SizeDelta: {x: 230, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5915613553988833987 CanvasRenderer: @@ -4950,10 +4950,10 @@ RectTransform: - {fileID: 239898139430097969} m_Father: {fileID: 8236132945779869188} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 110, y: -124} - m_SizeDelta: {x: 210, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4247297422581378552 CanvasRenderer: @@ -7313,10 +7313,10 @@ RectTransform: - {fileID: 4934558975903239102} m_Father: {fileID: 8236132945779869188} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 110, y: -90} - m_SizeDelta: {x: 210, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3369121211994654138 CanvasRenderer: @@ -8007,10 +8007,10 @@ RectTransform: - {fileID: 7773128163535172080} m_Father: {fileID: 5106551296758095294} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -158} - m_SizeDelta: {x: 290, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1538201362206907658 CanvasRenderer: @@ -9512,10 +9512,10 @@ RectTransform: - {fileID: 8983976402599428563} m_Father: {fileID: 5106551296758095294} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -90} - m_SizeDelta: {x: 290, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8819351641869115221 CanvasRenderer: @@ -11877,10 +11877,10 @@ RectTransform: - {fileID: 3407360332968577993} m_Father: {fileID: 8236132945779869188} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 110, y: -56} - m_SizeDelta: {x: 210, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4300145224472273166 CanvasRenderer: @@ -12545,10 +12545,10 @@ RectTransform: - {fileID: 6769054886412449106} m_Father: {fileID: 5106551296758095294} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -56} - m_SizeDelta: {x: 290, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6487236260048461744 CanvasRenderer: @@ -12978,10 +12978,10 @@ RectTransform: - {fileID: 4551446790370479478} m_Father: {fileID: 7049248817799997631} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 64.48075, y: -22} - m_SizeDelta: {x: 118.9615, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8129281279843792023 CanvasRenderer: @@ -13118,10 +13118,10 @@ RectTransform: - {fileID: 643449707283617506} m_Father: {fileID: 7049248817799997631} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 64.48075, y: -56} - m_SizeDelta: {x: 118.9615, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3258050494349403066 CanvasRenderer: @@ -13431,10 +13431,10 @@ RectTransform: - {fileID: 290966527929266020} m_Father: {fileID: 6340558249613605857} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100.0695, y: -22} - m_SizeDelta: {x: 190.139, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8978547910611737479 CanvasRenderer: diff --git a/Assets/Prefabs/AAA/Panel_Toolbox.prefab b/Assets/Prefabs/AAA/Panel_Toolbox.prefab index 38b2520f..83818c1f 100644 --- a/Assets/Prefabs/AAA/Panel_Toolbox.prefab +++ b/Assets/Prefabs/AAA/Panel_Toolbox.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 403790651948103616} - component: {fileID: 3946186376694391751} - component: {fileID: 4754171304233797908} + - component: {fileID: 5692666189586911590} m_Layer: 5 m_Name: Button_CopyObject m_TagString: Untagged @@ -121,6 +122,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &5692666189586911590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 265787027908541546} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6bd4fe9748586f47af6460d15964110, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltipText: Copy Object --- !u!1 &976429591461805790 GameObject: m_ObjectHideFlags: 0 @@ -180,7 +194,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: @@ -265,7 +279,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: @@ -361,7 +375,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: @@ -389,6 +403,7 @@ GameObject: - component: {fileID: 4179844308421223349} - component: {fileID: 274391191339824278} - component: {fileID: 408133449055997758} + - component: {fileID: 7315108059862719290} m_Layer: 5 m_Name: Button_DeleteObject m_TagString: Untagged @@ -498,6 +513,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &7315108059862719290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2467568269004610593} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6bd4fe9748586f47af6460d15964110, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltipText: Delete Object --- !u!1 &2729218007367948535 GameObject: m_ObjectHideFlags: 0 @@ -510,6 +538,7 @@ GameObject: - component: {fileID: 4829470509306811104} - component: {fileID: 7673940434916931189} - component: {fileID: 4332224196578230661} + - component: {fileID: 4769308848330047932} m_Layer: 5 m_Name: Button_Redo m_TagString: Untagged @@ -619,6 +648,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &4769308848330047932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2729218007367948535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6bd4fe9748586f47af6460d15964110, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltipText: Redo --- !u!1 &3020399564922232604 GameObject: m_ObjectHideFlags: 0 @@ -631,6 +673,7 @@ GameObject: - component: {fileID: 6955413316334478204} - component: {fileID: 9072943290627183468} - component: {fileID: 7347060046859577198} + - component: {fileID: 7494703359732022538} m_Layer: 5 m_Name: Button_SaveProject m_TagString: Untagged @@ -740,6 +783,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &7494703359732022538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3020399564922232604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6bd4fe9748586f47af6460d15964110, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltipText: Save Project --- !u!1 &3286773486838708677 GameObject: m_ObjectHideFlags: 0 @@ -799,7 +855,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: @@ -874,7 +930,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: @@ -949,7 +1005,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: @@ -1024,7 +1080,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: @@ -1099,7 +1155,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: @@ -1127,6 +1183,7 @@ GameObject: - component: {fileID: 791579605769297379} - component: {fileID: 5555066186744269482} - component: {fileID: 2608162128687145283} + - component: {fileID: 5831261688905854438} m_Layer: 5 m_Name: Button_ScaleGizmo m_TagString: Untagged @@ -1237,6 +1294,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &5831261688905854438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5281600493151853629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6bd4fe9748586f47af6460d15964110, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltipText: Scale Gizmo --- !u!1 &5680193822537945371 GameObject: m_ObjectHideFlags: 0 @@ -1296,7 +1366,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: @@ -1371,7 +1441,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1446,7 +1516,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1521,7 +1591,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1549,6 +1619,7 @@ GameObject: - component: {fileID: 2700340825488370104} - component: {fileID: 2960046717422333715} - component: {fileID: 2294932034123342636} + - component: {fileID: 4690043612467432898} m_Layer: 5 m_Name: Button_Run m_TagString: Untagged @@ -1659,6 +1730,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &4690043612467432898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7085081813181737744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6bd4fe9748586f47af6460d15964110, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltipText: Run --- !u!1 &7314677245254137759 GameObject: m_ObjectHideFlags: 0 @@ -1718,7 +1802,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1793,7 +1877,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1821,6 +1905,7 @@ GameObject: - component: {fileID: 1104937441688174212} - component: {fileID: 2387543470826281499} - component: {fileID: 3721177080757837880} + - component: {fileID: 16819707330558517} m_Layer: 5 m_Name: Button_MoveGizmo m_TagString: Untagged @@ -1931,6 +2016,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &16819707330558517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8146516467068974934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6bd4fe9748586f47af6460d15964110, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltipText: Move Gizmo --- !u!1 &8669998191490944890 GameObject: m_ObjectHideFlags: 0 @@ -1943,6 +2041,7 @@ GameObject: - component: {fileID: 5923409785368501235} - component: {fileID: 7452837045957790111} - component: {fileID: 470186664706083495} + - component: {fileID: 8276844273185009546} m_Layer: 5 m_Name: Button_Undo m_TagString: Untagged @@ -2052,6 +2151,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &8276844273185009546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8669998191490944890} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6bd4fe9748586f47af6460d15964110, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltipText: Undo --- !u!1 &9007909015713058797 GameObject: m_ObjectHideFlags: 0 @@ -2064,6 +2176,7 @@ GameObject: - component: {fileID: 584796686791580021} - component: {fileID: 6144906123351670505} - component: {fileID: 30726297808132654} + - component: {fileID: 3751716946903717258} m_Layer: 5 m_Name: Button_RotateGizmo m_TagString: Untagged @@ -2174,3 +2287,16 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &3751716946903717258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9007909015713058797} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6bd4fe9748586f47af6460d15964110, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltipText: Rotate Gizmo diff --git a/Assets/Prefabs/AAA/Panel_Tooltip.prefab b/Assets/Prefabs/AAA/Panel_Tooltip.prefab index 7314f9e4..c5cee9eb 100644 --- a/Assets/Prefabs/AAA/Panel_Tooltip.prefab +++ b/Assets/Prefabs/AAA/Panel_Tooltip.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 50} + m_SizeDelta: {x: 100, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4241131412235534449 CanvasRenderer: @@ -58,14 +58,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.48235294, g: 0.7254902, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 4986e28c0e91a7646bf3239c3fc6a4ce, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -134,7 +134,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: @@ -167,8 +167,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 16 + m_fontSizeBase: 16 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index 8549a565..83073a88 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -34,7 +34,6 @@ namespace Studio public Panel_InterferedObjectList panel_interferedobjectlist; public Panel_PredefinedType panel_predefinedtype; public Panel_DynamicObjectInfo panel_dynamicobjectinfo; - public Panel_Tooltip panel_tooltip; public Panel_PropertyViewer panel_propertyviewer; //public Panel_ObjectDistance panel_objectdistance; public Panel_APIConnectModal panel_apiconnectmodal; @@ -59,22 +58,17 @@ namespace Studio public override void AfterAwake() { - var raycaster = GameObject.FindAnyObjectByType(); var fbxFileManager = ManagerHub.instance.Get(); var renderObjectHandler = ManagerHub.instance.Get(); var childPanels = GetComponentsInChildren(true); - panel_dynamicobjectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged; - - raycaster.onUIHoverEvent += panel_tooltip.ActivateTooltip; - raycaster.onUIHoverExitEvent += panel_tooltip.DeactivateTooltip; + panel_dynamicobjectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged; foreach (var panel in childPanels) { panel.onEnableEvent += SetPanelAsLastSibling; } - canvasHandler = new PopupCanvasHandler(this); var assetManager = ManagerHub.instance.Get(); diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs index 4404963d..c85db543 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs @@ -14,6 +14,7 @@ namespace Studio.UI public Panel_StudioTopBar panel_studiotopbar; public Panel_SceneTab panel_scenetab; public Panel_Toolbox panel_toolbox; + public Panel_Tooltip panel_tooltip; private void Awake() { @@ -24,6 +25,7 @@ namespace Studio.UI { var statusPanel = FindSingle(); var projectManager = ManagerHub.instance.Get(); + var raycaster = GameObject.FindAnyObjectByType(); statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout); @@ -36,6 +38,9 @@ namespace Studio.UI panel_studiotopbar.onClickLanguageSetting += FindAnyObjectByType().Search; panel_studiotopbar.onClickClose += () => CommandInvoker.instance.Invoke(new ExitProgramCommand()); + + raycaster.onUIHoverEvent += panel_tooltip.ActivateTooltip; + raycaster.onUIHoverExitEvent += panel_tooltip.DeactivateTooltip; } } }