diff --git a/Assets/Animations/CharacterShoot.anim b/Assets/Animations/CharacterShoot.anim new file mode 100644 index 0000000..e441d83 --- /dev/null +++ b/Assets/Animations/CharacterShoot.anim @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: CharacterShoot + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300024, guid: affde2e1a66595c46989d8f63273bb41, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - path: 0 + attribute: 0 + script: {fileID: 0} + classID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300024, guid: affde2e1a66595c46989d8f63273bb41, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_StartTime: 0 + m_StopTime: .0833333358 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/CharacterShoot.anim.meta b/Assets/Animations/CharacterShoot.anim.meta new file mode 100644 index 0000000..85f69bd --- /dev/null +++ b/Assets/Animations/CharacterShoot.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07bc70ab175a72b4baf9c1a5dabfe331 +timeCreated: 1447182956 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/JumpShoot.anim b/Assets/Animations/JumpShoot.anim new file mode 100644 index 0000000..59a0b32 --- /dev/null +++ b/Assets/Animations/JumpShoot.anim @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: JumpShoot + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - path: 0 + attribute: 0 + script: {fileID: 0} + classID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_StartTime: 0 + m_StopTime: .0833333358 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/JumpShoot.anim.meta b/Assets/Animations/JumpShoot.anim.meta new file mode 100644 index 0000000..43449a1 --- /dev/null +++ b/Assets/Animations/JumpShoot.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e793796701ba6c941a5d7263eaf965a6 +timeCreated: 1447188019 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/RunShoot.anim b/Assets/Animations/RunShoot.anim new file mode 100644 index 0000000..0ccac23 --- /dev/null +++ b/Assets/Animations/RunShoot.anim @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: RunShoot + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - path: 0 + attribute: 0 + script: {fileID: 0} + classID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_StartTime: 0 + m_StopTime: .0833333358 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/RunShoot.anim.meta b/Assets/Animations/RunShoot.anim.meta new file mode 100644 index 0000000..17ba119 --- /dev/null +++ b/Assets/Animations/RunShoot.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f638740b2ffdeb45af40d99ed9b2566 +timeCreated: 1447187440 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/character_0.controller b/Assets/Animations/character_0.controller index 1335456..012023c 100644 --- a/Assets/Animations/character_0.controller +++ b/Assets/Animations/character_0.controller @@ -13,19 +13,25 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Ground m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 1 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: vSpeed m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: Shooting + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -39,6 +45,30 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &110152892 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Shooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 110232456} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: .25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &110160326 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -66,6 +96,30 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &110170126 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Shooting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 110265402} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: .25 + m_TransitionOffset: 0 + m_ExitTime: .825174809 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &110183808 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -153,6 +207,7 @@ AnimatorState: m_Transitions: - {fileID: 110160326} - {fileID: 110194588} + - {fileID: 110170126} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -190,6 +245,30 @@ AnimatorState: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: +--- !u!1102 &110265402 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: CharacterShoot + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 110152892} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 07bc70ab175a72b4baf9c1a5dabfe331, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: --- !u!1102 &110287914 AnimatorState: serializedVersion: 5 @@ -231,6 +310,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 110287914} m_Position: {x: 480, y: 168, z: 0} + - serializedVersion: 1 + m_State: {fileID: 110265402} + m_Position: {x: 372, y: -60, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -238,6 +320,6 @@ AnimatorStateMachine: m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 72, y: -72, z: 0} m_EntryPosition: {x: 60, y: 192, z: 0} - m_ExitPosition: {x: 1008, y: 156, z: 0} + m_ExitPosition: {x: 468, y: 312, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 110232456} diff --git a/Assets/Graphics/Thumbs.db b/Assets/Graphics/Thumbs.db new file mode 100644 index 0000000..26b845b Binary files /dev/null and b/Assets/Graphics/Thumbs.db differ diff --git a/Assets/Graphics/Thumbs.db.meta b/Assets/Graphics/Thumbs.db.meta new file mode 100644 index 0000000..51718ea --- /dev/null +++ b/Assets/Graphics/Thumbs.db.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b048ebc241f547488143f31e2faabf6 +timeCreated: 1447172965 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/projectiles (bonus characters).png b/Assets/Graphics/projectiles (bonus characters).png new file mode 100644 index 0000000..2ab3d59 Binary files /dev/null and b/Assets/Graphics/projectiles (bonus characters).png differ diff --git a/Assets/Graphics/projectiles (bonus characters).png.meta b/Assets/Graphics/projectiles (bonus characters).png.meta new file mode 100644 index 0000000..68c8d2d --- /dev/null +++ b/Assets/Graphics/projectiles (bonus characters).png.meta @@ -0,0 +1,67 @@ +fileFormatVersion: 2 +guid: 79e3562d4e1047c45a1cc07e1a7afd28 +timeCreated: 1447087586 +licenseType: Free +TextureImporter: + fileIDToRecycleName: + 21300000: missile_1 + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: + - name: missile_1 + rect: + serializedVersion: 2 + x: 254 + y: 473 + width: 24 + height: 10 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 3254687..410588e 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -13,6 +13,7 @@ GameObject: - 61: {fileID: 6183734} - 114: {fileID: 11477144} - 50: {fileID: 5006852} + - 114: {fileID: 11437552} m_Layer: 8 m_Name: Player m_TagString: Untagged @@ -106,6 +107,20 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 +--- !u!114 &11437552 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 101678} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2197f504ed5ef864b9bc03da81a8f4fb, type: 3} + m_Name: + m_EditorClassIdentifier: + rocket: {fileID: 5027078, guid: 1cf24e915b357664f94ba440a1d1ec1a, type: 2} + rocket_position_offset: {x: .100000001, y: 0, z: 0} + speed: 3 --- !u!114 &11477144 MonoBehaviour: m_ObjectHideFlags: 1 @@ -156,7 +171,19 @@ Prefab: serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} - m_Modifications: [] + m_Modifications: + - target: {fileID: 0} + propertyPath: rocket + value: + objectReference: {fileID: 5027078, guid: 1cf24e915b357664f94ba440a1d1ec1a, type: 2} + - target: {fileID: 0} + propertyPath: speed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: rocket_position_offset.x + value: .100000001 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 101678} diff --git a/Assets/Prefabs/rocket.prefab b/Assets/Prefabs/rocket.prefab new file mode 100644 index 0000000..b2a5c3d --- /dev/null +++ b/Assets/Prefabs/rocket.prefab @@ -0,0 +1,122 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &141294 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 421606} + - 212: {fileID: 21212352} + - 50: {fileID: 5027078} + - 114: {fileID: 11450384} + - 61: {fileID: 6184698} + m_Layer: 0 + m_Name: rocket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &421606 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 141294} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: .651942611, y: .117486805, z: 0} + m_LocalScale: {x: .5, y: .5, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!50 &5027078 +Rigidbody2D: + serializedVersion: 2 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 141294} + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: .0500000007 + m_GravityScale: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &6184698 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 141294} + m_Enabled: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Size: {x: .239999995, y: .100000001} +--- !u!114 &11450384 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 141294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0523305ab193c9b4dbcf3a14bd1fd1ae, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!212 &21212352 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 141294} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_ReflectionProbeUsage: 0 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 79e3562d4e1047c45a1cc07e1a7afd28, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 0} + propertyPath: m_IsKinematic + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: speed + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_GravityScale + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 141294} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/rocket.prefab.meta b/Assets/Prefabs/rocket.prefab.meta new file mode 100644 index 0000000..1d971f3 --- /dev/null +++ b/Assets/Prefabs/rocket.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1cf24e915b357664f94ba440a1d1ec1a +timeCreated: 1447087667 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RocketBehaviour.cs b/Assets/RocketBehaviour.cs new file mode 100644 index 0000000..530754d --- /dev/null +++ b/Assets/RocketBehaviour.cs @@ -0,0 +1,24 @@ +using UnityEngine; +using System.Collections; + +public class RocketBehaviour : MonoBehaviour { + + private bool isAPlayerRocket; + + //Destroys the rocket when no longer visible + void OnBecameInvisible() + { + Destroy(gameObject); + } + //Destroys the rocket when it hits something (except Player when its his rocket) + void OnCollisionEnter2D(Collision2D collision) + { + if(!isAPlayerRocket || collision.gameObject.tag != "Player") + Destroy(gameObject); + } + + public void SetProperty(bool playerRocket) + { + isAPlayerRocket = playerRocket; + } +} diff --git a/Assets/RocketBehaviour.cs.meta b/Assets/RocketBehaviour.cs.meta new file mode 100644 index 0000000..3a4b063 --- /dev/null +++ b/Assets/RocketBehaviour.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 0523305ab193c9b4dbcf3a14bd1fd1ae +timeCreated: 1447089423 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FireScript.cs b/Assets/Scripts/FireScript.cs new file mode 100644 index 0000000..b9b193e --- /dev/null +++ b/Assets/Scripts/FireScript.cs @@ -0,0 +1,45 @@ +using UnityEngine; +using System.Collections; + +public class FireScript : MonoBehaviour { + + public Rigidbody2D rocket; + public Vector3 rocket_position_offset; + public float speed = 10f; + + // Update is called once per frame + void Update () { + if (Input.GetButtonDown("Fire1")) + { + FireRocket(gameObject.GetComponent().GetFacingRight()); + } + + } + + void FireRocket(bool facingRight) + { + //Instantiate new rocket + Rigidbody2D rocketClone = (Rigidbody2D)Instantiate(rocket, transform.position, Quaternion.identity); + + //Sets rocket to be the player's + rocketClone.gameObject.GetComponent().SetProperty(true); + + if (!facingRight) + { + //Flip the rocket + Vector3 scale = rocketClone.gameObject.transform.localScale; + scale.x *= -1; + rocketClone.gameObject.transform.localScale = scale; + + //Substract the offset + rocketClone.gameObject.transform.position -= rocket_position_offset; + } + else + { + //Add the offset + rocketClone.gameObject.transform.position += rocket_position_offset; + } + //Make the rocket move + rocketClone.velocity = new Vector2(speed * transform.localScale.x, 0); + } +} diff --git a/Assets/Scripts/FireScript.cs.meta b/Assets/Scripts/FireScript.cs.meta new file mode 100644 index 0000000..f1a715e --- /dev/null +++ b/Assets/Scripts/FireScript.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 2197f504ed5ef864b9bc03da81a8f4fb +timeCreated: 1447090112 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: + - rocket: {instanceID: 0} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs index 9893972..a5a6327 100644 --- a/Assets/Scripts/PlayerBehavior.cs +++ b/Assets/Scripts/PlayerBehavior.cs @@ -29,6 +29,14 @@ public class PlayerBehavior : MonoBehaviour { anim.SetBool("Ground", false); rb.AddForce(new Vector2(0, jumpForce)); } + + //for the shooting animations + if (Input.GetButtonDown ("Fire1")) { + anim.SetBool("Shooting", true); + + } else { + anim.SetBool ("Shooting", false); + } } void FixedUpdate() @@ -47,6 +55,11 @@ public class PlayerBehavior : MonoBehaviour { anim.SetFloat("Speed", Mathf.Abs(xMove)); } + public bool GetFacingRight() + { + return facingRight; + } + private void flip() { facingRight = !facingRight; diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e040c5c..8a062e6 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.0f3 +m_EditorVersion: 5.2.1f1 m_StandardAssetsVersion: 0