From 3c794540cee2d2923c445dc083a5eb9df450023f Mon Sep 17 00:00:00 2001 From: Giovani Date: Sat, 1 Feb 2020 01:47:44 -0500 Subject: [PATCH] fixed merge --- Assets/Prefabs/Bug.prefab | 7 +- Assets/Scenes/LevelOne.unity | 140 +++++++++++++++++++- Assets/{ => Scripts}/BugMovement.cs | 0 Assets/{ => Scripts}/BugMovement.cs.meta | 0 Assets/Scripts/EventControlsDisplay.cs | 22 +++ Assets/Scripts/EventControlsDisplay.cs.meta | 11 ++ Assets/Scripts/Player.cs | 20 ++- Assets/Sprites/Controls.meta | 8 ++ 8 files changed, 200 insertions(+), 8 deletions(-) rename Assets/{ => Scripts}/BugMovement.cs (100%) rename Assets/{ => Scripts}/BugMovement.cs.meta (100%) create mode 100644 Assets/Scripts/EventControlsDisplay.cs create mode 100644 Assets/Scripts/EventControlsDisplay.cs.meta create mode 100644 Assets/Sprites/Controls.meta diff --git a/Assets/Prefabs/Bug.prefab b/Assets/Prefabs/Bug.prefab index f12375c..6eb9545 100644 --- a/Assets/Prefabs/Bug.prefab +++ b/Assets/Prefabs/Bug.prefab @@ -121,9 +121,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e5f777aa09d2ced42baa1cc6bf9dbe54, type: 3} m_Name: m_EditorClassIdentifier: - secondsLeft: 1 - secondsRight: 1 - movementSpeed: 1 + secondsGoingLeft: 1 + secondsGoingRight: 1 + movementSpeed: 5 + playerCollider: {fileID: 0} --- !u!50 &3827363133515929334 Rigidbody2D: serializedVersion: 4 diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index 8e8d520..325e2a9 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -120,6 +120,136 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &1491653 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1491654} + - component: {fileID: 1491657} + - component: {fileID: 1491656} + - component: {fileID: 1491655} + m_Layer: 0 + m_Name: Event Controls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1491654 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491653} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1008122163} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1491655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491653} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 555a3f8aa89a0e84fb6c43249a117f93, type: 3} + m_Name: + m_EditorClassIdentifier: + camera: {fileID: 1337282922} + tile: {fileID: 0} +--- !u!483693784 &1491656 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491653} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + 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_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1491657 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491653} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + 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 --- !u!1001 &414764564 PrefabInstance: m_ObjectHideFlags: 0 @@ -130,7 +260,7 @@ PrefabInstance: - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name - value: Pizza (1) + value: PizzaTwo objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -232,6 +362,7 @@ Transform: - {fileID: 1713017494} - {fileID: 1671840917} - {fileID: 1247097598} + - {fileID: 1491654} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -346,6 +477,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fe8fb0c1c30f84b43885e84de26e0f11, type: 3} +--- !u!20 &1337282922 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 5711328081315814051, guid: fe8fb0c1c30f84b43885e84de26e0f11, + type: 3} + m_PrefabInstance: {fileID: 1337282921} + m_PrefabAsset: {fileID: 0} --- !u!1 &1671840916 GameObject: m_ObjectHideFlags: 0 @@ -495,6 +632,7 @@ MonoBehaviour: runSpeed: 10 jumpSpeed: 30 runFasterFactor: 1.5 + groundErrorThreshold: 0.05 --- !u!68 &1671840922 EdgeCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/BugMovement.cs b/Assets/Scripts/BugMovement.cs similarity index 100% rename from Assets/BugMovement.cs rename to Assets/Scripts/BugMovement.cs diff --git a/Assets/BugMovement.cs.meta b/Assets/Scripts/BugMovement.cs.meta similarity index 100% rename from Assets/BugMovement.cs.meta rename to Assets/Scripts/BugMovement.cs.meta diff --git a/Assets/Scripts/EventControlsDisplay.cs b/Assets/Scripts/EventControlsDisplay.cs new file mode 100644 index 0000000..e1356ed --- /dev/null +++ b/Assets/Scripts/EventControlsDisplay.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Tilemaps; + +public class EventControlsDisplay : MonoBehaviour +{ + [SerializeField] private Camera camera; + + private Tilemap tilemap; + [SerializeField] private Tile tile; + + void Start() + { + tilemap = GetComponent(); + } + + void Update() + { + tilemap.SetTile(new Vector3Int((int)camera.transform.position.x, (int)camera.transform.position.y, (int)camera.transform.position.z), tile); + } +} diff --git a/Assets/Scripts/EventControlsDisplay.cs.meta b/Assets/Scripts/EventControlsDisplay.cs.meta new file mode 100644 index 0000000..8ad8c89 --- /dev/null +++ b/Assets/Scripts/EventControlsDisplay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 555a3f8aa89a0e84fb6c43249a117f93 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index f41721f..3c86371 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -7,18 +7,22 @@ public class Player : MonoBehaviour [SerializeField] private float runSpeed = 10f; [SerializeField] private float jumpSpeed = 10f; [SerializeField] private float runFasterFactor = 1.5f; + [SerializeField] private float groundErrorThreshold = 0.01f; private Rigidbody2D rigidbody; + private PolygonCollider2D collider; private bool isInEncounter = false; private void Start() { rigidbody = GetComponent(); + collider = GetComponent(); } private void Update() { - Debug.Log(HasEncounteredEnemy()); + //isInEncounter = HasEncounteredEnemy(); + //if (isInEncounter) MovePlayer(); } @@ -30,10 +34,8 @@ public class Player : MonoBehaviour private void Jump() { - var playerOnGround = rigidbody.IsTouchingLayers(LayerMask.GetMask(LayerNames.Ground)); - // Jump - if (Input.GetKey(KeyCode.Space) && playerOnGround) + if (Input.GetKey(KeyCode.Space) && IsPlayerOnGround()) { rigidbody.velocity += new Vector2(0, jumpSpeed); rigidbody.velocity = new Vector2(rigidbody.velocity.x, @@ -62,6 +64,16 @@ public class Player : MonoBehaviour } } + private bool IsPlayerOnGround() + { + RaycastHit2D hit = Physics2D.Raycast(transform.position, + -Vector2.up, + 1f + groundErrorThreshold, + LayerMask.GetMask(LayerNames.Ground)); + + return hit.collider != null && hit.collider.IsTouching(collider); + } + private bool HasEncounteredEnemy() { return rigidbody.IsTouchingLayers(LayerMask.GetMask(LayerNames.Enemies)); diff --git a/Assets/Sprites/Controls.meta b/Assets/Sprites/Controls.meta new file mode 100644 index 0000000..5b027c5 --- /dev/null +++ b/Assets/Sprites/Controls.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 394b12e250ac73549b5a1bd20b0c4910 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: