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;
@@ -84,7 +84,7 @@ namespace UVC.Studio.Manager
 
             Debug.Log("[GizmoController] 기즈모가 초기화되었습니다.");
         }
-
+    
         #endregion
 
         #region Target Management

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

@@ -36,18 +36,21 @@ namespace UVC.Studio.Manager
         /// </summary>
         private StageObjectManager.StageObject? _lastClickedStageObject;
 
+
         protected async void Start()
         {
             // InjectorSceneContext 초기화 대기
             //await InjectorSceneContext.Instance.WaitForInitializationAsync();
 
+            
+
             _selectionManager = InjectorAppContext.Instance.Get<SelectionManager>();
             _selectionManager.Gizmo.Initialize();
             _stageObjectManager = InjectorAppContext.Instance.Get<StageObjectManager>();
 
             if (_selectionManager == null)
             {
-                Debug.LogWarning("[SelectionInputHandler] SelectionManager not found.");
+                Debug.LogWarning("[SelectionInputHandler] targetScene not found.");
             }
 
             if (_stageObjectManager == null)
@@ -64,7 +67,7 @@ namespace UVC.Studio.Manager
             {
                 HandleClick();
             }
-
+         
             if (IsDraggingGizmo())
             {
                 _selectionManager?.TickPropertyWindow();

Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Tab/SideTabBarAccordion.cs

@@ -16,6 +16,8 @@ using ChunilENG;
 using UVC.Config;
 using KEPCO;
 using System;
+using UnityEngine.SceneManagement;
+using OCTOPUS_TWIN;
 
 namespace UVC.Tab
 {
@@ -173,7 +175,9 @@ namespace UVC.Tab
                 //객체 Y값 올리기
                 // 프리뷰를 실제 객체로 전환
                 dragPreview.transform.position = worldPosition;
-
+                var scenName = OctopusTwinAppMain.Instance.projectListController.CursceneName;
+                Scene targetScene = SceneManager.GetSceneByName(scenName);
+                 SceneManager.MoveGameObjectToScene(dragPreview,targetScene);
                 // 프리뷰 머티리얼을 원래대로 복원
                 RestorePreviewMaterials(dragPreview);
 

Assets/Scripts/ChunilENG/ChunilENGSceneMain.cs

@@ -9,6 +9,7 @@ using UVC.Core;
 using UVC.Data;
 using UVC.Data.Core;
 using UVC.Management;
+using UVC.Studio.Manager;
 using UVC.UI.Tooltip;
 
 namespace ChunilENG
@@ -51,7 +52,9 @@ namespace ChunilENG
                 thermostatInfoItemManager = await LoadManager<ThermostatInfoItemManager>();
                 viewManager = await LoadManager<ViewManager>();
                 mqttManager = FindAnyObjectByType<MQTT>();
-
+            var selectMnager = InjectorAppContext.Instance.Get<SelectionManager>();
+            selectMnager.Gizmo.Dispose();
+            selectMnager.Gizmo.Initialize();
             dataManager = await LoadManager<DataManager>();
             MQTTEventDisConnect();
             SetupDataSetting();

Assets/Scripts/UI/ProjectListController.cs

@@ -203,7 +203,7 @@ namespace OCTOPUS_TWIN
                     break;
             }
         }
-
+        public string CursceneName;
         public async UniTask SceneTransition(int index)
         {
             var sceneIndex = index == 2 ? 0 : 1;
@@ -219,6 +219,7 @@ namespace OCTOPUS_TWIN
         private async UniTask LoadActiveProjectScene(string mainScene, SceneStatus status)
         {
             await  sceneController.SceneChange(mainScene, status);
+           CursceneName=mainScene;
         }
 
         private void SetActiveProgjectDataObject(Transform parent, string targetName, bool isOn)