From b2501927a8ff77e541a2f33b4e34c4b3bb84a48e Mon Sep 17 00:00:00 2001 From: steven2gleal Date: Tue, 5 Sep 2017 15:05:59 -0500 Subject: [PATCH 1/5] init commit to movement branch --- Game 1/Assets/Scripts/Explosion.cs | 16 ++++++++++++++++ Game 1/Assets/Scripts/Explosion.cs.meta | 12 ++++++++++++ Game 1/Assets/Scripts/PlayerController.cs | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 Game 1/Assets/Scripts/Explosion.cs create mode 100644 Game 1/Assets/Scripts/Explosion.cs.meta diff --git a/Game 1/Assets/Scripts/Explosion.cs b/Game 1/Assets/Scripts/Explosion.cs new file mode 100644 index 0000000..c7047df --- /dev/null +++ b/Game 1/Assets/Scripts/Explosion.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Explosion : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Game 1/Assets/Scripts/Explosion.cs.meta b/Game 1/Assets/Scripts/Explosion.cs.meta new file mode 100644 index 0000000..655dfaf --- /dev/null +++ b/Game 1/Assets/Scripts/Explosion.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 93cb9d08b2b4f164d95fa992385774e9 +timeCreated: 1504641875 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Scripts/PlayerController.cs b/Game 1/Assets/Scripts/PlayerController.cs index 54e2dbd..b874572 100644 --- a/Game 1/Assets/Scripts/PlayerController.cs +++ b/Game 1/Assets/Scripts/PlayerController.cs @@ -25,7 +25,7 @@ public class PlayerController : MonoBehaviour { if (Input.GetMouseButtonDown(0)) { - explode.Play(); + //explode.Play; Debug.Log("Explosion at: " + Input.mousePosition); } From dcfe0db24ec2e063e60e7671be9c3fa0f6b689a8 Mon Sep 17 00:00:00 2001 From: steven2gleal Date: Tue, 5 Sep 2017 17:37:56 -0500 Subject: [PATCH 2/5] experimenting with animator --- Game 1/Assets/Animations/Explosion.anim | 31 ++++-- Game 1/Assets/Animations/Explosion.anim.meta | 2 +- Game 1/Assets/Animations/Explosion.controller | 60 +++++++++- .../Animations/Explosion.controller.meta | 4 +- Game 1/Assets/Levels/Level 0.unity | 103 +++++++++++++++++- .../Scripts/AnimationEventFunctions.meta | 9 ++ .../DeleteOnComplete.cs | 11 ++ .../DeleteOnComplete.cs.meta | 12 ++ Game 1/Assets/Scripts/Explosion.cs | 8 +- Game 1/Assets/Scripts/PlayerController.cs | 5 +- Game 1/Assets/Sprites.meta | 9 ++ 11 files changed, 227 insertions(+), 27 deletions(-) create mode 100644 Game 1/Assets/Scripts/AnimationEventFunctions.meta create mode 100644 Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs create mode 100644 Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs.meta create mode 100644 Game 1/Assets/Sprites.meta diff --git a/Game 1/Assets/Animations/Explosion.anim b/Game 1/Assets/Animations/Explosion.anim index 4727544..6463fb5 100644 --- a/Game 1/Assets/Animations/Explosion.anim +++ b/Game 1/Assets/Animations/Explosion.anim @@ -20,27 +20,27 @@ AnimationClip: - curve: - time: 0 value: {fileID: 21300000, guid: 881bd5958f68ce247b9a4f5efecbb941, type: 3} - - time: 0.1 + - time: 0.083333336 value: {fileID: 21300000, guid: d3a8897c2d6f8ce448f3ad959a265f74, type: 3} - - time: 0.2 + - time: 0.16666667 value: {fileID: 21300000, guid: a3ab2886f68aaeb45b9389f4cfac0552, type: 3} - - time: 0.3 + - time: 0.25 value: {fileID: 21300000, guid: 216dcb0bcaca0ca41a80571977743aa4, type: 3} - - time: 0.4 + - time: 0.33333334 value: {fileID: 21300000, guid: c447e916fd09fa64a9434fd8eb266c1f, type: 3} - - time: 0.5 + - time: 0.41666666 value: {fileID: 21300000, guid: 84c5fa4b9faddba478c05f6efa1caa97, type: 3} - - time: 0.6 + - time: 0.5 value: {fileID: 21300000, guid: 44c161753e16f9c42b4b66366d3bc056, type: 3} - - time: 0.7 + - time: 0.5833333 value: {fileID: 21300000, guid: cf25e726d7293e5408e59948fdf21884, type: 3} - - time: 0.8 + - time: 0.6666667 value: {fileID: 21300000, guid: 9583288c1726a0446b0e9d3f30047cbc, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 10 + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -69,12 +69,12 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.90000004 + m_StopTime: 0.75 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -89,4 +89,11 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_GenerateMotionCurves: 0 - m_Events: [] + m_Events: + - time: 0.75 + functionName: + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Game 1/Assets/Animations/Explosion.anim.meta b/Game 1/Assets/Animations/Explosion.anim.meta index a79ecb3..cfdac5b 100644 --- a/Game 1/Assets/Animations/Explosion.anim.meta +++ b/Game 1/Assets/Animations/Explosion.anim.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d33da4890b8c06245acb5521780c04e7 -timeCreated: 1504560403 +timeCreated: 1504642671 licenseType: Free NativeFormatImporter: mainObjectFileID: 7400000 diff --git a/Game 1/Assets/Animations/Explosion.controller b/Game 1/Assets/Animations/Explosion.controller index 33834e6..fb35adb 100644 --- a/Game 1/Assets/Animations/Explosion.controller +++ b/Game 1/Assets/Animations/Explosion.controller @@ -11,7 +11,7 @@ AnimatorController: m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer - m_StateMachine: {fileID: 1107124966039000128} + m_StateMachine: {fileID: 1107450737580238592} m_Mask: {fileID: 0} m_Motions: [] m_Behaviours: [] @@ -21,7 +21,28 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &1102155469024640798 +--- !u!1101 &1101774425169895672 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102864613521452634} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102044952823616290 AnimatorState: serializedVersion: 5 m_ObjectHideFlags: 1 @@ -30,6 +51,30 @@ AnimatorState: m_Name: Explosion m_Speed: 1 m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101774425169895672} + 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: d33da4890b8c06245acb5521780c04e7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: +--- !u!1102 &1102864613521452634 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Done + m_Speed: 0 + m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} @@ -44,7 +89,7 @@ AnimatorState: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: ---- !u!1107 &1107124966039000128 +--- !u!1107 &1107450737580238592 AnimatorStateMachine: serializedVersion: 5 m_ObjectHideFlags: 1 @@ -53,8 +98,11 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: 1102155469024640798} - m_Position: {x: 200, y: 0, z: 0} + m_State: {fileID: 1102044952823616290} + m_Position: {x: 300, y: 108, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102864613521452634} + m_Position: {x: 552, y: 108, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -64,4 +112,4 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102155469024640798} + m_DefaultState: {fileID: 1102044952823616290} diff --git a/Game 1/Assets/Animations/Explosion.controller.meta b/Game 1/Assets/Animations/Explosion.controller.meta index c89962a..2da98d5 100644 --- a/Game 1/Assets/Animations/Explosion.controller.meta +++ b/Game 1/Assets/Animations/Explosion.controller.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 546e5e4795abb4a4c8fe0394df79437d -timeCreated: 1504560404 +guid: 199880b47555b8643a17c2000501e0ea +timeCreated: 1504642671 licenseType: Free NativeFormatImporter: mainObjectFileID: 9100000 diff --git a/Game 1/Assets/Levels/Level 0.unity b/Game 1/Assets/Levels/Level 0.unity index 908070f..95b2195 100644 --- a/Game 1/Assets/Levels/Level 0.unity +++ b/Game 1/Assets/Levels/Level 0.unity @@ -11081,7 +11081,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: jumpPower: 15 - explosion: {fileID: 7400000, guid: d33da4890b8c06245acb5521780c04e7, type: 2} + explosion: {fileID: 0} --- !u!212 &440329286 SpriteRenderer: m_ObjectHideFlags: 0 @@ -23019,6 +23019,107 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1 &938413873 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 938413876} + - component: {fileID: 938413875} + - component: {fileID: 938413874} + - component: {fileID: 938413877} + m_Layer: 0 + m_Name: regularExplosion00 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &938413874 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 938413873} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 199880b47555b8643a17c2000501e0ea, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 +--- !u!212 &938413875 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 938413873} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 881bd5958f68ce247b9a4f5efecbb941, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!4 &938413876 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 938413873} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.930605, y: 1.2588631, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &938413877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 938413873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cb9d08b2b4f164d95fa992385774e9, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &945286658 GameObject: m_ObjectHideFlags: 0 diff --git a/Game 1/Assets/Scripts/AnimationEventFunctions.meta b/Game 1/Assets/Scripts/AnimationEventFunctions.meta new file mode 100644 index 0000000..f167a9a --- /dev/null +++ b/Game 1/Assets/Scripts/AnimationEventFunctions.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6972a0bb549a27a4a9b11f69d15a5119 +folderAsset: yes +timeCreated: 1504644409 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs b/Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs new file mode 100644 index 0000000..aa6fc8a --- /dev/null +++ b/Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DeleteOnComplete : MonoBehaviour { + + public DeleteOnComplete() + { + + } +} diff --git a/Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs.meta b/Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs.meta new file mode 100644 index 0000000..a6d09fd --- /dev/null +++ b/Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 62c625961f56be543920756f3b84d197 +timeCreated: 1504644420 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Scripts/Explosion.cs b/Game 1/Assets/Scripts/Explosion.cs index c7047df..8d745c7 100644 --- a/Game 1/Assets/Scripts/Explosion.cs +++ b/Game 1/Assets/Scripts/Explosion.cs @@ -4,13 +4,17 @@ using UnityEngine; public class Explosion : MonoBehaviour { + private Animator anim; + // Use this for initialization void Start () { - + anim = GetComponent(); } // Update is called once per frame void Update () { - + Debug.Log(anim.GetCurrentAnimatorStateInfo(0).tagHash); + //if (anim.GetCurrentAnimatorStateInfo(0).tagHash == 0) + // Destroy(gameObject); } } diff --git a/Game 1/Assets/Scripts/PlayerController.cs b/Game 1/Assets/Scripts/PlayerController.cs index b874572..30faebd 100644 --- a/Game 1/Assets/Scripts/PlayerController.cs +++ b/Game 1/Assets/Scripts/PlayerController.cs @@ -12,7 +12,7 @@ public class PlayerController : MonoBehaviour { // Use this for initialization void Start () { - explode = (AnimationClip)Instantiate(explosion, Camera.main.ScreenToWorldPoint(Input.mousePosition), Quaternion.identity); + // explode = (AnimationClip)Instantiate(explosion, Camera.main.ScreenToWorldPoint(Input.mousePosition), Quaternion.identity); } // Update is called once per frame @@ -25,8 +25,7 @@ public class PlayerController : MonoBehaviour { if (Input.GetMouseButtonDown(0)) { - //explode.Play; - Debug.Log("Explosion at: " + Input.mousePosition); + } } diff --git a/Game 1/Assets/Sprites.meta b/Game 1/Assets/Sprites.meta new file mode 100644 index 0000000..3eeaedb --- /dev/null +++ b/Game 1/Assets/Sprites.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1884be5a55d87e54689bff928b40ee6d +folderAsset: yes +timeCreated: 1504642159 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: From d4ed074352a9a9ff22640b4d2c9b81ce0833ddcb Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 5 Sep 2017 19:44:20 -0500 Subject: [PATCH 3/5] rockets and explosions --- Game 1/Assets/Animations/Explosion.anim | 4 +- Game 1/Assets/Animations/Explosion.controller | 48 -- Game 1/Assets/Levels/Level 0.unity | 494 ++++++++++-------- Game 1/Assets/Prefabs/Explosion.prefab | 55 +- Game 1/Assets/Prefabs/Explosion.prefab.meta | 4 +- Game 1/Assets/Prefabs/Rocket.prefab | 146 ++++++ Game 1/Assets/Prefabs/Rocket.prefab.meta | 9 + .../AnimEventFunctions.cs | 11 + ...ete.cs.meta => AnimEventFunctions.cs.meta} | 0 .../DeleteOnComplete.cs | 11 - Game 1/Assets/Scripts/Explosion.cs | 20 +- Game 1/Assets/Scripts/PlayerController.cs | 12 +- Game 1/Assets/Scripts/RocketController.cs | 38 ++ .../Assets/Scripts/RocketController.cs.meta | 12 + Game 1/Assets/Sprites.meta | 9 - Game 1/ProjectSettings/TagManager.asset | 2 +- 16 files changed, 567 insertions(+), 308 deletions(-) create mode 100644 Game 1/Assets/Prefabs/Rocket.prefab create mode 100644 Game 1/Assets/Prefabs/Rocket.prefab.meta create mode 100644 Game 1/Assets/Scripts/AnimationEventFunctions/AnimEventFunctions.cs rename Game 1/Assets/Scripts/AnimationEventFunctions/{DeleteOnComplete.cs.meta => AnimEventFunctions.cs.meta} (100%) delete mode 100644 Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs create mode 100644 Game 1/Assets/Scripts/RocketController.cs create mode 100644 Game 1/Assets/Scripts/RocketController.cs.meta delete mode 100644 Game 1/Assets/Sprites.meta diff --git a/Game 1/Assets/Animations/Explosion.anim b/Game 1/Assets/Animations/Explosion.anim index 6463fb5..e220575 100644 --- a/Game 1/Assets/Animations/Explosion.anim +++ b/Game 1/Assets/Animations/Explosion.anim @@ -90,8 +90,8 @@ AnimationClip: m_HasMotionFloatCurves: 0 m_GenerateMotionCurves: 0 m_Events: - - time: 0.75 - functionName: + - time: 0.5833333 + functionName: DeleteOnComplete data: objectReferenceParameter: {fileID: 0} floatParameter: 0 diff --git a/Game 1/Assets/Animations/Explosion.controller b/Game 1/Assets/Animations/Explosion.controller index fb35adb..dcca635 100644 --- a/Game 1/Assets/Animations/Explosion.controller +++ b/Game 1/Assets/Animations/Explosion.controller @@ -21,27 +21,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &1101774425169895672 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102864613521452634} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.6666666 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &1102044952823616290 AnimatorState: serializedVersion: 5 @@ -51,30 +30,6 @@ AnimatorState: m_Name: Explosion m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101774425169895672} - 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: d33da4890b8c06245acb5521780c04e7, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: ---- !u!1102 &1102864613521452634 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Done - m_Speed: 0 - m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} @@ -100,9 +55,6 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1102044952823616290} m_Position: {x: 300, y: 108, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102864613521452634} - m_Position: {x: 552, y: 108, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Game 1/Assets/Levels/Level 0.unity b/Game 1/Assets/Levels/Level 0.unity index 95b2195..242605f 100644 --- a/Game 1/Assets/Levels/Level 0.unity +++ b/Game 1/Assets/Levels/Level 0.unity @@ -11042,7 +11042,7 @@ GameObject: - component: {fileID: 440329285} - component: {fileID: 440329284} - component: {fileID: 440329288} - m_Layer: 0 + m_Layer: 8 m_Name: blocky m_TagString: Untagged m_Icon: {fileID: 0} @@ -11063,7 +11063,7 @@ Rigidbody2D: m_Mass: 1 m_LinearDrag: 0 m_AngularDrag: 0.05 - m_GravityScale: 5 + m_GravityScale: 4 m_Material: {fileID: 0} m_Interpolate: 0 m_SleepingMode: 1 @@ -11081,7 +11081,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: jumpPower: 15 - explosion: {fileID: 0} + rocketPrefab: {fileID: 1704205186022040, guid: 34e7aebb9fac79643b1a3450a3891e90, + type: 2} --- !u!212 &440329286 SpriteRenderer: m_ObjectHideFlags: 0 @@ -11136,7 +11137,7 @@ Transform: m_Children: - {fileID: 1521050879} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &440329288 BoxCollider2D: @@ -15405,52 +15406,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!1001 &629198292 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalPosition.x - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalPosition.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1146037055527736, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_Name - value: Floor (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_IsPrefabParent: 0 --- !u!1 &629388705 GameObject: m_ObjectHideFlags: 0 @@ -23019,107 +22974,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!1 &938413873 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 938413876} - - component: {fileID: 938413875} - - component: {fileID: 938413874} - - component: {fileID: 938413877} - m_Layer: 0 - m_Name: regularExplosion00 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!95 &938413874 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 938413873} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 199880b47555b8643a17c2000501e0ea, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 ---- !u!212 &938413875 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 938413873} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 881bd5958f68ce247b9a4f5efecbb941, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 ---- !u!4 &938413876 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 938413873} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.930605, y: 1.2588631, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &938413877 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 938413873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 93cb9d08b2b4f164d95fa992385774e9, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &945286658 GameObject: m_ObjectHideFlags: 0 @@ -25179,6 +25033,114 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1001 &1024968649 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalPosition.x + value: 6.61 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalPosition.y + value: 3.77 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1866320705803288, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_Name + value: Floor Slab MidLeft + objectReference: {fileID: 0} + - target: {fileID: 1263156782750720, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_Name + value: Floor Slab MidRight + objectReference: {fileID: 0} + - target: {fileID: 61527302635927084, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61019197741482430, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61153641053818090, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61168176574206006, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61527302635927084, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61019197741482430, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61153641053818090, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61168176574206006, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61020385707696216, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61020385707696216, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: -3.25 + objectReference: {fileID: 0} + - target: {fileID: 1146037055527736, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_Name + value: Floor (1) + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 61019197741482430, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + - {fileID: 61153641053818090, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + - {fileID: 61168176574206006, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + - {fileID: 61527302635927084, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1025685076 GameObject: m_ObjectHideFlags: 0 @@ -35914,7 +35876,7 @@ GameObject: - component: {fileID: 1521050877} - component: {fileID: 1521050876} - component: {fileID: 1521050875} - m_Layer: 0 + m_Layer: 8 m_Name: Main Camera m_TagString: MainCamera m_Icon: {fileID: 0} @@ -39745,9 +39707,71 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 1866320705803288, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_Name + value: Floor Slab MidLeft + objectReference: {fileID: 0} + - target: {fileID: 1263156782750720, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_Name + value: Floor Slab MidRight + objectReference: {fileID: 0} + - target: {fileID: 61527302635927084, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61019197741482430, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61153641053818090, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61168176574206006, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61527302635927084, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61019197741482430, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61153641053818090, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61168176574206006, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61020385707696216, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61020385707696216, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: -3.25 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 61019197741482430, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + - {fileID: 61153641053818090, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + - {fileID: 61168176574206006, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + - {fileID: 61527302635927084, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} m_IsPrefabParent: 0 --- !u!1 &1727294488 @@ -42897,56 +42921,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!1001 &1848171958 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalPosition.x - value: -3.527571 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalPosition.y - value: 0.9694656 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.z - value: -0.3826837 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.w - value: 0.9238795 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1146037055527736, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_Name - value: Floor (1) - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalEulerAnglesHint.z - value: -45.000004 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_IsPrefabParent: 0 --- !u!1 &1853391623 GameObject: m_ObjectHideFlags: 0 @@ -45006,6 +44980,118 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1001 &1928177339 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalPosition.x + value: -3.39 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalPosition.y + value: 1.79 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalRotation.z + value: -0.38268343 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalRotation.w + value: 0.92387956 + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1866320705803288, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_Name + value: Floor Slab MidLeft + objectReference: {fileID: 0} + - target: {fileID: 1263156782750720, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_Name + value: Floor Slab MidRight + objectReference: {fileID: 0} + - target: {fileID: 61527302635927084, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61019197741482430, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61153641053818090, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61168176574206006, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61527302635927084, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61019197741482430, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61153641053818090, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61168176574206006, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 61020385707696216, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 61020385707696216, guid: 37ac9a85e6d63c14fb94f09793c36676, + type: 2} + propertyPath: m_Offset.y + value: -3.25 + objectReference: {fileID: 0} + - target: {fileID: 1146037055527736, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_Name + value: Floor (2) + objectReference: {fileID: 0} + - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + propertyPath: m_LocalEulerAnglesHint.z + value: -45 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 61019197741482430, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + - {fileID: 61153641053818090, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + - {fileID: 61168176574206006, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + - {fileID: 61527302635927084, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1931100237 GameObject: m_ObjectHideFlags: 0 diff --git a/Game 1/Assets/Prefabs/Explosion.prefab b/Game 1/Assets/Prefabs/Explosion.prefab index e46e7cf..df39554 100644 --- a/Game 1/Assets/Prefabs/Explosion.prefab +++ b/Game 1/Assets/Prefabs/Explosion.prefab @@ -9,18 +9,20 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1584202889639542} + m_RootGameObject: {fileID: 1183751695519662} m_IsPrefabParent: 1 ---- !u!1 &1584202889639542 +--- !u!1 &1183751695519662 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4294117729170242} - - component: {fileID: 212637867282857650} - - component: {fileID: 95900756836741872} + - component: {fileID: 4224959689937078} + - component: {fileID: 212754038393971786} + - component: {fileID: 95598204179832612} + - component: {fileID: 114562294083830174} + - component: {fileID: 114448192127375214} m_Layer: 0 m_Name: Explosion m_TagString: Untagged @@ -28,29 +30,29 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4294117729170242 +--- !u!4 &4224959689937078 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1584202889639542} + m_GameObject: {fileID: 1183751695519662} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: -2, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 4.18, y: -1.481241, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &95900756836741872 +--- !u!95 &95598204179832612 Animator: serializedVersion: 3 m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1584202889639542} + m_GameObject: {fileID: 1183751695519662} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 546e5e4795abb4a4c8fe0394df79437d, type: 2} + m_Controller: {fileID: 9100000, guid: 199880b47555b8643a17c2000501e0ea, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -58,12 +60,35 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 ---- !u!212 &212637867282857650 +--- !u!114 &114448192127375214 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1183751695519662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62c625961f56be543920756f3b84d197, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114562294083830174 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1183751695519662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cb9d08b2b4f164d95fa992385774e9, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!212 &212754038393971786 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1584202889639542} + m_GameObject: {fileID: 1183751695519662} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -89,7 +114,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: 881bd5958f68ce247b9a4f5efecbb941, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Game 1/Assets/Prefabs/Explosion.prefab.meta b/Game 1/Assets/Prefabs/Explosion.prefab.meta index a98ff15..dcffed6 100644 --- a/Game 1/Assets/Prefabs/Explosion.prefab.meta +++ b/Game 1/Assets/Prefabs/Explosion.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: a1abe71ed18e0fb48af6d7851ad2146e -timeCreated: 1504560651 +guid: 5fb9f5ec9fd5a3e408f63285d4eddf7d +timeCreated: 1504652977 licenseType: Free NativeFormatImporter: mainObjectFileID: 100100000 diff --git a/Game 1/Assets/Prefabs/Rocket.prefab b/Game 1/Assets/Prefabs/Rocket.prefab new file mode 100644 index 0000000..9a22cf8 --- /dev/null +++ b/Game 1/Assets/Prefabs/Rocket.prefab @@ -0,0 +1,146 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1704205186022040} + m_IsPrefabParent: 1 +--- !u!1 &1704205186022040 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4430175170869306} + - component: {fileID: 212087158994003038} + - component: {fileID: 50380909930719022} + - component: {fileID: 114447255421982072} + - component: {fileID: 61260587973320418} + m_Layer: 0 + m_Name: Rocket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4430175170869306 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1704205186022040} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &50380909930719022 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1704205186022040} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 1 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!61 &61260587973320418 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1704205186022040} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.6, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.5625, y: 0.390625} + newSize: {x: 1.5625, y: 0.390625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.21, y: 0.21} + m_EdgeRadius: 0 +--- !u!114 &114447255421982072 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1704205186022040} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38c418fc426cea441a9f41f0771ec5c8, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} + explosionPrefab: {fileID: 1183751695519662, guid: 5fb9f5ec9fd5a3e408f63285d4eddf7d, + type: 2} +--- !u!212 &212087158994003038 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1704205186022040} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: f23de763eab733a4c84fe2ee17c95f32, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.5625, y: 0.390625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/Game 1/Assets/Prefabs/Rocket.prefab.meta b/Game 1/Assets/Prefabs/Rocket.prefab.meta new file mode 100644 index 0000000..4a08112 --- /dev/null +++ b/Game 1/Assets/Prefabs/Rocket.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 34e7aebb9fac79643b1a3450a3891e90 +timeCreated: 1504654990 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Scripts/AnimationEventFunctions/AnimEventFunctions.cs b/Game 1/Assets/Scripts/AnimationEventFunctions/AnimEventFunctions.cs new file mode 100644 index 0000000..20317e1 --- /dev/null +++ b/Game 1/Assets/Scripts/AnimationEventFunctions/AnimEventFunctions.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AnimEventFunctions : MonoBehaviour { + + public void DeleteOnComplete() + { + Destroy(gameObject); + } +} diff --git a/Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs.meta b/Game 1/Assets/Scripts/AnimationEventFunctions/AnimEventFunctions.cs.meta similarity index 100% rename from Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs.meta rename to Game 1/Assets/Scripts/AnimationEventFunctions/AnimEventFunctions.cs.meta diff --git a/Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs b/Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs deleted file mode 100644 index aa6fc8a..0000000 --- a/Game 1/Assets/Scripts/AnimationEventFunctions/DeleteOnComplete.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class DeleteOnComplete : MonoBehaviour { - - public DeleteOnComplete() - { - - } -} diff --git a/Game 1/Assets/Scripts/Explosion.cs b/Game 1/Assets/Scripts/Explosion.cs index 8d745c7..5cacdf8 100644 --- a/Game 1/Assets/Scripts/Explosion.cs +++ b/Game 1/Assets/Scripts/Explosion.cs @@ -4,17 +4,17 @@ using UnityEngine; public class Explosion : MonoBehaviour { - private Animator anim; + public PlayerController player; + private float MAX_PLAYER_DIST = 3.0f; - // Use this for initialization void Start () { - anim = GetComponent(); - } - - // Update is called once per frame - void Update () { - Debug.Log(anim.GetCurrentAnimatorStateInfo(0).tagHash); - //if (anim.GetCurrentAnimatorStateInfo(0).tagHash == 0) - // Destroy(gameObject); + Vector3 playerPos = player.transform.position; + float dist = (playerPos - transform.position).magnitude; + if (dist < MAX_PLAYER_DIST) + { + Rigidbody2D playerBody = player.GetComponent(); + Vector2 force = (playerPos - transform.position).normalized * (MAX_PLAYER_DIST - dist) * 15.0f; + playerBody.AddForce(force, ForceMode2D.Impulse); + } } } diff --git a/Game 1/Assets/Scripts/PlayerController.cs b/Game 1/Assets/Scripts/PlayerController.cs index 30faebd..13548e3 100644 --- a/Game 1/Assets/Scripts/PlayerController.cs +++ b/Game 1/Assets/Scripts/PlayerController.cs @@ -7,12 +7,11 @@ using UnityEngine; public class PlayerController : MonoBehaviour { public float jumpPower; - public AnimationClip explosion; - private AnimationClip explode; + public GameObject rocketPrefab; // Use this for initialization void Start () { - // explode = (AnimationClip)Instantiate(explosion, Camera.main.ScreenToWorldPoint(Input.mousePosition), Quaternion.identity); + } // Update is called once per frame @@ -25,8 +24,9 @@ public class PlayerController : MonoBehaviour { if (Input.GetMouseButtonDown(0)) { - - } - + Vector2 rocketPos = transform.position; + GameObject rocket = Instantiate(rocketPrefab, rocketPos, Quaternion.identity); + rocket.GetComponent().player = this; + } } } diff --git a/Game 1/Assets/Scripts/RocketController.cs b/Game 1/Assets/Scripts/RocketController.cs new file mode 100644 index 0000000..b5c9b29 --- /dev/null +++ b/Game 1/Assets/Scripts/RocketController.cs @@ -0,0 +1,38 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RocketController : MonoBehaviour { + + public PlayerController player; + public GameObject explosionPrefab; + private float ROCKET_SPEED = 20.0f; + + private void Start() + { + Vector2 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition); + Vector2 playerPos = player.transform.position; + Vector2 rocketDir = (mousePos - playerPos).normalized; + float angle = Mathf.Atan2(rocketDir.y, rocketDir.x) * Mathf.Rad2Deg; + Quaternion rotation = Quaternion.AngleAxis(angle, Vector3.forward); + transform.rotation = rotation; + Rigidbody2D rocketBody = GetComponent(); + Vector2 force = rocketDir * ROCKET_SPEED; + rocketBody.AddForce(force, ForceMode2D.Impulse); + } + + void OnCollisionEnter2D(Collision2D collision) + { + if (collision.gameObject.layer == LayerMask.NameToLayer("Player")) + { + Debug.Log("Player Collision Detected"); + return; + } + + Vector3 explosionPos = transform.position; + explosionPos.z = 0; + GameObject explosion = Instantiate(explosionPrefab, explosionPos, Quaternion.identity); + explosion.GetComponent().player = player; + Destroy(gameObject); + } +} diff --git a/Game 1/Assets/Scripts/RocketController.cs.meta b/Game 1/Assets/Scripts/RocketController.cs.meta new file mode 100644 index 0000000..7d2215f --- /dev/null +++ b/Game 1/Assets/Scripts/RocketController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 38c418fc426cea441a9f41f0771ec5c8 +timeCreated: 1504654288 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Sprites.meta b/Game 1/Assets/Sprites.meta deleted file mode 100644 index 3eeaedb..0000000 --- a/Game 1/Assets/Sprites.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 1884be5a55d87e54689bff928b40ee6d -folderAsset: yes -timeCreated: 1504642159 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game 1/ProjectSettings/TagManager.asset b/Game 1/ProjectSettings/TagManager.asset index 1c92a78..4459eeb 100644 --- a/Game 1/ProjectSettings/TagManager.asset +++ b/Game 1/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - UI - - - - + - Player - - - From e31811e4e6d3544a96e9a82151040a9905f4745a Mon Sep 17 00:00:00 2001 From: darrelmarek Date: Tue, 5 Sep 2017 20:11:49 -0500 Subject: [PATCH 4/5] Camera movement + Win condition --- Game 1/Assets/Levels/Level 0.unity | 354 +++++++++++++++++- Game 1/Assets/Scripts/CameraController.cs | 31 ++ .../Assets/Scripts/CameraController.cs.meta | 12 + Game 1/Assets/Scripts/PlayerController.cs | 14 +- Game 1/ProjectSettings/ProjectVersion.txt | 2 +- Game 1/ProjectSettings/TagManager.asset | 3 +- 6 files changed, 406 insertions(+), 10 deletions(-) create mode 100644 Game 1/Assets/Scripts/CameraController.cs create mode 100644 Game 1/Assets/Scripts/CameraController.cs.meta diff --git a/Game 1/Assets/Levels/Level 0.unity b/Game 1/Assets/Levels/Level 0.unity index 908070f..de5477b 100644 --- a/Game 1/Assets/Levels/Level 0.unity +++ b/Game 1/Assets/Levels/Level 0.unity @@ -5120,6 +5120,80 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1 &193095712 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 193095713} + - component: {fileID: 193095715} + - component: {fileID: 193095714} + m_Layer: 5 + m_Name: Win Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &193095713 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 193095712} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 686575755} + m_RootOrder: 0 + 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, y: 50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &193095714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 193095712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: You win +--- !u!222 &193095715 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 193095712} --- !u!1 &193805803 GameObject: m_ObjectHideFlags: 0 @@ -11082,6 +11156,7 @@ MonoBehaviour: m_EditorClassIdentifier: jumpPower: 15 explosion: {fileID: 7400000, guid: d33da4890b8c06245acb5521780c04e7, type: 2} + winText: {fileID: 193095714} --- !u!212 &440329286 SpriteRenderer: m_ObjectHideFlags: 0 @@ -11133,8 +11208,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1521050879} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -15442,7 +15516,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1146037055527736, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_Name @@ -16744,6 +16818,100 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1 &686575751 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 686575755} + - component: {fileID: 686575754} + - component: {fileID: 686575753} + - component: {fileID: 686575752} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &686575752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 686575751} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &686575753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 686575751} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &686575754 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 686575751} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &686575755 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 686575751} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 193095713} + m_Father: {fileID: 0} + m_RootOrder: 7 + 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_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &687115023 GameObject: m_ObjectHideFlags: 0 @@ -35809,6 +35977,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 1521050879} + - component: {fileID: 1521050880} - component: {fileID: 1521050878} - component: {fileID: 1521050877} - component: {fileID: 1521050876} @@ -35887,9 +36056,21 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 440329287} - m_RootOrder: 0 + m_Father: {fileID: 0} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1521050880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1521050874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 82066df26cc71bd46bc0762b0aba7372, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 440329283} --- !u!1 &1530641700 GameObject: m_ObjectHideFlags: 0 @@ -39323,6 +39504,103 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1 &1704683067 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1704683070} + - component: {fileID: 1704683069} + - component: {fileID: 1704683068} + m_Layer: 0 + m_Name: New Sprite + m_TagString: Finish Line + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1704683068 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1704683067} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &1704683069 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1704683067} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 339ca306d1d13334db5b13ba52419216, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 1 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!4 &1704683070 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1704683067} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.05, y: 6.01, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1709374497 GameObject: m_ObjectHideFlags: 0 @@ -39644,7 +39922,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} @@ -42833,7 +43111,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1146037055527736, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_Name @@ -45521,6 +45799,68 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1 &1951225743 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1951225746} + - component: {fileID: 1951225745} + - component: {fileID: 1951225744} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1951225744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1951225743} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1951225745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1951225743} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &1951225746 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1951225743} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1953146116 GameObject: m_ObjectHideFlags: 0 diff --git a/Game 1/Assets/Scripts/CameraController.cs b/Game 1/Assets/Scripts/CameraController.cs new file mode 100644 index 0000000..e2592ff --- /dev/null +++ b/Game 1/Assets/Scripts/CameraController.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CameraController : MonoBehaviour { + + public GameObject player; + + private int offset; + private Vector3 newPosition; + + private int minX, maxX, minY, maxY; + + void Start () { + offset = transform.position.y - player.transform.position.y; + minX = 0; + maxX = 0; + minY = 0; + maxY = 18; + } + + void LateUpdate () { + newPosition = player.transform.position + offset; + + //if(newPosition.x >= minX && newPosition.x <= maxX && newPosition.y >= minY && newPosition.y <= maxY) + if(newPosition.x >= minX && newPosition.x <= maxX && newPosition.y >= minY && newPosition.y <= maxY) + + transform.position = newPosition; + + } +} diff --git a/Game 1/Assets/Scripts/CameraController.cs.meta b/Game 1/Assets/Scripts/CameraController.cs.meta new file mode 100644 index 0000000..32ab67f --- /dev/null +++ b/Game 1/Assets/Scripts/CameraController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 82066df26cc71bd46bc0762b0aba7372 +timeCreated: 1504643500 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Scripts/PlayerController.cs b/Game 1/Assets/Scripts/PlayerController.cs index 54e2dbd..ce38fa6 100644 --- a/Game 1/Assets/Scripts/PlayerController.cs +++ b/Game 1/Assets/Scripts/PlayerController.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; // Simple script for a test I need to do @@ -10,9 +11,12 @@ public class PlayerController : MonoBehaviour { public AnimationClip explosion; private AnimationClip explode; + public Text winText; + // Use this for initialization void Start () { explode = (AnimationClip)Instantiate(explosion, Camera.main.ScreenToWorldPoint(Input.mousePosition), Quaternion.identity); + winText.text = ""; } // Update is called once per frame @@ -25,9 +29,17 @@ public class PlayerController : MonoBehaviour { if (Input.GetMouseButtonDown(0)) { - explode.Play(); + //explode.Play(); Debug.Log("Explosion at: " + Input.mousePosition); } } + + void OnTriggerEnter2D(Collider2D other) + { + //Check the provided Collider2D parameter other to see if it is tagged "PickUp", if it is... + if (other.gameObject.CompareTag ("Finish Line")) { + winText.text = "You Win!"; + } + } } diff --git a/Game 1/ProjectSettings/ProjectVersion.txt b/Game 1/ProjectSettings/ProjectVersion.txt index a211ccd..ca1aa05 100644 --- a/Game 1/ProjectSettings/ProjectVersion.txt +++ b/Game 1/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.1.1f1 +m_EditorVersion: 2017.1.0f3 diff --git a/Game 1/ProjectSettings/TagManager.asset b/Game 1/ProjectSettings/TagManager.asset index 1c92a78..aa01778 100644 --- a/Game 1/ProjectSettings/TagManager.asset +++ b/Game 1/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Finish Line layers: - Default - TransparentFX From 63a6166683a96117d68c6a10ce668a44ff079eb1 Mon Sep 17 00:00:00 2001 From: darrelmarek Date: Tue, 5 Sep 2017 20:15:43 -0500 Subject: [PATCH 5/5] Fixed camera --- Game 1/Assets/Scripts/CameraController.cs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Game 1/Assets/Scripts/CameraController.cs b/Game 1/Assets/Scripts/CameraController.cs index e2592ff..233a372 100644 --- a/Game 1/Assets/Scripts/CameraController.cs +++ b/Game 1/Assets/Scripts/CameraController.cs @@ -6,25 +6,24 @@ public class CameraController : MonoBehaviour { public GameObject player; - private int offset; + private Vector3 offset; private Vector3 newPosition; - private int minX, maxX, minY, maxY; + private float minX, maxX, minY, maxY; void Start () { - offset = transform.position.y - player.transform.position.y; - minX = 0; - maxX = 0; - minY = 0; - maxY = 18; + offset = transform.position - player.transform.position; + + minX = 0.0f; + maxX = 0.0f; + minY = 0.0f; + maxY = 18.0f; } void LateUpdate () { newPosition = player.transform.position + offset; - //if(newPosition.x >= minX && newPosition.x <= maxX && newPosition.y >= minY && newPosition.y <= maxY) if(newPosition.x >= minX && newPosition.x <= maxX && newPosition.y >= minY && newPosition.y <= maxY) - transform.position = newPosition; }