diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 629f45b..85c76a9 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -61,6 +61,7 @@ + diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 5f12fe3..2964803 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -121,6 +121,277 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &219260671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 219260672} + - component: {fileID: 219260673} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &219260672 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 219260671} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.23012455, y: 3.2188933, z: -23.273745} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &219260673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 219260671} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee409c97d3c47248aa00378547f85278, type: 3} + m_Name: + m_EditorClassIdentifier: + platformLeft: {fileID: 887921231} + platformMiddle: {fileID: 407879045} + platformRight: {fileID: 413955008} + player: {fileID: 2053847422} + maxSize: 5 +--- !u!1 &407879043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 407879045} + - component: {fileID: 407879044} + - component: {fileID: 407879046} + m_Layer: 0 + m_Name: PlatformMid + m_TagString: Ground + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &407879044 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 407879043} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 277681d38786cd38fb431511c081d3a3, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.7, y: 0.7} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &407879045 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 407879043} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.7, y: 2.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &407879046 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 407879043} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + 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: 0.7, y: 0.7} + newSize: {x: 0.7, y: 0.7} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.7, y: 0.7} + m_EdgeRadius: 0 +--- !u!1 &413955006 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 413955008} + - component: {fileID: 413955007} + - component: {fileID: 413955009} + m_Layer: 0 + m_Name: PlatformRight + m_TagString: Ground + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &413955007 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 413955006} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 3d88c48f0ac5f1b76a9b63a3c4f97dd6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.7, y: 0.7} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &413955008 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 413955006} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.4, y: 2.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &413955009 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 413955006} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + 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: 0.7, y: 0.7} + newSize: {x: 0.7, y: 0.7} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.35, y: 0.35} + - {x: -0.35, y: -0.35} + - {x: -0.021993905, y: -0.2905682} + - {x: 0.22573361, y: -0.16113642} + - {x: 0.3280517, y: -0.009914637} + - {x: 0.3570025, y: 0.12124181} + - {x: 0.328475, y: 0.32086563} + - {x: 0.23113629, y: 0.34999976} --- !u!1 &416234157 GameObject: m_ObjectHideFlags: 0 @@ -202,7 +473,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &416234160 MonoBehaviour: @@ -236,6 +507,121 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: smoothing: 1 +--- !u!1 &887921229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 887921231} + - component: {fileID: 887921230} + - component: {fileID: 887921232} + m_Layer: 0 + m_Name: PlatformLeft + m_TagString: Ground + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &887921230 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 887921229} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 53c010de1631b4bd7aab9bc8bff49cd1, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.7, y: 0.7} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &887921231 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 887921229} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1, y: 2.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &887921232 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 887921229} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + 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: 0.7, y: 0.7} + newSize: {x: 0.7, y: 0.7} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.28193402, y: 0.33931836} + - {x: -0.3446593, y: 0.30261526} + - {x: -0.35751337, y: 0.15566969} + - {x: -0.32897726, y: -0.008648053} + - {x: -0.15077958, y: -0.21121931} + - {x: 0.031678874, y: -0.2983211} + - {x: 0.35, y: -0.35} + - {x: 0.35, y: 0.35} --- !u!1 &996257474 GameObject: m_ObjectHideFlags: 0 @@ -317,7 +703,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &996257477 MonoBehaviour: @@ -394,7 +780,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1043406433 GameObject: @@ -526,7 +912,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1070284626 MonoBehaviour: @@ -621,7 +1007,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1351818047 GameObject: @@ -803,7 +1189,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1372634519 MonoBehaviour: @@ -917,7 +1303,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!68 &1508769556 EdgeCollider2D: @@ -1057,7 +1443,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1692511763 GameObject: @@ -1083,11 +1469,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1692511763} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.27, y: 2.74, z: -2.796909} + m_LocalPosition: {x: 2.27, y: 3.93, z: -2.796909} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2051666664 GameObject: @@ -1118,7 +1504,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!58 &2051666666 CircleCollider2D: @@ -1222,7 +1608,7 @@ Transform: m_Children: - {fileID: 1043406434} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &2053847423 Rigidbody2D: @@ -1283,6 +1669,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 216ec793de06a4ac7a9767782a179419, type: 3} m_Name: m_EditorClassIdentifier: + jumpForce: 5 + movementSpeed: 5 + sprintSpeed: 15 --- !u!114 &2053847426 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/OwnCharacterController.cs b/Assets/Scripts/OwnCharacterController.cs index 1514227..8adbb8a 100644 --- a/Assets/Scripts/OwnCharacterController.cs +++ b/Assets/Scripts/OwnCharacterController.cs @@ -7,6 +7,10 @@ using Random = System.Random; public class OwnCharacterController : MonoBehaviour { + public float jumpForce; + public float movementSpeed; + public float sprintSpeed; + private Rigidbody2D _rb; private Vector3 _spawnPos; private float _health = 100f; @@ -35,11 +39,11 @@ public class OwnCharacterController : MonoBehaviour } if (Input.GetButton("Fire3")) - input *= 10; - _rb.AddForce(new Vector2(input * 5, 0)); + input *= sprintSpeed; + _rb.AddForce(new Vector2(input * movementSpeed, 0)); if (Input.GetButtonDown("Jump") && IsOnGround()) - _rb.AddForce(new Vector2(0, 4), ForceMode2D.Impulse); + _rb.AddForce(new Vector2(0, jumpForce), ForceMode2D.Impulse); } public void Hit() diff --git a/Assets/Scripts/PlatformSpawner.cs b/Assets/Scripts/PlatformSpawner.cs new file mode 100644 index 0000000..dbac7bc --- /dev/null +++ b/Assets/Scripts/PlatformSpawner.cs @@ -0,0 +1,39 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Random = System.Random; + +public class PlatformSpawner : MonoBehaviour +{ + public Transform platformLeft; + public Transform platformMiddle; + public Transform platformRight; + public Transform player; + public int maxSize = 5; + + private Vector3 _spawnDiff; + private int _level = 0; + private Random _random = new Random(); + private Vector3 _lastPlatformPos; + // Start is called before the first frame update + void Start() + { + _spawnDiff = platformLeft.position - player.position; + _lastPlatformPos = platformRight.position; + } + + // Update is called once per frame + void FixedUpdate() + { + //If next platform is closer than _spawnDiff + if (player.position.x + _spawnDiff.x <= _lastPlatformPos.x) + return; + int size = _random.Next(maxSize); + Vector3 pos = _lastPlatformPos; + Instantiate(platformLeft).position = pos += new Vector3(1, 0, 0); + for (int i = 0; i < size; i++) + Instantiate(platformMiddle).position = pos += new Vector3(0.7f, 0, 0); + Instantiate(platformRight).position = pos += new Vector3(0.7f, 0, 0); + _lastPlatformPos = pos; + } +} diff --git a/Assets/Scripts/PlatformSpawner.cs.meta b/Assets/Scripts/PlatformSpawner.cs.meta new file mode 100644 index 0000000..0bfde7f --- /dev/null +++ b/Assets/Scripts/PlatformSpawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ee409c97d3c47248aa00378547f85278 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Background.meta b/Assets/Sprites/Background.meta new file mode 100644 index 0000000..4dc0a8e --- /dev/null +++ b/Assets/Sprites/Background.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05fcc8b01cf111536ae4859dd25adc82 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/bgElements_spritesheet.png b/Assets/Sprites/Background/bgElements_spritesheet.png similarity index 100% rename from Assets/Sprites/bgElements_spritesheet.png rename to Assets/Sprites/Background/bgElements_spritesheet.png diff --git a/Assets/Sprites/bgElements_spritesheet.png.meta b/Assets/Sprites/Background/bgElements_spritesheet.png.meta similarity index 100% rename from Assets/Sprites/bgElements_spritesheet.png.meta rename to Assets/Sprites/Background/bgElements_spritesheet.png.meta diff --git a/Assets/Sprites/cloudLayer1.png b/Assets/Sprites/Background/cloudLayer1.png similarity index 100% rename from Assets/Sprites/cloudLayer1.png rename to Assets/Sprites/Background/cloudLayer1.png diff --git a/Assets/Sprites/cloudLayer1.png.meta b/Assets/Sprites/Background/cloudLayer1.png.meta similarity index 100% rename from Assets/Sprites/cloudLayer1.png.meta rename to Assets/Sprites/Background/cloudLayer1.png.meta diff --git a/Assets/Sprites/cloudLayer2.png b/Assets/Sprites/Background/cloudLayer2.png similarity index 100% rename from Assets/Sprites/cloudLayer2.png rename to Assets/Sprites/Background/cloudLayer2.png diff --git a/Assets/Sprites/cloudLayer2.png.meta b/Assets/Sprites/Background/cloudLayer2.png.meta similarity index 100% rename from Assets/Sprites/cloudLayer2.png.meta rename to Assets/Sprites/Background/cloudLayer2.png.meta diff --git a/Assets/Sprites/cloudLayerB1.png b/Assets/Sprites/Background/cloudLayerB1.png similarity index 100% rename from Assets/Sprites/cloudLayerB1.png rename to Assets/Sprites/Background/cloudLayerB1.png diff --git a/Assets/Sprites/cloudLayerB1.png.meta b/Assets/Sprites/Background/cloudLayerB1.png.meta similarity index 100% rename from Assets/Sprites/cloudLayerB1.png.meta rename to Assets/Sprites/Background/cloudLayerB1.png.meta diff --git a/Assets/Sprites/cloudLayerB2.png b/Assets/Sprites/Background/cloudLayerB2.png similarity index 100% rename from Assets/Sprites/cloudLayerB2.png rename to Assets/Sprites/Background/cloudLayerB2.png diff --git a/Assets/Sprites/cloudLayerB2.png.meta b/Assets/Sprites/Background/cloudLayerB2.png.meta similarity index 100% rename from Assets/Sprites/cloudLayerB2.png.meta rename to Assets/Sprites/Background/cloudLayerB2.png.meta diff --git a/Assets/Sprites/groundLayer1.png b/Assets/Sprites/Background/groundLayer1.png similarity index 100% rename from Assets/Sprites/groundLayer1.png rename to Assets/Sprites/Background/groundLayer1.png diff --git a/Assets/Sprites/groundLayer1.png.meta b/Assets/Sprites/Background/groundLayer1.png.meta similarity index 100% rename from Assets/Sprites/groundLayer1.png.meta rename to Assets/Sprites/Background/groundLayer1.png.meta diff --git a/Assets/Sprites/groundLayer2.png b/Assets/Sprites/Background/groundLayer2.png similarity index 100% rename from Assets/Sprites/groundLayer2.png rename to Assets/Sprites/Background/groundLayer2.png diff --git a/Assets/Sprites/groundLayer2.png.meta b/Assets/Sprites/Background/groundLayer2.png.meta similarity index 100% rename from Assets/Sprites/groundLayer2.png.meta rename to Assets/Sprites/Background/groundLayer2.png.meta diff --git a/Assets/Sprites/hills.png b/Assets/Sprites/Background/hills.png similarity index 100% rename from Assets/Sprites/hills.png rename to Assets/Sprites/Background/hills.png diff --git a/Assets/Sprites/hills.png.meta b/Assets/Sprites/Background/hills.png.meta similarity index 100% rename from Assets/Sprites/hills.png.meta rename to Assets/Sprites/Background/hills.png.meta diff --git a/Assets/Sprites/hillsLarge.png b/Assets/Sprites/Background/hillsLarge.png similarity index 100% rename from Assets/Sprites/hillsLarge.png rename to Assets/Sprites/Background/hillsLarge.png diff --git a/Assets/Sprites/hillsLarge.png.meta b/Assets/Sprites/Background/hillsLarge.png.meta similarity index 100% rename from Assets/Sprites/hillsLarge.png.meta rename to Assets/Sprites/Background/hillsLarge.png.meta diff --git a/Assets/Sprites/mountainA.png b/Assets/Sprites/Background/mountainA.png similarity index 100% rename from Assets/Sprites/mountainA.png rename to Assets/Sprites/Background/mountainA.png diff --git a/Assets/Sprites/mountainA.png.meta b/Assets/Sprites/Background/mountainA.png.meta similarity index 100% rename from Assets/Sprites/mountainA.png.meta rename to Assets/Sprites/Background/mountainA.png.meta diff --git a/Assets/Sprites/mountainB.png b/Assets/Sprites/Background/mountainB.png similarity index 100% rename from Assets/Sprites/mountainB.png rename to Assets/Sprites/Background/mountainB.png diff --git a/Assets/Sprites/mountainB.png.meta b/Assets/Sprites/Background/mountainB.png.meta similarity index 100% rename from Assets/Sprites/mountainB.png.meta rename to Assets/Sprites/Background/mountainB.png.meta diff --git a/Assets/Sprites/mountainC.png b/Assets/Sprites/Background/mountainC.png similarity index 100% rename from Assets/Sprites/mountainC.png rename to Assets/Sprites/Background/mountainC.png diff --git a/Assets/Sprites/mountainC.png.meta b/Assets/Sprites/Background/mountainC.png.meta similarity index 100% rename from Assets/Sprites/mountainC.png.meta rename to Assets/Sprites/Background/mountainC.png.meta diff --git a/Assets/Sprites/mountains.png b/Assets/Sprites/Background/mountains.png similarity index 100% rename from Assets/Sprites/mountains.png rename to Assets/Sprites/Background/mountains.png diff --git a/Assets/Sprites/mountains.png.meta b/Assets/Sprites/Background/mountains.png.meta similarity index 100% rename from Assets/Sprites/mountains.png.meta rename to Assets/Sprites/Background/mountains.png.meta diff --git a/Assets/Sprites/grass.png b/Assets/Sprites/grass.png new file mode 100644 index 0000000..2d2b7fd Binary files /dev/null and b/Assets/Sprites/grass.png differ diff --git a/Assets/Sprites/grass.png.meta b/Assets/Sprites/grass.png.meta new file mode 100644 index 0000000..04dc05a --- /dev/null +++ b/Assets/Sprites/grass.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f35f4c00a8e280778b7dc11be457b4ac +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + 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: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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/grassCliffLeft.png b/Assets/Sprites/grassCliffLeft.png new file mode 100644 index 0000000..68353e8 Binary files /dev/null and b/Assets/Sprites/grassCliffLeft.png differ diff --git a/Assets/Sprites/grassCliffLeft.png.meta b/Assets/Sprites/grassCliffLeft.png.meta new file mode 100644 index 0000000..84f9005 --- /dev/null +++ b/Assets/Sprites/grassCliffLeft.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 53c010de1631b4bd7aab9bc8bff49cd1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + 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: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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/grassCliffRight.png b/Assets/Sprites/grassCliffRight.png new file mode 100644 index 0000000..a629213 Binary files /dev/null and b/Assets/Sprites/grassCliffRight.png differ diff --git a/Assets/Sprites/grassCliffRight.png.meta b/Assets/Sprites/grassCliffRight.png.meta new file mode 100644 index 0000000..73afb6a --- /dev/null +++ b/Assets/Sprites/grassCliffRight.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3d88c48f0ac5f1b76a9b63a3c4f97dd6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + 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: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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/grassMid.png b/Assets/Sprites/grassMid.png new file mode 100644 index 0000000..035adda Binary files /dev/null and b/Assets/Sprites/grassMid.png differ diff --git a/Assets/Sprites/grassMid.png.meta b/Assets/Sprites/grassMid.png.meta new file mode 100644 index 0000000..56117e7 --- /dev/null +++ b/Assets/Sprites/grassMid.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 277681d38786cd38fb431511c081d3a3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + 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: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: