diff --git a/Assets/Animations/Dog/DogWalking.anim b/Assets/Animations/Dog/DogWalking.anim index c76710d..a4171a7 100644 --- 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 index 4af5f7e..0d6c394 100644 --- 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 index f2bffb2..973ccdb 100644 --- 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 index b1a9223..32822d4 100644 --- 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 diff --git a/Assets/Prefabs/Ground Characters/Test Dog Clone.prefab b/Assets/Prefabs/Ground Characters/Test Dog Clone.prefab index 3cdce54..e619a89 100644 --- a/Assets/Prefabs/Ground Characters/Test Dog Clone.prefab +++ b/Assets/Prefabs/Ground Characters/Test Dog Clone.prefab @@ -241,13 +241,13 @@ GameObject: m_Component: - component: {fileID: 4274832022762586} - component: {fileID: 54726893292461770} - - component: {fileID: 82988502466345010} - component: {fileID: 136488809996048714} - component: {fileID: 195579264184893958} - component: {fileID: 114171912868847632} - component: {fileID: 114860986800652246} - component: {fileID: 114186232137434874} - component: {fileID: 135790850364958870} + - component: {fileID: 114253224428243426} m_Layer: 19 m_Name: Test Dog Clone m_TagString: Clone @@ -996,6 +996,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1937665238162648 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4615298118314180} + - component: {fileID: 82289300839046882} + m_Layer: 14 + m_Name: Movement Audiosource + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1942045770265152 GameObject: m_ObjectHideFlags: 1 @@ -1213,7 +1229,7 @@ Transform: m_LocalScale: {x: 0.35, y: 0.001, z: 0.35} m_Children: [] m_Father: {fileID: 4274832022762586} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4112497996104168 Transform: @@ -1299,6 +1315,7 @@ Transform: m_LocalPosition: {x: -1.3476725, y: 0.5, z: -20.058386} m_LocalScale: {x: 10, y: 10, z: 10} m_Children: + - {fileID: 4615298118314180} - {fileID: 224999301382265924} - {fileID: 4447256945343126} - {fileID: 4629194356278368} @@ -1444,7 +1461,7 @@ Transform: - {fileID: 4382317068342856} - {fileID: 4531938699361654} m_Father: {fileID: 4274832022762586} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!4 &4476664080796704 Transform: @@ -1600,6 +1617,19 @@ Transform: m_Father: {fileID: 4801690208821060} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 3.0275946, y: 0.066695124, z: 4.791916} +--- !u!4 &4615298118314180 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1937665238162648} + 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: 4274832022762586} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4629194356278368 Transform: m_ObjectHideFlags: 1 @@ -1611,7 +1641,7 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: [] m_Father: {fileID: 4274832022762586} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4647011019061770 Transform: @@ -1677,7 +1707,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4274832022762586} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4716723811478582 Transform: @@ -1979,17 +2009,17 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!82 &82988502466345010 +--- !u!82 &82289300839046882 AudioSource: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1164595066363010} + m_GameObject: {fileID: 1937665238162648} m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 + m_audioClip: {fileID: 8300000, guid: aac9604135c7be94fba8fd70c4184407, type: 3} + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 @@ -2028,7 +2058,7 @@ AudioSource: m_Curve: - serializedVersion: 2 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2270,6 +2300,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f2f82afd0eba08845840bbb819f61e5a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &114253224428243426 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1164595066363010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 91e1cdb2f640b9442ba4fa7158ec321b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TailChase: {fileID: 0} + m_Paw: {fileID: 0} + m_Bark: {fileID: 0} + m_MovementAudiosource: {fileID: 82289300839046882} --- !u!114 &114274210798098350 MonoBehaviour: m_ObjectHideFlags: 1 @@ -3209,7 +3254,7 @@ RectTransform: - {fileID: 224335698390808940} - {fileID: 224540464950937806} m_Father: {fileID: 4274832022762586} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/Prefabs/Ground Characters/Test Dog.prefab b/Assets/Prefabs/Ground Characters/Test Dog.prefab index 43e0eb3..635b9e5 100644 --- a/Assets/Prefabs/Ground Characters/Test Dog.prefab +++ b/Assets/Prefabs/Ground Characters/Test Dog.prefab @@ -516,10 +516,11 @@ GameObject: m_Component: - component: {fileID: 4365283792761212} - component: {fileID: 54299697557504564} - - component: {fileID: 82818904671345748} - component: {fileID: 136116443539993912} - component: {fileID: 114371144244762886} - component: {fileID: 114790119520008840} + - component: {fileID: 82309213767205268} + - component: {fileID: 114259639911344190} m_Layer: 14 m_Name: Test Dog m_TagString: Player @@ -537,6 +538,7 @@ GameObject: - component: {fileID: 4356584826311556} - component: {fileID: 95860868342045284} - component: {fileID: 114297193593836670} + - component: {fileID: 114495140206728210} m_Layer: 0 m_Name: Labrador_animation_12kpoly_07 (1) m_TagString: Untagged @@ -600,7 +602,7 @@ GameObject: - component: {fileID: 4528689228399078} - component: {fileID: 82103515527864108} m_Layer: 14 - m_Name: AudioSource Character + m_Name: Movement Audiosource m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1178,7 +1180,7 @@ Transform: - {fileID: 4424302875550218} m_Father: {fileID: 4961006728148880} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -18.45492, y: 64.14202, z: -28.309654} + m_LocalEulerAnglesHint: {x: -27.367453, y: 57.434067, z: -32.14862} --- !u!4 &4080482124888778 Transform: m_ObjectHideFlags: 1 @@ -1262,7 +1264,7 @@ Transform: - {fileID: 4608724262482266} m_Father: {fileID: 4606557887246814} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 5.1612983, y: 87.41652, z: -39.706593} + m_LocalEulerAnglesHint: {x: 4.948517, y: 87.62742, z: -37.854645} --- !u!4 &4121629782757582 Transform: m_ObjectHideFlags: 1 @@ -1315,7 +1317,7 @@ Transform: - {fileID: 4142798250568956} m_Father: {fileID: 4571646485201750} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -36.451706, y: -2.018668, z: 3.8874674} + m_LocalEulerAnglesHint: {x: -81.911446, y: -35.983288, z: 40.207405} --- !u!4 &4145628810404162 Transform: m_ObjectHideFlags: 1 @@ -1343,7 +1345,7 @@ Transform: - {fileID: 4650963680172010} m_Father: {fileID: 4603627048222404} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 1.8821037, y: 1.360013, z: -7.128074} + m_LocalEulerAnglesHint: {x: -52.110954, y: 14.908704, z: -19.03218} --- !u!4 &4149768756364566 Transform: m_ObjectHideFlags: 1 @@ -1370,7 +1372,7 @@ Transform: - {fileID: 4353604496495534} m_Father: {fileID: 4178389327818320} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -52.663063, y: 80.156364, z: -83.68198} + m_LocalEulerAnglesHint: {x: -53.02103, y: 95.91062, z: -77.57569} --- !u!4 &4178389327818320 Transform: m_ObjectHideFlags: 1 @@ -1429,7 +1431,7 @@ Transform: - {fileID: 4057430252003510} m_Father: {fileID: 4603627048222404} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -6.3450923, y: 0.50037944, z: -3.1418724} + m_LocalEulerAnglesHint: {x: -6.9195633, y: 2.1464093, z: -0.3422771} --- !u!4 &4249677402153920 Transform: m_ObjectHideFlags: 1 @@ -1471,7 +1473,7 @@ Transform: - {fileID: 4754870967026938} m_Father: {fileID: 4603627048222404} m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0.4221498, y: 15.11223, z: 2.5634336} + m_LocalEulerAnglesHint: {x: 0.4221496, y: -4.3793077, z: 2.5634568} --- !u!4 &4275163462137164 Transform: m_ObjectHideFlags: 1 @@ -1499,7 +1501,7 @@ Transform: - {fileID: 4983892095333034} m_Father: {fileID: 4603627048222404} m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: -2.2616875, y: 15.0312195, z: 1.5100694} + m_LocalEulerAnglesHint: {x: -2.2616856, y: -5.888131, z: 1.5100821} --- !u!4 &4292761651900402 Transform: m_ObjectHideFlags: 1 @@ -1568,7 +1570,7 @@ Transform: - {fileID: 4725135115085270} m_Father: {fileID: 4176890862425792} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 30.062159, y: 54.96725, z: -14.425254} + m_LocalEulerAnglesHint: {x: 44.247623, y: 48.207874, z: -20.05023} --- !u!4 &4356584826311556 Transform: m_ObjectHideFlags: 1 @@ -1597,7 +1599,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1497780920488766} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -46.42, y: 0.76, z: -20.46} + m_LocalPosition: {x: 0.89, y: 0.76, z: -1.1} m_LocalScale: {x: 10, y: 10, z: 10} m_Children: - {fileID: 4528689228399078} @@ -1621,7 +1623,7 @@ Transform: - {fileID: 4044153359538104} m_Father: {fileID: 4376695824091982} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 14.296827, y: 0.32718003, z: 2.808116} + m_LocalEulerAnglesHint: {x: 15.050162, y: 1.8559307, z: 9.283781} --- !u!4 &4376695824091982 Transform: m_ObjectHideFlags: 1 @@ -1635,7 +1637,7 @@ Transform: - {fileID: 4373999978945466} m_Father: {fileID: 4095415372863490} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 11.270959, y: -6.23579, z: -10.273671} + m_LocalEulerAnglesHint: {x: 11.41952, y: -5.654397, z: -8.116816} --- !u!4 &4382361632791688 Transform: m_ObjectHideFlags: 1 @@ -1675,7 +1677,7 @@ Transform: - {fileID: 4149768756364566} m_Father: {fileID: 4067999562693162} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -26.76429, y: -147.00691, z: 9.530214} + m_LocalEulerAnglesHint: {x: -31.466003, y: -147.9902, z: 11.602346} --- !u!4 &4526246020757202 Transform: m_ObjectHideFlags: 1 @@ -1696,8 +1698,8 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1580605939807918} - m_LocalRotation: {x: -0, y: 0.13052616, z: -0, w: 0.9914449} - m_LocalPosition: {x: 239.7, y: -0.23, z: 243.547} + 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: 4365283792761212} @@ -1730,7 +1732,7 @@ Transform: - {fileID: 4606557887246814} m_Father: {fileID: 4620031430536964} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 37.50071, y: -82.52801, z: 95.29612} + m_LocalEulerAnglesHint: {x: 35.043102, y: -83.20815, z: 96.075935} --- !u!4 &4571646485201750 Transform: m_ObjectHideFlags: 1 @@ -1744,7 +1746,7 @@ Transform: - {fileID: 4143818510834380} m_Father: {fileID: 4586079926525734} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -13.503191, y: 58.77317, z: -44.960323} + m_LocalEulerAnglesHint: {x: 7.1265817, y: 60.66564, z: -45.693398} --- !u!4 &4586079926525734 Transform: m_ObjectHideFlags: 1 @@ -1790,7 +1792,7 @@ Transform: - {fileID: 4118893498938004} m_Father: {fileID: 4557484658757040} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 27.478825, y: 13.164502, z: 0.8848566} + m_LocalEulerAnglesHint: {x: 25.73568, y: 13.221541, z: 1.0094587} --- !u!4 &4608724262482266 Transform: m_ObjectHideFlags: 1 @@ -1910,7 +1912,7 @@ Transform: - {fileID: 4256526739102320} m_Father: {fileID: 4353604496495534} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -7.1504617, y: -79.48943, z: 39.2239} + m_LocalEulerAnglesHint: {x: -9.5372505, y: -82.447975, z: 53.721775} --- !u!4 &4738429083707250 Transform: m_ObjectHideFlags: 1 @@ -2035,7 +2037,7 @@ Transform: - {fileID: 4526246020757202} m_Father: {fileID: 4603627048222404} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 1.3959769, y: 0.9626231, z: -5.7375417} + m_LocalEulerAnglesHint: {x: 1.4157728, y: -0.12832661, z: -5.179625} --- !u!4 &4983892095333034 Transform: m_ObjectHideFlags: 1 @@ -2507,8 +2509,8 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 + m_audioClip: {fileID: 8300000, guid: aac9604135c7be94fba8fd70c4184407, type: 3} + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 @@ -2578,7 +2580,7 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 ---- !u!82 &82818904671345748 +--- !u!82 &82309213767205268 AudioSource: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -2588,7 +2590,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 @@ -2627,7 +2629,7 @@ AudioSource: m_Curve: - serializedVersion: 2 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2709,6 +2711,21 @@ MonoBehaviour: m_RequiredAction: 8 m_RelatedScript: {fileID: 0} m_RelatedGameobject: {fileID: 0} +--- !u!114 &114259639911344190 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1497780920488766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 91e1cdb2f640b9442ba4fa7158ec321b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TailChase: {fileID: 0} + m_Paw: {fileID: 0} + m_Bark: {fileID: 0} + m_MovementAudiosource: {fileID: 82103515527864108} --- !u!114 &114288941317450178 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2750,7 +2767,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 752255e4ddabc8244a797e87756a5aa2, type: 3} m_Name: m_EditorClassIdentifier: - walkAnimSpeed: 1 + walkAnimSpeed: 2 sitAnimSpeed: 1 idleAnimSpeed: 1 walkingTailWagAnimSpeed: 1 @@ -2803,6 +2820,18 @@ MonoBehaviour: m_EditorClassIdentifier: GlowColor: {r: 0.4627451, g: 0.7764706, b: 1, a: 1} LerpFactor: 10 +--- !u!114 &114495140206728210 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1524933854851050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a92ff30457f3c864f96e07f70cf5a108, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DogStepOneShot: {fileID: 8300000, guid: fa555c1369d0cc44695603ccc23dc9fa, type: 3} --- !u!114 &114662011035024238 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Overseer/Overseer Camera.prefab b/Assets/Prefabs/Overseer/Overseer Camera.prefab index 3e9993c..ac3b264 100644 --- a/Assets/Prefabs/Overseer/Overseer Camera.prefab +++ b/Assets/Prefabs/Overseer/Overseer Camera.prefab @@ -68,7 +68,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1743480622849158} m_LocalRotation: {x: 0.27219734, y: 0.53356946, z: -0.17246751, w: 0.7819637} - m_LocalPosition: {x: -3.94, y: 11.67, z: 0.5} + m_LocalPosition: {x: -4.61, y: 10.72, z: 0.21} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4177683222155914} @@ -169,7 +169,7 @@ AudioListener: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1607725418486808} - m_Enabled: 1 + m_Enabled: 0 --- !u!92 &92121130511338426 Behaviour: m_ObjectHideFlags: 1 @@ -191,7 +191,7 @@ Animator: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1743480622849158} - m_Enabled: 0 + m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: d4e1aa0238ba2474b8fbce487a079213, type: 2} m_CullingMode: 0 diff --git a/Assets/PuppySounds.cs b/Assets/PuppySounds.cs new file mode 100644 index 0000000..cedf94b --- /dev/null +++ b/Assets/PuppySounds.cs @@ -0,0 +1,59 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PuppySounds : MonoBehaviour +{ + + public AudioClip m_TailChase; + public AudioClip m_Paw; + public AudioClip m_Bark; + + private AudioSource m_AudioSource; + public AudioSource m_MovementAudiosource; + + TimeManager m_TimeManager; + + // Use this for initialization + void Start() + { + m_AudioSource = GetComponent(); + m_TimeManager = GameObject.FindGameObjectWithTag("Time Manager").GetComponent(); + } + + // Update is called once per frame + void Update() + { + + } + + public void TailChase() + { + m_AudioSource.PlayOneShot(m_TailChase); + } + + public void Paw() + { + m_AudioSource.PlayOneShot(m_Paw); + } + + public void Bark() + { + m_AudioSource.PlayOneShot(m_Bark); + } + + public void MoveSound(bool play) + { + if (play && m_TimeManager.m_GameState == TimeManager.GameState.NORMAL) + { + if (!m_MovementAudiosource.isPlaying) + { + m_MovementAudiosource.Play(); + } + } + else + { + m_MovementAudiosource.Pause(); + } + } +} diff --git a/Assets/PuppySounds.cs.meta b/Assets/PuppySounds.cs.meta new file mode 100644 index 0000000..68eda4e --- /dev/null +++ b/Assets/PuppySounds.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 91e1cdb2f640b9442ba4fa7158ec321b +timeCreated: 1490157507 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AI/PuppyMovement.cs b/Assets/Scripts/AI/PuppyMovement.cs index 584cfa4..ff1bc4d 100644 --- a/Assets/Scripts/AI/PuppyMovement.cs +++ b/Assets/Scripts/AI/PuppyMovement.cs @@ -50,6 +50,8 @@ public class PuppyMovement : MonoBehaviour private bool m_CycleIdle = false; private PuppyCharacterController.PuppySate m_PuppyState; + private PuppySounds m_PuppySpounds; + void Start() { m_Animator = GetComponent(); @@ -58,6 +60,8 @@ void Start() m_CapsuleHeight = m_Capsule.height; m_CapsuleCenter = m_Capsule.center; + m_PuppySpounds = GetComponent(); + m_Rigidbody.constraints = RigidbodyConstraints.FreezeRotationX | RigidbodyConstraints.FreezeRotationY | RigidbodyConstraints.FreezeRotationZ; m_OrigGroundCheckDistance = m_GroundCheckDistance; @@ -70,9 +74,6 @@ void Start() private void Update() { - if (Input.GetButtonDown("Test Button")) - Sit(); - m_IdleTimer -= Time.deltaTime; if (m_IdleTimer <= 0) { @@ -87,7 +88,10 @@ public void Move(Vector3 move, bool crouch) // convert the world relative moveInput vector into a local-relative // turn amount and forward amount required to head in the desired // direction. - if (move.magnitude > 1f) move.Normalize(); + if (move.magnitude > 1f) + move.Normalize(); + + move = transform.InverseTransformDirection(move); CheckGroundStatus(); move = Vector3.ProjectOnPlane(move, m_GroundNormal); @@ -99,6 +103,8 @@ public void Move(Vector3 move, bool crouch) ApplyExtraTurnRotation(); + m_PuppySpounds.MoveSound(move.magnitude > 0.5f); + // send input and other state parameters to the animator UpdateAnimator(move); } @@ -132,23 +138,36 @@ void UpdateAnimator(Vector3 move) void PlayRandomIdle() { - float rndFloat = Random.Range(0.0f, 1.0f); + /* + Debug.Log("IDLE_PLAYER is :" + (m_PuppyState == PuppyCharacterController.PuppySate.IDLE_PLAYER)); + Debug.Log("Aware is: " + GameObject.FindGameObjectWithTag("Puppy").GetComponent().m_IsAware); + */ - if (rndFloat <= 0.25) - { - m_Animator.SetTrigger("bark"); - } - else if (rndFloat <= 0.50) - { - m_Animator.SetTrigger("tailChase"); - } - else if (rndFloat <= 0.75) - { - m_Animator.SetTrigger("sitOnce"); - } - else + + if (m_PuppyState == PuppyCharacterController.PuppySate.IDLE_PLAYER || m_PuppyState == PuppyCharacterController.PuppySate.IDLE_HOME) { - m_Animator.SetTrigger("paw"); + + float rndFloat = Random.Range(0.0f, 1.0f); + + if (rndFloat <= 0.25) + { + m_Animator.SetTrigger("bark"); + m_PuppySpounds.Bark(); + } + else if (rndFloat <= 0.50) + { + m_Animator.SetTrigger("tailChase"); + m_PuppySpounds.TailChase(); + } + else if (rndFloat <= 0.75) + { + m_Animator.SetTrigger("sitOnce"); + } + else + { + m_Animator.SetTrigger("paw"); + m_PuppySpounds.Paw(); + } } } @@ -231,6 +250,8 @@ public void StateModification(PuppyCharacterController.PuppySate puppySate) case PuppyCharacterController.PuppySate.MOVING_SOUND: m_Animator.SetTrigger("movingSound"); break; + case PuppyCharacterController.PuppySate.IDLE_PLAYER: + break; default: m_Animator.SetTrigger("stopEmotes"); break; diff --git a/Assets/Scripts/Dog/DogCloneCharacter.cs b/Assets/Scripts/Dog/DogCloneCharacter.cs index a29e684..eb1c74c 100644 --- a/Assets/Scripts/Dog/DogCloneCharacter.cs +++ b/Assets/Scripts/Dog/DogCloneCharacter.cs @@ -16,6 +16,7 @@ public class DogCloneCharacter : AnimatedDog Rigidbody m_Rigidbody; DogFP m_DogFP; + PuppySounds m_DogSounds; // For forcing animations when rewinding Vector3 m_LastPosition = new Vector3(); @@ -23,6 +24,7 @@ public class DogCloneCharacter : AnimatedDog public override void Start() { m_DogFP = GameObject.FindGameObjectWithTag("Player").GetComponent(); + m_DogSounds = GetComponent(); // Reference animator components to match the player walkAnimSpeed = m_DogFP.walkAnimSpeed; @@ -51,6 +53,8 @@ public void Move(Vector3 move, bool crouch) m_Rigidbody.velocity = v; } + m_DogSounds.MoveSound(Mathf.Abs(move.magnitude) >= 1f); + // send input and other state parameters to the animator UpdateAnimator(move); } diff --git a/Assets/Scripts/Dog/DogFP.cs b/Assets/Scripts/Dog/DogFP.cs index 5054e2a..dfadd11 100644 --- a/Assets/Scripts/Dog/DogFP.cs +++ b/Assets/Scripts/Dog/DogFP.cs @@ -26,6 +26,8 @@ public class DogFP : AnimatedDog private bool lockedMovement = false; private bool controlsEnabled = false; + private PuppySounds m_DogSounds; + // Input float horizontal = 0; float vertical = 0; @@ -40,6 +42,7 @@ void Awake() m_MouseLook.Init(transform, m_Camera.transform); m_RigidBody = GetComponent(); + m_DogSounds = GetComponentInChildren(); m_RigidBody.freezeRotation = true; m_RigidBody.useGravity = false; @@ -137,7 +140,7 @@ public void Move(bool crouch) #if NETWORKING if (networkedInput.horizontal < 0.05f && networkedInput.horizontal > -0.05f) #else - if(horizontal < 0.05f && horizontal >-0.05f) + if (horizontal < 0.05f && horizontal > -0.05f) #endif { m_LeftRockets.SetActive(false); @@ -147,7 +150,7 @@ public void Move(bool crouch) #if NETWORKING if (networkedInput.horizontal > 0.1f) #else - if(horizontal > 0.1f) + if (horizontal > 0.1f) #endif { m_LeftRockets.SetActive(true); @@ -156,7 +159,7 @@ public void Move(bool crouch) #if NETWORKING else if (networkedInput.horizontal < -0.1f) #else - else if (horizontal < -0.1f) + else if (horizontal < -0.1f) #endif { m_LeftRockets.SetActive(false); @@ -182,6 +185,8 @@ public void Move(bool crouch) UpdateAnimator(horizontal, crouch); m_MouseLook.UpdateCursorLock(); + m_DogSounds.MoveSound(Mathf.Abs(vertical) >= 0.1f); + // Reset state flags grounded = false; lockedMovement = false; diff --git a/Assets/Scripts/Dog/DogSounds.cs b/Assets/Scripts/Dog/DogSounds.cs new file mode 100644 index 0000000..0d01c7f --- /dev/null +++ b/Assets/Scripts/Dog/DogSounds.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DogSounds : MonoBehaviour +{ + + public AudioClip m_DogStepOneShot; + + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + public void DogStepOneShot() + { + AudioSource.PlayClipAtPoint(m_DogStepOneShot, transform.position); + } +} diff --git a/Assets/Scripts/Dog/DogSounds.cs.meta b/Assets/Scripts/Dog/DogSounds.cs.meta new file mode 100644 index 0000000..6caaefb --- /dev/null +++ b/Assets/Scripts/Dog/DogSounds.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a92ff30457f3c864f96e07f70cf5a108 +timeCreated: 1490156753 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Dog.meta b/Assets/Sounds/Dog.meta new file mode 100644 index 0000000..3b623c4 --- /dev/null +++ b/Assets/Sounds/Dog.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a580b68f3f96c134ba428127480fc70b +folderAsset: yes +timeCreated: 1490156734 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Dog/Dog_Step_OneShot_M.wav b/Assets/Sounds/Dog/Dog_Step_OneShot_M.wav new file mode 100644 index 0000000..b04037a Binary files /dev/null and b/Assets/Sounds/Dog/Dog_Step_OneShot_M.wav differ diff --git a/Assets/Sounds/Dog/Dog_Step_OneShot_M.wav.meta b/Assets/Sounds/Dog/Dog_Step_OneShot_M.wav.meta new file mode 100644 index 0000000..35447e6 --- /dev/null +++ b/Assets/Sounds/Dog/Dog_Step_OneShot_M.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fa555c1369d0cc44695603ccc23dc9fa +timeCreated: 1490156740 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Dog/FootSteps_Dog_M.wav b/Assets/Sounds/Dog/FootSteps_Dog_M.wav new file mode 100644 index 0000000..79cf8b2 Binary files /dev/null and b/Assets/Sounds/Dog/FootSteps_Dog_M.wav differ diff --git a/Assets/Sounds/Dog/FootSteps_Dog_M.wav.meta b/Assets/Sounds/Dog/FootSteps_Dog_M.wav.meta new file mode 100644 index 0000000..8174f39 --- /dev/null +++ b/Assets/Sounds/Dog/FootSteps_Dog_M.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7b91a5af6b571d54ba36d79ed981d59a +timeCreated: 1490162385 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Dog/FootSteps_Dog_S.wav b/Assets/Sounds/Dog/FootSteps_Dog_S.wav new file mode 100644 index 0000000..906aa53 Binary files /dev/null and b/Assets/Sounds/Dog/FootSteps_Dog_S.wav differ diff --git a/Assets/Sounds/Dog/FootSteps_Dog_S.wav.meta b/Assets/Sounds/Dog/FootSteps_Dog_S.wav.meta new file mode 100644 index 0000000..792b718 --- /dev/null +++ b/Assets/Sounds/Dog/FootSteps_Dog_S.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: aac9604135c7be94fba8fd70c4184407 +timeCreated: 1490162388 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Puppy.meta b/Assets/Sounds/Puppy.meta new file mode 100644 index 0000000..51b8009 --- /dev/null +++ b/Assets/Sounds/Puppy.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 159747c4e5efff74799a5a82fbb8fac8 +folderAsset: yes +timeCreated: 1490157571 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Puppy/FootSteps_Dog_M.wav b/Assets/Sounds/Puppy/FootSteps_Dog_M.wav new file mode 100644 index 0000000..79cf8b2 Binary files /dev/null and b/Assets/Sounds/Puppy/FootSteps_Dog_M.wav differ diff --git a/Assets/Sounds/Puppy/FootSteps_Dog_M.wav.meta b/Assets/Sounds/Puppy/FootSteps_Dog_M.wav.meta new file mode 100644 index 0000000..5b0048e --- /dev/null +++ b/Assets/Sounds/Puppy/FootSteps_Dog_M.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fb4d91f2d48cacb4bab20323846fc0a1 +timeCreated: 1490158627 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Puppy/Puppy_Bark_High_M.wav b/Assets/Sounds/Puppy/Puppy_Bark_High_M.wav new file mode 100644 index 0000000..111eb02 Binary files /dev/null and b/Assets/Sounds/Puppy/Puppy_Bark_High_M.wav differ diff --git a/Assets/Sounds/Puppy/Puppy_Bark_High_M.wav.meta b/Assets/Sounds/Puppy/Puppy_Bark_High_M.wav.meta new file mode 100644 index 0000000..12211db --- /dev/null +++ b/Assets/Sounds/Puppy/Puppy_Bark_High_M.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a599c6c53cd2e5d4eab8e4df150cefa2 +timeCreated: 1490158281 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Puppy/Puppy_Bark_M.wav b/Assets/Sounds/Puppy/Puppy_Bark_M.wav new file mode 100644 index 0000000..784660a Binary files /dev/null and b/Assets/Sounds/Puppy/Puppy_Bark_M.wav differ diff --git a/Assets/Sounds/Puppy/Puppy_Bark_M.wav.meta b/Assets/Sounds/Puppy/Puppy_Bark_M.wav.meta new file mode 100644 index 0000000..407a411 --- /dev/null +++ b/Assets/Sounds/Puppy/Puppy_Bark_M.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e69dcc7327d66dc40bff9c63f348b257 +timeCreated: 1490158422 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Puppy/Puppy_Spinning_M.wav b/Assets/Sounds/Puppy/Puppy_Spinning_M.wav new file mode 100644 index 0000000..3872d40 Binary files /dev/null and b/Assets/Sounds/Puppy/Puppy_Spinning_M.wav differ diff --git a/Assets/Sounds/Puppy/Puppy_Spinning_M.wav.meta b/Assets/Sounds/Puppy/Puppy_Spinning_M.wav.meta new file mode 100644 index 0000000..22b9e23 --- /dev/null +++ b/Assets/Sounds/Puppy/Puppy_Spinning_M.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 616af324f4b0c9a48aac5de3ca563a4e +timeCreated: 1490157576 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: