diff --git a/Assets/Prefabs/Projective.meta b/Assets/Prefabs/Projective.meta new file mode 100644 index 0000000..8ec69a0 --- /dev/null +++ b/Assets/Prefabs/Projective.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3bcf0a61ba363f043882bb6a53f33995 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Projective/EnemyShooty0001.png b/Assets/Prefabs/Projective/EnemyShooty0001.png new file mode 100644 index 0000000..8a9fe70 Binary files /dev/null and b/Assets/Prefabs/Projective/EnemyShooty0001.png differ diff --git a/Assets/Prefabs/Projective/EnemyShooty0001.png.meta b/Assets/Prefabs/Projective/EnemyShooty0001.png.meta new file mode 100644 index 0000000..6714d12 --- /dev/null +++ b/Assets/Prefabs/Projective/EnemyShooty0001.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 5dc199ed7fed7bc49a5bfd7dd91043e0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Projective/EnemyShooty00021.png b/Assets/Prefabs/Projective/EnemyShooty00021.png new file mode 100644 index 0000000..b38e81e Binary files /dev/null and b/Assets/Prefabs/Projective/EnemyShooty00021.png differ diff --git a/Assets/Prefabs/Projective/EnemyShooty00021.png.meta b/Assets/Prefabs/Projective/EnemyShooty00021.png.meta new file mode 100644 index 0000000..a040631 --- /dev/null +++ b/Assets/Prefabs/Projective/EnemyShooty00021.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e3ae8443c17cd584c9aed9948de1619b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/1/Enemy1V1.prefab b/Assets/Resources/Enemies/1/Enemy1V1.prefab index b2a96ab..2b4c7cf 100644 --- a/Assets/Resources/Enemies/1/Enemy1V1.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V1.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 3477818934881411113} - component: {fileID: 58401337460216238} - component: {fileID: 8428770856484636299} + - component: {fileID: 5147377511233184574} m_Layer: 0 m_Name: Enemy1V1 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &5147377511233184574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &8030114481966789124 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/1/Enemy1V2.prefab b/Assets/Resources/Enemies/1/Enemy1V2.prefab index 2e1383a..2c55af7 100644 --- a/Assets/Resources/Enemies/1/Enemy1V2.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V2.prefab @@ -135,6 +135,7 @@ GameObject: - component: {fileID: 1203571175389907979} - component: {fileID: 4546369442828517320} - component: {fileID: 8111329671581128041} + - component: {fileID: 6076718436353388380} m_Layer: 0 m_Name: Enemy1V2 m_TagString: Enemy @@ -297,6 +298,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &6076718436353388380 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1 &7260092502815078262 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/1/Enemy1V3.prefab b/Assets/Resources/Enemies/1/Enemy1V3.prefab index 897cb0a..567366b 100644 --- a/Assets/Resources/Enemies/1/Enemy1V3.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V3.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 7065122129502476799} - component: {fileID: 1757117162005437690} - component: {fileID: 7639895946029500357} + - component: {fileID: 4917627866832862912} m_Layer: 0 m_Name: Enemy1V3 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &4917627866832862912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &316838467825944121 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/2/Enemy2V1.prefab b/Assets/Resources/Enemies/2/Enemy2V1.prefab index b6f636b..2ccb717 100644 --- a/Assets/Resources/Enemies/2/Enemy2V1.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V1.prefab @@ -135,6 +135,7 @@ GameObject: - component: {fileID: 8407687426537136098} - component: {fileID: 5347138904714296145} - component: {fileID: 8131507713407366277} + - component: {fileID: 3840195329144413153} m_Layer: 0 m_Name: Enemy2V1 m_TagString: Enemy @@ -297,6 +298,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &3840195329144413153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1 &7184157512170153992 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/2/Enemy2V2.prefab b/Assets/Resources/Enemies/2/Enemy2V2.prefab index 5b819b1..337034e 100644 --- a/Assets/Resources/Enemies/2/Enemy2V2.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V2.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 2239829156743597080} - component: {fileID: 9116721273772261298} - component: {fileID: 833665078815953586} + - component: {fileID: 1203071559618178883} m_Layer: 0 m_Name: Enemy2V2 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &1203071559618178883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &861944024263757089 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/2/Enemy2V3.prefab b/Assets/Resources/Enemies/2/Enemy2V3.prefab index ae6e4b0..6ee3e28 100644 --- a/Assets/Resources/Enemies/2/Enemy2V3.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V3.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 2593167518683313509} - component: {fileID: 1597969697045467354} - component: {fileID: 7183425510269105097} + - component: {fileID: 4131989739711665858} m_Layer: 0 m_Name: Enemy2V3 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &4131989739711665858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &2911733727042986953 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/3/Enemy3V1.prefab b/Assets/Resources/Enemies/3/Enemy3V1.prefab index 4c13326..094ea1f 100644 --- a/Assets/Resources/Enemies/3/Enemy3V1.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V1.prefab @@ -135,6 +135,7 @@ GameObject: - component: {fileID: 5601190281078907372} - component: {fileID: 5775148875117303771} - component: {fileID: 1792220776575088205} + - component: {fileID: 2434603102242981559} m_Layer: 0 m_Name: Enemy3V1 m_TagString: Enemy @@ -297,6 +298,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &2434603102242981559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1 &8726065711573869828 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/3/Enemy3V2.prefab b/Assets/Resources/Enemies/3/Enemy3V2.prefab index d8e5e85..8155da4 100644 --- a/Assets/Resources/Enemies/3/Enemy3V2.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V2.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 5537633588480359369} - component: {fileID: 629574706924414947} - component: {fileID: 799119378079257124} + - component: {fileID: 2661459955571842845} m_Layer: 0 m_Name: Enemy3V2 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &2661459955571842845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &4591666118570224065 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/3/Enemy3V3.prefab b/Assets/Resources/Enemies/3/Enemy3V3.prefab index d85a53f..822d359 100644 --- a/Assets/Resources/Enemies/3/Enemy3V3.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V3.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 5342177024833758816} - component: {fileID: 9180341162620792323} - component: {fileID: 8845322091694779043} + - component: {fileID: 6435009456481248358} m_Layer: 0 m_Name: Enemy3V3 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &6435009456481248358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &4814295387499624289 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V1.prefab b/Assets/Resources/Enemies/4/Enemy4V1.prefab index 036fe08..dae643c 100644 --- a/Assets/Resources/Enemies/4/Enemy4V1.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V1.prefab @@ -135,6 +135,7 @@ GameObject: - component: {fileID: 6703538002322560484} - component: {fileID: 1593837753105570956} - component: {fileID: 6845376844323151706} + - component: {fileID: 8707421524367135635} m_Layer: 0 m_Name: Enemy4V1 m_TagString: Enemy @@ -297,6 +298,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &8707421524367135635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1 &8107784507586138233 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V2.prefab b/Assets/Resources/Enemies/4/Enemy4V2.prefab index 9639bcf..1986338 100644 --- a/Assets/Resources/Enemies/4/Enemy4V2.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V2.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 5189432348483020584} - component: {fileID: 6992716262122209801} - component: {fileID: 4819874625761020595} + - component: {fileID: 4984464882418314514} m_Layer: 0 m_Name: Enemy4V2 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &4984464882418314514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &5086109831227315773 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V3.prefab b/Assets/Resources/Enemies/4/Enemy4V3.prefab index 4f6efb8..378f02a 100644 --- a/Assets/Resources/Enemies/4/Enemy4V3.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V3.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 8229201628275188815} - component: {fileID: 5275513863136233879} - component: {fileID: 3466740024957840811} + - component: {fileID: 1085750007062579781} m_Layer: 0 m_Name: Enemy4V3 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &1085750007062579781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &4352670561598918136 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V1.prefab b/Assets/Resources/Enemies/5/Enemy5V1.prefab index 16d2c5a..4816fdb 100644 --- a/Assets/Resources/Enemies/5/Enemy5V1.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V1.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 17691115352120009} - component: {fileID: 853766927484383816} - component: {fileID: 2397480649246164426} + - component: {fileID: 5261040920339267747} m_Layer: 0 m_Name: Enemy5V1 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &5261040920339267747 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &1544961106352958877 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V2.prefab b/Assets/Resources/Enemies/5/Enemy5V2.prefab index d06468a..fc42b30 100644 --- a/Assets/Resources/Enemies/5/Enemy5V2.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V2.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 893626435943606516} - component: {fileID: 1353826037353208613} - component: {fileID: 1166639589295390852} + - component: {fileID: 3469026775726075388} m_Layer: 0 m_Name: Enemy5V2 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &3469026775726075388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &5603902875862274868 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V3.prefab b/Assets/Resources/Enemies/5/Enemy5V3.prefab index 218efd2..e9dced2 100644 --- a/Assets/Resources/Enemies/5/Enemy5V3.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V3.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 2019234432969631736} - component: {fileID: 1104779658182803384} - component: {fileID: 6053117177104604418} + - component: {fileID: 726348107358307867} m_Layer: 0 m_Name: Enemy5V3 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &726348107358307867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &2018686273432440032 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/6/Enemy6V1.prefab b/Assets/Resources/Enemies/6/Enemy6V1.prefab index 55e726d..8848b56 100644 --- a/Assets/Resources/Enemies/6/Enemy6V1.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V1.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 4552190225719755244} - component: {fileID: 7675421169139995944} - component: {fileID: 2639723550158062772} + - component: {fileID: 7020523015070545769} m_Layer: 0 m_Name: Enemy6V1 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &7020523015070545769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &412850958765099122 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/6/Enemy6V2.prefab b/Assets/Resources/Enemies/6/Enemy6V2.prefab index 6d51986..cad7d19 100644 --- a/Assets/Resources/Enemies/6/Enemy6V2.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V2.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 7803025104266690665} - component: {fileID: 4435590555684305438} - component: {fileID: 9140022268088615716} + - component: {fileID: 7426119072834239927} m_Layer: 0 m_Name: Enemy6V2 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &7426119072834239927 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &8420911966130886246 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/6/Enemy6V3.prefab b/Assets/Resources/Enemies/6/Enemy6V3.prefab index f9ddf84..709f418 100644 --- a/Assets/Resources/Enemies/6/Enemy6V3.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V3.prefab @@ -219,6 +219,7 @@ GameObject: - component: {fileID: 316906110964971930} - component: {fileID: 3935275739920240744} - component: {fileID: 1721532817145052869} + - component: {fileID: 2942917501068696347} m_Layer: 0 m_Name: Enemy6V3 m_TagString: Enemy @@ -381,6 +382,20 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &2942917501068696347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d42fe31ad4964f64587c814da01130b2, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + projectileLifetime: 3 --- !u!1001 &7644200986374021475 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Enemy/InstantiateOverTime.cs b/Assets/Scripts/Enemy/InstantiateOverTime.cs index 54c641c..5cd1a0f 100644 --- a/Assets/Scripts/Enemy/InstantiateOverTime.cs +++ b/Assets/Scripts/Enemy/InstantiateOverTime.cs @@ -31,7 +31,6 @@ public class InstantiateOverTime : MonoBehaviour private float CanShootTime; public GameObject projectile; - public ShootingRange shootingRange; public List Patterns; BulletPatternSequence _CurrentSequence; @@ -42,7 +41,7 @@ public class InstantiateOverTime : MonoBehaviour private void Update() { - if (CanShootTime < Time.time && shootingRange.inRange) // We are allowed to shoot + if (CanShootTime < Time.time) // We are allowed to shoot { BulletPattern currentPattern = _CurrentSequence.sequence[_CurrentSequence.currentPattern]; diff --git a/Assets/Scripts/Enemy/ShootingRange.cs b/Assets/Scripts/Enemy/ShootingRange.cs deleted file mode 100644 index 4bdb9c4..0000000 --- a/Assets/Scripts/Enemy/ShootingRange.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ShootingRange : MonoBehaviour -{ - public float range = 5f; - public LayerMask playerLayer; - public bool inRange = false; - void Update() - { - } - private void OnTriggerEnter2D(Collider2D collision) - { - inRange = true; - //Debug.Log("in range"); - - } - - private void OnTriggerExit2D(Collider2D collision) - { - inRange=false; - } -} diff --git a/Assets/Scripts/Enemy/ShootingRange.cs.meta b/Assets/Scripts/Enemy/ShootingRange.cs.meta deleted file mode 100644 index 40c7a06..0000000 --- a/Assets/Scripts/Enemy/ShootingRange.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7b4220a52291a1140945947ce3f52531 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: