From 2e29aa91a2b29ef927553e7fc22248ed8a2ddbe0 Mon Sep 17 00:00:00 2001 From: Sweet Tini Date: Sat, 1 Feb 2020 09:55:33 -0500 Subject: [PATCH 1/4] Add basic animations --- Assets/Scenes/LevelOne.unity | 26 +- Assets/Sprites/Player/JrDev.png | Bin 0 -> 2345 bytes Assets/Sprites/Player/JrDev.png.meta | 271 +++++++++++++++++++ Assets/Sprites/Player/JrDevIdle.anim | 53 ++++ Assets/Sprites/Player/JrDevIdle.anim.meta | 8 + Assets/Sprites/Player/JrDevRun.anim | 87 ++++++ Assets/Sprites/Player/JrDevRun.anim.meta | 8 + Assets/Sprites/Player/Player.controller | 101 +++++++ Assets/Sprites/Player/Player.controller.meta | 8 + 9 files changed, 559 insertions(+), 3 deletions(-) create mode 100644 Assets/Sprites/Player/JrDev.png create mode 100644 Assets/Sprites/Player/JrDev.png.meta create mode 100644 Assets/Sprites/Player/JrDevIdle.anim create mode 100644 Assets/Sprites/Player/JrDevIdle.anim.meta create mode 100644 Assets/Sprites/Player/JrDevRun.anim create mode 100644 Assets/Sprites/Player/JrDevRun.anim.meta create mode 100644 Assets/Sprites/Player/Player.controller create mode 100644 Assets/Sprites/Player/Player.controller.meta diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index c514863..acbe373 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -284,6 +284,7 @@ GameObject: - component: {fileID: 1671840918} - component: {fileID: 1671840921} - component: {fileID: 1671840922} + - component: {fileID: 1671840923} m_Layer: 10 m_Name: Player m_TagString: Untagged @@ -342,8 +343,8 @@ PolygonCollider2D: m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 2, y: 2} + pivot: {x: 0.5, y: 0} + oldSize: {x: 4, y: 4} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -437,6 +438,25 @@ EdgeCollider2D: m_Points: - {x: -1, y: -1.01} - {x: 1, y: -1.01} +--- !u!95 &1671840923 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671840916} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 537fbdd150c1bf441b792acccecb7d3d, 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!1 &1713017493 GameObject: m_ObjectHideFlags: 0 @@ -758,7 +778,7 @@ TilemapRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_ChunkCullingBounds: {x: 0.5, y: 0.5, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 diff --git a/Assets/Sprites/Player/JrDev.png b/Assets/Sprites/Player/JrDev.png new file mode 100644 index 0000000000000000000000000000000000000000..5d5b2bcb07253997bf022cf02995586e69f9351f GIT binary patch literal 2345 zcmV+^3D)+BP)Ssk9*<=9$5PyM+ps%X6()tG0#uOG(9hfSyq25)~*1>a@3mv z*~z`6F4L9M<6iXBzHxih zXbFx{qiv;=o2ds~JAvtGumQ@HAy%zF{aESbHukBmHEnt+K#yn>U|NfjPQI7vB{^(o z(;chR!VhKI7CQNMrkAv^5&)z((~W(`v-YNHdSCcS<3oJO%GJK4Fru5v*mrB>R!O^G4A8+{2D=AQLh946H+>47h0yc8w&44v z8o0;fodi}$efm|WPwCS!0dhZD2+$GTc5`#5*Pw~F1xA&jnt9C(l$ky!2vD$W*<8h# zsXigZ+Hzb-e`)&M0TL*HyAsJ=m85GE&Q-eP%js9%hKioc+f66kSNAS3dlcV1nUJzGd<^s0I`#&+Kg)4Ze>LZx|9T%4bZvbBy=h^ z243pM)W9>?m>PHn8&d<%U}I|F89ZV1t+89GxCS@_>u=8ANkt3bzKeZO%~k;c*!TF` zVrIh{D%ycE-T6MR^=qi;1;+HhfA}w}ngna8kO9E=%(tD*fHhQzLD1IX0pFIj>iZfh zRH0x!)3R3g4Qr@Sg_Q3pADNc5>iZfhv@z6rre#mLue_JW8Y;9QX1%`~;3s_BzOSJ| z8#2CsruXmv4oeNI)~}%g0CDU2?SgN;LEqO<0f4Oa@7BzAtxfCKPyv99^_9c$CvvQz z0ssNuGgJK}?ysQ&0|DPJS$`&O-Qxbk#u_SM(Dps$KIn6R*HD2(ul3C%a333>$yFdx zeVjKrcQtOpdX33{4Hc$PZ$0g;(0cND`ksgWNA2f_M&qub!W7!9ch2U$&iv@zO`)HA zH`M(#RG31&^?}8%;aE2x(Raoi{x^U)uLJAHy1#}BQ)s9GHP`vY8ropJlJ9G%uz;(+ zQ_HApSFNWrzdN&9dR9K{}f zsN#+gv7Yt12pSQ(aKyhI3RxBUlPDM>?l<6Vv_I$;MAL;{733t4NfZf)`)-X0zMoNf z?h#NCodGh5A|d5|WdUAC{v_u0r=0+`sfhPNs7VwCwE{TPU+IYhbi_A^RgDM}a8-qc z9sof0bg3(0XY@&Kv828VIkiTNbRoP1OZ}Kpu>;gwgZ!Z8<^u$ng#7nGDb>@zK+CAW zPofYA79c3Y<$=+kj63^n-^BpErRYzhD2UYHL2lPFU1;__Y7!JSE5Q=R9$;k>g?T7Z zhQr@`x-hvVz&(x^>@!a-qf|nYe>~ud03J$|fnB-iD)9X+T(Hl)xDPYU-vat;klFME zWiZ#K*#ObUzX!lMTf?{-1gn728aziTKzos@FtED-HLC!B3|u@>K{>nJ(;J3+6-!vx zZGFuuz;|;TBVe$IkRbXyKv~};tk0|hx#+|h(hLyy(v)y8aT;BM;SjDzvsb*?Qbk_ZM``w z`h8@bUEWQ$bKtB1K1i8(H{55sE%*RuFe!F)-afz?Oo| Date: Sat, 1 Feb 2020 09:56:08 -0500 Subject: [PATCH 2/4] events control WIP --- Assets/Scenes/LevelOne.unity | 5 +- Assets/Scripts/CameraMovement.cs | 2 +- Assets/Scripts/EventControlsDisplay.cs | 36 ++- Assets/Sprites/Controls/Control W.asset | 36 +++ Assets/Sprites/Controls/Control W.asset.meta | 8 + Assets/Sprites/Controls/Control W.png | Bin 0 -> 78 bytes Assets/Sprites/Controls/Control W.png.meta | 103 +++++++++ Assets/Sprites/Palette/Event Controls.prefab | 207 ++++++++++++++++++ .../Palette/Event Controls.prefab.meta | 7 + 9 files changed, 396 insertions(+), 8 deletions(-) create mode 100644 Assets/Sprites/Controls/Control W.asset create mode 100644 Assets/Sprites/Controls/Control W.asset.meta create mode 100644 Assets/Sprites/Controls/Control W.png create mode 100644 Assets/Sprites/Controls/Control W.png.meta create mode 100644 Assets/Sprites/Palette/Event Controls.prefab create mode 100644 Assets/Sprites/Palette/Event Controls.prefab.meta diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index ca99db1..5732917 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -166,7 +166,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: camera: {fileID: 1337282922} - tile: {fileID: 0} + tile: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} + framesPerControlTile: 15 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -813,7 +814,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1882958980 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CameraMovement.cs b/Assets/Scripts/CameraMovement.cs index e8f7a4a..477b215 100644 --- a/Assets/Scripts/CameraMovement.cs +++ b/Assets/Scripts/CameraMovement.cs @@ -15,6 +15,6 @@ public class CameraMovement : MonoBehaviour private void Update() { - transform.position = Vector2.Lerp(transform.position, player.transform.position + new Vector3(0, offsetY, 0), .2f); + transform.position = Vector2.Lerp(transform.position, player.transform.position + new Vector3(0, offsetY, 0), interpolate); } } diff --git a/Assets/Scripts/EventControlsDisplay.cs b/Assets/Scripts/EventControlsDisplay.cs index e1356ed..8ae3c4b 100644 --- a/Assets/Scripts/EventControlsDisplay.cs +++ b/Assets/Scripts/EventControlsDisplay.cs @@ -6,17 +6,43 @@ 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; - [SerializeField] private Tile tile; + private int nextControlAccumalator = 0; - void Start() + private int framePerSecond => 60; + + private void Start() { - tilemap = GetComponent(); + tilemap = GetComponent(); + } - void Update() + private void Update() { - tilemap.SetTile(new Vector3Int((int)camera.transform.position.x, (int)camera.transform.position.y, (int)camera.transform.position.z), tile); + + 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/Sprites/Controls/Control W.asset b/Assets/Sprites/Controls/Control W.asset new file mode 100644 index 0000000..f789d34 --- /dev/null +++ b/Assets/Sprites/Controls/Control W.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 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3} + m_Color: {r: 1, g: 1, b: 1, 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.asset.meta b/Assets/Sprites/Controls/Control W.asset.meta new file mode 100644 index 0000000..bbef4c4 --- /dev/null +++ b/Assets/Sprites/Controls/Control W.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ece7857530facb42b843eed2526c86a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Control W.png b/Assets/Sprites/Controls/Control W.png new file mode 100644 index 0000000000000000000000000000000000000000..8eb1b1ecc13b6e1d2375151866134cd7a040340c GIT binary patch literal 78 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=L_J*`LpWrU|M0W$cr!i aF)*;jval%k Date: Sat, 1 Feb 2020 10:29:31 -0500 Subject: [PATCH 3/4] Added player animation to script --- Assets/Scenes/LevelOne.unity | 49 ++++++------------ Assets/Scripts/BugMovement.cs | 2 +- Assets/Scripts/EventControlsDisplay.cs | 1 - Assets/Scripts/Player.cs | 44 ++++++++++++---- Assets/Sprites/Player/Player.controller | 68 +++++++++++++++++++++++-- 5 files changed, 113 insertions(+), 51 deletions(-) diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index 4b67efe..a54d416 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -168,6 +168,8 @@ MonoBehaviour: camera: {fileID: 1337282922} tile: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} framesPerControlTile: 15 + nextControlYOffset: 1 + nextControlXOffset: -2 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -500,11 +502,10 @@ GameObject: m_Component: - component: {fileID: 1671840917} - component: {fileID: 1671840920} - - component: {fileID: 1671840919} - component: {fileID: 1671840918} - component: {fileID: 1671840921} - - component: {fileID: 1671840922} - component: {fileID: 1671840923} + - component: {fileID: 1671840919} m_Layer: 10 m_Name: Player m_TagString: Untagged @@ -520,7 +521,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671840916} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -15, y: -3, z: 0} + m_LocalPosition: {x: -4.5, y: -4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} @@ -538,7 +539,7 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 1 + m_Mass: 2 m_LinearDrag: 0 m_AngularDrag: 0.05 m_GravityScale: 1 @@ -547,8 +548,8 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 1 m_Constraints: 4 ---- !u!60 &1671840919 -PolygonCollider2D: +--- !u!61 &1671840919 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -560,7 +561,7 @@ PolygonCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: -0.01, y: 1.36} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0} @@ -569,13 +570,10 @@ PolygonCollider2D: adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: 0, y: 1} - - {x: -1, y: -0.00000004371139} - - {x: 0.00000008742278, y: -1} - - {x: 1, y: 0.000000011924881} + m_AutoTiling: 1 + serializedVersion: 2 + m_Size: {x: 0.9, y: 2.79} + m_EdgeRadius: 0 --- !u!212 &1671840920 SpriteRenderer: m_ObjectHideFlags: 0 @@ -614,7 +612,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 0bc163d589d23d04a981d50eee804428, type: 3} + m_Sprite: {fileID: 7394781096031462559, guid: f983f27dec2fe7c428c3a3ed78b900d1, + type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -641,24 +640,6 @@ MonoBehaviour: jumpSpeed: 30 runFasterFactor: 1.5 groundErrorThreshold: 0.05 ---- !u!68 &1671840922 -EdgeCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1671840916} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_EdgeRadius: 0 - m_Points: - - {x: -1, y: -1.01} - - {x: 1, y: -1.01} --- !u!95 &1671840923 Animator: serializedVersion: 3 @@ -1481,7 +1462,7 @@ TilemapRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0.5, y: 0.5, z: 0} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 diff --git a/Assets/Scripts/BugMovement.cs b/Assets/Scripts/BugMovement.cs index 5de94ee..8ba32b7 100644 --- a/Assets/Scripts/BugMovement.cs +++ b/Assets/Scripts/BugMovement.cs @@ -7,7 +7,7 @@ public class BugMovement : MonoBehaviour [SerializeField] private float secondsGoingLeft = 1; [SerializeField] private float secondsGoingRight = 1; [SerializeField] private float movementSpeed = 10; - [SerializeField] PolygonCollider2D playerCollider; + [SerializeField] BoxCollider2D playerCollider; private int leftAccumalator = 0; private int rightAccumalator = 0; diff --git a/Assets/Scripts/EventControlsDisplay.cs b/Assets/Scripts/EventControlsDisplay.cs index 8ae3c4b..b80931b 100644 --- a/Assets/Scripts/EventControlsDisplay.cs +++ b/Assets/Scripts/EventControlsDisplay.cs @@ -19,7 +19,6 @@ public class EventControlsDisplay : MonoBehaviour private void Start() { tilemap = GetComponent(); - } private void Update() diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 3c86371..d36ff54 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -9,14 +9,16 @@ public class Player : MonoBehaviour [SerializeField] private float runFasterFactor = 1.5f; [SerializeField] private float groundErrorThreshold = 0.01f; - private Rigidbody2D rigidbody; - private PolygonCollider2D collider; + private Rigidbody2D rigidBody; + private BoxCollider2D collider; + private Animator animator; private bool isInEncounter = false; private void Start() { - rigidbody = GetComponent(); - collider = GetComponent(); + rigidBody = GetComponent(); + collider = GetComponent(); + animator = GetComponent(); } private void Update() @@ -30,6 +32,8 @@ public class Player : MonoBehaviour { Jump(); Run(); + FlipSprite(); + MarkAsRunning(); } private void Jump() @@ -37,9 +41,9 @@ public class Player : MonoBehaviour // Jump if (Input.GetKey(KeyCode.Space) && IsPlayerOnGround()) { - rigidbody.velocity += new Vector2(0, jumpSpeed); - rigidbody.velocity = new Vector2(rigidbody.velocity.x, - Mathf.Clamp(rigidbody.velocity.y, 0, jumpSpeed)); + rigidBody.velocity += new Vector2(0, jumpSpeed); + rigidBody.velocity = new Vector2(rigidBody.velocity.x, + Mathf.Clamp(rigidBody.velocity.y, 0, jumpSpeed)); } } @@ -56,11 +60,11 @@ public class Player : MonoBehaviour // Run if (Input.GetKey(KeyCode.RightArrow)) { - rigidbody.velocity = new Vector2(actualRunSpeed, rigidbody.velocity.y); + rigidBody.velocity = new Vector2(actualRunSpeed, rigidBody.velocity.y); } else if (Input.GetKey(KeyCode.LeftArrow)) { - rigidbody.velocity = new Vector2(actualRunSpeed * -1, rigidbody.velocity.y); + rigidBody.velocity = new Vector2(actualRunSpeed * -1, rigidBody.velocity.y); } } @@ -76,6 +80,26 @@ public class Player : MonoBehaviour private bool HasEncounteredEnemy() { - return rigidbody.IsTouchingLayers(LayerMask.GetMask(LayerNames.Enemies)); + return rigidBody.IsTouchingLayers(LayerMask.GetMask(LayerNames.Enemies)); + } + + private void FlipSprite() + { + if (Mathf.Abs(rigidBody.velocity.x) > Mathf.Epsilon && (Input.GetKey(KeyCode.RightArrow) || Input.GetKey(KeyCode.LeftArrow))) + { + transform.localScale = new Vector2(Mathf.Sign(rigidBody.velocity.x), 1f); + } + } + + private void MarkAsRunning() + { + if (Mathf.Abs(rigidBody.velocity.x) > Mathf.Epsilon) + { + animator.SetBool("IsRunning", true); + } + else + { + animator.SetBool("IsRunning", false); + } } } diff --git a/Assets/Sprites/Player/Player.controller b/Assets/Sprites/Player/Player.controller index a5642f6..798b5bb 100644 --- a/Assets/Sprites/Player/Player.controller +++ b/Assets/Sprites/Player/Player.controller @@ -11,10 +11,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2991084837782200938} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 290, y: 190, z: 0} - serializedVersion: 1 m_State: {fileID: 218451160527659384} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 280, y: 10, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -35,7 +35,8 @@ AnimatorState: m_Name: JrDevIdle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 6827210264901212170} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -59,7 +60,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Player serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: IsRunning + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -83,7 +90,8 @@ AnimatorState: m_Name: JrDevRun m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 3208414158787817513} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -99,3 +107,53 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &3208414158787817513 +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: IsRunning + 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: 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_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 From 9e2f7483536e5b5ad57f9fa4036e471e2545a068 Mon Sep 17 00:00:00 2001 From: Sweet Tini Date: Sat, 1 Feb 2020 10:30:40 -0500 Subject: [PATCH 4/4] Remove compression quality on sprites --- Assets/Sprites/Controls.meta | 2 +- Assets/Sprites/Player/JrDev.png.meta | 36 +++--- Assets/Sprites/Player/JrDevIdle.anim | 33 +++++- Assets/Sprites/Player/hero.png | Bin 731 -> 0 bytes Assets/Sprites/Player/hero.png.meta | 115 -------------------- Assets/Textures/DitherBrush.png.meta | 12 +- Assets/Textures/LogoFull.png.meta | 12 +- Assets/Textures/LogoHead.png.meta | 12 +- Assets/Textures/metal tiles.png.meta | 36 ++++++ Assets/Textures/neovera-service-bg.jpg.meta | 62 ++++++++++- 10 files changed, 162 insertions(+), 158 deletions(-) delete mode 100644 Assets/Sprites/Player/hero.png delete mode 100644 Assets/Sprites/Player/hero.png.meta diff --git a/Assets/Sprites/Controls.meta b/Assets/Sprites/Controls.meta index 5b027c5..ca48b25 100644 --- a/Assets/Sprites/Controls.meta +++ b/Assets/Sprites/Controls.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 394b12e250ac73549b5a1bd20b0c4910 +guid: bf9fc495ca38d7d4d804ad1d2df0f4c5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Sprites/Player/JrDev.png.meta b/Assets/Sprites/Player/JrDev.png.meta index a9e8dd9..9f40e6b 100644 --- a/Assets/Sprites/Player/JrDev.png.meta +++ b/Assets/Sprites/Player/JrDev.png.meta @@ -4,25 +4,25 @@ TextureImporter: internalIDToNameTable: - first: 213: 7394781096031462559 - second: JrDev_Idle + second: JrDevIdle - first: 213: -1717341178490256666 - second: JrDev_Run1 + second: JrDevRun1 - first: 213: 5052719299223408713 - second: JrDev_Run2 + second: JrDevRun2 - first: 213: -8899148160246948828 - second: JrDev_Jump + second: JrDevJump - first: 213: 111747663661122317 - second: JrDev_Fall + second: JrDevFall externalObjects: {} serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -62,7 +62,7 @@ TextureImporter: spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -78,7 +78,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -90,7 +90,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -102,7 +102,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -114,7 +114,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -126,7 +126,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -138,7 +138,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -149,7 +149,7 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: JrDev_Idle + name: JrDevIdle rect: serializedVersion: 2 x: 0 @@ -170,7 +170,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: JrDev_Run1 + name: JrDevRun1 rect: serializedVersion: 2 x: 64 @@ -191,7 +191,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: JrDev_Run2 + name: JrDevRun2 rect: serializedVersion: 2 x: 128 @@ -212,7 +212,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: JrDev_Jump + name: JrDevJump rect: serializedVersion: 2 x: 0 @@ -233,7 +233,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: JrDev_Fall + name: JrDevFall rect: serializedVersion: 2 x: 64 diff --git a/Assets/Sprites/Player/JrDevIdle.anim b/Assets/Sprites/Player/JrDevIdle.anim index e1ae42d..1040853 100644 --- a/Assets/Sprites/Player/JrDevIdle.anim +++ b/Assets/Sprites/Player/JrDevIdle.anim @@ -17,21 +17,37 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 7394781096031462559, 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: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 7394781096031462559, guid: f983f27dec2fe7c428c3a3ed78b900d1, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.016666668 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -50,4 +66,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Sprites/Player/hero.png b/Assets/Sprites/Player/hero.png deleted file mode 100644 index a8844685138fa11e12f8073ed0201ba757192e69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 731 zcmV<10wn#3P)00007bV*G`2jl_) z0v|OS5ZU4Y000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yP=Ro*Vjj?v_(w|@n^d?vWy$O~;Z-Vy__%$D{%qQTu?a%jCIt!G({zTuRj=qZk zWy_Ar+DuM4B8$4;B!~zz1lE{<^s-d4K}Eb-h$cp`+-P1ajPr zeo%o6bSynm;AUXyAp-H~^H_3fvm62?xQ!;u(QT`jmq)d(S*AP#uAT zx`5xsP0gPWP);Ggg+hU2dNF=bz5J1kn&z(-Aig|t=F*!|kB2{%LJa-v3ZKcL1Oma~ zi$e#O3Ifc8BL@4nfTKb{c^2}Uiod&5faecAS#u1;1SpFnmUIX{%e(Q+(o*`m6yk8Q zPwof=_tbFL3s}pCZ>n7{djLaUDex+U8zq}SfE=O&L#_;wrE9-q0D;t6mM`8`qKkmx zdy2w>p>G$cbAZu91WfSzpDT1EJxX9p{V(&G*TAF01ddr~b0Ce#j0s1F3q+?;