From 6fd6b2b355b24e685d1700f975caee8112b49318 Mon Sep 17 00:00:00 2001 From: wsh Date: Wed, 21 May 2025 10:38:14 +0900 Subject: [PATCH] 1 --- Assets/Scenes/pre-0.24.0.unity | 140 ++++++++---------- .../Studio/Managers/PopupCanvasHandler.cs | 34 ++++- .../Managers/SaveSceneSettingManager.cs | 5 +- .../Scripts/Studio/UI/Canvas/Canvas_Popup.cs | 50 ++++++- 4 files changed, 136 insertions(+), 93 deletions(-) diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 220b16cc..a3638d18 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -944,6 +944,25 @@ RectTransform: - {fileID: 1712022043} - {fileID: 1229281891} - {fileID: 1195713950} + - {fileID: 1318345825} + - {fileID: 917198748} + - {fileID: 5235659802877143473} + - {fileID: 110380560} + - {fileID: 1628957525} + - {fileID: 1939237826} + - {fileID: 535570956} + - {fileID: 1790230152} + - {fileID: 983009180} + - {fileID: 1847741281} + - {fileID: 1330774554} + - {fileID: 275537749} + - {fileID: 218538926} + - {fileID: 1805433612} + - {fileID: 1418698196} + - {fileID: 1299223833} + - {fileID: 702158320} + - {fileID: 2113204526} + - {fileID: 1523668493} m_Father: {fileID: 1981809316} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -980,6 +999,24 @@ MonoBehaviour: panel_assetedit: {fileID: 0} panel_thumbnail: {fileID: 0} panel_objectdistance: {fileID: 0} + panel_scenetab: {fileID: 0} + panel_startsetting: {fileID: 0} + panel_appsetting: {fileID: 0} + panel_authsetting: {fileID: 0} + panel_apisetting: {fileID: 0} + panel_mqttsetting: {fileID: 0} + panel_3dfactorysetting: {fileID: 0} + panel_dynamicobjectuisetting: {fileID: 0} + panel_authentication: {fileID: 0} + panel_quickstart: {fileID: 0} + panel_newprojectinfo: {fileID: 0} + panel_openprojectinfo: {fileID: 0} + panel_apiconnectmodal: {fileID: 0} + panel_mqttconnectmodal: {fileID: 0} + panel_datafiltersetting: {fileID: 0} + panel_multilingualsettingmodal: {fileID: 0} + panel_loggingmodal: {fileID: 0} + panel_exitchecker: {fileID: 0} --- !u!114 &545811783 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6554,7 +6591,6 @@ GameObject: - component: {fileID: 4040013061434197100} - component: {fileID: 5170900197735955222} - component: {fileID: 4175114401660365909} - - component: {fileID: 7792190747625166835} m_Layer: 0 m_Name: Canvas_Stuido_Popup m_TagString: Untagged @@ -6665,7 +6701,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 7357093652319228238, guid: d052112ad62360e4ba550f9f5fa8d61e, type: 3} propertyPath: m_Name @@ -6737,7 +6773,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8927815766955143701, guid: d052112ad62360e4ba550f9f5fa8d61e, type: 3} propertyPath: m_AnchoredPosition.y - value: -75 + value: -107 objectReference: {fileID: 0} - target: {fileID: 8927815766955143701, guid: d052112ad62360e4ba550f9f5fa8d61e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6762,7 +6798,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 2277027821890051672, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_SizeDelta.x @@ -6838,15 +6874,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3425713149264809870, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3425713149264809870, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3425713149264809870, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3425713149264809870, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_AnchoredPosition.x @@ -6923,7 +6959,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 6092324537095634317, guid: 84dfc296b72fa084b86783a94204fe9c, type: 3} propertyPath: m_Name @@ -7139,7 +7175,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 2112941324847836712, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_Name @@ -7236,7 +7272,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 3519767485975804969, guid: 8795ea0c7698ec949b563139a3f042d9, type: 3} propertyPath: m_Pivot.x @@ -7715,7 +7751,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 3326604155737549848, guid: 03a019a2380fb0b4a8f2e9b0a76e537e, type: 3} propertyPath: m_Name @@ -7934,7 +7970,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_TargetDisplay: 0 --- !u!1 &3194360978488024824 GameObject: @@ -7962,7 +7998,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 2372816582364840620, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} propertyPath: m_IsActive @@ -8082,7 +8118,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 1 + m_SortingOrder: -1 m_TargetDisplay: 0 --- !u!114 &4175114401660365909 MonoBehaviour: @@ -8107,7 +8143,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 1628728276460853738, guid: 5336ab702b9bbb647acaf552752e715b, type: 3} propertyPath: m_Name @@ -8204,7 +8240,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 2555259477019157526, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} propertyPath: m_Name @@ -8301,7 +8337,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 662268633433961251, guid: e3ce6613f4fc01d4380af5010453d7e9, type: 3} propertyPath: m_Name @@ -8431,7 +8467,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 2547989244355828686, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} propertyPath: m_Name @@ -8528,7 +8564,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 3409130499235709296, guid: 1c31c1f054f4a624aabe7579c0e241a7, type: 3} propertyPath: m_Pivot.x @@ -8642,7 +8678,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} propertyPath: m_Pivot.x @@ -8739,7 +8775,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 5904588325456822339, guid: 8b1e53b08c386aa4f9d7890359831d12, type: 3} propertyPath: m_Name @@ -9229,7 +9265,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 3223975308629568960, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} propertyPath: m_Pivot.x @@ -9326,7 +9362,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 7903913507570427698, guid: b0f606a28456e384ba973ec4b18be0b8, type: 3} propertyPath: m_Pivot.x @@ -9525,26 +9561,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1318345825} - - {fileID: 917198748} - - {fileID: 5235659802877143473} - - {fileID: 110380560} - - {fileID: 1628957525} - - {fileID: 1939237826} - - {fileID: 535570956} - - {fileID: 1790230152} - - {fileID: 983009180} - - {fileID: 1847741281} - - {fileID: 1330774554} - - {fileID: 275537749} - - {fileID: 218538926} - - {fileID: 1805433612} - - {fileID: 1418698196} - - {fileID: 1299223833} - - {fileID: 702158320} - - {fileID: 2113204526} - - {fileID: 1523668493} + m_Children: [] m_Father: {fileID: 1981809316} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -9552,43 +9569,13 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &7792190747625166835 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 452827165833568246} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5c8f7b3147f30b34abbe0f3043aa96b2, type: 3} - m_Name: - m_EditorClassIdentifier: - panel_scenetab: {fileID: 0} - panel_startsetting: {fileID: 0} - panel_appsetting: {fileID: 0} - panel_authsetting: {fileID: 0} - panel_apisetting: {fileID: 0} - panel_mqttsetting: {fileID: 0} - panel_3dfactorysetting: {fileID: 0} - panel_dynamicobjectuisetting: {fileID: 0} - panel_authentication: {fileID: 0} - panel_quickstart: {fileID: 0} - panel_newprojectinfo: {fileID: 0} - panel_openprojectinfo: {fileID: 0} - panel_apiconnectmodal: {fileID: 0} - panel_mqttconnectmodal: {fileID: 0} - panel_datafiltersetting: {fileID: 0} - panel_multilingualsettingmodal: {fileID: 0} - panel_loggingmodal: {fileID: 0} - panel_exitchecker: {fileID: 0} --- !u!1001 &7890537475798597708 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_Pivot.x @@ -10446,7 +10433,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 1112357447546033534, guid: 86fac645f610e6c43a57c53dec3f6e48, type: 3} propertyPath: m_Pivot.x @@ -10552,7 +10539,6 @@ MonoBehaviour: panel_shortcuts: {fileID: 0} panel_topbar: {fileID: 0} panel_toolbar: {fileID: 0} - panel_modecontrol: {fileID: 0} --- !u!1001 &9142868344755881623 PrefabInstance: m_ObjectHideFlags: 0 @@ -10804,7 +10790,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7792190747625166834} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 5081805814088647433, guid: d03aebf931b75b440a228af393aa7bbb, type: 3} propertyPath: m_Pivot.x diff --git a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs index 5c87cc61..7d09e513 100644 --- a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs @@ -2,11 +2,37 @@ namespace Studio.Manage { public class PopupCanvasHandler : CanvasEventHandler { - public PopupCanvasHandler(Canvas_Popup canvas_Popup) + public PopupCanvasHandler(Canvas_Popup canvas_popup) { - 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; + 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; + + 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_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_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; } } } \ No newline at end of file diff --git a/Assets/Scripts/Studio/Managers/SaveSceneSettingManager.cs b/Assets/Scripts/Studio/Managers/SaveSceneSettingManager.cs index 2a21b823..0e696647 100644 --- a/Assets/Scripts/Studio/Managers/SaveSceneSettingManager.cs +++ b/Assets/Scripts/Studio/Managers/SaveSceneSettingManager.cs @@ -29,12 +29,9 @@ namespace Studio.Manage public Action onMQTTSetting; public Action onSaveModelDatas; - public SaveSceneSettingManager() - { - } public override void Init() { - var canvas_Popup = EventConnector.instance.GetCanvas(); + var canvas_Popup = EventConnector.instance.GetCanvas(); onGetAppSetting += canvas_Popup.panel_appsetting.GetAppSetting; onGetAPISetting += canvas_Popup.panel_apisetting.GetAPISetting; onGetMQTTSetting += canvas_Popup.panel_mqttsetting.GetMQTTSetting; diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index 780cd7c6..fef8b818 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -5,6 +5,8 @@ using Studio.Util; using Studio.Test; using XRLib; using XRLib.UI; +using XED; +using XED.UI; namespace Studio { @@ -20,19 +22,29 @@ namespace Studio public Panel_PredefinedType panel_predefinedtype; public Panel_ObjectInfo panel_objectinfo; public Panel_ObjectAlign panel_objectalign; - public AGVNodePopup agvnodepopup; - public AGVNodeModePopup agvnodemodepopup; public Panel_Tooltip panel_tooltip; public Panel_PropertyViewer panel_propertyviewer; - //public Panel_DragHandler panel_draghandler; public Panel_AssetEdit panel_assetedit; public Panel_Thumbnail panel_thumbnail; public Panel_ObjectDistance panel_objectdistance; - - private void Awake() - { - canvasHandler = new PopupCanvasHandler(this); - } + 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; + public Panel_OpenProjectInfo panel_openprojectinfo; + public Panel_APIConnectModal panel_apiconnectmodal; + public Panel_MQTTConnectModal panel_mqttconnectmodal; + public Panel_DataFilterSetting panel_datafiltersetting; + public Panel_MultilingualSettingModal panel_multilingualsettingmodal; + public Panel_LoggingModal panel_loggingmodal; + public Panel_ExitChecker panel_exitchecker; public override void AfterAwake() { @@ -52,6 +64,28 @@ namespace Studio var fbxFileManager = ManagerHub.instance.Get(); panel_assetproperties.onOpen += fbxFileManager.GetCustomAssetData; panel_thumbnail.onOpen += fbxFileManager.GetCustomAssetData; + + canvasHandler = new PopupCanvasHandler(this); + + var saveSceneSettingManager = ManagerHub.instance.Get(); + var dataManager = FindAnyObjectByType(); + var quitManager = FindAnyObjectByType(); + + panel_apiconnectmodal.onClickFilterButton += dataManager.SetFilterData; + panel_apiconnectmodal.onSaveAPIData += dataManager.SetAPIData; + + panel_mqttconnectmodal.onClickFilterButton += dataManager.SetFilterData; + panel_mqttconnectmodal.onSaveMQTTData += dataManager.SetMQTTData; + + dataManager.mqttData += panel_datafiltersetting.SetLoadMQTTDataList; + dataManager.apiData += panel_datafiltersetting.SetLoadAPIDataList; + + panel_startsetting.onClickSaveButton += saveSceneSettingManager.SaveSceneSettingData; + panel_startsetting.onClickLoadButton += saveSceneSettingManager.LoadSceneSettingData; + + panel_exitchecker.onSaveAndExit += quitManager.OnConfirmQuit; + panel_exitchecker.onExit += quitManager.OnConfirmQuit; + panel_exitchecker.onCancel += quitManager.OnCancelQuit; } void SetPanelAsLastSibling(UIBase panel)