diff --git a/Assets/Editor/WI/PanelBaseEditor.cs b/Assets/Editor/WI/PanelBaseEditor.cs index cfd1297e..fcd9b764 100644 --- a/Assets/Editor/WI/PanelBaseEditor.cs +++ b/Assets/Editor/WI/PanelBaseEditor.cs @@ -27,15 +27,15 @@ public class PanelBaseEditor : Editor { base.OnInspectorGUI(); - if (GUILayout.Button("Button Naming")) - { - ButtonNaming(); - } + //if (GUILayout.Button("Button Naming")) + //{ + // ButtonNaming(); + //} - if(GUILayout.Button("Text Titleling")) - { - TextTitleling(); - } + //if(GUILayout.Button("Text Titleling")) + //{ + // TextTitleling(); + //} } void TextTitleling() diff --git a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_StudioTopBar.cs b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_StudioTopBar.cs index 24a38f1c..6d8ad28f 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_StudioTopBar.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Panel/Panel_StudioTopBar.cs @@ -1,4 +1,6 @@ +using Studio.Manage; using System; +using UnityEngine; using UnityEngine.UI; using XRLib.UI; @@ -96,6 +98,8 @@ namespace Studio.UI void OnClickAssetLibraryWindow() { + Debug.Log("On Click Asset Library"); + //EventConnector.instance.GetCanvas().panel_assetlibrary.SetActive(true); onClickAssetLibraryWindow?.Invoke(); } diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 99be24b3..a28c978e 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -808,7 +808,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1105169851982576340, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_Name - value: Panel_StuidoTopbar + value: Panel_StudioTopbar objectReference: {fileID: 0} - target: {fileID: 1653917884358936151, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -2884,10 +2884,38 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4062748835041242030, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4062748835041242030, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4062748835041242030, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 5808496954263173159, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5808496954263173159, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} + propertyPath: m_AnchorMax.y + value: 0.99999034 + objectReference: {fileID: 0} + - target: {fileID: 7269315550475766926, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.000001480362 + objectReference: {fileID: 0} - target: {fileID: 7484356029459005624, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_Name value: Panel_AssetLibrary objectReference: {fileID: 0} + - target: {fileID: 7484356029459005624, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index 48d18d76..c7dbf324 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -114,8 +114,8 @@ namespace Studio.AssetTool } selectedItem = UnityEngine.GameObject.Instantiate(renderObjectPrefab); selectRenderObject = selectedItem.GetComponent(); - selectRenderObject.OnOverlabBegin += interferedObjectManager.AddInterferedPair; - selectRenderObject.OnOverlabEnd += interferedObjectManager.RemoveInterferedPair; + //selectRenderObject.OnOverlabBegin += interferedObjectManager.AddInterferedPair; + //selectRenderObject.OnOverlabEnd += interferedObjectManager.RemoveInterferedPair; selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate; selectRenderObject.instantiateObject = selectedAssetData.InstantiateLoadedObject; selectRenderObject.getBounds = selectedAssetData.GetCombinedBoundary; @@ -223,7 +223,6 @@ namespace Studio.AssetTool internal void OnSelectObjects(string name, List selectedObjects) { var canvas_Popup = EventConnector.instance.GetCanvas(); - canvas_Popup.panel_objectinfo.gameObject.SetActive(true); canvas_Popup.panel_objectinfo.SetObjectInfo(name, selectedObjects); canvas_Popup.panel_objectdistance.SelectObjectFromClick(name, selectedObjects); } diff --git a/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs b/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs index 25cf4b97..31745c33 100644 --- a/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs +++ b/Assets/Scripts/Studio/Command/ObjectCommand/CopyObjectCommand.cs @@ -60,8 +60,8 @@ namespace Studio.Command copyAsset.renderObject.transform.position = copySource.renderObject.transform.position; copyAsset.renderObject.transform.rotation = copySource.renderObject.transform.rotation; copyAsset.renderObject.transform.localScale = copySource.renderObject.transform.localScale; - copyAsset.renderObject.OnOverlabBegin += connector.interferedObjectManager.AddInterferedPair; - copyAsset.renderObject.OnOverlabEnd += connector.interferedObjectManager.RemoveInterferedPair; + //copyAsset.renderObject.OnOverlabBegin += connector.interferedObjectManager.AddInterferedPair; + //copyAsset.renderObject.OnOverlabEnd += connector.interferedObjectManager.RemoveInterferedPair; List lastParent = new List(); for (int j = 0; j < copyAsset.hierarchyItem.layerNum + 1; j++) @@ -87,8 +87,8 @@ namespace Studio.Command childAsset.renderObject.transform.rotation = childSource.renderObject.transform.rotation; childAsset.renderObject.transform.localScale = childSource.renderObject.transform.localScale; childAsset.renderObject.transform.parent = lastParent[childAsset.hierarchyItem.layerNum - 1]; - childAsset.renderObject.OnOverlabBegin += connector.interferedObjectManager.AddInterferedPair; - childAsset.renderObject.OnOverlabEnd += connector.interferedObjectManager.RemoveInterferedPair; + //childAsset.renderObject.OnOverlabBegin += connector.interferedObjectManager.AddInterferedPair; + //childAsset.renderObject.OnOverlabEnd += connector.interferedObjectManager.RemoveInterferedPair; if (lastParent.Count <= childAsset.hierarchyItem.layerNum) { diff --git a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs index 1835dfbd..50d1b7dc 100644 --- a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs @@ -8,7 +8,7 @@ namespace Studio.Manage public PopupCanvasHandler(Canvas_Popup canvas_popup) { var canvas_static = EventConnector.instance.GetCanvas(); - canvas_popup.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_popup.panel_assetproperties.Open); + //canvas_popup.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_popup.panel_assetproperties.Open); canvas_popup.panel_assetproperties.onClickPreview += canvas_popup.panel_predefinedtype.Open; canvas_popup.panel_thumbnail.onGetPosition += canvas_popup.panel_assetlibrary.GetPositionX; diff --git a/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs b/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs index 25b37e1c..ee9f9143 100644 --- a/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs @@ -16,14 +16,9 @@ namespace Studio.Manage GameObject interferedobjectlistWindow = canvas_Popup.panel_interferedobjectlist.gameObject; GameObject assetLibraryWindow = canvas_Popup.panel_assetlibrary.gameObject; - canvas_static.panel_studiotopbar.onClickAssetLibraryWindow += (() => assetLibraryWindow.SetActive(!assetLibraryWindow.activeSelf)); - canvas_static.panel_studiotopbar.onClickHierarchyWindow += (() => hierarchyWindow.SetActive(!hierarchyWindow.activeSelf)); + canvas_static.panel_studiotopbar.onClickAssetLibraryWindow += (() => assetLibraryWindow.SetActive(true)); + canvas_static.panel_studiotopbar.onClickHierarchyWindow += (() => hierarchyWindow.SetActive(true)); - //canvas_static.panel_shortcuts.onClickOpenAssetWindow += (() => assetWindow.SetActive(!assetWindow.activeSelf)); - //canvas_static.panel_shortcuts.onClickOpenComponentWindow += (() => componentWindow.SetActive(!componentWindow.activeSelf)); - //canvas_static.panel_modecontrol.onClickObjectMode += () => statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout); - - //canvas_static.panel_studiotopbar.onClickComponentWindow += (() => componentWindow.SetActive(!componentWindow.activeSelf)); } } } \ No newline at end of file diff --git a/Assets/Scripts/Studio/UI/Elements/UI_MQTTConnection.cs b/Assets/Scripts/Studio/UI/Elements/UI_MQTTConnection.cs index 7875fd6c..4204bca8 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_MQTTConnection.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_MQTTConnection.cs @@ -36,7 +36,7 @@ namespace XED prf_InputTopicItem = Resources.Load("Prefabs/UI/PRF_InputTopicItem"); Button_AddTopicItem.onClick.AddListener(OnClickAddURLItemButton); - Button_TestMQTT.onClick.AddListener(OnClickTestAPIButton); + Button_TestMQTT.onClick.AddListener(OnClickTestMQTT); Button_Remove.onClick.AddListener(OnClickRemoveItemButton); inputTopicItems.Clear(); @@ -49,7 +49,7 @@ namespace XED AddURLItem(item); Button_AddTopicItem.transform.SetAsLastSibling(); } - private void OnClickTestAPIButton() + private void OnClickTestMQTT() { onTestAPI?.Invoke(); } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs index 26f5bb5b..893552ec 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AssetLibrary.cs @@ -34,4 +34,4 @@ namespace Studio.UI return rectTransform.anchoredPosition.x; } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs index 19b2fbec..bfa73a5d 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs @@ -33,20 +33,6 @@ namespace Studio.UI SetActive(false); } - private void OnClickPreview() - { - // Test - string[,] testArray = new string[3, 2]; - - testArray[0, 0] = "동작 현황"; - testArray[0, 1] = EPredefinedType.String.ToString(); - testArray[1, 0] = "양품률(24h)"; - testArray[1, 1] = EPredefinedType.Float.ToString(); - testArray[2, 0] = "가동 시간"; - testArray[2, 1] = EPredefinedType.Int.ToString(); - onClickPreview?.Invoke(testArray); - } - public void Open(List selectedItems) { Init(); diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectInfo.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectInfo.cs index 37074bea..3140afa2 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectInfo.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectInfo.cs @@ -238,6 +238,7 @@ namespace Studio.UI { lastSelectedInputField = new SelectedInput(InputFieldType.none, 0.0f); } + gameObject.SetActive(true); } public void ResetObjectInfo() { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs b/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs deleted file mode 100644 index 53293879..00000000 --- a/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs +++ /dev/null @@ -1,99 +0,0 @@ -using UnityEngine.UI; -using System; -using XRLib.UI; -using System.Diagnostics; -namespace Studio.UI -{ - public class Panel_TopBar : PanelBase - { - public Button Button_NewProject; - public Button Button_SaveProject; - public Button Button_LoadProject; - public Button Button_DownloadLayout; - public Button Button_ExportAGVPath; - public Button Button_ImportAGVPath; - public Button Button_LoadAssets; - public Button Button_AssetWindow; - public Button Button_HierarchyWindow; - public Button Button_Tools; - public Button Button_ConflictedListWindow; - public Button button_Icon; - - public event Action onClickNewProject; - public event Action onClickSaveProject; - public event Action onClickLoadProject; - public event Action onClickDownloadLayout; - public event Action onClickExportAGVPath; - public event Action onClickImportAGVPath; - public event Action onClickLoadAssets; - public event Action onClickAssetWindow; - public event Action onClickComponentWindow; - public event Action onClickTools; - public event Action onClickInterferedListWindow; - public event Action onClickIcon; - public override void AfterAwake() - { - Button_NewProject.onClick.AddListener(OnClickNewProject); - Button_SaveProject.onClick.AddListener(OnClickSaveProject); - Button_LoadProject.onClick.AddListener(OnClickLoadProject); - Button_DownloadLayout.onClick.AddListener(OnClickDownloadLayout); - Button_ExportAGVPath.onClick.AddListener(OnClickExportAGVPath); - Button_ImportAGVPath.onClick.AddListener(OnClickImportAGVPath); - Button_LoadAssets.onClick.AddListener(OnClickLoadAssets); - Button_AssetWindow.onClick.AddListener(OnClickAssetWindow); - Button_HierarchyWindow.onClick.AddListener(OnClickHierarchyWindow); - Button_Tools.onClick.AddListener(OnClickTools); - Button_ConflictedListWindow.onClick.AddListener(OnClickInterferedListWindow); - button_Icon.onClick.AddListener(OnClickIcon); - } - - void OnClickIcon() - { - onClickIcon?.Invoke(); - } - void OnClickNewProject() - { - onClickNewProject?.Invoke(); - } - void OnClickSaveProject() - { - onClickSaveProject?.Invoke(); - } - void OnClickLoadProject() - { - onClickLoadProject?.Invoke(); - } - void OnClickDownloadLayout() - { - onClickDownloadLayout?.Invoke(); - } - void OnClickExportAGVPath() - { - onClickExportAGVPath?.Invoke(); - } - void OnClickImportAGVPath() - { - onClickImportAGVPath?.Invoke(); - } - void OnClickLoadAssets() - { - onClickLoadAssets?.Invoke(); - } - void OnClickAssetWindow() - { - onClickAssetWindow?.Invoke(); - } - void OnClickHierarchyWindow() - { - onClickComponentWindow?.Invoke(); - } - void OnClickTools() - { - onClickTools?.Invoke(); - } - void OnClickInterferedListWindow() - { - onClickInterferedListWindow?.Invoke(); - } - } -} diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs.meta b/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs.meta deleted file mode 100644 index b8f526f4..00000000 --- a/Assets/Scripts/Studio/UI/Panel/Panel_TopBar.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: eeb29fdb1a9fc134aa57e1efd67b4848 \ No newline at end of file