cailean
/
drecon-unity
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

camera switch sound update

audio
Cailean Finn 8 months ago
parent
89bc001bb9
commit
5480dcae56
10 changed files with 5377 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      Assets/5_Scenes/DreconDemo.unity
  2. 5314
      Assets/7_Shaders/Vertex Snapping/Vertex Snapping Transform.shadergraph
  3. 10
      Assets/7_Shaders/Vertex Snapping/Vertex Snapping Transform.shadergraph.meta
  4. 8
      Assets/8_Scripts/1_Managers/AudioManager.cs
  5. 5
      Assets/8_Scripts/1_Managers/CameraManager.cs
  6. 5
      Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat
  7. 2
      Assets/ML-Agents/Timers/DreconDemo_timers.json
  8. BIN
      FMOD Banks/Desktop/Master.strings.bank
  9. BIN
      FMOD Banks/Desktop/Music.bank
  10. BIN
      FMOD Banks/Desktop/SFX.bank

84
Assets/5_Scenes/DreconDemo.unity
View File

@ -919,22 +919,22 @@ LineRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: -336.35178, y: -23.040375, z: -264.943}
- {x: -128.76859, y: -23.040375, z: -264.943}
- {x: -128.76859, y: -23.040375, z: -67.8672}
- {x: -336.35178, y: -23.040375, z: -67.8672}
- {x: -336.35178, y: -23.040375, z: -264.943}
- {x: -336.35178, y: 422.16306, z: -264.943}
- {x: -128.76859, y: 422.16306, z: -264.943}
- {x: -128.76859, y: -23.040375, z: -264.943}
- {x: -128.76859, y: 422.16306, z: -264.943}
- {x: -128.76859, y: 422.16306, z: -67.8672}
- {x: -128.76859, y: -23.040375, z: -67.8672}
- {x: -128.76859, y: 422.16306, z: -67.8672}
- {x: -336.35178, y: 422.16306, z: -67.8672}
- {x: -336.35178, y: -23.040375, z: -67.8672}
- {x: -336.35178, y: 422.16306, z: -67.8672}
- {x: -336.35178, y: 422.16306, z: -264.943}
- {x: -412.7127, y: -21.951141, z: -292.2906}
- {x: -133.86412, y: -21.951141, z: -292.2906}
- {x: -133.86412, y: -21.951141, z: -93.21399}
- {x: -412.7127, y: -21.951141, z: -93.21399}
- {x: -412.7127, y: -21.951141, z: -292.2906}
- {x: -412.7127, y: 462.59784, z: -292.2906}
- {x: -133.86412, y: 462.59784, z: -292.2906}
- {x: -133.86412, y: -21.951141, z: -292.2906}
- {x: -133.86412, y: 462.59784, z: -292.2906}
- {x: -133.86412, y: 462.59784, z: -93.21399}
- {x: -133.86412, y: -21.951141, z: -93.21399}
- {x: -133.86412, y: 462.59784, z: -93.21399}
- {x: -412.7127, y: 462.59784, z: -93.21399}
- {x: -412.7127, y: -21.951141, z: -93.21399}
- {x: -412.7127, y: 462.59784, z: -93.21399}
- {x: -412.7127, y: 462.59784, z: -292.2906}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
@ -2053,7 +2053,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 153031623}
serializedVersion: 2
m_LocalRotation: {x: -0.000010763111, y: 0.9982297, z: 0.059476666, w: -0.000077584016}
m_LocalRotation: {x: -0.000010761057, y: 0.9982297, z: 0.059476644, w: -0.000077618504}
m_LocalPosition: {x: 18.101631, y: 8.540332, z: 4.4995093}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -3872,8 +3872,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320225263}
serializedVersion: 2
m_LocalRotation: {x: -0.1099321, y: 0.80572003, z: -0.56010956, w: -0.15813781}
m_LocalPosition: {x: 146.21135, y: 328.14355, z: -324.69598}
m_LocalRotation: {x: -0.10993206, y: 0.8057201, z: -0.5601094, w: -0.1581378}
m_LocalPosition: {x: 146.21146, y: 328.1435, z: -324.69598}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -3902,7 +3902,7 @@ MonoBehaviour:
m_Follow: {fileID: 1683887270}
m_Lens:
FieldOfView: 0.3993083
OrthographicSize: 0.4493446
OrthographicSize: 0.429782
NearClipPlane: 0.01
FarClipPlane: 5000
Dutch: 0
@ -4194,7 +4194,7 @@ Camera:
far clip plane: 5000
field of view: 0.3993083
orthographic: 1
orthographic size: 0.4493446
orthographic size: 0.429782
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@ -4218,8 +4218,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 330585543}
serializedVersion: 2
m_LocalRotation: {x: -0.1099321, y: 0.80572003, z: -0.56010956, w: -0.15813781}
m_LocalPosition: {x: 146.21135, y: 328.14355, z: -324.69598}
m_LocalRotation: {x: -0.10993206, y: 0.8057201, z: -0.5601094, w: -0.1581378}
m_LocalPosition: {x: 146.21146, y: 328.1435, z: -324.69598}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -4245,7 +4245,7 @@ MonoBehaviour:
m_BlendUpdateMethod: 1
m_DefaultBlend:
m_Style: 1
m_Time: 14
m_Time: 13
m_CustomCurve:
serializedVersion: 2
m_Curve: []
@ -11393,7 +11393,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 882491594}
serializedVersion: 2
m_LocalRotation: {x: 0.25553492, y: 0.66415995, z: -0.65266806, w: 0.26003432}
m_LocalRotation: {x: 0.25553274, y: 0.66416085, z: -0.6526689, w: 0.26003215}
m_LocalPosition: {x: 18.100853, y: 10.055965, z: -0.48116565}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -21527,7 +21527,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1634889327}
serializedVersion: 2
m_LocalRotation: {x: -0.25950268, y: 0.6790122, z: -0.62649494, w: -0.28125605}
m_LocalRotation: {x: -0.25950274, y: 0.6790122, z: -0.62649494, w: -0.28125608}
m_LocalPosition: {x: 11.361925, y: 9.244215, z: 7.779041}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -23865,22 +23865,22 @@ LineRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: -93.83374, y: -17.741898, z: -244.3446}
- {x: 168.15671, y: -17.741898, z: -244.3446}
- {x: 168.15671, y: -17.741898, z: 18.026672}
- {x: -93.83374, y: -17.741898, z: 18.026672}
- {x: -93.83374, y: -17.741898, z: -244.3446}
- {x: -93.83374, y: 407.62787, z: -244.3446}
- {x: 168.15671, y: 407.62787, z: -244.3446}
- {x: 168.15671, y: -17.741898, z: -244.3446}
- {x: 168.15671, y: 407.62787, z: -244.3446}
- {x: 168.15671, y: 407.62787, z: 18.026672}
- {x: 168.15671, y: -17.741898, z: 18.026672}
- {x: 168.15671, y: 407.62787, z: 18.026672}
- {x: -93.83374, y: 407.62787, z: 18.026672}
- {x: -93.83374, y: -17.741898, z: 18.026672}
- {x: -93.83374, y: 407.62787, z: 18.026672}
- {x: -93.83374, y: 407.62787, z: -244.3446}
- {x: -60.598137, y: -17.702927, z: -248.73778}
- {x: 158.00845, y: -17.702927, z: -248.73778}
- {x: 158.00845, y: -17.702927, z: -7.0879364}
- {x: -60.598137, y: -17.702927, z: -7.0879364}
- {x: -60.598137, y: -17.702927, z: -248.73778}
- {x: -60.598137, y: 444.79578, z: -248.73778}
- {x: 158.00845, y: 444.79578, z: -248.73778}
- {x: 158.00845, y: -17.702927, z: -248.73778}
- {x: 158.00845, y: 444.79578, z: -248.73778}
- {x: 158.00845, y: 444.79578, z: -7.0879364}
- {x: 158.00845, y: -17.702927, z: -7.0879364}
- {x: 158.00845, y: 444.79578, z: -7.0879364}
- {x: -60.598137, y: 444.79578, z: -7.0879364}
- {x: -60.598137, y: -17.702927, z: -7.0879364}
- {x: -60.598137, y: 444.79578, z: -7.0879364}
- {x: -60.598137, y: 444.79578, z: -248.73778}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1

5314
Assets/7_Shaders/Vertex Snapping/Vertex Snapping Transform.shadergraph
View File

File diff suppressed because it is too large

10
Assets/7_Shaders/Vertex Snapping/Vertex Snapping Transform.shadergraph.meta
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 6f220e9ab0172124dac72e5c2ad8911e
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

8
Assets/8_Scripts/1_Managers/AudioManager.cs
View File

@ -9,6 +9,8 @@ public class AudioManager : MonoBehaviour
public static AudioManager instance { get; private set; }
[SerializeField] public EventReference m_Soundtrack;
[SerializeField] public EventReference m_CameraSwitch;
private void Awake()
{
if (instance != null)
@ -40,12 +42,12 @@ public class AudioManager : MonoBehaviour
// Physic's based sounds
public void PlayOneShotAttached(EventReference sound, GameObject obj, float force)
{
RuntimeManager.PlayOneShotAttached(sound, obj, 1f, 0.01f);
RuntimeManager.PlayOneShotAttached(sound, obj, 1f, force * 0.005f);
}
public void PlayOneShotAttachedBreathing(EventReference sound, GameObject obj, float force)
{
//RuntimeManager.PlayOneShotAttached(sound, obj, force, 0.05f);
RuntimeManager.PlayOneShotAttached(sound, obj, force, 0.05f);
}
public void StopSound(EventInstance soundInst)
@ -57,6 +59,6 @@ public class AudioManager : MonoBehaviour
public void PlaySoundOnCameraSwitch()
{
Debug.Log("Halo");
PlaySound(m_CameraSwitch);
}
}

