From c9711ef03d1e53fb5106cc94d3ccf384a01ecc13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=98=81=EB=AF=BC?= <117150306+jym04@users.noreply.github.com> Date: Thu, 29 May 2025 10:21:20 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Ctrl+D=20=EC=98=A4=EB=B8=8C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EB=B3=B5=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Studio/AssetTool/RenderObjectHandler.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs b/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs index adc9180f..91110d15 100644 --- a/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs +++ b/Assets/Scripts/Studio/AssetTool/RenderObjectHandler.cs @@ -422,13 +422,15 @@ namespace Studio.AssetTool var shortcutTable = new Dictionary>(); #if UNITY_EDITOR - shortcutTable.Add(KeyCode.LeftShift, new Dictionary()); - shortcutTable[KeyCode.LeftShift].Add(KeyCode.C, SaveItemsToCopy); - shortcutTable[KeyCode.LeftShift].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand())); + shortcutTable.Add(KeyCode.LeftControl, new Dictionary()); + //shortcutTable[KeyCode.LeftShift].Add(KeyCode.C, SaveItemsToCopy); + //shortcutTable[KeyCode.LeftShift].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand())); + shortcutTable[KeyCode.LeftControl].Add(KeyCode.D, () => CommandInvoker.instance.Invoke(new CopyObjectCommand())); #else shortcutTable.Add(KeyCode.LeftControl, new Dictionary()); - shortcutTable[KeyCode.LeftControl].Add(KeyCode.C, SaveItemsToCopy); - shortcutTable[KeyCode.LeftControl].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand())); + //shortcutTable[KeyCode.LeftControl].Add(KeyCode.C, SaveItemsToCopy); + //shortcutTable[KeyCode.LeftControl].Add(KeyCode.V, () => CommandInvoker.instance.Invoke(new CopyObjectCommand())); + shortcutTable[KeyCode.LeftControl].Add(KeyCode.D, () => CommandInvoker.instance.Invoke(new CopyObjectCommand())); #endif var handler = new InputHandler(getKeyActions, downKeyActions, upKeyActions, shortcutTable); From f254c0bb90f11ba1ecfea7647c532baf1cbbd912 Mon Sep 17 00:00:00 2001 From: wsh Date: Thu, 29 May 2025 10:38:19 +0900 Subject: [PATCH 2/3] 1 --- Assets/Font/NanumGothic SDF.asset | 4 +- .../IMG_StartPanelLogo.png.meta | 4 +- Assets/Prefabs/AAA/Panel_Start.prefab | 41 +++--------------- Assets/Scenes/pre-0.24.0.unity | 42 ++++++------------- 4 files changed, 22 insertions(+), 69 deletions(-) diff --git a/Assets/Font/NanumGothic SDF.asset b/Assets/Font/NanumGothic SDF.asset index f78a9387..c28d9618 100644 --- a/Assets/Font/NanumGothic SDF.asset +++ b/Assets/Font/NanumGothic SDF.asset @@ -9369,8 +9369,8 @@ Material: - _TextureHeight: 1024 - _TextureWidth: 1024 - _UnderlayDilate: 0 - - _UnderlayOffsetX: 0 - - _UnderlayOffsetY: 0 + - _UnderlayOffsetX: 0.33 + - _UnderlayOffsetY: -0.59 - _UnderlaySoftness: 0 - _VertexOffsetX: 0 - _VertexOffsetY: 0 diff --git a/Assets/Image/UI/Panel_StudioTopbar/IMG_StartPanelLogo.png.meta b/Assets/Image/UI/Panel_StudioTopbar/IMG_StartPanelLogo.png.meta index 801f351b..cadf7af0 100644 --- a/Assets/Image/UI/Panel_StudioTopbar/IMG_StartPanelLogo.png.meta +++ b/Assets/Image/UI/Panel_StudioTopbar/IMG_StartPanelLogo.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 196.51 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 4 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 16384 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Prefabs/AAA/Panel_Start.prefab b/Assets/Prefabs/AAA/Panel_Start.prefab index e789873d..ea4185a0 100644 --- a/Assets/Prefabs/AAA/Panel_Start.prefab +++ b/Assets/Prefabs/AAA/Panel_Start.prefab @@ -1045,8 +1045,8 @@ MonoBehaviour: m_Calls: [] m_text: Create m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} - m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} + m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -4916,7 +4916,6 @@ GameObject: m_Component: - component: {fileID: 3425713149264809870} - component: {fileID: 7373071156827141949} - - component: {fileID: 6751490921421346111} - component: {fileID: 3347938392809962262} m_Layer: 0 m_Name: Panel_Start @@ -4956,36 +4955,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6419739384633392332} m_CullTransparentMesh: 1 ---- !u!114 &6751490921421346111 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6419739384633392332} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!114 &3347938392809962262 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6965,8 +6934,8 @@ MonoBehaviour: m_Calls: [] m_text: Cancel m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} - m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} + m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -7218,7 +7187,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -50.4, y: 20.8} + m_AnchoredPosition: {x: -50.399902, y: 20.800049} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7471141289523351727 diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 60366771..9c6ba1c1 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -1673,6 +1673,14 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3673230047573262712, guid: 13ace7584c1d4514cb2218354647e355, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3673230047573262712, guid: 13ace7584c1d4514cb2218354647e355, type: 3} + propertyPath: m_PreserveAspect + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3887689113271058331, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3754,14 +3762,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 545811781} m_Modifications: - - target: {fileID: 2686821592073054891, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2686821592073054891, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3137596492354244850, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3778,14 +3778,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3369443847942175767, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3369443847942175767, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3425713149264809870, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -3926,18 +3918,6 @@ PrefabInstance: propertyPath: m_Name value: Panel_Start objectReference: {fileID: 0} - - target: {fileID: 6419739384633392332, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8097777418585433427, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} - propertyPath: m_AnchoredPosition.x - value: -50.399902 - objectReference: {fileID: 0} - - target: {fileID: 8097777418585433427, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} - propertyPath: m_AnchoredPosition.y - value: 20.800049 - objectReference: {fileID: 0} - target: {fileID: 8920532780144259430, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -12110,6 +12090,10 @@ PrefabInstance: propertyPath: m_Name value: Panel_DynamiceObjectUISetting objectReference: {fileID: 0} + - target: {fileID: 2555259477019157526, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -12176,7 +12160,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -195 + value: -494 objectReference: {fileID: 0} - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} propertyPath: m_LocalEulerAnglesHint.x From 6aed166ad86778d8feb9d3e526aefdbc03ea0cee Mon Sep 17 00:00:00 2001 From: wsh Date: Thu, 29 May 2025 10:53:56 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=AF=B8=EC=82=AC=EC=9A=A9=20UI=20Scene?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=A0=9C=EA=B1=B0=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/pre-0.24.0.unity | 906 +----------------- .../Studio/Managers/PopupCanvasHandler.cs | 1 - .../Managers/SceneStartSettingManager.cs | 3 - .../Managers/StudioPopupCanvasHandler.cs | 1 - .../Scripts/Studio/UI/Canvas/Canvas_Popup.cs | 5 - .../Studio/UI/Canvas/Canvas_Studio_Popup.cs | 2 - 6 files changed, 16 insertions(+), 902 deletions(-) diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 9c6ba1c1..2f57b513 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -700,196 +700,6 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 m_MaxRayIntersections: 0 ---- !u!1001 &235881573 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 545811781} - m_Modifications: - - target: {fileID: 522847655149368589, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1904820179092545403, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1904820179092545403, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1904820179092545403, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1904820179092545403, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2817559703452216858, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2817559703452216858, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2817559703452216858, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2817559703452216858, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3529671530150024245, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3529671530150024245, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3529671530150024245, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3529671530150024245, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3697621935846676485, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3697621935846676485, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3697621935846676485, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3697621935846676485, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_SizeDelta.y - value: -185 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.y - value: -92.5 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6998415192175560381, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6998415192175560381, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6998415192175560381, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6998415192175560381, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8358864612680385020, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_Name - value: Panel_StartSetting - objectReference: {fileID: 0} - - target: {fileID: 8358864612680385020, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} ---- !u!224 &235881574 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4361438021496185155, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} - m_PrefabInstance: {fileID: 235881573} - m_PrefabAsset: {fileID: 0} --- !u!1 &247025118 GameObject: m_ObjectHideFlags: 0 @@ -3329,17 +3139,12 @@ RectTransform: m_Children: - {fileID: 929951560} - {fileID: 663673411} - - {fileID: 235881574} - {fileID: 434723664} - {fileID: 1949998714} - {fileID: 1291368617} - {fileID: 136896850399454158} - - {fileID: 2113204526} - - {fileID: 1523668493} - {fileID: 6877782817204804254} - - {fileID: 6779400300325097680} - {fileID: 394283230} - - {fileID: 670251071} - {fileID: 1791222926} - {fileID: 8048799925780851990} - {fileID: 297039008} @@ -3393,16 +3198,13 @@ MonoBehaviour: panel_mqttsetting: {fileID: 0} panel_assetsetting: {fileID: 0} panel_3dfactorysetting: {fileID: 0} - panel_dynamicobjectuisetting: {fileID: 0} panel_accessibilitysettings: {fileID: 0} - panel_colorpicker: {fileID: 0} panel_hierarchy: {fileID: 0} panel_assetlibrary: {fileID: 0} panel_interworkingdatalist: {fileID: 0} panel_interferedobjectlist: {fileID: 0} panel_predefinedtype: {fileID: 0} panel_dynamicobjectinfo: {fileID: 0} - panel_objectalign: {fileID: 0} panel_tooltip: {fileID: 0} panel_propertyviewer: {fileID: 0} panel_apiconnectmodal: {fileID: 0} @@ -3762,6 +3564,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 545811781} m_Modifications: + - target: {fileID: 2686821592073054891, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2686821592073054891, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3137596492354244850, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3778,6 +3588,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3369443847942175767, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3369443847942175767, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3425713149264809870, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -3944,11 +3762,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3425713149264809870, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} m_PrefabInstance: {fileID: 663673410} m_PrefabAsset: {fileID: 0} ---- !u!224 &670251071 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - m_PrefabInstance: {fileID: 1976685923} - m_PrefabAsset: {fileID: 0} --- !u!1 &671739450 GameObject: m_ObjectHideFlags: 0 @@ -9808,11 +9621,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8789936807297394088, guid: 8b1e53b08c386aa4f9d7890359831d12, type: 3} m_PrefabInstance: {fileID: 1509431513} m_PrefabAsset: {fileID: 0} ---- !u!224 &1523668493 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - m_PrefabInstance: {fileID: 4875817395766294772} - m_PrefabAsset: {fileID: 0} --- !u!1 &1541677883 GameObject: m_ObjectHideFlags: 0 @@ -10809,323 +10617,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} m_PrefabInstance: {fileID: 1766393231} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1976685923 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 545811781} - m_Modifications: - - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495174325582678740, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.x - value: 318 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.y - value: 260.74 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: -380.2 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: -281 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2815481224497491875, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3263565422826670613, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3263565422826670613, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3759358454249268061, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3759358454249268061, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 161.97249 - objectReference: {fileID: 0} - - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: -9.5 - objectReference: {fileID: 0} - - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4815791146998578607, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4815791146998578607, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 141 - objectReference: {fileID: 0} - - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: -13.5 - objectReference: {fileID: 0} - - target: {fileID: 6929874536063340863, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6929874536063340863, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8351774369622538081, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8351774369622538081, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9168477493309714298, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_Name - value: Panel_ObjectAlign - objectReference: {fileID: 0} - - target: {fileID: 9168477493309714298, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} --- !u!1 &1981809315 GameObject: m_ObjectHideFlags: 0 @@ -11212,11 +10703,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6366813177479495702, guid: f931459c154b09e4c98ab9a5082560e6, type: 3} m_PrefabInstance: {fileID: 1833658608} m_PrefabAsset: {fileID: 0} ---- !u!224 &2113204526 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - m_PrefabInstance: {fileID: 5354378095848928545} - m_PrefabAsset: {fileID: 0} --- !u!224 &136896850399454158 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 49760610953151177, guid: ea83f56b6eed48b4d98d8ee2b8f4b6e9, type: 3} @@ -11510,103 +10996,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1001 &1621939674436309667 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 545811781} - m_Modifications: - - target: {fileID: 2241443489286420852, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_Name - value: Panel_ColorPicker - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_SizeDelta.x - value: 654 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_SizeDelta.y - value: 585 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_AnchoredPosition.y - value: -42 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} --- !u!1001 &1704448147529843531 PrefabInstance: m_ObjectHideFlags: 0 @@ -12078,264 +11467,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a247a040b2f41a7479cb4dcc20d9ecd0, type: 3} ---- !u!1001 &4875817395766294772 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 545811781} - m_Modifications: - - target: {fileID: 2555259477019157526, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_Name - value: Panel_DynamiceObjectUISetting - objectReference: {fileID: 0} - - target: {fileID: 2555259477019157526, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_SizeDelta.x - value: 500 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_SizeDelta.y - value: 190 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 1050 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_AnchoredPosition.y - value: -494 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} ---- !u!1001 &5354378095848928545 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 545811781} - m_Modifications: - - target: {fileID: 1674852998343464126, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1674852998343464126, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1674852998343464126, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_SizeDelta.x - value: -17 - objectReference: {fileID: 0} - - target: {fileID: 2329154291525507558, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2329154291525507558, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2329154291525507558, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchoredPosition.x - value: 701.5 - objectReference: {fileID: 0} - - target: {fileID: 2329154291525507558, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchoredPosition.y - value: -92.5 - objectReference: {fileID: 0} - - target: {fileID: 2547989244355828686, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_Name - value: Panel_3DFactorySetting - objectReference: {fileID: 0} - - target: {fileID: 2547989244355828686, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3426804515912810300, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_SizeDelta.y - value: 185 - objectReference: {fileID: 0} - - target: {fileID: 4974998567431618568, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4974998567431618568, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4974998567431618568, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchoredPosition.x - value: 340 - objectReference: {fileID: 0} - - target: {fileID: 4974998567431618568, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchoredPosition.y - value: -15 - objectReference: {fileID: 0} - - target: {fileID: 8352325830369551728, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8352325830369551728, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_SizeDelta.x - value: -500 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_SizeDelta.y - value: -100 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchoredPosition.x - value: -250 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_AnchoredPosition.y - value: -50 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8591771762958906654, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} --- !u!1001 &5755889530248260559 PrefabInstance: m_ObjectHideFlags: 0 @@ -12744,11 +11875,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!224 &6779400300325097680 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6326893951638458967, guid: dc939bec0d4c2064f85a1812d063d42f, type: 3} - m_PrefabInstance: {fileID: 1621939674436309667} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6842742182395219503 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs index c00ff68d..18ef02b4 100644 --- a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs @@ -31,7 +31,6 @@ namespace Studio.Manage 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/SceneStartSettingManager.cs b/Assets/Scripts/Studio/Managers/SceneStartSettingManager.cs index 0522b2e5..7634d357 100644 --- a/Assets/Scripts/Studio/Managers/SceneStartSettingManager.cs +++ b/Assets/Scripts/Studio/Managers/SceneStartSettingManager.cs @@ -21,7 +21,6 @@ namespace Studio.Services onAppSetting += canvas_Popup.panel_appsetting.SetAppSetting; onAPISetting += canvas_Popup.panel_apisetting.SetAPISetting; onMQTTSetting += canvas_Popup.panel_mqttsetting.SetMQTTSetting; - onSaveModelDatas += canvas_Popup.panel_3dfactorysetting.SetDynamic3DModelSetting; } public SceneStartSetting GetSceneStartSettingData() { @@ -31,7 +30,6 @@ namespace Studio.Services sceneStartSetting.appSetting = canvas_Popup.panel_appsetting.GetAppSetting(); sceneStartSetting.apiSetting = canvas_Popup.panel_apisetting.GetAPISetting(); sceneStartSetting.mqttSetting = canvas_Popup.panel_mqttsetting.GetMQTTSetting(); - sceneStartSetting.factorySetting = canvas_Popup.panel_3dfactorysetting.GetDynamic3DModelSetting(); return sceneStartSetting; } @@ -55,7 +53,6 @@ namespace Studio.Services var canvas_Popup = CanvasManager.instance.GetCanvas(); onMQTTSetting?.Invoke(mqttSetting); - canvas_Popup.panel_3dfactorysetting.SetDataDropdownData(mqttSetting); } public void Set3DFactorySettingData(Dynamic3DModelSetting dynamic3DModelSetting) { diff --git a/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs b/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs index 663c8c69..6ec132d1 100644 --- a/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/StudioPopupCanvasHandler.cs @@ -19,7 +19,6 @@ namespace Studio.Manage canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData; - canvas_popup.panel_3dfactorysetting.onUISetting += canvas_popup.panel_dynamicobjectuisetting.SetData; } } } diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index 2e670bf1..9e67b601 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -21,20 +21,15 @@ namespace Studio public Panel_APISetting panel_apisetting; public Panel_MQTTSetting panel_mqttsetting; public Panel_AssetSetting panel_assetsetting; - public Panel_3DFactorySetting panel_3dfactorysetting; - public Panel_DynamicObjectUISetting panel_dynamicobjectuisetting; //public Panel_AssetManager panel_assetmanager; public Panel_AccessibilitySettings panel_accessibilitysettings; - public Panel_ColorPicker panel_colorpicker; public Panel_Hierarchy panel_hierarchy; public Panel_AssetLibrary panel_assetlibrary; public Panel_InterworkingDataList panel_interworkingdatalist; public Panel_InterferedObjectList panel_interferedobjectlist; public Panel_PredefinedType panel_predefinedtype; public Panel_DynamicObjectInfo panel_dynamicobjectinfo; - // public Panel_ObjectInfo panel_objectinfo; - public Panel_ObjectAlign panel_objectalign; public Panel_Tooltip panel_tooltip; public Panel_PropertyViewer panel_propertyviewer; //public Panel_ObjectDistance panel_objectdistance; diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Studio_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Studio_Popup.cs index ad320733..f8175107 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Studio_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Studio_Popup.cs @@ -9,8 +9,6 @@ namespace Studio.UI 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_Start panel_quickstart; public Panel_NewProjectInfo panel_newprojectinfo;