에셋매니져 고침
This commit is contained in:
@@ -37,11 +37,11 @@ namespace Studio.Manage
|
|||||||
fbxFileManager.onLoadComplete += OnLoadCustomAsset;
|
fbxFileManager.onLoadComplete += OnLoadCustomAsset;
|
||||||
onAddSettingPaths += canvas_Popup.panel_assetsetting.SetAssetPathItmes;
|
onAddSettingPaths += canvas_Popup.panel_assetsetting.SetAssetPathItmes;
|
||||||
onSetAssetSetting += canvas_Popup.panel_assetsetting.SetAssetManager;
|
onSetAssetSetting += canvas_Popup.panel_assetsetting.SetAssetManager;
|
||||||
|
|
||||||
onAssetManagerDatas += (data) => projectManager.OpenProjectSettingsDataAfterDataLoad();
|
onAssetManagerDatas += (data) => projectManager.OpenProjectSettingsDataAfterDataLoad();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ClearFolderPathList()
|
public void ClearFolderPathList()
|
||||||
{
|
{
|
||||||
localAssetPaths.Clear();
|
localAssetPaths.Clear();
|
||||||
@@ -77,18 +77,20 @@ namespace Studio.Manage
|
|||||||
folderPathList.Add(folderPath);
|
folderPathList.Add(folderPath);
|
||||||
localAssetPaths.Add(folderPath);
|
localAssetPaths.Add(folderPath);
|
||||||
}
|
}
|
||||||
LoadResourcesAsset();
|
|
||||||
//LoadLocalFBXDirectorys();
|
LoadLocalFBXDirectorys();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void LoadResourcesAsset()
|
public void InitRessourceAsset()
|
||||||
{
|
{
|
||||||
var assets = Resources.LoadAll<GameObject>("Test");
|
var assets = Resources.LoadAll<GameObject>("Test");
|
||||||
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
||||||
fbxFileManager.LoadResource(assets);
|
fbxFileManager.LoadResource(assets);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void LoadResourcesAsset()
|
||||||
|
{
|
||||||
OnLoadCustomAsset();
|
OnLoadCustomAsset();
|
||||||
// var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
|
|
||||||
//canvas_Popup.panel_3dfactorysetting.SetModelDropdownData(fbxFileManager.dataRepo);
|
|
||||||
}
|
}
|
||||||
public void LoadLocalFBXDirectorys()
|
public void LoadLocalFBXDirectorys()
|
||||||
{
|
{
|
||||||
@@ -109,9 +111,6 @@ namespace Studio.Manage
|
|||||||
var projectManager = ManagerHub.instance.Get<ProjectManager>();
|
var projectManager = ManagerHub.instance.Get<ProjectManager>();
|
||||||
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
||||||
|
|
||||||
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
|
|
||||||
canvas_Popup.panel_3dfactorysetting.SetModelDropdownData(fbxFileManager.dataRepo);
|
|
||||||
|
|
||||||
if (projectManager.curProjectData.assetDatas.Count <= 0)
|
if (projectManager.curProjectData.assetDatas.Count <= 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ namespace Studio.Manage
|
|||||||
|
|
||||||
fbxFileManager.ClearFilePaths();
|
fbxFileManager.ClearFilePaths();
|
||||||
assetManager.ClearFolderPathList();
|
assetManager.ClearFolderPathList();
|
||||||
|
assetManager.InitRessourceAsset();
|
||||||
assetManager.onAssetManagerDatas?.Invoke(null);
|
assetManager.onAssetManagerDatas?.Invoke(null);
|
||||||
}
|
}
|
||||||
public void TopMenuNewProjectSettingData()
|
public void TopMenuNewProjectSettingData()
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Studio.Manage
|
namespace Studio.Manage
|
||||||
@@ -13,11 +13,11 @@ namespace Studio.Manage
|
|||||||
|
|
||||||
private void OnEnable()
|
private void OnEnable()
|
||||||
{
|
{
|
||||||
Application.wantsToQuit += HandleForcedExitRequest;
|
//Application.wantsToQuit += HandleForcedExitRequest;
|
||||||
}
|
}
|
||||||
protected override void OnDestroy()
|
protected override void OnDestroy()
|
||||||
{
|
{
|
||||||
Application.wantsToQuit -= HandleForcedExitRequest;
|
//Application.wantsToQuit -= HandleForcedExitRequest;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool HandleForcedExitRequest()
|
public bool HandleForcedExitRequest()
|
||||||
|
|||||||
@@ -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<AssetManager>().LoadResourcesAsset();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 8a546a61f765e9a46b7a9e75cc879902
|
|
||||||
Reference in New Issue
Block a user