중간 저장
This commit is contained in:
@@ -1,172 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &6403074468239445253
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 13273118576283872}
|
||||
- component: {fileID: 538649878903734265}
|
||||
m_Layer: 0
|
||||
m_Name: CustomAssetConnector
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &13273118576283872
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6403074468239445253}
|
||||
serializedVersion: 2
|
||||
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: 4978247003912376479}
|
||||
- {fileID: 1000793883570924469}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &538649878903734265
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6403074468239445253}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 33f84af3802526548befd3c6e68f67d8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &3956852705411700500
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 13273118576283872}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2048176525751629727, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RenderObjectHandler
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4254239384611290273, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4254239384611290273, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4254239384611290273, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4254239384611290273, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4254239384611290273, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4254239384611290273, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4254239384611290273, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4254239384611290273, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4254239384611290273, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4254239384611290273, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
--- !u!4 &1000793883570924469 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4254239384611290273, guid: 2d670e3279ac3324bba323ab3ed2bef9, type: 3}
|
||||
m_PrefabInstance: {fileID: 3956852705411700500}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &6247234762045722773
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 13273118576283872}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1415515309089783818, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1415515309089783818, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1415515309089783818, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1415515309089783818, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1415515309089783818, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1415515309089783818, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1415515309089783818, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1415515309089783818, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1415515309089783818, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1415515309089783818, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7695058519597474191, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SaveLoadFBXData
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
--- !u!4 &4978247003912376479 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1415515309089783818, guid: 20880f5e11bf5724b82b2b3ebd3de3db, type: 3}
|
||||
m_PrefabInstance: {fileID: 6247234762045722773}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2c4ff86506de88747baaf66d9d637c5b
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,46 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &2048176525751629727
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4254239384611290273}
|
||||
- component: {fileID: 6125667014742207553}
|
||||
m_Layer: 0
|
||||
m_Name: RenderObjectHandler
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4254239384611290273
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2048176525751629727}
|
||||
serializedVersion: 2
|
||||
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: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6125667014742207553
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2048176525751629727}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 23bf878a8d76f9f4d9514e7c393cf926, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
@@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2d670e3279ac3324bba323ab3ed2bef9
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -255,6 +255,50 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 88186217}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &138733192
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 138733193}
|
||||
- component: {fileID: 138733194}
|
||||
m_Layer: 0
|
||||
m_Name: SystemMain
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &138733193
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 138733192}
|
||||
serializedVersion: 2
|
||||
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: []
|
||||
m_Father: {fileID: 1093055756}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &138733194
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 138733192}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2778cc56cc78c8a46846112e3aad69d2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &157533902
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3037,6 +3081,50 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7756644939596186566, guid: a906cd4ab09260143b9d87e622d9e458, type: 3}
|
||||
m_PrefabInstance: {fileID: 812349387}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &817519639
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 817519640}
|
||||
- component: {fileID: 817519641}
|
||||
m_Layer: 0
|
||||
m_Name: ManageHub
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &817519640
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 817519639}
|
||||
serializedVersion: 2
|
||||
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: []
|
||||
m_Father: {fileID: 1093055756}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &817519641
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 817519639}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 729a2ee4bef76d34aa641f7254b67f3b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &827571245
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3112,32 +3200,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 827571245}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &833546890 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4357501051956785434, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
m_PrefabInstance: {fileID: 1319277344}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &833546892
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 833546890}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8d1f9c7add0ac3345ac4cc9e8c59084a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
identifier:
|
||||
password:
|
||||
onLoadFbxFile:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
onRemoveFbxFile:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
isLoadTaskComplete: 1
|
||||
--- !u!1 &837752632
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4246,18 +4308,19 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 1149817090}
|
||||
- {fileID: 636283413}
|
||||
- {fileID: 1437072834}
|
||||
- {fileID: 1451571416}
|
||||
- {fileID: 1552320077}
|
||||
- {fileID: 2021424132}
|
||||
- {fileID: 1123988285}
|
||||
- {fileID: 812349388}
|
||||
- {fileID: 503307894}
|
||||
- {fileID: 1805249248}
|
||||
- {fileID: 2057021881}
|
||||
- {fileID: 538683123}
|
||||
- {fileID: 617235297}
|
||||
- {fileID: 1801579273}
|
||||
- {fileID: 138733193}
|
||||
- {fileID: 1900911698}
|
||||
- {fileID: 817519640}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1096619401
|
||||
@@ -4696,7 +4759,6 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1123988285}
|
||||
- component: {fileID: 1123988286}
|
||||
m_Layer: 0
|
||||
m_Name: CommandManager
|
||||
m_TagString: Untagged
|
||||
@@ -4719,18 +4781,6 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1093055756}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1123988286
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1123988284}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 476f4f09271b1e141a85ed6cff471f5e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1149817088
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -8628,67 +8678,6 @@ MonoBehaviour:
|
||||
_gradientOffset: 0
|
||||
_isVisible: 0
|
||||
_renderIgnoreCameras: []
|
||||
--- !u!1001 &1319277344
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1093055756}
|
||||
m_Modifications:
|
||||
- target: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6403074468239445253, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: CustomAssetConnector
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 7645908678807808531, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4357501051956785434, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 833546892}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
--- !u!1 &1321269470
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -8764,50 +8753,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1321269470}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &1437072833
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1437072834}
|
||||
- component: {fileID: 1437072835}
|
||||
m_Layer: 0
|
||||
m_Name: UserInputManager
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1437072834
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1437072833}
|
||||
serializedVersion: 2
|
||||
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: []
|
||||
m_Father: {fileID: 1093055756}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1437072835
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1437072833}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b37771737b0e1c45aa27bf9a659ee88, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1439596646
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -10355,7 +10300,6 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1801579273}
|
||||
- component: {fileID: 1801579275}
|
||||
- component: {fileID: 1801579274}
|
||||
m_Layer: 0
|
||||
m_Name: ProjectManager
|
||||
@@ -10391,23 +10335,6 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d3b7eb8ddaf6a2c4a94629439aa5654f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1801579275
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1801579272}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c5052381a5a4ad84385f60d56ad223fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!4 &1805249248 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 13273118576283872, guid: 2c4ff86506de88747baaf66d9d637c5b, type: 3}
|
||||
m_PrefabInstance: {fileID: 1319277344}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1809156807
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -10875,6 +10802,37 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1851032822}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1900911697
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1900911698}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1900911698
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1900911697}
|
||||
serializedVersion: 2
|
||||
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: []
|
||||
m_Father: {fileID: 1093055756}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1903053286
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -4,6 +4,7 @@ using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using UnityEngine.UI.Extensions;
|
||||
using XED.Manage;
|
||||
using XRLib.UI;
|
||||
|
||||
namespace XED.UI
|
||||
@@ -27,6 +28,8 @@ namespace XED.UI
|
||||
|
||||
List<(ConnectionHandlePoint, ConnectionHandlePoint)> connections = new();
|
||||
List<ConnectionHandlePoint> connection = new();
|
||||
|
||||
|
||||
internal void Connect(ConnectionHandlePoint connectionHandlePoint)
|
||||
{
|
||||
connection.Add(connectionHandlePoint);
|
||||
|
||||
@@ -28,9 +28,6 @@ namespace XED.Asset
|
||||
public GameObject selectedItem;
|
||||
public CustomAssetRenderObject selectRenderObject;
|
||||
|
||||
public FBXFileManager saveLoadFBXData;
|
||||
public RenderObjectHandler renderObjectHandler;
|
||||
public System.Action<string, List<GameObject>> onSelectObjects;
|
||||
public System.Action onDeselectObjects;
|
||||
public System.Action onRemoveObjects;
|
||||
public System.Action onAssetDropped;
|
||||
@@ -38,39 +35,36 @@ namespace XED.Asset
|
||||
public CustomAssetDataHandler assetDataHandler;
|
||||
public CustomAssetEventHandler assetEventHandler;
|
||||
|
||||
ProjectManager projectManager;
|
||||
public CustomAssetConnector()
|
||||
{
|
||||
saveLoadFBXData = ManagerHub.instance.Get<FBXFileManager>();
|
||||
renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
|
||||
assetDataHandler = new CustomAssetDataHandler(this);
|
||||
assetEventHandler = new CustomAssetEventHandler(this);
|
||||
projectManager = ManagerHub.instance.Get<ProjectManager>();
|
||||
assetScrollRect = EventConnector.instance.popupCanvasHandler.canvas.panel_assetlibrary.scrollRect;
|
||||
assetScrollView = EventConnector.instance.popupCanvasHandler.canvas.panel_assetlibrary.scrollView;
|
||||
componentScrollView = EventConnector.instance.popupCanvasHandler.canvas.panel_hierarchy.scrollView;
|
||||
InterworkingDataScrollView = EventConnector.instance.popupCanvasHandler.canvas.panel_interworkingdatalist.scrollView;
|
||||
renderObjectPrefab = Resources.Load<GameObject>("Prefabs/PRF_RenderObject");
|
||||
assetEventHandler = new CustomAssetEventHandler();
|
||||
}
|
||||
public override void Init()
|
||||
{
|
||||
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
|
||||
|
||||
onRemoveObjects += canvas_Popup.panel_objectinfo.ResetObjectInfo;
|
||||
onDeselectObjects += (() => { canvas_Popup.panel_objectinfo.gameObject.SetActive(false); });
|
||||
|
||||
assetScrollRect = EventConnector.instance.GetCanvas<Canvas_Popup>().panel_assetlibrary.scrollRect;
|
||||
assetScrollRect.onDragBegin.AddListener(OnAssetSelected);
|
||||
assetScrollRect.onDragAndDrop.AddListener(OnAssetDropped);
|
||||
assetScrollView.onSelect.AddListener(assetEventHandler.OnSelectAssetFromHierarchy);
|
||||
|
||||
InterworkingDataScrollView = EventConnector.instance.GetCanvas<Canvas_Popup>().panel_interworkingdatalist.scrollView;
|
||||
InterworkingDataScrollView.onSelect.AddListener(assetEventHandler.OnSelectDataFromHierarchy);
|
||||
|
||||
assetScrollView = EventConnector.instance.GetCanvas<Canvas_Popup>().panel_assetlibrary.scrollView;
|
||||
assetScrollView.onSelect.AddListener(assetEventHandler.OnSelectAssetFromHierarchy);
|
||||
|
||||
componentScrollView = EventConnector.instance.GetCanvas<Canvas_Popup>().panel_hierarchy.scrollView;
|
||||
componentScrollView.onSelect.AddListener(assetEventHandler.OnSelectObjectFromHierarchy);
|
||||
componentScrollView.onParentChanged.AddListener(OnParentChanged);
|
||||
saveLoadFBXData.onLoadFbxFile.AddListener(assetDataHandler.OnLoadFbxFile);
|
||||
|
||||
saveLoadFBXData.onRemoveFbxFile.AddListener(assetDataHandler.OnRemoveFbxFile);
|
||||
renderObjectHandler.onSelectObject.AddListener(assetEventHandler.OnSelectObjectFromObjectHandler);
|
||||
renderObjectHandler.onCopyObject.AddListener(OnCopyObject);
|
||||
renderObjectHandler.onRemoveObject.AddListener(OnRemoveObject);
|
||||
renderObjectHandler.onOrderByHierachy.AddListener(OrderByHierarchy);
|
||||
renderObjectHandler.onDeselectAll += OnDeselectAll;
|
||||
|
||||
projectManager.onRemoveAsset += OnRemoveObject;
|
||||
renderObjectPrefab = Resources.Load<GameObject>("Prefabs/PRF_RenderObject");
|
||||
}
|
||||
|
||||
private void OnRemoveObject(List<CustomAssetRenderObject> objects)
|
||||
public void OnRemoveObject(List<CustomAssetRenderObject> objects)
|
||||
{
|
||||
if (objects.Count == 0)
|
||||
{
|
||||
@@ -88,7 +82,7 @@ namespace XED.Asset
|
||||
CommandInvoker.instance.Invoke(command);
|
||||
}
|
||||
|
||||
private void OnCopyObject(List<CustomAssetRenderObject> objects)
|
||||
public void OnCopyObject(List<CustomAssetRenderObject> objects)
|
||||
{
|
||||
if (objects.Count == 0)
|
||||
{
|
||||
@@ -233,6 +227,20 @@ namespace XED.Asset
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
internal void ClearObjects()
|
||||
{
|
||||
List<CustomAssetRenderObject> objects = connectedAssets.Select(x => x.renderObject).ToList();
|
||||
OnRemoveObject(objects);
|
||||
}
|
||||
|
||||
internal void OnSelectObjects(string name, List<GameObject> selectedObjects)
|
||||
{
|
||||
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
|
||||
canvas_Popup.panel_objectinfo.gameObject.SetActive(true);
|
||||
canvas_Popup.panel_objectinfo.SetObjectInfo(name, selectedObjects);
|
||||
canvas_Popup.panel_objectdistance.SelectObjectFromClick(name, selectedObjects);
|
||||
}
|
||||
}
|
||||
public class ConnectedAsset
|
||||
{
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using XED.Asset;
|
||||
using XED.HierarchyTree;
|
||||
using XED.Manage;
|
||||
using XED.Util;
|
||||
|
||||
namespace XED
|
||||
@@ -28,12 +29,14 @@ namespace XED
|
||||
|
||||
public void SaveSelectedAssetDatasToLocal()
|
||||
{
|
||||
connector.saveLoadFBXData.SaveToLocalData(connector.selectedAssetDatas);
|
||||
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
||||
fbxFileManager.SaveToLocalData(connector.selectedAssetDatas);
|
||||
}
|
||||
|
||||
public void LoadLocalAssetDatas()
|
||||
{
|
||||
connector.saveLoadFBXData.LoadLocalData();
|
||||
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
||||
fbxFileManager.LoadLocalData();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,19 +3,13 @@ using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
using XED.HierarchyTree;
|
||||
using XED.Manage;
|
||||
using XED.Util;
|
||||
|
||||
namespace XED.Asset
|
||||
{
|
||||
public class CustomAssetEventHandler
|
||||
{
|
||||
private CustomAssetConnector connector;
|
||||
|
||||
public CustomAssetEventHandler(CustomAssetConnector connector)
|
||||
{
|
||||
this.connector = connector;
|
||||
}
|
||||
|
||||
public void OnSelectObjectFromHierarchy(List<HierarchyItem> selectedItems)
|
||||
{
|
||||
if (selectedItems.Count == 0)
|
||||
@@ -23,25 +17,28 @@ namespace XED.Asset
|
||||
return;
|
||||
}
|
||||
string name = "";
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
|
||||
List<GameObject> selectedObjects = new List<GameObject>();
|
||||
foreach (ConnectedAsset connectedAsset in connector.connectedAssets)
|
||||
{
|
||||
connectedAsset.renderObject.Deselect();
|
||||
}
|
||||
connector.renderObjectHandler.RemoveAllSelections();
|
||||
renderObjectHandler.RemoveAllSelections();
|
||||
for (int i = 0; i < selectedItems.Count; i++)
|
||||
{
|
||||
ConnectedAsset searchAsset = connector.connectedAssets.Find((x) => x.hierarchyItem == selectedItems[i]);
|
||||
name = i == 0 ? searchAsset.hierarchyItem.name : name.Equals(searchAsset.hierarchyItem.name) ? searchAsset.hierarchyItem.name : "-";
|
||||
selectedObjects.Add(searchAsset.renderObject.gameObject);
|
||||
connector.renderObjectHandler.AddSelection(searchAsset.renderObject);
|
||||
renderObjectHandler.AddSelection(searchAsset.renderObject);
|
||||
}
|
||||
connector.renderObjectHandler.ResetGizmoTargetObjects();
|
||||
connector.onSelectObjects?.Invoke(name, selectedObjects);
|
||||
renderObjectHandler.ResetGizmoTargetObjects();
|
||||
connector.OnSelectObjects(name, selectedObjects);
|
||||
}
|
||||
|
||||
public void OnSelectAssetFromHierarchy(List<HierarchyItem> selectedItems)
|
||||
{
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
connector.selectedAssetDatas.Clear();
|
||||
if (selectedItems.Count == 0)
|
||||
{
|
||||
@@ -76,6 +73,8 @@ namespace XED.Asset
|
||||
string name = "";
|
||||
List<GameObject> selectedObjects = new List<GameObject>();
|
||||
List<HierarchyItem> selectedItems = new List<HierarchyItem>();
|
||||
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
for (int i = 0; i < objects.Count; i++)
|
||||
{
|
||||
ConnectedAsset searchAsset = connector.connectedAssets.Find((x) => x.renderObject == objects[i]);
|
||||
@@ -84,20 +83,24 @@ namespace XED.Asset
|
||||
selectedObjects.Add(searchAsset.renderObject.gameObject);
|
||||
}
|
||||
connector.componentScrollView.OnSelect(selectedItems);
|
||||
connector.onSelectObjects?.Invoke(name, selectedObjects);
|
||||
|
||||
connector.OnSelectObjects(name, selectedObjects);
|
||||
}
|
||||
|
||||
public void OnDragBoxSelect(Rect selectionBoxRect)
|
||||
{
|
||||
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
List<ConnectedAsset> activeAssets = connector.connectedAssets.FindAll(x => x.renderObject != null && x.renderObject.gameObject.activeSelf);
|
||||
if (activeAssets.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
string name = "";
|
||||
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
|
||||
List<HierarchyItem> selectedItems = new List<HierarchyItem>();
|
||||
List<CustomAssetRenderObject> selectedRenderObjects = new List<CustomAssetRenderObject>();
|
||||
connector.renderObjectHandler.RemoveAllSelections();
|
||||
renderObjectHandler.RemoveAllSelections();
|
||||
for (int i = 0; i < activeAssets.Count; i++)
|
||||
{
|
||||
ConnectedAsset activeAsset = activeAssets[i];
|
||||
@@ -108,9 +111,9 @@ namespace XED.Asset
|
||||
selectedRenderObjects.Add(activeAsset.renderObject);
|
||||
}
|
||||
}
|
||||
connector.renderObjectHandler.AddSelection(selectedRenderObjects);
|
||||
renderObjectHandler.AddSelection(selectedRenderObjects);
|
||||
connector.componentScrollView.OnSelect(selectedItems);
|
||||
connector.onSelectObjects?.Invoke(name, selectedRenderObjects.Select(x => x.gameObject).ToList());
|
||||
connector.OnSelectObjects(name, selectedRenderObjects.Select(x => x.gameObject).ToList());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using XED.Repositories;
|
||||
using XED.Asset;
|
||||
|
||||
namespace XED.Manage
|
||||
{
|
||||
@@ -18,7 +19,6 @@ namespace XED.Manage
|
||||
|
||||
public string identifier;
|
||||
public string password;
|
||||
public UnityEvent<string, string, CustomAssetData> onLoadFbxFile;
|
||||
public UnityEvent<string> onRemoveFbxFile;
|
||||
public event System.Action onBeginLoadAsset;
|
||||
private SaveData saveData;
|
||||
@@ -38,11 +38,17 @@ namespace XED.Manage
|
||||
messagePacker = new MessagePackFileManager<SaveData>();
|
||||
messagePacker.Initialize();
|
||||
|
||||
identifier = identifier.Length == 0 ? "defaultAssetData" : identifier;
|
||||
identifier = string.IsNullOrEmpty(identifier) ? "defaultAssetData" : identifier;
|
||||
//StartCoroutine(CoroutineLoadLocalFiles());
|
||||
string baseDataPath = Application.streamingAssetsPath + "/baseAssetData";
|
||||
LoadLocalData(baseDataPath);
|
||||
}
|
||||
public override void Init()
|
||||
{
|
||||
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
|
||||
GameObject assetWindow = canvas_Popup.panel_assetlibrary.gameObject;
|
||||
onBeginLoadAsset += (() => assetWindow.SetActive(true));
|
||||
}
|
||||
|
||||
public void LoadLocalFBXDirectory()
|
||||
{
|
||||
@@ -132,12 +138,13 @@ namespace XED.Manage
|
||||
assetData.Manager = "xr@uvc.co.kr";
|
||||
assetData.LoadLocalFBX(path);
|
||||
dataRepo.Add(assetData);
|
||||
onLoadFbxFile?.Invoke(name, lastFolderName, assetData);
|
||||
//onLoadFbxFile?.Invoke(name, lastFolderName, assetData);
|
||||
yield return new WaitUntil(() => (assetData.isLoadComplete == true && assetData.progress == 1) || assetData.isLoadError == true);
|
||||
if (assetData.isLoadError)
|
||||
{
|
||||
dataRepo.Remove(assetData);
|
||||
onRemoveFbxFile?.Invoke(name);
|
||||
ManagerHub.instance.Get<CustomAssetConnector>().assetDataHandler.OnRemoveFbxFile(name);
|
||||
//onRemoveFbxFile?.Invoke(name);
|
||||
}
|
||||
yield return null;
|
||||
}
|
||||
@@ -325,9 +332,11 @@ namespace XED.Manage
|
||||
assetData.OnLoadComplete();
|
||||
|
||||
dataRepo.Add(assetData);
|
||||
//listAssets.Add(assetData);
|
||||
onLoadFbxFile?.Invoke(assetData.assetName, assetData.folderName, assetData);
|
||||
//listAssets.Add(assetData);
|
||||
ManagerHub.instance.Get<CustomAssetConnector>().assetDataHandler.OnLoadFbxFile(assetData.assetName, assetData.folderName, assetData);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -29,23 +29,10 @@ namespace XED.Util
|
||||
int uiLayer;
|
||||
int selectIndex;
|
||||
bool lockHandler = false;
|
||||
public event System.Action<Vector3> onDragBegin;
|
||||
public event System.Action<Vector3> onDragEnd;
|
||||
public event System.Action onDragForceEnd;
|
||||
public UnityEvent<List<CustomAssetRenderObject>> onSelectObject;
|
||||
public UnityEvent<List<CustomAssetRenderObject>> onRemoveObject;
|
||||
public UnityEvent<List<CustomAssetRenderObject>> onCopyObject;
|
||||
public UnityEvent<List<CustomAssetRenderObject>> onOrderByHierachy;
|
||||
public event System.Action onDeselectAll;
|
||||
public event System.Action<List<GameObject>> onTransformChanged;
|
||||
|
||||
void Awake()
|
||||
public override void Init()
|
||||
{
|
||||
myHandler = GetInputHandler();
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
rtgController = new RTGController();
|
||||
rtgController.onTransformBegin = OnTransformBegin;
|
||||
rtgController.onTransformChanged = OnTransformChangedFromRTG;
|
||||
@@ -68,7 +55,7 @@ namespace XED.Util
|
||||
{
|
||||
return;
|
||||
}
|
||||
onDragBegin?.Invoke(clickBeginPos);
|
||||
EventConnector.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.OnBeginDrag(clickBeginPos);
|
||||
}
|
||||
private void OnMousePointerUp()
|
||||
{
|
||||
@@ -88,14 +75,14 @@ namespace XED.Util
|
||||
EventSystem.current.RaycastAll(pointerData, raycastResults);
|
||||
if (raycastResults.Any(x => x.gameObject.layer == uiLayer))
|
||||
{
|
||||
onDragForceEnd?.Invoke();
|
||||
EventConnector.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
|
||||
return;
|
||||
}
|
||||
//포인터 업 위치가 포인터 다운 위치에서 크게 벗어났을 경우는 클릭을 무시한다.
|
||||
if ((clickBeginPos - Input.mousePosition).magnitude > clickLengthThreshold)
|
||||
{
|
||||
DeselectAll();
|
||||
onDragEnd?.Invoke(Input.mousePosition);
|
||||
EventConnector.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.OnEndDrag(Input.mousePosition);
|
||||
return;
|
||||
}
|
||||
List<CustomAssetRenderObject> raycastedTarget = new List<CustomAssetRenderObject>();
|
||||
@@ -151,7 +138,8 @@ namespace XED.Util
|
||||
ResetRTG();
|
||||
DeselectAll();
|
||||
}
|
||||
onDragForceEnd?.Invoke();
|
||||
|
||||
EventConnector.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
|
||||
}
|
||||
public void DeselectAll()
|
||||
{
|
||||
@@ -160,13 +148,11 @@ namespace XED.Util
|
||||
return;
|
||||
}
|
||||
RemoveAllSelections();
|
||||
onDeselectAll?.Invoke();
|
||||
}
|
||||
|
||||
public void RemoveAll(List<ConnectedAsset> removeList)
|
||||
{
|
||||
CompletelyRemoveAllSelections(removeList);
|
||||
onDeselectAll?.Invoke();
|
||||
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
|
||||
canvas_Popup.panel_objectinfo.ResetObjectInfo();
|
||||
|
||||
ManagerHub.instance.Get<CustomAssetConnector>().OnDeselectAll();
|
||||
}
|
||||
|
||||
public void AddSelection(CustomAssetRenderObject item)
|
||||
@@ -223,7 +209,7 @@ namespace XED.Util
|
||||
}
|
||||
private void OnSelect()
|
||||
{
|
||||
onSelectObject?.Invoke(selectedRenderObjects);
|
||||
ManagerHub.instance.Get<CustomAssetConnector>().assetEventHandler.OnSelectObjectFromObjectHandler(selectedRenderObjects);
|
||||
rtgController.SetGizmoTargetObjects(selectedGameObjects);
|
||||
}
|
||||
public void ResetRTG()
|
||||
@@ -249,8 +235,8 @@ namespace XED.Util
|
||||
public void OnTransformChangedFromRTG(List<GameObject> transformObjects)
|
||||
{
|
||||
OnTransformChanged(transformObjects);
|
||||
onTransformChanged?.Invoke(selectedGameObjects);
|
||||
onDragForceEnd?.Invoke();
|
||||
EventConnector.instance.GetCanvas<Canvas_Popup>().panel_objectinfo.OnTransformChanged(transformObjects);
|
||||
EventConnector.instance.GetCanvas<Canvas_DragArea>().panel_draghandler.ForceEndDrag();
|
||||
}
|
||||
public void OnTransformChanged(List<GameObject> transformObjects)
|
||||
{
|
||||
@@ -266,14 +252,15 @@ namespace XED.Util
|
||||
public void RemoveItem()
|
||||
{
|
||||
if (selectedRenderObjects.Count == 0) return;
|
||||
onRemoveObject?.Invoke(selectedRenderObjects);
|
||||
|
||||
ManagerHub.instance.Get<CustomAssetConnector>().OnRemoveObject(selectedRenderObjects);
|
||||
}
|
||||
public void CopyItem()
|
||||
{
|
||||
if (selectedRenderObjects.Count == 0)
|
||||
return;
|
||||
|
||||
onCopyObject?.Invoke(selectedRenderObjects);
|
||||
ManagerHub.instance.Get<CustomAssetConnector>().OnCopyObject(copyRenderObjects);
|
||||
}
|
||||
public void SaveItemsToCopy()
|
||||
{
|
||||
@@ -282,8 +269,9 @@ namespace XED.Util
|
||||
}
|
||||
public void CopySavedItems()
|
||||
{
|
||||
if (copyRenderObjects.Count == 0) return;
|
||||
onCopyObject?.Invoke(copyRenderObjects);
|
||||
if (copyRenderObjects.Count == 0)
|
||||
return;
|
||||
ManagerHub.instance.Get<CustomAssetConnector>().OnCopyObject(copyRenderObjects);
|
||||
}
|
||||
public void ResetGizmoTargetObjects()
|
||||
{
|
||||
@@ -295,7 +283,7 @@ namespace XED.Util
|
||||
{
|
||||
return;
|
||||
}
|
||||
onOrderByHierachy?.Invoke(selectedRenderObjects);
|
||||
ManagerHub.instance.Get<CustomAssetConnector>().OrderByHierarchy(selectedRenderObjects);
|
||||
List<CustomAssetRenderObject> objectsToAlign = new List<CustomAssetRenderObject>(selectedRenderObjects);
|
||||
List<Vector3> originalPos = objectsToAlign.Select(x => x.transform.position).ToList();
|
||||
|
||||
@@ -337,7 +325,8 @@ namespace XED.Util
|
||||
renderObject.transform.position = referencePoint + primaryDir * countP + secondaryDir * countS;
|
||||
renderObject.onTransformChanged?.Invoke();
|
||||
}
|
||||
onTransformChanged?.Invoke(objectsToAlign.Select(renderObject => renderObject.gameObject).ToList());
|
||||
|
||||
EventConnector.instance.GetCanvas<Canvas_Popup>().panel_objectinfo.OnTransformChanged(objectsToAlign.Select(renderObject => renderObject.gameObject).ToList());
|
||||
}
|
||||
|
||||
private void UndoAlign(List<CustomAssetRenderObject> objectsToAlign, List<Vector3> originalPos)
|
||||
@@ -348,7 +337,7 @@ namespace XED.Util
|
||||
renderObject.transform.position = originalPos[i];
|
||||
renderObject.onTransformChanged?.Invoke();
|
||||
}
|
||||
onTransformChanged?.Invoke(objectsToAlign.Select(renderObject => renderObject.gameObject).ToList());
|
||||
EventConnector.instance.GetCanvas<Canvas_Popup>().panel_objectinfo.OnTransformChanged(objectsToAlign.Select(renderObject => renderObject.gameObject).ToList());
|
||||
}
|
||||
public void VertexSnap()
|
||||
{
|
||||
|
||||
@@ -118,7 +118,7 @@ namespace XED.Command
|
||||
}
|
||||
}
|
||||
ManagerHub.instance.Get<RenderObjectHandler>().DeselectAll();
|
||||
var canvas = EventConnector.instance.popupCanvasHandler.canvas as Canvas_Popup;
|
||||
var canvas = EventConnector.instance.GetCanvas<Canvas_Popup>();
|
||||
canvas.panel_objectinfo.ResetObjectInfo();
|
||||
//connector.onRemoveObjects?.Invoke();
|
||||
connector.componentScrollView.DeselectAll();
|
||||
|
||||
@@ -48,7 +48,7 @@ namespace XED.Command
|
||||
}
|
||||
//connector.onRemoveObjects?.Invoke();
|
||||
ManagerHub.instance.Get<RenderObjectHandler>().DeselectAll();
|
||||
var canvas = EventConnector.instance.popupCanvasHandler.canvas as Canvas_Popup;
|
||||
var canvas = EventConnector.instance.GetCanvas<Canvas_Popup>();
|
||||
canvas.panel_objectinfo.ResetObjectInfo();
|
||||
|
||||
connector.componentScrollView.DeselectAll();
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
using XED.Asset;
|
||||
using XED.Command;
|
||||
using XED.Manage;
|
||||
|
||||
namespace XED.Core
|
||||
{
|
||||
@@ -9,5 +11,11 @@ namespace XED.Core
|
||||
get;
|
||||
private set;
|
||||
} = new CommandInvoker();
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
ManagerHub.instance.Init();
|
||||
EventConnector.instance.Init();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -37,7 +37,7 @@ namespace XED.Core
|
||||
{
|
||||
GameObject singleton = new GameObject(typeof(T).Name);
|
||||
_instance = singleton.AddComponent<T>();
|
||||
_instance.Init();
|
||||
//_instance.Init();
|
||||
_instance.name = typeof(T).ToString();
|
||||
DontDestroyOnLoad(_instance.gameObject);
|
||||
}
|
||||
@@ -65,10 +65,6 @@ namespace XED.Core
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void Init()
|
||||
{
|
||||
}
|
||||
|
||||
protected virtual void OnApplicationQuit()
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
|
||||
@@ -2,8 +2,7 @@ using XRLib.UI;
|
||||
|
||||
namespace XED.Manage
|
||||
{
|
||||
public class CanvasEventHandler<T> where T : CanvasBase
|
||||
public class CanvasEventHandler
|
||||
{
|
||||
public T canvas;
|
||||
}
|
||||
}
|
||||
@@ -8,16 +8,35 @@ using System.Collections.Generic;
|
||||
using System;
|
||||
using XED.Core;
|
||||
using XED.Command;
|
||||
using XRLib.UI;
|
||||
|
||||
namespace XED.Manage
|
||||
{
|
||||
[DefaultExecutionOrder(int.MaxValue)]
|
||||
public class EventConnector : UnitySingleton<EventConnector>
|
||||
{
|
||||
StaticCanvasHandler staticCanvasHandler;
|
||||
public PopupCanvasHandler popupCanvasHandler { get; private set; }
|
||||
HashSet<CanvasBase> canvases = new();
|
||||
|
||||
public void Awake()
|
||||
public T GetCanvas<T>() where T : CanvasBase
|
||||
{
|
||||
foreach (var canvas in canvases)
|
||||
{
|
||||
if (canvas is T)
|
||||
{
|
||||
return (T)canvas;
|
||||
}
|
||||
}
|
||||
var a = FindAnyObjectByType<T>();
|
||||
if (a == null)
|
||||
return default;
|
||||
else
|
||||
{
|
||||
canvases.Add(a);
|
||||
return a;
|
||||
}
|
||||
}
|
||||
|
||||
public void Init()
|
||||
{
|
||||
var rayCaster = FindAnyObjectByType<Raycaster>();
|
||||
var statusPanel = FindAnyObjectByType<ModePanel>();
|
||||
@@ -26,87 +45,32 @@ namespace XED.Manage
|
||||
var canvas_Popup = FindAnyObjectByType<Canvas_Popup>();
|
||||
var canvas_DragArea = FindAnyObjectByType<Canvas_DragArea>();
|
||||
|
||||
//var agvManager = FindSingle<AGVManager>();
|
||||
var wallBuilder = FindAnyObjectByType<WallBuilder>();
|
||||
//var agvNodeManager = FindSingle<AGVNodeManager>();
|
||||
var userInputManager = ManagerHub.instance.Get<UserInputManager>();
|
||||
//var agvNodeLinkManager = FindSingle<AGVNodeLinkManager>();
|
||||
//var nodeGizmoController = FindSingle<NodeGizmoController>();
|
||||
var customAssetConnector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
|
||||
var projectManager = ManagerHub.instance.Get<ProjectManager>();
|
||||
|
||||
GameObject assetWindow = canvas_Popup.panel_assetlibrary.gameObject;
|
||||
FBXFileManager fbxFileManager = customAssetConnector.saveLoadFBXData;
|
||||
FBXFileManager fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
||||
GameObject componentWindow = canvas_Popup.panel_hierarchy.gameObject;
|
||||
GameObject interferedobjectlistWindow = canvas_Popup.panel_interferedobjectlist.gameObject;
|
||||
|
||||
UIConnection();
|
||||
StatusConnection();
|
||||
ManagerConnection();
|
||||
DefaultActionSetting();
|
||||
canvas_Popup.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged;
|
||||
|
||||
void ManagerConnection()
|
||||
{
|
||||
customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Popup.panel_objectinfo.gameObject.SetActive(true); });
|
||||
customAssetConnector.onSelectObjects += canvas_Popup.panel_objectinfo.SetObjectInfo;
|
||||
customAssetConnector.onSelectObjects += canvas_Popup.panel_objectdistance.SelectObjectFromClick;
|
||||
customAssetConnector.onRemoveObjects += canvas_Popup.panel_objectinfo.ResetObjectInfo;
|
||||
customAssetConnector.onDeselectObjects += (() => { canvas_Popup.panel_objectinfo.gameObject.SetActive(false); });
|
||||
canvas_DragArea.panel_draghandler.onDragBoxSelect += customAssetConnector.assetEventHandler.OnDragBoxSelect;
|
||||
//statusPanel.AddController(renderObjectHandler);
|
||||
//statusPanel.AddController(wallBuilder);
|
||||
//statusPanel.AddModeEnterEvent(ModePanel.ProgramMode.AGVPathDrawing, canvas_Popup.agvnodemodepopup.Open);
|
||||
//statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout);
|
||||
var commandHandler = CommandInvoker.instance.GetInputHandler();
|
||||
userInputManager.SetHandler(GetDefaultInputHandler());
|
||||
userInputManager.SetHandler(commandHandler);
|
||||
canvas_static.panel_modecontrol.onClickObjectMode += () => statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout);
|
||||
//canvas_static.panel_modecontrol.onClickPropertyMode += () => statusPanel.SetMode(ModePanel.ProgramMode.None);
|
||||
|
||||
renderObjectHandler.onDeselectAll += canvas_Popup.panel_objectinfo.ResetObjectInfo;
|
||||
renderObjectHandler.onTransformChanged += canvas_Popup.panel_objectinfo.OnTransformChanged;
|
||||
renderObjectHandler.onDragBegin += canvas_DragArea.panel_draghandler.OnBeginDrag;
|
||||
renderObjectHandler.onDragEnd += canvas_DragArea.panel_draghandler.OnEndDrag;
|
||||
renderObjectHandler.onDragForceEnd += canvas_DragArea.panel_draghandler.ForceEndDrag;
|
||||
|
||||
fbxFileManager.onBeginLoadAsset += (() => assetWindow.SetActive(true));
|
||||
canvas_Popup.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged;
|
||||
|
||||
projectManager.onLoadAsset += customAssetConnector.OnLoadAsset;
|
||||
projectManager.onRestoreHierarchy += customAssetConnector.OnRestoreHierarchy;
|
||||
}
|
||||
|
||||
void UIConnection()
|
||||
{
|
||||
staticCanvasHandler = new
|
||||
StaticCanvasHandler
|
||||
(
|
||||
canvas_static,
|
||||
projectManager,
|
||||
assetWindow,
|
||||
componentWindow,
|
||||
fbxFileManager,
|
||||
interferedobjectlistWindow,
|
||||
renderObjectHandler
|
||||
);
|
||||
|
||||
popupCanvasHandler = new PopupCanvasHandler(canvas_Popup, fbxFileManager);
|
||||
|
||||
canvas_DragArea.panel_draghandler.onDragBoxSelect += customAssetConnector.assetEventHandler.OnDragBoxSelect;
|
||||
}
|
||||
|
||||
void StatusConnection()
|
||||
{
|
||||
statusPanel.AddController(renderObjectHandler);
|
||||
statusPanel.AddController(wallBuilder);
|
||||
//statusPanel.AddController(agvNodeManager);
|
||||
statusPanel.AddModeEnterEvent(ModePanel.ProgramMode.AGVPathDrawing, canvas_Popup.agvnodemodepopup.Open);
|
||||
statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout);
|
||||
}
|
||||
|
||||
void DefaultActionSetting()
|
||||
{
|
||||
var commandHandler = CommandInvoker.instance.GetInputHandler();
|
||||
userInputManager.SetHandler(GetDefaultInputHandler());
|
||||
userInputManager.SetHandler(commandHandler);
|
||||
canvas_static.panel_modecontrol.onClickObjectMode += () => statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout);
|
||||
//canvas_static.panel_modecontrol.onClickPropertyMode += () => statusPanel.SetMode(ModePanel.ProgramMode.None);
|
||||
|
||||
rayCaster.onUIHoverEvent += canvas_Popup.panel_tooltip.ActivateTooltip;
|
||||
rayCaster.onUIHoverExitEvent += canvas_Popup.panel_tooltip.DeactivateTooltip;
|
||||
//rayCaster.AddEvent(Raycaster.EventType.FirstRightClickOnly, typeof(TwinObject), canvas_Popup.panel_propertyviewer.Activate);
|
||||
}
|
||||
rayCaster.onUIHoverEvent += canvas_Popup.panel_tooltip.ActivateTooltip;
|
||||
rayCaster.onUIHoverExitEvent += canvas_Popup.panel_tooltip.DeactivateTooltip;
|
||||
//rayCaster.AddEvent(Raycaster.EventType.FirstRightClickOnly, typeof(TwinObject), canvas_Popup.panel_propertyviewer.Activate);
|
||||
}
|
||||
|
||||
InputHandler defaultInputHandler;
|
||||
|
||||
@@ -2,5 +2,6 @@ namespace XED.Manage
|
||||
{
|
||||
public abstract class Manager
|
||||
{
|
||||
public abstract void Init();
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using XED.Asset;
|
||||
using XED.Core;
|
||||
using XED.Util;
|
||||
|
||||
namespace XED.Manage
|
||||
{
|
||||
@@ -9,13 +10,21 @@ namespace XED.Manage
|
||||
{
|
||||
HashSet<Manager> managers = new HashSet<Manager>();
|
||||
|
||||
private void Awake()
|
||||
public void Init()
|
||||
{
|
||||
Join(new ProjectManager());
|
||||
Join(new CustomAssetConnector());
|
||||
Join(new FBXFileManager());
|
||||
Join(new UserInputManager());
|
||||
Join(new CustomAssetConnector());
|
||||
Join(new RenderObjectHandler());
|
||||
|
||||
|
||||
foreach(var m in managers)
|
||||
{
|
||||
m.Init();
|
||||
}
|
||||
}
|
||||
public void Join(Manager newManager)
|
||||
void Join(Manager newManager)
|
||||
{
|
||||
if (!managers.Add(newManager))
|
||||
{
|
||||
|
||||
@@ -1,17 +1,15 @@
|
||||
namespace XED.Manage
|
||||
{
|
||||
public class PopupCanvasHandler : CanvasEventHandler<Canvas_Popup>
|
||||
public class PopupCanvasHandler : CanvasEventHandler
|
||||
{
|
||||
public PopupCanvasHandler( Canvas_Popup canvas_Popup, FBXFileManager fbxFileManager)
|
||||
public PopupCanvasHandler(Canvas_Popup canvas_Popup)
|
||||
{
|
||||
canvas = canvas_Popup;
|
||||
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
||||
canvas_Popup.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_Popup.panel_assetproperties.Open);
|
||||
canvas_Popup.panel_assetlibrary.scrollView.onHover.AddListener(canvas_Popup.panel_thumbnail.HandleOpenClose);
|
||||
canvas_Popup.panel_assetlibrary.scrollRect.onExit.AddListener(canvas_Popup.panel_thumbnail.HandleOpenClose);
|
||||
|
||||
canvas_Popup.panel_assetproperties.onClickPreview += canvas_Popup.panel_predefinedtype.Open;
|
||||
canvas_Popup.panel_assetproperties.onOpen += fbxFileManager.GetCustomAssetData;
|
||||
|
||||
canvas_Popup.panel_thumbnail.onOpen += fbxFileManager.GetCustomAssetData;
|
||||
canvas_Popup.panel_thumbnail.onGetPosition += canvas_Popup.panel_assetlibrary.GetPositionX;
|
||||
}
|
||||
|
||||
@@ -16,22 +16,23 @@ namespace XED.Manage
|
||||
public class ProjectManager : Manager
|
||||
{
|
||||
private AssetDataService assetDataService;
|
||||
private CustomAssetConnector connector;
|
||||
|
||||
private string curProjectPath;
|
||||
private ProjectData curProjectData;
|
||||
Dictionary<int, HierarchyItem> itemDict = new Dictionary<int, HierarchyItem>();
|
||||
|
||||
public event Action<AssetData> onLoadAsset;
|
||||
public event Action<HierarchyItem, HierarchyItem> onRestoreHierarchy;
|
||||
public event Action<List<CustomAssetRenderObject>> onRemoveAsset;
|
||||
|
||||
public ProjectManager()
|
||||
{
|
||||
assetDataService = new AssetDataService();
|
||||
connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
}
|
||||
|
||||
}
|
||||
public override void Init()
|
||||
{
|
||||
curProjectPath = string.Empty;
|
||||
curProjectData = null;
|
||||
itemDict.Clear();
|
||||
}
|
||||
public void SaveProject()
|
||||
{
|
||||
bool isNewProject = string.IsNullOrEmpty(curProjectPath);
|
||||
@@ -41,6 +42,7 @@ namespace XED.Manage
|
||||
if (string.IsNullOrEmpty(path))
|
||||
return;
|
||||
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
List<AssetData> assetDatas = assetDataService.SortAssetDatas(connector.connectedAssets);
|
||||
ProjectData projectData = CreateProjectData(path, assetDatas);
|
||||
|
||||
@@ -65,7 +67,9 @@ namespace XED.Manage
|
||||
if (projectData == null)
|
||||
return;
|
||||
|
||||
RemoveObject();
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
connector.ClearObjects();
|
||||
|
||||
Init();
|
||||
|
||||
LoadAssets(projectData.assetDatas);
|
||||
@@ -77,7 +81,9 @@ namespace XED.Manage
|
||||
|
||||
public void NewProject()
|
||||
{
|
||||
RemoveObject();
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
connector.ClearObjects();
|
||||
|
||||
Init();
|
||||
}
|
||||
|
||||
@@ -101,7 +107,8 @@ namespace XED.Manage
|
||||
|
||||
private void LoadAsset(AssetData asset)
|
||||
{
|
||||
onLoadAsset?.Invoke(asset);
|
||||
var connector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
connector.OnLoadAsset(asset);
|
||||
itemDict.Add(asset.id, connector.connectedAssets.Last().hierarchyItem);
|
||||
}
|
||||
|
||||
@@ -123,24 +130,10 @@ namespace XED.Manage
|
||||
if (parent == null || child == null)
|
||||
continue;
|
||||
|
||||
onRestoreHierarchy?.Invoke(parent, child);
|
||||
ManagerHub.instance.Get<CustomAssetConnector>().OnRestoreHierarchy(parent, child);
|
||||
}
|
||||
}
|
||||
|
||||
private void RemoveObject()
|
||||
{
|
||||
List<CustomAssetRenderObject> objects = connector.connectedAssets.Select(x => x.renderObject).ToList();
|
||||
onRemoveAsset?.Invoke(objects);
|
||||
}
|
||||
|
||||
private void Init()
|
||||
{
|
||||
curProjectPath = string.Empty;
|
||||
curProjectData = null;
|
||||
connector.connectedAssets.Clear();
|
||||
itemDict.Clear();
|
||||
}
|
||||
|
||||
private string GetSaveFilePath()
|
||||
{
|
||||
var data = StandaloneFileBrowser.SaveFilePanel("SaveProject", "", "", "json");
|
||||
@@ -167,5 +160,6 @@ namespace XED.Manage
|
||||
string json = File.ReadAllText(path);
|
||||
return JsonConvert.DeserializeObject<ProjectData>(json);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,17 +5,19 @@ using XED.Util;
|
||||
|
||||
namespace XED.Manage
|
||||
{
|
||||
public class StaticCanvasHandler
|
||||
public class StaticCanvasHandler : CanvasEventHandler
|
||||
{
|
||||
public StaticCanvasHandler(
|
||||
Canvas_Static canvas_static,
|
||||
ProjectManager projectManager,
|
||||
GameObject assetWindow,
|
||||
GameObject componentWindow,
|
||||
FBXFileManager fbxFileManager,
|
||||
GameObject interferedobjectlistWindow,
|
||||
RenderObjectHandler renderObjectHandler)
|
||||
public StaticCanvasHandler(Canvas_Static canvas_static)
|
||||
{
|
||||
var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
|
||||
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
|
||||
var projectManager = ManagerHub.instance.Get<ProjectManager>();
|
||||
|
||||
var canvas_Popup = EventConnector.instance.GetCanvas<Canvas_Popup>();
|
||||
GameObject componentWindow = canvas_Popup.panel_hierarchy.gameObject;
|
||||
GameObject interferedobjectlistWindow = canvas_Popup.panel_interferedobjectlist.gameObject;
|
||||
GameObject assetWindow = canvas_Popup.panel_assetlibrary.gameObject;
|
||||
|
||||
canvas_static.panel_shortcuts.onClickOpenAssetWindow += (() => assetWindow.SetActive(!assetWindow.activeSelf));
|
||||
canvas_static.panel_shortcuts.onClickOpenComponentWindow += (() => componentWindow.SetActive(!componentWindow.activeSelf));
|
||||
canvas_static.panel_shortcuts.onClickUndo += CommandInvoker.instance.Undo;
|
||||
@@ -35,6 +37,7 @@ namespace XED.Manage
|
||||
canvas_static.panel_toolbar.onClickRotate += renderObjectHandler.SetRTGRotate;
|
||||
canvas_static.panel_toolbar.onClickRemove += renderObjectHandler.RemoveItem;
|
||||
canvas_static.panel_toolbar.onClickCopy += renderObjectHandler.CopyItem;
|
||||
//canvas_static.panel_modecontrol.onClickObjectMode += () => statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout);
|
||||
}
|
||||
}
|
||||
}
|
||||
13
Assets/Scripts/Studio/Managers/UIManager.cs
Normal file
13
Assets/Scripts/Studio/Managers/UIManager.cs
Normal file
@@ -0,0 +1,13 @@
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using XED.Core;
|
||||
using XRLib.UI;
|
||||
|
||||
namespace XED.Manage
|
||||
{
|
||||
public class UIManager : UnitySingleton<UIManager>
|
||||
{
|
||||
HashSet<CanvasBase> canvases = new();
|
||||
|
||||
}
|
||||
}
|
||||
2
Assets/Scripts/Studio/Managers/UIManager.cs.meta
Normal file
2
Assets/Scripts/Studio/Managers/UIManager.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 02d3bbdaee00e134285162a93672e0fd
|
||||
@@ -149,5 +149,9 @@ namespace XED.Manage
|
||||
|
||||
updateLoop?.Invoke();
|
||||
}
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,10 +4,11 @@ using XRLib;
|
||||
using XRLib.UI;
|
||||
using XED.UI;
|
||||
using XED.VirtualFactory;
|
||||
using XED.Manage;
|
||||
|
||||
namespace XED
|
||||
{
|
||||
public class Canvas_Popup : CanvasBase
|
||||
public class Canvas_Popup : CanvasBase, ISingle
|
||||
{
|
||||
public Panel_AccessibilitySettings panel_accessibilitysettings;
|
||||
public Panel_ColorPicker panel_colorpicker;
|
||||
@@ -28,6 +29,11 @@ namespace XED
|
||||
public Panel_Thumbnail panel_thumbnail;
|
||||
public Panel_ObjectDistance panel_objectdistance;
|
||||
|
||||
void Awake()
|
||||
{
|
||||
canvasHandler = new PopupCanvasHandler(this);
|
||||
}
|
||||
|
||||
public override void AfterAwake()
|
||||
{
|
||||
GetComponent<Canvas>().sortingOrder = 1;
|
||||
|
||||
@@ -11,5 +11,10 @@ namespace XED.UI
|
||||
public Panel_TopBar panel_topbar;
|
||||
public Panel_Toolbar panel_toolbar;
|
||||
public Panel_ModeControl panel_modecontrol;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
canvasHandler = new StaticCanvasHandler(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace XED.UI
|
||||
public override void AfterAwake()
|
||||
{
|
||||
CustomAssetConnector assetConnector = ManagerHub.instance.Get<CustomAssetConnector>();
|
||||
renderObjectHandler = assetConnector.renderObjectHandler;
|
||||
renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
|
||||
InputField_GapX.onValueChanged.AddListener(OnGapXChanged);
|
||||
InputField_GapZ.onValueChanged.AddListener(OnGapZChanged);
|
||||
InputField_Row.onValueChanged.AddListener(OnRowChanged);
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
namespace XRLib.UI
|
||||
using XED.Manage;
|
||||
|
||||
namespace XRLib.UI
|
||||
{
|
||||
public abstract class CanvasBase : UIBase, ISingle
|
||||
public abstract class CanvasBase : UIBase
|
||||
{
|
||||
protected CanvasEventHandler canvasHandler;
|
||||
public CanvasEventHandler eventHandler { get=>canvasHandler; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user