diff --git a/Assets/Audio/SFX/Bullet Bounce.mp3 b/Assets/Audio/SFX/Bullet Bounce.mp3 new file mode 100644 index 0000000..748535d Binary files /dev/null and b/Assets/Audio/SFX/Bullet Bounce.mp3 differ diff --git a/Assets/Audio/SFX/BulletBounce.mp3.meta b/Assets/Audio/SFX/Bullet Bounce.mp3.meta similarity index 91% rename from Assets/Audio/SFX/BulletBounce.mp3.meta rename to Assets/Audio/SFX/Bullet Bounce.mp3.meta index 886d604..9f2eb16 100644 --- a/Assets/Audio/SFX/BulletBounce.mp3.meta +++ b/Assets/Audio/SFX/Bullet Bounce.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f0b9464c5082334d8a3e4bae6931241 +guid: cdd5d9c7624b1e0429c680b53e6839e4 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/SFX/BulletBounce.mp3 b/Assets/Audio/SFX/BulletBounce.mp3 deleted file mode 100644 index fa2b2e8..0000000 Binary files a/Assets/Audio/SFX/BulletBounce.mp3 and /dev/null differ diff --git a/Assets/Audio/SFX/Enemy Damage.mp3 b/Assets/Audio/SFX/Enemy Damage.mp3 index 831ff6e..1ba8c57 100644 Binary files a/Assets/Audio/SFX/Enemy Damage.mp3 and b/Assets/Audio/SFX/Enemy Damage.mp3 differ diff --git a/Assets/Audio/SFX/Laser Shoot.mp3 b/Assets/Audio/SFX/Laser Shoot.mp3 index ad1a194..e1d10c0 100644 Binary files a/Assets/Audio/SFX/Laser Shoot.mp3 and b/Assets/Audio/SFX/Laser Shoot.mp3 differ diff --git a/Assets/Audio/SFX/Shotgun Shoot.mp3 b/Assets/Audio/SFX/Shotgun Shoot.mp3 index 2642631..c8c1a47 100644 Binary files a/Assets/Audio/SFX/Shotgun Shoot.mp3 and b/Assets/Audio/SFX/Shotgun Shoot.mp3 differ diff --git a/Assets/Audio/SFX/Shotgun Shoot.wav b/Assets/Audio/SFX/Shotgun Shoot.wav new file mode 100644 index 0000000..6b8a68f Binary files /dev/null and b/Assets/Audio/SFX/Shotgun Shoot.wav differ diff --git a/Assets/Audio/SFX/Shotgun Shoot.wav.meta b/Assets/Audio/SFX/Shotgun Shoot.wav.meta new file mode 100644 index 0000000..e19cfd7 --- /dev/null +++ b/Assets/Audio/SFX/Shotgun Shoot.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e850f3f8ab5051943a09bc30110ad96a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 0d80ccd..fb236f8 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18029143, g: 0.22572419, b: 0.30693057, a: 1} + m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1271,9 +1271,7 @@ GameObject: - component: {fileID: 1541622504} - component: {fileID: 1541622503} - component: {fileID: 1541622506} - - component: {fileID: 1541622508} - - component: {fileID: 1541622507} - m_Layer: 7 + m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera m_Icon: {fileID: 0} @@ -1377,7 +1375,7 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 + m_RenderPostProcessing: 1 m_Antialiasing: 0 m_AntialiasingQuality: 2 m_StopNaN: 0 @@ -1398,83 +1396,6 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 ---- !u!114 &1541622507 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1541622502} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} - m_Name: - m_EditorClassIdentifier: - sharedProfile: {fileID: 11400000, guid: 6fe8ee8ac0cfee94dbbeb8cbce040d96, type: 2} - isGlobal: 1 - blendDistance: 0 - weight: 1 - priority: 0 ---- !u!114 &1541622508 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1541622502} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} - m_Name: - m_EditorClassIdentifier: - volumeTrigger: {fileID: 1541622505} - volumeLayer: - serializedVersion: 2 - m_Bits: 128 - stopNaNPropagation: 1 - finalBlitToCameraTarget: 0 - antialiasingMode: 0 - temporalAntialiasing: - jitterSpread: 0.75 - sharpness: 0.25 - stationaryBlending: 0.95 - motionBlending: 0.85 - subpixelMorphologicalAntialiasing: - quality: 2 - fastApproximateAntialiasing: - fastMode: 0 - keepAlpha: 0 - fog: - enabled: 1 - excludeSkybox: 1 - debugLayer: - lightMeter: - width: 512 - height: 256 - showCurves: 1 - histogram: - width: 512 - height: 256 - channel: 3 - waveform: - exposure: 0.12 - height: 256 - vectorscope: - size: 256 - exposure: 0.12 - overlaySettings: - linearDepth: 0 - motionColorIntensity: 4 - motionGridSize: 64 - colorBlindnessType: 0 - colorBlindnessStrength: 1 - m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} - m_ShowToolkit: 0 - m_ShowCustomSorter: 0 - breakBeforeColorGrading: 0 - m_BeforeTransparentBundles: [] - m_BeforeStackBundles: [] - m_AfterStackBundles: [] --- !u!1 &1572274679 GameObject: m_ObjectHideFlags: 0 @@ -1754,6 +1675,55 @@ MonoBehaviour: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 +--- !u!1 &1669610023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1669610025} + - component: {fileID: 1669610024} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1669610024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669610023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: a6560a915ef98420e9faacc1c7438823, type: 2} +--- !u!4 &1669610025 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669610023} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 61.007027, y: -34.068207, z: 174.93384} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1739273668 GameObject: m_ObjectHideFlags: 0 @@ -2096,3 +2066,4 @@ SceneRoots: - {fileID: 914665657} - {fileID: 1739273672} - {fileID: 529128274} + - {fileID: 1669610025} diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/SampleSceneProfile.asset index 37e401d..ab48471 100644 --- a/Assets/Settings/SampleSceneProfile.asset +++ b/Assets/Settings/SampleSceneProfile.asset @@ -13,45 +13,40 @@ MonoBehaviour: m_Name: Bloom m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 - threshold: - m_OverrideState: 1 - m_Value: 1 - min: 0 - intensity: - m_OverrideState: 1 - m_Value: 1 - min: 0 - scatter: - m_OverrideState: 0 - m_Value: 0.7 - min: 0 - max: 1 - clamp: - m_OverrideState: 0 - m_Value: 65472 - min: 0 - tint: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 - highQualityFiltering: - m_OverrideState: 0 - m_Value: 0 skipIterations: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 16 + threshold: + m_OverrideState: 1 + m_Value: 1 + intensity: + m_OverrideState: 1 + m_Value: 13.27 + scatter: + m_OverrideState: 0 + m_Value: 0.7 + clamp: + m_OverrideState: 0 + m_Value: 65472 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + downscale: + m_OverrideState: 0 + m_Value: 0 + maxIterations: + m_OverrideState: 0 + m_Value: 6 dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} + dimension: 1 dirtIntensity: m_OverrideState: 0 m_Value: 0 - min: 0 --- !u!114 &-7011558710299706105 MonoBehaviour: m_ObjectHideFlags: 3 @@ -65,26 +60,18 @@ MonoBehaviour: m_Name: Vignette m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 color: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 center: m_OverrideState: 0 m_Value: {x: 0.5, y: 0.5} intensity: m_OverrideState: 1 - m_Value: 0.25 - min: 0 - max: 1 + m_Value: 0.39 smoothness: m_OverrideState: 1 - m_Value: 0.4 - min: 0.01 - max: 1 + m_Value: 0.25 rounded: m_OverrideState: 0 m_Value: 0 @@ -117,7 +104,30 @@ MonoBehaviour: m_Name: Tonemapping m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 1 + neutralHDRRangeReductionMode: + m_OverrideState: 0 + m_Value: 2 + acesPreset: + m_OverrideState: 0 + m_Value: 3 + hueShiftAmount: + m_OverrideState: 0 + m_Value: 0 + detectPaperWhite: + m_OverrideState: 0 + m_Value: 0 + paperWhite: + m_OverrideState: 0 + m_Value: 300 + detectBrightnessLimits: + m_OverrideState: 0 + m_Value: 1 + minNits: + m_OverrideState: 0 + m_Value: 0.005 + maxNits: + m_OverrideState: 0 + m_Value: 1000