chore : bugfix with audio scripts and test in separate scene
This commit is contained in:
@@ -0,0 +1,77 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &4567019715677106522
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5806845514899202101}
|
||||
- component: {fileID: 6986862178007090695}
|
||||
- component: {fileID: 7365274582226833486}
|
||||
m_Layer: 0
|
||||
m_Name: WwiseEventTrigger
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &5806845514899202101
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4567019715677106522}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -2.30955, y: 1.74, z: -5.64}
|
||||
m_LocalScale: {x: 1, y: 3.1175, z: 3.0324}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!65 &6986862178007090695
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4567019715677106522}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &7365274582226833486
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4567019715677106522}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7c1cc6d5ab210fa4baa79dabb29253e3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Audio_WwiseEventTrigger
|
||||
wwiseEvents:
|
||||
- label: Play_Test_Binaural
|
||||
wwiseEvent:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: d5f4712941b510141bf650af8b0f2d30, type: 2}
|
||||
triggerOnEnter: 1
|
||||
triggerOnExit: 0
|
||||
playerTag: Player
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: aec729894f9f57b46b671ad6de6dfd31
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1562,6 +1562,67 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: aa5fd76235a9d7f42b164cfd00ee58a4, type: 3}
|
||||
--- !u!1001 &1488412446344103320
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4567019715677106522, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: WwiseEventTrigger
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -2.30955
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 1.74
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -5.64
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7365274582226833486, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: wwiseEvents.Array.data[0].label
|
||||
value: Binaural
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
--- !u!1001 &1671855845641723936
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1720,3 +1781,4 @@ SceneRoots:
|
||||
- {fileID: 1671855845641723936}
|
||||
- {fileID: 1250423863045520849}
|
||||
- {fileID: 2118492718844646720}
|
||||
- {fileID: 1488412446344103320}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9db28fdf5c572414aa08b31921ca2e3a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -49,7 +49,7 @@ public class Audio_AudioManager : MonoBehaviour
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogWarning("AudioManager already exist! Destroying new ibnstance.");
|
||||
Debug.LogWarning("AudioManager already exist! Destroying new instance.");
|
||||
Destroy(this);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
using UnityEngine;
|
||||
using System.Collections.Generic;
|
||||
|
||||
[RequireComponent(typeof(Collider))]
|
||||
public class Audio_WwiseEventTrigger : MonoBehaviour
|
||||
{
|
||||
[System.Serializable]
|
||||
public class WwiseEventEntry
|
||||
{
|
||||
public string label = "Event";
|
||||
public AK.Wwise.Event wwiseEvent;
|
||||
public bool triggerOnEnter = true;
|
||||
public bool triggerOnExit = false;
|
||||
}
|
||||
|
||||
[Header("Wwise Events")]
|
||||
[SerializeField] private List<WwiseEventEntry> wwiseEvents = new List<WwiseEventEntry>();
|
||||
|
||||
[Header("Trigger Settings")]
|
||||
[SerializeField] private string playerTag = "Player";
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
GetComponent<Collider>().isTrigger = true;
|
||||
}
|
||||
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
if (!other.CompareTag(playerTag)) return;
|
||||
|
||||
foreach (var entry in wwiseEvents)
|
||||
{
|
||||
if (entry.triggerOnEnter && entry.wwiseEvent != null)
|
||||
entry.wwiseEvent.Post(other.gameObject);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTriggerExit(Collider other)
|
||||
{
|
||||
if (!other.CompareTag(playerTag)) return;
|
||||
|
||||
foreach (var entry in wwiseEvents)
|
||||
{
|
||||
if (entry.triggerOnExit && entry.wwiseEvent != null)
|
||||
entry.wwiseEvent.Post(other.gameObject);
|
||||
}
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
private void OnDrawGizmos()
|
||||
{
|
||||
BoxCollider box = GetComponent<BoxCollider>();
|
||||
if (box == null) return;
|
||||
|
||||
Gizmos.matrix = transform.localToWorldMatrix;
|
||||
Gizmos.color = new Color(1f, 0.5f, 0f, 0.25f);
|
||||
Gizmos.DrawCube(box.center, box.size);
|
||||
Gizmos.color = new Color(1f, 0.5f, 0f, 0.8f);
|
||||
Gizmos.DrawWireCube(box.center, box.size);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7c1cc6d5ab210fa4baa79dabb29253e3
|
||||
Reference in New Issue
Block a user