diff --git a/Assets/Model.meta b/Assets/Model.meta new file mode 100644 index 0000000..f22c276 --- /dev/null +++ b/Assets/Model.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 477280fac62d2934f9d0aa49bedf3251 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Model/EventControlTile.cs b/Assets/Model/EventControlTile.cs new file mode 100644 index 0000000..95fd97f --- /dev/null +++ b/Assets/Model/EventControlTile.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; +using UnityEngine.Tilemaps; + +namespace Assets.Model +{ + public class EventControlTile + { + public KeyCode keyCode; + public Tile tile; + public Tile successTile; + public Vector3Int position; + + public EventControlTile(KeyCode keyCode, Tile tile, Tile successTile, Vector3Int position) + { + this.keyCode = keyCode; + this.tile = tile; + this.successTile = successTile; + this.position = position; + } + } +} diff --git a/Assets/Model/EventControlTile.cs.meta b/Assets/Model/EventControlTile.cs.meta new file mode 100644 index 0000000..fff2c4e --- /dev/null +++ b/Assets/Model/EventControlTile.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 651afb7ac1f7a324b8b21db2b04ff151 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Bug.prefab b/Assets/Prefabs/Bug.prefab index 6eb9545..bad02d9 100644 --- a/Assets/Prefabs/Bug.prefab +++ b/Assets/Prefabs/Bug.prefab @@ -121,10 +121,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e5f777aa09d2ced42baa1cc6bf9dbe54, type: 3} m_Name: m_EditorClassIdentifier: - secondsGoingLeft: 1 - secondsGoingRight: 1 - movementSpeed: 5 + secondsGoingLeft: 0.8 + secondsGoingRight: 0.8 + movementSpeed: 2 playerCollider: {fileID: 0} + eventControls: {fileID: 0} --- !u!50 &3827363133515929334 Rigidbody2D: serializedVersion: 4 diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index 9e3c5a3..6f1015b 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -167,9 +167,11 @@ MonoBehaviour: m_EditorClassIdentifier: camera: {fileID: 1337282922} tile: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} + successTile: {fileID: 11400000, guid: 6cf7a50810d16f2468acc06180743d07, type: 2} framesPerControlTile: 15 - nextControlYOffset: 1 - nextControlXOffset: -2 + nextControlYOffset: 2 + nextControlXOffset: -1 + tileMapClearDelayInSeconds: 0.5 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -289,6 +291,186 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &136431330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 136431333} + - component: {fileID: 136431332} + - component: {fileID: 136431331} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &136431331 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136431330} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4, y: 4} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &136431332 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136431330} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8b1593eba53dfd848ba134d626f63f6c, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!4 &136431333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136431330} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.728933, y: -5.9760585, z: -27.586058} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &367096168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 367096169} + - component: {fileID: 367096170} + m_Layer: 0 + m_Name: StaminaBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &367096169 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367096168} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.39, y: 6.39, z: 6.1276217} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1146013793} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &367096170 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367096168} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 80eebf55b1280784a8820eb8444c6a7b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 4.5, y: 1.5} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &193535120 GameObject: m_ObjectHideFlags: 0 @@ -646,8 +828,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 1671840916} - offsetY: 0 - interpolate: 0.1 + offsetY: 2 + interpolate: 0.6 --- !u!4 &1146013793 stripped Transform: m_CorrespondingSourceObject: {fileID: 5711328081315814049, guid: fe8fb0c1c30f84b43885e84de26e0f11, @@ -1206,6 +1388,86 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2086987803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2086987804} + - component: {fileID: 2086987805} + m_Layer: 0 + m_Name: LifeBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2086987804 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086987803} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.85, y: -6.83, z: 8.230801} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1146013793} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2086987805 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086987803} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 82c7c7c05d293dd46aa29dd621784808, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 10, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2120494076 GameObject: m_ObjectHideFlags: 0 @@ -40136,5 +40398,10 @@ PrefabInstance: propertyPath: playerCollider value: objectReference: {fileID: 1671840919} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: eventControls + value: + objectReference: {fileID: 1491655} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} diff --git a/Assets/Scripts/BugMovement.cs b/Assets/Scripts/BugMovement.cs index 8ba32b7..40daa80 100644 --- a/Assets/Scripts/BugMovement.cs +++ b/Assets/Scripts/BugMovement.cs @@ -8,6 +8,7 @@ public class BugMovement : MonoBehaviour [SerializeField] private float secondsGoingRight = 1; [SerializeField] private float movementSpeed = 10; [SerializeField] BoxCollider2D playerCollider; + [SerializeField] EventControls eventControls; private int leftAccumalator = 0; private int rightAccumalator = 0; @@ -17,13 +18,15 @@ public class BugMovement : MonoBehaviour private void Start() { - Physics2D.IgnoreCollision(GetComponent(), playerCollider); rigidBody = GetComponent(); } // Update is called once per frame private void Update() { + if (HasEncounteredPlayer()) + eventControls.TriggerEvent(playerCollider, GetComponent()); + var totalFramesGoingLeft = framesPerSecond * secondsGoingLeft; var totalFramesGoingRight = framesPerSecond * secondsGoingRight; @@ -56,4 +59,9 @@ public class BugMovement : MonoBehaviour var actualSpeed = movementSpeed; rigidBody.velocity = new Vector2(actualSpeed, rigidBody.velocity.y); } + + private bool HasEncounteredPlayer() + { + return rigidBody.IsTouchingLayers(LayerMask.GetMask(LayerNames.Player)); + } } diff --git a/Assets/Scripts/CameraMovement.cs.meta b/Assets/Scripts/CameraMovement.cs.meta index a7d36b4..e4e1421 100644 --- a/Assets/Scripts/CameraMovement.cs.meta +++ b/Assets/Scripts/CameraMovement.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 100 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/EventControls.cs b/Assets/Scripts/EventControls.cs new file mode 100644 index 0000000..6eadd5b --- /dev/null +++ b/Assets/Scripts/EventControls.cs @@ -0,0 +1,172 @@ +using Assets.Model; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Tilemaps; + +public class EventControls : MonoBehaviour +{ + [SerializeField] private Camera camera; + [SerializeField] private Tile tile; + [SerializeField] private Tile successTile; + [SerializeField] private float framesPerControlTile = 15; + [SerializeField] private int nextControlYOffset = 0; + [SerializeField] private int nextControlXOffset = 0; + [SerializeField] private float tileMapClearDelayInSeconds = 0.5f; + + private Tilemap tilemap; + + /* For drawing event control tiles */ + private Vector3Int? initialCameraPosition; + private int maxNumberOfControlTiles = 3; + private int numberOfControlTilesSet = 0; + private int nextControlAccumalator = 0; + + private bool eventDrawn = false; + private bool eventTriggered = false; + private int eventCycleInSeconds = 2; + private int eventCycleAccumalator = 0; + private int tileMapClearDelayAccumalator = 0; + private EventControlTile currentEventControl; + + private Collider2D currentPlayerCollider; + private Collider2D currentEnemyCollider; + + private Queue eventControlTilesInCycle; + + private int framesPerSecond => 60; + private Vector3Int nextControlOffSetAsVector => new Vector3Int(nextControlXOffset, nextControlYOffset, 0); + + public void TriggerEvent(Collider2D playerCollider, Collider2D enemyCollider) + { + currentPlayerCollider = playerCollider; + currentEnemyCollider = enemyCollider; + Physics2D.IgnoreCollision(playerCollider, enemyCollider, true); + + eventTriggered = true; + } + + public bool IsEventTriggered() + { + + return eventTriggered; + } + + private void Start() + { + tilemap = GetComponent(); + eventControlTilesInCycle = new Queue(); + } + + private void Update() + { + if (eventTriggered) + { + SetTile(); + //SetTileMapPosition(); + } + + if (eventDrawn && eventTriggered) + { + PerformControlEvent(); + } + + if (eventDrawn && !eventTriggered) + { + Reset(); + } + } + + private void SetTile() + { + if (nextControlAccumalator >= framesPerControlTile && numberOfControlTilesSet < maxNumberOfControlTiles) + { + if (initialCameraPosition == null) + initialCameraPosition = GetCameraPosition(); + + // Store tiles for event cycle + var eventControlTile = new EventControlTile(KeyCode.W, tile, successTile, GetNextTilePosition() + nextControlOffSetAsVector); /* TODO: Hard code */ + eventControlTilesInCycle.Enqueue(eventControlTile); + + tilemap.SetTile(eventControlTile.position, tile); + + nextControlAccumalator = 0; + numberOfControlTilesSet++; + } + else if (numberOfControlTilesSet == maxNumberOfControlTiles) + { + initialCameraPosition = null; + eventDrawn = true; + } + else + { + nextControlAccumalator++; + } + } + + private Vector3Int GetCameraPosition() + { + return new Vector3Int((int)camera.transform.position.x, + (int)camera.transform.position.y, + (int)camera.transform.position.z); + } + + private Vector3Int GetNextTilePosition() + { + return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet, 0, 0)) + .GetValueOrDefault(); + } + + private void PerformControlEvent() + { + nextControlAccumalator = 0; + + if (currentEventControl == null) + currentEventControl = eventControlTilesInCycle.Dequeue(); + + if (Input.GetKeyDown(currentEventControl.keyCode)) + { + tilemap.SetTile(currentEventControl.position, currentEventControl.successTile); + + currentEventControl = null; + if (eventControlTilesInCycle.Count == 0) + { + eventTriggered = false; + eventCycleAccumalator = 0; + } + } + else if (eventCycleAccumalator >= eventCycleInSeconds * framesPerSecond) + { + + } + else + { + eventCycleAccumalator++; + } + } + + private void Reset() + { + if (tileMapClearDelayAccumalator >= tileMapClearDelayInSeconds * framesPerSecond) + { + tilemap.ClearAllTiles(); + tileMapClearDelayAccumalator = 0; + eventDrawn = false; + numberOfControlTilesSet = 0; + + Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); + currentPlayerCollider = null; + currentEnemyCollider = null; + } + else + { + tileMapClearDelayAccumalator++; + } + } + + private void SetTileMapPosition() + { + transform.position = camera.transform.position + + new Vector3Int(nextControlXOffset, nextControlYOffset, 0); // offset + } +} diff --git a/Assets/Scripts/EventControlsDisplay.cs.meta b/Assets/Scripts/EventControls.cs.meta similarity index 91% rename from Assets/Scripts/EventControlsDisplay.cs.meta rename to Assets/Scripts/EventControls.cs.meta index 8ad8c89..84457e3 100644 --- a/Assets/Scripts/EventControlsDisplay.cs.meta +++ b/Assets/Scripts/EventControls.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 200 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/EventControlsDisplay.cs b/Assets/Scripts/EventControlsDisplay.cs deleted file mode 100644 index b80931b..0000000 --- a/Assets/Scripts/EventControlsDisplay.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Tilemaps; - -public class EventControlsDisplay : MonoBehaviour -{ - [SerializeField] private Camera camera; - [SerializeField] private Tile tile; - [SerializeField] private float framesPerControlTile = 15; - [SerializeField] private int nextControlYOffset = 1; - [SerializeField] private int nextControlXOffset = -2; - - private Tilemap tilemap; - private int nextControlAccumalator = 0; - - private int framePerSecond => 60; - - private void Start() - { - tilemap = GetComponent(); - } - - private void Update() - { - - if (nextControlAccumalator >= framesPerControlTile && nextControlXOffset < 1) - { - tilemap.SetTile(GetCameraPosition() + new Vector3Int(nextControlXOffset, nextControlYOffset, 0), tile); - nextControlAccumalator = 0; - nextControlXOffset++; - } - else - { - //transform.position = Vector2.Lerp(transform.position, player.transform.position + new Vector3(0, offsetY, 0), .1f); - } - - nextControlAccumalator++; - } - - private Vector3Int GetCameraPosition() - { - return new Vector3Int((int) camera.transform.position.x, - (int) camera.transform.position.y, - (int) camera.transform.position.z); - } -} diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index d36ff54..49e7e2d 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -1,4 +1,5 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -10,9 +11,8 @@ public class Player : MonoBehaviour [SerializeField] private float groundErrorThreshold = 0.01f; private Rigidbody2D rigidBody; - private BoxCollider2D collider; + new private BoxCollider2D collider; private Animator animator; - private bool isInEncounter = false; private void Start() { @@ -23,8 +23,6 @@ public class Player : MonoBehaviour private void Update() { - //isInEncounter = HasEncounteredEnemy(); - //if (isInEncounter) MovePlayer(); } @@ -33,13 +31,14 @@ public class Player : MonoBehaviour Jump(); Run(); FlipSprite(); - MarkAsRunning(); + //MarkAsRunning(); + HandleAnimations(); } private void Jump() { // Jump - if (Input.GetKey(KeyCode.Space) && IsPlayerOnGround()) + if (Input.GetKeyDown(KeyCode.Space) && IsPlayerOnGround()) { rigidBody.velocity += new Vector2(0, jumpSpeed); rigidBody.velocity = new Vector2(rigidBody.velocity.x, @@ -102,4 +101,11 @@ public class Player : MonoBehaviour animator.SetBool("IsRunning", false); } } + + private void HandleAnimations() + { + animator.SetBool("IsRunning", Mathf.Abs(rigidBody.velocity.x) > float.Epsilon); + animator.SetBool("IsGround", IsPlayerOnGround()); + animator.SetFloat("YVelocity", rigidBody.velocity.y); + } } diff --git a/Assets/Scripts/Player.cs.meta b/Assets/Scripts/Player.cs.meta index 58fde68..b1db695 100644 --- a/Assets/Scripts/Player.cs.meta +++ b/Assets/Scripts/Player.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 50 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Sprites/Collectibles/Coffee.png b/Assets/Sprites/Collectibles/Coffee.png new file mode 100644 index 0000000..96dad33 Binary files /dev/null and b/Assets/Sprites/Collectibles/Coffee.png differ diff --git a/Assets/Sprites/Collectibles/Coffee.png.meta b/Assets/Sprites/Collectibles/Coffee.png.meta new file mode 100644 index 0000000..b6df58e --- /dev/null +++ b/Assets/Sprites/Collectibles/Coffee.png.meta @@ -0,0 +1,151 @@ +fileFormatVersion: 2 +guid: 66b61c174b527e14e9b5ad791405c46e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + 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 + 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 + - serializedVersion: 3 + buildTarget: Windows Store Apps + 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: iPhone + 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: Android + 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: WebGL + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Collectibles/pizza.png.meta b/Assets/Sprites/Collectibles/pizza.png.meta index 22d68ce..b218ce9 100644 --- a/Assets/Sprites/Collectibles/pizza.png.meta +++ b/Assets/Sprites/Collectibles/pizza.png.meta @@ -63,7 +63,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -75,7 +75,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -87,7 +87,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -99,7 +99,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -111,7 +111,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,7 +123,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/Controls/Buttons.png b/Assets/Sprites/Controls/Buttons.png new file mode 100644 index 0000000..46aa53c Binary files /dev/null and b/Assets/Sprites/Controls/Buttons.png differ diff --git a/Assets/Sprites/Controls/Buttons.png.meta b/Assets/Sprites/Controls/Buttons.png.meta new file mode 100644 index 0000000..b5a3e01 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons.png.meta @@ -0,0 +1,403 @@ +fileFormatVersion: 2 +guid: 41e19859471e9554081441f3912fd642 +TextureImporter: + internalIDToNameTable: + - first: + 213: 8894201953851282084 + second: Buttons_0 + - first: + 213: 7664807735657788756 + second: Buttons_1 + - first: + 213: -5402412272178277761 + second: Buttons_2 + - first: + 213: 2013261503205373015 + second: Buttons_3 + - first: + 213: 3760674464881954987 + second: Buttons_4 + - first: + 213: -7811504096720598664 + second: Buttons_5 + - first: + 213: -7814535901586335685 + second: Buttons_6 + - first: + 213: -3243065930256096816 + second: Buttons_7 + - first: + 213: -5316896731886317114 + second: Buttons_8 + - first: + 213: 7219830438018454713 + second: Buttons_9 + - first: + 213: 3100856887975758742 + second: Buttons_10 + - first: + 213: 4520375771122408675 + second: Buttons_11 + externalObjects: {} + serializedVersion: 10 + 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: 16 + 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 + 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 + - serializedVersion: 3 + buildTarget: WebGL + 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: Buttons_0 + rect: + serializedVersion: 2 + x: 1 + y: 121 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 771983acc2d2d614590277d7ff3d4a12 + internalID: 8894201953851282084 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_1 + rect: + serializedVersion: 2 + x: 25 + y: 121 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c1c5ef53feb463f4e80d085366da3b4a + internalID: 7664807735657788756 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_2 + rect: + serializedVersion: 2 + x: 1 + y: 97 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 61d8869a701da1649b6221cb6c5e7669 + internalID: -5402412272178277761 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_3 + rect: + serializedVersion: 2 + x: 25 + y: 97 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c2b21a77049f7334ba16935e70fa3c04 + internalID: 2013261503205373015 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_4 + rect: + serializedVersion: 2 + x: 1 + y: 73 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8745ecc39f073ea49af751755b0e5ae3 + internalID: 3760674464881954987 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_5 + rect: + serializedVersion: 2 + x: 25 + y: 73 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eaae1ffb4ef4aeb4db0bd07f0b71eab6 + internalID: -7811504096720598664 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_6 + rect: + serializedVersion: 2 + x: 1 + y: 49 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4e94035bc6af70b429517d2fe6fa525e + internalID: -7814535901586335685 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_7 + rect: + serializedVersion: 2 + x: 25 + y: 49 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5e64ab545a490104c8b040fd70d59d1e + internalID: -3243065930256096816 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_8 + rect: + serializedVersion: 2 + x: 1 + y: 25 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ced29ff062e9d9549981d3399e85ef87 + internalID: -5316896731886317114 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_9 + rect: + serializedVersion: 2 + x: 25 + y: 25 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 692327ffefa56a34aa833cd3b7a6b559 + internalID: 7219830438018454713 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_10 + rect: + serializedVersion: 2 + x: 1 + y: 1 + width: 22 + height: 22 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: db9b987a7e2fb7341bb9565a6961c61a + internalID: 3100856887975758742 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Buttons_11 + rect: + serializedVersion: 2 + x: 25 + y: 1 + width: 22 + height: 21 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 41caa7ddfc35e804cb7899be46e9acb0 + internalID: 4520375771122408675 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Control W Success.asset b/Assets/Sprites/Controls/Control W Success.asset new file mode 100644 index 0000000..4bedf93 --- /dev/null +++ b/Assets/Sprites/Controls/Control W Success.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Control W Success + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3} + m_Color: {r: 0.066082224, g: 0.9339623, b: 0.12693371, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Control W Success.asset.meta b/Assets/Sprites/Controls/Control W Success.asset.meta new file mode 100644 index 0000000..8f04672 --- /dev/null +++ b/Assets/Sprites/Controls/Control W Success.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6cf7a50810d16f2468acc06180743d07 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Plus.png b/Assets/Sprites/Controls/Plus.png new file mode 100644 index 0000000..dee090e Binary files /dev/null and b/Assets/Sprites/Controls/Plus.png differ diff --git a/Assets/Sprites/Controls/Plus.png.meta b/Assets/Sprites/Controls/Plus.png.meta new file mode 100644 index 0000000..97d3add --- /dev/null +++ b/Assets/Sprites/Controls/Plus.png.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: 7b479c9679b034648b04c7b0bb947faf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + 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 + 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 + - serializedVersion: 3 + buildTarget: WebGL + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemy/GioBug.meta b/Assets/Sprites/Enemy/GioBug.meta new file mode 100644 index 0000000..452bc84 --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b10abe26d9fb8b4b8833e1f030d78f0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemy/GioBug/GioBug.anim b/Assets/Sprites/Enemy/GioBug/GioBug.anim new file mode 100644 index 0000000..2fd35b4 --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug/GioBug.anim @@ -0,0 +1,73 @@ +%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: GioBug + 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: 7874731793569252650, guid: 843576248a0c2dc4eb92d627ffe951a6, + type: 3} + - time: 0.125 + value: {fileID: -2140509875661681078, guid: 843576248a0c2dc4eb92d627ffe951a6, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 8 + 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: 7874731793569252650, guid: 843576248a0c2dc4eb92d627ffe951a6, type: 3} + - {fileID: -2140509875661681078, guid: 843576248a0c2dc4eb92d627ffe951a6, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.25 + 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/Sprites/Enemy/GioBug/GioBug.anim.meta b/Assets/Sprites/Enemy/GioBug/GioBug.anim.meta new file mode 100644 index 0000000..ce0906f --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug/GioBug.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 35774ad3ac32bb641beb7c3b9e10f8d8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemy/GioBug/GioBug.png b/Assets/Sprites/Enemy/GioBug/GioBug.png new file mode 100644 index 0000000..2b4c5ed Binary files /dev/null and b/Assets/Sprites/Enemy/GioBug/GioBug.png differ diff --git a/Assets/Sprites/Enemy/GioBug/GioBug.png.meta b/Assets/Sprites/Enemy/GioBug/GioBug.png.meta new file mode 100644 index 0000000..eb3a924 --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug/GioBug.png.meta @@ -0,0 +1,199 @@ +fileFormatVersion: 2 +guid: 843576248a0c2dc4eb92d627ffe951a6 +TextureImporter: + internalIDToNameTable: + - first: + 213: 7874731793569252650 + second: GioBug0 + - first: + 213: -2140509875661681078 + second: GioBug1 + externalObjects: {} + serializedVersion: 10 + 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: 16 + 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 + 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 + - serializedVersion: 3 + buildTarget: Windows Store Apps + 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: iPhone + 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: Android + 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: WebGL + 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: GioBug0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 64 + height: 64 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 11ac28c96939e93498dfa9120ebda5eb + internalID: 7874731793569252650 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: GioBug1 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 64 + height: 64 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8d27cd8b1810d6546997ad498e0065a1 + internalID: -2140509875661681078 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller new file mode 100644 index 0000000..e68b27c --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-2351193573875906098 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GioBug + 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: 35774ad3ac32bb641beb7c3b9e10f8d8, 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: GioBugAnim + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6471426929848467592} + 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 &6471426929848467592 +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: -2351193573875906098} + 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: -2351193573875906098} diff --git a/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller.meta b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller.meta new file mode 100644 index 0000000..e3edc2d --- /dev/null +++ b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b76bb1b393cc12742a8731288b81b071 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemy/KatBug/KatBug.anim b/Assets/Sprites/Enemy/KatBug/KatBug.anim new file mode 100644 index 0000000..0864444 --- /dev/null +++ b/Assets/Sprites/Enemy/KatBug/KatBug.anim @@ -0,0 +1,81 @@ +%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: KatBug + 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: 7736766425618006454, guid: b0ab9d2a48d01f64892a3fddb3ab1622, + type: 3} + - time: 0.25 + value: {fileID: 3280950127566773269, guid: b0ab9d2a48d01f64892a3fddb3ab1622, + type: 3} + - time: 0.5 + value: {fileID: -8924824664453206661, guid: b0ab9d2a48d01f64892a3fddb3ab1622, + type: 3} + - time: 0.75 + value: {fileID: 5875687446670976453, guid: b0ab9d2a48d01f64892a3fddb3ab1622, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 4 + 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: 7736766425618006454, guid: b0ab9d2a48d01f64892a3fddb3ab1622, type: 3} + - {fileID: 3280950127566773269, guid: b0ab9d2a48d01f64892a3fddb3ab1622, type: 3} + - {fileID: -8924824664453206661, guid: b0ab9d2a48d01f64892a3fddb3ab1622, type: 3} + - {fileID: 5875687446670976453, guid: b0ab9d2a48d01f64892a3fddb3ab1622, type: 3} + 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/Sprites/Enemy/KatBug/KatBug.anim.meta b/Assets/Sprites/Enemy/KatBug/KatBug.anim.meta new file mode 100644 index 0000000..ee138a9 --- /dev/null +++ b/Assets/Sprites/Enemy/KatBug/KatBug.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 230aeafb651d43a4ba0b692f099ed9c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemy/KatBug/KatBug.png.meta b/Assets/Sprites/Enemy/KatBug/KatBug.png.meta index 145df43..f214b72 100644 --- a/Assets/Sprites/Enemy/KatBug/KatBug.png.meta +++ b/Assets/Sprites/Enemy/KatBug/KatBug.png.meta @@ -4,16 +4,16 @@ TextureImporter: internalIDToNameTable: - first: 213: 5875687446670976453 - second: KatBug_0 + second: KatBug0 - first: 213: 7736766425618006454 - second: KatBug_1 + second: KatBug1 - first: 213: 3280950127566773269 - second: KatBug_2 + second: KatBug2 - first: 213: -8924824664453206661 - second: KatBug_3 + second: KatBug3 externalObjects: {} serializedVersion: 10 mipmaps: @@ -110,84 +110,84 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: KatBug_0 + name: KatBug0 rect: serializedVersion: 2 x: 0 y: 64 width: 64 height: 64 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 6f4e391968fcf9d49970d99d64690f0a + spriteID: f5924d52da99945408e636c8884a6990 internalID: 5875687446670976453 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: KatBug_1 + name: KatBug1 rect: serializedVersion: 2 x: 64 y: 64 width: 64 height: 64 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 2f7c5fbbb87128a479ae7e7eea6295d8 + spriteID: 2cb774fc754a1594991edf9c9bbb933e internalID: 7736766425618006454 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: KatBug_2 + name: KatBug2 rect: serializedVersion: 2 x: 0 y: 0 width: 64 height: 64 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 1d2d498f1c1e82045a815f4805ce3e37 + spriteID: 79c1bd5e65859c44dbe562d3a59dc60b internalID: 3280950127566773269 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: KatBug_3 + name: KatBug3 rect: serializedVersion: 2 x: 64 y: 0 width: 64 height: 64 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: bacae02e7339d8b4cb8459a0ee11b233 + spriteID: e0a2841ce7fc12a49946571cd2410282 internalID: -8924824664453206661 vertices: [] indices: diff --git a/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller b/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller new file mode 100644 index 0000000..73869df --- /dev/null +++ b/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8082923426992956091 +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: -6909292311268931723} + 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: -6909292311268931723} +--- !u!1102 &-6909292311268931723 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: KatBug + 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: 230aeafb651d43a4ba0b692f099ed9c4, 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: KatBugAnim + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8082923426992956091} + 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} diff --git a/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller.meta b/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller.meta new file mode 100644 index 0000000..ca3aa8f --- /dev/null +++ b/Assets/Sprites/Enemy/KatBug/KatBugAnim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8b1593eba53dfd848ba134d626f63f6c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Hud.meta b/Assets/Sprites/Hud.meta new file mode 100644 index 0000000..7c0b3e6 --- /dev/null +++ b/Assets/Sprites/Hud.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9931456aa6e9e840b3bd497e9b0803d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Hud/Heart.png b/Assets/Sprites/Hud/Heart.png new file mode 100644 index 0000000..c0a2b18 Binary files /dev/null and b/Assets/Sprites/Hud/Heart.png differ diff --git a/Assets/Sprites/Hud/Heart.png.meta b/Assets/Sprites/Hud/Heart.png.meta new file mode 100644 index 0000000..eebd685 --- /dev/null +++ b/Assets/Sprites/Hud/Heart.png.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: 80eebf55b1280784a8820eb8444c6a7b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + 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 + 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 + - serializedVersion: 3 + buildTarget: WebGL + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Hud/StaminaBar.png b/Assets/Sprites/Hud/StaminaBar.png new file mode 100644 index 0000000..0c14635 Binary files /dev/null and b/Assets/Sprites/Hud/StaminaBar.png differ diff --git a/Assets/Sprites/Hud/StaminaBar.png.meta b/Assets/Sprites/Hud/StaminaBar.png.meta new file mode 100644 index 0000000..0bbb57d --- /dev/null +++ b/Assets/Sprites/Hud/StaminaBar.png.meta @@ -0,0 +1,151 @@ +fileFormatVersion: 2 +guid: 82c7c7c05d293dd46aa29dd621784808 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 12, y: 14, z: 12, w: 12} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + - serializedVersion: 3 + buildTarget: WebGL + 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: Windows Store Apps + 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: iPhone + 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: Android + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Palette/Event Controls.prefab b/Assets/Sprites/Palette/Event Controls.prefab index 7288274..1e82ddc 100644 --- a/Assets/Sprites/Palette/Event Controls.prefab +++ b/Assets/Sprites/Palette/Event Controls.prefab @@ -85,6 +85,15 @@ Tilemap: m_GameObject: {fileID: 7903917978724306658} m_Enabled: 1 m_Tiles: + - first: {x: -2, y: 1, z: 0} + second: + m_TileIndex: 1 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: 0, y: 1, z: 0} second: m_TileIndex: 0 @@ -98,11 +107,13 @@ Tilemap: m_TileAssetArray: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} - m_TileSpriteArray: - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 6cf7a50810d16f2468acc06180743d07, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 m_Data: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3} m_TileMatrixArray: - - m_RefCount: 1 + - m_RefCount: 2 m_Data: e00: 1 e01: 0 @@ -121,12 +132,12 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {r: 1, g: 1, b: 1, a: 1} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 2, z: 1} + m_Origin: {x: -2, y: 0, z: 0} + m_Size: {x: 3, y: 2, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: diff --git a/Assets/Sprites/Player/JrDevFall.anim b/Assets/Sprites/Player/JrDevFall.anim new file mode 100644 index 0000000..363d92f --- /dev/null +++ b/Assets/Sprites/Player/JrDevFall.anim @@ -0,0 +1,69 @@ +%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: JrDevFall + 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: 111747663661122317, guid: f983f27dec2fe7c428c3a3ed78b900d1, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 111747663661122317, guid: f983f27dec2fe7c428c3a3ed78b900d1, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + 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/Sprites/Player/JrDevFall.anim.meta b/Assets/Sprites/Player/JrDevFall.anim.meta new file mode 100644 index 0000000..e659124 --- /dev/null +++ b/Assets/Sprites/Player/JrDevFall.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c548f94c5ec43584b96000eba8131665 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/JrDevIdle.anim b/Assets/Sprites/Player/JrDevIdle.anim index 1040853..114a902 100644 --- a/Assets/Sprites/Player/JrDevIdle.anim +++ b/Assets/Sprites/Player/JrDevIdle.anim @@ -66,11 +66,4 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: - - time: 0 - functionName: - data: - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + m_Events: [] diff --git a/Assets/Sprites/Player/JrDevJump.anim b/Assets/Sprites/Player/JrDevJump.anim new file mode 100644 index 0000000..9d2e8cd --- /dev/null +++ b/Assets/Sprites/Player/JrDevJump.anim @@ -0,0 +1,69 @@ +%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: JrDevJump + 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: -8899148160246948828, guid: f983f27dec2fe7c428c3a3ed78b900d1, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -8899148160246948828, guid: f983f27dec2fe7c428c3a3ed78b900d1, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + 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/Sprites/Player/JrDevJump.anim.meta b/Assets/Sprites/Player/JrDevJump.anim.meta new file mode 100644 index 0000000..fbf13be --- /dev/null +++ b/Assets/Sprites/Player/JrDevJump.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1d96d85916a6600498f0b701f6fa0dbd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/JrDevRun.anim b/Assets/Sprites/Player/JrDevRun.anim index df48157..0d10626 100644 --- a/Assets/Sprites/Player/JrDevRun.anim +++ b/Assets/Sprites/Player/JrDevRun.anim @@ -29,7 +29,7 @@ AnimationClip: path: classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 10 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -70,18 +70,4 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: - - time: 0 - functionName: - data: - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 - - time: 0.2 - functionName: - data: - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + m_Events: [] diff --git a/Assets/Sprites/Player/Player.controller b/Assets/Sprites/Player/Player.controller index 798b5bb..062d010 100644 --- a/Assets/Sprites/Player/Player.controller +++ b/Assets/Sprites/Player/Player.controller @@ -11,20 +11,74 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2991084837782200938} - m_Position: {x: 290, y: 190, z: 0} + m_Position: {x: -120, y: 170, z: 0} - serializedVersion: 1 m_State: {fileID: 218451160527659384} - m_Position: {x: 280, y: 10, z: 0} + m_Position: {x: -120, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3835953866042416} + m_Position: {x: 160, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6251363122210737033} + m_Position: {x: 160, y: 270, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: 3708718943660755162} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} + m_AnyStatePosition: {x: -100, y: 40, z: 0} + m_EntryPosition: {x: -100, y: 80, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2991084837782200938} +--- !u!1101 &-4427708455344951909 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2991084837782200938} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-4109286016316069763 +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: IsRunning + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 218451160527659384} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-2991084837782200938 AnimatorState: serializedVersion: 5 @@ -36,7 +90,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 6827210264901212170} + - {fileID: -4109286016316069763} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -65,6 +119,18 @@ AnimatorController: m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 + m_DefaultBool: 1 + m_Controller: {fileID: 0} + - m_Name: IsGround + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: YVelocity + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} m_AnimatorLayers: @@ -80,6 +146,60 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &3835953866042416 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JrDevJump + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6603220255420949708} + - {fileID: -4427708455344951909} + - {fileID: 52732914799995005} + 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: 1d96d85916a6600498f0b701f6fa0dbd, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &52732914799995005 +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: IsGround + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 218451160527659384} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &218451160527659384 AnimatorState: serializedVersion: 5 @@ -91,7 +211,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 3208414158787817513} + - {fileID: 8688058787396499934} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -107,7 +227,161 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &3208414158787817513 +--- !u!1101 &577109220446267355 +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: IsGround + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 218451160527659384} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &666109352704067654 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: YVelocity + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3835953866042416} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3708718943660755162 +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: IsGround + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3835953866042416} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &4734573323873509709 +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: IsGround + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2991084837782200938} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &6251363122210737033 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JrDevFall + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 666109352704067654} + - {fileID: 4734573323873509709} + - {fileID: 577109220446267355} + 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: c548f94c5ec43584b96000eba8131665, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6603220255420949708 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: YVelocity + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6251363122210737033} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &8688058787396499934 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -127,32 +401,7 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &6827210264901212170 -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: IsRunning - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 218451160527659384} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1