crayonix/fatal-exception
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020

Browse Source
This commit is contained in:
Sweet Tini
2020-02-01 11:51:34 -05:00
parent 9c18c13e8d 950efeab81
commit 26083d4112
10 changed files with 170 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/CameraMovement.cs.meta
View File

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

52
Assets/Scripts/EventControlsDisplay.cs
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
}
}

2
Assets/Scripts/EventControlsDisplay.cs.meta
View File

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

2
Assets/Scripts/Player.cs
View File

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

2
Assets/Scripts/Player.cs.meta
View File

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