5
Assets/8_Scripts/1_Managers/CameraManager.cs
View File

@ -200,8 +200,6 @@ public class CameraManager : MonoBehaviour
private void SetCamera(GameObject camera)
{
AudioManager.instance.PlaySoundOnCameraSwitch();
SetCameraBlend(camera);
// Set all camera to active, and set all priorities to 0, bar the first camera
@ -227,7 +225,8 @@ public class CameraManager : MonoBehaviour
if(!pastCamera.GetComponent<VirtualCameraSettings>().m_CameraSettings.cut
|| !m_ActiveCamera.GetComponent<VirtualCameraSettings>().m_CameraSettings.cut){
blendtime = 0;
}
AudioManager.instance.PlaySoundOnCameraSwitch();
}
// if (AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Body")
// || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Body") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Body")

5
Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat
View File

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: smplx texture human
m_Shader: {fileID: -6465566751694194690, guid: 8da30c3b74c073944b750388446f9e0c,
m_Shader: {fileID: -6465566751694194690, guid: 6f220e9ab0172124dac72e5c2ad8911e,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
@ -33,7 +33,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- Texture2D_4450AB74:
m_Texture: {fileID: 2800000, guid: 873df25e462adb64bb1b42f080d89330, type: 3}
m_Texture: {fileID: 2800000, guid: a8892f830876f50488e9bd05d6541488, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AnisotropyMap:
@ -205,6 +205,7 @@ Material:
- _Ior: 1.5
- _IridescenceMask: 1
- _IridescenceThickness: 1
- _LerpTexture: 0.848
- _LinkDetailsWithBase: 1
- _MaterialID: 1
- _Metallic: 0

2
Assets/ML-Agents/Timers/DreconDemo_timers.json
View File

@ -1 +1 @@
{"count":1,"self":217.437696,"total":226.9797499,"children":{"InitializeActuators":{"count":1,"self":0.0015126999999999999,"total":0.0015126999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0015317,"total":0.0015317,"children":null},"AgentSendState":{"count":13204,"self":0.1104831,"total":2.555361,"children":{"CollectObservations":{"count":6602,"self":2.4018332,"total":2.4018330999999997,"children":null},"WriteActionMask":{"count":6602,"self":0.011765399999999999,"total":0.011765399999999999,"children":null},"RequestDecision":{"count":6602,"self":0.0312794,"total":0.0312794,"children":null}}},"DecideAction":{"count":13204,"self":4.2894679999999994,"total":4.2894679999999994,"children":null},"AgentAct":{"count":13204,"self":2.6926722,"total":2.6926722,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1716910697","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId 027d0021-ba81-4595-b0ef-efe85134d5fa -accessToken _RnpSRKkMsImb2bSPwhTsTP3Ja5N480tUu59C7A5i2Q005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1716910923"}}
{"count":1,"self":128.62777599999998,"total":133.6115917,"children":{"InitializeActuators":{"count":1,"self":0.0015666,"total":0.0015666,"children":null},"InitializeSensors":{"count":1,"self":0.001,"total":0.001,"children":null},"AgentSendState":{"count":7598,"self":0.053791399999999996,"total":1.6417686,"children":{"CollectObservations":{"count":3799,"self":1.5508513,"total":1.5508513,"children":null},"WriteActionMask":{"count":3799,"self":0.0123361,"total":0.0123361,"children":null},"RequestDecision":{"count":3799,"self":0.024789799999999997,"total":0.024789799999999997,"children":null}}},"DecideAction":{"count":7598,"self":2.3099756,"total":2.3099756,"children":null},"AgentAct":{"count":7598,"self":1.028495,"total":1.028495,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1717416385","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId cfc8f2a9-0537-4fba-b070-f880e52effa9 -accessToken _5JvzjJIQvBt0od_zI7MaK1dhKrYADPo_KWmtnyaPac005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1717416519"}}

BIN
FMOD Banks/Desktop/Master.strings.bank
View File

Binary file not shown.

BIN
FMOD Banks/Desktop/Music.bank
View File

Binary file not shown.

BIN
FMOD Banks/Desktop/SFX.bank
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save