diff --git a/Assets/Prefabs/Units/Base/BaseSkeleton.prefab b/Assets/Prefabs/Units/Base/BaseSkeleton.prefab index 03a1417..7202c51 100644 --- a/Assets/Prefabs/Units/Base/BaseSkeleton.prefab +++ b/Assets/Prefabs/Units/Base/BaseSkeleton.prefab @@ -75,6 +75,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 1854268353119403178, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: distanceGoal + value: 15 + objectReference: {fileID: 0} - target: {fileID: 2076979688870881298, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: m_Name value: BaseSkeleton @@ -171,6 +175,7 @@ MonoBehaviour: arrowPrefab: {fileID: 173966350544600092, guid: 22fecdb2f1d632f199be524414c444c4, type: 3} arrowBaseSpeed: 20 spawnPos: {fileID: 7035766952310155559} + directShot: 0 --- !u!4 &7591572713894325371 stripped Transform: m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} diff --git a/Assets/Prefabs/Units/SkeletonA.prefab b/Assets/Prefabs/Units/SkeletonA.prefab index a2c8a09..07aadc6 100644 --- a/Assets/Prefabs/Units/SkeletonA.prefab +++ b/Assets/Prefabs/Units/SkeletonA.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 694975301204954681, guid: 31f097ed795257d8da1f9b48164def89, type: 3} + propertyPath: cooldown + value: 4 + objectReference: {fileID: 0} - target: {fileID: 3646442495847485308, guid: 31f097ed795257d8da1f9b48164def89, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -20,6 +24,10 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 3f2019db81a04f662aef4921a814266f, type: 2} + - target: {fileID: 6487507096035890842, guid: 31f097ed795257d8da1f9b48164def89, type: 3} + propertyPath: distanceGoal + value: 15 + objectReference: {fileID: 0} - target: {fileID: 6872779381538554402, guid: 31f097ed795257d8da1f9b48164def89, type: 3} propertyPath: m_Name value: SkeletonA diff --git a/Assets/Prefabs/Units/SkeletonB.prefab b/Assets/Prefabs/Units/SkeletonB.prefab index 250a09f..7f33f0d 100644 --- a/Assets/Prefabs/Units/SkeletonB.prefab +++ b/Assets/Prefabs/Units/SkeletonB.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 694975301204954681, guid: 31f097ed795257d8da1f9b48164def89, type: 3} + propertyPath: cooldown + value: 4 + objectReference: {fileID: 0} - target: {fileID: 3646442495847485308, guid: 31f097ed795257d8da1f9b48164def89, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -20,10 +24,18 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 6876598314dc3045981aca3566e74903, type: 2} + - target: {fileID: 6487507096035890842, guid: 31f097ed795257d8da1f9b48164def89, type: 3} + propertyPath: distanceGoal + value: 15 + objectReference: {fileID: 0} - target: {fileID: 6872779381538554402, guid: 31f097ed795257d8da1f9b48164def89, type: 3} propertyPath: m_Name value: SkeletonB objectReference: {fileID: 0} + - target: {fileID: 6919678614572891214, guid: 31f097ed795257d8da1f9b48164def89, type: 3} + propertyPath: k__BackingField + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7591572713894325371, guid: 31f097ed795257d8da1f9b48164def89, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Assets/Scenes/Clement 1.unity b/Assets/Scenes/Clement 1.unity index a714fd4..07bb974 100644 --- a/Assets/Scenes/Clement 1.unity +++ b/Assets/Scenes/Clement 1.unity @@ -553,6 +553,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 6208992634893184319, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3} m_PrefabInstance: {fileID: 17729954} m_PrefabAsset: {fileID: 0} +--- !u!1001 &26189255 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1448926686} + m_Modifications: + - target: {fileID: 2083905689776276340, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_Name + value: SkeletonB (5) + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.x + value: -19.785355 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.y + value: 23.834272 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.z + value: 17.116287 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b015905a96a8532a98d619573f9e665b, type: 3} +--- !u!4 &26189256 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + m_PrefabInstance: {fileID: 26189255} + m_PrefabAsset: {fileID: 0} --- !u!1 &30637912 GameObject: m_ObjectHideFlags: 0 @@ -1014,7 +1076,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &94062376 Transform: m_ObjectHideFlags: 0 @@ -1494,7 +1556,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &134139495 Transform: m_ObjectHideFlags: 0 @@ -4268,6 +4330,68 @@ Transform: - {fileID: 1488394846} m_Father: {fileID: 873683489} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &400777764 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1448926686} + m_Modifications: + - target: {fileID: 2083905689776276340, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_Name + value: SkeletonB (1) + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.x + value: -18.24522 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.y + value: 23.834272 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.z + value: 16.256287 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b015905a96a8532a98d619573f9e665b, type: 3} +--- !u!4 &400777765 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + m_PrefabInstance: {fileID: 400777764} + m_PrefabAsset: {fileID: 0} --- !u!1001 &406816957 PrefabInstance: m_ObjectHideFlags: 0 @@ -4392,6 +4516,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 6208992634893184319, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3} m_PrefabInstance: {fileID: 410394920} m_PrefabAsset: {fileID: 0} +--- !u!1001 &412052000 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1405465991} + m_Modifications: + - target: {fileID: 1777546452201213730, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_Name + value: SkeletonA (2) + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.x + value: -3.6422133 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.y + value: 3.419713 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.z + value: -2.4357681 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} +--- !u!4 &412052001 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + m_PrefabInstance: {fileID: 412052000} + m_PrefabAsset: {fileID: 0} --- !u!1001 &420811154 PrefabInstance: m_ObjectHideFlags: 0 @@ -7933,6 +8119,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 6208992634893184319, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3} m_PrefabInstance: {fileID: 754725879} m_PrefabAsset: {fileID: 0} +--- !u!1001 &765401887 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1448926686} + m_Modifications: + - target: {fileID: 2083905689776276340, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_Name + value: SkeletonB + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.x + value: -18.24522 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.y + value: 23.834272 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.z + value: 17.530334 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b015905a96a8532a98d619573f9e665b, type: 3} +--- !u!4 &765401888 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + m_PrefabInstance: {fileID: 765401887} + m_PrefabAsset: {fileID: 0} --- !u!1001 &782058416 PrefabInstance: m_ObjectHideFlags: 0 @@ -8714,6 +8962,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 6208992634893184319, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3} m_PrefabInstance: {fileID: 854130963} m_PrefabAsset: {fileID: 0} +--- !u!1001 &867531973 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1405465991} + m_Modifications: + - target: {fileID: 1777546452201213730, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_Name + value: SkeletonA (1) + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.x + value: -3.6422133 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.y + value: 3.419713 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.z + value: -0.6457672 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} +--- !u!4 &867531974 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + m_PrefabInstance: {fileID: 867531973} + m_PrefabAsset: {fileID: 0} --- !u!1 &870440480 GameObject: m_ObjectHideFlags: 0 @@ -10311,6 +10621,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 8301512717716404702, guid: a0750dd4706e5480da2ad597b62d8531, type: 3} m_PrefabInstance: {fileID: 993055333} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1015426802 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1448926686} + m_Modifications: + - target: {fileID: 2083905689776276340, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_Name + value: SkeletonB (3) + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.x + value: -19.785355 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.y + value: 23.834272 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.z + value: 14.716286 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b015905a96a8532a98d619573f9e665b, type: 3} +--- !u!4 &1015426803 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + m_PrefabInstance: {fileID: 1015426802} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1040338045 PrefabInstance: m_ObjectHideFlags: 0 @@ -10435,6 +10807,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 8301512717716404702, guid: a0750dd4706e5480da2ad597b62d8531, type: 3} m_PrefabInstance: {fileID: 1053243240} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1060279392 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1405465991} + m_Modifications: + - target: {fileID: 1777546452201213730, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_Name + value: SkeletonA (5) + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.x + value: -1.7289524 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.y + value: 3.419713 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.z + value: 0.36423492 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} +--- !u!4 &1060279393 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + m_PrefabInstance: {fileID: 1060279392} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1064582351 PrefabInstance: m_ObjectHideFlags: 0 @@ -12479,6 +12913,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 8301512717716404702, guid: a0750dd4706e5480da2ad597b62d8531, type: 3} m_PrefabInstance: {fileID: 1258150568} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1263769919 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1405465991} + m_Modifications: + - target: {fileID: 1777546452201213730, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_Name + value: SkeletonA + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.x + value: -3.6422133 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.y + value: 3.419713 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.z + value: 0.9463043 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} +--- !u!4 &1263769920 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + m_PrefabInstance: {fileID: 1263769919} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1271060367 PrefabInstance: m_ObjectHideFlags: 0 @@ -13917,6 +14413,105 @@ Transform: m_CorrespondingSourceObject: {fileID: 6208992634893184319, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3} m_PrefabInstance: {fileID: 1403214126} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1404401009 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1405465991} + m_Modifications: + - target: {fileID: 1777546452201213730, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_Name + value: SkeletonA (4) + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.x + value: -1.7289524 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.y + value: 3.419713 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.z + value: -1.0057678 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} +--- !u!4 &1404401010 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + m_PrefabInstance: {fileID: 1404401009} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1405465990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1405465991} + m_Layer: 0 + m_Name: 6SkeletonA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1405465991 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1405465990} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 19.5, y: -0.30971318, z: 69.245766} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1263769920} + - {fileID: 867531974} + - {fileID: 412052001} + - {fileID: 1777228770} + - {fileID: 1404401010} + - {fileID: 1060279393} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1406721130 PrefabInstance: m_ObjectHideFlags: 0 @@ -14549,6 +15144,43 @@ Transform: m_CorrespondingSourceObject: {fileID: 6208992634893184319, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3} m_PrefabInstance: {fileID: 1442812341} m_PrefabAsset: {fileID: 0} +--- !u!1 &1448926685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1448926686} + m_Layer: 0 + m_Name: 6SkeletonB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1448926686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448926685} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -27.374645, y: -20.604273, z: 60.15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 765401888} + - {fileID: 400777765} + - {fileID: 1786755850} + - {fileID: 1015426803} + - {fileID: 1794695416} + - {fileID: 26189256} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1463906297 PrefabInstance: m_ObjectHideFlags: 0 @@ -17657,6 +18289,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 8301512717716404702, guid: a0750dd4706e5480da2ad597b62d8531, type: 3} m_PrefabInstance: {fileID: 1768180884} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1777228769 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1405465991} + m_Modifications: + - target: {fileID: 1777546452201213730, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_Name + value: SkeletonA (3) + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.x + value: -1.7289524 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.y + value: 3.419713 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalPosition.z + value: -2.4357681 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} +--- !u!4 &1777228770 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3} + m_PrefabInstance: {fileID: 1777228769} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1782861620 PrefabInstance: m_ObjectHideFlags: 0 @@ -17719,6 +18413,130 @@ Transform: m_CorrespondingSourceObject: {fileID: 8301512717716404702, guid: a0750dd4706e5480da2ad597b62d8531, type: 3} m_PrefabInstance: {fileID: 1782861620} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1786755849 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1448926686} + m_Modifications: + - target: {fileID: 2083905689776276340, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_Name + value: SkeletonB (2) + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.x + value: -18.24522 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.y + value: 23.834272 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.z + value: 14.716286 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b015905a96a8532a98d619573f9e665b, type: 3} +--- !u!4 &1786755850 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + m_PrefabInstance: {fileID: 1786755849} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1794695415 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1448926686} + m_Modifications: + - target: {fileID: 2083905689776276340, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_Name + value: SkeletonB (4) + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.x + value: -19.785355 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.y + value: 23.834272 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalPosition.z + value: 15.91629 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b015905a96a8532a98d619573f9e665b, type: 3} +--- !u!4 &1794695416 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3} + m_PrefabInstance: {fileID: 1794695415} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1798211838 PrefabInstance: m_ObjectHideFlags: 0 @@ -25181,3 +25999,5 @@ SceneRoots: - {fileID: 134139495} - {fileID: 1190375594} - {fileID: 118507728} + - {fileID: 1448926686} + - {fileID: 1405465991} diff --git a/Assets/Scripts/UnitScripts/Attacks/ArrowHandler.cs b/Assets/Scripts/UnitScripts/Attacks/ArrowHandler.cs index 2752ee6..3a5798b 100644 --- a/Assets/Scripts/UnitScripts/Attacks/ArrowHandler.cs +++ b/Assets/Scripts/UnitScripts/Attacks/ArrowHandler.cs @@ -1,3 +1,4 @@ +using Unity.VisualScripting; using UnityEngine; /// @@ -9,6 +10,7 @@ public class ArrowHandler : MonoBehaviour [SerializeField] private float baseDamage; [SerializeField] private float baseKnockback; private Rigidbody _rigidBody; + private bool _fromTeamA; void Awake() { @@ -21,9 +23,10 @@ public class ArrowHandler : MonoBehaviour if (_rigidBody.linearVelocity.magnitude >= 1f) transform.forward = _rigidBody.linearVelocity.normalized; } - public void LaunchArrow(Vector3 baseSpeed) + public void LaunchArrow(Vector3 baseSpeed, bool fromTeamA) { _rigidBody.linearVelocity = baseSpeed; + _fromTeamA = fromTeamA; } void OnCollisionEnter(Collision collision) @@ -31,7 +34,7 @@ public class ArrowHandler : MonoBehaviour // Can be optimized with tags, but it add dependance beetween teams if (collision.gameObject.TryGetComponent(out AbstractUnit unit)) { - if (unit is MinecraftUnit) + if (unit is MinecraftUnit && unit.IsTeamA != _fromTeamA) // No friendly fire { MinecraftUnit minecraftUnit = unit as MinecraftUnit; Vector3 knockback = _rigidBody.linearVelocity * baseKnockback; diff --git a/Assets/Scripts/UnitScripts/Attacks/AttackSkeleton.cs b/Assets/Scripts/UnitScripts/Attacks/AttackSkeleton.cs index 54dd1d5..31acb88 100644 --- a/Assets/Scripts/UnitScripts/Attacks/AttackSkeleton.cs +++ b/Assets/Scripts/UnitScripts/Attacks/AttackSkeleton.cs @@ -24,7 +24,7 @@ public class AttackSkeleton : AttackHandler Vector3 diffVector = Vector3.ProjectOnPlane(targetUnit.transform.position - spawnPos.position, Vector3.up); Vector3 launchVectorNormalized = (localLaunchVector.x * diffVector.normalized + localLaunchVector.y * Vector3.up).normalized; - arrowHandler.LaunchArrow(launchVectorNormalized * arrowBaseSpeed); + arrowHandler.LaunchArrow(launchVectorNormalized * arrowBaseSpeed, _minecraftUnit.IsTeamA); return true; }