From 19844c037973efbc93a308d4b03bab7587bccd56 Mon Sep 17 00:00:00 2001 From: Jack Rus Date: Sat, 1 Feb 2020 20:32:24 -0500 Subject: [PATCH 1/2] completed health and stamikna script --- Assets/HealthScript.cs | 18 ++ Assets/HealthScript.cs.meta | 11 + Assets/PlayerContact.cs | 20 ++ Assets/PlayerContact.cs.meta | 11 + Assets/Prefabs/Coffee.prefab | 49 ++++ Assets/Prefabs/Pizza.prefab | 63 +++++ Assets/Scenes/LevelOne.unity | 425 ++++++++++++++++++++++++++++-- Assets/Scripts/Player.cs | 50 +++- Assets/Sprites/Hud/Heart.png.meta | 2 +- ProjectSettings/TagManager.asset | 4 +- 10 files changed, 624 insertions(+), 29 deletions(-) create mode 100644 Assets/HealthScript.cs create mode 100644 Assets/HealthScript.cs.meta create mode 100644 Assets/PlayerContact.cs create mode 100644 Assets/PlayerContact.cs.meta diff --git a/Assets/HealthScript.cs b/Assets/HealthScript.cs new file mode 100644 index 0000000..a9ef463 --- /dev/null +++ b/Assets/HealthScript.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HealthScript : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/HealthScript.cs.meta b/Assets/HealthScript.cs.meta new file mode 100644 index 0000000..7044fe0 --- /dev/null +++ b/Assets/HealthScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3c2b1c10b368d1641bef76c6874131de +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PlayerContact.cs b/Assets/PlayerContact.cs new file mode 100644 index 0000000..2be5f21 --- /dev/null +++ b/Assets/PlayerContact.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerContact : MonoBehaviour +{ + public Player player; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/PlayerContact.cs.meta b/Assets/PlayerContact.cs.meta new file mode 100644 index 0000000..13a5a3b --- /dev/null +++ b/Assets/PlayerContact.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 47ff2cdf170756a4792387a95db53a5f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Coffee.prefab b/Assets/Prefabs/Coffee.prefab index 051040a..ab02dee 100644 --- a/Assets/Prefabs/Coffee.prefab +++ b/Assets/Prefabs/Coffee.prefab @@ -10,6 +10,8 @@ GameObject: m_Component: - component: {fileID: 7123021364386132083} - component: {fileID: 1747974818995494046} + - component: {fileID: 5520736153122788072} + - component: {fileID: 1518483160148691188} m_Layer: 0 m_Name: Coffee m_TagString: Untagged @@ -80,3 +82,50 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &5520736153122788072 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870250841519595495} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + 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.5, y: 1.5} + newSize: {x: 1.5, y: 1.5} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.5, y: 1.5} + m_EdgeRadius: 0 +--- !u!50 &1518483160148691188 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870250841519595495} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 diff --git a/Assets/Prefabs/Pizza.prefab b/Assets/Prefabs/Pizza.prefab index 9032cf2..347ef22 100644 --- a/Assets/Prefabs/Pizza.prefab +++ b/Assets/Prefabs/Pizza.prefab @@ -10,6 +10,9 @@ GameObject: m_Component: - component: {fileID: 8554420466772133694} - component: {fileID: 256661142209474860} + - component: {fileID: -1689152108654162109} + - component: {fileID: 271381267833183223} + - component: {fileID: -2721928150708373069} m_Layer: 0 m_Name: Pizza m_TagString: Untagged @@ -80,3 +83,63 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &-1689152108654162109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1137786072160203054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 47ff2cdf170756a4792387a95db53a5f, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!61 &271381267833183223 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1137786072160203054} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + 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.5, y: 1.5} + newSize: {x: 1.5, y: 1.5} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.5, y: 1.5} + m_EdgeRadius: 0 +--- !u!50 &-2721928150708373069 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1137786072160203054} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index 64195d3..57047cb 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -229,7 +229,268 @@ Tilemap: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1491653} m_Enabled: 1 - m_Tiles: {} + m_Tiles: + - first: {x: 5, y: 17, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 6, y: 17, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 7, y: 17, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 8, y: 17, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 9, y: 17, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 10, y: 17, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 11, y: 17, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 11, y: 18, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 12, y: 18, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 12, y: 19, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 13, y: 19, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 13, y: 20, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 14, y: 20, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 14, y: 21, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 15, y: 21, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 15, y: 22, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 16, y: 22, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 16, y: 23, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 17, y: 23, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 17, y: 24, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 18, y: 24, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 18, y: 25, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 19, y: 25, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 19, y: 26, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 20, y: 26, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 20, y: 27, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 21, y: 27, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 21, y: 28, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 22, y: 28, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 m_AnimatedTiles: {} m_TileAssetArray: - m_RefCount: 0 @@ -238,8 +499,8 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 29 + m_Data: {fileID: 11400000, guid: 72512fd510bbaa54abcab943acdfad9d, type: 2} m_TileSpriteArray: - m_RefCount: 0 m_Data: {fileID: 0} @@ -247,34 +508,35 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 29 + m_Data: {fileID: 7688254355190835736, guid: 06179a7b27612804c9315624bd8657bc, + type: 3} m_TileMatrixArray: - - m_RefCount: 0 + - m_RefCount: 29 m_Data: - e00: NaN - e01: NaN - e02: -0.0000000555834 + e00: 1 + e01: 0 + e02: 0 e03: 0 - e10: NaN - e11: NaN - e12: 1.18e-43 + e10: 0 + e11: 1 + e12: 0 e13: 0 e20: 0 - e21: -0.000000055583342 - e22: 0 + e21: 0 + e22: 1 e23: 0 e30: 0 - e31: 1.18e-43 + e31: 0 e32: 0 - e33: 0 + e33: 1 m_TileColorArray: - - m_RefCount: 0 - m_Data: {r: 6.129018e-32, g: 6.129018e-32, b: 6.129018e-32, a: 6.129018e-32} + - m_RefCount: 29 + m_Data: {r: 1, g: 1, b: 1, a: 1} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: 0, y: 0, z: 0} - m_Size: {x: 68, y: 6, z: 1} + m_Size: {x: 68, y: 29, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -301,11 +563,36 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.x + value: 0.040924072 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.x + value: 0.9434204 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.09003568 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.y + value: 1.3199286 + objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name value: CoffeeTwo objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x @@ -375,6 +662,11 @@ PrefabInstance: propertyPath: m_Name value: CoffeeSix objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x @@ -1168,7 +1460,7 @@ GameObject: - component: {fileID: 367096169} - component: {fileID: 367096170} m_Layer: 0 - m_Name: StaminaBar + m_Name: Health m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1182,7 +1474,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 367096168} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -5.39, y: 6.39, z: 6.1276217} + m_LocalPosition: {x: -7.7, y: 6.6, z: 6.1276217} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1146013793} @@ -1231,7 +1523,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 - m_Size: {x: 4.5, y: 1.5} + m_Size: {x: 1.5, y: 1.5} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1249,6 +1541,11 @@ PrefabInstance: propertyPath: m_Name value: PizzaTwo objectReference: {fileID: 0} + - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_TagString + value: Pizza + objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalPosition.x @@ -1318,6 +1615,11 @@ PrefabInstance: propertyPath: m_Name value: CoffeeFife objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x @@ -1430,20 +1732,45 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.x + value: 0.040924072 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.x + value: 0.95977783 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.08594322 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.y + value: 1.3281136 + objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name value: CoffeeThree objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x - value: 132.6 + value: 132.502 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.y - value: 37.8 + value: 37.694 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1538,6 +1865,11 @@ PrefabInstance: propertyPath: m_Name value: CoffeeFoor objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x @@ -1835,6 +2167,12 @@ MonoBehaviour: groundErrorThreshold: 3 wallLineCaseDistance: 1.15 runErrorThreshold: 0.05 + startHealth: 3 + startStamina: 100 + coffeValuePercent: 10 + bugStaminaDamagePercent: 15 + healthBar: {fileID: 367096170} + staminaBar: {fileID: 2086987805} --- !u!95 &1671840923 Animator: serializedVersion: 3 @@ -1866,6 +2204,11 @@ PrefabInstance: propertyPath: m_Name value: PizzaThree objectReference: {fileID: 0} + - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_TagString + value: Pizza + objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalPosition.x @@ -2340,7 +2683,7 @@ GameObject: - component: {fileID: 2086987804} - component: {fileID: 2086987805} m_Layer: 0 - m_Name: LifeBar + m_Name: StaminaBar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2408,7 +2751,7 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + m_SpriteSortPoint: 1 --- !u!1 &2120494076 GameObject: m_ObjectHideFlags: 0 @@ -47141,6 +47484,11 @@ PrefabInstance: propertyPath: m_Name value: Pizza objectReference: {fileID: 0} + - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_TagString + value: Pizza + objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalPosition.x @@ -47324,11 +47672,36 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.x + value: 0.032886505 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.x + value: 0.95738983 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.09043503 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.y + value: 1.31913 + objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name value: Coffee objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 2b9ae61..6a4e5d2 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -11,6 +11,16 @@ public class Player : MonoBehaviour [SerializeField] private float groundErrorThreshold = 0.05f; [SerializeField] private float wallLineCaseDistance = 0.5f; [SerializeField] private float runErrorThreshold = 0.05f; + [SerializeField] private int startHealth = 3; + private int currentHealth; + [SerializeField] private int startStamina = 100; + [SerializeField] private int coffeValuePercent = 10; + [SerializeField] private int bugStaminaDamagePercent = 15; + private int currentStamina; + + [SerializeField] private SpriteRenderer healthBar; + [SerializeField] private SpriteRenderer staminaBar; + private Rigidbody2D rigidBody; new private BoxCollider2D collider; @@ -23,13 +33,51 @@ public class Player : MonoBehaviour rigidBody = GetComponent(); collider = GetComponent(); animator = GetComponent(); + currentHealth = startHealth; + currentStamina = startStamina; + healthBar.size = new Vector2(1.5f * startHealth, healthBar.size.y); + staminaBar.size = new Vector2(staminaBar.size.x, staminaBar.size.y); } private void Update() - { + { MovePlayer(); } + void OnCollisionEnter2D(Collision2D coll) + { + if (coll.gameObject.tag == "Pizza") + { + Destroy(coll.gameObject); + currentHealth += currentHealth < startHealth ? 1 : 0; + healthBar.size = new Vector2(1.5f * currentHealth, this.healthBar.size.y); + } + else if (coll.gameObject.tag == "Coffee") + { + Destroy(coll.gameObject); + DrinkCoffee(); + } + } + + private void DrinkCoffee() + { + int result = currentStamina + GetStaminaValueChange(coffeValuePercent); + currentStamina = result < startStamina ? result : startStamina; + staminaBar.size = new Vector2(staminaBar.size.x * (currentStamina/startStamina), staminaBar.size.y); + } + + private void DecreaseStaminaAfterBugFight() + { + int result = currentStamina - GetStaminaValueChange(bugStaminaDamagePercent); + currentStamina = result < 0 ? 0 : result; + } + + private int GetStaminaValueChange(int percentage) + { + return currentStamina < startStamina ? (startStamina * percentage / 100) : 0; + } + + private void MovePlayer() { Jump(); diff --git a/Assets/Sprites/Hud/Heart.png.meta b/Assets/Sprites/Hud/Heart.png.meta index eebd685..9f9d5ba 100644 --- a/Assets/Sprites/Hud/Heart.png.meta +++ b/Assets/Sprites/Hud/Heart.png.meta @@ -43,7 +43,7 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 4 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index ea1159a..597cc20 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,9 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Pizza + - Coffee layers: - Default - TransparentFX From 600b56ed147fcd06c20e607976415b7dfba05ef8 Mon Sep 17 00:00:00 2001 From: Sweet Tini Date: Sat, 1 Feb 2020 20:50:30 -0500 Subject: [PATCH 2/2] Add stamina bar piece --- Assets/Scenes/LevelOne.unity | 88 ++++++++++++- Assets/Sprites/Hud/StaminaBar 1.png | Bin 0 -> 190 bytes Assets/Sprites/Hud/StaminaBar 1.png.meta | 151 +++++++++++++++++++++++ 3 files changed, 235 insertions(+), 4 deletions(-) create mode 100644 Assets/Sprites/Hud/StaminaBar 1.png create mode 100644 Assets/Sprites/Hud/StaminaBar 1.png.meta diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index 2a14307..e23ed2b 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -1478,7 +1478,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1146013793} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &367096170 SpriteRenderer: @@ -2748,7 +2748,7 @@ Transform: m_LocalScale: {x: 5.4678884, y: 5.4678884, z: 5.4678884} m_Children: [] m_Father: {fileID: 1146013793} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1882958981 SpriteRenderer: @@ -2799,6 +2799,86 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1895829829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1895829830} + - component: {fileID: 1895829831} + m_Layer: 0 + m_Name: StaminaPiece + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1895829830 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1895829829} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -7.158, y: -6.773, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1146013793} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1895829831 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1895829829} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: 5ea496523db789f4fb72651035776eba, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 8.75, y: 0.625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2086987803 GameObject: m_ObjectHideFlags: 0 @@ -2824,11 +2904,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2086987803} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.85, y: -6.83, z: 8.230801} + m_LocalPosition: {x: -2.85, y: -6.83, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1146013793} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2086987805 SpriteRenderer: diff --git a/Assets/Sprites/Hud/StaminaBar 1.png b/Assets/Sprites/Hud/StaminaBar 1.png new file mode 100644 index 0000000000000000000000000000000000000000..23bcd5e020c0eedfc6593e07a1c434316c8b8741 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^OhC-V0U`z4CFFn|4}nTJN(%hkfifWF3|WGMAFm6F{ENnazaCcy!C-A^X=;mG*`%kaWOG0 XDG>BklRy6hsEEPS)z4*}Q$iB}LNPEt literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Hud/StaminaBar 1.png.meta b/Assets/Sprites/Hud/StaminaBar 1.png.meta new file mode 100644 index 0000000..ef3ab9c --- /dev/null +++ b/Assets/Sprites/Hud/StaminaBar 1.png.meta @@ -0,0 +1,151 @@ +fileFormatVersion: 2 +guid: 5ea496523db789f4fb72651035776eba +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 4 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: