From bb0f5a69d9bc73067c6173f6f3c95c1a7b545d82 Mon Sep 17 00:00:00 2001 From: Adam P Skawinski Date: Mon, 24 Feb 2020 01:21:34 -0500 Subject: [PATCH] Wow All I have left to do now is sounds and bullets for the boss (Big Ones) and maybe some introspection after trying out --- SpaceShooter/Assets/Prefabs/Bolt_3.prefab | 12 +- SpaceShooter/Assets/Prefabs/Bolt_UFO.prefab | 163 ++++++++++++++++++ .../Assets/Prefabs/Bolt_UFO.prefab.meta | 7 + SpaceShooter/Assets/Prefabs/Boss.prefab | 1 + SpaceShooter/Assets/Prefabs/Enemy1.prefab | 47 +++++ SpaceShooter/Assets/Scenes/Main.unity | 96 +---------- .../Scripts/Enemy Game Controllers/Bullet.cs | 18 ++ .../Enemy Game Controllers/Bullet.cs.meta | 11 ++ .../DestroyByContact_BOSS.cs | 5 +- .../GameController_Boss.cs | 4 +- .../Assets/Scripts/PlayerController.cs | 8 +- SpaceShooter/Assets/Scripts/UFOController.cs | 31 ++++ .../Assets/Scripts/UFOController.cs.meta | 11 ++ .../Backgrounds/Materials/fx_bolt_ufo.mat | 77 +++++++++ .../Materials/fx_bolt_ufo.mat.meta | 8 + .../PNG/Lasers/Materials/laserGreen14.mat | 2 +- .../PNG/Lasers/laserRed01.png.meta | 38 +++- .../PNG/Lasers/laserRed02.png.meta | 38 +++- .../PNG/Lasers/laserRed03.png | Bin 275 -> 0 bytes .../PNG/Lasers/laserRed03.png.meta | 88 ---------- SpaceShooter/ProjectSettings/TagManager.asset | 2 + 21 files changed, 465 insertions(+), 202 deletions(-) create mode 100644 SpaceShooter/Assets/Prefabs/Bolt_UFO.prefab create mode 100644 SpaceShooter/Assets/Prefabs/Bolt_UFO.prefab.meta create mode 100644 SpaceShooter/Assets/Scripts/Enemy Game Controllers/Bullet.cs create mode 100644 SpaceShooter/Assets/Scripts/Enemy Game Controllers/Bullet.cs.meta create mode 100644 SpaceShooter/Assets/Scripts/UFOController.cs create mode 100644 SpaceShooter/Assets/Scripts/UFOController.cs.meta create mode 100644 SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_ufo.mat create mode 100644 SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_ufo.mat.meta delete mode 100644 SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed03.png delete mode 100644 SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed03.png.meta diff --git a/SpaceShooter/Assets/Prefabs/Bolt_3.prefab b/SpaceShooter/Assets/Prefabs/Bolt_3.prefab index 6f9bf54..4a2a643 100644 --- a/SpaceShooter/Assets/Prefabs/Bolt_3.prefab +++ b/SpaceShooter/Assets/Prefabs/Bolt_3.prefab @@ -27,7 +27,7 @@ Transform: 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_LocalScale: {x: 0.38, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6948602002579683005} m_RootOrder: 0 @@ -57,7 +57,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 8640f3ab4a54e3b4c9921daadfe65141, type: 2} + - {fileID: 2100000, guid: 175fe77a117bf6c4684a1676dc1b846e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -103,14 +103,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8766883913918649533} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0.00045830314, w: 0.9999999} 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} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.053000003} --- !u!50 &6260297823475101260 Rigidbody2D: serializedVersion: 4 @@ -145,8 +145,8 @@ CapsuleCollider2D: 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_Offset: {x: 0.0007089377, y: 0.01688671} + m_Size: {x: 1.0272433, y: 1.0610145} m_Direction: 0 --- !u!114 &114937746348040522 MonoBehaviour: diff --git a/SpaceShooter/Assets/Prefabs/Bolt_UFO.prefab b/SpaceShooter/Assets/Prefabs/Bolt_UFO.prefab new file mode 100644 index 0000000..67f6a1d --- /dev/null +++ b/SpaceShooter/Assets/Prefabs/Bolt_UFO.prefab @@ -0,0 +1,163 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3903302120907774476 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3903302120907774472} + - component: {fileID: 3903302120907774473} + - component: {fileID: 3903302120907774474} + - component: {fileID: 3903302120907774475} + m_Layer: 0 + m_Name: Bolt_UFO + m_TagString: Shot_UFO + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3903302120907774472 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3903302120907774476} + 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: 3903302122060358011} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &3903302120907774473 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3903302120907774476} + 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 &3903302120907774474 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3903302120907774476} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0074856505, y: -0.0049904585} + m_Size: {x: 0.16564249, y: 0.39117002} + m_Direction: 0 +--- !u!114 &3903302120907774475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3903302120907774476} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5ff6ebfbd9061a54e90a0f68a9da7e82, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: -5 +--- !u!1 &3903302122060358012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3903302122060358011} + - component: {fileID: 3903302122060358009} + - component: {fileID: 3903302122060358010} + m_Layer: 0 + m_Name: VFX_UFO + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3903302122060358011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3903302122060358012} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.15, y: 0.35, z: 1} + m_Children: [] + m_Father: {fileID: 3903302120907774472} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3903302122060358009 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3903302122060358012} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3903302122060358010 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3903302122060358012} + 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: 402d2fba31dde6d4d83049a3bdcf9161, 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_UFO.prefab.meta b/SpaceShooter/Assets/Prefabs/Bolt_UFO.prefab.meta new file mode 100644 index 0000000..34bfd51 --- /dev/null +++ b/SpaceShooter/Assets/Prefabs/Bolt_UFO.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e5bfaa19a9edb8b44ad362f07d65c029 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/Prefabs/Boss.prefab b/SpaceShooter/Assets/Prefabs/Boss.prefab index 64688da..bb0032a 100644 --- a/SpaceShooter/Assets/Prefabs/Boss.prefab +++ b/SpaceShooter/Assets/Prefabs/Boss.prefab @@ -98,6 +98,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: health_2: 500 + bullet: {fileID: 8766883913918649533, guid: 3c53c55c456010b43b10739596fce741, type: 3} --- !u!1 &8953245506337528968 GameObject: m_ObjectHideFlags: 0 diff --git a/SpaceShooter/Assets/Prefabs/Enemy1.prefab b/SpaceShooter/Assets/Prefabs/Enemy1.prefab index 889f108..3869b8c 100644 --- a/SpaceShooter/Assets/Prefabs/Enemy1.prefab +++ b/SpaceShooter/Assets/Prefabs/Enemy1.prefab @@ -1,5 +1,35 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2284648921952794628 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2760303618189867876} + m_Layer: 0 + m_Name: Shot Spawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2760303618189867876 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2284648921952794628} + 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: 7043807102827822322} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6617579414641325867 GameObject: m_ObjectHideFlags: 0 @@ -13,6 +43,7 @@ GameObject: - component: {fileID: 1194926252314578580} - component: {fileID: 6344453602545399672} - component: {fileID: 5827337609354552143} + - component: {fileID: 114420546823563000} m_Layer: 0 m_Name: Enemy1 m_TagString: Untagged @@ -32,6 +63,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8894411066166071236} + - {fileID: 2760303618189867876} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -98,6 +130,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -1 +--- !u!114 &114420546823563000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6617579414641325867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1bd52e6ed45a8a749886b29c00f3d74b, type: 3} + m_Name: + m_EditorClassIdentifier: + bullet: {fileID: 3903302120907774476, guid: e5bfaa19a9edb8b44ad362f07d65c029, type: 3} + shotSpawn: {fileID: 2760303618189867876} + fireRate: 1 --- !u!1 &7483132265249294097 GameObject: m_ObjectHideFlags: 0 diff --git a/SpaceShooter/Assets/Scenes/Main.unity b/SpaceShooter/Assets/Scenes/Main.unity index 6107577..77d9ccd 100644 --- a/SpaceShooter/Assets/Scenes/Main.unity +++ b/SpaceShooter/Assets/Scenes/Main.unity @@ -223,7 +223,7 @@ RectTransform: 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: -82.18} + m_AnchoredPosition: {x: -2.2000122, y: -7} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!114 &9615814 @@ -848,7 +848,7 @@ RectTransform: 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: -144.8} + m_AnchoredPosition: {x: 0, y: -63.1} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!114 &453447295 @@ -891,83 +891,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 453447293} m_CullTransparentMesh: 0 ---- !u!1 &517482452 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 517482453} - - component: {fileID: 517482455} - - component: {fileID: 517482454} - 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 &517482453 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 517482452} - 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: 1815080235} - 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: -82.1} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0, y: 1} ---- !u!114 &517482454 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 517482452} - 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: 20 - 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: '''Flyer'' - 10 health' ---- !u!222 &517482455 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 517482452} - m_CullTransparentMesh: 0 --- !u!1 &529826142 GameObject: m_ObjectHideFlags: 0 @@ -1303,7 +1226,7 @@ RectTransform: 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: -41.75} + m_AnchoredPosition: {x: 773.3, y: -61.07} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!114 &642729832 @@ -1442,7 +1365,7 @@ RectTransform: 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: 0} + m_AnchoredPosition: {x: 774.28, y: -29.67} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!114 &689181781 @@ -1747,11 +1670,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1815080235} - m_RootOrder: 3 + 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: -103.3} + m_AnchoredPosition: {x: 0, y: -81.1} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!114 &853745215 @@ -2352,7 +2275,7 @@ MonoBehaviour: m_EditorClassIdentifier: hazard_BOSS: {fileID: 5435074586135439926, guid: f24d2a605ceb07843bfb6797b4a46b86, type: 3} - spawnValues_BOSS: {x: 1, y: 15} + spawnValues_BOSS: {x: 1, y: 13} hazardCount_BOSS: 0 spawnWait_BOSS: 0 startWait_BOSS: 0 @@ -2396,7 +2319,7 @@ RectTransform: 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: -282.8} + m_AnchoredPosition: {x: 0, y: -229.9} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!114 &1379383720 @@ -3288,14 +3211,13 @@ RectTransform: m_Children: - {fileID: 29916360} - {fileID: 1041226636} - - {fileID: 517482453} - {fileID: 853745214} m_Father: {fileID: 19546990} m_RootOrder: 6 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: -468.3} + m_AnchoredPosition: {x: 0, y: -423.3} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!114 &1815080236 diff --git a/SpaceShooter/Assets/Scripts/Enemy Game Controllers/Bullet.cs b/SpaceShooter/Assets/Scripts/Enemy Game Controllers/Bullet.cs new file mode 100644 index 0000000..ad87b01 --- /dev/null +++ b/SpaceShooter/Assets/Scripts/Enemy Game Controllers/Bullet.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Bullet : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/SpaceShooter/Assets/Scripts/Enemy Game Controllers/Bullet.cs.meta b/SpaceShooter/Assets/Scripts/Enemy Game Controllers/Bullet.cs.meta new file mode 100644 index 0000000..cfde3f3 --- /dev/null +++ b/SpaceShooter/Assets/Scripts/Enemy Game Controllers/Bullet.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 749fa53979480634bae2513e6900fc82 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/Scripts/Enemy Game Controllers/DestroyByContact_BOSS.cs b/SpaceShooter/Assets/Scripts/Enemy Game Controllers/DestroyByContact_BOSS.cs index 20c973b..2bff56b 100644 --- a/SpaceShooter/Assets/Scripts/Enemy Game Controllers/DestroyByContact_BOSS.cs +++ b/SpaceShooter/Assets/Scripts/Enemy Game Controllers/DestroyByContact_BOSS.cs @@ -10,8 +10,10 @@ public class DestroyByContact_BOSS : MonoBehaviour public float health_2 = 500; + public void Update() { + if (health_2 < 1) { Destroy(gameObject); @@ -19,6 +21,7 @@ public class DestroyByContact_BOSS : MonoBehaviour } + void OnTriggerEnter2D(Collider2D other) { @@ -66,7 +69,7 @@ public class DestroyByContact_BOSS : MonoBehaviour if (other.tag == "Shot_3") { - ScoreScript.scoreValue += 5; + ScoreScript.scoreValue +=15; Destroy(other.gameObject); health_2 = health_2 - 15; } diff --git a/SpaceShooter/Assets/Scripts/Enemy Game Controllers/GameController_Boss.cs b/SpaceShooter/Assets/Scripts/Enemy Game Controllers/GameController_Boss.cs index 26feed6..0c55f5b 100644 --- a/SpaceShooter/Assets/Scripts/Enemy Game Controllers/GameController_Boss.cs +++ b/SpaceShooter/Assets/Scripts/Enemy Game Controllers/GameController_Boss.cs @@ -45,10 +45,10 @@ public class GameController_Boss : MonoBehaviour waveWait_BOSS = 0; } - if (ScoreScript.scoreValue >= 900) + if (ScoreScript.scoreValue >=901) { hazardCount_BOSS = 1; - spawnWait_BOSS = .10f; + spawnWait_BOSS = 6000; waveWait_BOSS = 0; } diff --git a/SpaceShooter/Assets/Scripts/PlayerController.cs b/SpaceShooter/Assets/Scripts/PlayerController.cs index d3bf75e..1be7f68 100644 --- a/SpaceShooter/Assets/Scripts/PlayerController.cs +++ b/SpaceShooter/Assets/Scripts/PlayerController.cs @@ -57,7 +57,13 @@ public class PlayerController : MonoBehaviour Destroy(other.gameObject); } - if (other.tag == "PowerUp2") + if (other.tag == "Shot_UFO") + { + HealthScript.healthValue = HealthScript.healthValue - 5; + Destroy(other.gameObject); + } + + if (other.tag == "PowerUp2") { HealthScript.healthValue = HealthScript.healthValue + 50; Destroy(other.gameObject); diff --git a/SpaceShooter/Assets/Scripts/UFOController.cs b/SpaceShooter/Assets/Scripts/UFOController.cs new file mode 100644 index 0000000..58ebf0d --- /dev/null +++ b/SpaceShooter/Assets/Scripts/UFOController.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UFOController : MonoBehaviour +{ + [SerializeField] + public GameObject bullet; + public Transform shotSpawn; + public float fireRate; + private float nextFire; + + private void Start() + { + fireRate = 3f; + nextFire = Time.time; + } + + void Update() + { + CheckIfTimeToFire(); + } + + void CheckIfTimeToFire() + { + if (Time.time > nextFire){ + Instantiate(bullet, shotSpawn.position, shotSpawn.rotation); + nextFire = Time.time + fireRate; + } + } +} diff --git a/SpaceShooter/Assets/Scripts/UFOController.cs.meta b/SpaceShooter/Assets/Scripts/UFOController.cs.meta new file mode 100644 index 0000000..60688d0 --- /dev/null +++ b/SpaceShooter/Assets/Scripts/UFOController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1bd52e6ed45a8a749886b29c00f3d74b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_ufo.mat b/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_ufo.mat new file mode 100644 index 0000000..03be98c --- /dev/null +++ b/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_ufo.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: fx_bolt_ufo + 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: a451a5ebc90f9024ca135b6fcb49c786, 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)/Backgrounds/Materials/fx_bolt_ufo.mat.meta b/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_ufo.mat.meta new file mode 100644 index 0000000..d6fc636 --- /dev/null +++ b/SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_ufo.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 402d2fba31dde6d4d83049a3bdcf9161 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + 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 index c92ffd7..d0ff4ea 100644 --- a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials/laserGreen14.mat +++ b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials/laserGreen14.mat @@ -40,7 +40,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: dcb7a6180139de242b0d166d85703b1e, type: 3} + m_Texture: {fileID: 2800000, guid: b7b592b8d64886441a3533544d973675, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed01.png.meta b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed01.png.meta index 22d0971..33270c3 100644 --- a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed01.png.meta +++ b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed01.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,13 +69,35 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + 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: + spriteID: c6463632cdbff824094fb7e162905f75 vertices: [] indices: edges: [] diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed02.png.meta b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed02.png.meta index ccbb123..3cc05c4 100644 --- a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed02.png.meta +++ b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed02.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,13 +69,35 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + 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: + spriteID: 071bf46b649cbf1428a57422de52d798 vertices: [] indices: edges: [] diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed03.png b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed03.png deleted file mode 100644 index bc1bb8730900d972a8c073a4aa7b43cf9c4e9e42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^oItF~!3HEJ{68EEq!xO*IEGZ*N={&C%5ru6X_fo- zUsdkgzXm*ynvXbs;(6NC^yllWS>L6%Z2iADd4h$dC;M8s8r)xc&|M##k#ixO9Igs>%q zw#2ORF*ah-X1J)a)NAjwYc(}bg+1hAM3iQ?En?8<3sPx1<&okkARi;b#K^$To>uiU zqr4O7SltrWh?3y^w370~qEv>YO1-3<{QQ)ZO1Jx^OEyZ WQj1ow)xQI3WbkzLb6Mw<&;$VN<7n^z diff --git a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed03.png.meta b/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed03.png.meta deleted file mode 100644 index a6ec772..0000000 --- a/SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserRed03.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: fe0e009e8b7b83142a4cc114ce395375 -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/TagManager.asset b/SpaceShooter/ProjectSettings/TagManager.asset index a7abb9f..08af32c 100644 --- a/SpaceShooter/ProjectSettings/TagManager.asset +++ b/SpaceShooter/ProjectSettings/TagManager.asset @@ -16,6 +16,8 @@ TagManager: - GoldStar - LightningBolt - Enemy1 + - Boss + - Shot_UFO layers: - Default - TransparentFX