diff --git a/Assets/NewStudioJYM/Scripts/StudioJYMCanvas_Popup.cs b/Assets/NewStudioJYM/Scripts/StudioJYMCanvas_Popup.cs index 3c84aad2..d185cb40 100644 --- a/Assets/NewStudioJYM/Scripts/StudioJYMCanvas_Popup.cs +++ b/Assets/NewStudioJYM/Scripts/StudioJYMCanvas_Popup.cs @@ -14,7 +14,7 @@ namespace Studio public Panel_MQTTConnectModal panel_mqttconnectmodal; public Panel_DataFilterSetting panel_datafiltersetting; public Panel_APIConnectModal panel_apiconnectmodal; - public Panel_GenerateDynamicObject panel_generatedynamicobject; + public Panel_3DFactorySetting panel_3dfactorysetting; public Panel_DynamicObjectUISetting panel_dynamicobjectuisetting; public Panel_ExitChecker panel_exitchecker; diff --git a/Assets/NewStudioJYM/Scripts/StudioJYMPopupCanvasHandler.cs b/Assets/NewStudioJYM/Scripts/StudioJYMPopupCanvasHandler.cs index 505d6f8c..7ce6d4f6 100644 --- a/Assets/NewStudioJYM/Scripts/StudioJYMPopupCanvasHandler.cs +++ b/Assets/NewStudioJYM/Scripts/StudioJYMPopupCanvasHandler.cs @@ -13,8 +13,7 @@ namespace Studio canvas_Popup.panel_datafiltersetting.onSaveMQTTFilterData += canvas_Popup.panel_mqttconnectmodal.SetFilterData; canvas_Popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_Popup.panel_apiconnectmodal.SetFilterData; - canvas_Popup.panel_generatedynamicobject.onUISetting += canvas_Popup.panel_dynamicobjectuisetting.SetData; - canvas_Popup.panel_dynamicobjectuisetting.onSaveDynamicObjectUIData += canvas_Popup.panel_generatedynamicobject.Save; + canvas_Popup.panel_3dfactorysetting.onUISetting += canvas_Popup.panel_dynamicobjectuisetting.SetData; } } } diff --git a/Assets/NewStudioPGD/Scripts/Manager/StudioPopupCanvasHandler.cs b/Assets/NewStudioPGD/Scripts/Manager/StudioPopupCanvasHandler.cs index 9b577a16..687a6919 100644 --- a/Assets/NewStudioPGD/Scripts/Manager/StudioPopupCanvasHandler.cs +++ b/Assets/NewStudioPGD/Scripts/Manager/StudioPopupCanvasHandler.cs @@ -4,34 +4,31 @@ { public StudioPopupCanvasHandler(Canvas_Studio_Popup canvas_popup) { - canvas_popup.panel_selectlogic.onClickAppSetting += canvas_popup.panel_applogiclist.OnSelectLogic; - canvas_popup.panel_selectlogic.onClickAuthentication += canvas_popup.panel_applogiclist.OnSelectLogic; - canvas_popup.panel_selectlogic.onClickLanguage += canvas_popup.panel_applogiclist.OnSelectLogic; - canvas_popup.panel_selectlogic.onClickLogging += canvas_popup.panel_applogiclist.OnSelectLogic; - canvas_popup.panel_selectlogic.onClickAPIConnection += canvas_popup.panel_applogiclist.OnSelectLogic; - canvas_popup.panel_selectlogic.onClickMQTTConnection += canvas_popup.panel_applogiclist.OnSelectLogic; - canvas_popup.panel_selectlogic.onClickCreate3DObject += canvas_popup.panel_applogiclist.OnSelectLogic; - canvas_popup.panel_selectlogic.onClickCreateUI += canvas_popup.panel_applogiclist.OnSelectLogic; - canvas_popup.panel_quickstart.onClickNewProject += canvas_popup.panel_newprojectinfo.Open; canvas_popup.panel_quickstart.onClickNewProject += canvas_popup.panel_openprojectinfo.Close; canvas_popup.panel_quickstart.onClickOpenProject += canvas_popup.panel_newprojectinfo.Close; canvas_popup.panel_quickstart.onClickOpenProject += canvas_popup.panel_openprojectinfo.Open; - canvas_popup.panel_newprojectinfo.onClickCreate += canvas_popup.panel_startimage.Open; - canvas_popup.panel_newprojectinfo.onClickCreate += canvas_popup.panel_applogiclist.Open; - canvas_popup.panel_newprojectinfo.onClickCreate += canvas_popup.panel_inspector.Open; + canvas_popup.panel_newprojectinfo.onClickCreate += canvas_popup.panel_scenetab.Open; canvas_popup.panel_newprojectinfo.onClickCreate += canvas_popup.panel_quickstart.Close; canvas_popup.panel_newprojectinfo.onClickCreate += canvas_popup.panel_newprojectinfo.Close; - canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_startimage.Open; - canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_applogiclist.Open; - canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_inspector.Open; + canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_scenetab.Open; canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_quickstart.Close; canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_openprojectinfo.Close; + canvas_popup.panel_scenetab.onSceneSettingTab += canvas_popup.panel_startsetting.Active; + + canvas_popup.panel_startsetting.onClickAppSetting += canvas_popup.panel_appsetting.Active; + 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.onSaveMQTTFilterData += canvas_popup.panel_mqttconnectmodal.SetFilterData; canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData; + + canvas_popup.panel_3dfactorysetting.onUISetting += canvas_popup.panel_dynamicobjectuisetting.SetData; } } } diff --git a/Assets/NewStudioPGD/Scripts/UI/Canvas/Canvas_Studio_Popup.cs b/Assets/NewStudioPGD/Scripts/UI/Canvas/Canvas_Studio_Popup.cs index ccdf4567..2480bf31 100644 --- a/Assets/NewStudioPGD/Scripts/UI/Canvas/Canvas_Studio_Popup.cs +++ b/Assets/NewStudioPGD/Scripts/UI/Canvas/Canvas_Studio_Popup.cs @@ -2,16 +2,22 @@ using Studio.Manage; using Studio.UI; using XRLib.UI; +using XED; +using XED.UI; namespace Studio { public class Canvas_Studio_Popup : CanvasBase { - public Panel_StartImage panel_startimage; - public Panel_AppLogicList panel_applogiclist; - public Panel_Inspector panel_inspector; - public Panel_SelectLogic panel_selectlogic; + public Panel_SceneTab panel_scenetab; + public Panel_StartSetting panel_startsetting; public Panel_AppSetting panel_appsetting; + public Panel_AuthSetting panel_authsetting; + public Panel_APISetting panel_apisetting; + public Panel_MQTTSetting panel_mqttsetting; + public Panel_3DFactorySetting panel_3dfactorysetting; + public Panel_DynamicObjectUISetting panel_dynamicobjectuisetting; + public Panel_Authentication panel_authentication; public Panel_QuickStart panel_quickstart; public Panel_NewProjectInfo panel_newprojectinfo; @@ -21,10 +27,13 @@ namespace Studio public Panel_DataFilterSetting panel_datafiltersetting; public Panel_MultilingualSettingModal panel_multilingualsettingmodal; public Panel_LoggingModal panel_loggingmodal; + public Panel_ExitChecker panel_exitchecker; private void Awake() { var dataManager = FindAnyObjectByType(); + var quitManager = FindAnyObjectByType(); + var saveManager = FindAnyObjectByType(); canvasHandler = new StudioPopupCanvasHandler(this); @@ -36,6 +45,22 @@ namespace Studio dataManager.mqttData += panel_datafiltersetting.SetLoadMQTTDataList; dataManager.apiData += panel_datafiltersetting.SetLoadAPIDataList; + + //panel_startsetting.onClickLoadButton += saveManager.LoadSceneSettingData; + + saveManager.onGetAppSetting += panel_appsetting.GetAppSetting; + saveManager.onGetAPISetting += panel_apisetting.GetAPISetting; + saveManager.onGetMQTTSetting += panel_mqttsetting.GetMQTTSetting; + saveManager.onGetSaveModelDatas += panel_3dfactorysetting.Get3DFactorySetting; + + saveManager.onAppSetting += panel_appsetting.SetAppSetting; + saveManager.onAPISetting += panel_apisetting.SetAPISetting; + saveManager.onMQTTSetting += panel_mqttsetting.SetMQTTSetting; + saveManager.onSaveModelDatas += panel_3dfactorysetting.Set3DFactorySetting; + + panel_exitchecker.onSaveAndExit += quitManager.OnConfirmQuit; + panel_exitchecker.onExit += quitManager.OnConfirmQuit; + panel_exitchecker.onCancel += quitManager.OnCancelQuit; } } } diff --git a/Assets/NewStudioPGD/Scripts/UI/Element/UI_AppSettingItem.cs b/Assets/NewStudioPGD/Scripts/UI/Element/UI_AppSettingItem.cs deleted file mode 100644 index 9ddb89aa..00000000 --- a/Assets/NewStudioPGD/Scripts/UI/Element/UI_AppSettingItem.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using TMPro; -using UnityEngine.UI; -using XRLib.UI; - -namespace Studio.UI -{ - public class UI_AppSettingItem : UIBase - { - public TMP_InputField InputField_Type; - public TMP_InputField InputField_Value; - public TMP_Dropdown Dropdown; - public Button Button_Remove; - - public enum EType - { - APIDomain, - APIPort, - API, - MQTTDomain, - MQTTPort - } - - private void Awake() - { - InputField_Type = transform.GetComponentsInChildren().FirstOrDefault(x => x.name == nameof(InputField_Type)); - InputField_Value = transform.GetComponentsInChildren().FirstOrDefault(x => x.name == nameof(InputField_Value)); - Dropdown = transform.GetComponentInChildren(); - Button_Remove = transform.GetComponentInChildren