Skip to content
Permalink
Browse files

Big Update

Going to study for exams but this is so far what just happened:
- 3 bullets
-level menu
-gamecontroller interracts with levels

Still need:
- Enemies
-Music
-Powerups
  • Loading branch information
aps16104 committed Feb 23, 2020
1 parent 8ed6219 commit f65e9b5ef32d3c660cf5aff6a0fcf187f40bc497
Showing with 1,417 additions and 114 deletions.
  1. +163 −0 SpaceShooter/Assets/Prefabs/Bolt_2.prefab
  2. +7 −0 SpaceShooter/Assets/Prefabs/Bolt_2.prefab.meta
  3. +163 −0 SpaceShooter/Assets/Prefabs/Bolt_3.prefab
  4. +7 −0 SpaceShooter/Assets/Prefabs/Bolt_3.prefab.meta
  5. +709 −19 SpaceShooter/Assets/Scenes/Main.unity
  6. +17 −4 SpaceShooter/Assets/Scripts/DestroyByContact.cs
  7. +52 −0 SpaceShooter/Assets/Scripts/GameController.cs
  8. +71 −0 SpaceShooter/Assets/Scripts/LevelScript.cs
  9. +11 −0 SpaceShooter/Assets/Scripts/LevelScript.cs.meta
  10. +1 −1 SpaceShooter/Assets/Scripts/PauseMenu.cs
  11. +25 −1 SpaceShooter/Assets/Scripts/PlayerController.cs
  12. +2 −0 SpaceShooter/Assets/Scripts/ScoreScript.cs
  13. BIN SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/{laserGreen08.png → __.png}
  14. 0 ...eShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/{laserGreen08.png.meta → __.png.meta}
  15. +85 −0 SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_blue.mat
  16. +8 −0 SpaceShooter/Assets/SpaceShooterRedux (1)/Backgrounds/Materials/fx_bolt_blue.mat.meta
  17. +8 −0 SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials.meta
  18. +77 −0 SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials/laserGreen14.mat
  19. +8 −0 SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/Materials/laserGreen14.mat.meta
  20. BIN SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserBlue14.png
  21. +0 −88 SpaceShooter/Assets/SpaceShooterRedux (1)/PNG/Lasers/laserBlue14.png.meta
  22. +1 −1 SpaceShooter/ProjectSettings/EditorBuildSettings.asset
  23. +2 −0 SpaceShooter/ProjectSettings/TagManager.asset
@@ -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

Some generated files are not rendered by default. Learn more.

@@ -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

Some generated files are not rendered by default. Learn more.

0 comments on commit f65e9b5

Please sign in to comment.
You can’t perform that action at this time.