Merge pull request #136 from NicolasLaure/credits_and_sound

Credits and sound
NicolasLaure · Nov 27, 2024 · 2c1a3da · 2c1a3da
2 parents bfd8a07 + 71e06a5
commit 2c1a3da
Show file tree

Hide file tree

Showing 33 changed files with 3,356 additions and 2,702 deletions.
diff --git a/Assets/Prefabs/Levels/LevelSequenceManager.prefab b/Assets/Prefabs/Levels/LevelSequenceManager.prefab
@@ -51,6 +51,7 @@ MonoBehaviour:
   obstacleSequence: {fileID: 1600891506706725506}
   minionsSequence: {fileID: 2780287947506723910}
   bossSequence: {fileID: 8538605700224022850}
+  onPlayerNewMotorValue: {fileID: 11400000, guid: 97ccbf7a468d85c4bb0fa9b6d4f17895, type: 2}
 --- !u!114 &1600891506706725506
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scenes/Boot.unity b/Assets/Scenes/Boot.unity
@@ -574,6 +574,10 @@ PrefabInstance:
       propertyPath: initScenes.Array.data[2]
       value: Roads
       objectReference: {fileID: 0}
+    - target: {fileID: 6288261650114330022, guid: d1b9efb00f169a74eba642e6c29ec261, type: 3}
+      propertyPath: stopSfxEvent.WwiseObjectReference
+      value: 
+      objectReference: {fileID: 11400000, guid: dc9cf9f7049b4724ab64460945a342bd, type: 2}
     - target: {fileID: 7888415006632084745, guid: d1b9efb00f169a74eba642e6c29ec261, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.2978884

diff --git a/Assets/Scenes/GameLoop.unity b/Assets/Scenes/GameLoop.unity
@@ -583,7 +583,43 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 765996105383918817, guid: 3083adca6baa6e84f9ab522107f1414b, type: 3}
       propertyPath: motorDiff
-      value: 45
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 765996105383918817, guid: 3083adca6baa6e84f9ab522107f1414b, type: 3}
+      propertyPath: initMotorValue
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 765996105383918817, guid: 3083adca6baa6e84f9ab522107f1414b, type: 3}
+      propertyPath: onGameplayReset
+      value: 
+      objectReference: {fileID: 11400000, guid: ab870950ec2b0124da9411e0e9f8faa6, type: 2}
+    - target: {fileID: 765996105383918817, guid: 3083adca6baa6e84f9ab522107f1414b, type: 3}
+      propertyPath: onNewMotorValue
+      value: 
+      objectReference: {fileID: 11400000, guid: 97ccbf7a468d85c4bb0fa9b6d4f17895, type: 2}
+    - target: {fileID: 765996105383918817, guid: 3083adca6baa6e84f9ab522107f1414b, type: 3}
+      propertyPath: motorChangeDuration
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 765996105383918817, guid: 3083adca6baa6e84f9ab522107f1414b, type: 3}
+      propertyPath: motorSoundCurve.m_Curve.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 765996105383918817, guid: 3083adca6baa6e84f9ab522107f1414b, type: 3}
+      propertyPath: motorSoundCurve.m_Curve.Array.data[1].time
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 765996105383918817, guid: 3083adca6baa6e84f9ab522107f1414b, type: 3}
+      propertyPath: motorSoundCurve.m_Curve.Array.data[1].value
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 765996105383918817, guid: 3083adca6baa6e84f9ab522107f1414b, type: 3}
+      propertyPath: motorSoundCurve.m_Curve.Array.data[1].inSlope
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 765996105383918817, guid: 3083adca6baa6e84f9ab522107f1414b, type: 3}
+      propertyPath: motorSoundCurve.m_Curve.Array.data[1].outSlope
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 936739446926610039, guid: 3083adca6baa6e84f9ab522107f1414b, type: 3}
       propertyPath: m_LocalPosition.x

