Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo

Assets/DownloadAssets/XRLib/Scripts/UVC/Manager/GizmoController.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.Collections.Generic;
 using RTGLite;
@@ -143,7 +143,7 @@ namespace UVC.Studio.Manager
         /// </summary>
         /// <param name="toolType">설정할 도구 타입</param>
         /// <param name="selectedCount">현재 선택된 객체 수</param>
-        public void SetActiveTool(TransformToolType toolType, int selectedCount = 0)
+        public void SetActiveTool(TransformToolType toolType)
         {
             if (!_initialized)
             {
@@ -160,11 +160,11 @@ namespace UVC.Studio.Manager
             if (_rotateGizmo != null) _rotateGizmo.enabled = false;
             if (_scaleGizmo != null) _scaleGizmo.enabled = false;
 
-            if (selectedCount == 0)
+            //if (selectedCount == 0)
-            {
+            //{
-                Debug.Log("[GizmoController] No selected objects. Gizmos will remain disabled.");
+            //    Debug.Log("[GizmoController] No selected objects. Gizmos will remain disabled.");
-                return;
+            //    return;
-            }
+            //}
 
             // 선택된 도구에 해당하는 기즈모 활성화
             switch (toolType)

Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.unity

@@ -9329,6 +9329,68 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 4301870690972932130, guid: 194fc48267c4a8546b1cd3cf81b72c0f, type: 3}
   m_PrefabInstance: {fileID: 195784722}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &196082805
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 510326597}
+    m_Modifications:
+    - target: {fileID: 3512242442729094994, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 24.92
+      objectReference: {fileID: 0}
+    - target: {fileID: 3512242442729094994, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 3512242442729094994, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 12.94
+      objectReference: {fileID: 0}
+    - target: {fileID: 3512242442729094994, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.7071037
+      objectReference: {fileID: 0}
+    - target: {fileID: 3512242442729094994, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3512242442729094994, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.7071099
+      objectReference: {fileID: 0}
+    - target: {fileID: 3512242442729094994, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3512242442729094994, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3512242442729094994, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3512242442729094994, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9169771889041799776, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+      propertyPath: m_Name
+      value: 4. CSS_prefab
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+--- !u!4 &196082806 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3512242442729094994, guid: a78f4c86e34b3434dabcbf1bdb3444cd, type: 3}
+  m_PrefabInstance: {fileID: 196082805}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &196326291
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -21941,68 +22003,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 8070779672533912818, guid: 4a3744e34338c53429c1b0e1fa714829, type: 3}
   m_PrefabInstance: {fileID: 453330637}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &455304156
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 510326597}
-    m_Modifications:
-    - target: {fileID: 6978348453776653865, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-      propertyPath: m_Name
-      value: 4. CSS
-      objectReference: {fileID: 0}
-    - target: {fileID: 7618644288684692450, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 24.92
-      objectReference: {fileID: 0}
-    - target: {fileID: 7618644288684692450, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.01
-      objectReference: {fileID: 0}
-    - target: {fileID: 7618644288684692450, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 12.94
-      objectReference: {fileID: 0}
-    - target: {fileID: 7618644288684692450, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.7071037
-      objectReference: {fileID: 0}
-    - target: {fileID: 7618644288684692450, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7618644288684692450, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071099
-      objectReference: {fileID: 0}
-    - target: {fileID: 7618644288684692450, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7618644288684692450, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7618644288684692450, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 269.999
-      objectReference: {fileID: 0}
-    - target: {fileID: 7618644288684692450, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
---- !u!4 &455304157 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7618644288684692450, guid: 0790368270e4ae0419a62a1f7778f6a2, type: 3}
-  m_PrefabInstance: {fileID: 455304156}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &457411438
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -23017,6 +23017,55 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 9064307636745932545, guid: 003e85a18ed389742ac31602abe72cf3, type: 3}
   m_PrefabInstance: {fileID: 489383363}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &490108526
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 490108527}
+  - component: {fileID: 490108528}
+  m_Layer: 0
+  m_Name: Agentic AI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &490108527
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 490108526}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.48600605, z: -0, w: 0.8739554}
+  m_LocalPosition: {x: 29.8, y: 0.35, z: 12.888}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1005158937}
+  m_LocalEulerAnglesHint: {x: 0, y: -58.157, z: 0}
+--- !u!114 &490108528
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 490108526}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ec4594a576c99c74b90ad6e3c4c2ac4b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::ChunilENG.Object.CameraPoint
+  floorIndex: 2
+  azimuth: 90
+  elevation: 26
+  distance: 7
+  TargetPivotTransform: {fileID: 0}
 --- !u!1001 &490751941
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -24313,7 +24362,7 @@ Transform:
   - {fileID: 1458566683}
   - {fileID: 1388978136}
   - {fileID: 868533779}
-  - {fileID: 455304157}
+  - {fileID: 196082806}
   - {fileID: 5495658386985200873}
   - {fileID: 443938317}
   - {fileID: 27671608}
@@ -44716,10 +44765,12 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1698040805}
   - {fileID: 1877012570}
   - {fileID: 1740796822}
   - {fileID: 842397949}
   - {fileID: 503925392}
+  - {fileID: 490108527}
   m_Father: {fileID: 70695278}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1005625676
@@ -78244,6 +78295,55 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 034bc47afcbf5e141a58d5c20b7808e4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &1698040804
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1698040805}
+  - component: {fileID: 1698040806}
+  m_Layer: 0
+  m_Name: Default
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1698040805
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1698040804}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 2.3, y: 1.87, z: -1.21}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1005158937}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1698040806
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1698040804}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ec4594a576c99c74b90ad6e3c4c2ac4b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::ChunilENG.Object.CameraPoint
+  floorIndex: 2
+  azimuth: 270
+  elevation: 26
+  distance: 8.5
+  TargetPivotTransform: {fileID: 0}
 --- !u!114 &1698921192
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -88356,7 +88456,7 @@ Transform:
   m_GameObject: {fileID: 1877012569}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 23.1, y: 0, z: -1.21}
+  m_LocalPosition: {x: 13.939, y: 0, z: 4.704}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Resources/UI/Sprites/TotalStatusBoard/BlueBackground.png.meta

@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 1bee05afcea9f694397fdb416714fccd
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/SystemScene.unity

@@ -2232,131 +2232,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1001 &1109772084
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 2065615845}
-    m_Modifications:
-    - target: {fileID: 2015586183705257098, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_Name
-      value: PlaybackListPanel
-      objectReference: {fileID: 0}
-    - target: {fileID: 2015586183705257098, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 353
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 313
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -434
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5477525448751655022, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5477525448751655022, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5477525448751655022, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: -1.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8100983100533929295, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 9138834436198834237, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 9138834436198834237, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
 --- !u!1001 &1168843108
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3007,6 +2882,7 @@ GameObject:
   - component: {fileID: 1603599219}
   - component: {fileID: 1603599218}
   - component: {fileID: 1603599220}
+  - component: {fileID: 1603599221}
   m_Layer: 10
   m_Name: Camera
   m_TagString: MainCamera
@@ -3120,7 +2996,7 @@ Camera:
   m_HDR: 1
   m_AllowMSAA: 1
   m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
+  m_ForceIntoRT: 1
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
@@ -3140,6 +3016,31 @@ MonoBehaviour:
     serializedVersion: 2
     m_Bits: 4294967295
   m_MaxRayIntersections: 0
+--- !u!114 &1603599221
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1603599216}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7bb42831ee5422f409e7f24f9e7488ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: EPO::EPOOutline.Outliner
+  stage: 1
+  renderingStrategy: 0
+  renderingMode: 0
+  outlineLayerMask: -1
+  primaryBufferSizeMode: 0
+  primaryRendererScale: 0.75
+  primarySizeReference: 800
+  blurShift: 1
+  dilateShift: 1
+  dilateIterations: 1
+  dilateQuality: 0
+  blurIterations: 1
+  blurType: 1
 --- !u!1 &1609824333
 GameObject:
   m_ObjectHideFlags: 0
@@ -3631,12 +3532,17 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9018949087606917739, guid: 0312eabdb9db59f41b04acd492040a66, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 145
+      objectReference: {fileID: 0}
+    - target: {fileID: 9018949087606917739, guid: 0312eabdb9db59f41b04acd492040a66, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 130
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects:
+    m_AddedGameObjects: []
-    - targetCorrespondingSourceObject: {fileID: 1813555272631186170, guid: 0312eabdb9db59f41b04acd492040a66, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 2080567709}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 0312eabdb9db59f41b04acd492040a66, type: 3}
 --- !u!114 &1758853234 stripped
@@ -4581,11 +4487,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c8cb2092b3edb8c45a6c83e42f465f94, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::UVC.Studio.Manager.SelectionInputHandler
---- !u!224 &2080567709 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5290342058106165413, guid: 52ccb7d1523bbb34aa311042f6af11a8, type: 3}
-  m_PrefabInstance: {fileID: 1109772084}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2082176946
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Camera/OrbitalController.cs

@@ -230,11 +230,11 @@ namespace OCTOPUS_TWIN
             currentAzimuth += input.mouseX * rotateSpeed;
             currentAzimuth %= 360;
 
-            if(viewMode == ViewMode.PerspectiveView)
+            //if(viewMode == ViewMode.PerspectiveView)
-            {
+            //{
-                currentElevation -= input.mouseY * rotateSpeed;
+            //    currentElevation -= input.mouseY * rotateSpeed;
-                currentElevation = Mathf.Clamp(currentElevation, minElevation, maxElevation);
+            //    currentElevation = Mathf.Clamp(currentElevation, minElevation, maxElevation);
-            }
+            //}
             isRotateOperation = true;
         }
 

Assets/Scripts/ChunilENG/Command/UICommand/ActiveFloorControlPanelCommand.cs

@@ -1,27 +0,0 @@
-using ChunilENG.Management;
-using UnityEngine;
-using UVC.UI.Commands;
-
-namespace ChunilENG.UI.Command
-{
-    public class ActiveFloorControlPanelCommand : ICommand
-    {
-        private bool isActive;
-
-        public void Execute(object? parameter = null)
-        {
-            var uiManager = ChunilENGSceneMain.Instance.GetManager<ChunilENGUIManager>();
-
-            if (!isActive)
-            {
-                uiManager.GetCanvas<PopupCanvas>().GetPanel<FloorControlPanel>().Open();
-                isActive = true;
-            }
-            else
-            {
-                uiManager.GetCanvas<PopupCanvas>().GetPanel<FloorControlPanel>().Close();
-                isActive = false;
-            }
-        }
-    }
-}

Assets/Scripts/ChunilENG/Command/UICommand/ActiveFloorControlPanelCommand.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 354196db0cc909b49b89c97f06bb1528

Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs

@@ -1,20 +0,0 @@
-using ChunilENG;
-using ChunilENG.Management;
-using ChunilENG.UI;
-using UnityEngine;
-using UVC.UI.Commands;
-
-namespace ChunilENG.UI.Command
-{
-    public class ActiveMachineInfoItemCommand : ICommand
-    {
-        private bool isActive = true;
-        public void Execute(object? parameter = null)
-        {
-            var itemManager = ChunilENGSceneMain.Instance.GetManager<MachineInfoItemManager>();
-            isActive = !isActive;
-            itemManager.ActiveIcons(isActive);
-        }
-    }
-}
-

Assets/Scripts/ChunilENG/Command/UICommand/ActiveMachineInfoItemCommand.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: dc27e9cd507dea347ade0e5e30c38bde

Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs

@@ -26,7 +26,7 @@ namespace ChunilENG.Management
         public Action<Machine> onClickKPIToMachine;
 
         public float defaultNameHeight = 2f;
-
+        private bool activeIconEnable;
         [Header("Scale Settings")]
         [Range(0.1f, 1.5f)] public float minScale;
         [Range(0.5f, 3f)] public float maxScale;
@@ -93,6 +93,7 @@ namespace ChunilENG.Management
         }
         void MachineIconsActive(Machine machine)
         {
+            if (!activeIconEnable) return;
             if(machine == null) return;
             var currentFloor = ChunilENGSceneMain.Instance.building.GetCurFloor();
             var machineInFloor = machine.GetComponentInParent<Floor>();
@@ -151,7 +152,8 @@ namespace ChunilENG.Management
         }
         public void ActiveIcons(bool isActive)
         {
-            foreach(var icon in itemToMachines.Keys)
+            activeIconEnable = isActive;
+            foreach (var icon in itemToMachines.Keys)
             {
                 icon.gameObject.SetActive(isActive);
             }

Assets/Scripts/ChunilENG/UI/LeftSidePanel.cs

@@ -1,4 +1,5 @@
-using ChunilENG.UI.Command;
+using ChunilENG.Management;
+using ChunilENG.UI.Command;
 using Cysharp.Threading.Tasks;
 using OCTOPUS_TWIN;
 using OCTOPUS_TWIN.Command;
@@ -96,11 +97,15 @@ namespace ChunilENG.UI
                 "화면을 녹화합니다.");
 
             // 내/외벽 활성화/비활성화
