From 89b571f65d5f79bc8c1b15bd9b4583491f0555e7 Mon Sep 17 00:00:00 2001 From: dyllandry Date: Sun, 3 Jul 2016 19:01:38 -0400 Subject: [PATCH 1/4] Momentary Commit --- djGame/Assembly-CSharp.csproj | 1 + djGame/Assets/Resources/EmptyHeart.png | Bin 0 -> 384 bytes djGame/Assets/Resources/EmptyHeart.png.meta | 57 +++ djGame/Assets/Resources/Heart.png | Bin 0 -> 379 bytes djGame/Assets/Resources/Heart.png.meta | 57 +++ djGame/Assets/scenes/test_scene.unity | 377 +++++++++++++++++- djGame/Assets/scripts/HealthController.cs | 41 ++ .../Assets/scripts/HealthController.cs.meta | 12 + djGame/Assets/scripts/PlayerController.cs | 11 + djGame/Assets/sprites/Obstacle.png.meta | 2 +- djGame/Assets/sprites/Surface.png.meta | 2 +- 11 files changed, 557 insertions(+), 3 deletions(-) create mode 100644 djGame/Assets/Resources/EmptyHeart.png create mode 100644 djGame/Assets/Resources/EmptyHeart.png.meta create mode 100644 djGame/Assets/Resources/Heart.png create mode 100644 djGame/Assets/Resources/Heart.png.meta create mode 100644 djGame/Assets/scripts/HealthController.cs create mode 100644 djGame/Assets/scripts/HealthController.cs.meta diff --git a/djGame/Assembly-CSharp.csproj b/djGame/Assembly-CSharp.csproj index f28c8a1..229af63 100644 --- a/djGame/Assembly-CSharp.csproj +++ b/djGame/Assembly-CSharp.csproj @@ -47,6 +47,7 @@ + diff --git a/djGame/Assets/Resources/EmptyHeart.png b/djGame/Assets/Resources/EmptyHeart.png new file mode 100644 index 0000000000000000000000000000000000000000..4df4d9606d81bc83fcfd24d89b7bb325f9e3e4b6 GIT binary patch literal 384 zcmV-`0e}99P)-@25Jmr*^t2S#5u9uI4&fdgf_pf3;2K;37n*eHY>y{$kt_o-i?o7_UHDfT;OjrF zG!g<{dg;L;Zg}tSUY5qx+&*+&rRg~2B_bJs&F^{MKWm+f0*UpC0HrZCoA*UA>b$WQ zt#cxT(hmAu6#)LH3Ui0pWChlQ2%Vtf6s!Re z3ZDg73K0_?1W1L54UYoQLTJLH0b(Jv;VOU-L`t|CK!QjO2LktkISv1SQ^IHO1sVuI ee`y&4JX|-Z`z`!$r80v600000fhdEP)BI)D}1n$fjHi zIuQV@#mEo!19K{O$_AJl>?B?TODi3K2viiH)w0Z@-l!;mnE>bObsFH%b<`T;H;s|3 z#qaF~d%tIgH(EnqE`vSfv(`X#6lRFqK|gB*fY*#d=n$J6fh8egCn!4wOF+cJg8*|O zQo^GExe%%0NdQs^Nq90qDugs#1Q3JB2^Rx!5V_$%Z002ovPDHLkV1mA=p|b!0 literal 0 HcmV?d00001 diff --git a/djGame/Assets/Resources/Heart.png.meta b/djGame/Assets/Resources/Heart.png.meta new file mode 100644 index 0000000..554e81a --- /dev/null +++ b/djGame/Assets/Resources/Heart.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 4fc3512d2fda74d8da4dbf1e5119abe2 +timeCreated: 1467584613 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + 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: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/djGame/Assets/scenes/test_scene.unity b/djGame/Assets/scenes/test_scene.unity index 259907a..8feca3d 100644 --- a/djGame/Assets/scenes/test_scene.unity +++ b/djGame/Assets/scenes/test_scene.unity @@ -129,6 +129,101 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 +--- !u!1 &150709536 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 150709540} + - 223: {fileID: 150709539} + - 114: {fileID: 150709538} + - 114: {fileID: 150709537} + m_Layer: 5 + m_Name: Health + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &150709537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 150709536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &150709538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 150709536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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 &150709539 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 150709536} + m_Enabled: 1 + serializedVersion: 2 + 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_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &150709540 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 150709536} + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 274008728} + - {fileID: 432161708} + - {fileID: 1434662694} + m_Father: {fileID: 0} + m_RootOrder: 5 + 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 &156225565 GameObject: m_ObjectHideFlags: 0 @@ -191,6 +286,142 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 +--- !u!1 &274008727 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 274008728} + - 222: {fileID: 274008730} + - 114: {fileID: 274008729} + m_Layer: 5 + m_Name: Heart 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &274008728 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 274008727} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 150709540} + m_RootOrder: 0 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -50, y: 220} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &274008729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 274008727} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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_Sprite: {fileID: 21300000, guid: 4fc3512d2fda74d8da4dbf1e5119abe2, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &274008730 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 274008727} +--- !u!1 &432161707 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 432161708} + - 222: {fileID: 432161710} + - 114: {fileID: 432161709} + m_Layer: 5 + m_Name: Heart 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &432161708 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 432161707} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 150709540} + m_RootOrder: 1 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 220} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &432161709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 432161707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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_Sprite: {fileID: 21300000, guid: 4fc3512d2fda74d8da4dbf1e5119abe2, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &432161710 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 432161707} --- !u!1 &963627605 GameObject: m_ObjectHideFlags: 0 @@ -372,7 +603,8 @@ MonoBehaviour: groundPointRadius: 0.01 groundMask: serializedVersion: 2 - m_Bits: 256 + m_Bits: 0 + scoreObject: {fileID: 2036509773} --- !u!50 &1000382898 Rigidbody2D: serializedVersion: 2 @@ -432,6 +664,136 @@ Transform: m_Children: [] m_Father: {fileID: 1000382896} m_RootOrder: 0 +--- !u!1 &1434662693 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1434662694} + - 222: {fileID: 1434662696} + - 114: {fileID: 1434662695} + m_Layer: 5 + m_Name: Heart 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1434662694 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1434662693} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 150709540} + m_RootOrder: 2 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 50, y: 220} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1434662695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1434662693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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_Sprite: {fileID: 21300000, guid: 4fc3512d2fda74d8da4dbf1e5119abe2, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1434662696 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1434662693} +--- !u!1 &1799111744 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1799111747} + - 114: {fileID: 1799111746} + - 114: {fileID: 1799111745} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1799111745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1799111744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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 &1799111746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1799111744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &1799111747 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1799111744} + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 --- !u!1 &2036509773 GameObject: m_ObjectHideFlags: 0 @@ -441,6 +803,7 @@ GameObject: m_Component: - 4: {fileID: 2036509775} - 132: {fileID: 2036509774} + - 114: {fileID: 2036509776} m_Layer: 0 m_Name: Score Text m_TagString: Untagged @@ -484,3 +847,15 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 +--- !u!114 &2036509776 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2036509773} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc5123a07fe7c4648acecabc0dead047, type: 3} + m_Name: + m_EditorClassIdentifier: + scoreRate: 0 diff --git a/djGame/Assets/scripts/HealthController.cs b/djGame/Assets/scripts/HealthController.cs new file mode 100644 index 0000000..fad50a2 --- /dev/null +++ b/djGame/Assets/scripts/HealthController.cs @@ -0,0 +1,41 @@ +using UnityEngine; +using UnityEngine.UI; +using System.Collections; + +public class HealthController : MonoBehaviour { + + private int health = 3; + + public void GiveHealth(){ + health++; + UpdateHealth (); + } + + public void LoseHealth(){ + health--; + UpdateHealth (); + } + + private void UpdateHealth(){ + switch (health) { + case 1: + gameObject.transform.GetChild (0).GetComponent ().sprite = (Sprite)Resources.Load ("Heart"); + gameObject.transform.GetChild (1).GetComponent ().sprite = (Sprite)Resources.Load ("Empty Heart"); + gameObject.transform.GetChild (2).GetComponent ().sprite = (Sprite)Resources.Load ("Empty Heart"); + break; + + case 2: + gameObject.transform.GetChild (0).GetComponent ().sprite = (Sprite)Resources.Load ("Heart"); + gameObject.transform.GetChild (1).GetComponent ().sprite = (Sprite)Resources.Load ("Heart"); + gameObject.transform.GetChild (2).GetComponent ().sprite = (Sprite)Resources.Load ("Empty Heart"); + break; + + case 3: + gameObject.transform.GetChild (0).GetComponent ().sprite = (Sprite)Resources.Load ("Heart"); + gameObject.transform.GetChild (1).GetComponent ().sprite = (Sprite)Resources.Load ("Heart"); + gameObject.transform.GetChild (2).GetComponent ().sprite = (Sprite)Resources.Load ("Heart"); + break; + } + } + +} diff --git a/djGame/Assets/scripts/HealthController.cs.meta b/djGame/Assets/scripts/HealthController.cs.meta new file mode 100644 index 0000000..22b54dc --- /dev/null +++ b/djGame/Assets/scripts/HealthController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: de81c38f1baa04d48b725309c1e7967f +timeCreated: 1467585220 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/djGame/Assets/scripts/PlayerController.cs b/djGame/Assets/scripts/PlayerController.cs index b4173fe..291dd94 100644 --- a/djGame/Assets/scripts/PlayerController.cs +++ b/djGame/Assets/scripts/PlayerController.cs @@ -29,12 +29,19 @@ public class PlayerController : MonoBehaviour public GameObject scoreObject; private ScoreController score; + public GameObject Health; + private HealthController healthController; + + void Start () { rb2D = GetComponent (); + score = scoreObject.GetComponent (); score.SetScoreRate (10); + + healthController = Health.GetComponent (); } void Update () @@ -53,6 +60,7 @@ void JumpControl () isGrounded = Physics2D.OverlapCircle (groundPoint.position, groundPointRadius, groundMask); //Jumping controls. + print(isGrounded); if (Input.GetKeyDown (KeyCode.Space) && isGrounded) { rb2D.AddForce (new Vector2 (0, jumpHeight)); @@ -66,6 +74,9 @@ void OnTriggerEnter2D (Collider2D other) chunkController.PlayerCollision (); collision = true; score.PauseScore (); + + healthController.LoseHealth (); + } } diff --git a/djGame/Assets/sprites/Obstacle.png.meta b/djGame/Assets/sprites/Obstacle.png.meta index 81a7e1c..35e652c 100644 --- a/djGame/Assets/sprites/Obstacle.png.meta +++ b/djGame/Assets/sprites/Obstacle.png.meta @@ -26,7 +26,7 @@ TextureImporter: cubemapConvolutionSteps: 7 cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 2048 textureSettings: filterMode: -1 diff --git a/djGame/Assets/sprites/Surface.png.meta b/djGame/Assets/sprites/Surface.png.meta index b191162..cb816f2 100644 --- a/djGame/Assets/sprites/Surface.png.meta +++ b/djGame/Assets/sprites/Surface.png.meta @@ -26,7 +26,7 @@ TextureImporter: cubemapConvolutionSteps: 7 cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 2048 textureSettings: filterMode: -1 From fbd0d188d869941aa690b8c8810419ff7eaa77c3 Mon Sep 17 00:00:00 2001 From: dyllandry Date: Sun, 3 Jul 2016 19:16:52 -0400 Subject: [PATCH 2/4] Momentary Commit --- djGame/Assets/scenes/test_scene.unity | 37 ++++++++++++++++++--------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/djGame/Assets/scenes/test_scene.unity b/djGame/Assets/scenes/test_scene.unity index 8feca3d..2a3bd76 100644 --- a/djGame/Assets/scenes/test_scene.unity +++ b/djGame/Assets/scenes/test_scene.unity @@ -140,6 +140,7 @@ GameObject: - 223: {fileID: 150709539} - 114: {fileID: 150709538} - 114: {fileID: 150709537} + - 114: {fileID: 150709541} m_Layer: 5 m_Name: Health m_TagString: Untagged @@ -224,6 +225,17 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &150709541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 150709536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de81c38f1baa04d48b725309c1e7967f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &156225565 GameObject: m_ObjectHideFlags: 0 @@ -311,15 +323,15 @@ RectTransform: m_GameObject: {fileID: 274008727} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 150709540} m_RootOrder: 0 m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -50, y: 220} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -245, y: 229.7} + m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &274008729 MonoBehaviour: @@ -379,15 +391,15 @@ RectTransform: m_GameObject: {fileID: 432161707} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 150709540} m_RootOrder: 1 m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 220} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -210, y: 229.7} + m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &432161709 MonoBehaviour: @@ -580,7 +592,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1000382893} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.14, z: 0} + m_LocalPosition: {x: 0, y: 0.19, z: 0} m_LocalScale: {x: 4, y: 4, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: @@ -603,8 +615,9 @@ MonoBehaviour: groundPointRadius: 0.01 groundMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 256 scoreObject: {fileID: 2036509773} + Health: {fileID: 150709536} --- !u!50 &1000382898 Rigidbody2D: serializedVersion: 2 @@ -689,15 +702,15 @@ RectTransform: m_GameObject: {fileID: 1434662693} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 150709540} m_RootOrder: 2 m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: 220} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -175, y: 229.7} + m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1434662695 MonoBehaviour: @@ -841,7 +854,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2036509773} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalPosition: {x: 0, y: 0.93, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] From ae4ed6eb90af8ef5f94506992db66fea9ce90aa7 Mon Sep 17 00:00:00 2001 From: dyllandry Date: Mon, 4 Jul 2016 13:35:41 -0400 Subject: [PATCH 3/4] sharp.csproj include --- djGame/Assembly-CSharp.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/djGame/Assembly-CSharp.csproj b/djGame/Assembly-CSharp.csproj index 229af63..1871554 100644 --- a/djGame/Assembly-CSharp.csproj +++ b/djGame/Assembly-CSharp.csproj @@ -50,6 +50,7 @@ + /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll From 2c6bf87f6592bb307f79fd17e129a397d0dac10c Mon Sep 17 00:00:00 2001 From: dyllandry Date: Mon, 4 Jul 2016 14:13:35 -0400 Subject: [PATCH 4/4] Added + or - Score Methods to ScoreController MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I think health is good to go at this point. I don’t think that when you die we want to change scenes just yet, there is no reason to, but at least or right now it adds some closure to the game and a way to restart it. --- djGame/Assets/scripts/ScoreController.cs | 28 +++++++++++++++--------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/djGame/Assets/scripts/ScoreController.cs b/djGame/Assets/scripts/ScoreController.cs index f665620..e9082e9 100644 --- a/djGame/Assets/scripts/ScoreController.cs +++ b/djGame/Assets/scripts/ScoreController.cs @@ -12,31 +12,39 @@ public class ScoreController : MonoBehaviour { - public int scoreRate; - private float score; + public int scoreRate = 0; + private float score = 0; private bool pause = false; - void Start () - { + void Update () + { + IncrementScore (); + UpdateScore (); + } + public void IncreaseScore (int amount) + { + score += amount; } - void Update () - { - IncrementScore (); + public void DescreaseScore (int amount) + { + score -= amount; + if (score < 0) { + score = 0; + } } void IncrementScore () { - if (scoreRate != null && !pause) { + if (!pause) { score += scoreRate * Time.deltaTime; - UpdateScore (); } } void UpdateScore () { - gameObject.GetComponent ().text = "Score: " + Mathf.Round (score).ToString(); + gameObject.GetComponent ().text = "Score: " + Mathf.Round (score).ToString (); } public void PauseScore ()