From e6fa39fb678a0a563342e74d6b06124f80d12f81 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Sun, 15 May 2022 10:05:34 -0400 Subject: [PATCH] Rework hitscaning on cannon fire --- Assets/Prefabs/Canvas_UI.prefab | 74 +-- Assets/Prefabs/Player.prefab | 2 +- Assets/Scenes/SoulahaScene.unity | 955 ++++++++++++++++++++++--------- Assets/Scripts/CannonScript.cs | 57 +- 4 files changed, 777 insertions(+), 311 deletions(-) diff --git a/Assets/Prefabs/Canvas_UI.prefab b/Assets/Prefabs/Canvas_UI.prefab index de150cb..25e7a55 100644 --- a/Assets/Prefabs/Canvas_UI.prefab +++ b/Assets/Prefabs/Canvas_UI.prefab @@ -454,9 +454,9 @@ RectTransform: m_Father: {fileID: 8183383574400522882} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100.00001, y: -25} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3947095809116700151 @@ -1114,7 +1114,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.775, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1189,8 +1189,8 @@ RectTransform: m_Father: {fileID: 7617209483920801355} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.775, y: 0} + m_AnchorMax: {x: 0.775, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1265,9 +1265,9 @@ RectTransform: m_Father: {fileID: 6054892815323966725} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100.00001, y: -25} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5251019473499131800 @@ -4023,8 +4023,8 @@ RectTransform: m_Father: {fileID: 7832311567031281615} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.775, y: 0} + m_AnchorMax: {x: 0.775, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -4234,7 +4234,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.775, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -4310,9 +4310,9 @@ RectTransform: m_Father: {fileID: 4514125314489927979} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 200, y: -104.26691} m_SizeDelta: {x: 441.22693, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5662559955727251511 @@ -4652,9 +4652,9 @@ RectTransform: m_Father: {fileID: 4514125314489927979} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 200, y: -34.755634} m_SizeDelta: {x: 441.22693, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2360335056540398615 @@ -4831,9 +4831,9 @@ RectTransform: m_Father: {fileID: 8477939615244931290} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320.61346, y: -25} m_SizeDelta: {x: 241.2269, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5381892342036000582 @@ -5332,8 +5332,8 @@ RectTransform: m_Father: {fileID: 5471430262505720550} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.775, y: 0} + m_AnchorMax: {x: 0.775, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -5410,9 +5410,9 @@ RectTransform: m_Father: {fileID: 8183383574400522882} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320.61346, y: -25} m_SizeDelta: {x: 241.2269, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2623087485492258608 @@ -5815,9 +5815,9 @@ RectTransform: m_Father: {fileID: 6054892815323966725} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320.61346, y: -25} m_SizeDelta: {x: 241.2269, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7282530242272405843 @@ -5970,9 +5970,9 @@ RectTransform: m_Father: {fileID: 4514125314489927979} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 200, y: -173.77817} m_SizeDelta: {x: 441.22693, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6358657304481751404 @@ -7577,9 +7577,9 @@ RectTransform: m_Father: {fileID: 8477939615244931290} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100.00001, y: -25} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &349148022202180518 @@ -7941,7 +7941,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.775, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -8133,7 +8133,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6873527208435646568 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 7b56fd1..ca508a9 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -218,7 +218,7 @@ MonoBehaviour: m_EditorClassIdentifier: cannon: {fileID: 6969840675257017922} projectile: {fileID: 5630905120393344806, guid: 70e77cdd333989d4193d3d85029d8cbe, type: 3} - lookDepth: 400 + lookDepth: 150 cannonForce: 500 fireRate: 0.5 fireTimer: 0 diff --git a/Assets/Scenes/SoulahaScene.unity b/Assets/Scenes/SoulahaScene.unity index 6f0f4d4..d895a65 100644 --- a/Assets/Scenes/SoulahaScene.unity +++ b/Assets/Scenes/SoulahaScene.unity @@ -123,6 +123,327 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &158125 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.x + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.y + value: 61.7 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9519358 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.06536628 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0.25627452 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0.15449566 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 11.75 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -28.537 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.439 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_Name + value: enemy2 (4) + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: flyingSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: landingPoint + value: + objectReference: {fileID: 6969840674995165992} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} +--- !u!1001 &640759056 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.x + value: -73.3 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.y + value: 17.5 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9519358 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.06536628 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0.25627452 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0.15449566 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 11.75 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -28.537 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.439 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_Name + value: enemy2 (5) + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: flyingSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: landingPoint + value: + objectReference: {fileID: 6969840674995165992} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} +--- !u!1001 &913159823 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.x + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.y + value: 6.8999996 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9519358 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.06536628 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0.25627452 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0.15449566 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 11.75 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -28.537 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.439 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_Name + value: enemy2 (3) + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: flyingSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: landingPoint + value: + objectReference: {fileID: 6969840674995165992} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} +--- !u!1001 &979165674 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_LocalPosition.x + value: -62.25621 + objectReference: {fileID: 0} + - target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000019073486 + objectReference: {fileID: 0} + - target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_LocalPosition.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4677231174284622268, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: m_Name + value: Meteorite + objectReference: {fileID: 0} + - target: {fileID: 7767178052037687813, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} + propertyPath: landingPoint + value: + objectReference: {fileID: 6969840674995165992} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3} +--- !u!1001 &1170137485 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.x + value: 35.1 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.y + value: 34.4 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9519358 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.06536628 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0.25627452 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0.15449566 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 11.75 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -28.537 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.439 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_Name + value: enemy2 (1) + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: flyingSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: landingPoint + value: + objectReference: {fileID: 6969840674995165992} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} --- !u!114 &1407792871 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3117915759359451286, guid: 486166ffed264a842ab4bc0affec38c4, type: 3} @@ -145,6 +466,71 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1475098292 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.x + value: -81.1 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.y + value: 53.3 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9519358 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.06536628 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0.25627452 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0.15449566 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 11.75 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -28.537 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.439 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_Name + value: enemy2 (7) + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: flyingSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: landingPoint + value: + objectReference: {fileID: 6969840674995165992} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} --- !u!1 &1571118493 GameObject: m_ObjectHideFlags: 0 @@ -190,8 +576,138 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1702395318 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.x + value: -81.1 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.y + value: 53.3 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9519358 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.06536628 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0.25627452 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0.15449566 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 11.75 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -28.537 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.439 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_Name + value: enemy2 (8) + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: flyingSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: landingPoint + value: + objectReference: {fileID: 6969840674995165992} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} +--- !u!1001 &1787351161 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.x + value: 35.1 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.y + value: 6.8999996 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9519358 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.06536628 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0.25627452 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0.15449566 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 11.75 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -28.537 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.439 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_Name + value: enemy2 (2) + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: flyingSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: landingPoint + value: + objectReference: {fileID: 6969840674995165992} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} --- !u!1001 &1822990540 PrefabInstance: m_ObjectHideFlags: 0 @@ -201,87 +717,39 @@ PrefabInstance: m_Modifications: - target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 19.4609 objectReference: {fileID: 0} - target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 425090134378490078, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 425090134378490078, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 425090134378490078, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 100.00001 - objectReference: {fileID: 0} - - target: {fileID: 425090134378490078, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 + value: -5.5 objectReference: {fileID: 0} - target: {fileID: 430403745636601587, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: player value: objectReference: {fileID: 1407792871} - - target: {fileID: 877886674277595571, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.x - value: 0.775 - objectReference: {fileID: 0} - - target: {fileID: 877886674277595571, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 318.01968 objectReference: {fileID: 0} - target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2651780916393450759, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2651780916393450759, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2651780916393450759, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 320.61346 - objectReference: {fileID: 0} - - target: {fileID: 2651780916393450759, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 2695976781126370413, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.x - value: 0.775 - objectReference: {fileID: 0} - - target: {fileID: 2695976781126370413, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 + value: -50 objectReference: {fileID: 0} - target: {fileID: 3203615922723506192, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: player @@ -289,195 +757,107 @@ PrefabInstance: objectReference: {fileID: 1407792871} - target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 19.4609 objectReference: {fileID: 0} - target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -5.5 objectReference: {fileID: 0} - - target: {fileID: 3726360089292738754, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + - target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 3726360089292738754, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + - target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 3726360089292738754, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 320.61346 - objectReference: {fileID: 0} - - target: {fileID: 3726360089292738754, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 3829834968911239637, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.x - value: 0.775 - objectReference: {fileID: 0} - - target: {fileID: 3829834968911239637, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3829834968911239637, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.x - value: 0.775 - objectReference: {fileID: 0} - - target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 33.4218 objectReference: {fileID: 0} - target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -5.5 objectReference: {fileID: 0} - target: {fileID: 4088869081495123135, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: player value: objectReference: {fileID: 1407792871} - - target: {fileID: 4487556644161876901, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.x - value: 0.775 - objectReference: {fileID: 0} - - target: {fileID: 4487556644161876901, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + - target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4487556644161876901, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.x - value: 0.775 - objectReference: {fileID: 0} - - target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 33.4218 objectReference: {fileID: 0} - target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -5.5 objectReference: {fileID: 0} - target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 184.00984 objectReference: {fileID: 0} - target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 5156634212059812228, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1571118494} - - target: {fileID: 6054892815323966725, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6054892815323966725, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6054892815323966725, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 6054892815323966725, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.y - value: -173.77817 - objectReference: {fileID: 0} - - target: {fileID: 6093655991451943081, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6093655991451943081, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6093655991451943081, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 100.00001 - objectReference: {fileID: 0} - - target: {fileID: 6093655991451943081, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5.5 objectReference: {fileID: 0} - target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -5.5 objectReference: {fileID: 0} - target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7115721288431601857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7115721288431601857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7115721288431601857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 320.61346 - objectReference: {fileID: 0} - - target: {fileID: 7115721288431601857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 + value: -50 objectReference: {fileID: 0} - target: {fileID: 7226858076299792826, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_Pivot.x @@ -489,7 +869,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7226858076299792826, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7226858076299792826, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.x @@ -573,123 +953,51 @@ PrefabInstance: objectReference: {fileID: 1407792871} - target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5.5 objectReference: {fileID: 0} - target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8183383574400522882, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8183383574400522882, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8183383574400522882, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 8183383574400522882, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.y - value: -34.755634 + value: -5.5 objectReference: {fileID: 0} - target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 18.883 objectReference: {fileID: 0} - target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -5.5 objectReference: {fileID: 0} - - target: {fileID: 8477939615244931290, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8477939615244931290, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8477939615244931290, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 8477939615244931290, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.y - value: -104.26691 - objectReference: {fileID: 0} - - target: {fileID: 8537247833070452607, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.x - value: 0.775 - objectReference: {fileID: 0} - - target: {fileID: 8537247833070452607, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8537247833070452607, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.x - value: 0.775 - objectReference: {fileID: 0} - - target: {fileID: 8714066585298625451, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.x - value: 0.775 - objectReference: {fileID: 0} - - target: {fileID: 8714066585298625451, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8773558742081360758, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8810935160172039527, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8810935160172039527, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 8810935160172039527, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.x - value: 100.00001 + value: 5.5 objectReference: {fileID: 0} - - target: {fileID: 8810935160172039527, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + - target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: -5.5 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} @@ -704,6 +1012,136 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79b7d4d08379c4a4b9c0c4a91499fb6d, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1853250034 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.x + value: -39.6 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.y + value: 53.3 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9519358 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.06536628 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0.25627452 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0.15449566 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 11.75 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -28.537 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.439 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_Name + value: enemy2 (6) + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: flyingSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: landingPoint + value: + objectReference: {fileID: 6969840674995165992} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} +--- !u!1001 &1880112937 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.x + value: -7.139782 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.y + value: 34.4 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalPosition.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9519358 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.06536628 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0.25627452 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0.15449566 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 11.75 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -28.537 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.439 + objectReference: {fileID: 0} + - target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: m_Name + value: enemy2 + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: flyingSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + propertyPath: landingPoint + value: + objectReference: {fileID: 6969840674995165992} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} --- !u!1 &1966667440 GameObject: m_ObjectHideFlags: 0 @@ -820,7 +1258,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &6969840674995165991 PrefabInstance: @@ -883,3 +1321,8 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 486166ffed264a842ab4bc0affec38c4, type: 3} +--- !u!4 &6969840674995165992 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6969840675499469969, guid: 486166ffed264a842ab4bc0affec38c4, type: 3} + m_PrefabInstance: {fileID: 6969840674995165991} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/CannonScript.cs b/Assets/Scripts/CannonScript.cs index 5eda36e..c694016 100644 --- a/Assets/Scripts/CannonScript.cs +++ b/Assets/Scripts/CannonScript.cs @@ -35,20 +35,6 @@ public class CannonScript : MonoBehaviour if(fireTimer >= fireRate){ Fire(); fireTimer = 0; - - RaycastHit hit; - - if (Physics.Raycast(transform.position, lookDir, out hit, Mathf.Infinity)) - { - Debug.DrawRay(transform.position, lookDir * hit.distance, Color.yellow); - - GameObject hitObject = hit.collider.gameObject; - - if (hitObject.tag == "Enemy") - { - hitObject.GetComponent().IsShot(); - } - } } }else if(fireTimer < fireRate){ fireTimer += Time.deltaTime; @@ -59,6 +45,18 @@ public class CannonScript : MonoBehaviour GameObject proj = Instantiate(projectile, cannon.transform.position, cannon.transform.rotation); proj.GetComponent().SetDamage(damage); proj.GetComponent().AddForce(cannonForce * lookDir, ForceMode.Impulse); + RaycastHit hit; + if (Physics.Raycast(transform.position, lookDir, out hit, Mathf.Infinity)) + { + Debug.DrawRay(transform.position, lookDir * hit.distance, Color.yellow, 0.5f); + + GameObject hitObject = hit.collider.gameObject; + + if (hitObject.CompareTag("Enemy")) + { + hitObject.GetComponent().IsShot(); + } + } if(bullets > 1){ //Pick random offset from lookDir for (int i = 0; i < bullets-1; i++) @@ -66,15 +64,40 @@ public class CannonScript : MonoBehaviour proj = Instantiate(projectile, cannon.transform.position, cannon.transform.rotation); proj.GetComponent().SetDamage(damage); proj.GetComponent().AddForce(cannonForce * (lookDir+offsets[i]), ForceMode.Impulse); + if (Physics.Raycast(transform.position, (lookDir+offsets[i]), out hit, Mathf.Infinity)) + { + Debug.DrawRay(transform.position, (lookDir+offsets[i]) * hit.distance, Color.yellow, 0.5f); + + GameObject hitObject = hit.collider.gameObject; + + if (hitObject.CompareTag("Enemy")) + { + hitObject.GetComponent().IsShot(); + } + } } } } private Vector3 GetMouseWorldPosition(){ Vector3 screenPos = Mouse.current.position.ReadValue(); - screenPos.z = lookDepth; - Vector3 worldPoint = Camera.main.ScreenToWorldPoint(screenPos); - + Ray ray = Camera.main.ScreenPointToRay(screenPos); + RaycastHit hit; + Vector3 worldPoint = Vector3.zero; + if (Physics.Raycast(ray, out hit)) { + if(hit.transform.gameObject.CompareTag("Enemy")){ + worldPoint = hit.point; + }else{ + screenPos.z = lookDepth; + worldPoint = Camera.main.ScreenToWorldPoint(screenPos); + } + + } + if(worldPoint == Vector3.zero){ + screenPos.z = lookDepth; + worldPoint = Camera.main.ScreenToWorldPoint(screenPos); + } + return worldPoint; }