From 2c447fa8907dc66971f16a478dad250e19da924b Mon Sep 17 00:00:00 2001 From: Giovani Date: Sat, 1 Feb 2020 09:56:08 -0500 Subject: [PATCH] events control WIP --- Assets/Scenes/LevelOne.unity | 5 +- Assets/Scripts/CameraMovement.cs | 2 +- Assets/Scripts/EventControlsDisplay.cs | 36 ++- Assets/Sprites/Controls/Control W.asset | 36 +++ Assets/Sprites/Controls/Control W.asset.meta | 8 + Assets/Sprites/Controls/Control W.png | Bin 0 -> 78 bytes Assets/Sprites/Controls/Control W.png.meta | 103 +++++++++ Assets/Sprites/Palette/Event Controls.prefab | 207 ++++++++++++++++++ .../Palette/Event Controls.prefab.meta | 7 + 9 files changed, 396 insertions(+), 8 deletions(-) create mode 100644 Assets/Sprites/Controls/Control W.asset create mode 100644 Assets/Sprites/Controls/Control W.asset.meta create mode 100644 Assets/Sprites/Controls/Control W.png create mode 100644 Assets/Sprites/Controls/Control W.png.meta create mode 100644 Assets/Sprites/Palette/Event Controls.prefab create mode 100644 Assets/Sprites/Palette/Event Controls.prefab.meta diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index ca99db1..5732917 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -166,7 +166,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: camera: {fileID: 1337282922} - tile: {fileID: 0} + tile: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} + framesPerControlTile: 15 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -813,7 +814,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1882958980 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CameraMovement.cs b/Assets/Scripts/CameraMovement.cs index e8f7a4a..477b215 100644 --- a/Assets/Scripts/CameraMovement.cs +++ b/Assets/Scripts/CameraMovement.cs @@ -15,6 +15,6 @@ public class CameraMovement : MonoBehaviour private void Update() { - transform.position = Vector2.Lerp(transform.position, player.transform.position + new Vector3(0, offsetY, 0), .2f); + transform.position = Vector2.Lerp(transform.position, player.transform.position + new Vector3(0, offsetY, 0), interpolate); } } diff --git a/Assets/Scripts/EventControlsDisplay.cs b/Assets/Scripts/EventControlsDisplay.cs index e1356ed..8ae3c4b 100644 --- a/Assets/Scripts/EventControlsDisplay.cs +++ b/Assets/Scripts/EventControlsDisplay.cs @@ -6,17 +6,43 @@ using UnityEngine.Tilemaps; 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; private Tilemap tilemap; - [SerializeField] private Tile tile; + private int nextControlAccumalator = 0; - void Start() + private int framePerSecond => 60; + + private void Start() { - tilemap = GetComponent(); + tilemap = GetComponent(); + } - void Update() + private void Update() { - tilemap.SetTile(new Vector3Int((int)camera.transform.position.x, (int)camera.transform.position.y, (int)camera.transform.position.z), tile); + + 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); + } + + nextControlAccumalator++; + } + + private Vector3Int GetCameraPosition() + { + return new Vector3Int((int) camera.transform.position.x, + (int) camera.transform.position.y, + (int) camera.transform.position.z); } } diff --git a/Assets/Sprites/Controls/Control W.asset b/Assets/Sprites/Controls/Control W.asset new file mode 100644 index 0000000..f789d34 --- /dev/null +++ b/Assets/Sprites/Controls/Control W.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Control W + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Control W.asset.meta b/Assets/Sprites/Controls/Control W.asset.meta new file mode 100644 index 0000000..bbef4c4 --- /dev/null +++ b/Assets/Sprites/Controls/Control W.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ece7857530facb42b843eed2526c86a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Control W.png b/Assets/Sprites/Controls/Control W.png new file mode 100644 index 0000000000000000000000000000000000000000..8eb1b1ecc13b6e1d2375151866134cd7a040340c GIT binary patch literal 78 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=L_J*`LpWrU|M0W$cr!i aF)*;jval%k