From c69f89b174e46a246de54c39b4c96adaed34db7b Mon Sep 17 00:00:00 2001 From: chyknkat Date: Sat, 1 Feb 2020 11:36:57 -0500 Subject: [PATCH 1/2] stamina bar asset --- Assets/Sprites/Hud.meta | 8 ++ Assets/Sprites/Hud/StaminaBar.png | Bin 0 -> 373 bytes Assets/Sprites/Hud/StaminaBar.png.meta | 115 +++++++++++++++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 Assets/Sprites/Hud.meta create mode 100644 Assets/Sprites/Hud/StaminaBar.png create mode 100644 Assets/Sprites/Hud/StaminaBar.png.meta diff --git a/Assets/Sprites/Hud.meta b/Assets/Sprites/Hud.meta new file mode 100644 index 0000000..7c0b3e6 --- /dev/null +++ b/Assets/Sprites/Hud.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9931456aa6e9e840b3bd497e9b0803d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Hud/StaminaBar.png b/Assets/Sprites/Hud/StaminaBar.png new file mode 100644 index 0000000000000000000000000000000000000000..0c146356043227a66611b0fabc8b4f7468d6b281 GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W*h@TpUD=;7F$yR${XHen2NV)7 zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6;RN#5=*4F5rJ!QSPQK_VqVe!&nC^9bo$pvXQ?7srr_Id7-Naxp9N zv|NsUCs@74?u$UJhL0}yyNo2Mqx)Rh$_}R3JzmcsuygLAWyjir?EEeLauZA1*b>%C zNp0fRsIq_O8q9O<6|ZA(*kiBwIS2cu7K&c!UDU=F-g@_}PT`|zjB_kl3YH3m`#At*XHIpUp>h zi)%wYYc9i)_lr0gZl&ujT6lg%a=5nxlMq7 Date: Sat, 1 Feb 2020 11:44:43 -0500 Subject: [PATCH 2/2] Finished event control displaying and movement --- Assets/Scenes/LevelOne.unity | 8 ++-- Assets/Scripts/CameraMovement.cs.meta | 2 +- Assets/Scripts/EventControlsDisplay.cs | 52 +++++++++++++++------ Assets/Scripts/EventControlsDisplay.cs.meta | 2 +- Assets/Scripts/Player.cs | 2 +- Assets/Scripts/Player.cs.meta | 2 +- Assets/Sprites/Player/Player.controller | 2 +- 7 files changed, 47 insertions(+), 23 deletions(-) diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index a54d416..ea191cf 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -168,8 +168,8 @@ MonoBehaviour: camera: {fileID: 1337282922} tile: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} framesPerControlTile: 15 - nextControlYOffset: 1 - nextControlXOffset: -2 + nextControlYOffset: 4 + nextControlXOffset: 1.5 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -388,7 +388,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 1671840916} - offsetY: 0 + offsetY: 2 interpolate: 0.1 --- !u!4 &1146013793 stripped Transform: @@ -521,7 +521,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671840916} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.5, y: -4, z: 0} + m_LocalPosition: {x: -5, y: -4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} diff --git a/Assets/Scripts/CameraMovement.cs.meta b/Assets/Scripts/CameraMovement.cs.meta index a7d36b4..e4e1421 100644 --- a/Assets/Scripts/CameraMovement.cs.meta +++ b/Assets/Scripts/CameraMovement.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 100 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/EventControlsDisplay.cs b/Assets/Scripts/EventControlsDisplay.cs index b80931b..f8e322e 100644 --- a/Assets/Scripts/EventControlsDisplay.cs +++ b/Assets/Scripts/EventControlsDisplay.cs @@ -8,10 +8,13 @@ public class EventControlsDisplay : MonoBehaviour [SerializeField] private Camera camera; [SerializeField] private Tile tile; [SerializeField] private float framesPerControlTile = 15; - [SerializeField] private int nextControlYOffset = 1; - [SerializeField] private int nextControlXOffset = -2; + [SerializeField] private float nextControlYOffset = 0; + [SerializeField] private float nextControlXOffset = 0; private Tilemap tilemap; + private int maxNumberOfControlTiles = 3; + private int numberOfControlTilesSet = 0; + private Vector3Int? initialCameraPosition; private int nextControlAccumalator = 0; private int framePerSecond => 60; @@ -23,25 +26,46 @@ public class EventControlsDisplay : MonoBehaviour private void Update() { - - if (nextControlAccumalator >= framesPerControlTile && nextControlXOffset < 1) - { - tilemap.SetTile(GetCameraPosition() + new Vector3Int(nextControlXOffset, nextControlYOffset, 0), tile); - nextControlAccumalator = 0; - nextControlXOffset++; - } - else - { - //transform.position = Vector2.Lerp(transform.position, player.transform.position + new Vector3(0, offsetY, 0), .1f); - } - + SetTile(); + SetTileMapPosition(); + nextControlAccumalator++; } + private void SetTile() + { + if (nextControlAccumalator >= framesPerControlTile && numberOfControlTilesSet < maxNumberOfControlTiles) + { + if (initialCameraPosition == null) + initialCameraPosition = GetCameraPosition(); + + tilemap.SetTile(GetNextTilePosition(), tile); + + nextControlAccumalator = 0; + numberOfControlTilesSet++; + } + else if (numberOfControlTilesSet == maxNumberOfControlTiles) + { + initialCameraPosition = null; + } + } + private Vector3Int GetCameraPosition() { return new Vector3Int((int) camera.transform.position.x, (int) camera.transform.position.y, (int) camera.transform.position.z); } + + private Vector3Int GetNextTilePosition() + { + return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet, 0, 0)) + .GetValueOrDefault(); + } + + private void SetTileMapPosition() + { + transform.position = camera.transform.position + + new Vector3(nextControlXOffset, nextControlYOffset, 0); // offset + } } diff --git a/Assets/Scripts/EventControlsDisplay.cs.meta b/Assets/Scripts/EventControlsDisplay.cs.meta index 8ad8c89..84457e3 100644 --- a/Assets/Scripts/EventControlsDisplay.cs.meta +++ b/Assets/Scripts/EventControlsDisplay.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 200 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index d36ff54..ab93479 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -39,7 +39,7 @@ public class Player : MonoBehaviour private void Jump() { // Jump - if (Input.GetKey(KeyCode.Space) && IsPlayerOnGround()) + if (Input.GetKeyDown(KeyCode.Space) && IsPlayerOnGround()) { rigidBody.velocity += new Vector2(0, jumpSpeed); rigidBody.velocity = new Vector2(rigidBody.velocity.x, diff --git a/Assets/Scripts/Player.cs.meta b/Assets/Scripts/Player.cs.meta index 58fde68..b1db695 100644 --- a/Assets/Scripts/Player.cs.meta +++ b/Assets/Scripts/Player.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 50 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Sprites/Player/Player.controller b/Assets/Sprites/Player/Player.controller index 798b5bb..8791c72 100644 --- a/Assets/Sprites/Player/Player.controller +++ b/Assets/Sprites/Player/Player.controller @@ -65,7 +65,7 @@ AnimatorController: m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 - m_DefaultBool: 0 + m_DefaultBool: 1 m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5