diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index ca99db1..a54d416 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -166,7 +166,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: camera: {fileID: 1337282922} - tile: {fileID: 0} + tile: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} + framesPerControlTile: 15 + nextControlYOffset: 1 + nextControlXOffset: -2 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -499,10 +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 @@ -518,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} @@ -536,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 @@ -545,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} @@ -558,22 +561,19 @@ 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.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 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 @@ -612,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 @@ -639,24 +640,25 @@ MonoBehaviour: jumpSpeed: 30 runFasterFactor: 1.5 groundErrorThreshold: 0.05 ---- !u!68 &1671840922 -EdgeCollider2D: +--- !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_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} + 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 @@ -813,7 +815,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/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/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..b80931b 100644 --- a/Assets/Scripts/EventControlsDisplay.cs +++ b/Assets/Scripts/EventControlsDisplay.cs @@ -6,17 +6,42 @@ 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/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/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/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 0000000..8eb1b1e Binary files /dev/null and b/Assets/Sprites/Controls/Control W.png differ diff --git a/Assets/Sprites/Player/hero.png.meta b/Assets/Sprites/Controls/Control W.png.meta similarity index 66% rename from Assets/Sprites/Player/hero.png.meta rename to Assets/Sprites/Controls/Control W.png.meta index 39ed2a7..149d694 100644 --- a/Assets/Sprites/Player/hero.png.meta +++ b/Assets/Sprites/Controls/Control W.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 2df6c10caf1039b4b8017ed74c32574c +guid: 7c63d0c80ca19b944a6838f2becbc094 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 10 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -32,24 +32,24 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 3 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 16 + spritePixelsToUnits: 4 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 @@ -62,31 +62,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - 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: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -97,8 +73,20 @@ TextureImporter: spriteSheet: serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] + outline: + - - {x: 0, y: 2} + - {x: -1.7320509, y: 0.99999994} + - {x: -1.7320508, y: -1.0000001} + - {x: 0.00000017484555, y: -2} + - {x: 1.7320509, y: -0.9999998} + - {x: 1.7320509, y: 0.9999998} + physicsShape: + - - {x: 0, y: 2} + - {x: -1.7320509, y: 0.99999994} + - {x: -1.7320508, y: -1.0000001} + - {x: 0.00000017484555, y: -2} + - {x: 1.7320509, y: -0.9999998} + - {x: 1.7320509, y: 0.9999998} bones: [] spriteID: 5e97eb03825dee720800000000000000 internalID: 0 diff --git a/Assets/Sprites/Palette/Event Controls.prefab b/Assets/Sprites/Palette/Event Controls.prefab new file mode 100644 index 0000000..7288274 --- /dev/null +++ b/Assets/Sprites/Palette/Event Controls.prefab @@ -0,0 +1,207 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &250460987577937926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8451922393878023463} + - component: {fileID: 6482756908934580023} + m_Layer: 31 + m_Name: Event Controls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8451922393878023463 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 250460987577937926} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4445724640077345663} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &6482756908934580023 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 250460987577937926} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!1 &7903917978724306658 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4445724640077345663} + - component: {fileID: 1910082812748934942} + - component: {fileID: 1728952742816643536} + m_Layer: 31 + m_Name: Layer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4445724640077345663 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7903917978724306658} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8451922393878023463} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &1910082812748934942 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7903917978724306658} + m_Enabled: 1 + m_Tiles: + - first: {x: 0, y: 1, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} + m_TileSpriteArray: + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3} + m_TileMatrixArray: + - m_RefCount: 1 + m_Data: + 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_TileColorArray: + - m_RefCount: 1 + 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_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!483693784 &1728952742816643536 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7903917978724306658} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!114 &4149141949054693552 +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: 12395, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Palette Settings + m_EditorClassIdentifier: + cellSizing: 0 diff --git a/Assets/Sprites/Palette/Event Controls.prefab.meta b/Assets/Sprites/Palette/Event Controls.prefab.meta new file mode 100644 index 0000000..4f4fd53 --- /dev/null +++ b/Assets/Sprites/Palette/Event Controls.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 81db5aaa01ecff44db2a1f185624c92c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/JrDev.png b/Assets/Sprites/Player/JrDev.png new file mode 100644 index 0000000..5d5b2bc Binary files /dev/null and b/Assets/Sprites/Player/JrDev.png differ diff --git a/Assets/Sprites/Player/JrDev.png.meta b/Assets/Sprites/Player/JrDev.png.meta new file mode 100644 index 0000000..9f40e6b --- /dev/null +++ b/Assets/Sprites/Player/JrDev.png.meta @@ -0,0 +1,271 @@ +fileFormatVersion: 2 +guid: f983f27dec2fe7c428c3a3ed78b900d1 +TextureImporter: + internalIDToNameTable: + - first: + 213: 7394781096031462559 + second: JrDevIdle + - first: + 213: -1717341178490256666 + second: JrDevRun1 + - first: + 213: 5052719299223408713 + second: JrDevRun2 + - first: + 213: -8899148160246948828 + second: JrDevJump + - first: + 213: 111747663661122317 + second: JrDevFall + 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: 0 + 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: JrDevIdle + rect: + serializedVersion: 2 + x: 0 + y: 64 + 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: 86374016e66a36a40a65436719e0b707 + internalID: 7394781096031462559 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: JrDevRun1 + rect: + serializedVersion: 2 + x: 64 + y: 64 + 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: 578354f911b99a84b886bfb419c60a7b + internalID: -1717341178490256666 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: JrDevRun2 + rect: + serializedVersion: 2 + x: 128 + y: 64 + 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: cd4a447353767a349a3ef0be23e16d13 + internalID: 5052719299223408713 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: JrDevJump + 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: 7485496dd79020844a99727b74804931 + internalID: -8899148160246948828 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: JrDevFall + 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: 1f2b4486e434dab44b1d305865109c80 + internalID: 111747663661122317 + 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/Player/JrDevIdle.anim b/Assets/Sprites/Player/JrDevIdle.anim new file mode 100644 index 0000000..1040853 --- /dev/null +++ b/Assets/Sprites/Player/JrDevIdle.anim @@ -0,0 +1,76 @@ +%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: JrDevIdle + 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: 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: + - 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: 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: + - time: 0 + functionName: + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Sprites/Player/JrDevIdle.anim.meta b/Assets/Sprites/Player/JrDevIdle.anim.meta new file mode 100644 index 0000000..40ea52b --- /dev/null +++ b/Assets/Sprites/Player/JrDevIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d586c8de4190e2c44a9ddd1dc2690516 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/JrDevRun.anim b/Assets/Sprites/Player/JrDevRun.anim new file mode 100644 index 0000000..df48157 --- /dev/null +++ b/Assets/Sprites/Player/JrDevRun.anim @@ -0,0 +1,87 @@ +%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: JrDevRun + 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: -1717341178490256666, guid: f983f27dec2fe7c428c3a3ed78b900d1, + type: 3} + - time: 0.1 + value: {fileID: 5052719299223408713, 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: -1717341178490256666, guid: f983f27dec2fe7c428c3a3ed78b900d1, type: 3} + - {fileID: 5052719299223408713, guid: f983f27dec2fe7c428c3a3ed78b900d1, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.2 + 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: + - 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 diff --git a/Assets/Sprites/Player/JrDevRun.anim.meta b/Assets/Sprites/Player/JrDevRun.anim.meta new file mode 100644 index 0000000..0b211b5 --- /dev/null +++ b/Assets/Sprites/Player/JrDevRun.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3923f9bcc9ab22947a9c686da454a8ad +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/Player.controller b/Assets/Sprites/Player/Player.controller new file mode 100644 index 0000000..798b5bb --- /dev/null +++ b/Assets/Sprites/Player/Player.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-6298890634085635574 +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: -2991084837782200938} + m_Position: {x: 290, y: 190, z: 0} + - serializedVersion: 1 + m_State: {fileID: 218451160527659384} + m_Position: {x: 280, y: 10, 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: -2991084837782200938} +--- !u!1102 &-2991084837782200938 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JrDevIdle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6827210264901212170} + 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: d586c8de4190e2c44a9ddd1dc2690516, 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: Player + serializedVersion: 5 + 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 + m_StateMachine: {fileID: -6298890634085635574} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &218451160527659384 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JrDevRun + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3208414158787817513} + 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: 3923f9bcc9ab22947a9c686da454a8ad, type: 2} + m_Tag: + m_SpeedParameter: + 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 diff --git a/Assets/Sprites/Player/Player.controller.meta b/Assets/Sprites/Player/Player.controller.meta new file mode 100644 index 0000000..263fd92 --- /dev/null +++ b/Assets/Sprites/Player/Player.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 537fbdd150c1bf441b792acccecb7d3d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/hero.png b/Assets/Sprites/Player/hero.png deleted file mode 100644 index a884468..0000000 Binary files a/Assets/Sprites/Player/hero.png and /dev/null differ diff --git a/Assets/Textures/DitherBrush.png.meta b/Assets/Textures/DitherBrush.png.meta index f9fd875..fe8380b 100644 --- a/Assets/Textures/DitherBrush.png.meta +++ b/Assets/Textures/DitherBrush.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/Textures/LogoFull.png.meta b/Assets/Textures/LogoFull.png.meta index 9783f29..b1939c4 100644 --- a/Assets/Textures/LogoFull.png.meta +++ b/Assets/Textures/LogoFull.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/Textures/LogoHead.png.meta b/Assets/Textures/LogoHead.png.meta index d6c165a..351f7be 100644 --- a/Assets/Textures/LogoHead.png.meta +++ b/Assets/Textures/LogoHead.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/Textures/metal tiles.png.meta b/Assets/Textures/metal tiles.png.meta index 0303b18..c77ed22 100644 --- a/Assets/Textures/metal tiles.png.meta +++ b/Assets/Textures/metal tiles.png.meta @@ -157,6 +157,42 @@ TextureImporter: 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: diff --git a/Assets/Textures/neovera-service-bg.jpg.meta b/Assets/Textures/neovera-service-bg.jpg.meta index 5cd11f1..5c57c45 100644 --- a/Assets/Textures/neovera-service-bg.jpg.meta +++ b/Assets/Textures/neovera-service-bg.jpg.meta @@ -63,7 +63,67 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 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