diff --git a/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth.mat b/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth.mat index d3ded54b..3a3facf3 100644 --- a/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth.mat +++ b/Assets/ART/Material/Synthwave Material/Terrain/Grid_synth.mat @@ -47,7 +47,7 @@ Material: - _MainTex: m_Texture: {fileID: 2800000, guid: 21eaf55ddaa3f874f8a025251d4443cd, type: 3} m_Scale: {x: -10, y: -10} - m_Offset: {x: 0, y: 10.393961} + m_Offset: {x: 0, y: 6.726523} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/Scenes/EndCinematic.unity b/Assets/Scenes/EndCinematic.unity index ecceaaa9..aa7b42b3 100644 --- a/Assets/Scenes/EndCinematic.unity +++ b/Assets/Scenes/EndCinematic.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.18028334, g: 0.2257134, b: 0.30692226, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -155,10 +155,10 @@ MonoBehaviour: video: {fileID: 1146872517} sceneLoader: {fileID: 222780968} mainMenuLevelindex: 1 - holdDuration: 3 - isSkeappeable: 0 - emptySprite: {fileID: 0} - fullSprite: {fileID: 0} + transitionTime: 2 + isSkippable: 0 + panelTransform: {fileID: 0} + maxWidth: 0 --- !u!4 &91922094 Transform: m_ObjectHideFlags: 0 @@ -228,6 +228,7 @@ GameObject: m_Component: - component: {fileID: 403372528} - component: {fileID: 403372527} + - component: {fileID: 403372529} m_Layer: 0 m_Name: WwiseGlobal m_TagString: Untagged @@ -275,6 +276,30 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &403372529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 403372526} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 604148b846732534daf7c6fd333812cf, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerList: f7e1664c + useOtherObject: 0 + data: + idInternal: 0 + valueGuidInternal: + groupIdInternal: 0 + groupGuidInternal: + WwiseObjectReference: {fileID: 11400000, guid: 284a7c4af5ac8794496cfa3f91911443, type: 2} + valueIdInternal: 0 + groupIdInternal: 0 + valueGuidInternal: + groupGuidInternal: --- !u!1 &1116082336 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/StartCinematic.unity b/Assets/Scenes/StartCinematic.unity index d06ca6e6..83bbdfa8 100644 --- a/Assets/Scenes/StartCinematic.unity +++ b/Assets/Scenes/StartCinematic.unity @@ -312,7 +312,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5c979a81c0d93f446aa30c781ebf28d1, type: 3} m_Name: m_EditorClassIdentifier: - triggerList: f7e1664c + triggerList: ae8d9d44 useOtherObject: 0 data: idInternal: 0 diff --git a/Assets/Wwise/ScriptableObjects/State/DFF86F03-33EF-4B6E-8A42-E2E69712C66B.asset b/Assets/Wwise/ScriptableObjects/State/DFF86F03-33EF-4B6E-8A42-E2E69712C66B.asset new file mode 100644 index 00000000..3d9ca70e --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/State/DFF86F03-33EF-4B6E-8A42-E2E69712C66B.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf17aff194482f847a8925cf757af951, type: 3} + m_Name: DFF86F03-33EF-4B6E-8A42-E2E69712C66B + m_EditorClassIdentifier: + objectName: None + id: 748895195 + guid: DFF86F03-33EF-4B6E-8A42-E2E69712C66B + WwiseStateGroupReference: {fileID: 11400000, guid: 92c554e16145d234f801a39166aa58a7, type: 2} diff --git a/Assets/Wwise/ScriptableObjects/State/DFF86F03-33EF-4B6E-8A42-E2E69712C66B.asset.meta b/Assets/Wwise/ScriptableObjects/State/DFF86F03-33EF-4B6E-8A42-E2E69712C66B.asset.meta new file mode 100644 index 00000000..4dcff3d3 --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/State/DFF86F03-33EF-4B6E-8A42-E2E69712C66B.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 284a7c4af5ac8794496cfa3f91911443 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Dimeowtions_WwiseProject/Events/Default Work Unit.wwu b/Dimeowtions_WwiseProject/Events/Default Work Unit.wwu index 688e626d..0eb15cd2 100644 --- a/Dimeowtions_WwiseProject/Events/Default Work Unit.wwu +++ b/Dimeowtions_WwiseProject/Events/Default Work Unit.wwu @@ -164,6 +164,23 @@ + + + + + + + + + + + + + + + + + diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk index f3728e87..31e7c6a8 100644 Binary files a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk and b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk differ diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Init.txt b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Init.txt index 1bec4b29..4235105a 100644 --- a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Init.txt +++ b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Init.txt @@ -13,9 +13,6 @@ State ID Name State Group Notes 2607556080 Menu Music_States 2932583730 Synthwave Music_States -Game Parameter ID Name Wwise Object Path Notes - 2918011349 MasterVolume \Default Work Unit\MasterVolume - Audio Bus ID Name Wwise Object Path Notes 3803692087 Master Audio Bus \Default Work Unit\Master Audio Bus diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Main.bnk b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Main.bnk index 79ed0258..5d2ebc7b 100644 Binary files a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Main.bnk and b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Main.bnk differ diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml index 0a5083d3..3963acc5 100644 --- a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml +++ b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml @@ -24,15 +24,12 @@ - + Init Init Init.bnk - - - - + \SoundBanks\Default Work Unit\Main Main Main.bnk diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk index 1f27c2ae..57480425 100644 Binary files a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk and b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk differ diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Init.txt b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Init.txt index 1bec4b29..4235105a 100644 --- a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Init.txt +++ b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Init.txt @@ -13,9 +13,6 @@ State ID Name State Group Notes 2607556080 Menu Music_States 2932583730 Synthwave Music_States -Game Parameter ID Name Wwise Object Path Notes - 2918011349 MasterVolume \Default Work Unit\MasterVolume - Audio Bus ID Name Wwise Object Path Notes 3803692087 Master Audio Bus \Default Work Unit\Master Audio Bus diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Main.bnk b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Main.bnk index 79ed0258..5d2ebc7b 100644 Binary files a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Main.bnk and b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Main.bnk differ diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml index 42df0a55..a36d0001 100644 --- a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml +++ b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml @@ -24,15 +24,12 @@ - + Init Init Init.bnk - - - - + \SoundBanks\Default Work Unit\Main Main Main.bnk diff --git a/Dimeowtions_WwiseProject/Master-Mixer Hierarchy/Default Work Unit.wwu b/Dimeowtions_WwiseProject/Master-Mixer Hierarchy/Default Work Unit.wwu index 66b04413..3d36f50e 100644 --- a/Dimeowtions_WwiseProject/Master-Mixer Hierarchy/Default Work Unit.wwu +++ b/Dimeowtions_WwiseProject/Master-Mixer Hierarchy/Default Work Unit.wwu @@ -4,41 +4,6 @@ - - - - - - - - - - - - - - - - 0 - -200 - 5 - - - 1.00673 - -0.21716 - 0 - - - 100 - 200 - 37 - - - - - - -