-            toolbarModel.AddToggleButton("button_wall_control", false,
+            toolbarModel.AddToggleButton("button_wall_control", true,
                 "Prefabs/UI/Toolbar/images/IMG_WallControl_on",
                 "Prefabs/UI/Toolbar/images/IMG_WallControl_off",
-                (isSelected) => Debug.Log($"내/외벽 조절 UI 활성화 상태 : {(isSelected ? "활성화" : "비활성화")} (OnToggle 콜백)"),
+                (isSelected) => 
-                new ActiveMachineInfoItemCommand(),
+                {
+                    var itemManager = ChunilENGSceneMain.Instance.GetManager<MachineInfoItemManager>();
+                    itemManager.ActiveIcons(!isSelected);
+                },
+                new ActiveWallControlPanelCommand(),
                 "내/외벽 조절 UI를 활성화/비활성화 합니다.");
 
             // 라이브러리

Assets/Scripts/ChunilENG/UI/MachineInfoItem/MachineInfoItem.cs

@@ -188,8 +188,7 @@ namespace ChunilENG.UI
 
         public void OnPointerExit(PointerEventData eventData)
         {
-            var controller = OctopusTwinAppMain.Instance.cameraController;
+            if (isExpand)
-            if (isExpand && !controller.IsCameraOperating)
             {
                 Default_KPI.gameObject.SetActive(true);
                 Expand_KPI.gameObject.SetActive(false);

Assets/Scripts/OctopusTwin/ShortcutConfigurator.cs

@@ -1,4 +1,4 @@
-using Cysharp.Threading.Tasks;
+using Cysharp.Threading.Tasks;
 using UnityEngine;
 using UVC.Core;
 using UVC.Object3d.Manager;
@@ -18,11 +18,11 @@ public class ShortcutConfigurator : MonoBehaviour
     [Inject]
     private SelectionManager? selectionManager;
 
-    // 단축키 관리자
+    // 단축키 관리자
     public ShortcutManager? shortcutManager;
 
     /// <summary>
-    /// 단축키 관리자를 설정합니다.
+    /// 단축키 관리자를 설정합니다.
     /// </summary>
     public async void SetupShortcutManager()
     {
@@ -31,7 +31,7 @@ public class ShortcutConfigurator : MonoBehaviour
         selectionManager = InjectorAppContext.Instance.Get<SelectionManager>();
         stageObjectManager = InjectorAppContext.Instance.Get<StageObjectManager>();
 
-        // StudioShortcutManager 생성 또는 가져오기
+        // StudioShortcutManager 생성 또는 가져오기
         shortcutManager = ShortcutManager.Instance;
         if (shortcutManager == null)
         {
@@ -40,7 +40,7 @@ public class ShortcutConfigurator : MonoBehaviour
             DontDestroyOnLoad(go);
         }
 
-        // Setting 주입
+        // Setting 주입
         Setting? currentSetting = setting;
         if (currentSetting == null && InjectorAppContext.Instance != null)
         {
@@ -51,53 +51,53 @@ public class ShortcutConfigurator : MonoBehaviour
             shortcutManager.SetSetting(currentSetting);
         }
 
-        // 메뉴 단축키 등록
+        // 메뉴 단축키 등록
         RegisterMenuShortcuts();
 
-        // 도구 단축키 등록
+        // 도구 단축키 등록
         RegisterToolShortcuts();
 
-        Debug.Log("[SetupShortcutManager] 단축키 관리자가 설정되었습니다.");
+        Debug.Log("[SetupShortcutManager] 단축키 관리자가 설정되었습니다.");
     }
 
     /// <summary>
-    /// 메뉴 단축키를 등록합니다.
+    /// 메뉴 단축키를 등록합니다.
     /// </summary>
     private void RegisterMenuShortcuts()
     {
         if (shortcutManager == null) return;
 
-        // Edit 메뉴
+        // Edit 메뉴
         shortcutManager.RegisterMenuShortcut("delete", new EditDeleteCommand(selectionManager!, stageObjectManager!));
     }
 
     /// <summary>
-    /// 도구 단축키를 등록합니다.
+    /// 도구 단축키를 등록합니다.
     /// </summary>
     private void RegisterToolShortcuts()
     {
         if (shortcutManager == null) return;
 
-        // 도구 단축키 - SelectionManager를 통해 기즈모 제어
+        // 도구 단축키 - SelectionManager를 통해 기즈모 제어
-        //shortcutManager.RegisterToolShortcut("select", () =>
+        shortcutManager.RegisterToolShortcut("select", () =>
-        //{
+        {
-        //    if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Select);
+            if (selectionManager != null) selectionManager.Gizmo.SetActiveTool(TransformToolType.Select);
-        //});
+        });
 
-        //shortcutManager.RegisterToolShortcut("move", () =>
+        shortcutManager.RegisterToolShortcut("move", () =>
-        //{
+        {
-        //    if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Move);
+            if (selectionManager != null) selectionManager.Gizmo.SetActiveTool(TransformToolType.Move);
-        //});
+        });
 
-        //shortcutManager.RegisterToolShortcut("rotate", () =>
+        shortcutManager.RegisterToolShortcut("rotate", () =>
-        //{
+        {
-        //    if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Rotate);
+            if (selectionManager != null) selectionManager.Gizmo.SetActiveTool(TransformToolType.Rotate);
-        //});
+        });
 
-        //shortcutManager.RegisterToolShortcut("scale", () =>
+        shortcutManager.RegisterToolShortcut("scale", () =>
-        //{
+        {
-        //    if (selectionManager != null) selectionManager.SetActiveTool(TransformToolType.Scale);
+            if (selectionManager != null) selectionManager.Gizmo.SetActiveTool(TransformToolType.Scale);
-        //});
+        });
 
         shortcutManager.RegisterToolShortcut("node", () =>
         {