diff --git a/Survival Shooter/Assets/Audio/Effects/OrbNotification.wav b/Survival Shooter/Assets/Audio/Effects/OrbNotification.wav
new file mode 100644
index 0000000000000000000000000000000000000000..bf38f0cd99e4fc07603fe8c439bc48e327151a23
Binary files /dev/null and b/Survival Shooter/Assets/Audio/Effects/OrbNotification.wav differ
diff --git a/Survival Shooter/Assets/Audio/Effects/OrbNotification.wav.meta b/Survival Shooter/Assets/Audio/Effects/OrbNotification.wav.meta
new file mode 100644
index 0000000000000000000000000000000000000000..b7fa5ed52da5272cd2fea61b7f3bf50fc729732a
--- /dev/null
+++ b/Survival Shooter/Assets/Audio/Effects/OrbNotification.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 686821bd161171844802bee45defbe05
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Survival Shooter/Assets/Audio/Effects/OrbPickup.wav b/Survival Shooter/Assets/Audio/Effects/OrbPickup.wav
new file mode 100644
index 0000000000000000000000000000000000000000..efb926fe2d9690d46788e82c63a57290b85c62ba
Binary files /dev/null and b/Survival Shooter/Assets/Audio/Effects/OrbPickup.wav differ
diff --git a/Survival Shooter/Assets/Audio/Effects/OrbPickup.wav.meta b/Survival Shooter/Assets/Audio/Effects/OrbPickup.wav.meta
new file mode 100644
index 0000000000000000000000000000000000000000..567115db0b2b506018908ceba7fe6556f97dce83
--- /dev/null
+++ b/Survival Shooter/Assets/Audio/Effects/OrbPickup.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3693f15bbf2fada42a6dbde216143439
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Survival Shooter/Assets/Prefabs/Bullet.prefab b/Survival Shooter/Assets/Prefabs/Bullet.prefab
index 7421b8dd29ec88e01537bd8f18699eb8f3c0ec0e..84e2195e1503558d43cd7ee4e767fe41fd91d297 100644
--- a/Survival Shooter/Assets/Prefabs/Bullet.prefab
+++ b/Survival Shooter/Assets/Prefabs/Bullet.prefab
@@ -87,8 +87,8 @@ Light:
m_Type: 2
m_Shape: 0
m_Color: {r: 0.882353, g: 0.6117647, b: 0.20000002, a: 1}
- m_Intensity: 1
- m_Range: 10
+ m_Intensity: 0.5
+ m_Range: 5
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
@@ -121,7 +121,7 @@ Light:
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
- m_RenderMode: 0
+ m_RenderMode: 1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
diff --git a/Survival Shooter/Assets/Prefabs/HealthOrb.prefab b/Survival Shooter/Assets/Prefabs/HealthOrb.prefab
index 71f21f55c285fdc7ba0bd35201139c5669a409dc..24cf974af61685d27892621e8837b693ca8e3d86 100644
--- a/Survival Shooter/Assets/Prefabs/HealthOrb.prefab
+++ b/Survival Shooter/Assets/Prefabs/HealthOrb.prefab
@@ -183,7 +183,7 @@ Light:
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
- m_RenderMode: 0
+ m_RenderMode: 1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
diff --git a/Survival Shooter/Assets/Prefabs/OrbSpawnPoint.prefab b/Survival Shooter/Assets/Prefabs/OrbSpawnPoint.prefab
index 39a4a2fe5b14e320fbb55c93729399a49a89032e..a982aa4eda6ad9a9919d121e2b1cfb7b39823913 100644
--- a/Survival Shooter/Assets/Prefabs/OrbSpawnPoint.prefab
+++ b/Survival Shooter/Assets/Prefabs/OrbSpawnPoint.prefab
@@ -1,5 +1,35 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &252083800054699811
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2219783587100324842}
+ m_Layer: 0
+ m_Name: SpawnPoint6
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2219783587100324842
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 252083800054699811}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -1.85, y: 0, z: -3.15}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 956654941051951564}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1772599669655808164
GameObject:
m_ObjectHideFlags: 0
@@ -182,6 +212,7 @@ Transform:
- {fileID: 1293407273377250357}
- {fileID: 1293407273377250356}
- {fileID: 1293407273377250347}
+ - {fileID: 2219783587100324842}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Survival Shooter/Assets/Prefabs/PickupManager.prefab b/Survival Shooter/Assets/Prefabs/PickupManager.prefab
index 0d42575f4cc9057ddab9157a498fd5d81d776019..2ddbc38bf9441ba8bc55f7bfe019ff98678faa2b 100644
--- a/Survival Shooter/Assets/Prefabs/PickupManager.prefab
+++ b/Survival Shooter/Assets/Prefabs/PickupManager.prefab
@@ -10,6 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 9119066394149137112}
- component: {fileID: 9119066394149137113}
+ - component: {fileID: -3768914290357085086}
m_Layer: 0
m_Name: PickupManager
m_TagString: Untagged
@@ -54,3 +55,99 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
+--- !u!82 &-3768914290357085086
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9119066394149137118}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 8300000, guid: 686821bd161171844802bee45defbe05, type: 3}
+ m_PlayOnAwake: 0
+ m_Volume: 0.453
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 500
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
diff --git a/Survival Shooter/Assets/Prefabs/PowerOrb.prefab b/Survival Shooter/Assets/Prefabs/PowerOrb.prefab
index e1188ade4e00b62b89cfbe06e5e26098b5645374..3135c8e7c0cdd724c36aff25e925736555e69ade 100644
--- a/Survival Shooter/Assets/Prefabs/PowerOrb.prefab
+++ b/Survival Shooter/Assets/Prefabs/PowerOrb.prefab
@@ -183,7 +183,7 @@ Light:
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
- m_RenderMode: 0
+ m_RenderMode: 1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
diff --git a/Survival Shooter/Assets/Prefabs/SpeedOrb.prefab b/Survival Shooter/Assets/Prefabs/SpeedOrb.prefab
index e4e340ae8b1c7e20f26ea3287e1c9e47df1ef496..68a49c210e4850d17844926e905d1e688f1fbd78 100644
--- a/Survival Shooter/Assets/Prefabs/SpeedOrb.prefab
+++ b/Survival Shooter/Assets/Prefabs/SpeedOrb.prefab
@@ -183,7 +183,7 @@ Light:
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
- m_RenderMode: 0
+ m_RenderMode: 1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
diff --git a/Survival Shooter/Assets/Scenes/WaveMode.unity b/Survival Shooter/Assets/Scenes/WaveMode.unity
index d39fb1090925aee68f793416c7719ef874c19f96..2c7394ad35def179a571121505720751d67bae61 100644
--- a/Survival Shooter/Assets/Scenes/WaveMode.unity
+++ b/Survival Shooter/Assets/Scenes/WaveMode.unity
@@ -161,6 +161,107 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 60}
m_Pivot: {x: 0, y: 0}
+--- !u!1 &144907417 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3654113803822656081, guid: a9b042c890e3a7045b0b660332b2de46, type: 3}
+ m_PrefabInstance: {fileID: 3654113802655374938}
+ m_PrefabAsset: {fileID: 0}
+--- !u!82 &144907418
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 144907417}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 8300000, guid: 3693f15bbf2fada42a6dbde216143439, type: 3}
+ m_PlayOnAwake: 0
+ m_Volume: 0.53
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 500
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
--- !u!1 &162017014
GameObject:
m_ObjectHideFlags: 0
@@ -1624,7 +1725,7 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3654113802655374940, guid: a9b042c890e3a7045b0b660332b2de46, type: 3}
m_PrefabInstance: {fileID: 3654113802655374938}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
+ m_GameObject: {fileID: 144907417}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 544f2064df03e95419b4a5147c506b08, type: 3}
@@ -1794,6 +1895,107 @@ MonoBehaviour:
m_EditorClassIdentifier:
target: {fileID: 1167386677}
smoothing: 5
+--- !u!1 &967728096 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3654113803822656025, guid: a9b042c890e3a7045b0b660332b2de46, type: 3}
+ m_PrefabInstance: {fileID: 3654113802655374938}
+ m_PrefabAsset: {fileID: 0}
+--- !u!82 &967728097
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 967728096}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 8300000, guid: 3693f15bbf2fada42a6dbde216143439, type: 3}
+ m_PlayOnAwake: 0
+ m_Volume: 0.53
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 500
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
--- !u!1 &1078761138
GameObject:
m_ObjectHideFlags: 0
@@ -3586,6 +3788,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6e3d49b904179974ab53cbb0d368a260, type: 3}
+--- !u!4 &3769188182163057061 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2219783587100324842, guid: 6e3d49b904179974ab53cbb0d368a260, type: 3}
+ m_PrefabInstance: {fileID: 3769188182163057060}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &4570730763213162806
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3936,6 +4143,10 @@ PrefabInstance:
propertyPath: playerHealth
value:
objectReference: {fileID: 875225643}
+ - target: {fileID: 9119066394149137113, guid: be50d7281d71b064fa7d4049f307bcda, type: 3}
+ propertyPath: spawnPoints.Array.size
+ value: 6
+ objectReference: {fileID: 0}
- target: {fileID: 9119066394149137113, guid: be50d7281d71b064fa7d4049f307bcda, type: 3}
propertyPath: spawnPoints.Array.data[0]
value:
@@ -3956,6 +4167,10 @@ PrefabInstance:
propertyPath: spawnPoints.Array.data[4]
value:
objectReference: {fileID: 2719544848253408655}
+ - target: {fileID: 9119066394149137113, guid: be50d7281d71b064fa7d4049f307bcda, type: 3}
+ propertyPath: spawnPoints.Array.data[5]
+ value:
+ objectReference: {fileID: 3769188182163057061}
- target: {fileID: 9119066394149137118, guid: be50d7281d71b064fa7d4049f307bcda, type: 3}
propertyPath: m_Name
value: PickupManager
diff --git a/Survival Shooter/Assets/Scenes/ZenMode.unity b/Survival Shooter/Assets/Scenes/ZenMode.unity
index acda7cb9fdbc663cec62935f0c7672d414b21f35..a8b5b8383609b06ba51d6a170c740c566ccdcaff 100644
--- a/Survival Shooter/Assets/Scenes/ZenMode.unity
+++ b/Survival Shooter/Assets/Scenes/ZenMode.unity
@@ -1575,7 +1575,7 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3654113802655374940, guid: a9b042c890e3a7045b0b660332b2de46, type: 3}
m_PrefabInstance: {fileID: 3654113802655374938}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
+ m_GameObject: {fileID: 3654113802655374939}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 544f2064df03e95419b4a5147c506b08, type: 3}
@@ -2922,6 +2922,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1293407273377250359, guid: 6e3d49b904179974ab53cbb0d368a260, type: 3}
m_PrefabInstance: {fileID: 1577720935}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &1577720941 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2219783587100324842, guid: 6e3d49b904179974ab53cbb0d368a260, type: 3}
+ m_PrefabInstance: {fileID: 1577720935}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1607600957
GameObject:
m_ObjectHideFlags: 0
@@ -3603,6 +3608,10 @@ PrefabInstance:
propertyPath: playerHealth
value:
objectReference: {fileID: 875225643}
+ - target: {fileID: 9119066394149137113, guid: be50d7281d71b064fa7d4049f307bcda, type: 3}
+ propertyPath: spawnPoints.Array.size
+ value: 6
+ objectReference: {fileID: 0}
- target: {fileID: 9119066394149137113, guid: be50d7281d71b064fa7d4049f307bcda, type: 3}
propertyPath: spawnPoints.Array.data[0]
value:
@@ -3623,6 +3632,10 @@ PrefabInstance:
propertyPath: spawnPoints.Array.data[4]
value:
objectReference: {fileID: 1577720936}
+ - target: {fileID: 9119066394149137113, guid: be50d7281d71b064fa7d4049f307bcda, type: 3}
+ propertyPath: spawnPoints.Array.data[5]
+ value:
+ objectReference: {fileID: 1577720941}
- target: {fileID: 9119066394149137118, guid: be50d7281d71b064fa7d4049f307bcda, type: 3}
propertyPath: m_Name
value: PickupManager
@@ -3889,6 +3902,208 @@ PrefabInstance:
objectReference: {fileID: 8946891882775703378, guid: d6c526ea9d76cdd468b8425ad07a3ded, type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a9b042c890e3a7045b0b660332b2de46, type: 3}
+--- !u!1 &3654113802655374939 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3654113803822656081, guid: a9b042c890e3a7045b0b660332b2de46, type: 3}
+ m_PrefabInstance: {fileID: 3654113802655374938}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &3654113802655374940 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3654113803822656025, guid: a9b042c890e3a7045b0b660332b2de46, type: 3}
+ m_PrefabInstance: {fileID: 3654113802655374938}
+ m_PrefabAsset: {fileID: 0}
+--- !u!82 &3654113802655374941
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3654113802655374939}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 8300000, guid: 3693f15bbf2fada42a6dbde216143439, type: 3}
+ m_PlayOnAwake: 0
+ m_Volume: 0.53
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 500
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+--- !u!82 &3654113802655374942
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3654113802655374940}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 8300000, guid: 3693f15bbf2fada42a6dbde216143439, type: 3}
+ m_PlayOnAwake: 0
+ m_Volume: 0.53
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 500
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
--- !u!1001 &4002831951290252429
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Survival Shooter/Assets/Scripts/Managers/PickupManager.cs b/Survival Shooter/Assets/Scripts/Managers/PickupManager.cs
index 8e94d3222f2fd89751c1a94413725375078c86b6..478d1de41cb6de4d93b7a124876f135d1e2141ca 100644
--- a/Survival Shooter/Assets/Scripts/Managers/PickupManager.cs
+++ b/Survival Shooter/Assets/Scripts/Managers/PickupManager.cs
@@ -10,9 +10,13 @@ public class PickupManager : MonoBehaviour
public Transform[] spawnPoints;
public static List<Vector3> usedSpawnPoints = new List<Vector3>();
-
+ AudioSource[] orbAudioArr;
+ AudioSource orbSpawnAudio;
void Start ()
{
+ orbAudioArr = GetComponents<AudioSource>();
+ orbSpawnAudio = orbAudioArr[0];
+
InvokeRepeating("Spawn", spawnTime, spawnTime);
}
@@ -40,12 +44,15 @@ public class PickupManager : MonoBehaviour
// HANDLE MAX SPEED, DONT SPAWN SPEED ORB
}
if (random == 0){
+ orbSpawnAudio.Play();
Instantiate(powerPickup, spawnPoints[spawnPointIndex].position, spawnPoints[spawnPointIndex].rotation);
}
else if (random == 1){
+ orbSpawnAudio.Play();
Instantiate(speedPickup, spawnPoints[spawnPointIndex].position, spawnPoints[spawnPointIndex].rotation);
}
else if (random == 2 ){
+ orbSpawnAudio.Play();
Instantiate(healthPickup, spawnPoints[spawnPointIndex].position, spawnPoints[spawnPointIndex].rotation);
}
}
diff --git a/Survival Shooter/Assets/Scripts/Pickup/Pickup.cs b/Survival Shooter/Assets/Scripts/Pickup/Pickup.cs
index f92c87de8d1dd3c9671b9532c2d656a7b7598fe8..a0fd783c838fd17d89064d25832f48f02e82123d 100644
--- a/Survival Shooter/Assets/Scripts/Pickup/Pickup.cs
+++ b/Survival Shooter/Assets/Scripts/Pickup/Pickup.cs
@@ -14,6 +14,7 @@ public class Pickup : MonoBehaviour
protected PlayerMovement playerMovement;
public float delay = 30f;
+
// Start is called before the first frame update
void Start()
{
@@ -21,6 +22,7 @@ public class Pickup : MonoBehaviour
playerHealth = player.GetComponent <PlayerHealth> ();
playerShooting = player.GetComponentInChildren <PlayerShooting> ();
playerMovement = player.GetComponentInChildren <PlayerMovement> ();
+
StartCoroutine(SelfDestruct());
// enemyHealth = GetComponent<EnemyHealth>();
// anim = GetComponent <Animator> ();
@@ -46,20 +48,20 @@ public class Pickup : MonoBehaviour
if(playerInRange)
{
PickupManager.usedSpawnPoints.Remove(transform.position);
- Debug.Log(transform.position);
- switch (pickupType) {
- case PickupType.Power:
- playerShooting.powerOrb();
- break;
-
- case PickupType.Speed:
- playerMovement.speedOrb();
- break;
-
- case PickupType.Health:
- playerHealth.healthOrb();
- break;
- }
+ // Debug.Log(transform.position);
+ switch (pickupType) {
+ case PickupType.Power:
+ playerShooting.powerOrb();
+ break;
+
+ case PickupType.Speed:
+ playerMovement.speedOrb();
+ break;
+
+ case PickupType.Health:
+ playerHealth.healthOrb();
+ break;
+ }
Destroy(gameObject,0f);
}
}
diff --git a/Survival Shooter/Assets/Scripts/Player/PlayerHealth.cs b/Survival Shooter/Assets/Scripts/Player/PlayerHealth.cs
index ea88dc8e7a787859b98396955c84a0f469ac38eb..abd3b5227bacc0813874b6438b334279f12bdf94 100644
--- a/Survival Shooter/Assets/Scripts/Player/PlayerHealth.cs
+++ b/Survival Shooter/Assets/Scripts/Player/PlayerHealth.cs
@@ -15,7 +15,10 @@ public class PlayerHealth : MonoBehaviour
Animator anim;
+
+ AudioSource[] playerAudioArr;
AudioSource playerAudio;
+ AudioSource orbPickupAudio;
PlayerMovement playerMovement;
PlayerShooting playerShooting;
bool isDead;
@@ -25,7 +28,9 @@ public class PlayerHealth : MonoBehaviour
void Awake()
{
anim = GetComponent<Animator>();
- playerAudio = GetComponent<AudioSource>();
+ playerAudioArr = GetComponents<AudioSource>();
+ playerAudio = playerAudioArr[0];
+ orbPickupAudio = playerAudioArr[1];
playerMovement = GetComponent<PlayerMovement>();
playerShooting = GetComponentInChildren<PlayerShooting>();
@@ -83,6 +88,7 @@ public class PlayerHealth : MonoBehaviour
}
public void healthOrb(){
+ orbPickupAudio.Play();
if (HPBarManager.maxHealth < 300){
currentHealth += 20;
HPBarManager.health += 20;
diff --git a/Survival Shooter/Assets/Scripts/Player/PlayerMovement.cs b/Survival Shooter/Assets/Scripts/Player/PlayerMovement.cs
index fce43250e736f96cadda260784b08f2ae6ebb869..4a4bd3c7bf7964c1d77b032c9c2570b31872da94 100644
--- a/Survival Shooter/Assets/Scripts/Player/PlayerMovement.cs
+++ b/Survival Shooter/Assets/Scripts/Player/PlayerMovement.cs
@@ -10,11 +10,16 @@ public class PlayerMovement : MonoBehaviour
int floorMask;
float camRayLength = 100f;
+ AudioSource[] playerAudioArr;
+ AudioSource orbPickupAudio;
+
void Awake() {
floorMask = LayerMask.GetMask("Floor");
anim = GetComponent <Animator> ();
playerRigidbody = GetComponent<Rigidbody>();
speed = initialspeed;
+ playerAudioArr = GetComponents<AudioSource>();
+ orbPickupAudio = playerAudioArr[1];
}
void FixedUpdate() {
@@ -53,6 +58,7 @@ public class PlayerMovement : MonoBehaviour
}
public void speedOrb(){
+ orbPickupAudio.Play();
if (speed < 10f){
speed += 0.45f;
SpeedManager.speed += 1f;
diff --git a/Survival Shooter/Assets/Scripts/Player/PlayerShooting.cs b/Survival Shooter/Assets/Scripts/Player/PlayerShooting.cs
index b2d3096f3834884139f930c17bb1f38617ef255a..b0f8ca5cf9483a87118ac62c4f5b159cf9da4740 100644
--- a/Survival Shooter/Assets/Scripts/Player/PlayerShooting.cs
+++ b/Survival Shooter/Assets/Scripts/Player/PlayerShooting.cs
@@ -19,6 +19,7 @@ public class PlayerShooting : MonoBehaviour
AudioSource[] gunAudioArr;
AudioSource gunAudio;
AudioSource critAudio;
+ AudioSource orbPickupAudio;
Light gunLight;
float effectsDisplayTime = 0.2f;
ObjectPooler objectPooler;
@@ -36,6 +37,7 @@ public class PlayerShooting : MonoBehaviour
gunAudioArr = GetComponents<AudioSource>();
gunAudio = gunAudioArr[0];
critAudio = gunAudioArr[1];
+ orbPickupAudio = gunAudioArr[2];
gunLight = GetComponent<Light>();
critChance = 0;
@@ -127,6 +129,7 @@ public class PlayerShooting : MonoBehaviour
}
public void powerOrb()
{
+ orbPickupAudio.Play();
if (PowerManager.power < 10)
{
damagePerShot += 5;