Finished event control displaying and movement

This commit is contained in:
2020-02-01 11:44:43 -05:00
parent 9b23e5deff
commit 5b812bbb32
7 changed files with 47 additions and 23 deletions

View File

@@ -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}

View File

@@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
executionOrder: 100
icon: {instanceID: 0}
userData:
assetBundleName:

View File

@@ -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
}
}

View File

@@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
executionOrder: 200
icon: {instanceID: 0}
userData:
assetBundleName:

View File

@@ -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,

View File

@@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
executionOrder: 50
icon: {instanceID: 0}
userData:
assetBundleName:

View File

@@ -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