Merge remote-tracking branch 'origin/develop' into develop

m21-cerutti · m21-cerutti · commit c68ae54fbaca · 2021-07-24T17:08:47.000+02:00
diff --git a/Assets/Data/Events/JumpEvent.asset b/Assets/Data/Events/JumpEvent.asset
@@ -0,0 +1,14 @@
+%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: 788cf15a156f93c459b78abb321a2e80, type: 3}
+  m_Name: JumpEvent
+  m_EditorClassIdentifier: 
diff --git a/Assets/Data/Events/JumpEvent.asset.meta b/Assets/Data/Events/JumpEvent.asset.meta
diff --git a/Assets/Data/Prefabs/Level/Gameplay/Autel.prefab b/Assets/Data/Prefabs/Level/Gameplay/Autel.prefab
@@ -13,6 +13,48 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 2.6, y: 2, z: 3.51}
   m_Center: {x: -0.14, y: 1.1, z: -0.06}
+--- !u!114 &3130105512880051929
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5164108242750382102}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3976a1fd3e335d4458a2b7ed19d267ce, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_event: {fileID: 11400000, guid: 0e4abd6988862cc48af23f67ce143061, type: 2}
+  m_func:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4371646599904214497}
+        m_TargetAssemblyTypeName: AutelSound, Assembly-CSharp
+        m_MethodName: OnInteraction
+        m_Mode: 0
+        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!114 &4371646599904214497
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5164108242750382102}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 795b2fbe797bc4e47b9728bd1213b517, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_autelVictoryName: event:/SoundFX/ObjectFound
+  m_autelWrongName: event:/SoundFX/ObjectFound
 --- !u!114 &6471938960726025062
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Assets/Data/Prefabs/Player/Player.prefab b/Assets/Data/Prefabs/Player/Player.prefab
@@ -231,6 +231,7 @@ MonoBehaviour:
     m_Bits: 8
   m_rayDist: 0.3
   m_moveEvent: {fileID: 11400000, guid: cddb9d3dd3c72744a825dc4171f60be5, type: 2}
+  m_jumpEvent: {fileID: 11400000, guid: 8edf4f0c9803ded49a220f6f39b6390c, type: 2}
 --- !u!114 &5529392882851554763
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Assets/Data/Prefabs/UI/Main Menu.prefab b/Assets/Data/Prefabs/UI/Main Menu.prefab
@@ -228,7 +228,7 @@ MonoBehaviour:
 
     Gabriel Dubois
 
-    Theo'
+    Theo Lopez'
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -864,7 +864,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7762978115362854768
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1582,7 +1582,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1000, y: 0}
+  m_AnchoredPosition: {x: 1014.7, y: -153.9}
   m_SizeDelta: {x: 1000, y: 0}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!1 &7762978116138308863
diff --git a/Assets/Scripts/Runtime/AutelSound.cs b/Assets/Scripts/Runtime/AutelSound.cs
@@ -0,0 +1,42 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using FMOD.Studio;
+
+public class AutelSound : MonoBehaviour
+{
+	[FMODUnity.EventRef]
+	[SerializeField]
+	private string m_autelVictoryName;
+
+	[FMODUnity.EventRef]
+	[SerializeField]
+	private string m_autelWrongName;
+
+	private EventInstance m_autelVictory;
+	private EventInstance m_autelWrong;
+
+	private void OnEnable()
+	{
+		m_autelVictory = FMODUnity.RuntimeManager.CreateInstance(m_autelVictoryName);
+		m_autelWrong = FMODUnity.RuntimeManager.CreateInstance(m_autelWrongName);
+	}
+
+	private void OnDisable()
+	{
+		m_autelVictory.release();
+		m_autelWrong.release();
+	}
+
+	public void OnInteraction(bool isFull)
+	{
+		if(isFull)
+		{
+			m_autelVictory.start();
+		}
+		else
+		{
+			m_autelWrong.start();
+		}
+	}
+}
diff --git a/Assets/Scripts/Runtime/AutelSound.cs.meta b/Assets/Scripts/Runtime/AutelSound.cs.meta
diff --git a/Assets/Scripts/Runtime/JumpSound.cs b/Assets/Scripts/Runtime/JumpSound.cs
@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using FMOD.Studio;
+using CustomEvents;
+
+using UnityEngine;
+
+public class JumpSound : MonoBehaviour
+{	
+	[FMODUnity.EventRef]
+	[SerializeField]
+	private string m_jumpName;
+
+	private EventInstance m_jump;
+
+	private void OnEnable()
+	{
+		m_jump = FMODUnity.RuntimeManager.CreateInstance(m_jumpName);
+	}
+
+	private void OnDisable()
+	{
+		m_jump.release();
+	}
+
+	public void OnJump()
+	{
+		m_jump.start();
+	}
+}
diff --git a/Assets/Scripts/Runtime/JumpSound.cs.meta b/Assets/Scripts/Runtime/JumpSound.cs.meta
diff --git a/Assets/Scripts/Runtime/Player/Controllers/PlayerMovementContoller.cs b/Assets/Scripts/Runtime/Player/Controllers/PlayerMovementContoller.cs
@@ -34,6 +34,7 @@ public class PlayerMovementContoller : MonoBehaviour
 
 	[Header("Events", order = 4)]
 	[SerializeField] private MoveEvent m_moveEvent;
