Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: d524adc6297ea50418c16190b3f42f66
|
guid: 8ca817cf0dbcb8c45a568fe8416068d1
|
||||||
PrefabImporter:
|
PrefabImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -2960,7 +2960,6 @@ RectTransform:
|
|||||||
- {fileID: 1949998714}
|
- {fileID: 1949998714}
|
||||||
- {fileID: 1291368617}
|
- {fileID: 1291368617}
|
||||||
- {fileID: 783209398}
|
- {fileID: 783209398}
|
||||||
- {fileID: 722122563}
|
|
||||||
- {fileID: 2113204526}
|
- {fileID: 2113204526}
|
||||||
- {fileID: 1523668493}
|
- {fileID: 1523668493}
|
||||||
- {fileID: 1265526094}
|
- {fileID: 1265526094}
|
||||||
@@ -3649,224 +3648,6 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 6b37771737b0e1c45aa27bf9a659ee88, type: 3}
|
m_Script: {fileID: 11500000, guid: 6b37771737b0e1c45aa27bf9a659ee88, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
--- !u!1001 &722122562
|
|
||||||
PrefabInstance:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Modification:
|
|
||||||
serializedVersion: 3
|
|
||||||
m_TransformParent: {fileID: 545811781}
|
|
||||||
m_Modifications:
|
|
||||||
- target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_SizeDelta.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 45148937921022231, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: -23
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 869571349897044537, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_Pivot.x
|
|
||||||
value: 0.5
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_Pivot.y
|
|
||||||
value: 0.5
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.x
|
|
||||||
value: 0.5
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0.5
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMin.x
|
|
||||||
value: 0.5
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0.5
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_SizeDelta.x
|
|
||||||
value: 600
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_SizeDelta.y
|
|
||||||
value: 720
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_LocalPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_LocalPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_LocalPosition.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_LocalRotation.w
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_LocalRotation.x
|
|
||||||
value: -0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_LocalRotation.y
|
|
||||||
value: -0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_LocalRotation.z
|
|
||||||
value: -0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3023688080371428050, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.x
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3023688080371428050, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3023688080371428050, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_SizeDelta.x
|
|
||||||
value: -17
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3506873638369636397, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3602097825703806022, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: Panel_AssetSetting
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3602097825703806022, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_IsActive
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3874569747575904293, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.x
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3874569747575904293, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3899362292182497691, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6640188506573938184, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_SizeDelta.y
|
|
||||||
value: 83
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_SizeDelta.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9034550250193582980, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: -63
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
|
||||||
m_RemovedGameObjects: []
|
|
||||||
m_AddedGameObjects: []
|
|
||||||
m_AddedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
--- !u!224 &722122563 stripped
|
|
||||||
RectTransform:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 722122562}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &749092879
|
--- !u!1 &749092879
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -17,9 +17,6 @@ namespace Studio.Manage
|
|||||||
private Dictionary<int, HierarchyItem> itemDict = new Dictionary<int, HierarchyItem>();
|
private Dictionary<int, HierarchyItem> itemDict = new Dictionary<int, HierarchyItem>();
|
||||||
|
|
||||||
private Dictionary<int, string> assetSettingPaths = new Dictionary<int, string>();
|
private Dictionary<int, string> assetSettingPaths = new Dictionary<int, string>();
|
||||||
private Dictionary<int, string> assetManagerPaths = new Dictionary<int, string>();
|
|
||||||
|
|
||||||
public Action<Dictionary<int, string>> onAddMangerPaths;
|
|
||||||
public Action<Dictionary<int, string>> onAddSettingPaths;
|
public Action<Dictionary<int, string>> onAddSettingPaths;
|
||||||
|
|
||||||
public Action<AssetManagerData> onAssetManagerDatas;
|
public Action<AssetManagerData> onAssetManagerDatas;
|
||||||
@@ -38,10 +35,8 @@ namespace Studio.Manage
|
|||||||
|
|
||||||
fbxFileManager.onLoadComplete += OnLoadCustomAsset;
|
fbxFileManager.onLoadComplete += OnLoadCustomAsset;
|
||||||
onAddSettingPaths += canvas_Popup.panel_assetsetting.SetAssetPathItmes;
|
onAddSettingPaths += canvas_Popup.panel_assetsetting.SetAssetPathItmes;
|
||||||
onAddMangerPaths += canvas_Popup.panel_assetmanager.SetAssetPathItmes;
|
|
||||||
|
|
||||||
onSetAssetManager += canvas_Popup.panel_assetmanager.SetAssetManager;
|
|
||||||
onSetAssetSetting += canvas_Popup.panel_assetsetting.SetAssetManager;
|
onSetAssetSetting += canvas_Popup.panel_assetsetting.SetAssetManager;
|
||||||
|
|
||||||
onAssetManagerDatas += (data) => projectManager.OpenProjectSettingsDataAfterDataLoad();
|
onAssetManagerDatas += (data) => projectManager.OpenProjectSettingsDataAfterDataLoad();
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -50,19 +45,6 @@ namespace Studio.Manage
|
|||||||
localAssetPaths.Clear();
|
localAssetPaths.Clear();
|
||||||
folderPathList.Clear();
|
folderPathList.Clear();
|
||||||
}
|
}
|
||||||
public void LoadAssetManagerFBXDirectorys(int index, string folderPath)
|
|
||||||
{
|
|
||||||
if (!assetManagerPaths.ContainsKey(index))
|
|
||||||
{
|
|
||||||
assetManagerPaths.Add(index, folderPath);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
assetManagerPaths[index] = folderPath;
|
|
||||||
}
|
|
||||||
onAddSettingPaths?.Invoke(assetManagerPaths);
|
|
||||||
CombineAssetFolderPaths(assetManagerPaths.Values.ToList());
|
|
||||||
}
|
|
||||||
public void LoadAssetSettingFBXDirectorys(int index, string folderPath)
|
public void LoadAssetSettingFBXDirectorys(int index, string folderPath)
|
||||||
{
|
{
|
||||||
if (!assetSettingPaths.ContainsKey(index))
|
if (!assetSettingPaths.ContainsKey(index))
|
||||||
@@ -73,7 +55,7 @@ namespace Studio.Manage
|
|||||||
{
|
{
|
||||||
assetSettingPaths[index] = folderPath;
|
assetSettingPaths[index] = folderPath;
|
||||||
}
|
}
|
||||||
onAddMangerPaths?.Invoke(assetSettingPaths);
|
onAddSettingPaths?.Invoke(assetSettingPaths);
|
||||||
CombineAssetFolderPaths(assetSettingPaths.Values.ToList());
|
CombineAssetFolderPaths(assetSettingPaths.Values.ToList());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,7 +89,6 @@ namespace Studio.Manage
|
|||||||
}
|
}
|
||||||
public void SetAssetManager(AssetManagerData data)
|
public void SetAssetManager(AssetManagerData data)
|
||||||
{
|
{
|
||||||
onSetAssetManager?.Invoke(data);
|
|
||||||
onSetAssetSetting?.Invoke(data);
|
onSetAssetSetting?.Invoke(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace Studio.Manage
|
|||||||
GameObject assetLibraryWindow = canvas_Popup.panel_assetlibrary.gameObject;
|
GameObject assetLibraryWindow = canvas_Popup.panel_assetlibrary.gameObject;
|
||||||
GameObject repository = canvas_Popup.panel_datarepository.gameObject;
|
GameObject repository = canvas_Popup.panel_datarepository.gameObject;
|
||||||
|
|
||||||
canvas_static.panel_studiotopbar.onClickAssetManager += canvas_Popup.panel_assetmanager.Open;
|
canvas_static.panel_studiotopbar.onClickAssetManager += canvas_Popup.panel_assetsetting.Open;
|
||||||
canvas_static.panel_studiotopbar.onClickAssetLibraryWindow += (() => assetLibraryWindow.SetActive(true));
|
canvas_static.panel_studiotopbar.onClickAssetLibraryWindow += (() => assetLibraryWindow.SetActive(true));
|
||||||
canvas_static.panel_studiotopbar.onClickHierarchyWindow += (() => hierarchyWindow.SetActive(true));
|
canvas_static.panel_studiotopbar.onClickHierarchyWindow += (() => hierarchyWindow.SetActive(true));
|
||||||
canvas_static.panel_studiotopbar.onClickDataStorage += (() => repository.SetActive(true));
|
canvas_static.panel_studiotopbar.onClickDataStorage += (() => repository.SetActive(true));
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ namespace Studio
|
|||||||
public Panel_3DFactorySetting panel_3dfactorysetting;
|
public Panel_3DFactorySetting panel_3dfactorysetting;
|
||||||
public Panel_DynamicObjectUISetting panel_dynamicobjectuisetting;
|
public Panel_DynamicObjectUISetting panel_dynamicobjectuisetting;
|
||||||
|
|
||||||
public Panel_AssetManager panel_assetmanager;
|
//public Panel_AssetManager panel_assetmanager;
|
||||||
public Panel_AccessibilitySettings panel_accessibilitysettings;
|
public Panel_AccessibilitySettings panel_accessibilitysettings;
|
||||||
public Panel_ColorPicker panel_colorpicker;
|
public Panel_ColorPicker panel_colorpicker;
|
||||||
public Panel_Hierarchy panel_hierarchy;
|
public Panel_Hierarchy panel_hierarchy;
|
||||||
@@ -84,7 +84,6 @@ namespace Studio
|
|||||||
|
|
||||||
panel_newprojectinfo.onClickCreate += () => CommandInvoker.instance.Invoke(new NewProjectCommand());
|
panel_newprojectinfo.onClickCreate += () => CommandInvoker.instance.Invoke(new NewProjectCommand());
|
||||||
panel_openprojectinfo.onClickOpen += () => CommandInvoker.instance.Invoke(new OpenProjectCommand());
|
panel_openprojectinfo.onClickOpen += () => CommandInvoker.instance.Invoke(new OpenProjectCommand());
|
||||||
panel_assetmanager.onSelectedURL += assetManager.LoadAssetManagerFBXDirectorys;
|
|
||||||
panel_assetsetting.onSelectedURL += assetManager.LoadAssetSettingFBXDirectorys;
|
panel_assetsetting.onSelectedURL += assetManager.LoadAssetSettingFBXDirectorys;
|
||||||
|
|
||||||
panel_saveandnewchecker.onClickSaveAndNew += () => CommandInvoker.instance.Invoke(new SaveAndNewProjectCommand());
|
panel_saveandnewchecker.onClickSaveAndNew += () => CommandInvoker.instance.Invoke(new SaveAndNewProjectCommand());
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace Studio.UI
|
|||||||
private Button Button_SelectedFolder;
|
private Button Button_SelectedFolder;
|
||||||
|
|
||||||
public Action<UI_FolderPathItem> onEndEditInputFieldURL;
|
public Action<UI_FolderPathItem> onEndEditInputFieldURL;
|
||||||
|
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
|
||||||
|
|
||||||
public override void AfterAwake()
|
public override void AfterAwake()
|
||||||
{
|
{
|
||||||
@@ -32,7 +33,7 @@ namespace Studio.UI
|
|||||||
}
|
}
|
||||||
private void OnClickSelectedFolderButton()
|
private void OnClickSelectedFolderButton()
|
||||||
{
|
{
|
||||||
var paths = StandaloneFileBrowser.OpenFolderPanel("Select AssetsFolder", "", false);
|
var paths = StandaloneFileBrowser.OpenFolderPanel("Select AssetsFolder", defaultPath, false);
|
||||||
|
|
||||||
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ using Studio.Util;
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
using XRLib.UI;
|
using XRLib.UI;
|
||||||
@@ -23,6 +24,7 @@ namespace Studio.UI
|
|||||||
private RectTransform Content_LocalAssets;
|
private RectTransform Content_LocalAssets;
|
||||||
|
|
||||||
private Button Button_AddFolderPathItem;
|
private Button Button_AddFolderPathItem;
|
||||||
|
private Button Button_Close;
|
||||||
|
|
||||||
private UI_FolderPathItem prf_folderPathItem;
|
private UI_FolderPathItem prf_folderPathItem;
|
||||||
private List<UI_FolderPathItem> folderPathItems = new List<UI_FolderPathItem>();
|
private List<UI_FolderPathItem> folderPathItems = new List<UI_FolderPathItem>();
|
||||||
@@ -37,32 +39,56 @@ namespace Studio.UI
|
|||||||
toggleGroup = TabToggles.GetComponent<ToggleGroup>();
|
toggleGroup = TabToggles.GetComponent<ToggleGroup>();
|
||||||
Toggle_ServerAssets.onValueChanged.AddListener(OnServerAssetsValueChanged);
|
Toggle_ServerAssets.onValueChanged.AddListener(OnServerAssetsValueChanged);
|
||||||
Toggle_LocalAssets.onValueChanged.AddListener(OnLocalAssetsValueChanged);
|
Toggle_LocalAssets.onValueChanged.AddListener(OnLocalAssetsValueChanged);
|
||||||
Toggle_AssetHierarchy.onValueChanged.AddListener(OnSAssetHierarchyValueChanged);
|
Toggle_AssetHierarchy.onValueChanged.AddListener(OnAssetHierarchyValueChanged);
|
||||||
|
|
||||||
Toggle_ServerAssets.group = toggleGroup;
|
Toggle_ServerAssets.group = toggleGroup;
|
||||||
Toggle_LocalAssets.group = toggleGroup;
|
Toggle_LocalAssets.group = toggleGroup;
|
||||||
Toggle_AssetHierarchy.group = toggleGroup;
|
Toggle_AssetHierarchy.group = toggleGroup;
|
||||||
|
|
||||||
Button_AddFolderPathItem.onClick.AddListener(OnClickAddFolderPathItemButton);
|
Button_AddFolderPathItem.onClick.AddListener(OnClickAddFolderPathItemButton);
|
||||||
|
Button_Close.onClick.AddListener(Close);
|
||||||
folderPathItems.Clear();
|
folderPathItems.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Active(bool isOn)
|
public void Open()
|
||||||
{
|
{
|
||||||
SetActive(isOn);
|
SetActive(true);
|
||||||
|
}
|
||||||
|
public void Close()
|
||||||
|
{
|
||||||
|
SetActive(false);
|
||||||
}
|
}
|
||||||
private void OnServerAssetsValueChanged(bool isOn)
|
private void OnServerAssetsValueChanged(bool isOn)
|
||||||
{
|
{
|
||||||
|
SetToggleChanged(Toggle_ServerAssets, isOn);
|
||||||
ServerAssets.gameObject.SetActive(isOn);
|
ServerAssets.gameObject.SetActive(isOn);
|
||||||
}
|
}
|
||||||
private void OnLocalAssetsValueChanged(bool isOn)
|
private void OnLocalAssetsValueChanged(bool isOn)
|
||||||
{
|
{
|
||||||
|
SetToggleChanged(Toggle_LocalAssets, isOn);
|
||||||
LocalAssets.gameObject.SetActive(isOn);
|
LocalAssets.gameObject.SetActive(isOn);
|
||||||
}
|
}
|
||||||
private void OnSAssetHierarchyValueChanged(bool isOn)
|
private void OnAssetHierarchyValueChanged(bool isOn)
|
||||||
{
|
{
|
||||||
|
SetToggleChanged(Toggle_AssetHierarchy, isOn);
|
||||||
AssetHierarchy.gameObject.SetActive(isOn);
|
AssetHierarchy.gameObject.SetActive(isOn);
|
||||||
}
|
}
|
||||||
|
private void SetToggleChanged(Toggle toggle, bool isOn)
|
||||||
|
{
|
||||||
|
Debug.Log($"SetToggleChanged: {toggle.name} isOn: {isOn}");
|
||||||
|
var image = toggle.transform.GetChild(0).GetComponent<Image>();
|
||||||
|
image.gameObject.SetActive(isOn);
|
||||||
|
|
||||||
|
TextMeshProUGUI text = toggle.GetComponentInChildren<TextMeshProUGUI>();
|
||||||
|
if (isOn)
|
||||||
|
{
|
||||||
|
text.color = Color.white;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
text.color = Color.black;
|
||||||
|
}
|
||||||
|
}
|
||||||
private void OnClickAddFolderPathItemButton()
|
private void OnClickAddFolderPathItemButton()
|
||||||
{
|
{
|
||||||
var item = Instantiate(prf_folderPathItem, Content_LocalAssets);
|
var item = Instantiate(prf_folderPathItem, Content_LocalAssets);
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ namespace Studio.UI
|
|||||||
private Dictionary<string, string> languages = new Dictionary<string, string>();
|
private Dictionary<string, string> languages = new Dictionary<string, string>();
|
||||||
private string json;
|
private string json;
|
||||||
public string saveLanguage;
|
public string saveLanguage;
|
||||||
|
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
|
||||||
|
|
||||||
public override void AfterAwake()
|
public override void AfterAwake()
|
||||||
{
|
{
|
||||||
@@ -38,7 +39,7 @@ namespace Studio.UI
|
|||||||
}
|
}
|
||||||
void OnClickOpenFileButton()
|
void OnClickOpenFileButton()
|
||||||
{
|
{
|
||||||
StandaloneFileBrowser.OpenFilePanelAsync("Open File", "", "json", false, LoadJson);
|
StandaloneFileBrowser.OpenFilePanelAsync("Open File", defaultPath, "json", false, LoadJson);
|
||||||
}
|
}
|
||||||
void OnClickSaveButton()
|
void OnClickSaveButton()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ namespace Studio.UI
|
|||||||
|
|
||||||
private void OnClickFileExplorer()
|
private void OnClickFileExplorer()
|
||||||
{
|
{
|
||||||
var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", "", false);
|
var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", defaultPath, false);
|
||||||
|
|
||||||
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ namespace Studio.UI
|
|||||||
public Button Button_Open;
|
public Button Button_Open;
|
||||||
|
|
||||||
public Action onClickOpen;
|
public Action onClickOpen;
|
||||||
|
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
|
||||||
|
|
||||||
public override void AfterAwake()
|
public override void AfterAwake()
|
||||||
{
|
{
|
||||||
@@ -76,7 +77,7 @@ namespace Studio.UI
|
|||||||
|
|
||||||
private void OnClickFileExplorer()
|
private void OnClickFileExplorer()
|
||||||
{
|
{
|
||||||
var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", "", "ocs", false);
|
var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", defaultPath, "ocs", false);
|
||||||
|
|
||||||
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ namespace Studio.UI
|
|||||||
public Button Button_Close;
|
public Button Button_Close;
|
||||||
|
|
||||||
public Action onClickCreate;
|
public Action onClickCreate;
|
||||||
|
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
|
||||||
|
|
||||||
public override void AfterAwake()
|
public override void AfterAwake()
|
||||||
{
|
{
|
||||||
@@ -28,7 +29,7 @@ namespace Studio.UI
|
|||||||
}
|
}
|
||||||
private void OnClickFileExplorer()
|
private void OnClickFileExplorer()
|
||||||
{
|
{
|
||||||
var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", "", false);
|
var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", defaultPath, false);
|
||||||
|
|
||||||
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ namespace Studio.UI
|
|||||||
public Button Button_Close;
|
public Button Button_Close;
|
||||||
|
|
||||||
public Action onClickOpen;
|
public Action onClickOpen;
|
||||||
|
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
|
||||||
|
|
||||||
public override void AfterAwake()
|
public override void AfterAwake()
|
||||||
{
|
{
|
||||||
@@ -27,7 +28,7 @@ namespace Studio.UI
|
|||||||
}
|
}
|
||||||
private void OnClickFileExplorer()
|
private void OnClickFileExplorer()
|
||||||
{
|
{
|
||||||
var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", "", "ocs", false);
|
var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", defaultPath, "ocs", false);
|
||||||
|
|
||||||
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user