diff --git a/Assets/Scenes/OverlayCanvas.unity b/Assets/Scenes/OverlayCanvas.unity
@@ -139,6 +139,78 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 110514247}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
+      value: 
+      objectReference: {fileID: 110514246}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
+      value: 
+      objectReference: {fileID: 110514245}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target
+      value: 
+      objectReference: {fileID: 110514244}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: StopAllSfxs
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName
+      value: RaiseEvent
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: Sounds.SfxStopper, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName
+      value: Events.EventRaiser`1[[System.Boolean, mscorlib
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName
+      value: Events.StringEventRaiser, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_StringArgument
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_StringArgument
+      value: MainMenu
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
+    - target: {fileID: 3818340155730375841, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
     - target: {fileID: 6164988826039075903, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -182,8 +254,65 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 3075073673414848795, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 110514247}
   m_SourcePrefab: {fileID: 100100000, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+--- !u!1 &110514243 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3075073673414848795, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+  m_PrefabInstance: {fileID: 110514242}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &110514244 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1603754729365973475, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+  m_PrefabInstance: {fileID: 110514242}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 110514243}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4c2f69a6c98dc814dbee85c443ae7f6c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &110514245 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2829005107464933537, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+  m_PrefabInstance: {fileID: 110514242}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 110514243}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 580d265a6e84aa54aa1c74d5f4d5ea4a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &110514246 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6430404070798962081, guid: 3a715ec63509ef44891816f63e2ea190, type: 3}
+  m_PrefabInstance: {fileID: 110514242}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 110514243}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 580d265a6e84aa54aa1c74d5f4d5ea4a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &110514247
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 110514243}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9c74b9672a4de6e4e958b1bd4ded6f8a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  stopAllSfxEvent:
+    idInternal: 0
+    valueGuidInternal: 
+    WwiseObjectReference: {fileID: 11400000, guid: dc9cf9f7049b4724ab64460945a342bd, type: 2}
 --- !u!1 &308966343
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/ScriptableObjects/Credits/CreditsDataConfig.asset b/Assets/ScriptableObjects/Credits/CreditsDataConfig.asset
@@ -46,7 +46,6 @@ MonoBehaviour:
   - title: QA
     members:
     - Eneas Cardozo
-    - Gonzalo Fernandez
     - Gonzalo Nataniel Fernandez Ibarra
     - Valentina Lanus
     - Federico Javier Loriente Pinto

diff --git a/Assets/ScriptableObjects/Events/Player/Motor.meta b/Assets/ScriptableObjects/Events/Player/Motor.meta
diff --git a/Assets/ScriptableObjects/Events/Player/Motor/OnNewMotorValue.asset b/Assets/ScriptableObjects/Events/Player/Motor/OnNewMotorValue.asset
@@ -0,0 +1,20 @@
+%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: 902884aedffb44b489c51c625bb7747b, type: 3}
+  m_Name: OnNewMotorValue
+  m_EditorClassIdentifier: 
+  onEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  onFloatEvent:
+    m_PersistentCalls:
+      m_Calls: []
diff --git a/Assets/ScriptableObjects/Events/Player/Motor/OnNewMotorValue.asset.meta b/Assets/ScriptableObjects/Events/Player/Motor/OnNewMotorValue.asset.meta
diff --git a/Assets/ScriptableObjects/Levels/FirstLoopConfig.asset b/Assets/ScriptableObjects/Levels/FirstLoopConfig.asset
@@ -42,3 +42,5 @@ MonoBehaviour:
   minionsData:
     managerData: {fileID: 11400000, guid: 91033f8a42d6eca46a3415f50b958ebf, type: 2}
     spawnerData: {fileID: 11400000, guid: 243747caa98ab304da81a7d8e918fbe4, type: 2}
+  playerData:
+    motorRtpcValue: 25
diff --git a/Assets/ScriptableObjects/Levels/SecondLoopConfig.asset b/Assets/ScriptableObjects/Levels/SecondLoopConfig.asset
@@ -42,3 +42,5 @@ MonoBehaviour:
   minionsData:
     managerData: {fileID: 11400000, guid: 8cd32077c5b690d438b85c3fe7c4cc97, type: 2}
     spawnerData: {fileID: 11400000, guid: d46629b6d3b2c1f46b45324709c13e79, type: 2}
+  playerData:
+    motorRtpcValue: 50
diff --git a/Assets/ScriptableObjects/Levels/ThirdLoopConfig.asset b/Assets/ScriptableObjects/Levels/ThirdLoopConfig.asset
@@ -42,3 +42,5 @@ MonoBehaviour:
   minionsData:
     managerData: {fileID: 11400000, guid: 85d3b1fece252cb4aa3e17dd6393c921, type: 2}
     spawnerData: {fileID: 11400000, guid: beb5d6bb5653158469701d4f946d35f1, type: 2}
+  playerData:
+    motorRtpcValue: 75
diff --git a/Assets/Scripts/LevelManagement/LevelLoopManager.cs b/Assets/Scripts/LevelManagement/LevelLoopManager.cs
@@ -1,4 +1,5 @@
 using System.Collections;
+using Events;
 using LevelManagement.Sequences;
 using ObstacleSystem;
 using UnityEngine;
@@ -15,6 +16,8 @@ public class LevelLoopManager : MonoBehaviour
         [SerializeField] private MinionsSequence minionsSequence;
         [SerializeField] private BossSequence bossSequence;
 
+        [SerializeField] private FloatEventChannelSO onPlayerNewMotorValue;
+
         private LevelLoopSO _levelConfig;
         private Coroutine _actualLoopSequence;
 
@@ -27,6 +30,7 @@ public void StartLevelSequence(LevelLoopSO loopConfig)
         public void SetupLevelLoop(LevelLoopSO loopConfig)
         {
             _levelConfig = loopConfig;
+            onPlayerNewMotorValue?.RaiseEvent(_levelConfig.playerData.motorRtpcValue);
 
             obstacleSequence.SetupSequence(_levelConfig.roadData);
             minionsSequence.SetupSequence(_levelConfig.minionsData);

diff --git a/Assets/Scripts/LevelManagement/LevelLoopSO.cs b/Assets/Scripts/LevelManagement/LevelLoopSO.cs
@@ -44,6 +44,12 @@ public class MinionsData
         public MinionsManagerSO managerData;
         public MinionSpawnerSO spawnerData;
     }
+
+    [Serializable]
+    public class PlayerData
+    {
+        public float motorRtpcValue;
+    }
 
     [CreateAssetMenu(menuName = "Level Loop Config", fileName = "LevelLoopConfig", order = 0)]
     public class LevelLoopSO : ScriptableObject
@@ -52,5 +58,6 @@ public class LevelLoopSO : ScriptableObject
         public RoadData roadData;
         public BossData bossData;
         public MinionsData minionsData;
+        public PlayerData playerData;
     }
 }
diff --git a/Assets/Scripts/LevelManagement/LevelManager.cs b/Assets/Scripts/LevelManagement/LevelManager.cs
@@ -27,7 +27,6 @@ public class LevelManager : MonoBehaviour
         [SerializeField] private IntEventChannelSO onEnemyDamageEvent;
         [SerializeField] private VoidEventChannelSO onEnemyShouldLeaveEvent;
         [SerializeField] private VoidEventChannelSO onEnemyLeftEvent;
-
         [SerializeField] private VoidEventChannelSO onEnemyDeathEvent;
         [SerializeField] private VoidEventChannelSO onPlayerDeathEvent;
         [SerializeField] private BoolEventChannelSO onTryAgainCanvasEvent;

diff --git a/Assets/Scripts/Managers/SceneryManager.cs b/Assets/Scripts/Managers/SceneryManager.cs
@@ -12,7 +12,7 @@ namespace Managers
     public class SceneryManager : MonoBehaviour
     {
         [SerializeField] private ScenesDataConfig scenesDataConfig;
-
+        
         [Tooltip("Scenes that are on boot")] 
         [SerializeField] private string[] initScenes;