+	[SerializeField] private SimpleEvent m_jumpEvent;
 
 	public bool IsGrounded { get; private set; } = false;
 	public bool IsMoving => m_inputVelocity.sqrMagnitude > 0.1;
@@ -177,6 +178,7 @@ public void OnJump(InputAction.CallbackContext context)
 				{
 					m_jumpToPerformThisFrame = true;
 					m_canJump = false;
+					m_jumpEvent.Invoke();
 				}
 			}
 		}
diff --git a/Assets/Settings/Graphics/VFX/ObjectFound.vfx b/Assets/Settings/Graphics/VFX/ObjectFound.vfx
@@ -117,62 +117,6 @@ MonoBehaviour:
   loopCount: 0
   delayBeforeLoop: 0
   delayAfterLoop: 0
---- !u!114 &8926484042661614556
-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: f05c6884b705ce14d82ae720f0ec209f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UIIgnoredErrors: []
-  m_Parent: {fileID: 8926484042661614555}
-  m_Children: []
-  m_UIPosition: {x: 233.38269, y: 57.572144}
-  m_UICollapsed: 0
-  m_UISuperCollapsed: 0
-  m_InputSlots:
-  - {fileID: 8926484042661614557}
-  m_OutputSlots: []
-  m_Disabled: 0
---- !u!114 &8926484042661614557
-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: f780aa281814f9842a7c076d436932e7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UIIgnoredErrors: []
-  m_Parent: {fileID: 0}
-  m_Children: []
-  m_UIPosition: {x: 0, y: 0}
-  m_UICollapsed: 1
-  m_UISuperCollapsed: 0
-  m_MasterSlot: {fileID: 8926484042661614557}
-  m_MasterData:
-    m_Owner: {fileID: 8926484042661614556}
-    m_Value:
-      m_Type:
-        m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
-          PublicKeyToken=b77a5c561934e089
-      m_SerializableObject: 16
-    m_Space: 2147483647
-  m_Property:
-    name: Rate
-    m_serializedType:
-      m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
-        PublicKeyToken=b77a5c561934e089
-  m_Direction: 0
-  m_LinkedSlots: []
 --- !u!114 &8926484042661614558
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1297,26 +1241,6 @@ MonoBehaviour:
         Culture=neutral, PublicKeyToken=null
   m_Direction: 0
   m_LinkedSlots: []
---- !u!114 &8926484042661614595
-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: f68759077adc0b143b6e1c101e82065e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UIIgnoredErrors: []
-  m_Parent: {fileID: 0}
-  m_Children: []
-  m_UIPosition: {x: 0, y: 0}
-  m_UICollapsed: 1
-  m_UISuperCollapsed: 0
-  title: 
-  m_Owners: []
 --- !u!114 &8926484042661614616
 MonoBehaviour:
   m_ObjectHideFlags: 0

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public class PlayerMovementContoller : MonoBehaviour`
`34`	`34`
`35`	`35`	`[Header("Events", order = 4)]`
`36`	`36`	`[SerializeField] private MoveEvent m_moveEvent;`
	`37`	`+ [SerializeField] private SimpleEvent m_jumpEvent;`
`37`	`38`
`38`	`39`	`public bool IsGrounded { get; private set; } = false;`
`39`	`40`	`public bool IsMoving => m_inputVelocity.sqrMagnitude > 0.1;`
`@@ -177,6 +178,7 @@ public void OnJump(InputAction.CallbackContext context)`
`177`	`178`	`{`
`178`	`179`	`m_jumpToPerformThisFrame = true;`
`179`	`180`	`m_canJump = false;`
	`181`	`+ m_jumpEvent.Invoke();`
`180`	`182`	`}`
`181`	`183`	`}`
`182`	`184`	`}`