diff --git a/SpaceShooter/Assets/Prefabs/Bolt_2.prefab b/SpaceShooter/Assets/Prefabs/Bolt_2.prefab new file mode 100644 index 0000000..27a0ed6 --- /dev/null +++ b/SpaceShooter/Assets/Prefabs/Bolt_2.prefab @@ -0,0 +1,163 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2415889741903307488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2415889741903307516} + - component: {fileID: 2415889741903307519} + - component: {fileID: 2415889741903307518} + - component: {fileID: 2415889741903307489} + m_Layer: 0 + m_Name: Bolt_2 + m_TagString: Shot_2 + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2415889741903307516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2415889741903307488} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.98, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2415889742383427265} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &2415889741903307519 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2415889741903307488} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!70 &2415889741903307518 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2415889741903307488} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.008779168, y: -0.014632106} + m_Size: {x: 0.751673, y: 0.78344417} + m_Direction: 0 +--- !u!114 &2415889741903307489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2415889741903307488} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5ff6ebfbd9061a54e90a0f68a9da7e82, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 +--- !u!1 &2415889742383427264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2415889742383427265} + - component: {fileID: 2415889742383427295} + - component: {fileID: 2415889742383427294} + m_Layer: 0 + m_Name: VFX_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2415889742383427265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2415889742383427264} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.75, y: 0.75, z: 1} + m_Children: [] + m_Father: {fileID: 2415889741903307516} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2415889742383427295 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2415889742383427264} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2415889742383427294 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2415889742383427264} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 50acd433f269996468e7de6461ab9ac7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 diff --git a/SpaceShooter/Assets/Prefabs/Bolt_2.prefab.meta b/SpaceShooter/Assets/Prefabs/Bolt_2.prefab.meta new file mode 100644 index 0000000..0b878ff --- /dev/null +++ b/SpaceShooter/Assets/Prefabs/Bolt_2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 19a5ce27ffe75944b97123c5539131b8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/Prefabs/Bolt_3.prefab b/SpaceShooter/Assets/Prefabs/Bolt_3.prefab new file mode 100644 index 0000000..6f9bf54 --- /dev/null +++ b/SpaceShooter/Assets/Prefabs/Bolt_3.prefab @@ -0,0 +1,163 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8271371509601810433 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2699934648402645679} + - component: {fileID: 4485039003850961600} + - component: {fileID: 8183394578757418228} + m_Layer: 0 + m_Name: VFX_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2699934648402645679 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8271371509601810433} + 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_Children: [] + m_Father: {fileID: 6948602002579683005} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4485039003850961600 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8271371509601810433} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8183394578757418228 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8271371509601810433} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 8640f3ab4a54e3b4c9921daadfe65141, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &8766883913918649533 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6948602002579683005} + - component: {fileID: 6260297823475101260} + - component: {fileID: 7603744221496446052} + - component: {fileID: 114937746348040522} + m_Layer: 0 + m_Name: Bolt_3 + m_TagString: Shot_3 + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6948602002579683005 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766883913918649533} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.9, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2699934648402645679} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &6260297823475101260 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766883913918649533} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!70 &7603744221496446052 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766883913918649533} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.007732883, y: 0} + m_Size: {x: 1.0103595, y: 1.0103595} + m_Direction: 0 +--- !u!114 &114937746348040522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766883913918649533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5ff6ebfbd9061a54e90a0f68a9da7e82, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 15 diff --git a/SpaceShooter/Assets/Prefabs/Bolt_3.prefab.meta b/SpaceShooter/Assets/Prefabs/Bolt_3.prefab.meta new file mode 100644 index 0000000..bf35d82 --- /dev/null +++ b/SpaceShooter/Assets/Prefabs/Bolt_3.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3c53c55c456010b43b10739596fce741 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/Scenes/Main.unity b/SpaceShooter/Assets/Scenes/Main.unity index c7b6087..877ef72 100644 --- a/SpaceShooter/Assets/Scenes/Main.unity +++ b/SpaceShooter/Assets/Scenes/Main.unity @@ -112,6 +112,83 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &637981 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 637982} + - component: {fileID: 637984} + - component: {fileID: 637983} + m_Layer: 5 + m_Name: Shooting (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &637982 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 637981} + 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_Children: [] + m_Father: {fileID: 453447294} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -65.21} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &637983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 637981} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 50 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: '''Q'' - Tank' +--- !u!222 &637984 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 637981} + m_CullTransparentMesh: 0 --- !u!1 &9615812 GameObject: m_ObjectHideFlags: 0 @@ -124,7 +201,7 @@ GameObject: - component: {fileID: 9615815} - component: {fileID: 9615814} m_Layer: 5 - m_Name: Text + m_Name: Esc m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -142,7 +219,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 19546990} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -202,7 +279,7 @@ GameObject: - component: {fileID: 19546988} - component: {fileID: 19546987} m_Layer: 5 - m_Name: Canvas + m_Name: Canvas (SideBar) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -281,9 +358,11 @@ RectTransform: m_Children: - {fileID: 689181780} - {fileID: 642729831} + - {fileID: 918084478} - {fileID: 9615813} + - {fileID: 453447294} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -320,6 +399,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 598201721} + - {fileID: 1172212687} m_Father: {fileID: 1700812998} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -432,6 +512,8 @@ Transform: m_Children: - {fileID: 1024978147} - {fileID: 283186217} + - {fileID: 1671016381} + - {fileID: 135324280} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -456,7 +538,43 @@ MonoBehaviour: shot: {fileID: 2786470009650213004, guid: 9e195a83d88cbaf4fa88db914f35bca4, type: 3} shotSpawn: {fileID: 283186217} fireRate: 0.15 + shot_2: {fileID: 2415889741903307488, guid: 19a5ce27ffe75944b97123c5539131b8, type: 3} + shotSpawn_2: {fileID: 1671016381} + fireRate_2: 5 + shot_3: {fileID: 8766883913918649533, guid: 3c53c55c456010b43b10739596fce741, type: 3} + shotSpawn_3: {fileID: 135324280} + fireRate_3: 7.5 score: {fileID: 0} +--- !u!1 &135324279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 135324280} + m_Layer: 0 + m_Name: Shot Spawn (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &135324280 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135324279} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 128653742} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &283186216 GameObject: m_ObjectHideFlags: 0 @@ -487,6 +605,86 @@ Transform: m_Father: {fileID: 128653742} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &453447293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 453447294} + - component: {fileID: 453447296} + - component: {fileID: 453447295} + m_Layer: 5 + m_Name: Shooting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &453447294 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453447293} + 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_Children: + - {fileID: 1874034109} + - {fileID: 637982} + - {fileID: 1788233993} + m_Father: {fileID: 19546990} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -627.9} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &453447295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453447293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.56101495, g: 0.003921565, b: 0.78431374, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 'Shooting:' +--- !u!222 &453447296 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453447293} + m_CullTransparentMesh: 0 --- !u!1 &534669902 GameObject: m_ObjectHideFlags: 0 @@ -977,7 +1175,7 @@ GameObject: m_Component: - component: {fileID: 852977240} m_Layer: 0 - m_Name: Background Object + m_Name: 'Background ' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -998,8 +1196,98 @@ Transform: - {fileID: 1748514802} - {fileID: 745307569} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &918084477 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 918084478} + - component: {fileID: 918084481} + - component: {fileID: 918084480} + - component: {fileID: 918084479} + m_Layer: 5 + m_Name: Level + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &918084478 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 918084477} + 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_Children: [] + m_Father: {fileID: 19546990} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 775, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &918084479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 918084477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b458613cc0332084c8721f24bfe31e52, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &918084480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 918084477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 44 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &918084481 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 918084477} + m_CullTransparentMesh: 0 --- !u!1 &1024978146 GameObject: m_ObjectHideFlags: 0 @@ -1079,7 +1367,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1200935772 +--- !u!1 &1172212686 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1087,33 +1375,174 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1200935774} - - component: {fileID: 1200935773} - m_Layer: 0 - m_Name: Game Controller + - component: {fileID: 1172212687} + - component: {fileID: 1172212691} + - component: {fileID: 1172212690} + - component: {fileID: 1172212689} + - component: {fileID: 1172212688} + m_Layer: 5 + m_Name: Restart m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1200935773 +--- !u!224 &1172212687 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1172212686} + 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_Children: + - {fileID: 1687622851} + m_Father: {fileID: 29912843} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.48828125, y: 0.61361474} + m_AnchorMax: {x: 0.48828125, y: 0.61361474} + m_AnchoredPosition: {x: 0.25, y: -25} + m_SizeDelta: {x: 235.4, y: 55.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1172212688 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1200935772} + m_GameObject: {fileID: 1172212686} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cde2c6df7977f240997a1e3434f83b6, type: 3} + m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 4, y: -4} + m_UseGraphicAlpha: 1 +--- !u!114 &1172212689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1172212686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 0} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.46666667} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.6627451} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1172212690} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1700812999} + m_MethodName: RestartGame + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1172212690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1172212686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1172212691 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1172212686} + m_CullTransparentMesh: 0 +--- !u!1 &1200935772 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1200935774} + - component: {fileID: 1200935773} + m_Layer: 0 + m_Name: Game Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1200935773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1200935772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cde2c6df7977f240997a1e3434f83b6, type: 3} m_Name: m_EditorClassIdentifier: hazard: {fileID: 8413504239514052086, guid: 36ad102bc23fdf24bbb56f0c5a2caa28, type: 3} spawnValues: {x: 4.25, y: 15} - hazardCount: 15 + hazardCount: 10 spawnWait: 0.5 startWait: 1 - waveWait: 3 + waveWait: 5 --- !u!4 &1200935774 Transform: m_ObjectHideFlags: 0 @@ -1205,6 +1634,113 @@ Transform: m_Father: {fileID: 852977240} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1671016380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1671016381} + m_Layer: 0 + m_Name: Shot Spawn (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1671016381 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671016380} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 128653742} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1687622850 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1687622851} + - component: {fileID: 1687622853} + - component: {fileID: 1687622852} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1687622851 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1687622850} + 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_Children: [] + m_Father: {fileID: 1172212687} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 1.05} + m_SizeDelta: {x: 0, y: 2.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1687622852 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1687622850} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 35 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: RESTART +--- !u!222 &1687622853 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1687622850} + m_CullTransparentMesh: 0 --- !u!1 &1700812994 GameObject: m_ObjectHideFlags: 0 @@ -1219,7 +1755,7 @@ GameObject: - component: {fileID: 1700812995} - component: {fileID: 1700812999} m_Layer: 5 - m_Name: Canvas + m_Name: Canvas (Pause) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1298,7 +1834,7 @@ RectTransform: m_Children: - {fileID: 29912843} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1472,6 +2008,160 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1784172503} m_CullTransparentMesh: 0 +--- !u!1 &1788233992 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1788233993} + - component: {fileID: 1788233995} + - component: {fileID: 1788233994} + m_Layer: 5 + m_Name: Shooting (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1788233993 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1788233992} + 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_Children: [] + m_Father: {fileID: 453447294} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -100} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1788233994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1788233992} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 50 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: '''E'' - Beam' +--- !u!222 &1788233995 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1788233992} + m_CullTransparentMesh: 0 +--- !u!1 &1874034108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1874034109} + - component: {fileID: 1874034111} + - component: {fileID: 1874034110} + m_Layer: 5 + m_Name: Shooting (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1874034109 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874034108} + 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_Children: [] + m_Father: {fileID: 453447294} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -31.2} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1874034110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874034108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 50 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: '''Space'' - Light' +--- !u!222 &1874034111 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874034108} + m_CullTransparentMesh: 0 --- !u!1 &1942229631 GameObject: m_ObjectHideFlags: 0 @@ -1606,5 +2296,5 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/SpaceShooter/Assets/Scripts/DestroyByContact.cs b/SpaceShooter/Assets/Scripts/DestroyByContact.cs index 69ade7b..b8ea19f 100644 --- a/SpaceShooter/Assets/Scripts/DestroyByContact.cs +++ b/SpaceShooter/Assets/Scripts/DestroyByContact.cs @@ -22,13 +22,26 @@ public class DestroyByContact : MonoBehaviour } } - if (other.tag == "Shot") + if (other.tag == "Shot" ) { - ScoreScript.scoreValue += 1; + ScoreScript.scoreValue += 5; Destroy(other.gameObject); Destroy(gameObject); } - - + + if (other.tag == "Shot_2") + { + ScoreScript.scoreValue += 5; + Destroy(other.gameObject); + Destroy(gameObject); + } + + if (other.tag == "Shot_3") + { + ScoreScript.scoreValue += 5; + Destroy(other.gameObject); + Destroy(gameObject); + } + } } \ No newline at end of file diff --git a/SpaceShooter/Assets/Scripts/GameController.cs b/SpaceShooter/Assets/Scripts/GameController.cs index eef3fbe..d2cb9ad 100644 --- a/SpaceShooter/Assets/Scripts/GameController.cs +++ b/SpaceShooter/Assets/Scripts/GameController.cs @@ -33,5 +33,57 @@ public class GameController : MonoBehaviour yield return new WaitForSeconds(waveWait); } } + + //By level Enemy Updating + void Update() + { + + //level 1 + if (ScoreScript.scoreValue >= 100 && ScoreScript.scoreValue < 200) + { + //Asteroid + hazardCount = 10; + spawnWait = .40f; + waveWait = 5; + } + + //level 2 + if (ScoreScript.scoreValue >= 200 && ScoreScript.scoreValue < 300) + { + //Asteroid + hazardCount = 10; + spawnWait = .30f; + waveWait = 5; + } + + //level 3 + if (ScoreScript.scoreValue >= 300 && ScoreScript.scoreValue < 400) + { + //Asteroid + hazardCount = 10; + spawnWait = .25f; + waveWait = 4; + + } + + // level 4 + if (ScoreScript.scoreValue >= 400 && ScoreScript.scoreValue < 500) + { + //Asteroid + hazardCount = 15; + spawnWait = .25f; + waveWait = 3.5f; + + } + + //From level 5 and onwards + if (ScoreScript.scoreValue >= 500 && ScoreScript.scoreValue < 1000000000) + { + //Asteroid + hazardCount = 15; + spawnWait = .25f; + waveWait = 2.5f; + } + } } diff --git a/SpaceShooter/Assets/Scripts/LevelScript.cs b/SpaceShooter/Assets/Scripts/LevelScript.cs new file mode 100644 index 0000000..f05eab1 --- /dev/null +++ b/SpaceShooter/Assets/Scripts/LevelScript.cs @@ -0,0 +1,71 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + + +public class LevelScript : MonoBehaviour +{ + public static int levelValue = 0; + Text level; + + void Start() + { + level = GetComponent(); + } + + // Update is called once per frame + void Update() + { + level.text = "Level:" + levelValue; + if (ScoreScript.scoreValue >= 100 && ScoreScript.scoreValue < 200 ) + { + level.text = "Level:" + (levelValue + 1); + } + + if (ScoreScript.scoreValue >= 200 && ScoreScript.scoreValue < 300) + { + level.text = "Level:" + (levelValue + 2); + } + + if (ScoreScript.scoreValue >= 300 && ScoreScript.scoreValue < 400) + { + level.text = "Level:" + (levelValue + 3); + } + + if (ScoreScript.scoreValue >= 400 && ScoreScript.scoreValue < 500) + { + level.text = "Level:" + (levelValue + 4); + } + + if (ScoreScript.scoreValue >= 500 && ScoreScript.scoreValue < 600) + { + level.text = "Level:" + (levelValue + 5); + } + + if (ScoreScript.scoreValue >= 600 && ScoreScript.scoreValue < 700) + { + level.text = "Level:" + (levelValue + 6); + } + + if (ScoreScript.scoreValue >= 700 && ScoreScript.scoreValue < 800) + { + level.text = "Level:" + (levelValue + 7); + } + + if (ScoreScript.scoreValue >= 800 && ScoreScript.scoreValue < 900) + { + level.text = "Level:" + (levelValue + 8); + } + + if (ScoreScript.scoreValue >= 900 && ScoreScript.scoreValue < 1000) + { + level.text = "Level:" + (levelValue + 9); + } + + if (ScoreScript.scoreValue >= 1000 && ScoreScript.scoreValue < 10000000) + { + level.text = "Level:" + "Final Round"; + } + } +} diff --git a/SpaceShooter/Assets/Scripts/LevelScript.cs.meta b/SpaceShooter/Assets/Scripts/LevelScript.cs.meta new file mode 100644 index 0000000..9ec6273 --- /dev/null +++ b/SpaceShooter/Assets/Scripts/LevelScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b458613cc0332084c8721f24bfe31e52 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/Scripts/PauseMenu.cs b/SpaceShooter/Assets/Scripts/PauseMenu.cs index 88ddd1b..a701757 100644 --- a/SpaceShooter/Assets/Scripts/PauseMenu.cs +++ b/SpaceShooter/Assets/Scripts/PauseMenu.cs @@ -43,13 +43,13 @@ public class PauseMenu : MonoBehaviour GameIsPaused = true; } - Text health; public void RestartGame() { SceneManager.LoadScene("Main"); HealthScript.healthValue = 100; ScoreScript.scoreValue = 0; pauseMenuUI.SetActive(false); + Time.timeScale = 1f; GameIsPaused = false; } diff --git a/SpaceShooter/Assets/Scripts/PlayerController.cs b/SpaceShooter/Assets/Scripts/PlayerController.cs index 5e4e200..1b6886f 100644 --- a/SpaceShooter/Assets/Scripts/PlayerController.cs +++ b/SpaceShooter/Assets/Scripts/PlayerController.cs @@ -16,12 +16,24 @@ public class PlayerController : MonoBehaviour public float speed; public Boundary boundary; + //Shot type 1 (Green) public GameObject shot; public Transform shotSpawn; public float fireRate; - private float nextFire; + //Shot type 2 (Blue) + public GameObject shot_2; + public Transform shotSpawn_2; + public float fireRate_2; + private float nextFire_2; + + //Shot type 3 (Green Big) + public GameObject shot_3; + public Transform shotSpawn_3; + public float fireRate_3; + private float nextFire_3; + public Text score; @@ -32,6 +44,18 @@ public class PlayerController : MonoBehaviour nextFire = Time.time + fireRate; Instantiate(shot, shotSpawn.position, shotSpawn.rotation); } + + if (Input.GetKeyDown("q") && Time.time > nextFire_2) + { + nextFire_2 = Time.time + fireRate_2; + Instantiate(shot_2, shotSpawn_2.position, shotSpawn_2.rotation); + } + + if (Input.GetKeyDown("e") && Time.time > nextFire_3) + { + nextFire_3 = Time.time + fireRate_3; + Instantiate(shot_3, shotSpawn_3.position, shotSpawn_3.rotation); + } } void FixedUpdate() diff --git a/SpaceShooter/Assets/Scripts/ScoreScript.cs b/SpaceShooter/Assets/Scripts/ScoreScript.cs index ee30556..4bb2a94 100644 --- a/SpaceShooter/Assets/Scripts/ScoreScript.cs +++ b/SpaceShooter/Assets/Scripts/ScoreScript.cs @@ -9,6 +9,7 @@ public class ScoreScript : MonoBehaviour public static int scoreValue = 0; Text score; + void Start() { score = GetComponent(); @@ -18,5 +19,6 @@ public class ScoreScript : MonoBehaviour void Update() { score.text = "Score: " + scoreValue; + } } diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/laserGreen08.png b/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/__.png similarity index 100% rename from SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/laserGreen08.png rename to SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/__.png diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/laserGreen08.png.meta b/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/__.png.meta similarity index 100% rename from SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/laserGreen08.png.meta rename to SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/__.png.meta diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_blue.mat b/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_blue.mat new file mode 100644 index 0000000..7f20c78 --- /dev/null +++ b/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_blue.mat @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fx_bolt_blue + m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 52a2a22cf3250ee4c8fc99a4ebec63a4, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnableExternalAlpha: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_blue.mat.meta b/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_blue.mat.meta new file mode 100644 index 0000000..867cfa7 --- /dev/null +++ b/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_blue.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50acd433f269996468e7de6461ab9ac7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials.meta b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials.meta new file mode 100644 index 0000000..154873e --- /dev/null +++ b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d0864d79d36c9f24cb15210b6642d182 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials/laserGreen14.mat b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials/laserGreen14.mat new file mode 100644 index 0000000..c92ffd7 --- /dev/null +++ b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials/laserGreen14.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: laserGreen14 + m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: dcb7a6180139de242b0d166d85703b1e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials/laserGreen14.mat.meta b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials/laserGreen14.mat.meta new file mode 100644 index 0000000..a42853d --- /dev/null +++ b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials/laserGreen14.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8640f3ab4a54e3b4c9921daadfe65141 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserBlue14.png b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserBlue14.png deleted file mode 100644 index 254601e..0000000 Binary files a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserBlue14.png and /dev/null differ diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserBlue14.png.meta b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserBlue14.png.meta deleted file mode 100644 index 0577707..0000000 --- a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserBlue14.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: bbd2b460297a2c842bd4c0506bf2a469 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/SpaceShooter/ProjectSettings/EditorBuildSettings.asset b/SpaceShooter/ProjectSettings/EditorBuildSettings.asset index 55a39c9..6f61ca8 100644 --- a/SpaceShooter/ProjectSettings/EditorBuildSettings.asset +++ b/SpaceShooter/ProjectSettings/EditorBuildSettings.asset @@ -6,6 +6,6 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Main.unity + path: Assets/Scenes/Main.unity guid: 5eaa67886ba119d4889d04fb09a442e3 m_configObjects: {} diff --git a/SpaceShooter/ProjectSettings/TagManager.asset b/SpaceShooter/ProjectSettings/TagManager.asset index 29207fa..194d63e 100644 --- a/SpaceShooter/ProjectSettings/TagManager.asset +++ b/SpaceShooter/ProjectSettings/TagManager.asset @@ -8,6 +8,8 @@ TagManager: - Asteroid - Boundary - Ship + - Shot_2 + - Shot_3 layers: - Default - TransparentFX