diff --git a/Assets/Prefabs/TestUnit.prefab b/Assets/Prefabs/TestUnit.prefab index d057330..f88461a 100644 --- a/Assets/Prefabs/TestUnit.prefab +++ b/Assets/Prefabs/TestUnit.prefab @@ -39,6 +39,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5142912027960738922} + - {fileID: 3230378027333185902} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1284886913308718791 @@ -72,7 +73,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 9be37de3d951e42fabb3b6a507b2d04c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -181,7 +182,7 @@ MonoBehaviour: k__BackingField: {fileID: 3280843376750909586} k__BackingField: {fileID: 8213395333053285225} k__BackingField: {fileID: 8908285060348773052} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 6587310683195830629} k__BackingField: 1 price: 0 --- !u!114 &8213395333053285225 @@ -196,9 +197,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8511709ac7cfc1d05bee202fa8b8b095, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 0 - currentHealth: 0 - armor: 0 + maxHealth: 100 + currentHealth: 100 + armor: 5 --- !u!114 &8908285060348773052 MonoBehaviour: m_ObjectHideFlags: 0 @@ -211,10 +212,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eb03fb8c097f016f09d345ce200c3f41, type: 3} m_Name: m_EditorClassIdentifier: - damage: 0 - cooldown: 0 - attackShape: {fileID: 0} - knockback: 0 + damage: 10 + cooldown: 2 + attackShape: {fileID: 2074347425566192522} + knockback: 2 --- !u!114 &6587310683195830629 MonoBehaviour: m_ObjectHideFlags: 0 @@ -242,7 +243,7 @@ GameObject: - component: {fileID: 4636164416841421870} - component: {fileID: 9158133565586009641} m_Layer: 0 - m_Name: Cube + m_Name: Nose m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -316,3 +317,111 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7673576048613581623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3230378027333185902} + - component: {fileID: 2074347425566192522} + - component: {fileID: 661999679205371441} + - component: {fileID: 2136414657818712025} + m_Layer: 0 + m_Name: AttackShape + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3230378027333185902 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7673576048613581623} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1.568} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3092074377783379531} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2074347425566192522 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7673576048613581623} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.5, y: 2, z: 2} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &661999679205371441 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7673576048613581623} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2136414657818712025 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7673576048613581623} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/TestUnitA.prefab b/Assets/Prefabs/TestUnitA.prefab new file mode 100644 index 0000000..155091d --- /dev/null +++ b/Assets/Prefabs/TestUnitA.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8724889092303240057 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2076979688870881298, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_Name + value: TestUnit + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} diff --git a/Assets/Prefabs/UnitA.prefab.meta b/Assets/Prefabs/TestUnitA.prefab.meta similarity index 74% rename from Assets/Prefabs/UnitA.prefab.meta rename to Assets/Prefabs/TestUnitA.prefab.meta index 02f2dfa..1f0d023 100644 --- a/Assets/Prefabs/UnitA.prefab.meta +++ b/Assets/Prefabs/TestUnitA.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b4ad7271f382d79229f35ae1348d0eeb +guid: 68318918c11a4047e9399d779574751e PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/TestUnitB.prefab b/Assets/Prefabs/TestUnitB.prefab new file mode 100644 index 0000000..11f0118 --- /dev/null +++ b/Assets/Prefabs/TestUnitB.prefab @@ -0,0 +1,67 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7137092879915356993 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2076979688870881298, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_Name + value: TestUnitB + objectReference: {fileID: 0} + - target: {fileID: 2572766376840025726, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7841837150169133400, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 00745ff6d44b5164689351328da3df97, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} diff --git a/Assets/Prefabs/UnitB.prefab.meta b/Assets/Prefabs/TestUnitB.prefab.meta similarity index 74% rename from Assets/Prefabs/UnitB.prefab.meta rename to Assets/Prefabs/TestUnitB.prefab.meta index 4141c00..3dda8f4 100644 --- a/Assets/Prefabs/UnitB.prefab.meta +++ b/Assets/Prefabs/TestUnitB.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55c7812ba8b0a4e6e9eb31bae387a77f +guid: 0986f06ae42c33d9d8087f9e657df525 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/UnitA.prefab b/Assets/Prefabs/UnitA.prefab deleted file mode 100644 index 468e366..0000000 --- a/Assets/Prefabs/UnitA.prefab +++ /dev/null @@ -1,318 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2076979688870881298 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3092074377783379531} - - component: {fileID: 1284886913308718791} - - component: {fileID: 7841837150169133400} - - component: {fileID: 3280843376750909586} - - component: {fileID: 5811210244409818000} - - component: {fileID: 1085507300097694875} - - component: {fileID: 2572766376840025726} - - component: {fileID: 8213395333053285225} - - component: {fileID: 8908285060348773052} - - component: {fileID: 6587310683195830629} - m_Layer: 0 - m_Name: UnitA - m_TagString: Unit - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 18 - m_IsActive: 1 ---- !u!4 &3092074377783379531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.069} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5142912027960738922} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1284886913308718791 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7841837150169133400 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 9be37de3d951e42fabb3b6a507b2d04c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!54 &3280843376750909586 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!195 &5811210244409818000 -NavMeshAgent: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_AgentTypeID: 0 - m_Radius: 0.5 - m_Speed: 3.5 - m_Acceleration: 8 - avoidancePriority: 50 - m_AngularSpeed: 120 - m_StoppingDistance: 0 - m_AutoTraverseOffMeshLink: 1 - m_AutoBraking: 1 - m_AutoRepath: 1 - m_Height: 2 - m_BaseOffset: 1 - m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 4 ---- !u!136 &1085507300097694875 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &2572766376840025726 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9815bed5dc151c8c6a271899ed1b7c4f, type: 3} - m_Name: - m_EditorClassIdentifier: - k__BackingField: {fileID: 3280843376750909586} - k__BackingField: {fileID: 8213395333053285225} - k__BackingField: {fileID: 8908285060348773052} - k__BackingField: {fileID: 0} - k__BackingField: 1 - price: 0 ---- !u!114 &8213395333053285225 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8511709ac7cfc1d05bee202fa8b8b095, type: 3} - m_Name: - m_EditorClassIdentifier: - maxHealth: 0 - currentHealth: 0 - armor: 0 ---- !u!114 &8908285060348773052 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eb03fb8c097f016f09d345ce200c3f41, type: 3} - m_Name: - m_EditorClassIdentifier: - damage: 0 - cooldown: 0 - attackShape: {fileID: 0} - knockback: 0 ---- !u!114 &6587310683195830629 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa245c9f3dff7f6b9888b009a1023628, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 5 - agent: {fileID: 5811210244409818000} - defaultMoveTarget: {fileID: 0} ---- !u!1 &3380792937898646976 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5142912027960738922} - - component: {fileID: 4636164416841421870} - - component: {fileID: 9158133565586009641} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5142912027960738922 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3380792937898646976} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.016, y: 0, z: 0.405} - m_LocalScale: {x: 0.44113, y: 0.45127, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3092074377783379531} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4636164416841421870 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3380792937898646976} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &9158133565586009641 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3380792937898646976} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/UnitB.prefab b/Assets/Prefabs/UnitB.prefab deleted file mode 100644 index 387b4d6..0000000 --- a/Assets/Prefabs/UnitB.prefab +++ /dev/null @@ -1,318 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2076979688870881298 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3092074377783379531} - - component: {fileID: 1284886913308718791} - - component: {fileID: 7841837150169133400} - - component: {fileID: 3280843376750909586} - - component: {fileID: 5811210244409818000} - - component: {fileID: 1085507300097694875} - - component: {fileID: 2572766376840025726} - - component: {fileID: 8213395333053285225} - - component: {fileID: 8908285060348773052} - - component: {fileID: 6587310683195830629} - m_Layer: 0 - m_Name: UnitB - m_TagString: Unit - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 18 - m_IsActive: 1 ---- !u!4 &3092074377783379531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.069} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5142912027960738922} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1284886913308718791 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7841837150169133400 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 00745ff6d44b5164689351328da3df97, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!54 &3280843376750909586 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!195 &5811210244409818000 -NavMeshAgent: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_AgentTypeID: 0 - m_Radius: 0.5 - m_Speed: 3.5 - m_Acceleration: 8 - avoidancePriority: 50 - m_AngularSpeed: 120 - m_StoppingDistance: 0 - m_AutoTraverseOffMeshLink: 1 - m_AutoBraking: 1 - m_AutoRepath: 1 - m_Height: 2 - m_BaseOffset: 1 - m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 4 ---- !u!136 &1085507300097694875 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &2572766376840025726 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9815bed5dc151c8c6a271899ed1b7c4f, type: 3} - m_Name: - m_EditorClassIdentifier: - k__BackingField: {fileID: 3280843376750909586} - k__BackingField: {fileID: 8213395333053285225} - k__BackingField: {fileID: 8908285060348773052} - k__BackingField: {fileID: 0} - k__BackingField: 0 - price: 0 ---- !u!114 &8213395333053285225 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8511709ac7cfc1d05bee202fa8b8b095, type: 3} - m_Name: - m_EditorClassIdentifier: - maxHealth: 0 - currentHealth: 0 - armor: 0 ---- !u!114 &8908285060348773052 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eb03fb8c097f016f09d345ce200c3f41, type: 3} - m_Name: - m_EditorClassIdentifier: - damage: 0 - cooldown: 0 - attackShape: {fileID: 0} - knockback: 0 ---- !u!114 &6587310683195830629 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2076979688870881298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa245c9f3dff7f6b9888b009a1023628, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 5 - agent: {fileID: 5811210244409818000} - defaultMoveTarget: {fileID: 0} ---- !u!1 &3380792937898646976 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5142912027960738922} - - component: {fileID: 4636164416841421870} - - component: {fileID: 9158133565586009641} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5142912027960738922 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3380792937898646976} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.016, y: 0, z: 0.405} - m_LocalScale: {x: 0.44113, y: 0.45127, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3092074377783379531} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4636164416841421870 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3380792937898646976} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &9158133565586009641 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3380792937898646976} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Scenes/Clement.unity b/Assets/Scenes/Clement.unity index c585250..df4d9a6 100644 --- a/Assets/Scenes/Clement.unity +++ b/Assets/Scenes/Clement.unity @@ -94,7 +94,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} - m_LightingSettings: {fileID: 0} + m_LightingSettings: {fileID: 4890085278179872738, guid: a81c52f78acd4e679bb437686ec209a3, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,67 +119,10 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &131554006 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 144756041} - m_Modifications: - - target: {fileID: 2076979688870881298, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_Name - value: UnitB (1) - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_LocalPosition.x - value: 29.9 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_LocalPosition.z - value: 15.7 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} ---- !u!4 &131554007 stripped +--- !u!4 &101049055 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - m_PrefabInstance: {fileID: 131554006} + m_CorrespondingSourceObject: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + m_PrefabInstance: {fileID: 1955858983} m_PrefabAsset: {fileID: 0} --- !u!1 &144756040 GameObject: @@ -210,11 +153,12 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1746362923} - - {fileID: 131554007} - - {fileID: 757754279} - - {fileID: 618555937} - - {fileID: 2001936274} + - {fileID: 101049055} + - {fileID: 383054460} + - {fileID: 1745910078} + - {fileID: 220806383} + - {fileID: 639002463} + - {fileID: 827980921} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &163296925 @@ -239,193 +183,7 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -5254744924520217869, guid: 2f2cad356fc43243b9e657c7a69a490b, type: 3} ---- !u!1001 &296544477 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1694772215} - m_Modifications: - - target: {fileID: 2076979688870881298, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_Name - value: UnitA (1) - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalPosition.z - value: 14.3 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} ---- !u!4 &296544478 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - m_PrefabInstance: {fileID: 296544477} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &348166308 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1694772215} - m_Modifications: - - target: {fileID: 2076979688870881298, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_Name - value: UnitA - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalPosition.z - value: 1.069 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} ---- !u!4 &348166309 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - m_PrefabInstance: {fileID: 348166308} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &478497476 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1694772215} - m_Modifications: - - target: {fileID: 2076979688870881298, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_Name - value: UnitA (3) - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalPosition.z - value: 5.62 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} ---- !u!4 &478497477 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - m_PrefabInstance: {fileID: 478497476} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &618555936 +--- !u!1001 &220806382 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -433,59 +191,245 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 144756041} m_Modifications: - - target: {fileID: 2076979688870881298, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_Name - value: UnitB (3) - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.x - value: 29.9 + value: 39.2 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.z - value: 27.5 + value: 8.1 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9214054967999642451, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_Name + value: TestUnitB (3) + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} ---- !u!4 &618555937 stripped + m_SourcePrefab: {fileID: 100100000, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} +--- !u!4 &220806383 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - m_PrefabInstance: {fileID: 618555936} + m_CorrespondingSourceObject: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + m_PrefabInstance: {fileID: 220806382} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &383054459 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 144756041} + m_Modifications: + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalPosition.x + value: 33.4 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalPosition.z + value: 4.3 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9214054967999642451, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_Name + value: TestUnitB (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} +--- !u!4 &383054460 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + m_PrefabInstance: {fileID: 383054459} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &508460464 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1694772215} + m_Modifications: + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.z + value: 31.1 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7334079432953664363, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_Name + value: TestUnitA (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 68318918c11a4047e9399d779574751e, type: 3} +--- !u!4 &508460465 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + m_PrefabInstance: {fileID: 508460464} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &528966394 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1694772215} + m_Modifications: + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.z + value: 16.9 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7334079432953664363, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_Name + value: TestUnitA (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 68318918c11a4047e9399d779574751e, type: 3} +--- !u!4 &528966395 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + m_PrefabInstance: {fileID: 528966394} m_PrefabAsset: {fileID: 0} --- !u!1 &630853617 GameObject: @@ -522,6 +466,125 @@ Transform: - {fileID: 3879000297819353749} m_Father: {fileID: 543450653570552176} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &639002462 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 144756041} + m_Modifications: + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalPosition.x + value: 39.2 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalPosition.z + value: 16.2 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9214054967999642451, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_Name + value: TestUnitB (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} +--- !u!4 &639002463 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + m_PrefabInstance: {fileID: 639002462} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &644619083 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1694772215} + m_Modifications: + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7334079432953664363, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_Name + value: TestUnitA + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 68318918c11a4047e9399d779574751e, type: 3} --- !u!1 &665745495 GameObject: m_ObjectHideFlags: 0 @@ -672,7 +735,7 @@ MonoBehaviour: m_DefaultActionMap: Player m_SplitScreenIndex: -1 m_Camera: {fileID: 0} ---- !u!1001 &757754278 +--- !u!1001 &827980920 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -680,59 +743,64 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 144756041} m_Modifications: - - target: {fileID: 2076979688870881298, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_Name - value: UnitB (2) - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.x - value: 29.9 + value: 37.1 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.z - value: 4.65 + value: 22.1 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9214054967999642451, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_Name + value: TestUnitB (5) + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} ---- !u!4 &757754279 stripped + m_SourcePrefab: {fileID: 100100000, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} +--- !u!4 &827980921 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - m_PrefabInstance: {fileID: 757754278} + m_CorrespondingSourceObject: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + m_PrefabInstance: {fileID: 827980920} + m_PrefabAsset: {fileID: 0} +--- !u!4 &861725540 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + m_PrefabInstance: {fileID: 644619083} m_PrefabAsset: {fileID: 0} --- !u!1 &942806714 GameObject: @@ -840,7 +908,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: moveSpeed: 20 ---- !u!1001 &947368903 +--- !u!1001 &954672610 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -848,59 +916,59 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1694772215} m_Modifications: - - target: {fileID: 2076979688870881298, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_Name - value: UnitA (4) - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -7.2 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalPosition.z - value: -4.01 + value: 22 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7334079432953664363, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_Name + value: TestUnitA (4) + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} ---- !u!4 &947368904 stripped + m_SourcePrefab: {fileID: 100100000, guid: 68318918c11a4047e9399d779574751e, type: 3} +--- !u!4 &954672611 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - m_PrefabInstance: {fileID: 947368903} + m_CorrespondingSourceObject: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + m_PrefabInstance: {fileID: 954672610} m_PrefabAsset: {fileID: 0} --- !u!1 &1158208131 GameObject: @@ -1094,7 +1162,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1584560069 +--- !u!1001 &1576493359 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -1102,59 +1170,59 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1694772215} m_Modifications: - - target: {fileID: 2076979688870881298, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - propertyPath: m_Name - value: UnitA (2) - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -7.2 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalPosition.z - value: 31.5 + value: 12.3 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7334079432953664363, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_Name + value: TestUnitA (5) + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} ---- !u!4 &1584560070 stripped + m_SourcePrefab: {fileID: 100100000, guid: 68318918c11a4047e9399d779574751e, type: 3} +--- !u!4 &1576493360 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: b4ad7271f382d79229f35ae1348d0eeb, type: 3} - m_PrefabInstance: {fileID: 1584560069} + m_CorrespondingSourceObject: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + m_PrefabInstance: {fileID: 1576493359} m_PrefabAsset: {fileID: 0} --- !u!1 &1694772214 GameObject: @@ -1185,14 +1253,15 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 348166309} - - {fileID: 296544478} - - {fileID: 1584560070} - - {fileID: 478497477} - - {fileID: 947368904} + - {fileID: 861725540} + - {fileID: 2032109117} + - {fileID: 528966395} + - {fileID: 508460465} + - {fileID: 954672611} + - {fileID: 1576493360} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1746362922 +--- !u!1001 &1745910077 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -1200,61 +1269,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 144756041} m_Modifications: - - target: {fileID: 2076979688870881298, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_Name - value: UnitB - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.x - value: 29.9 + value: 33.4 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.z - value: 1.069 + value: 10.9 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9214054967999642451, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_Name + value: TestUnitB (2) + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} ---- !u!4 &1746362923 stripped + m_SourcePrefab: {fileID: 100100000, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} +--- !u!4 &1745910078 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - m_PrefabInstance: {fileID: 1746362922} + m_CorrespondingSourceObject: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + m_PrefabInstance: {fileID: 1745910077} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2001936273 +--- !u!1001 &1955858983 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -1262,59 +1331,116 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 144756041} m_Modifications: - - target: {fileID: 2076979688870881298, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - propertyPath: m_Name - value: UnitB (4) - objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.x - value: 29.9 + value: 33.4 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalPosition.z - value: 18.4 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} + - target: {fileID: 5324747254623278346, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9214054967999642451, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} + propertyPath: m_Name + value: TestUnitB + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} ---- !u!4 &2001936274 stripped + m_SourcePrefab: {fileID: 100100000, guid: 0986f06ae42c33d9d8087f9e657df525, type: 3} +--- !u!1001 &2032109116 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1694772215} + m_Modifications: + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalPosition.z + value: 9.3 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7334079432953664363, guid: 68318918c11a4047e9399d779574751e, type: 3} + propertyPath: m_Name + value: TestUnitA (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 68318918c11a4047e9399d779574751e, type: 3} +--- !u!4 &2032109117 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: 55c7812ba8b0a4e6e9eb31bae387a77f, type: 3} - m_PrefabInstance: {fileID: 2001936273} + m_CorrespondingSourceObject: {fileID: 6051792421228363058, guid: 68318918c11a4047e9399d779574751e, type: 3} + m_PrefabInstance: {fileID: 2032109116} m_PrefabAsset: {fileID: 0} --- !u!4 &105823620233657495 Transform: diff --git a/Assets/Scripts/AttackHandler.cs b/Assets/Scripts/AttackHandler.cs index 69badaa..249e30e 100644 --- a/Assets/Scripts/AttackHandler.cs +++ b/Assets/Scripts/AttackHandler.cs @@ -25,7 +25,8 @@ public class AttackHandler : MonoBehaviour void Update() { - _timer = Mathf.Max(_timer - Time.deltaTime, 0f); + _timer = _timer - Time.deltaTime; + Attack(); } /// @@ -34,9 +35,10 @@ public class AttackHandler : MonoBehaviour /// public bool Attack() { - if (_timer >= 0) return false; + if (_timer > 0) return false; Collider[] targets = DetectTargets(); + print(targets.Length); foreach (Collider target in targets) { if (!target.CompareTag("Unit")) continue; @@ -58,17 +60,15 @@ public class AttackHandler : MonoBehaviour private Collider[] DetectTargets() { // Make sure to manager layers for better performance - - List targets = new List(); Collider[] hitColliders; - + switch (attackShape) { case SphereCollider sphere: - hitColliders = Physics.OverlapSphere(sphere.transform.position, sphere.radius, sphere.includeLayers); + hitColliders = Physics.OverlapSphere(sphere.transform.position, sphere.radius); break; case BoxCollider box: - hitColliders = Physics.OverlapBox(box.bounds.center, box.bounds.extents, box.transform.rotation, box.includeLayers); + hitColliders = Physics.OverlapBox(box.bounds.center, box.bounds.extents, box.transform.rotation); break; default: throw new ArgumentException("Only sphere or box are supported");