From cfd55c912eebec0f741b3c23a752d826c419a78d Mon Sep 17 00:00:00 2001 From: wsh Date: Fri, 23 May 2025 13:23:55 +0900 Subject: [PATCH] =?UTF-8?q?LoadProjectCommand=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Studio/AssetTool/CustomAssetConnector.cs | 11 +-- .../ProjectCommand/LoadProjectCommand.cs | 98 ------------------- .../ProjectCommand/LoadProjectCommand.cs.meta | 2 - 3 files changed, 3 insertions(+), 108 deletions(-) delete mode 100644 Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs delete mode 100644 Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs.meta diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index e3552862..94a96401 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -21,7 +21,6 @@ namespace Studio.AssetTool public AssetLibraryPooledScrollView assetScrollView; public AssetLibraryScrollRect assetScrollRect; public HierarchyPooledScrollView componentScrollView; - public HierarchyPooledScrollView InterworkingDataScrollView; public Panel_ObjectDistance panel_ObjectDistance; public GameObject renderObjectPrefab; public float objectShowDistance = 1000.0f; @@ -36,12 +35,8 @@ namespace Studio.AssetTool public System.Action onRemoveObjects; public System.Action onAssetDropped; - public CustomAssetEventHandler assetEventHandler; public SceneDataContainer sceneDataContainer; - public CustomAssetConnector() - { - assetEventHandler = new CustomAssetEventHandler(); - } + public override void Init() { //interferedObjectManager = ManagerHub.instance.Get(); @@ -52,7 +47,7 @@ namespace Studio.AssetTool assetScrollView = EventConnector.instance.GetCanvas().panel_assetlibrary.scrollView; componentScrollView = EventConnector.instance.GetCanvas().panel_hierarchy.scrollView; panel_ObjectDistance = EventConnector.instance.GetCanvas().panel_objectdistance; - InterworkingDataScrollView = EventConnector.instance.GetCanvas().panel_interworkingdatalist.scrollView; + //InterworkingDataScrollView = EventConnector.instance.GetCanvas().panel_interworkingdatalist.scrollView; assetScrollRect.onDragBegin.AddListener(OnAssetSelected); assetScrollRect.onDragAndDrop.AddListener(OnAssetDropped); @@ -177,8 +172,8 @@ namespace Studio.AssetTool } selectRenderObject.Deselect(); selectedAssetData = null; - Debug.Log($"On Asset Dropped {item.name}"); onAssetDropped?.Invoke(); + Debug.Log($"On Asset Dropped {item.name}"); } public void OnParentChanged(HierarchyItem parentItem, HierarchyItem childItem) diff --git a/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs b/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs deleted file mode 100644 index af259e36..00000000 --- a/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs +++ /dev/null @@ -1,98 +0,0 @@ -using Newtonsoft.Json; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using TriLibCore.SFB; -using Studio.AssetTool; -using Studio.HierarchyTree; -using Studio.Manage; -using Studio.Util; - -namespace Studio.Command -{ - public class LoadProjectCommand : IIrreversibleCommand - { - private CustomAssetConnector connector; - private Dictionary itemDict = new Dictionary(); - - public LoadProjectCommand() - { - - } - - public string id { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); } - - public bool CanExecute() - { - throw new System.NotImplementedException(); - } - - public void Execute() - { - var projectManager = ManagerHub.instance.Get(); - projectManager.LoadSceneSettingData(); - - //connector = ManagerHub.instance.Get(); - //var projectManager = ManagerHub.instance.Get(); - - //List assets = projectManager.curProjectData.assetDatas; - - //string path = GetOpenFilePath(); - - //if (string.IsNullOrEmpty(path)) - // return; - - //ProjectData projectData = GetFileData(path); - - //if (projectData == null) - // return; - - //CommandInvoker.instance.Invoke(new RemoveAllObjectCommand()); - - //foreach (AssetData asset in assets) - //{ - // LoadAsset(asset); - //} - - //foreach (AssetData asset in assets) - //{ - // RestoreHierarchy(asset); - //} - - //projectManager.curProjectPath = path; - //projectManager.curProjectData = projectData; - } - - private string GetOpenFilePath() - { - var data = StandaloneFileBrowser.OpenFilePanel("OpenProject", "", "json", false); - return data.Count >= 1 ? data[0].Name : ""; - } - - private ProjectData GetFileData(string path) - { - string json = File.ReadAllText(path); - return JsonConvert.DeserializeObject(json); - } - - private void LoadAsset(AssetData asset) - { - connector.OnLoadAsset(asset); - itemDict.Add(asset.id, connector.connectedAssets.Last().hierarchyItem); - } - - private void RestoreHierarchy(AssetData asset) - { - foreach (int id in asset.children) - { - HierarchyItem parent = itemDict[asset.id]; - HierarchyItem child = itemDict[id]; - - if (parent == null || child == null) - continue; - - connector.OnRestoreHierarchy(parent, child); - } - } - } -} diff --git a/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs.meta b/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs.meta deleted file mode 100644 index 280541e7..00000000 --- a/Assets/Scripts/Studio/Command/ProjectCommand/LoadProjectCommand.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 58dff3fed88a2eb4fab1bc8116f0c170 \ No newline at end of file