diff --git a/Assets/Audio/SFX.meta b/Assets/Audio/SFX.meta new file mode 100644 index 0000000..6829fbb --- /dev/null +++ b/Assets/Audio/SFX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 811c9c5fc28e2b942b372cac075b1abe +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Enemy_Crash.wav b/Assets/Audio/SFX/Enemy_Crash.wav new file mode 100644 index 0000000..07fbd02 Binary files /dev/null and b/Assets/Audio/SFX/Enemy_Crash.wav differ diff --git a/Assets/Audio/SFX/Enemy_Crash.wav.meta b/Assets/Audio/SFX/Enemy_Crash.wav.meta new file mode 100644 index 0000000..71febe7 --- /dev/null +++ b/Assets/Audio/SFX/Enemy_Crash.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fc62f6c0ccafc4b43a763c29137d625c +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/Assets/Audio/SFX/Enemy_Death.wav b/Assets/Audio/SFX/Enemy_Death.wav new file mode 100644 index 0000000..7a9e3b6 Binary files /dev/null and b/Assets/Audio/SFX/Enemy_Death.wav differ diff --git a/Assets/Audio/SFX/Enemy_Death.wav.meta b/Assets/Audio/SFX/Enemy_Death.wav.meta new file mode 100644 index 0000000..b401750 --- /dev/null +++ b/Assets/Audio/SFX/Enemy_Death.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7885d0ee8f43974478abb2ba43278cb6 +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/Assets/Audio/SFX/Enemy_Hit.wav b/Assets/Audio/SFX/Enemy_Hit.wav new file mode 100644 index 0000000..85eab6e Binary files /dev/null and b/Assets/Audio/SFX/Enemy_Hit.wav differ diff --git a/Assets/Audio/SFX/Enemy_Hit.wav.meta b/Assets/Audio/SFX/Enemy_Hit.wav.meta new file mode 100644 index 0000000..bd2c6e9 --- /dev/null +++ b/Assets/Audio/SFX/Enemy_Hit.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: cf82b8589f9dc1c45997a8be4a762e0a +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/Assets/Audio/SFX/Menu_Click.wav b/Assets/Audio/SFX/Menu_Click.wav new file mode 100644 index 0000000..1fc9aee Binary files /dev/null and b/Assets/Audio/SFX/Menu_Click.wav differ diff --git a/Assets/Audio/SFX/Menu_Click.wav.meta b/Assets/Audio/SFX/Menu_Click.wav.meta new file mode 100644 index 0000000..eff872e --- /dev/null +++ b/Assets/Audio/SFX/Menu_Click.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 21a7ca19709ed2f40aa8750bf4a54fd9 +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/Assets/Audio/SFX/Menu_Hover.wav b/Assets/Audio/SFX/Menu_Hover.wav new file mode 100644 index 0000000..07acbb6 Binary files /dev/null and b/Assets/Audio/SFX/Menu_Hover.wav differ diff --git a/Assets/Audio/SFX/Menu_Hover.wav.meta b/Assets/Audio/SFX/Menu_Hover.wav.meta new file mode 100644 index 0000000..7fbb200 --- /dev/null +++ b/Assets/Audio/SFX/Menu_Hover.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9b57fc32454f5bc4fae7d031edc5df09 +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/Assets/Audio/SFX/Shoot.wav b/Assets/Audio/SFX/Shoot.wav new file mode 100644 index 0000000..5448651 Binary files /dev/null and b/Assets/Audio/SFX/Shoot.wav differ diff --git a/Assets/Audio/SFX/Shoot.wav.meta b/Assets/Audio/SFX/Shoot.wav.meta new file mode 100644 index 0000000..7ba5258 --- /dev/null +++ b/Assets/Audio/SFX/Shoot.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 58db08c1de711734587c1dfa42bb1754 +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/Assets/Audio/SFX/Switch_Dimension.wav b/Assets/Audio/SFX/Switch_Dimension.wav new file mode 100644 index 0000000..d26e4e9 Binary files /dev/null and b/Assets/Audio/SFX/Switch_Dimension.wav differ diff --git a/Assets/Audio/SFX/Switch_Dimension.wav.meta b/Assets/Audio/SFX/Switch_Dimension.wav.meta new file mode 100644 index 0000000..09c1626 --- /dev/null +++ b/Assets/Audio/SFX/Switch_Dimension.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5fd7ccd651fe4264486d4d6573b7f21e +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/Assets/Audio/SFX/Upgrade_Buy.wav b/Assets/Audio/SFX/Upgrade_Buy.wav new file mode 100644 index 0000000..527001f Binary files /dev/null and b/Assets/Audio/SFX/Upgrade_Buy.wav differ diff --git a/Assets/Audio/SFX/Upgrade_Buy.wav.meta b/Assets/Audio/SFX/Upgrade_Buy.wav.meta new file mode 100644 index 0000000..9c0b008 --- /dev/null +++ b/Assets/Audio/SFX/Upgrade_Buy.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8bc2ffee532157243822c24772485f46 +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/Assets/Prefabs/Enemies/enemy1.prefab b/Assets/Prefabs/Enemies/enemy1.prefab index 03f0df4..ca64f99 100644 --- a/Assets/Prefabs/Enemies/enemy1.prefab +++ b/Assets/Prefabs/Enemies/enemy1.prefab @@ -527,6 +527,7 @@ GameObject: - component: {fileID: 3119225800646921348} - component: {fileID: 8314483452424837569} - component: {fileID: 774736357024529276} + - component: {fileID: 1468877991388605754} m_Layer: 0 m_Name: enemy1 m_TagString: Enemy @@ -569,6 +570,10 @@ MonoBehaviour: onHitExplosion: {fileID: 6699315643444341781} landingPoint: {fileID: 0} body: {fileID: 4916962407531476031} + sfx: {fileID: 1468877991388605754} + enemyCrash: {fileID: 8300000, guid: fc62f6c0ccafc4b43a763c29137d625c, type: 3} + enemyDeath: {fileID: 8300000, guid: 7885d0ee8f43974478abb2ba43278cb6, type: 3} + enemyHit: {fileID: 8300000, guid: cf82b8589f9dc1c45997a8be4a762e0a, type: 3} flyingSpeed: 15 collider: {fileID: 774736357024529276} maxHP: 1 @@ -618,6 +623,111 @@ SphereCollider: serializedVersion: 2 m_Radius: 4.01 m_Center: {x: 0, y: 0, z: 0} +--- !u!82 &1468877991388605754 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4834061106301780291} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 1 + 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: 0.20370996 + value: 0.40281963 + inSlope: -1.4979794 + outSlope: -1.4979794 + 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: 1 + 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 &4834061106792183633 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Enemies/enemy2.prefab b/Assets/Prefabs/Enemies/enemy2.prefab index ba89aac..390f7a4 100644 --- a/Assets/Prefabs/Enemies/enemy2.prefab +++ b/Assets/Prefabs/Enemies/enemy2.prefab @@ -193,6 +193,7 @@ GameObject: - component: {fileID: 2196894380528568352} - component: {fileID: 7403712487563690438} - component: {fileID: 1871861664620959488} + - component: {fileID: 5825531694307741412} m_Layer: 0 m_Name: enemy2 m_TagString: Enemy @@ -268,6 +269,10 @@ MonoBehaviour: onHitExplosion: {fileID: 1030715603680260148} landingPoint: {fileID: 0} body: {fileID: 6601239271941144557} + sfx: {fileID: 5825531694307741412} + enemyCrash: {fileID: 8300000, guid: fc62f6c0ccafc4b43a763c29137d625c, type: 3} + enemyDeath: {fileID: 8300000, guid: 7885d0ee8f43974478abb2ba43278cb6, type: 3} + enemyHit: {fileID: 8300000, guid: cf82b8589f9dc1c45997a8be4a762e0a, type: 3} flyingSpeed: 15 collider: {fileID: 1871861664620959488} maxHP: 2 @@ -285,6 +290,102 @@ SphereCollider: serializedVersion: 2 m_Radius: 11.05 m_Center: {x: 0, y: 0, z: 0} +--- !u!82 &5825531694307741412 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002961339065835567} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 1 + 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: 1 + 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 &1002961339087089633 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Enemies/enemy3.prefab b/Assets/Prefabs/Enemies/enemy3.prefab index 0f6a7b7..963ff93 100644 --- a/Assets/Prefabs/Enemies/enemy3.prefab +++ b/Assets/Prefabs/Enemies/enemy3.prefab @@ -10986,6 +10986,7 @@ GameObject: - component: {fileID: 8639967248234000911} - component: {fileID: 1091277268389575657} - component: {fileID: 8097907429543341359} + - component: {fileID: 4792721917038421177} m_Layer: 0 m_Name: enemy3 m_TagString: Enemy @@ -11061,6 +11062,10 @@ MonoBehaviour: onHitExplosion: {fileID: 3757014927451604543} landingPoint: {fileID: 0} body: {fileID: 3605108994955462082} + sfx: {fileID: 4792721917038421177} + enemyCrash: {fileID: 8300000, guid: fc62f6c0ccafc4b43a763c29137d625c, type: 3} + enemyDeath: {fileID: 8300000, guid: 7885d0ee8f43974478abb2ba43278cb6, type: 3} + enemyHit: {fileID: 8300000, guid: cf82b8589f9dc1c45997a8be4a762e0a, type: 3} flyingSpeed: 10 collider: {fileID: 8097907429543341359} maxHP: 3 @@ -11078,6 +11083,102 @@ SphereCollider: serializedVersion: 2 m_Radius: 11.05 m_Center: {x: 0, y: 0, z: 0} +--- !u!82 &4792721917038421177 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7237433744057047552} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 1 + 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: 1 + 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 &7237433744537839851 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/SoundManager.prefab b/Assets/Prefabs/SoundManager.prefab index 9d6249d..7ea06fa 100644 --- a/Assets/Prefabs/SoundManager.prefab +++ b/Assets/Prefabs/SoundManager.prefab @@ -72,7 +72,7 @@ AudioSource: m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 - Loop: 0 + Loop: 1 Mute: 0 Spatialize: 0 SpatializePostEffects: 0 @@ -168,7 +168,7 @@ AudioSource: m_PlayOnAwake: 1 m_Volume: 0 m_Pitch: 1 - Loop: 0 + Loop: 1 Mute: 0 Spatialize: 0 SpatializePostEffects: 0 @@ -264,7 +264,7 @@ AudioSource: m_PlayOnAwake: 1 m_Volume: 0 m_Pitch: 1 - Loop: 0 + Loop: 1 Mute: 0 Spatialize: 0 SpatializePostEffects: 0 @@ -360,7 +360,7 @@ AudioSource: m_PlayOnAwake: 1 m_Volume: 0 m_Pitch: 1 - Loop: 0 + Loop: 1 Mute: 0 Spatialize: 0 SpatializePostEffects: 0 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index ef7a0dc..9bda95d 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -2986,6 +2986,126 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.size + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[14].m_ActionId + value: ce1dffb7-3600-4c58-a12a-ce124ef1ddd0 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[15].m_ActionId + value: 4a73fe5c-a8b1-48a9-8377-e4d9941b4e32 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[16].m_ActionId + value: d392a866-be73-4182-8081-9878fbdc19c8 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[14].m_ActionName + value: Player/Dimension1[/Keyboard/1] + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[15].m_ActionName + value: Player/Dimension2[/Keyboard/2] + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[16].m_ActionName + value: Player/Dimension3[/Keyboard/3] + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1536863736} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1536863736} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1536863736} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SwitchWorld + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SwitchWorld + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SwitchWorld + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: WorldSwitcher, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: WorldSwitcher, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: WorldSwitcher, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8845503654399814671, guid: 547051710011ee146aa8c829d9642ca5, type: 3} + propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 547051710011ee146aa8c829d9642ca5, type: 3} --- !u!1001 &7226858077067413575 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index b1eab88..18bb7e8 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -367,6 +367,7 @@ GameObject: - component: {fileID: 103759607} - component: {fileID: 103759606} - component: {fileID: 103759605} + - component: {fileID: 103759608} m_Layer: 5 m_Name: optionsBtn m_TagString: Untagged @@ -489,6 +490,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 103759603} m_CullTransparentMesh: 1 +--- !u!114 &103759608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103759603} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuHover + 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 + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuClick + 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!1 &125529413 GameObject: m_ObjectHideFlags: 0 @@ -847,6 +893,7 @@ GameObject: - component: {fileID: 253336692} - component: {fileID: 253336691} - component: {fileID: 253336690} + - component: {fileID: 253336693} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -969,6 +1016,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 253336688} m_CullTransparentMesh: 1 +--- !u!114 &253336693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 253336688} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuHover + 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 + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuClick + 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!1 &297966772 GameObject: m_ObjectHideFlags: 0 @@ -1153,6 +1245,7 @@ GameObject: - component: {fileID: 341877385} - component: {fileID: 341877384} - component: {fileID: 341877383} + - component: {fileID: 341877386} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -1275,6 +1368,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 341877381} m_CullTransparentMesh: 1 +--- !u!114 &341877386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 341877381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuHover + 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 + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuClick + 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!1001 &403752666 PrefabInstance: m_ObjectHideFlags: 0 @@ -1290,6 +1428,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4792721917038421177, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3} + propertyPath: rolloffMode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5886657504162338292, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3} propertyPath: m_Intensity value: 101.29 @@ -2065,6 +2207,7 @@ GameObject: - component: {fileID: 616633927} - component: {fileID: 616633926} - component: {fileID: 616633925} + - component: {fileID: 616633928} m_Layer: 5 m_Name: helpBtn m_TagString: Untagged @@ -2187,6 +2330,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 616633923} m_CullTransparentMesh: 1 +--- !u!114 &616633928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616633923} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuHover + 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 + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuClick + 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!1 &643534696 GameObject: m_ObjectHideFlags: 0 @@ -3299,6 +3487,7 @@ GameObject: - component: {fileID: 1100567390} - component: {fileID: 1100567389} - component: {fileID: 1100567388} + - component: {fileID: 1100567391} m_Layer: 5 m_Name: quitBtn m_TagString: Untagged @@ -3421,6 +3610,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1100567386} m_CullTransparentMesh: 1 +--- !u!114 &1100567391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1100567386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuHover + 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 + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuClick + 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!1 &1204433448 GameObject: m_ObjectHideFlags: 0 @@ -4088,6 +4322,7 @@ GameObject: - component: {fileID: 1484841318} - component: {fileID: 1484841317} - component: {fileID: 1484841316} + - component: {fileID: 1484841319} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -4210,6 +4445,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484841314} m_CullTransparentMesh: 1 +--- !u!114 &1484841319 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484841314} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuHover + 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 + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuClick + 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!1 &1489999939 GameObject: m_ObjectHideFlags: 0 @@ -4222,6 +4502,7 @@ GameObject: - component: {fileID: 1489999943} - component: {fileID: 1489999942} - component: {fileID: 1489999941} + - component: {fileID: 1489999944} m_Layer: 5 m_Name: leaderboardBtn m_TagString: Untagged @@ -4344,6 +4625,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1489999939} m_CullTransparentMesh: 1 +--- !u!114 &1489999944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1489999939} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuHover + 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 + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuClick + 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!1 &1520374238 GameObject: m_ObjectHideFlags: 0 @@ -4433,6 +4759,8 @@ GameObject: - component: {fileID: 1533964577} - component: {fileID: 1533964576} - component: {fileID: 1533964580} + - component: {fileID: 1533964582} + - component: {fileID: 1533964581} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -4544,6 +4872,200 @@ MonoBehaviour: masterVolumeSlider: {fileID: 423514904} musicVolumeSlider: {fileID: 1467228183} sfxVolumeSlider: {fileID: 1473163820} + menuHover: {fileID: 1533964582} + menuClick: {fileID: 1533964581} +--- !u!82 &1533964581 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533964575} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 21a7ca19709ed2f40aa8750bf4a54fd9, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + 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 &1533964582 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533964575} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 9b57fc32454f5bc4fae7d031edc5df09, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + 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 &1563295205 GameObject: m_ObjectHideFlags: 0 @@ -4708,6 +5230,7 @@ GameObject: - component: {fileID: 1606285498} - component: {fileID: 1606285497} - component: {fileID: 1606285496} + - component: {fileID: 1606285499} m_Layer: 5 m_Name: playBtn m_TagString: Untagged @@ -4830,6 +5353,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1606285494} m_CullTransparentMesh: 1 +--- !u!114 &1606285499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1606285494} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuHover + 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 + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1533964580} + m_TargetAssemblyTypeName: MainMenuController, Assembly-CSharp + m_MethodName: MenuClick + 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!1001 &1634808412 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Enemy.cs b/Assets/Scripts/Enemy.cs index e92a11f..796ab87 100644 --- a/Assets/Scripts/Enemy.cs +++ b/Assets/Scripts/Enemy.cs @@ -9,6 +9,11 @@ public class Enemy : MonoBehaviour public Transform landingPoint; public GameObject body; + [Header("Audio")] + public AudioSource sfx; + [SerializeField] private AudioClip enemyDeath; + [SerializeField] private AudioClip enemyHit; + [Header("Enemy Stats")] public float flyingSpeed; public SphereCollider collider; @@ -45,13 +50,13 @@ public class Enemy : MonoBehaviour if (_health <= 0) { StartCoroutine(Destroy(destroyDelay)); + SoundManager.Instance.PlaySfx(sfx, enemyDeath); } else { - Debug.Log("dmg"); StartCoroutine(playDmgParticles(destroyDelay)); + SoundManager.Instance.PlaySfx(sfx, enemyHit); } - } private IEnumerator Destroy(float waitTime) diff --git a/Assets/Scripts/MainMenuController.cs b/Assets/Scripts/MainMenuController.cs index 1d26ce0..4c906c7 100644 --- a/Assets/Scripts/MainMenuController.cs +++ b/Assets/Scripts/MainMenuController.cs @@ -31,6 +31,10 @@ public class MainMenuController : MonoBehaviour [SerializeField] private Slider musicVolumeSlider; [SerializeField] private Slider sfxVolumeSlider; + [Header("Audio Sources")] + [SerializeField] private AudioSource menuHover; + [SerializeField] private AudioSource menuClick; + private void Start() { SetMenuMode(MenuMode.MainMenu); SetMenuSliders(); @@ -95,4 +99,14 @@ public class MainMenuController : MonoBehaviour { SoundManager.Instance.OnSfxVolumeChanged(sfxVolumeSlider.value); } + + public void MenuHover() + { + SoundManager.Instance.PlaySfx(menuHover); + } + + public void MenuClick() + { + SoundManager.Instance.PlaySfx(menuClick); + } } diff --git a/Assets/Scripts/SoundManager.cs b/Assets/Scripts/SoundManager.cs index d1ac9e9..d86cffd 100644 --- a/Assets/Scripts/SoundManager.cs +++ b/Assets/Scripts/SoundManager.cs @@ -45,6 +45,19 @@ public class SoundManager : MonoBehaviour dimensionMusicID = dimensionID; } + public void PlaySfx(AudioSource audioSource) + { + audioSource.volume = masterVolume * sfxVolume; + audioSource.Play(); + } + + public void PlaySfx(AudioSource audioSource, AudioClip audioClip) + { + audioSource.clip = audioClip; + audioSource.volume = masterVolume * sfxVolume; + audioSource.Play(); + } + private IEnumerator FadeIn(int dimensionID) { float time = 0; diff --git a/Assets/Scripts/WorldSwitcher.cs b/Assets/Scripts/WorldSwitcher.cs index 2c084f7..b3bb972 100644 --- a/Assets/Scripts/WorldSwitcher.cs +++ b/Assets/Scripts/WorldSwitcher.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using UnityEngine; using UnityEngine.Events; +using UnityEngine.InputSystem; [Serializable] public class IntEvent : UnityEvent {} @@ -31,6 +32,7 @@ public class WorldSwitcher : MonoBehaviour { int lastWorldIndex; int currentWorldIndex; Coroutine transition; + bool supportHDR; static readonly int UVOffset = Shader.PropertyToID("_UVOffset"); //static readonly int Opacity = Shader.PropertyToID("_Opacity"); @@ -46,10 +48,12 @@ public class WorldSwitcher : MonoBehaviour { currentWorldIndex = 1; lastWorldIndex = 0; + supportHDR = SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.DefaultHDR); + for (int i = 0; i < worldInfos.Length; i++) { worldInfos[i].material = worldInfos[i].renderQuad.GetComponent().material; - worldInfos[i].GenerateRenderTexture(quadOffset); + worldInfos[i].GenerateRenderTexture(quadOffset, supportHDR); } ResetQuadPositions(); @@ -65,7 +69,7 @@ public class WorldSwitcher : MonoBehaviour { //TODO Block window resize during transition? foreach (WorldInfo worldInfo in worldInfos) { if (Screen.width != worldInfo.texture.width || Screen.height != worldInfo.texture.height) - worldInfo.GenerateRenderTexture(quadOffset); + worldInfo.GenerateRenderTexture(quadOffset, supportHDR); } lastWorldIndex = currentWorldIndex; @@ -76,6 +80,21 @@ public class WorldSwitcher : MonoBehaviour { transition = StartCoroutine(TransitionCamera(currentWorldIndex - lastWorldIndex < 0)); } + public void OnDimension1(InputAction.CallbackContext ctx) { + if (ctx.performed) + SwitchWorld(0); + } + + public void OnDimension2(InputAction.CallbackContext ctx) { + if (ctx.performed) + SwitchWorld(1); + } + + public void OnDimension3(InputAction.CallbackContext ctx) { + if (ctx.performed) + SwitchWorld(2); + } + /*void OnGUI() { for (int i = 0; i < worldInfos.Length; ++i) { if (GUILayout.Button($"World {i}")) @@ -228,7 +247,7 @@ struct WorldInfo { } } - public void GenerateRenderTexture(float quadOffset) { + public void GenerateRenderTexture(float quadOffset, bool supportHDR) { bool usingTexture = !ReferenceEquals(camera.targetTexture, null); if (usingTexture) camera.targetTexture = null; @@ -236,6 +255,8 @@ struct WorldInfo { float height = 2f * Mathf.Tan(Mathf.Deg2Rad * camera.fieldOfView / 2f) * quadOffset; renderQuad.localScale = new Vector3(camera.aspect * height, height, 1f); texture = new RenderTexture(Screen.width, Screen.height, 32); + if (supportHDR) + texture.format = RenderTextureFormat.DefaultHDR; material.SetTexture(CameraTexture, texture); diff --git a/Assets/Settings/ConjureCreativeJam20.cs b/Assets/Settings/ConjureCreativeJam20.cs index d1eae92..eae67c5 100644 --- a/Assets/Settings/ConjureCreativeJam20.cs +++ b/Assets/Settings/ConjureCreativeJam20.cs @@ -62,6 +62,33 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl ""processors"": """", ""interactions"": """", ""initialStateCheck"": false + }, + { + ""name"": ""Dimension1"", + ""type"": ""Button"", + ""id"": ""ce1dffb7-3600-4c58-a12a-ce124ef1ddd0"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, + { + ""name"": ""Dimension2"", + ""type"": ""Button"", + ""id"": ""4a73fe5c-a8b1-48a9-8377-e4d9941b4e32"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, + { + ""name"": ""Dimension3"", + ""type"": ""Button"", + ""id"": ""d392a866-be73-4182-8081-9878fbdc19c8"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -306,6 +333,39 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl ""action"": ""Pause"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""8ff86459-0301-428f-9c14-66444870ce9d"", + ""path"": ""/1"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Keyboard&Mouse"", + ""action"": ""Dimension1"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""ae9973d7-05ba-432d-8bee-c18db95965a9"", + ""path"": ""/2"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Keyboard&Mouse"", + ""action"": ""Dimension2"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""374cfa5d-88f9-4467-a1ec-e76b85f7a222"", + ""path"": ""/3"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Keyboard&Mouse"", + ""action"": ""Dimension3"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] }, @@ -895,6 +955,9 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl m_Player_Look = m_Player.FindAction("Look", throwIfNotFound: true); m_Player_Fire = m_Player.FindAction("Fire", throwIfNotFound: true); m_Player_Pause = m_Player.FindAction("Pause", throwIfNotFound: true); + m_Player_Dimension1 = m_Player.FindAction("Dimension1", throwIfNotFound: true); + m_Player_Dimension2 = m_Player.FindAction("Dimension2", throwIfNotFound: true); + m_Player_Dimension3 = m_Player.FindAction("Dimension3", throwIfNotFound: true); // UI m_UI = asset.FindActionMap("UI", throwIfNotFound: true); m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true); @@ -970,6 +1033,9 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl private readonly InputAction m_Player_Look; private readonly InputAction m_Player_Fire; private readonly InputAction m_Player_Pause; + private readonly InputAction m_Player_Dimension1; + private readonly InputAction m_Player_Dimension2; + private readonly InputAction m_Player_Dimension3; public struct PlayerActions { private @ConjureCreativeJam20 m_Wrapper; @@ -978,6 +1044,9 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl public InputAction @Look => m_Wrapper.m_Player_Look; public InputAction @Fire => m_Wrapper.m_Player_Fire; public InputAction @Pause => m_Wrapper.m_Player_Pause; + public InputAction @Dimension1 => m_Wrapper.m_Player_Dimension1; + public InputAction @Dimension2 => m_Wrapper.m_Player_Dimension2; + public InputAction @Dimension3 => m_Wrapper.m_Player_Dimension3; public InputActionMap Get() { return m_Wrapper.m_Player; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -999,6 +1068,15 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl @Pause.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnPause; @Pause.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnPause; @Pause.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnPause; + @Dimension1.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension1; + @Dimension1.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension1; + @Dimension1.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension1; + @Dimension2.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension2; + @Dimension2.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension2; + @Dimension2.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension2; + @Dimension3.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension3; + @Dimension3.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension3; + @Dimension3.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnDimension3; } m_Wrapper.m_PlayerActionsCallbackInterface = instance; if (instance != null) @@ -1015,6 +1093,15 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl @Pause.started += instance.OnPause; @Pause.performed += instance.OnPause; @Pause.canceled += instance.OnPause; + @Dimension1.started += instance.OnDimension1; + @Dimension1.performed += instance.OnDimension1; + @Dimension1.canceled += instance.OnDimension1; + @Dimension2.started += instance.OnDimension2; + @Dimension2.performed += instance.OnDimension2; + @Dimension2.canceled += instance.OnDimension2; + @Dimension3.started += instance.OnDimension3; + @Dimension3.performed += instance.OnDimension3; + @Dimension3.canceled += instance.OnDimension3; } } } @@ -1175,6 +1262,9 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl void OnLook(InputAction.CallbackContext context); void OnFire(InputAction.CallbackContext context); void OnPause(InputAction.CallbackContext context); + void OnDimension1(InputAction.CallbackContext context); + void OnDimension2(InputAction.CallbackContext context); + void OnDimension3(InputAction.CallbackContext context); } public interface IUIActions { diff --git a/Assets/Settings/ConjureCreativeJam20.inputactions b/Assets/Settings/ConjureCreativeJam20.inputactions index 6558f44..ecf924a 100644 --- a/Assets/Settings/ConjureCreativeJam20.inputactions +++ b/Assets/Settings/ConjureCreativeJam20.inputactions @@ -40,6 +40,33 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Dimension1", + "type": "Button", + "id": "ce1dffb7-3600-4c58-a12a-ce124ef1ddd0", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Dimension2", + "type": "Button", + "id": "4a73fe5c-a8b1-48a9-8377-e4d9941b4e32", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Dimension3", + "type": "Button", + "id": "d392a866-be73-4182-8081-9878fbdc19c8", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -284,6 +311,39 @@ "action": "Pause", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "8ff86459-0301-428f-9c14-66444870ce9d", + "path": "/1", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Dimension1", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ae9973d7-05ba-432d-8bee-c18db95965a9", + "path": "/2", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Dimension2", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "374cfa5d-88f9-4467-a1ec-e76b85f7a222", + "path": "/3", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Dimension3", + "isComposite": false, + "isPartOfComposite": false } ] },