From f5a1e9685da68100449d81c441e993fa8dfd5fc4 Mon Sep 17 00:00:00 2001 From: Jaden Balogh Date: Sat, 2 May 2020 20:26:54 -0700 Subject: [PATCH 01/10] Add checkpoint and basic UI --- Assets/MessageDisplay.cs | 19 + Assets/MessageDisplay.cs.meta | 11 + Assets/Prefabs/CheckpointTile.prefab | 2 +- Assets/Scenes/Main.unity | 979 ++++++++++++++++++++++----- Assets/Scripts/Checkpoint.cs | 1 + Assets/Scripts/LevelController.cs | 42 +- Assets/Scripts/TimeDisplay.cs | 24 + Assets/Scripts/TimeDisplay.cs.meta | 11 + Packages/manifest.json | 2 +- ProjectSettings/TagManager.asset | 3 + 10 files changed, 922 insertions(+), 172 deletions(-) create mode 100644 Assets/MessageDisplay.cs create mode 100644 Assets/MessageDisplay.cs.meta create mode 100644 Assets/Scripts/TimeDisplay.cs create mode 100644 Assets/Scripts/TimeDisplay.cs.meta diff --git a/Assets/MessageDisplay.cs b/Assets/MessageDisplay.cs new file mode 100644 index 0000000..b353d0b --- /dev/null +++ b/Assets/MessageDisplay.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class MessageDisplay : MonoBehaviour +{ + private Text textComponent; + + void Awake() + { + textComponent = GetComponent(); + } + + public void SetMessage(string message) + { + textComponent.text = message; + } +} diff --git a/Assets/MessageDisplay.cs.meta b/Assets/MessageDisplay.cs.meta new file mode 100644 index 0000000..5a2837a --- /dev/null +++ b/Assets/MessageDisplay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7d24c015367ade743aeabe965f111381 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/CheckpointTile.prefab b/Assets/Prefabs/CheckpointTile.prefab index f08a4c3..a333f77 100644 --- a/Assets/Prefabs/CheckpointTile.prefab +++ b/Assets/Prefabs/CheckpointTile.prefab @@ -15,7 +15,7 @@ GameObject: m_Layer: 0 m_Name: CheckpointTile m_TagString: Untagged - m_Icon: {fileID: 0} + m_Icon: {fileID: 2488908585195742037, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 0a63f07..3749e76 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -121,6 +121,147 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &51622608 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1699333069} + m_Modifications: + - target: {fileID: 5617554557256136235, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_Name + value: CheckpointTile + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.5 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b3ad727215cf114088f643107357297, type: 3} +--- !u!4 &51622609 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + m_PrefabInstance: {fileID: 51622608} + m_PrefabAsset: {fileID: 0} +--- !u!1 &493858624 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 493858627} + - component: {fileID: 493858626} + - component: {fileID: 493858625} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &493858625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 493858624} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &493858626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 493858624} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &493858627 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 493858624} + 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: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -260,10 +401,86 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1776470351} + - {fileID: 1699333069} - {fileID: 1432579797} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1282284560 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1699333069} + m_Modifications: + - target: {fileID: 5617554557256136235, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_Name + value: CheckpointTile + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.5 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.5 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b3ad727215cf114088f643107357297, type: 3} +--- !u!4 &1282284561 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + m_PrefabInstance: {fileID: 1282284560} + m_PrefabAsset: {fileID: 0} --- !u!1 &1413427920 GameObject: m_ObjectHideFlags: 0 @@ -408,6 +625,106 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1420357648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1420357652} + - component: {fileID: 1420357651} + - component: {fileID: 1420357650} + - component: {fileID: 1420357649} + m_Layer: 5 + m_Name: HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1420357649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1420357648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1420357650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1420357648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 64 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1420357651 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1420357648} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 519420031} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 254244247 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1420357652 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1420357648} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1688262108} + - {fileID: 2061805257} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1432579796 GameObject: m_ObjectHideFlags: 0 @@ -441,7 +758,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 636881363} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!483693784 &1432579798 TilemapRenderer: @@ -481,7 +798,7 @@ TilemapRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1913947151 m_SortingLayer: 2 - m_SortingOrder: 0 + m_SortingOrder: 1 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} m_MaxChunkCount: 16 @@ -1022,172 +1339,32 @@ CompositeCollider2D: m_ColliderPaths: - m_Collider: {fileID: 1432579800} m_ColliderPaths: - - - X: 70000100 - Y: -50000041 - - X: 70000100 - Y: 50000041 - - X: 70000041 - Y: 50000100 - - X: -41 - Y: 50000100 - - X: -100 - Y: 50000041 - - X: -100 - Y: 39999959 - - X: -41 - Y: 39999900 - - X: 59999900 - Y: 39999900 - - X: 59999900 - Y: -39999900 - - X: -59999900 - Y: -39999900 - - X: -59999900 - Y: 50000041 - - X: -59999959 - Y: 50000100 - - X: -70000041 - Y: 50000100 - - X: -70000100 - Y: 50000041 - - X: -70000100 - Y: -50000041 - - X: -70000041 - Y: -50000100 - - X: 70000041 - Y: -50000100 - - - X: -51799900 - Y: 41799963 - - X: -51799900 - Y: 48200041 - - X: -51799959 - Y: 48200100 - - X: -58200041 - Y: 48200100 - - X: -58200100 - Y: 48200041 - - X: -58200100 - Y: 41799963 - - X: -58200041 - Y: 41799904 - - X: -51799959 - Y: 41799904 - - - X: -41799900 - Y: 41799963 - - X: -41799900 - Y: 48200041 - - X: -41799959 - Y: 48200100 - - X: -48200041 - Y: 48200100 - - X: -48200100 - Y: 48200041 - - X: -48200100 - Y: 41799963 - - X: -48200041 - Y: 41799904 - - X: -41799959 - Y: 41799904 - - - X: -31799900 - Y: 41799963 - - X: -31799900 - Y: 48200041 - - X: -31799959 - Y: 48200100 - - X: -38200041 - Y: 48200100 - - X: -38200100 - Y: 48200041 - - X: -38200100 - Y: 41799963 - - X: -38200041 - Y: 41799904 - - X: -31799959 - Y: 41799904 - - - X: -21799900 - Y: 41799963 - - X: -21799900 - Y: 48200041 - - X: -21799959 - Y: 48200100 - - X: -28200041 - Y: 48200100 - - X: -28200100 - Y: 48200041 - - X: -28200100 - Y: 41799963 - - X: -28200041 - Y: 41799904 - - X: -21799959 - Y: 41799904 - - - X: -11799901 - Y: 41799963 - - X: -11799901 - Y: 48200041 - - X: -11799960 - Y: 48200100 - - X: -18200041 - Y: 48200100 - - X: -18200100 - Y: 48200041 - - X: -18200100 - Y: 41799963 - - X: -18200041 - Y: 41799904 - - X: -11799960 - Y: 41799904 - - - X: -1799900 - Y: 41799963 - - X: -1799900 - Y: 48200041 - - X: -1799959 - Y: 48200100 - - X: -8200040 - Y: 48200100 - - X: -8200099 - Y: 48200041 - - X: -8200099 - Y: 41799963 - - X: -8200040 - Y: 41799904 - - X: -1799959 - Y: 41799904 + - - X: 70000000 + Y: 50000000 + - X: -70000000 + Y: 50000000 + - X: -70000000 + Y: -50000000 + - X: 70000000 + Y: -50000000 + - - X: -60000000 + Y: -40000000 + - X: -60000000 + Y: 40000000 + - X: 60000000 + Y: 40000000 + - X: 60000000 + Y: -40000000 m_CompositePaths: m_Paths: - - - {x: 6.9999743, y: -5.00001} - - {x: 6.9999743, y: 5.00001} - - {x: -0.00001, y: 4.9999747} - - {x: 0.0000252, y: 3.99999} - - {x: 5.99999, y: 3.999961} - - {x: 5.999961, y: -3.99999} - - {x: -5.99999, y: -3.999961} - - {x: -6.0000253, y: 5.00001} - - {x: -7.0000095, y: 4.9999747} - - {x: -6.9999743, y: -5.00001} - - - {x: -5.180025, y: 4.1799903} - - {x: -5.180025, y: 4.82001} - - {x: -5.82001, y: 4.819975} - - {x: -5.819975, y: 4.1799903} - - - {x: -4.180025, y: 4.1799903} - - {x: -4.180025, y: 4.82001} - - {x: -4.82001, y: 4.819975} - - {x: -4.819975, y: 4.1799903} - - - {x: -3.1800253, y: 4.1799903} - - {x: -3.1800253, y: 4.82001} - - {x: -3.82001, y: 4.819975} - - {x: -3.819975, y: 4.1799903} - - - {x: -2.1800253, y: 4.1799903} - - {x: -2.1800253, y: 4.82001} - - {x: -2.82001, y: 4.819975} - - {x: -2.819975, y: 4.1799903} - - - {x: -1.1800253, y: 4.1799903} - - {x: -1.1800253, y: 4.82001} - - {x: -1.8200101, y: 4.819975} - - {x: -1.8199748, y: 4.1799903} - - - {x: -0.1800252, y: 4.1799903} - - {x: -0.1800252, y: 4.82001} - - {x: -0.8200099, y: 4.819975} - - {x: -0.8199747, y: 4.1799903} + - - {x: 6.9999704, y: -5} + - {x: 6.9999704, y: 5} + - {x: -7, y: 4.999971} + - {x: -6.9999704, y: -5} + - - {x: 6, y: -3.9999704} + - {x: -6, y: -3.9999704} + - {x: -5.9999704, y: 4} + - {x: 6, y: 3.9999704} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &1432579802 @@ -1211,6 +1388,81 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!1001 &1455916647 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1699333069} + m_Modifications: + - target: {fileID: 5617554557256136235, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_Name + value: CheckpointTile + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.5 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b3ad727215cf114088f643107357297, type: 3} +--- !u!4 &1455916648 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + m_PrefabInstance: {fileID: 1455916647} + m_PrefabAsset: {fileID: 0} --- !u!1 &1603210741 GameObject: m_ObjectHideFlags: 0 @@ -1254,6 +1506,220 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e3075c630d7118a4fb08fb9b0ffc2f48, type: 3} m_Name: m_EditorClassIdentifier: + endMessage: Press 'space' to restart! + timeDisplay: {fileID: 1688262111} + messageDisplay: {fileID: 2061805260} +--- !u!1 &1688262107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1688262108} + - component: {fileID: 1688262110} + - component: {fileID: 1688262109} + - component: {fileID: 1688262111} + m_Layer: 5 + m_Name: TimeDisplay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1688262108 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688262107} + 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: 1420357652} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 180, y: 50} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1688262109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688262107} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 1 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 'Time: 0.0s' +--- !u!222 &1688262110 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688262107} + m_CullTransparentMesh: 0 +--- !u!114 &1688262111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688262107} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33fc2b78c2e314140aa5f17029b07df3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1699333068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1699333069} + - component: {fileID: 1699333071} + - component: {fileID: 1699333070} + m_Layer: 0 + m_Name: Triggerable + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1699333069 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699333068} + 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: + - {fileID: 51622609} + - {fileID: 2097115485} + - {fileID: 1455916648} + - {fileID: 1282284561} + m_Father: {fileID: 636881363} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &1699333070 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699333068} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 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: 1913947151 + m_SortingLayer: 2 + 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 &1699333071 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699333068} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + 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!1 &1776470350 GameObject: m_ObjectHideFlags: 0 @@ -2277,3 +2743,184 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &2061805256 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2061805257} + - component: {fileID: 2061805259} + - component: {fileID: 2061805258} + - component: {fileID: 2061805261} + - component: {fileID: 2061805260} + m_Layer: 5 + m_Name: MessageDisplay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2061805257 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061805256} + 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: 1420357652} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 30} + m_SizeDelta: {x: 400, y: 40} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &2061805258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061805256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 1 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &2061805259 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061805256} + m_CullTransparentMesh: 0 +--- !u!114 &2061805260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061805256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7d24c015367ade743aeabe965f111381, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2061805261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061805256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!1001 &2097115484 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1699333069} + m_Modifications: + - target: {fileID: 5617554557256136235, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_Name + value: CheckpointTile + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.5 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b3ad727215cf114088f643107357297, type: 3} +--- !u!4 &2097115485 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, + type: 3} + m_PrefabInstance: {fileID: 2097115484} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/Checkpoint.cs b/Assets/Scripts/Checkpoint.cs index 2aa9eca..dca33b8 100644 --- a/Assets/Scripts/Checkpoint.cs +++ b/Assets/Scripts/Checkpoint.cs @@ -17,5 +17,6 @@ void Update() void OnTriggerEnter2D() { Debug.Log("Checkpoint reached!"); + LevelController.instance.EndGame(); } } diff --git a/Assets/Scripts/LevelController.cs b/Assets/Scripts/LevelController.cs index 9c23e63..46f13d2 100644 --- a/Assets/Scripts/LevelController.cs +++ b/Assets/Scripts/LevelController.cs @@ -1,18 +1,52 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; public class LevelController : MonoBehaviour { - // Start is called before the first frame update + public static LevelController instance; + + public string endMessage; + + public TimeDisplay timeDisplay; + public MessageDisplay messageDisplay; + + private float gameTimer; + private bool isTimerActive; + + void Awake() + { + // Enforce a singleton pattern for the LevelController object + if (instance != null) + { + Destroy(instance.gameObject); + } + instance = this; + } + void Start() { - + isTimerActive = true; } - // Update is called once per frame void Update() { - + if (isTimerActive) + { + gameTimer += Time.deltaTime; + timeDisplay.SetTime(gameTimer); + } + else if (Input.GetKeyDown(KeyCode.Space)) + { + SceneManager.LoadScene("Main"); + } + } + + public void EndGame() + { + isTimerActive = false; + timeDisplay.SetCompleted(); + messageDisplay.SetMessage(endMessage); } } diff --git a/Assets/Scripts/TimeDisplay.cs b/Assets/Scripts/TimeDisplay.cs new file mode 100644 index 0000000..e42457c --- /dev/null +++ b/Assets/Scripts/TimeDisplay.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class TimeDisplay : MonoBehaviour +{ + private Text textComponent; + + void Awake() + { + textComponent = GetComponent(); + } + + public void SetTime(float time) + { + textComponent.text = "Score: " + time.ToString("f1") + "s"; + } + + public void SetCompleted() + { + textComponent.color = Color.green; + } +} diff --git a/Assets/Scripts/TimeDisplay.cs.meta b/Assets/Scripts/TimeDisplay.cs.meta new file mode 100644 index 0000000..79fd85f --- /dev/null +++ b/Assets/Scripts/TimeDisplay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 33fc2b78c2e314140aa5f17029b07df3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index b929cb5..857962e 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -9,7 +9,7 @@ "com.unity.2d.tilemap.extras": "https://github.com/Unity-Technologies/2d-extras.git#master", "com.unity.collab-proxy": "1.2.16", "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.1.4", + "com.unity.ide.vscode": "1.2.0", "com.unity.test-framework": "1.1.11", "com.unity.textmeshpro": "2.0.1", "com.unity.timeline": "1.2.13", diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 8c3c5e1..a95dac3 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -47,3 +47,6 @@ TagManager: - name: Main uniqueID: 1913947151 locked: 0 + - name: UI + uniqueID: 254244247 + locked: 0 From 54ad6ff83276fb516a99b4eaa9ff02bb52704225 Mon Sep 17 00:00:00 2001 From: Jaden Balogh Date: Sat, 2 May 2020 21:26:40 -0700 Subject: [PATCH 02/10] Fix merge issues --- Assets/Brushes/CheckpointBrush.asset.meta | 8 ++++++++ Assets/Scenes/Main.unity | 19 +++++++++++++++++-- Assets/{ => Scripts}/MessageDisplay.cs | 0 Assets/{ => Scripts}/MessageDisplay.cs.meta | 0 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 Assets/Brushes/CheckpointBrush.asset.meta rename Assets/{ => Scripts}/MessageDisplay.cs (100%) rename Assets/{ => Scripts}/MessageDisplay.cs.meta (100%) diff --git a/Assets/Brushes/CheckpointBrush.asset.meta b/Assets/Brushes/CheckpointBrush.asset.meta new file mode 100644 index 0000000..7e0269a --- /dev/null +++ b/Assets/Brushes/CheckpointBrush.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 45a2cecb42ccd51449b15ceaabe82115 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 50a82fe..a31d78e 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -273,6 +273,7 @@ GameObject: - component: {fileID: 519420032} - component: {fileID: 519420031} - component: {fileID: 519420029} + - component: {fileID: 519420030} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -288,6 +289,20 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_Enabled: 1 +--- !u!114 &519420030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1802951089b56844a8790c3fe199ba26, type: 3} + m_Name: + m_EditorClassIdentifier: + followTime: 0.1 + zOffset: -10 --- !u!20 &519420031 Camera: m_ObjectHideFlags: 0 @@ -339,7 +354,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 35.2, y: -0.38, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -593,7 +608,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1413427925 diff --git a/Assets/MessageDisplay.cs b/Assets/Scripts/MessageDisplay.cs similarity index 100% rename from Assets/MessageDisplay.cs rename to Assets/Scripts/MessageDisplay.cs diff --git a/Assets/MessageDisplay.cs.meta b/Assets/Scripts/MessageDisplay.cs.meta similarity index 100% rename from Assets/MessageDisplay.cs.meta rename to Assets/Scripts/MessageDisplay.cs.meta From 9d4c51c018f373e70dfa2587ef9c6ae24bbc6ff0 Mon Sep 17 00:00:00 2001 From: Jaden Balogh Date: Sat, 2 May 2020 21:31:10 -0700 Subject: [PATCH 03/10] Update checkpoints --- Assets/Scenes/Main.unity | 204 ++++++----------------------------- Assets/Scripts/Checkpoint.cs | 11 -- 2 files changed, 34 insertions(+), 181 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a31d78e..bce984e 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -121,81 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &51622608 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1699333069} - m_Modifications: - - target: {fileID: 5617554557256136235, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_Name - value: CheckpointTile - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalPosition.x - value: 5.5 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2b3ad727215cf114088f643107357297, type: 3} ---- !u!4 &51622609 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - m_PrefabInstance: {fileID: 51622608} - m_PrefabAsset: {fileID: 0} --- !u!1 &493858624 GameObject: m_ObjectHideFlags: 0 @@ -406,7 +331,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1282284560 +--- !u!1001 &725083726 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -421,12 +346,12 @@ PrefabInstance: - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} propertyPath: m_LocalPosition.x - value: 5.5 + value: 40.5 objectReference: {fileID: 0} - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} propertyPath: m_LocalPosition.y - value: -1.5 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} @@ -456,7 +381,7 @@ PrefabInstance: - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} propertyPath: m_RootOrder - value: 3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} @@ -475,11 +400,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b3ad727215cf114088f643107357297, type: 3} ---- !u!4 &1282284561 stripped +--- !u!4 &725083727 stripped Transform: m_CorrespondingSourceObject: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} - m_PrefabInstance: {fileID: 1282284560} + m_PrefabInstance: {fileID: 725083726} m_PrefabAsset: {fileID: 0} --- !u!1 &1413427920 GameObject: @@ -560,7 +485,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 0 + m_Constraints: 4 --- !u!212 &1413427924 SpriteRenderer: m_ObjectHideFlags: 0 @@ -600,7 +525,7 @@ SpriteRenderer: m_SortingLayerID: 1913947151 m_SortingLayer: 2 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 479c2a30f9d08354783f16fcda70641c, type: 3} + m_Sprite: {fileID: 21300000, guid: a6a6100a79614194a954485e3012b2e9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -608,7 +533,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1413427925 @@ -2668,7 +2593,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!1001 &1455916647 +--- !u!1001 &1435258501 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -2683,12 +2608,12 @@ PrefabInstance: - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} propertyPath: m_LocalPosition.x - value: 5.5 + value: 40.5 objectReference: {fileID: 0} - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} propertyPath: m_LocalPosition.y - value: 1.5 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} @@ -2718,7 +2643,7 @@ PrefabInstance: - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} @@ -2737,11 +2662,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b3ad727215cf114088f643107357297, type: 3} ---- !u!4 &1455916648 stripped +--- !u!4 &1435258502 stripped Transform: m_CorrespondingSourceObject: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, type: 3} - m_PrefabInstance: {fileID: 1455916647} + m_PrefabInstance: {fileID: 1435258501} m_PrefabAsset: {fileID: 0} --- !u!1 &1603210741 GameObject: @@ -2800,6 +2725,7 @@ GameObject: - component: {fileID: 1688262108} - component: {fileID: 1688262110} - component: {fileID: 1688262109} + - component: {fileID: 1688262112} - component: {fileID: 1688262111} m_Layer: 5 m_Name: TimeDisplay @@ -2840,7 +2766,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2879,6 +2805,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 33fc2b78c2e314140aa5f17029b07df3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1688262112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688262107} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1699333068 GameObject: m_ObjectHideFlags: 0 @@ -2908,10 +2849,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 51622609} - - {fileID: 2097115485} - - {fileID: 1455916648} - - {fileID: 1282284561} + - {fileID: 725083727} + - {fileID: 1435258502} m_Father: {fileID: 636881363} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6613,78 +6552,3 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 ---- !u!1001 &2097115484 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1699333069} - m_Modifications: - - target: {fileID: 5617554557256136235, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_Name - value: CheckpointTile - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalPosition.x - value: 5.5 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.5 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2b3ad727215cf114088f643107357297, type: 3} ---- !u!4 &2097115485 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5617554557256136237, guid: 2b3ad727215cf114088f643107357297, - type: 3} - m_PrefabInstance: {fileID: 2097115484} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/Checkpoint.cs b/Assets/Scripts/Checkpoint.cs index dca33b8..12ead87 100644 --- a/Assets/Scripts/Checkpoint.cs +++ b/Assets/Scripts/Checkpoint.cs @@ -4,19 +4,8 @@ public class Checkpoint : MonoBehaviour { - void Start() - { - - } - - void Update() - { - - } - void OnTriggerEnter2D() { - Debug.Log("Checkpoint reached!"); LevelController.instance.EndGame(); } } From bd76c66b8c63e81234591a4fbfb53cbc09ff49c9 Mon Sep 17 00:00:00 2001 From: Jaden Balogh Date: Sun, 3 May 2020 12:58:39 -0700 Subject: [PATCH 04/10] Update UI and player speed --- Assets/Scenes/Main.unity | 2 +- Assets/Scripts/TimeDisplay.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index ef0bd00..7442c9b 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -438,7 +438,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c97e11b4edd8c534b808b0f1b410956c, type: 3} m_Name: m_EditorClassIdentifier: - movementSpeed: 3 + movementSpeed: 3.5 --- !u!61 &1413427922 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/TimeDisplay.cs b/Assets/Scripts/TimeDisplay.cs index e42457c..1af6969 100644 --- a/Assets/Scripts/TimeDisplay.cs +++ b/Assets/Scripts/TimeDisplay.cs @@ -14,7 +14,7 @@ void Awake() public void SetTime(float time) { - textComponent.text = "Score: " + time.ToString("f1") + "s"; + textComponent.text = "Time: " + time.ToString("f1") + "s"; } public void SetCompleted() From 39d518b9220e423a25945567931a3b7078cf2db9 Mon Sep 17 00:00:00 2001 From: Lilmergo Date: Sun, 3 May 2020 13:21:13 -0700 Subject: [PATCH 05/10] added player sprite - replaced wall placeholder with player sprite - scale pixels per unit to 64 --- Assets/Scenes/Main.unity | 2 +- Assets/Sprites/Player.meta | 8 ++ Assets/Sprites/Player/player.png | Bin 0 -> 22100 bytes Assets/Sprites/Player/player.png.meta | 104 ++++++++++++++++++++++++++ 4 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 Assets/Sprites/Player.meta create mode 100644 Assets/Sprites/Player/player.png create mode 100644 Assets/Sprites/Player/player.png.meta diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 7442c9b..546284f 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -525,7 +525,7 @@ SpriteRenderer: m_SortingLayerID: 1913947151 m_SortingLayer: 2 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: a6a6100a79614194a954485e3012b2e9, type: 3} + m_Sprite: {fileID: 21300000, guid: 38b4e4e8c02ad9046a80b614fc4d3297, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Sprites/Player.meta b/Assets/Sprites/Player.meta new file mode 100644 index 0000000..792e7b5 --- /dev/null +++ b/Assets/Sprites/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cade8ac076efc174c8269f6103ff5e46 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/player.png b/Assets/Sprites/Player/player.png new file mode 100644 index 0000000000000000000000000000000000000000..7789ff480de9d294eb3c5f908fbd0fae812049fd GIT binary patch literal 22100 zcmeI42UL?wx3FJ|(mR4kF%$)Xkc1wj_byf1Q3y$ZNC_oU1*y_JAfQx1P(h?BD2Q}K zu!5*`5RfLKpaKFS@CVVz@p!&J-~ZkJ-gVbX7J0Lo*?Z5-Gc$Yko2(?(#8`)cb{{PO z01SG%nr8S{)vYJ>Zv3?f`Z4@@ z{d-KCS+uk$xgX@lP$VRTp50?AP9I0xM>WBJIU(XoOx&Zjv7jriJ$1`dPd9G&Do>Xz zWLI`lHBr;2>Pnf)gwkJE=VKX-Xm4#Bn~+cqqZRT5n5ipK{66b~WWY*@qN12U6IBC1 z=Kq3@8fY@gYJ&1aZ!*1A&-jBZG?J_dmn3gM9m)=<1}3N%0IJ$#q1ovN&4FA>z~M2{ zaU3uK0}jHcr(OV|*((`AWPsgy{yk*5NdSlq9is`j90p1{kH%>M)=+@m$)FVu^nn4W zo|Tg>aHAS%>R_g;0I2B!sA){pA%HRnaCjgn=nq6@0PNbItQ0?rl`&6?;z?yxDAowU zwZiPE!Cq8WRuX(79eSK%?6L@QM5d}lOF#yfWSBJ5=)w~K$W7XVAML`re+Oe(M~7@e z6{9`)ZR74u0Y}I2jmgepPyED<;X=AL#37aYLJ#i_b>FyrV2;w|I9=|^<#?wGCe_UM}nR>2$2E%r@T>u#$dieHzPMjKuWg-IR@)1h1$ zZF#b2n9tLhOcUuiG?l3HwVH18EAI<|Rz1fWYf<)bQ&z78&CIh4lKBF$>dA-hA9%ir zdOae(Mxi_+1Kc>FOcs;`E$_-r7|Y>jJry$k@KYO&2PMW`u4T_VOh{Wj-S)^&0Z z0HIEL$zA|(TvJHG;!&kaJ2e1k=7x#hP~%=~-Yed;o2Pl#P&3_E2iZtUaIm+H<`MeN%3TqXtBJ*sN~7?1wozDEK(OnL#g(Fnhn7} z5JTn|XDygO&6yFk!r!b*$r>*NdKklQDqxT#qYE>OvjAD@@_thCCWlA=p?x>$@B=_H z{Og%I9oYG>3R9(*^tUx?3gz}iYG0;%hQh%z6FG9To_XKer*u{}Z~9rW3)4WNvPL_! z>CIj$sa7|rMB6>}oATl`Dagk+1xo0P+xFc!T0&79yM*k#=|{;Lrqx6vOX;T$Lhz~S zS{qs$_vsdbc!Z=`2597HC?ZW;gauLx4Q?I0%d**|X6YZ0?YC-k`{nJ1+uccarK)hw@Mnhh7`S+K|?+Nzi4RhgBWMi;V4 zpUi|mjo{ET$S=Ko;l(}|PM2j&`5W9_mf;J0#%a&2o>r~RjVMQhX7d28d9imvCuHKg>V ztSZeG&O514ji-C9T*MjEOp9DgTL_7J#Xf)N^&##8X~P;A`VZHl)U;IVV%=iXVx8G~ z*|PW7vJ2|9YHilS7}eVKh5r!NaZc>ml|60VZ$5mD_8NzglEPA%M3HMgcV4ZgU!%vh zx%8Zd>ZiZ(1Vh#>*4@8cThgJo-d#yAw0n@gW3S?U8856NFQk3&qp8NR zd#W1whzp3cvB;#FF2yU|+J9;@oyD~MF)lRj-sawR<>2mv{09w;-Wttini653IpY~+PWGTUVC8x8dvwE{esvT_oZN;k!tL~unDkf|TZ04%!JfdvjHu=_; zw#O>9OS4N4^wgHtUSqjdW1M1KoYUic@5aZfhgH|Bxo%AM?H(+va<2+TI6HDWSKlwY zH713@PqmZecY1Qv9ZACOW9eKSuO7i2g~PV z=P+~8LzkXNUpkayBjxk#-UE$M)5$Isx=RLLvIp3ZZgdibFR;9f+s`LGd zmJ#!u%Ab|JFO4gYE6Tl+d}U+*M6Rj&LG|M!_pmwkQ6n0s1vgQffty{xwa^1(&J?j> zYGHQdYb$}L_!|>c6b8|sEBfE7oz1OL+oP5kUK&2xT*~kA;N7`W{^jZPj-(C@W0XnA zo1SM>h$%$;y%2igsOTuGGb#z5G1mLKU}-XbT|*i^Bbr|{Q#D^@Im3>?%fb3GqRK@Q zClm+d?n>WPX_IiWdD3m2ZLQ~Kzyp^MEtB53W! zCcjInlL-*IFO@GoSraLI{al?PgW+(NLJmi!FUVa|NueGVk(_kSOTCESD5c8zt@D(V z@8c45RK>=9kN9c`-vz3Nu9fFXcG-YwtJDkLSlEj6ic(cLqph48pT<6drxxdkJ$?VA z^3mWqxr_6cHs7`Xh14GmG;$3)-ux)M`8JvBES)9oWK{6%Q1AO=N30<>BexM>&SY~d?}?2oV;|&9 z+jF{4WXOM#I~x0_F=Ocbt?R|DHKw5RAjI=qDrIYN~7YPI`p-N9ZwIdSX{MOwD@8nJNJC}HllaMqic>ksP41$yY4}| zy5)7{hYf?4WR^zVPTlA=y|v0^m9p5PnU&Nv_hY5T?q2WPDV|fTQwcIw_13)X=6$YY zVV2k@Yf zP|y67shwq>xn}2RclXE><*uH$uL8g74DM&TD6MD{pub@85Hm0n{vyTsQ|H<23)#UT z601WFgO{sZCz!DFcbRcx&$Tw=rw`X1?)c-=9o(mi!AUl&J64(H3ij@Aac>nj zQeGTsuf15CSyuChYt39>{p}#9g*R)->da&3`cjX*li5;%@3VE(d3uA&^4s9ygMqQb0cXfkx64$ zVn*WQGYn^DbL5rb@YgEd>oZ@kX>_7G59V-gT;6zG#>oK*S?Qkb?dVGH%1ir{meS~c zDu4ZL(=1o{U|UNYU&BLxDcJGFqigS*{f7K_=dX+~9ho=n_mUIyj2Vl0DV)zxhe^$Z8Zq8HZlQeV7<{G83|c15-KYPl7maYWaQ+e<-|df zP?!t^Dg}{(f+eLCq@fDZlA!Mo0cBder09)uQZUoh{@xt^KP3Sd9L`e#0`c?nlkk(0 zz10=S#iH4Y=eXu9Jk!USnd`|>_*LfeD8Tuz& zB3$9sf9uHe$F0oo`$ee!M~pa((?4`%tL7ig(EgZzFx#rxHv6`wwx?PVPhCO78;!tW zy)CdBBJV7E>7!MTI&*zXLecX%F9p9 z9X?P<1t+YxI|8SSaYs0#A)X%2ijbd$J2bzoUIjf59~{C1iPqCp#urFnFen8y6fQ6C zD2oEiAf(Y?S)?=^42R1>zg-YcFgcVgT=E+ZBcq+>e{-#gMV{Q+KzP^Nu?B@j;@uM# zk^&4VDFc^AIDzF+a&RyVhDLx9NTf6vg?5s5l0!O4B9N#b4efCDw}y^*WALF6;kH9( zYb+>yV<-et28BY&f)NNwDX^Tpv?JIN?t}t6Ny$sg$Uu>DP)C^`P5j2q-f8ZUzOj2ojKa;ucbdK+%VsQmM6m72fekYl>~llYC@DF1hFlfZ?QoEf!qpr%E+yS zj>c2?OX<&U5iGx(Vg5dy#39)Bzr*~W+wgNid;F`7vhC`d);~M(!8+mm5Z-7tXZ#8w zW)E+B{j1rp?iC?h$AcT@|HDN1AbkI`X^@9XA!MOwBp8K|gMnqC(onEGLIw_YbdrY3 zN=hQ&NEq_RH2=R%!!MEMe{LFnu41GM!owMjQil8(*^h$%#+gH6J$%vL|IQ}DZ&d_7 zDMEYuC_8y$-9ZRXPd5w_v9%!~z8_<-ow1k=m!r-#9U`Yws zPB%OBcKF#!{uS`K75<$67DAQrHh(MoRo{9mM{+y)EeDd5gyJ6%*w*#C>CWn3O>O?Q z>CWn3O@CTidSGzM_$>EZM}H~aVYPLKvJKT7e^-v)8rrW#ziOLc{LyaKniza$?6Z~O z$x45>`L*J=hBp6XxTE5`;r15Yaqs+XNo<$m@67RU3P1?&3hY=dgpBgPUidkp|9am9 zkEBKjD2NeAxQL-d&>`U>pddyd;Ub0-L5GBkfPxr-go_wT1RWAC0t#XT5-wsW5p+nn z2q=gVNVtfhM9?AOBA_5fAmJj05W-1QIS{C=ql>xCkhS z5lFa*p+wLj;Ub_QMj+uLh7v)Cgo}WJ7=eU~7)k^k5-tJ?VgwQ{Vki-GNVo_nh!IG* zh@nK#A>ksRAVwhJB8Cz{hlGoOf*65>ix^4-9TF}A3StBjE@CJVbV#@eD2NeAxQL-d z&>`U>pddyd;Ub0-L5GBkfPxr-go_wT1RWAC0t#Y;e~F9s=lAT<9{4ZU`{BPuKbkr7 z1^*3v5K`C72mk^P06=I20IY7}UuOW|BoqMNIskw|IskBDlkM+o<9{sbwVtM$h5x|2 ztl+aeXx?^}PN~i(bFYs3+1Wj-vcd#uK~?z|_u19uP>b|2>o-M4>bj}YZ$z}3=xVZ@ zO;6us&G!>f54UNAEK`pdflsdNlXT@nwomx29)`(5Wx`sK8%#0@fqPseO2>83^P_= z%Of0kR;K=3K7VYaXO$hW0uP9UW!irZ%TDVUCO^8qilOkFl~Q@VTFWOqMAh2q_w|~` zs2CZQ{OXu|by)*j==8EuF@=EUJ@9C=(c^dV?zWF#RI5C^eI$e;^w{!dQhej4%ok-v zxHGF0EWpFHvT4cUq>Vucxz=ovfay-f|v zCrf)%ad#`{(W(wm>e0JBkin4fuEc6vy}}EjaW){zM)&sP;nf_SBTILvm&t7HrYO>> zgqVpUBHC#0lQ zDHHE1?+vCK(tMddn)5+U=%5h7;e!xGgz&6!OUcQm($23j8upE~sI1s@+wi%LhGS%& zEEK%S2f|$sdj8pFt8Ph-Z~Dc6&uk?km>V9@8x@&zdViCTnb1Xc8ezSl zAUYw0JWckMx;jk%)Fbt@FXzg= z6rB~TBVo7F^7^y!b3H&N8JN$ujots{fIsip%kPL&x{5adBtF>B0LNDQ=oU(=&A*q zUbp6Ry(HSiVRk(^E%ki8!h^|bqXvZ*%#qcD>v%pmK=>dpu$=%3kA1j zc4eJE5vM(vPSb2;I`@=pOq{p3&Gu;_&m>Cg--E)G$W5(9U#7tdAoZBIwKIvbgEPE)=_t z;V4FPtQl29ngL+{hCh?yUA~^7wmiPQ{)>Bb-;F)6m_NI2xo`4`HS8cS=8N69#h9n} z%K=IIQ`5a`&O$)0*r2=m2Y$~`?)A?ujgwtVJR38vhQ<@H1}EniuD}x?PHh?WfWTWp zHP^4m1cV&G)Q`~#@~^BEj=ZU^G{udI#9k4aaf@SXe5+N%Xr|9&wMt$s$bsLdEwy!-NDrBQH~9&MDMhL#?GKKCI#=Y4cjD6(j# z5svqq1+@3q>-N7ttUqR^bhP5|eGWs^UkD_9dRysGE^yy?}SmWu^o?xekQ_9nAohW_ED0Z)1 zLf+Vf19Jf=I^G)Dt|ZsufscQN9F9G22cv7HKi7d<9-LJB18sOty_vM(VrsrNmH#N*K}JsGx{`PKV5sngUA&KG3JZ;? zds)M=v>n;IEQ&VX_P4YY-tox29A`q!RRZmQ|0zoD+2Ns?_RWnA%i39cDz`iLK6`!0 zD`T!Jnb^#Wk9@y~Wqdi*{^^pN2%q9j8EYffqy)!FX|^a4Q#}XFqT3DImyoQR=qZ?_ zcihyPMAn6v)cs{*tF?|i=d^C>(iL;H7U+7t!ylw?467rx*`TmNhKwhQ9LH}YZ!}a3 z2o&AkQ)*?44tTTvW@rNm@mvir=h($&{`HPJ5T>A(Yz5GFdIYWNt{K^M@AKz}joz3AhR-!^xndK%rNI*J4PmFVLq1;0xOw}M+)@Hr zZ4hJJu##1}$(}gABK8D9K_78;>6+GBwE6iAa)(nbsB7)36*XbyMw)J2-Hu3phvzwU zw_d?i-3D*=y1lw}G&*%@QR`SqTKpSFp!cNbF)C!qt@0)Iw!I!78%}-xvVJRoEOM&6 ztLtm0Nky3uuvlXmm4E)K8DGxy>i~(^$d(0*?yl^3-%-~HEWIr^j+x>X_Cv5M*Fdi+ z&tA-c>sxKr+qXmU@nZGXop981F|u+Cq_Q3(nf9nbc&<_!WJSC=u3Wf1p+|+zusYnZ z;1Dq1R?_57O%?(ica4}|TWLt_2{}jhb@bwaD|0p=cCBl@6lKNwz^rv{QSB}lccbAq z)?f#u+8ugGlqxq_MTMb--yrT-)N~EC8Z#xs(uRQ2sT_84`!&=31L>?XhM;F=peTpy zFFJJMH%tpyp7if3Fc{CdMm|yvYdXn$@L<8Cs}(ijRC_1(@aVjzaEp%o@R>hj zVJ4{pW9wzEjS?3Tvboqvo(~&grx&Gg51yMgBFEYmFD0BD;7<=9tSi50idYO^TUNEG zE*0!Oc(-D>tyhghm16gyUFz~HM*Gc7e97~pRm6&n7^l@$`=|LK9+;=9l5W zuc}YS;KGSy{i`vU3r^JHE%_ Date: Sun, 3 May 2020 15:20:04 -0700 Subject: [PATCH 06/10] Update HUD sorting layer --- Assets/Scenes/Main.unity | 2 +- ProjectSettings/TagManager.asset | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 9646026..21bca8d 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -626,7 +626,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 254244247 + m_SortingLayerID: -1917081857 m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!224 &1420357652 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index a95dac3..4cf85ac 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -48,5 +48,5 @@ TagManager: uniqueID: 1913947151 locked: 0 - name: UI - uniqueID: 254244247 + uniqueID: 2377885439 locked: 0 From 330f910003fdfe850b42f47ef153ed1e48e7525e Mon Sep 17 00:00:00 2001 From: Lilmergo Date: Sun, 3 May 2020 16:40:58 -0700 Subject: [PATCH 07/10] Idle animation for player added player sprite, idle sprite sheet and animation --- Assets/Animations.meta | 8 + .../Animations/Idle_sprite_sheet_0.controller | 12 ++ .../Idle_sprite_sheet_0.controller.meta | 8 + Assets/Animations/player_idle.anim | 53 +++++ Assets/Animations/player_idle.anim.meta | 8 + Assets/Sprites/Player/Idle_sprite_sheet.png | Bin 0 -> 21831 bytes .../Sprites/Player/Idle_sprite_sheet.png.meta | 182 ++++++++++++++++++ 7 files changed, 271 insertions(+) create mode 100644 Assets/Animations.meta create mode 100644 Assets/Animations/Idle_sprite_sheet_0.controller create mode 100644 Assets/Animations/Idle_sprite_sheet_0.controller.meta create mode 100644 Assets/Animations/player_idle.anim create mode 100644 Assets/Animations/player_idle.anim.meta create mode 100644 Assets/Sprites/Player/Idle_sprite_sheet.png create mode 100644 Assets/Sprites/Player/Idle_sprite_sheet.png.meta diff --git a/Assets/Animations.meta b/Assets/Animations.meta new file mode 100644 index 0000000..febaea3 --- /dev/null +++ b/Assets/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7dff7ee44b52d6344ba07469f610ee0e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Idle_sprite_sheet_0.controller b/Assets/Animations/Idle_sprite_sheet_0.controller new file mode 100644 index 0000000..305b3e4 --- /dev/null +++ b/Assets/Animations/Idle_sprite_sheet_0.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle_sprite_sheet_0 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/Assets/Animations/Idle_sprite_sheet_0.controller.meta b/Assets/Animations/Idle_sprite_sheet_0.controller.meta new file mode 100644 index 0000000..40031b8 --- /dev/null +++ b/Assets/Animations/Idle_sprite_sheet_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a328b4d2797f2054ba54539853f188bb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/player_idle.anim b/Assets/Animations/player_idle.anim new file mode 100644 index 0000000..ae85080 --- /dev/null +++ b/Assets/Animations/player_idle.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: player_idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/player_idle.anim.meta b/Assets/Animations/player_idle.anim.meta new file mode 100644 index 0000000..2b9d6c2 --- /dev/null +++ b/Assets/Animations/player_idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0884d22e5fd692d4fa46e1fd3c766fb1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/Idle_sprite_sheet.png b/Assets/Sprites/Player/Idle_sprite_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..ee0daa43e8501b1c15069bf28f6a86ab0a7ebb75 GIT binary patch literal 21831 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 R^6vAfbTkaqOV#Yd{~z!$=q&&M literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Player/Idle_sprite_sheet.png.meta b/Assets/Sprites/Player/Idle_sprite_sheet.png.meta new file mode 100644 index 0000000..2cc9b13 --- /dev/null +++ b/Assets/Sprites/Player/Idle_sprite_sheet.png.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: be96ebdb481316d41af313bc939f86a2 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8881852086280476939 + second: Idle_sprite_sheet_0 + - first: + 213: -6346362999820004702 + second: Idle_sprite_sheet_1 + - first: + 213: -6740654290224598787 + second: Idle_sprite_sheet_0 + - first: + 213: -3630519383162891311 + second: Idle_sprite_sheet_1 + - first: + 213: -9040790887311895192 + second: Idle_sprite_sheet_2 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 64 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Idle_sprite_sheet_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: df03375f2a26472a0800000000000000 + internalID: -6740654290224598787 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Idle_sprite_sheet_1 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1d3d7683bddcd9dc0800000000000000 + internalID: -3630519383162891311 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Idle_sprite_sheet_2 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8659f219698a88280800000000000000 + internalID: -9040790887311895192 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From 3b7c144b1ae95d5f863cfb9a6cff76bc37e2459a Mon Sep 17 00:00:00 2001 From: Lilmergo Date: Sun, 3 May 2020 17:51:40 -0700 Subject: [PATCH 08/10] player movement animation added movement spritesheet and animation --- .../Animations/Idle_sprite_sheet_0.controller | 62 +++++- .../movement_sprite_sheet_0.controller | 72 +++++++ .../movement_sprite_sheet_0.controller.meta | 8 + Assets/Animations/player_idle.anim | 46 ++++- Assets/Animations/player_movement.anim | 77 ++++++++ Assets/Animations/player_movement.anim.meta | 8 + .../Sprites/Player/movement_sprite_sheet.png | Bin 0 -> 24353 bytes .../Player/movement_sprite_sheet.png.meta | 176 ++++++++++++++++++ 8 files changed, 443 insertions(+), 6 deletions(-) create mode 100644 Assets/Animations/movement_sprite_sheet_0.controller create mode 100644 Assets/Animations/movement_sprite_sheet_0.controller.meta create mode 100644 Assets/Animations/player_movement.anim create mode 100644 Assets/Animations/player_movement.anim.meta create mode 100644 Assets/Sprites/Player/movement_sprite_sheet.png create mode 100644 Assets/Sprites/Player/movement_sprite_sheet.png.meta diff --git a/Assets/Animations/Idle_sprite_sheet_0.controller b/Assets/Animations/Idle_sprite_sheet_0.controller index 305b3e4..9e24da7 100644 --- a/Assets/Animations/Idle_sprite_sheet_0.controller +++ b/Assets/Animations/Idle_sprite_sheet_0.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-4683628564483349010 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: player_idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 0884d22e5fd692d4fa46e1fd3c766fb1, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -9,4 +35,38 @@ AnimatorController: m_Name: Idle_sprite_sheet_0 serializedVersion: 5 m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 4975175714463238045} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &4975175714463238045 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -4683628564483349010} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -4683628564483349010} diff --git a/Assets/Animations/movement_sprite_sheet_0.controller b/Assets/Animations/movement_sprite_sheet_0.controller new file mode 100644 index 0000000..36890cc --- /dev/null +++ b/Assets/Animations/movement_sprite_sheet_0.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: movement_sprite_sheet_0 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6203949734447310393} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &5175945139256332422 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: player_movement + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 4648d0375979fbb4e8e926237132ae18, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &6203949734447310393 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 5175945139256332422} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5175945139256332422} diff --git a/Assets/Animations/movement_sprite_sheet_0.controller.meta b/Assets/Animations/movement_sprite_sheet_0.controller.meta new file mode 100644 index 0000000..42b8053 --- /dev/null +++ b/Assets/Animations/movement_sprite_sheet_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7acb119ec6cccc5408217762ca3db8ef +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/player_idle.anim b/Assets/Animations/player_idle.anim index ae85080..d92a5b0 100644 --- a/Assets/Animations/player_idle.anim +++ b/Assets/Animations/player_idle.anim @@ -17,21 +17,57 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -8881852086280476939, guid: be96ebdb481316d41af313bc939f86a2, + type: 3} + - time: 0.083333336 + value: {fileID: -8881852086280476939, guid: be96ebdb481316d41af313bc939f86a2, + type: 3} + - time: 0.16666667 + value: {fileID: -6346362999820004702, guid: be96ebdb481316d41af313bc939f86a2, + type: 3} + - time: 0.5 + value: {fileID: -6346362999820004702, guid: be96ebdb481316d41af313bc939f86a2, + type: 3} + - time: 0.5833333 + value: {fileID: -9040790887311895192, guid: be96ebdb481316d41af313bc939f86a2, + type: 3} + - time: 0.6666667 + value: {fileID: -9040790887311895192, guid: be96ebdb481316d41af313bc939f86a2, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -8881852086280476939, guid: be96ebdb481316d41af313bc939f86a2, type: 3} + - {fileID: -8881852086280476939, guid: be96ebdb481316d41af313bc939f86a2, type: 3} + - {fileID: -6346362999820004702, guid: be96ebdb481316d41af313bc939f86a2, type: 3} + - {fileID: -6346362999820004702, guid: be96ebdb481316d41af313bc939f86a2, type: 3} + - {fileID: -9040790887311895192, guid: be96ebdb481316d41af313bc939f86a2, type: 3} + - {fileID: -9040790887311895192, guid: be96ebdb481316d41af313bc939f86a2, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.75 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/player_movement.anim b/Assets/Animations/player_movement.anim new file mode 100644 index 0000000..0a09474 --- /dev/null +++ b/Assets/Animations/player_movement.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: player_movement + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 8557713837914641959, guid: ec13d0852489767429487d7c0aa8748e, + type: 3} + - time: 0.16666667 + value: {fileID: -1793131902560908880, guid: ec13d0852489767429487d7c0aa8748e, + type: 3} + - time: 0.33333334 + value: {fileID: 3345798486640417026, guid: ec13d0852489767429487d7c0aa8748e, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 8557713837914641959, guid: ec13d0852489767429487d7c0aa8748e, type: 3} + - {fileID: -1793131902560908880, guid: ec13d0852489767429487d7c0aa8748e, type: 3} + - {fileID: 3345798486640417026, guid: ec13d0852489767429487d7c0aa8748e, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.4166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/player_movement.anim.meta b/Assets/Animations/player_movement.anim.meta new file mode 100644 index 0000000..8b442bb --- /dev/null +++ b/Assets/Animations/player_movement.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4648d0375979fbb4e8e926237132ae18 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/movement_sprite_sheet.png b/Assets/Sprites/Player/movement_sprite_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..1970c62fba4e89b6451f12d56773f43ca632175b GIT binary patch literal 24353 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 z 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 Hra}K7&e)!% literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Player/movement_sprite_sheet.png.meta b/Assets/Sprites/Player/movement_sprite_sheet.png.meta new file mode 100644 index 0000000..3f56d79 --- /dev/null +++ b/Assets/Sprites/Player/movement_sprite_sheet.png.meta @@ -0,0 +1,176 @@ +fileFormatVersion: 2 +guid: ec13d0852489767429487d7c0aa8748e +TextureImporter: + internalIDToNameTable: + - first: + 213: 8557713837914641959 + second: movement_sprite_sheet_0 + - first: + 213: -1793131902560908880 + second: movement_sprite_sheet_1 + - first: + 213: 3345798486640417026 + second: movement_sprite_sheet_2 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 64 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: movement_sprite_sheet_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 726d856156b13c670800000000000000 + internalID: 8557713837914641959 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: movement_sprite_sheet_1 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0b9cf68f8048d17e0800000000000000 + internalID: -1793131902560908880 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: movement_sprite_sheet_2 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 209dd3e2ff9ae6e20800000000000000 + internalID: 3345798486640417026 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From d78701dfa249ee67eb4f9c0378217508497c9b32 Mon Sep 17 00:00:00 2001 From: Jaden Balogh Date: Sun, 3 May 2020 18:44:16 -0700 Subject: [PATCH 09/10] Add player animator --- .../Animations/Idle_sprite_sheet_0.controller | 72 -------- Assets/Animations/Player.controller | 159 ++++++++++++++++++ ..._idle.anim.meta => Player.controller.meta} | 2 +- .../{player_idle.anim => PlayerIdle.anim} | 22 +-- ...0.controller.meta => PlayerIdle.anim.meta} | 2 +- .../{player_movement.anim => PlayerMove.anim} | 8 +- ...ovement.anim.meta => PlayerMove.anim.meta} | 2 +- .../movement_sprite_sheet_0.controller | 72 -------- .../movement_sprite_sheet_0.controller.meta | 8 - Assets/Scenes/Main.unity | 22 ++- Assets/Scripts/Player.cs | 16 +- 11 files changed, 206 insertions(+), 179 deletions(-) delete mode 100644 Assets/Animations/Idle_sprite_sheet_0.controller create mode 100644 Assets/Animations/Player.controller rename Assets/Animations/{player_idle.anim.meta => Player.controller.meta} (78%) rename Assets/Animations/{player_idle.anim => PlayerIdle.anim} (73%) rename Assets/Animations/{Idle_sprite_sheet_0.controller.meta => PlayerIdle.anim.meta} (78%) rename Assets/Animations/{player_movement.anim => PlayerMove.anim} (95%) rename Assets/Animations/{player_movement.anim.meta => PlayerMove.anim.meta} (78%) delete mode 100644 Assets/Animations/movement_sprite_sheet_0.controller delete mode 100644 Assets/Animations/movement_sprite_sheet_0.controller.meta diff --git a/Assets/Animations/Idle_sprite_sheet_0.controller b/Assets/Animations/Idle_sprite_sheet_0.controller deleted file mode 100644 index 9e24da7..0000000 --- a/Assets/Animations/Idle_sprite_sheet_0.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-4683628564483349010 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: player_idle - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 0884d22e5fd692d4fa46e1fd3c766fb1, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Idle_sprite_sheet_0 - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 4975175714463238045} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1107 &4975175714463238045 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -4683628564483349010} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -4683628564483349010} diff --git a/Assets/Animations/Player.controller b/Assets/Animations/Player.controller new file mode 100644 index 0000000..24ec53b --- /dev/null +++ b/Assets/Animations/Player.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7584289755329316101 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerMove + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4329202729814802561} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 9b461c1c44f8bcc4287b4db576f0fa61, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-3281273397376504217 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7584289755329316101} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.40000004 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: IsMoving + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 9203724832085611890} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1714020121257191822 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerIdle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3281273397376504217} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 94941b56c2afec644a8a99cf066e3ba7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &4329202729814802561 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1714020121257191822} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.40000004 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &9203724832085611890 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7584289755329316101} + m_Position: {x: 310, y: 230, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1714020121257191822} + m_Position: {x: 310, y: 120, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1714020121257191822} diff --git a/Assets/Animations/player_idle.anim.meta b/Assets/Animations/Player.controller.meta similarity index 78% rename from Assets/Animations/player_idle.anim.meta rename to Assets/Animations/Player.controller.meta index 2b9d6c2..4bfcfde 100644 --- a/Assets/Animations/player_idle.anim.meta +++ b/Assets/Animations/Player.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0884d22e5fd692d4fa46e1fd3c766fb1 +guid: 1f6f35ef89c2fc34ba147909f7ba9a8c NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Animations/player_idle.anim b/Assets/Animations/PlayerIdle.anim similarity index 73% rename from Assets/Animations/player_idle.anim rename to Assets/Animations/PlayerIdle.anim index d92a5b0..5ae699b 100644 --- a/Assets/Animations/player_idle.anim +++ b/Assets/Animations/PlayerIdle.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: player_idle + m_Name: PlayerIdle serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -22,26 +22,17 @@ AnimationClip: - time: 0 value: {fileID: -8881852086280476939, guid: be96ebdb481316d41af313bc939f86a2, type: 3} - - time: 0.083333336 - value: {fileID: -8881852086280476939, guid: be96ebdb481316d41af313bc939f86a2, - type: 3} - - time: 0.16666667 + - time: 0.2 value: {fileID: -6346362999820004702, guid: be96ebdb481316d41af313bc939f86a2, type: 3} - - time: 0.5 - value: {fileID: -6346362999820004702, guid: be96ebdb481316d41af313bc939f86a2, - type: 3} - - time: 0.5833333 - value: {fileID: -9040790887311895192, guid: be96ebdb481316d41af313bc939f86a2, - type: 3} - - time: 0.6666667 + - time: 0.4 value: {fileID: -9040790887311895192, guid: be96ebdb481316d41af313bc939f86a2, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 12 + m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -57,17 +48,14 @@ AnimationClip: isPPtrCurve: 1 pptrCurveMapping: - {fileID: -8881852086280476939, guid: be96ebdb481316d41af313bc939f86a2, type: 3} - - {fileID: -8881852086280476939, guid: be96ebdb481316d41af313bc939f86a2, type: 3} - {fileID: -6346362999820004702, guid: be96ebdb481316d41af313bc939f86a2, type: 3} - - {fileID: -6346362999820004702, guid: be96ebdb481316d41af313bc939f86a2, type: 3} - - {fileID: -9040790887311895192, guid: be96ebdb481316d41af313bc939f86a2, type: 3} - {fileID: -9040790887311895192, guid: be96ebdb481316d41af313bc939f86a2, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.75 + m_StopTime: 0.4166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Idle_sprite_sheet_0.controller.meta b/Assets/Animations/PlayerIdle.anim.meta similarity index 78% rename from Assets/Animations/Idle_sprite_sheet_0.controller.meta rename to Assets/Animations/PlayerIdle.anim.meta index 40031b8..fcf0ddc 100644 --- a/Assets/Animations/Idle_sprite_sheet_0.controller.meta +++ b/Assets/Animations/PlayerIdle.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a328b4d2797f2054ba54539853f188bb +guid: 94941b56c2afec644a8a99cf066e3ba7 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Animations/player_movement.anim b/Assets/Animations/PlayerMove.anim similarity index 95% rename from Assets/Animations/player_movement.anim rename to Assets/Animations/PlayerMove.anim index 0a09474..68e521d 100644 --- a/Assets/Animations/player_movement.anim +++ b/Assets/Animations/PlayerMove.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: player_movement + m_Name: PlayerMove serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -22,17 +22,17 @@ AnimationClip: - time: 0 value: {fileID: 8557713837914641959, guid: ec13d0852489767429487d7c0aa8748e, type: 3} - - time: 0.16666667 + - time: 0.2 value: {fileID: -1793131902560908880, guid: ec13d0852489767429487d7c0aa8748e, type: 3} - - time: 0.33333334 + - time: 0.4 value: {fileID: 3345798486640417026, guid: ec13d0852489767429487d7c0aa8748e, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 12 + m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Animations/player_movement.anim.meta b/Assets/Animations/PlayerMove.anim.meta similarity index 78% rename from Assets/Animations/player_movement.anim.meta rename to Assets/Animations/PlayerMove.anim.meta index 8b442bb..c3e0522 100644 --- a/Assets/Animations/player_movement.anim.meta +++ b/Assets/Animations/PlayerMove.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4648d0375979fbb4e8e926237132ae18 +guid: 9b461c1c44f8bcc4287b4db576f0fa61 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Animations/movement_sprite_sheet_0.controller b/Assets/Animations/movement_sprite_sheet_0.controller deleted file mode 100644 index 36890cc..0000000 --- a/Assets/Animations/movement_sprite_sheet_0.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: movement_sprite_sheet_0 - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 6203949734447310393} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &5175945139256332422 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: player_movement - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 4648d0375979fbb4e8e926237132ae18, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &6203949734447310393 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 5175945139256332422} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 5175945139256332422} diff --git a/Assets/Animations/movement_sprite_sheet_0.controller.meta b/Assets/Animations/movement_sprite_sheet_0.controller.meta deleted file mode 100644 index 42b8053..0000000 --- a/Assets/Animations/movement_sprite_sheet_0.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7acb119ec6cccc5408217762ca3db8ef -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 21bca8d..6120d20 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -419,6 +419,7 @@ GameObject: - component: {fileID: 1413427923} - component: {fileID: 1413427922} - component: {fileID: 1413427921} + - component: {fileID: 1413427926} m_Layer: 0 m_Name: Player m_TagString: Player @@ -544,12 +545,31 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1413427920} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 1.36, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1413427926 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1413427920} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1420357648 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 3085661..5b380a4 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -6,9 +6,13 @@ public class Player : MonoBehaviour { public float movementSpeed = 1f; - void Start() + private Animator animator; + private SpriteRenderer spriteRenderer; + + void Awake() { - + animator = GetComponent(); + spriteRenderer = GetComponent(); } void Update() @@ -37,6 +41,14 @@ private void Move() { dy--; } + + bool isMoving = dx != 0 || dy != 0; + animator.SetBool("IsMoving", isMoving); + if (dx != 0) + { + spriteRenderer.flipX = dx > 0; + } + Vector3 direction = new Vector3(dx, dy).normalized; transform.position += direction * movementSpeed * Time.deltaTime; } From f2248fe69a533d500d1db0a3db2e251d500f45ee Mon Sep 17 00:00:00 2001 From: Jaden Balogh Date: Sun, 3 May 2020 18:48:02 -0700 Subject: [PATCH 10/10] Adjust sorting layers --- Assets/Scenes/Main.unity | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 6120d20..413b998 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -525,7 +525,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1913947151 m_SortingLayer: 2 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 38b4e4e8c02ad9046a80b614fc4d3297, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -561,7 +561,7 @@ Animator: m_GameObject: {fileID: 1413427920} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 1f6f35ef89c2fc34ba147909f7ba9a8c, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -743,7 +743,7 @@ TilemapRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1913947151 m_SortingLayer: 2 - m_SortingOrder: 1 + m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} m_MaxChunkCount: 16