From 538d80a1913b070db299cf51cb3e37a03756827b Mon Sep 17 00:00:00 2001 From: Adam P Skawinski Date: Tue, 21 Apr 2020 13:14:01 -0400 Subject: [PATCH] Shuriken Shuriken --- Platformer/Assets/Prefabs/Bullet.prefab | 7 +- Platformer/Assets/Scripts/Level 1/Bullet.cs | 3 +- Platformer/Assets/Scripts/Level 1/Weapon.cs | 24 +- .../Items/Hearts&Keys/Shuriken pronta 2.png | Bin 0 -> 14279 bytes .../Hearts&Keys/Shuriken pronta 2.png.meta | 88 +++ .../Items/Hearts&Keys/Shuriken pronta.png | Bin 0 -> 13949 bytes .../Hearts&Keys/Shuriken pronta.png.meta | 88 +++ Platformer/Assets/_Scenes/Level1.unity | 504 ++++++++++-------- Platformer/ProjectSettings/TagManager.asset | 1 + 9 files changed, 485 insertions(+), 230 deletions(-) create mode 100644 Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta 2.png create mode 100644 Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta 2.png.meta create mode 100644 Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta.png create mode 100644 Platformer/Assets/World Build/Items/Hearts&Keys/Shuriken pronta.png.meta 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 0000000000000000000000000000000000000000..c88f665bf24effbcd053af62010d3ee6047c0dd0 GIT binary patch literal 14279 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 literal 0 HcmV?d00001 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