diff --git a/Platformer/Assets/Prefabs/Bullet.prefab b/Platformer/Assets/Prefabs/Bullet.prefab index 8c2dfc6..2a68c18 100644 --- a/Platformer/Assets/Prefabs/Bullet.prefab +++ b/Platformer/Assets/Prefabs/Bullet.prefab @@ -28,8 +28,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 776097286453626797} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -12.0997, y: -3.6982, z: -11.903397} - m_LocalScale: {x: 0.2274377, y: 0.41128823, z: 1} + m_LocalPosition: {x: -12.29, y: -2.211, z: -11.903397} + m_LocalScale: {x: 0.02429194, y: 0.02429194, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -71,7 +71,7 @@ SpriteRenderer: m_SortingLayerID: -1143351675 m_SortingLayer: 3 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 0cc984826de43774b8b2676e287482ea, type: 3} + m_Sprite: {fileID: 21300000, guid: d42206453d3eb9c4c9473d5a8d2aa59f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -132,5 +132,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 15 - damage: 25 rb: {fileID: 2657745054146267846} diff --git a/Platformer/Assets/Scripts/Level 1/Bullet.cs b/Platformer/Assets/Scripts/Level 1/Bullet.cs index 0d124ae..a9cd123 100644 --- a/Platformer/Assets/Scripts/Level 1/Bullet.cs +++ b/Platformer/Assets/Scripts/Level 1/Bullet.cs @@ -10,7 +10,8 @@ public class Bullet : MonoBehaviour void Start() { rb.velocity = transform.right * speed; - } + + } private void OnTriggerEnter2D(Collider2D other) { diff --git a/Platformer/Assets/Scripts/Level 1/Weapon.cs b/Platformer/Assets/Scripts/Level 1/Weapon.cs index b90b85b..0c81e9d 100644 --- a/Platformer/Assets/Scripts/Level 1/Weapon.cs +++ b/Platformer/Assets/Scripts/Level 1/Weapon.cs @@ -6,7 +6,9 @@ public class Weapon : MonoBehaviour { public Transform firePoint; //where player is shooting from public GameObject bulletPrefab; - void Update() + public int shots; + + void Update() { if (Input.GetKeyDown(KeyCode.Space)) { @@ -16,6 +18,24 @@ void Update() void Shoot() { - Instantiate(bulletPrefab, firePoint.position, firePoint.rotation); + if (shots > 0) + { + Instantiate(bulletPrefab, firePoint.position, firePoint.rotation); + shots = shots - 1; + } + else + { + return; + } } + + void OnTriggerEnter2D(Collider2D other) //Pickups + { + if (other.gameObject.CompareTag("NinjaStar")) //If you got the key + { + other.gameObject.SetActive(false); //Star Dissapears + shots = shots + 1; + + } + } } diff --git a/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta 2.png b/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta 2.png new file mode 100644 index 0000000..c88f665 Binary files /dev/null and b/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta 2.png differ diff --git a/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta 2.png.meta b/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta 2.png.meta new file mode 100644 index 0000000..e9d8bc6 --- /dev/null +++ b/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta 2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: ff45a01e13ca29947a507a292a98330c +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6443d677098ee0f4ea2525854ac9ac09 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta.png b/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta.png new file mode 100644 index 0000000..73ddc1d Binary files /dev/null and b/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta.png differ diff --git a/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta.png.meta b/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta.png.meta new file mode 100644 index 0000000..e888da9 --- /dev/null +++ b/Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: d42206453d3eb9c4c9473d5a8d2aa59f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e8163e836b404cb4191a756f63d6e711 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Platformer/Assets/_Scenes/Level1.unity b/Platformer/Assets/_Scenes/Level1.unity index 02b2b7f..c32ce93 100644 --- a/Platformer/Assets/_Scenes/Level1.unity +++ b/Platformer/Assets/_Scenes/Level1.unity @@ -379,6 +379,275 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &133927644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 133927645} + - component: {fileID: 133927647} + - component: {fileID: 133927646} + m_Layer: 0 + m_Name: Star 1 (1) + m_TagString: NinjaStar + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &133927645 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 133927644} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -12.84, y: -1.2804, z: 0} + m_LocalScale: {x: 0.034064647, y: 0.030660462, z: 1} + m_Children: [] + m_Father: {fileID: 2065312515} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &133927646 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 133927644} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.000000029802322, y: -0.0033959672} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 13.95, y: 13.95} + newSize: {x: 0.64, y: 0.64} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.31398678, y: 0.3071947} + m_EdgeRadius: 0 +--- !u!212 &133927647 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 133927644} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1143351675 + m_SortingLayer: 3 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: d42206453d3eb9c4c9473d5a8d2aa59f, 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.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &288285784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 288285786} + - component: {fileID: 288285785} + m_Layer: 0 + m_Name: GameObject + m_TagString: Box + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &288285785 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288285784} + 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, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!4 &288285786 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288285784} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -12.87, y: -4.28, z: -11.903397} + m_LocalScale: {x: 6.9, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &313642510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 313642511} + - component: {fileID: 313642513} + - component: {fileID: 313642512} + m_Layer: 0 + m_Name: Star 1 (2) + m_TagString: NinjaStar + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &313642511 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313642510} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -12.84, y: -1.2804, z: 0} + m_LocalScale: {x: 0.034064647, y: 0.030660462, z: 1} + m_Children: [] + m_Father: {fileID: 2065312515} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &313642512 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313642510} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.000000029802322, y: -0.0033959672} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 13.95, y: 13.95} + newSize: {x: 0.64, y: 0.64} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.31398678, y: 0.3071947} + m_EdgeRadius: 0 +--- !u!212 &313642513 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313642510} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1143351675 + m_SortingLayer: 3 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: d42206453d3eb9c4c9473d5a8d2aa59f, 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.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &399541327 GameObject: m_ObjectHideFlags: 0 @@ -391,8 +660,8 @@ GameObject: - component: {fileID: 399541330} - component: {fileID: 399541329} m_Layer: 0 - m_Name: $ (1) - m_TagString: Cash + m_Name: Star 1 + m_TagString: NinjaStar m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -405,8 +674,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 399541327} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -13.8, y: 0.59, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_LocalPosition: {x: -18.2187, y: -1.2804, z: 0} + m_LocalScale: {x: 0.034064647, y: 0.030660462, z: 1} m_Children: [] m_Father: {fileID: 2065312515} m_RootOrder: 1 @@ -428,7 +697,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.64, y: 0.64} + oldSize: {x: 13.95, y: 13.95} newSize: {x: 0.64, y: 0.64} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -474,7 +743,7 @@ SpriteRenderer: m_SortingLayerID: -1143351675 m_SortingLayer: 3 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 3b3006e1bedb8144fabeff8980ec1675, type: 3} + m_Sprite: {fileID: 21300000, guid: d42206453d3eb9c4c9473d5a8d2aa59f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -800,112 +1069,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0aae26f0af702a347a6091785b3436e3, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &850308270 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 850308271} - - component: {fileID: 850308273} - - component: {fileID: 850308272} - m_Layer: 0 - m_Name: $ (2) - m_TagString: Cash - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &850308271 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 850308270} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -13.2, y: 0.6, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} - m_Children: [] - m_Father: {fileID: 2065312515} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &850308272 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 850308270} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.000000029802322, y: -0.0033959672} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.64, y: 0.64} - newSize: {x: 0.64, y: 0.64} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.31398678, y: 0.3071947} - m_EdgeRadius: 0 ---- !u!212 &850308273 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 850308270} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 3b3006e1bedb8144fabeff8980ec1675, 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.64, y: 0.64} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1208994405 GameObject: m_ObjectHideFlags: 0 @@ -936,7 +1099,7 @@ Transform: m_LocalScale: {x: 3, y: 5, z: 1} m_Children: [] m_Father: {fileID: 2065312515} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1208994407 BoxCollider2D: @@ -1074,7 +1237,7 @@ Transform: m_LocalScale: {x: 1.5, y: 1.5, z: 1} m_Children: [] m_Father: {fileID: 2065312515} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1472312208 SpriteRenderer: @@ -1170,112 +1333,6 @@ Transform: m_Father: {fileID: 1919620928} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1767996969 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1767996970} - - component: {fileID: 1767996972} - - component: {fileID: 1767996971} - m_Layer: 0 - m_Name: '$ ' - m_TagString: Cash - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1767996970 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1767996969} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -14.4, y: 0.59, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} - m_Children: [] - m_Father: {fileID: 2065312515} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1767996971 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1767996969} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.000000029802322, y: -0.0033959672} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.64, y: 0.64} - newSize: {x: 0.64, y: 0.64} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.31398678, y: 0.3071947} - m_EdgeRadius: 0 ---- !u!212 &1767996972 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1767996969} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 3b3006e1bedb8144fabeff8980ec1675, 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.64, y: 0.64} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1780404589 GameObject: m_ObjectHideFlags: 0 @@ -1438,7 +1495,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1919620925} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -12.839, y: -3.28, z: 0} + m_LocalPosition: {x: -12.839, y: -3.08, z: 0} m_LocalScale: {x: 0.67200005, y: 0.75, z: 1} m_Children: - {fileID: 1729492402} @@ -1523,6 +1580,7 @@ MonoBehaviour: firePoint: {fileID: 1729492402} bulletPrefab: {fileID: 776097286453626797, guid: 8db08d1742a9c9845b440e2adcab3ca0, type: 3} + shots: 0 --- !u!1 &1935750959 GameObject: m_ObjectHideFlags: 0 @@ -1682,10 +1740,10 @@ Transform: - {fileID: 102694164} - {fileID: 399541328} - {fileID: 697734697} - - {fileID: 850308271} - {fileID: 1472312207} - {fileID: 1208994406} - - {fileID: 1767996970} + - {fileID: 133927645} + - {fileID: 313642511} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Platformer/ProjectSettings/TagManager.asset b/Platformer/ProjectSettings/TagManager.asset index 845f40d..51a0c4d 100644 --- a/Platformer/ProjectSettings/TagManager.asset +++ b/Platformer/ProjectSettings/TagManager.asset @@ -12,6 +12,7 @@ TagManager: - Bouncer - Enemy - Bullet + - NinjaStar layers: - Default - TransparentFX