From c8731787170bf0a67408f033725211e0ac2d022e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A4=80=ED=95=99=20=EB=85=B8?= Date: Thu, 29 May 2025 02:41:41 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=90=EC=85=8B=EB=A7=A4=EB=8B=88=EC=A0=B8?= =?UTF-8?q?=20=EA=B3=A0=EC=B9=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Studio/Managers/AssetManager.cs | 19 ++++++++------- .../Scripts/Studio/Managers/ProjectManager.cs | 1 + Assets/Scripts/Studio/Managers/QuitManager.cs | 6 ++--- Assets/Test.cs | 23 ------------------- Assets/Test.cs.meta | 2 -- 5 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 Assets/Test.cs delete mode 100644 Assets/Test.cs.meta diff --git a/Assets/Scripts/Studio/Managers/AssetManager.cs b/Assets/Scripts/Studio/Managers/AssetManager.cs index 1a0fb89c..bf99853b 100644 --- a/Assets/Scripts/Studio/Managers/AssetManager.cs +++ b/Assets/Scripts/Studio/Managers/AssetManager.cs @@ -37,11 +37,11 @@ namespace Studio.Manage fbxFileManager.onLoadComplete += OnLoadCustomAsset; onAddSettingPaths += canvas_Popup.panel_assetsetting.SetAssetPathItmes; onSetAssetSetting += canvas_Popup.panel_assetsetting.SetAssetManager; - + onAssetManagerDatas += (data) => projectManager.OpenProjectSettingsDataAfterDataLoad(); } - + public void ClearFolderPathList() { localAssetPaths.Clear(); @@ -77,18 +77,20 @@ namespace Studio.Manage folderPathList.Add(folderPath); localAssetPaths.Add(folderPath); } - LoadResourcesAsset(); - //LoadLocalFBXDirectorys(); + + LoadLocalFBXDirectorys(); } - public void LoadResourcesAsset() + public void InitRessourceAsset() { var assets = Resources.LoadAll("Test"); var fbxFileManager = ManagerHub.instance.Get(); fbxFileManager.LoadResource(assets); + } + + public void LoadResourcesAsset() + { OnLoadCustomAsset(); - // var canvas_Popup = CanvasManager.instance.GetCanvas(); - //canvas_Popup.panel_3dfactorysetting.SetModelDropdownData(fbxFileManager.dataRepo); } public void LoadLocalFBXDirectorys() { @@ -109,9 +111,6 @@ namespace Studio.Manage var projectManager = ManagerHub.instance.Get(); var fbxFileManager = ManagerHub.instance.Get(); - var canvas_Popup = CanvasManager.instance.GetCanvas(); - canvas_Popup.panel_3dfactorysetting.SetModelDropdownData(fbxFileManager.dataRepo); - if (projectManager.curProjectData.assetDatas.Count <= 0) return; diff --git a/Assets/Scripts/Studio/Managers/ProjectManager.cs b/Assets/Scripts/Studio/Managers/ProjectManager.cs index f07fff5e..a66cf0fe 100644 --- a/Assets/Scripts/Studio/Managers/ProjectManager.cs +++ b/Assets/Scripts/Studio/Managers/ProjectManager.cs @@ -55,6 +55,7 @@ namespace Studio.Manage fbxFileManager.ClearFilePaths(); assetManager.ClearFolderPathList(); + assetManager.InitRessourceAsset(); assetManager.onAssetManagerDatas?.Invoke(null); } public void TopMenuNewProjectSettingData() diff --git a/Assets/Scripts/Studio/Managers/QuitManager.cs b/Assets/Scripts/Studio/Managers/QuitManager.cs index 67dd04b5..d68c7b27 100644 --- a/Assets/Scripts/Studio/Managers/QuitManager.cs +++ b/Assets/Scripts/Studio/Managers/QuitManager.cs @@ -1,4 +1,4 @@ -using System; +using System; using UnityEngine; namespace Studio.Manage @@ -13,11 +13,11 @@ namespace Studio.Manage private void OnEnable() { - Application.wantsToQuit += HandleForcedExitRequest; + //Application.wantsToQuit += HandleForcedExitRequest; } protected override void OnDestroy() { - Application.wantsToQuit -= HandleForcedExitRequest; + //Application.wantsToQuit -= HandleForcedExitRequest; } public bool HandleForcedExitRequest() diff --git a/Assets/Test.cs b/Assets/Test.cs deleted file mode 100644 index 9cf0b762..00000000 --- a/Assets/Test.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Studio.Manage; -using UnityEngine; - -namespace Studio -{ - public class Test : MonoBehaviour - { - // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() - { - - } - - // Update is called once per frame - void Update() - { - if(Input.GetKeyDown(KeyCode.K)) - { - ManagerHub.instance.Get().LoadResourcesAsset(); - } - } - } -} diff --git a/Assets/Test.cs.meta b/Assets/Test.cs.meta deleted file mode 100644 index b0f2e808..00000000 --- a/Assets/Test.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 8a546a61f765e9a46b7a9e75cc879902 \ No newline at end of file