diff --git a/Assets/Prefabs/AAA/Panel_AssetManager.prefab b/Assets/Prefabs/AAA/Panel_AssetManager.prefab index 6b94e987..29613170 100644 --- a/Assets/Prefabs/AAA/Panel_AssetManager.prefab +++ b/Assets/Prefabs/AAA/Panel_AssetManager.prefab @@ -850,10 +850,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8351073445621197384} - {fileID: 7343312561069943535} - - {fileID: 5432522367969156775} - - {fileID: 278239820566090254} + - {fileID: 7093248375770478575} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -911,7 +909,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 25457a0961cc0bb4a949d5fe58c2ada6, type: 3} m_Name: m_EditorClassIdentifier: - selectedURLs: [] --- !u!1 &2774336303168765450 GameObject: m_ObjectHideFlags: 0 @@ -925,7 +922,7 @@ GameObject: - component: {fileID: 4194680172313760227} - component: {fileID: 4161472474340858527} m_Layer: 5 - m_Name: Contents + m_Name: ContentArea m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -938,7 +935,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2774336303168765450} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -946,7 +943,7 @@ RectTransform: - {fileID: 7853657062583654302} - {fileID: 5597721997679764478} - {fileID: 3968252631811439720} - m_Father: {fileID: 7257151592976347537} + m_Father: {fileID: 7093248375770478575} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1265,8 +1262,9 @@ GameObject: - component: {fileID: 6840359962142578336} - component: {fileID: 1993039467431344961} - component: {fileID: 3994860411736980792} + - component: {fileID: 1699707003209144614} m_Layer: 5 - m_Name: Title + m_Name: HaederArea m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1279,13 +1277,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4322829904092401199} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3734078514979837023} - m_Father: {fileID: 7257151592976347537} + - {fileID: 278239820566090254} + m_Father: {fileID: 7093248375770478575} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1345,6 +1344,18 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!114 &1699707003209144614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4322829904092401199} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa81ed666c3432441a47113a8812fc7c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4527343414870565064 GameObject: m_ObjectHideFlags: 0 @@ -1772,6 +1783,43 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6010522723516701095 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7093248375770478575} + m_Layer: 5 + m_Name: Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7093248375770478575 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6010522723516701095} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8351073445621197384} + - {fileID: 5432522367969156775} + m_Father: {fileID: 7257151592976347537} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6802457156864953380 GameObject: m_ObjectHideFlags: 0 @@ -2567,13 +2615,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8415573258789961671} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3421495713549568527} - m_Father: {fileID: 7257151592976347537} + m_Father: {fileID: 8351073445621197384} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 92f8a932..ce3bef33 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -1771,6 +1771,7 @@ RectTransform: - {fileID: 1712022043} - {fileID: 1229281891} - {fileID: 1195713950} + - {fileID: 1440673856} - {fileID: 1318345825} - {fileID: 917198748} - {fileID: 5235659802877143473} @@ -1834,6 +1835,7 @@ MonoBehaviour: panel_multilingualsettingmodal: {fileID: 0} panel_loggingmodal: {fileID: 0} panel_exitchecker: {fileID: 0} + panel_datarepository: {fileID: 0} panel_dataconnectmodal: {fileID: 0} panel_alarmconnectmodal: {fileID: 0} panel_dynamicobjectinfo: {fileID: 0} @@ -6701,7 +6703,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2762757506943678736, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + insertIndex: -1 + addedObject: {fileID: 1392094550} m_SourcePrefab: {fileID: 100100000, guid: d524adc6297ea50418c16190b3f42f66, type: 3} --- !u!224 &1265526094 stripped RectTransform: @@ -6775,6 +6780,28 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8789936807297394088, guid: 8b1e53b08c386aa4f9d7890359831d12, type: 3} m_PrefabInstance: {fileID: 6692007882516102510} m_PrefabAsset: {fileID: 0} +--- !u!1 &1392094546 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2762757506943678736, guid: d524adc6297ea50418c16190b3f42f66, type: 3} + m_PrefabInstance: {fileID: 1265526093} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1392094550 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392094546} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3} + m_Name: + m_EditorClassIdentifier: + state: 0 + resizeDirection: 0 + handleThickness: 5 + minWidth: 100 + minHeight: 100 --- !u!224 &1418698196 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1137729075814093741, guid: fee67c74d2dc0a44faefb6391492902e, type: 3} @@ -6882,6 +6909,11 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3} m_PrefabInstance: {fileID: 1439596646} m_PrefabAsset: {fileID: 0} +--- !u!224 &1440673856 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + m_PrefabInstance: {fileID: 1642586509} + m_PrefabAsset: {fileID: 0} --- !u!224 &1523668493 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} @@ -7152,6 +7184,463 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3425713149264809870, guid: 7dc4728378d41514e97175c1e1256bba, type: 3} m_PrefabInstance: {fileID: 1497175492396361906} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1642586509 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 545811781} + m_Modifications: + - target: {fileID: 436272971326210540, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 436272971326210540, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1278068010924803958, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1278068010924803958, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -338 + objectReference: {fileID: 0} + - target: {fileID: 1630686248379312651, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1630686248379312651, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1630686248379312651, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -383 + objectReference: {fileID: 0} + - target: {fileID: 2822090260079876239, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2822090260079876239, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -23 + objectReference: {fileID: 0} + - target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -158 + objectReference: {fileID: 0} + - target: {fileID: 3356956008821289435, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: -107 + objectReference: {fileID: 0} + - target: {fileID: 3844317292563568359, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3844317292563568359, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: 53 + objectReference: {fileID: 0} + - target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 98 + objectReference: {fileID: 0} + - target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -83.5 + objectReference: {fileID: 0} + - target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: 53 + objectReference: {fileID: 0} + - target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 98 + objectReference: {fileID: 0} + - target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -30.5 + objectReference: {fileID: 0} + - target: {fileID: 5534746474241454325, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5534746474241454325, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 800 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5771394843837740805, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_Name + value: Panel_DataRepository + objectReference: {fileID: 0} + - target: {fileID: 5771394843837740805, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -293 + objectReference: {fileID: 0} + - target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 94 + objectReference: {fileID: 0} + - target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -48 + objectReference: {fileID: 0} + - target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 94 + objectReference: {fileID: 0} + - target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -48 + objectReference: {fileID: 0} + - target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -203 + objectReference: {fileID: 0} + - target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -428 + objectReference: {fileID: 0} + - target: {fileID: 6878974675812328970, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6878974675812328970, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -68 + objectReference: {fileID: 0} + - target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -248 + objectReference: {fileID: 0} + - target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.x + value: 584 + objectReference: {fileID: 0} + - target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchoredPosition.y + value: -113 + objectReference: {fileID: 0} + - target: {fileID: 8345779493912287860, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_SizeDelta.y + value: -440 + objectReference: {fileID: 0} + - target: {fileID: 8779561970847334551, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8779561970847334551, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6cd73227415ad0641a0549a54080ba77, type: 3} --- !u!1001 &1712022042 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index 6ae8df4e..efd0cf52 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -187,6 +187,22 @@ namespace Studio.AssetTool } childAsset.renderObject.transform.parent = parentAsset.renderObject.transform; } + public void OnLoadAsset(AssetData asset) + { + AssetLibraryItem item = assetScrollView.FindItem(asset.name, AssetLibraryItemType.file); + OnAssetSelected(item); + selectRenderObject.transform.position = new Vector3(asset.position.x, asset.position.y, asset.position.z); + selectRenderObject.transform.eulerAngles = new Vector3(asset.rotation.x, asset.rotation.y, asset.rotation.z); + selectRenderObject.transform.localScale = new Vector3(asset.scale.x, asset.scale.y, asset.scale.z); + OnAssetDropped(item); + } + + public void OnRestoreHierarchy(HierarchyItem parentItem, HierarchyItem childItem) + { + componentScrollView.selectedItems.Add(childItem); + componentScrollView.SetToChildItem(childItem, parentItem); + componentScrollView.DeselectAll(); + } public void OnDeselectAll() { diff --git a/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs b/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs index cd61c31c..753f785a 100644 --- a/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs +++ b/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs @@ -31,6 +31,7 @@ namespace Studio.AssetTool private bool isSaveTaskComplete = true; public bool isLoadTaskComplete = true; public Transform fbxAnchor; + public Action onLoadComplete; public FBXFileManager() { @@ -231,6 +232,7 @@ namespace Studio.AssetTool connector.assetScrollView.AddItem(folderName, null, AssetLibraryItemType.folder); AssetLibraryItem item = connector.assetScrollView.AddItem(assetData.assetName, assetData.gameObject, AssetLibraryItemType.file, urlSectionItem); + onLoadComplete?.Invoke(); } } } \ No newline at end of file diff --git a/Assets/Scripts/Studio/Command/AssetManagerCommand/LoadLocalAssetCommand.cs b/Assets/Scripts/Studio/Command/AssetManagerCommand/LoadLocalAssetCommand.cs index f7f5f675..3ad11145 100644 --- a/Assets/Scripts/Studio/Command/AssetManagerCommand/LoadLocalAssetCommand.cs +++ b/Assets/Scripts/Studio/Command/AssetManagerCommand/LoadLocalAssetCommand.cs @@ -1,9 +1,6 @@ -using Studio.AssetTool; -using Studio.Command; using Studio.Manage; -using UnityEngine; -namespace XED +namespace Studio.Command { public class LoadLocalAssetCommand : IIrreversibleCommand { @@ -17,7 +14,8 @@ namespace XED public void Execute() { var assetManager = ManagerHub.instance.Get(); - assetManager.LoadLocalFBXDirectorys(); + var canvas_Popup = EventConnector.instance.GetCanvas(); + assetManager.LoadLocalFBXDirectorys(canvas_Popup.panel_assetmanager.GetAssetManagerData().localAssetsPaths); } } } diff --git a/Assets/Scripts/Studio/Command/ProjectCommand/OpenProjectCommand.cs b/Assets/Scripts/Studio/Command/ProjectCommand/OpenProjectCommand.cs new file mode 100644 index 00000000..0079859f --- /dev/null +++ b/Assets/Scripts/Studio/Command/ProjectCommand/OpenProjectCommand.cs @@ -0,0 +1,20 @@ +using Studio.Manage; + +namespace Studio.Command +{ + public class OpenProjectCommand : IIrreversibleCommand + { + 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.OpenProejctSettingData(); + } + } +} diff --git a/Assets/Scripts/Studio/Command/ProjectCommand/OpenProjectCommand.cs.meta b/Assets/Scripts/Studio/Command/ProjectCommand/OpenProjectCommand.cs.meta new file mode 100644 index 00000000..00ed7853 --- /dev/null +++ b/Assets/Scripts/Studio/Command/ProjectCommand/OpenProjectCommand.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 23bc6c2724e5b5c4f8a51420ad4b8d06 \ No newline at end of file diff --git a/Assets/Scripts/Studio/Common/ProejctData.cs b/Assets/Scripts/Studio/Common/ProejctData.cs index 1b77324e..7c8e06fa 100644 --- a/Assets/Scripts/Studio/Common/ProejctData.cs +++ b/Assets/Scripts/Studio/Common/ProejctData.cs @@ -5,8 +5,8 @@ namespace Studio.Util { public class ProjectData { - public string updateDate; public SceneStartSetting sceneStartSetting; + public AssetManagerData assetManagerData; public List assetDatas; } @@ -82,6 +82,12 @@ namespace Studio.Util public string dataValue; } + public class AssetManagerData + { + public List serverAssetsPaths = new List(); + public List localAssetsPaths = new List(); + } + public class AssetData { public int id; diff --git a/Assets/Scripts/Studio/Managers/AssetManager.cs b/Assets/Scripts/Studio/Managers/AssetManager.cs index 8222316f..0ebf8a84 100644 --- a/Assets/Scripts/Studio/Managers/AssetManager.cs +++ b/Assets/Scripts/Studio/Managers/AssetManager.cs @@ -4,7 +4,7 @@ using Studio.Manage; using System.Collections.Generic; using UnityEngine; -namespace XED +namespace Studio.Manage { public class AssetManager : Manager { @@ -14,12 +14,11 @@ namespace XED { folderPath.Clear(); } - public void LoadLocalFBXDirectorys() + public void LoadLocalFBXDirectorys(List folderPaths) { - var canvas_Popup = EventConnector.instance.GetCanvas(); var fbxFileManager = ManagerHub.instance.Get(); - foreach(var path in canvas_Popup.panel_assetmanager.selectedURLs) + foreach(var path in folderPaths) { if (folderPath.Contains(path)) continue; diff --git a/Assets/Scripts/Studio/Managers/ManagerHub.cs b/Assets/Scripts/Studio/Managers/ManagerHub.cs index e8712eb7..b71ba4eb 100644 --- a/Assets/Scripts/Studio/Managers/ManagerHub.cs +++ b/Assets/Scripts/Studio/Managers/ManagerHub.cs @@ -3,7 +3,6 @@ using UnityEngine; using Studio.AssetTool; using Studio.Core; using Studio.Util; -using XED; namespace Studio.Manage { diff --git a/Assets/Scripts/Studio/Managers/ProjectManager.cs b/Assets/Scripts/Studio/Managers/ProjectManager.cs index 32ebc469..163470eb 100644 --- a/Assets/Scripts/Studio/Managers/ProjectManager.cs +++ b/Assets/Scripts/Studio/Managers/ProjectManager.cs @@ -8,6 +8,7 @@ using Studio.Util; using UnityEngine; using System.Linq; using Studio.HierarchyTree; +using Studio.Command; namespace Studio.Manage { @@ -24,14 +25,22 @@ namespace Studio.Manage public Action onMQTTSetting; public Action onSaveModelDatas; + public Action onAssetManagerDatas; + + private CustomAssetConnector connector; + private Dictionary itemDict = new Dictionary(); + public override void Init() { var canvas_Popup = EventConnector.instance.GetCanvas(); + var fbxFileManager = ManagerHub.instance.Get(); + fbxFileManager.onLoadComplete += LoadCustomAsset; onAppSetting += canvas_Popup.panel_appsetting.SetAppSetting; onAPISetting += canvas_Popup.panel_apisetting.SetAPISetting; onMQTTSetting += canvas_Popup.panel_mqttsetting.SetMQTTSetting; onSaveModelDatas += canvas_Popup.panel_3dfactorysetting.SetDynamic3DModelSetting; + onAssetManagerDatas += canvas_Popup.panel_assetmanager.SetAssetManager; } public void NewProjectSettingData() { @@ -42,9 +51,10 @@ namespace Studio.Manage curProjectTemplate = canvas_Popup.panel_newprojectinfo.GetProjectTemplate(); curProjectData = null; } - public void LoadSceneSettingData() + public void OpenProejctSettingData() { var canvas_Popup = EventConnector.instance.GetCanvas(); + var assetManager = ManagerHub.instance.Get(); var filePath = canvas_Popup.panel_openprojectinfo.GetProjectRoute(); if (File.Exists(filePath)) @@ -55,6 +65,8 @@ namespace Studio.Manage curProjectPath = Path.GetDirectoryName(filePath); curProjectData = JsonConvert.DeserializeObject(json); + assetManager.LoadLocalFBXDirectorys(curProjectData.assetManagerData.localAssetsPaths); + onAppSetting?.Invoke(curProjectData.sceneStartSetting.appSetting); onAPISetting?.Invoke(curProjectData.sceneStartSetting.apiSetting); onMQTTSetting?.Invoke(curProjectData.sceneStartSetting.mqttSetting); @@ -82,8 +94,8 @@ namespace Studio.Manage .Select(asset => CreateAssetData(asset.hierarchyItem)) .ToList(); curProjectData = CreateProjectData(assetDatas); - string json = JsonConvert.SerializeObject(curProjectData, Formatting.Indented); + FileStream fs = new FileStream(path, FileMode.Create, FileAccess.Write); StreamWriter writer = new StreamWriter(fs, System.Text.Encoding.Unicode); writer.Write(json); @@ -106,8 +118,8 @@ namespace Studio.Manage { return new ProjectData { - updateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), sceneStartSetting = CreateSceneStartSettingData(), + assetManagerData = CreateAssetManagerData(), assetDatas = assetDatas }; } @@ -123,11 +135,58 @@ namespace Studio.Manage return sceneStartSetting; } + private AssetManagerData CreateAssetManagerData() + { + var canvas_Popup = EventConnector.instance.GetCanvas(); + var assetManagerData = canvas_Popup.panel_assetmanager.GetAssetManagerData(); + + return assetManagerData; + } private string GetSaveFilePath() { var data = StandaloneFileBrowser.SaveFilePanel("SaveProject", "", curProjectName, ".ocs"); return data.Name; } + private void LoadCustomAsset() + { + if (curProjectData == null) + return; + + connector = ManagerHub.instance.Get(); + List assets = curProjectData.assetDatas; + + CommandInvoker.instance.Invoke(new RemoveAllObjectCommand()); + + foreach (AssetData asset in assets) + { + LoadAsset(asset); + itemDict.Add(asset.id, connector.connectedAssets.Last().hierarchyItem); + } + + foreach (AssetData asset in assets) + { + RestoreHierarchy(asset); + } + onAssetManagerDatas?.Invoke(curProjectData.assetManagerData); + } + private void LoadAsset(AssetData asset) + { + connector.OnLoadAsset(asset); + } + + 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/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index 42c29410..8fa5de92 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -86,7 +86,7 @@ namespace Studio var quitManager = FindAnyObjectByType(); panel_newprojectinfo.onClickCreate += () => CommandInvoker.instance.Invoke(new NewProjectCommand()); - //panel_openprojectinfo.onClickOpen += () => CommandInvoker.instance.Invoke(new LoadProjectCommand()); + panel_openprojectinfo.onClickOpen += () => CommandInvoker.instance.Invoke(new OpenProjectCommand()); panel_assetmanager.onSelectedURLs += () => CommandInvoker.instance.Invoke(new LoadLocalAssetCommand()); panel_apiconnectmodal.onClickFilterButton += dataManager.SetFilterData; diff --git a/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs b/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs index 7bf9164e..8b34c9e0 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; using TriLibCore.SFB; using System; -namespace XED +namespace Studio.UI { public class UI_FolderPathItem : UIBase { @@ -19,6 +19,10 @@ namespace XED InputField_URL.onEndEdit.AddListener(OnEndEditInputFieldURL); Button_SelectedFolder.onClick.AddListener(OnClickSelectedFolderButton); } + public void SetData(string path) + { + InputField_URL.text = path; + } private void OnEndEditInputFieldURL(string input) { if (string.IsNullOrEmpty(input)) diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs index e4d8865d..d5c57614 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs @@ -170,15 +170,17 @@ namespace Studio.UI } public void SetAppSetting(AppSetting appSetting) { - var bytes = Convert.FromBase64String(appSetting.splashImageByte); - - Texture2D texture = new Texture2D(2, 2); - if (texture.LoadImage(bytes)) + if (!string.IsNullOrEmpty(appSetting.splashImageByte)) { - Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f)); - Image_Selected.sprite = sprite; - } + var bytes = Convert.FromBase64String(appSetting.splashImageByte); + Texture2D texture = new Texture2D(2, 2); + if (texture.LoadImage(bytes)) + { + Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f)); + Image_Selected.sprite = sprite; + } + } Dropdown_AnimationStyle.value = Dropdown_AnimationStyle.options.FindIndex(option => option.text == appSetting.animationStyle); Dropdown_ProgressBarStyle.value = Dropdown_ProgressBarStyle.options.FindIndex(option => option.text == appSetting.progressBarStyle); Toggle_AutoStart.isOn = appSetting.autoStart; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AssetManager.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AssetManager.cs index 5b42cc94..16f8a627 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AssetManager.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AssetManager.cs @@ -1,10 +1,11 @@ +using Studio.Util; using System; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using XRLib.UI; -namespace XED +namespace Studio.UI { public class Panel_AssetManager : PanelBase { @@ -25,7 +26,7 @@ namespace XED private UI_FolderPathItem prf_folderPathItem; private List folderPathItems = new List(); - public List selectedURLs = new List(); + private List selectedURLs = new List(); public Action onSelectedURLs; @@ -85,5 +86,27 @@ namespace XED } onSelectedURLs?.Invoke(); } + public AssetManagerData GetAssetManagerData() + { + var assetManagerData = new AssetManagerData(); + assetManagerData.localAssetsPaths.AddRange(selectedURLs); + + return assetManagerData; + } + public void SetAssetManager(AssetManagerData assetManagerData) + { + selectedURLs.Clear(); + + foreach (var localPath in assetManagerData.localAssetsPaths) + { + var item = Instantiate(prf_folderPathItem, Content_LocalAssets); + item.onEndEditInputFieldURL += LoadAsstsPath; + item.SetData(localPath); + folderPathItems.Add(item); + selectedURLs.Add(item.GetURL()); + + Button_AddFolderPathItem.transform.SetAsLastSibling(); + } + } } } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_OpenProjectInfo.cs b/Assets/Scripts/Studio/UI/Panel/Panel_OpenProjectInfo.cs index 48a4dd57..80015def 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_OpenProjectInfo.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_OpenProjectInfo.cs @@ -53,17 +53,21 @@ namespace Studio.UI string json = File.ReadAllText(input); var metaInfo = JsonConvert.DeserializeObject(json).sceneStartSetting.appSetting; - var bytes = Convert.FromBase64String(metaInfo.splashImageByte); - Texture2D texture = new Texture2D(2, 2); - if (texture.LoadImage(bytes)) + if (!string.IsNullOrEmpty(metaInfo.splashImageByte)) { - Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f)); - Image_ProjectMetaInfo.sprite = sprite; + var bytes = Convert.FromBase64String(metaInfo.splashImageByte); - float height = Image_ProjectMetaInfo.rectTransform.rect.height; - float newWidth = Image_ProjectMetaInfo.rectTransform.rect.height / metaInfo.ratio; - Image_ProjectMetaInfo.rectTransform.sizeDelta = new Vector2(newWidth, height); + Texture2D texture = new Texture2D(2, 2); + if (texture.LoadImage(bytes)) + { + Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f)); + Image_ProjectMetaInfo.sprite = sprite; + + float height = Image_ProjectMetaInfo.rectTransform.rect.height; + float newWidth = Image_ProjectMetaInfo.rectTransform.rect.height / metaInfo.ratio; + Image_ProjectMetaInfo.rectTransform.sizeDelta = new Vector2(newWidth, height); + } } }