From e4daf951e8b16388938c0b09d780d4de448614f6 Mon Sep 17 00:00:00 2001
From: geondo55 <102933884+geondo55@users.noreply.github.com>
Date: Thu, 12 Jun 2025 15:38:35 +0900
Subject: [PATCH] =?UTF-8?q?=EC=83=88=20=ED=94=84=EB=A1=9C=EC=A0=9D?=
 =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B1=B0?=
 =?UTF-8?q?=EB=82=98=20=EA=B8=B0=EC=A1=B4=20=ED=94=84=EB=A1=9C=EC=A0=9D?=
 =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=EC=97=B4=20=EB=95=8C=EB=A7=88=EB=8B=A4=20?=
 =?UTF-8?q?=EC=97=90=EC=85=8B=EC=9D=84=20=EB=8B=A4=EC=8B=9C=20=EB=B6=88?=
 =?UTF-8?q?=EB=9F=AC=EC=98=A4=EB=8A=94=20=EB=AC=B8=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scripts/Studio/AssetTool/CustomAssetConnector.cs  | 10 +++++++++-
 .../Studio/AssetTool/CustomAssetDataRepository.cs     | 11 +++++++++++
 .../Command/ObjectCommand/RemoveAllObjectCommand.cs   |  3 ++-
 Assets/Scripts/Studio/Managers/FBXFileManager.cs      |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs
index 382c2321..0aff71d5 100644
--- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs
+++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs
@@ -254,7 +254,15 @@ namespace Studio.AssetTool
             componentScrollView.DeselectAll();
             //canvas_Popup.panel_objectdistance.SetSelecetedObjectToNull();
         }
-
+        public void DestoryConnectedAssetAll()
+        {
+            foreach (ConnectedAsset connectedAsset in connectedAssets)
+            {
+                connectedAsset.renderObject.Deselect();
+                GameObject.Destroy(connectedAsset.renderObject.gameObject);
+            }
+            connectedAssets.Clear();
+        }
         public void OrderByHierarchy(List<CustomAssetRenderObject> objectsToOrder)
         {
             SortedDictionary<int, CustomAssetRenderObject> itemToObject = new SortedDictionary<int, CustomAssetRenderObject>();
diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetDataRepository.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetDataRepository.cs
index ba1c9561..bf8cf3d6 100644
--- a/Assets/Scripts/Studio/AssetTool/CustomAssetDataRepository.cs
+++ b/Assets/Scripts/Studio/AssetTool/CustomAssetDataRepository.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using Studio.Util;
+using UnityEngine;
 
 namespace Studio.Repositories
 {
@@ -34,6 +35,16 @@ namespace Studio.Repositories
         {
             assetDatas.Remove(assetData);
         }
+        
+        public void RemoveAll()
+        {
+            foreach (var assetData in assetDatas)
+            {
+                GameObject.Destroy(assetData.gameObject);
+            }
+
+            assetDatas.Clear();
+        }
 
         internal bool TryGetDataFromName(string name, out CustomAssetData p)
         {
diff --git a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs
index fd8363ef..14cf4c25 100644
--- a/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs
+++ b/Assets/Scripts/Studio/Command/ObjectCommand/RemoveAllObjectCommand.cs
@@ -58,11 +58,12 @@ namespace Studio
                 }
             }
             //connector.onRemoveObjects?.Invoke();
-            ManagerHub.instance.Get<RenderObjectHandler>().DeselectAll();
             var canvas = CanvasManager.instance.GetCanvas<Canvas_Popup>();
             canvas.panel_dynamicobjectinfo.ResetObjectInfo();
             connector.componentScrollView.DeselectAll();
             CanvasManager.instance.GetCanvas<Canvas_Popup>().panel_dynamicobjectinfo.ResetObjectInfo();
+            ManagerHub.instance.Get<RenderObjectHandler>().DeselectAll();
+            connector.DestoryConnectedAssetAll();
         }
     }
 }
diff --git a/Assets/Scripts/Studio/Managers/FBXFileManager.cs b/Assets/Scripts/Studio/Managers/FBXFileManager.cs
index 1a360852..001a4e85 100644
--- a/Assets/Scripts/Studio/Managers/FBXFileManager.cs
+++ b/Assets/Scripts/Studio/Managers/FBXFileManager.cs
@@ -51,7 +51,7 @@ namespace Studio.AssetTool
         }
         public void ClearFilePaths()
         {
-            dataRepo.assetDatas.Clear();
+            dataRepo.RemoveAll();
             filePaths.Clear();
         }