Fix Cinematics Music

Okami115 · Mar 6, 2024 · 56b3a38 · 56b3a38
1 parent 3e3e95f
commit 56b3a38
Show file tree

Hide file tree

Showing 15 changed files with 79 additions and 58 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/Dimeowtions_WwiseProject/Events/Default Work Unit.wwu b/Dimeowtions_WwiseProject/Events/Default Work Unit.wwu
@@ -164,6 +164,23 @@
 						</Event>
 						<Event Name="Play_Cinematica" ID="{FF85C195-3739-4A70-9A15-76DFC58BC411}">
 							<ChildrenList>
+								<Action Name="" ID="{311C649A-2E4E-4A52-A9D5-F99B845B79E3}" ShortID="855889114">
+									<PropertyList>
+										<Property Name="ActionType" Type="int16" Value="11"/>
+										<Property Name="Volume" Type="Real64">
+											<ModifierList>
+												<ModifierInfo>
+													<Modifier Name="" ID="{B36DD272-AAEF-4C58-AC14-F37AB13D3284}"/>
+												</ModifierInfo>
+											</ModifierList>
+										</Property>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Target">
+											<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{9FA5E459-1B02-46DD-8489-E7668FDC6496}"/>
+										</Reference>
+									</ReferenceList>
+								</Action>
 								<Action Name="" ID="{1B7575F0-E632-4890-8CE2-323FD00E2BB7}" ShortID="341980672">
 									<ReferenceList>
 										<Reference Name="Target">

diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk
diff --git 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
diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml
@@ -24,15 +24,12 @@
 	</StreamedFiles>
 	<MediaFilesNotInAnyBank/>
 	<SoundBanks>
-		<SoundBank Id="1355168291" Language="SFX" Hash="755726857">
+		<SoundBank Id="1355168291" Language="SFX" Hash="2722518523">
 			<ObjectPath>Init</ObjectPath>
 			<ShortName>Init</ShortName>
 			<Path>Init.bnk</Path>
-			<GameParameters>
-				<GameParameter Id="2918011349" Name="MasterVolume" ObjectPath="\Game Parameters\Default Work Unit\MasterVolume"/>
-			</GameParameters>
 		</SoundBank>
-		<SoundBank Id="3161908922" Language="SFX" Hash="680462759">
+		<SoundBank Id="3161908922" Language="SFX" Hash="2819192956">
 			<ObjectPath>\SoundBanks\Default Work Unit\Main</ObjectPath>
 			<ShortName>Main</ShortName>
 			<Path>Main.bnk</Path>

diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk
diff --git 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
diff --git a/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml b/Dimeowtions_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml
@@ -24,15 +24,12 @@
 	</StreamedFiles>
 	<MediaFilesNotInAnyBank/>
 	<SoundBanks>
-		<SoundBank Id="1355168291" Language="SFX" Hash="3567442839">
+		<SoundBank Id="1355168291" Language="SFX" Hash="2615612493">
 			<ObjectPath>Init</ObjectPath>
 			<ShortName>Init</ShortName>
 			<Path>Init.bnk</Path>
-			<GameParameters>
-				<GameParameter Id="2918011349" Name="MasterVolume" ObjectPath="\Game Parameters\Default Work Unit\MasterVolume"/>
-			</GameParameters>
 		</SoundBank>
-		<SoundBank Id="3161908922" Language="SFX" Hash="680462759">
+		<SoundBank Id="3161908922" Language="SFX" Hash="2819192956">
 			<ObjectPath>\SoundBanks\Default Work Unit\Main</ObjectPath>
 			<ShortName>Main</ShortName>
 			<Path>Main.bnk</Path>

diff --git a/Dimeowtions_WwiseProject/Master-Mixer Hierarchy/Default Work Unit.wwu b/Dimeowtions_WwiseProject/Master-Mixer Hierarchy/Default Work Unit.wwu
@@ -4,41 +4,6 @@
 		<WorkUnit Name="Default Work Unit" ID="{9FA5E459-1B02-46DD-8489-E7668FDC6496}" PersistMode="Standalone">
 			<ChildrenList>
 				<Bus Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}">
-					<PropertyList>
-						<Property Name="Volume" Type="Real64">
-							<RTPCList>
-								<RTPC Name="" ID="{275CB3C2-35CF-45E6-B086-C82E707E1F76}" ShortID="966856827">
-									<ReferenceList>
-										<Reference Name="ControlInput">
-											<ObjectRef Name="MasterVolume" ID="{00CFB1DF-F58F-4FC0-9A92-459B498F53B6}" WorkUnitID="{4C0DB5EC-629B-4F31-BD18-9013D475EE2F}"/>
-										</Reference>
-									</ReferenceList>
-									<Curve Name="" ID="{C66300D1-3F13-43FA-BEAE-B06999E2BFC7}">
-										<PropertyList>
-											<Property Name="Flags" Type="int32" Value="3"/>
-										</PropertyList>
-										<PointList>
-											<Point>
-												<XPos>0</XPos>
-												<YPos>-200</YPos>
-												<Flags>5</Flags>
-											</Point>
-											<Point>
-												<XPos>1.00673</XPos>
-												<YPos>-0.21716</YPos>
-												<Flags>0</Flags>
-											</Point>
-											<Point>
-												<XPos>100</XPos>
-												<YPos>200</YPos>
-												<Flags>37</Flags>
-											</Point>
-										</PointList>
-									</Curve>
-								</RTPC>
-							</RTPCList>
-						</Property>
-					</PropertyList>
 					<ReferenceList>
 						<Reference Name="AudioDevice">
 							<ObjectRef Name="System" ID="{7378FEDA-562B-4AF1-B8A0-1102A096E677}" WorkUnitID="{F8D06492-72EC-47EC-B1D7-458AC4CC7A78}"/>