diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index d34a4f3..f1e1966 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -706,6 +706,7 @@ Transform: - {fileID: 2133072947} - {fileID: 2012930730} - {fileID: 2060531169} + - {fileID: 1665413108} m_Father: {fileID: 734498092} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -879,7 +880,12 @@ MonoBehaviour: soundeffects: - {fileID: 1908750963} - {fileID: 368878861} - - {fileID: 1908750963} + - {fileID: 1028937044} + - {fileID: 1665413109} + - {fileID: 756259945} + - {fileID: 2133072948} + - {fileID: 2012930731} + - {fileID: 2060531170} --- !u!1 &1028937042 GameObject: m_ObjectHideFlags: 0 @@ -1105,7 +1111,7 @@ Prefab: - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchoredPosition.x - value: 65.89836 + value: 65.33481 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} @@ -1230,7 +1236,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 243359265566762914, guid: efb934a745665924d8c7dd46c0a117ae, type: 2} - m_audioClip: {fileID: 8300000, guid: c89601ee48d799943a756d1d15cd4954, type: 3} + m_audioClip: {fileID: 8300000, guid: 88c03fd1f6e7872419e7013745d876d2, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -1344,6 +1350,131 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1665413107 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1665413108} + - component: {fileID: 1665413109} + m_Layer: 0 + m_Name: door + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1665413108 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1665413107} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 816024605} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1665413109 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1665413107} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 243257092868039642, guid: efb934a745665924d8c7dd46c0a117ae, + type: 2} + m_audioClip: {fileID: 8300000, guid: 60847d53050c22347acc899c3deb8843, 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 &1908750961 GameObject: m_ObjectHideFlags: 0 @@ -1594,11 +1725,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!4 &2032758561 stripped -Transform: - m_PrefabParentObject: {fileID: 4676354101874032, guid: 3d1911457c1e44f53b6b4044334db52f, - type: 2} - m_PrefabInternal: {fileID: 865504979} --- !u!1 &2060531168 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TitleScene.unity b/Assets/Scenes/TitleScene.unity index 4c53d38..1eb1c2a 100644 --- a/Assets/Scenes/TitleScene.unity +++ b/Assets/Scenes/TitleScene.unity @@ -265,7 +265,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1911841377} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &114022018 AudioSource: @@ -363,6 +363,131 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &170010727 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 170010728} + - component: {fileID: 170010729} + m_Layer: 0 + m_Name: door + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &170010728 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 170010727} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1911841377} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &170010729 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 170010727} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 243257092868039642, guid: efb934a745665924d8c7dd46c0a117ae, + type: 2} + m_audioClip: {fileID: 8300000, guid: 60847d53050c22347acc899c3deb8843, 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 &272880425 GameObject: m_ObjectHideFlags: 0 @@ -390,7 +515,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1911841377} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &272880427 AudioSource: @@ -827,7 +952,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1911841377} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &571134117 AudioSource: @@ -1067,7 +1192,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 243359265566762914, guid: efb934a745665924d8c7dd46c0a117ae, type: 2} - m_audioClip: {fileID: 8300000, guid: c89601ee48d799943a756d1d15cd4954, type: 3} + m_audioClip: {fileID: 8300000, guid: 88c03fd1f6e7872419e7013745d876d2, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -1380,6 +1505,11 @@ MonoBehaviour: - {fileID: 1187801173} - {fileID: 987581542} - {fileID: 429380406} + - {fileID: 170010729} + - {fileID: 571134117} + - {fileID: 114022018} + - {fileID: 272880427} + - {fileID: 2015154023} --- !u!1 &1039057777 GameObject: m_ObjectHideFlags: 0 @@ -2079,6 +2209,7 @@ Transform: - {fileID: 1187801172} - {fileID: 987581541} - {fileID: 429380405} + - {fileID: 170010728} - {fileID: 571134116} - {fileID: 114022017} - {fileID: 272880426} @@ -2143,7 +2274,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1911841377} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &2015154023 AudioSource: diff --git a/Assets/Scripts/AudioControl.cs b/Assets/Scripts/AudioControl.cs index 336c310..8575847 100644 --- a/Assets/Scripts/AudioControl.cs +++ b/Assets/Scripts/AudioControl.cs @@ -13,7 +13,7 @@ public class AudioControl : MonoBehaviour public enum Sfx { shoot, explosion, mobattack, door, faster, slower, driving, slowdriving }; - private const float lvlbgm = 6.79f; + private const float lvlbgm = 5.759f; private const float gobgm = 14.406f; private const float loopdelay = 0.05f; private bool menu; diff --git a/Assets/sound/AudioMixer.mixer b/Assets/sound/AudioMixer.mixer index 71713b1..f2558a3 100644 --- a/Assets/sound/AudioMixer.mixer +++ b/Assets/sound/AudioMixer.mixer @@ -30,6 +30,7 @@ AudioMixerController: - 88c3759403be8514c97c0a0b2f565e60 - 8783d2948d71b9d469384aea903ce55c - 3fcf75061f55ae640990a5d2e32b20fe + - 6640809a565deef43b1954590fb1bcfe name: View m_CurrentViewIndex: 0 m_TargetSnapshot: {fileID: 24500006} @@ -162,6 +163,23 @@ AudioMixerGroupController: m_Mute: 0 m_Solo: 0 m_BypassEffects: 0 +--- !u!243 &243257092868039642 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: door + m_AudioMixer: {fileID: 24100000} + m_GroupID: 6640809a565deef43b1954590fb1bcfe + m_Children: [] + m_Volume: 644f6589fc60a074a98ad67d609f2bfb + m_Pitch: 4ab50086cf705494aacc1dbb1df4a887 + m_Effects: + - {fileID: 244643032102958874} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 --- !u!243 &243356048287013750 AudioMixerGroupController: m_ObjectHideFlags: 0 @@ -231,6 +249,7 @@ AudioMixerGroupController: - {fileID: 243163957001275252} - {fileID: 243021022379401452} - {fileID: 243229718110042718} + - {fileID: 243257092868039642} m_Volume: bb7239234bfe40f409abe7c8da078444 m_Pitch: 3add7831cf75dd0468538de15eeb2617 m_Effects: @@ -364,6 +383,19 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!244 &244643032102958874 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_EffectID: 6ed7c9718923dc94986ca9fcdc66a018 + m_EffectName: Attenuation + m_MixLevel: a776022aa77751941bd1de62a4d08f6d + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!244 &244932309018270998 AudioMixerEffectController: m_ObjectHideFlags: 3 diff --git a/Assets/sound/Welcome in the DungeonV1.2.wav b/Assets/sound/Welcome in the DungeonV1.2.wav new file mode 100644 index 0000000..9e9a3c9 Binary files /dev/null and b/Assets/sound/Welcome in the DungeonV1.2.wav differ diff --git a/Assets/sound/Welcome in the DungeonV1.2.wav.meta b/Assets/sound/Welcome in the DungeonV1.2.wav.meta new file mode 100644 index 0000000..0f716e1 --- /dev/null +++ b/Assets/sound/Welcome in the DungeonV1.2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 88c03fd1f6e7872419e7013745d876d2 +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: