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/Prefabs/UI/UI.prefab b/Assets/Prefabs/UI/UI.prefab index bb6c413..54f9a6b 100644 --- a/Assets/Prefabs/UI/UI.prefab +++ b/Assets/Prefabs/UI/UI.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3315624217225912576} + - component: {fileID: 4586330195874448812} m_Layer: 5 m_Name: TimerUI m_TagString: Untagged @@ -36,6 +37,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4586330195874448812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 203935764274243221} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e0dc4c0bfe6da44682256676d1ccef6, type: 3} + m_Name: + m_EditorClassIdentifier: + timerText: {fileID: 5558345568148303310} --- !u!1 &851408572817441430 GameObject: m_ObjectHideFlags: 0 @@ -1129,6 +1143,94 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6216580377014392011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1294303342848261759} + - component: {fileID: 2160402623048284357} + - component: {fileID: 7320843173059553054} + - component: {fileID: 6190172744665135225} + m_Layer: 5 + m_Name: FadeImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1294303342848261759 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216580377014392011} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2603779566095873902} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10000, y: 10000} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2160402623048284357 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216580377014392011} + m_CullTransparentMesh: 1 +--- !u!114 &7320843173059553054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216580377014392011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6190172744665135225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216580377014392011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55f8b539d824ad84cb0f7384c2525a2e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6910246373966366672 GameObject: m_ObjectHideFlags: 0 @@ -1217,6 +1319,7 @@ GameObject: - component: {fileID: 3829147617141221472} - component: {fileID: 8067116145730438707} - component: {fileID: 1150396837806670114} + - component: {fileID: 7577166944879627524} m_Layer: 5 m_Name: UI m_TagString: Untagged @@ -1239,6 +1342,7 @@ RectTransform: - {fileID: 5758936918037227603} - {fileID: 3315624217225912576} - {fileID: 1594701663256479489} + - {fileID: 1294303342848261759} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1309,6 +1413,18 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!114 &7577166944879627524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7301411897347746173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 94eb4529510a25d448334415d28e7fa4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7485285492053268969 GameObject: m_ObjectHideFlags: 0 @@ -1362,7 +1478,7 @@ MonoBehaviour: spawner: {fileID: 0} slider: {fileID: 6134467867004299163} waveText: {fileID: 5636459425788774448} - waveTextDisplayTime: 3 + waveTextDisplayTime: 1 --- !u!1 &7671763227494701576 GameObject: m_ObjectHideFlags: 0 @@ -1465,7 +1581,7 @@ RectTransform: m_GameObject: {fileID: 8343632487405850332} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.57061476, y: 0.57061476, z: 0.57061476} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1594701663256479489} @@ -1735,7 +1851,7 @@ RectTransform: m_GameObject: {fileID: 8805328679230352364} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.9407643, y: 1.9407643, z: 1.9407643} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.9407643} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5330981716967833427} @@ -1754,7 +1870,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 291.11456, y: 291.1147} + m_AnchoredPosition: {x: 194.86456, y: 195} m_SizeDelta: {x: 250, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1107145590061588416 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/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index a8e3d9c..3cad8d2 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -780,24 +780,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4aabce12c1341ff488ee4dc806fd80e8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &872164353 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 203935764274243221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - m_PrefabInstance: {fileID: 4158834148864819266} - m_PrefabAsset: {fileID: 0} ---- !u!114 &872164355 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 872164353} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0e0dc4c0bfe6da44682256676d1ccef6, type: 3} - m_Name: - m_EditorClassIdentifier: - timerText: {fileID: 1785683341} --- !u!1 &941230147 GameObject: m_ObjectHideFlags: 0 @@ -3133,17 +3115,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1785683341 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5558345568148303310, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - m_PrefabInstance: {fileID: 4158834148864819266} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1872712129 GameObject: m_ObjectHideFlags: 0 @@ -3276,10 +3247,6 @@ PrefabInstance: propertyPath: spawner value: objectReference: {fileID: 5796191506433166634} - - target: {fileID: 1656765803503857110, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: waveTextDisplayTime - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2404937059918327841, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3380,34 +3347,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_LocalScale.x - value: 1.2 - objectReference: {fileID: 0} - - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_LocalScale.y - value: 1.2 - objectReference: {fileID: 0} - - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_AnchoredPosition.x - value: 194.86456 - objectReference: {fileID: 0} - - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_AnchoredPosition.y - value: 195 - objectReference: {fileID: 0} - - target: {fileID: 6089114235279588614, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_LocalScale.x - value: 0.57061476 - objectReference: {fileID: 0} - - target: {fileID: 6089114235279588614, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_LocalScale.y - value: 0.57061476 - objectReference: {fileID: 0} - - target: {fileID: 6089114235279588614, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_LocalScale.z - value: 0.57061476 - objectReference: {fileID: 0} - target: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} propertyPath: m_Name value: UI @@ -3415,31 +3354,8 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - insertIndex: -1 - addedObject: {fileID: 4158834148864819268} - - targetCorrespondingSourceObject: {fileID: 203935764274243221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - insertIndex: -1 - addedObject: {fileID: 872164355} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} ---- !u!1 &4158834148864819267 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - m_PrefabInstance: {fileID: 4158834148864819266} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4158834148864819268 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4158834148864819267} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 94eb4529510a25d448334415d28e7fa4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &4910321061857220295 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/PrefabTest.unity b/Assets/Scenes/PrefabTest.unity index 46b8c1d..92545a5 100644 --- a/Assets/Scenes/PrefabTest.unity +++ b/Assets/Scenes/PrefabTest.unity @@ -175,11 +175,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy6V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7426119072834239927, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} + insertIndex: -1 + addedObject: {fileID: 29946017} m_SourcePrefab: {fileID: 100100000, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} +--- !u!1 &29946016 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} + m_PrefabInstance: {fileID: 29946015} + m_PrefabAsset: {fileID: 0} +--- !u!114 &29946017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 29946016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &40791261 PrefabInstance: m_ObjectHideFlags: 0 @@ -232,11 +255,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy6V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2942917501068696347, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} + insertIndex: -1 + addedObject: {fileID: 40791263} m_SourcePrefab: {fileID: 100100000, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} +--- !u!1 &40791262 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} + m_PrefabInstance: {fileID: 40791261} + m_PrefabAsset: {fileID: 0} +--- !u!114 &40791263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40791262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &78004539 PrefabInstance: m_ObjectHideFlags: 0 @@ -289,11 +335,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy5V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 726348107358307867, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} + insertIndex: -1 + addedObject: {fileID: 78004541} m_SourcePrefab: {fileID: 100100000, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} +--- !u!1 &78004540 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} + m_PrefabInstance: {fileID: 78004539} + m_PrefabAsset: {fileID: 0} +--- !u!114 &78004541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 78004540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &270647951 PrefabInstance: m_ObjectHideFlags: 0 @@ -346,11 +415,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy4V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1085750007062579781, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} + insertIndex: -1 + addedObject: {fileID: 270647953} m_SourcePrefab: {fileID: 100100000, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} +--- !u!1 &270647952 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} + m_PrefabInstance: {fileID: 270647951} + m_PrefabAsset: {fileID: 0} +--- !u!114 &270647953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270647952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &288771115 PrefabInstance: m_ObjectHideFlags: 0 @@ -403,11 +495,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy6V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7020523015070545769, guid: af739fea850caf944ac8c1932d2ec386, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: af739fea850caf944ac8c1932d2ec386, type: 3} + insertIndex: -1 + addedObject: {fileID: 288771117} m_SourcePrefab: {fileID: 100100000, guid: af739fea850caf944ac8c1932d2ec386, type: 3} +--- !u!1 &288771116 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: af739fea850caf944ac8c1932d2ec386, type: 3} + m_PrefabInstance: {fileID: 288771115} + m_PrefabAsset: {fileID: 0} +--- !u!114 &288771117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288771116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1 &359673318 GameObject: m_ObjectHideFlags: 0 @@ -597,11 +712,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy4V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4984464882418314514, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + insertIndex: -1 + addedObject: {fileID: 641267243} m_SourcePrefab: {fileID: 100100000, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} +--- !u!1 &641267242 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + m_PrefabInstance: {fileID: 641267241} + m_PrefabAsset: {fileID: 0} +--- !u!114 &641267243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641267242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &752623411 PrefabInstance: m_ObjectHideFlags: 0 @@ -654,11 +792,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy3V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2661459955571842845, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} + insertIndex: -1 + addedObject: {fileID: 752623413} m_SourcePrefab: {fileID: 100100000, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} +--- !u!1 &752623412 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} + m_PrefabInstance: {fileID: 752623411} + m_PrefabAsset: {fileID: 0} +--- !u!114 &752623413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752623412} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &755220341 PrefabInstance: m_ObjectHideFlags: 0 @@ -711,11 +872,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy4V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8707421524367135635, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} + insertIndex: -1 + addedObject: {fileID: 755220343} m_SourcePrefab: {fileID: 100100000, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} +--- !u!1 &755220342 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} + m_PrefabInstance: {fileID: 755220341} + m_PrefabAsset: {fileID: 0} +--- !u!114 &755220343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755220342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &855086680 PrefabInstance: m_ObjectHideFlags: 0 @@ -768,11 +952,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy3V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6435009456481248358, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} + insertIndex: -1 + addedObject: {fileID: 855086682} m_SourcePrefab: {fileID: 100100000, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} +--- !u!1 &855086681 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} + m_PrefabInstance: {fileID: 855086680} + m_PrefabAsset: {fileID: 0} +--- !u!114 &855086682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855086681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &861243354 PrefabInstance: m_ObjectHideFlags: 0 @@ -825,11 +1032,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy5V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 5261040920339267747, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} + insertIndex: -1 + addedObject: {fileID: 861243356} m_SourcePrefab: {fileID: 100100000, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} +--- !u!1 &861243355 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} + m_PrefabInstance: {fileID: 861243354} + m_PrefabAsset: {fileID: 0} +--- !u!114 &861243356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861243355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1063152536 PrefabInstance: m_ObjectHideFlags: 0 @@ -882,11 +1112,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy2V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3840195329144413153, guid: f808ad67f6a747241a310437e433c828, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: f808ad67f6a747241a310437e433c828, type: 3} + insertIndex: -1 + addedObject: {fileID: 1063152538} m_SourcePrefab: {fileID: 100100000, guid: f808ad67f6a747241a310437e433c828, type: 3} +--- !u!1 &1063152537 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: f808ad67f6a747241a310437e433c828, type: 3} + m_PrefabInstance: {fileID: 1063152536} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1063152538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1063152537} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1222102540 PrefabInstance: m_ObjectHideFlags: 0 @@ -939,11 +1192,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy1V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6076718436353388380, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} + insertIndex: -1 + addedObject: {fileID: 1222102542} m_SourcePrefab: {fileID: 100100000, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} +--- !u!1 &1222102541 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} + m_PrefabInstance: {fileID: 1222102540} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1222102542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1222102541} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1295265087 PrefabInstance: m_ObjectHideFlags: 0 @@ -996,11 +1272,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy3V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2434603102242981559, guid: 40512b69b08d56d498aa78823087362c, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 40512b69b08d56d498aa78823087362c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1295265089} m_SourcePrefab: {fileID: 100100000, guid: 40512b69b08d56d498aa78823087362c, type: 3} +--- !u!1 &1295265088 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 40512b69b08d56d498aa78823087362c, type: 3} + m_PrefabInstance: {fileID: 1295265087} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1295265089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295265088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1408234649 PrefabInstance: m_ObjectHideFlags: 0 @@ -1053,11 +1352,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy1V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4917627866832862912, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} + insertIndex: -1 + addedObject: {fileID: 1408234651} m_SourcePrefab: {fileID: 100100000, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} +--- !u!1 &1408234650 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} + m_PrefabInstance: {fileID: 1408234649} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1408234651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408234650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1509665393 PrefabInstance: m_ObjectHideFlags: 0 @@ -1110,11 +1432,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy1V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 5147377511233184574, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1509665395} m_SourcePrefab: {fileID: 100100000, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} +--- !u!1 &1509665394 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + m_PrefabInstance: {fileID: 1509665393} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1509665395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509665394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1 &1732151769 GameObject: m_ObjectHideFlags: 0 @@ -1235,11 +1580,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy2V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1203071559618178883, guid: f48e8133073214446b0889b26d867b03, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: f48e8133073214446b0889b26d867b03, type: 3} + insertIndex: -1 + addedObject: {fileID: 1941423964} m_SourcePrefab: {fileID: 100100000, guid: f48e8133073214446b0889b26d867b03, type: 3} +--- !u!1 &1941423963 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: f48e8133073214446b0889b26d867b03, type: 3} + m_PrefabInstance: {fileID: 1941423962} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1941423964 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1941423963} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1977605622 PrefabInstance: m_ObjectHideFlags: 0 @@ -1292,11 +1660,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy5V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3469026775726075388, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} + insertIndex: -1 + addedObject: {fileID: 1977605624} m_SourcePrefab: {fileID: 100100000, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} +--- !u!1 &1977605623 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} + m_PrefabInstance: {fileID: 1977605622} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1977605624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977605623} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &2105330683 PrefabInstance: m_ObjectHideFlags: 0 @@ -1349,11 +1740,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy2V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4131989739711665858, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} + insertIndex: -1 + addedObject: {fileID: 2105330685} m_SourcePrefab: {fileID: 100100000, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} +--- !u!1 &2105330684 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} + m_PrefabInstance: {fileID: 2105330683} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2105330685 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105330684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1660057539 &9223372036854775807 SceneRoots: 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/Player/PlayerCollideAttack.cs b/Assets/Scripts/Player/PlayerCollideAttack.cs index d41ef29..458f924 100644 --- a/Assets/Scripts/Player/PlayerCollideAttack.cs +++ b/Assets/Scripts/Player/PlayerCollideAttack.cs @@ -11,10 +11,14 @@ public class PlayerCollideAttack : MonoBehaviour public void OnCollisionEnter2D(Collision2D collision) { + if (collision.collider.tag != "Enemy") return; + HealthComponent health = collision.collider.gameObject.GetComponent(); if (health == null) health = collision.collider.transform.parent.GetComponent(); if (health == null) return; + health = collision.collider.gameObject.GetComponentInChildren(); + if (health == null) return; float speed = body.velocity.magnitude; float damage = speedToDamage.Evaluate(speed); diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs index 22d08b1..ea59093 100644 --- a/Assets/Scripts/Player/PlayerMovement.cs +++ b/Assets/Scripts/Player/PlayerMovement.cs @@ -83,11 +83,8 @@ public class PlayerMovement : MonoBehaviour void OnCollisionStay2D(Collision2D collision) { - Debug.Log("Hit other " + collision.otherCollider.gameObject.name); - Debug.Log("Hit other " + collision.collider.gameObject.name); if (collision.collider.gameObject.CompareTag("Enemy")) { // Other object is an enemy - Debug.Log("Hit enememenemy"); hp.TakeDamage(1f); } } diff --git a/Assets/Scripts/UI/Wait2SecondsToShow.cs b/Assets/Scripts/UI/Wait2SecondsToShow.cs new file mode 100644 index 0000000..e1e77d2 --- /dev/null +++ b/Assets/Scripts/UI/Wait2SecondsToShow.cs @@ -0,0 +1,47 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Wait2SecondsToShow : MonoBehaviour +{ + // Reference to the Image component + private Image canvas; + + private void Start() + { + canvas = GetComponent(); + Invoke(nameof(StartFade), 2.8f); + } + + void StartFade() + { + StartCoroutine(FadeOut(2f)); + } + + // Coroutine to fade out the image + public IEnumerator FadeOut(float duration) + { + // Make sure the canvas is not null + if (canvas == null) + { + yield break; // Exit if canvas is not assigned + } + + // Starting alpha value (1 is fully opaque) + float startAlpha = 1.0f; + + // Elapsed time + float time = 0; + + while (time < duration) + { + time += Time.deltaTime; // Update the time based on the time passed since last frame + float alpha = Mathf.Lerp(startAlpha, 0, time / duration); // Calculate the new alpha value + canvas.color = new Color(canvas.color.r, canvas.color.g, canvas.color.b, alpha); // Apply the new alpha value to the canvas color + yield return null; // Wait for the next frame + } + + Destroy(gameObject); + } +} diff --git a/Assets/Scripts/Enemy/ShootingRange.cs.meta b/Assets/Scripts/UI/Wait2SecondsToShow.cs.meta similarity index 83% rename from Assets/Scripts/Enemy/ShootingRange.cs.meta rename to Assets/Scripts/UI/Wait2SecondsToShow.cs.meta index 40c7a06..84b62ca 100644 --- a/Assets/Scripts/Enemy/ShootingRange.cs.meta +++ b/Assets/Scripts/UI/Wait2SecondsToShow.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7b4220a52291a1140945947ce3f52531 +guid: 55f8b539d824ad84cb0f7384c2525a2e MonoImporter: externalObjects: {} serializedVersion: 2