From 08be6bc77c46a02dc4a60ac530ca6149428fedd7 Mon Sep 17 00:00:00 2001 From: Ava Gaiety Wroten Date: Fri, 19 Jun 2020 11:08:05 -0500 Subject: [PATCH] Lasers in intro --- Assets/Animations/Intro/Story-Animator.anim | 376 ++++++++++++++++++++ Assets/Scenes/Intro.unity | 275 +++++++++++++- Assets/Scripts/Turret.cs | 2 + 3 files changed, 641 insertions(+), 12 deletions(-) diff --git a/Assets/Animations/Intro/Story-Animator.anim b/Assets/Animations/Intro/Story-Animator.anim index 2fe9452..38a552c 100644 --- a/Assets/Animations/Intro/Story-Animator.anim +++ b/Assets/Animations/Intro/Story-Animator.anim @@ -110,6 +110,92 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: panel-4 + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -9.83, y: 5.04, z: 23.890944} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 4.1 + value: {x: -9.83, y: 5.04, z: 23.890944} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 12.05 + value: {x: -9.83, y: 0.61, z: 23.890944} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 18.95 + value: {x: -9.83, y: 5.04, z: 23.890944} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 20.283333 + value: {x: -9.83, y: 5.04, z: 23.890944} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: X Laser + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 4.1 + value: {x: 7.84, y: 4.52, z: 23.890944} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 12.066667 + value: {x: -4.62, y: 4.52, z: 23.890944} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 18.766666 + value: {x: 7.84, y: 4.52, z: 23.890944} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Y Laser m_ScaleCurves: - curve: serializedVersion: 2 @@ -335,6 +421,20 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1683292493 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3257010937 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3624239529 attribute: 3 @@ -998,6 +1098,282 @@ AnimationClip: path: Story-3 classID: 114 script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -9.83 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.1 + value: -9.83 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12.05 + value: -9.83 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18.95 + value: -9.83 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 20.283333 + value: -9.83 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: X Laser + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 5.04 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.1 + value: 5.04 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12.05 + value: 0.61 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18.95 + value: 5.04 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 20.283333 + value: 5.04 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: X Laser + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 23.890944 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.1 + value: 23.890944 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12.05 + value: 23.890944 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18.95 + value: 23.890944 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 20.283333 + value: 23.890944 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: X Laser + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 4.1 + value: 7.84 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12.066667 + value: -4.62 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18.766666 + value: 7.84 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Y Laser + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 4.1 + value: 4.52 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12.066667 + value: 4.52 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18.766666 + value: 4.52 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Y Laser + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 4.1 + value: 23.890944 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12.066667 + value: 23.890944 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18.766666 + value: 23.890944 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Y Laser + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Scenes/Intro.unity b/Assets/Scenes/Intro.unity index b97e930..0d28bcc 100644 --- a/Assets/Scenes/Intro.unity +++ b/Assets/Scenes/Intro.unity @@ -154,7 +154,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1187264636} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -340,6 +340,101 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 +--- !u!1001 &108118562 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1187264636} + m_Modifications: + - target: {fileID: 2115795504606128404, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_Name + value: Y Laser + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128409, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: speed + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128409, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: isHorizontal + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128409, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: animated + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalPosition.x + value: 6.86 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalPosition.y + value: 4.52 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalPosition.z + value: 23.890944 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128415, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: flipDirection + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0fecd55e0eb9020499d7ba0934555d41, type: 3} +--- !u!4 &108118563 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + m_PrefabInstance: {fileID: 108118562} + m_PrefabAsset: {fileID: 0} --- !u!1 &195546182 GameObject: m_ObjectHideFlags: 0 @@ -382,7 +477,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &413214410 GameObject: @@ -417,7 +512,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1187264636} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -875,7 +970,7 @@ RectTransform: - {fileID: 449727263} - {fileID: 1827190587} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1280,13 +1375,82 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1187264636} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.69, y: -2.38} m_SizeDelta: {x: 11.894907, y: 2.1616306} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &681465367 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4683683892600594510, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_Name + value: Charge Counter + objectReference: {fileID: 0} + - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_LocalPosition.z + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} --- !u!1 &769197193 GameObject: m_ObjectHideFlags: 0 @@ -1678,7 +1842,7 @@ Transform: m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] m_Father: {fileID: 1187264636} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1087635634 PrefabInstance: @@ -1730,7 +1894,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -1862,13 +2026,15 @@ Transform: m_LocalPosition: {x: 1.3304508, y: 0.14483318, z: -23.890944} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1809945979} + - {fileID: 108118563} - {fileID: 809806095} - {fileID: 677262423} - {fileID: 413214411} - {fileID: 16745508} - {fileID: 1276061842} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1187264637 Animator: @@ -1930,7 +2096,7 @@ Transform: m_LocalScale: {x: 1.8, y: 1.8, z: 1} m_Children: [] m_Father: {fileID: 1187264636} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1276061843 SpriteRenderer: @@ -2046,7 +2212,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1598451562 GameObject: @@ -2262,7 +2428,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2288,6 +2454,12 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!4 &1809945979 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + m_PrefabInstance: {fileID: 1983614550} + m_PrefabAsset: {fileID: 0} --- !u!1 &1827190586 GameObject: m_ObjectHideFlags: 0 @@ -2467,6 +2639,85 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &1983614550 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1187264636} + m_Modifications: + - target: {fileID: 2115795504606128404, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_Name + value: X Laser + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128409, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: speed + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128409, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: animated + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalPosition.x + value: -9.83 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalPosition.y + value: 5.04 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalPosition.z + value: 23.890944 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2115795504606128410, guid: 0fecd55e0eb9020499d7ba0934555d41, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0fecd55e0eb9020499d7ba0934555d41, type: 3} --- !u!1 &2078602940 GameObject: m_ObjectHideFlags: 0 @@ -2678,7 +2929,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Turret.cs b/Assets/Scripts/Turret.cs index 2f51c84..e6d8c21 100644 --- a/Assets/Scripts/Turret.cs +++ b/Assets/Scripts/Turret.cs @@ -7,6 +7,7 @@ public class Turret : MonoBehaviour public float speed = 10.0f; public float distance = 2.0f; public bool isHorizontal = false; + public bool animated = false; float startX; float startY; @@ -28,6 +29,7 @@ public class Turret : MonoBehaviour bool allowMovement(Vector3 movementVector) { + if (animated) return false; bool moveUp = movementVector.y > 0; bool moveDown = movementVector.y < 0; bool moveRight = movementVector.x > 0;