Merge branch 'test-sounds' into dev

vladimirdlc · Mar 22, 2017 · a22c231 · a22c231
2 parents b874c35 + 39db522
commit a22c231
Show file tree

Hide file tree

Showing 30 changed files with 694 additions and 70 deletions.
diff --git a/Assets/Animations/Dog/DogWalking.anim b/Assets/Animations/Dog/DogWalking.anim
@@ -16513,4 +16513,32 @@ AnimationClip:
   m_HasMotionFloatCurves: 0
   m_GenerateMotionCurves: 0
   m_IsEmpty: 0
-  m_Events: []
+  m_Events:
+  - time: 0.27906978
+    functionName: DogStepOneShot
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.4360465
+    functionName: DogStepOneShot
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.71511626
+    functionName: DogStepOneShot
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.88372093
+    functionName: DogStepOneShot
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
diff --git a/Assets/PATimeRefactor/Assets/Scripts/PuppyCharacterController.cs b/Assets/PATimeRefactor/Assets/Scripts/PuppyCharacterController.cs
@@ -178,6 +178,8 @@ public void restoreState(global::TimeManager.State state)
         m_FollowDogTransform = state.m_PuppyTargetTransform;
         m_PuppyState = state.m_PuppyState;
         m_IsAware = state.m_PuppyAware;
+
+        m_Character.StateModification(m_PuppyState);
     }
 
     private void LateUpdate()
@@ -213,6 +215,7 @@ private void LateUpdate()
             if (m_PuppyState == PuppySate.IDLE_PLAYER)
             {
                 m_PuppyState = PuppySate.MOVING_PLAYER;
+                m_Character.StateModification(m_PuppyState);
             }
         }
         else
@@ -222,6 +225,7 @@ private void LateUpdate()
             if (m_PuppyState == PuppySate.MOVING_PLAYER)
             {
                 m_PuppyState = PuppySate.IDLE_PLAYER;
+                m_Character.StateModification(m_PuppyState);
             }
             else if (m_PuppyState == PuppySate.MOVING_SOUND)
             {

diff --git a/Assets/PATimeRefactor/Assets/Scripts/TimeManagerDependable.cs b/Assets/PATimeRefactor/Assets/Scripts/TimeManagerDependable.cs
@@ -125,8 +125,8 @@ void Update()
                     {
                         m_ParadoxFOVTimer = Mathf.Clamp(m_ParadoxFOVTimer -= Time.deltaTime, 0, m_InitFOV);
                         m_Camera.fieldOfView = Mathf.Lerp(m_InitFOV * m_ParadoxFOVMultiplier, m_InitFOV, m_ParadoxFOVTimer / m_ParadoxFOVInterval);
-                        Debug.Log(m_InitFOV * m_ParadoxFOVMultiplier);
-                        Debug.Log(m_Camera.fieldOfView);
+                        //Debug.Log(m_InitFOV * m_ParadoxFOVMultiplier);
+                        //Debug.Log(m_Camera.fieldOfView);
                     }
                     break;
                 case RequiredAction.ParadoxOff:

diff --git a/Assets/Prefabs/Ground Characters/Puppy/Puppy Gizmo.prefab b/Assets/Prefabs/Ground Characters/Puppy/Puppy Gizmo.prefab
@@ -434,6 +434,8 @@ GameObject:
   - component: {fileID: 114089431758400466}
   - component: {fileID: 135520360206607512}
   - component: {fileID: 114170022948509158}
+  - component: {fileID: 82176936156840940}
+  - component: {fileID: 114771153228054198}
   m_Layer: 22
   m_Name: Puppy Gizmo
   m_TagString: Puppy
@@ -731,6 +733,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1648380243505222
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4361777139064184}
+  - component: {fileID: 82521455723738612}
+  m_Layer: 22
+  m_Name: Moving Audiosource
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1666434982990114
 GameObject:
   m_ObjectHideFlags: 1
@@ -1456,6 +1474,19 @@ Transform:
   m_Father: {fileID: 4960433051706904}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0.00002632024, y: -0.00000040687874, z: -0.00000978171}
+--- !u!4 &4361777139064184
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1648380243505222}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4728816619038788}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4361881870634254
 Transform:
   m_ObjectHideFlags: 1
@@ -1562,7 +1593,7 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1063806573325964}
-  m_LocalRotation: {x: -0.3521753, y: -0.62304157, z: 0.6317084, w: 0.2978863}
+  m_LocalRotation: {x: -0.35217533, y: -0.6230416, z: 0.63170844, w: 0.29788634}
   m_LocalPosition: {x: 0.0000000063329932, y: 0.0041280463, z: -2.2351741e-10}
   m_LocalScale: {x: 1, y: 0.9999999, z: 1.0000001}
   m_Children:
@@ -1773,6 +1804,7 @@ Transform:
   - {fileID: 4930291271488606}
   - {fileID: 4264061594250432}
   - {fileID: 4361881870634254}
+  - {fileID: 4361777139064184}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
@@ -2221,6 +2253,166 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!82 &82176936156840940
+AudioSource:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1324764088501468}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    - serializedVersion: 2
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
+--- !u!82 &82521455723738612
+AudioSource:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1648380243505222}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: fb4d91f2d48cacb4bab20323846fc0a1, type: 3}
+  m_PlayOnAwake: 0
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 1
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    - serializedVersion: 2
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
 --- !u!95 &95015575624991952
 Animator:
   serializedVersion: 3
@@ -2289,13 +2481,28 @@ MonoBehaviour:
   m_MoveSpeedMultiplier: 1
   m_GroundCheckDistance: 0.1
   idleCountdown: 3
-  walkingAnimatorSpeed: 1
+  walkingAnimatorSpeed: 2
   barkAnimatorSpeed: 2
   loveEmoteAnimatorSpeed: 1
   pawSpeed: 0.75
   tailChaseSpeed: 0.5
   sitSpeed: 1
   sittingTailWagSpeed: 1
+--- !u!114 &114771153228054198
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1324764088501468}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 91e1cdb2f640b9442ba4fa7158ec321b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_TailChase: {fileID: 8300000, guid: 616af324f4b0c9a48aac5de3ca563a4e, type: 3}
+  m_Paw: {fileID: 8300000, guid: e69dcc7327d66dc40bff9c63f348b257, type: 3}
+  m_Bark: {fileID: 8300000, guid: a599c6c53cd2e5d4eab8e4df150cefa2, type: 3}
+  m_MovementAudiosource: {fileID: 82521455723738612}
 --- !u!135 &135520360206607512
 SphereCollider:
   m_ObjectHideFlags: 1
@@ -2918,7 +3125,7 @@ NavMeshAgent:
   m_Acceleration: 15
   avoidancePriority: 50
   m_AngularSpeed: 120
-  m_StoppingDistance: 2.5
+  m_StoppingDistance: 3.5
   m_AutoTraverseOffMeshLink: 1
   m_AutoBraking: 1
   m_AutoRepath: 1