diff --git a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs index 45299129..9418e9cb 100644 --- a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs @@ -8,7 +8,6 @@ namespace Studio.Manage public PopupCanvasHandler(Canvas_Popup canvas_popup) { var canvas_static = CanvasManager.instance.GetCanvas(); - //canvas_popup.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_popup.panel_assetproperties.Open); canvas_popup.panel_thumbnail.onGetPosition += canvas_popup.panel_assetlibrary.GetPositionX; canvas_popup.panel_start.onClickNewProject += canvas_popup.panel_newprojectinfo.Open; @@ -38,7 +37,6 @@ namespace Studio.Manage canvas_popup.panel_startsetting.onClickAuthSetting += canvas_popup.panel_authsetting.Active; canvas_popup.panel_startsetting.onClickAPISetting += canvas_popup.panel_apisetting.Active; canvas_popup.panel_startsetting.onClickMQTTSetting += canvas_popup.panel_mqttsetting.Active; - canvas_popup.panel_startsetting.onClick3DFactorySetting += canvas_popup.panel_3dfactorysetting.Active; canvas_popup.panel_startsetting.onClickAssetSetting += canvas_popup.panel_assetsetting.Active; canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData; diff --git a/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs b/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs index ef0a29cf..28a5b32b 100644 --- a/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs @@ -21,7 +21,6 @@ namespace Studio.Manage canvas_popup.panel_startsetting.onClickAuthSetting += canvas_popup.panel_authsetting.Active; canvas_popup.panel_startsetting.onClickAPISetting += canvas_popup.panel_apisetting.Active; canvas_popup.panel_startsetting.onClickMQTTSetting += canvas_popup.panel_mqttsetting.Active; - canvas_popup.panel_startsetting.onClick3DFactorySetting += canvas_popup.panel_3dfactorysetting.Active; canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_StartSetting.cs b/Assets/Scripts/Studio/UI/Panel/Panel_StartSetting.cs index 6bbcbced..f613a15e 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_StartSetting.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_StartSetting.cs @@ -18,26 +18,17 @@ namespace Studio.UI private Toggle Toggle_AuthSetting; private Toggle Toggle_APISetting; private Toggle Toggle_MQTTSetting; - private Toggle Toggle_3DFactorySetting; private Toggle Toggle_AssetSetting; public Action onClickAppSetting; public Action onClickAuthSetting; public Action onClickAPISetting; public Action onClickMQTTSetting; - public Action onClick3DFactorySetting; public Action onClickAssetSetting; - #region TestButton - private Button Button_Load; - private Button Button_Save; - - public Action onClickLoadButton; - public Action onClickSaveButton; - #endregion - public void Active(bool isOn) { + Debug.Log("Panel_StartSetting Active: " + isOn); SetActive(isOn); if(isOn == false) @@ -74,14 +65,13 @@ namespace Studio.UI Toggle_AuthSetting.onValueChanged.AddListener(OnClickAuthSettingButton); Toggle_APISetting.onValueChanged.AddListener(OnClickAPISettingButton); Toggle_MQTTSetting.onValueChanged.AddListener(OnClickMQTTSettingButton); - Toggle_3DFactorySetting.onValueChanged.AddListener(OnClick3DFactorySettingButton); Toggle_AssetSetting.onValueChanged.AddListener(OnClickAssetSettingButton); + SetToggleChanged(this.Toggle_AppSetting, true); - Button_Load.onClick.AddListener(OnClickLoadButton); - Button_Save.onClick.AddListener(OnClickSaveButton); } private void SetToggleChanged(Toggle toggle, bool isOn) { + Debug.Log($"SetToggleChanged: {toggle.name} isOn: {isOn}"); selectedToggle = TabToggles.GetFirstActiveToggle(); var image = toggle.transform.GetChild(0).GetComponent(); image.gameObject.SetActive(isOn); @@ -98,41 +88,34 @@ namespace Studio.UI } private void OnClickAppSettingButton(bool isOn) { + Debug.Log($"OnClickAppSettingButton: {isOn}"); SetToggleChanged(Toggle_AppSetting, isOn); onClickAppSetting?.Invoke(isOn); } private void OnClickAuthSettingButton(bool isOn) { + Debug.Log($"OnClickAuthSettingButton: {isOn}"); SetToggleChanged(Toggle_AuthSetting, isOn); onClickAuthSetting?.Invoke(isOn); } private void OnClickAPISettingButton(bool isOn) { + Debug.Log($"OnClickAPISettingButton: {isOn}"); SetToggleChanged(Toggle_APISetting, isOn); onClickAPISetting?.Invoke(isOn); } private void OnClickMQTTSettingButton(bool isOn) { + Debug.Log($"OnClickMQTTSettingButton: {isOn}"); SetToggleChanged(Toggle_MQTTSetting, isOn); onClickMQTTSetting?.Invoke(isOn); } - private void OnClick3DFactorySettingButton(bool isOn) - { - SetToggleChanged(Toggle_3DFactorySetting, isOn); - onClick3DFactorySetting?.Invoke(isOn); - } + private void OnClickAssetSettingButton(bool isOn) { + Debug.Log($"OnClickAssetSettingButton: {isOn}"); SetToggleChanged(Toggle_AssetSetting, isOn); onClickAssetSetting?.Invoke(isOn); } - private void OnClickSaveButton() - { - onClickSaveButton?.Invoke(); - } - private void OnClickLoadButton() - { - onClickLoadButton?.Invoke(); - } } }