From c4ecdf5ce9324da01db34d5f9e4c393e1a4f1aba Mon Sep 17 00:00:00 2001 From: Zenny Date: Fri, 19 Aug 2022 12:02:20 -0700 Subject: [PATCH] Update footsteps --- Assets/Player/Model/FBXModel.fbx.meta | 46 +++- Assets/Player/Model/PlayerModel.controller | 48 ++++- Assets/Player/Player.prefab | 237 ++++++++++++++++++++- Assets/Scripts/Audio/Footsteps.cs | 3 +- 4 files changed, 322 insertions(+), 12 deletions(-) diff --git a/Assets/Player/Model/FBXModel.fbx.meta b/Assets/Player/Model/FBXModel.fbx.meta index adc04f0..7b0c1e9 100644 --- a/Assets/Player/Model/FBXModel.fbx.meta +++ b/Assets/Player/Model/FBXModel.fbx.meta @@ -15,6 +15,9 @@ ModelImporter: - first: 74: -4799524434163024911 second: Armature|walk + - first: + 74: -6372505770197538151 + second: Armature|walk (1) externalObjects: {} materials: materialImportMode: 1 @@ -45,11 +48,11 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: Armature|Idle - takeName: Armature|Idle + name: Armature|walk (1) + takeName: Armature|walk internalID: 0 firstFrame: 0 - lastFrame: 78 + lastFrame: 109 wrapMode: 0 orientationOffsetY: 0 level: 0 @@ -155,7 +158,42 @@ ModelImporter: mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 curves: [] - events: [] + events: + - time: 0.05680478 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.23307759 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.4022537 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.5671016 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.72520363 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 transformMask: [] maskType: 3 maskSource: {instanceID: 0} diff --git a/Assets/Player/Model/PlayerModel.controller b/Assets/Player/Model/PlayerModel.controller index f986fee..05a37bf 100644 --- a/Assets/Player/Model/PlayerModel.controller +++ b/Assets/Player/Model/PlayerModel.controller @@ -1,5 +1,17 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6818889654973240792 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 0cd0534464da8a647b1234155ab548ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1101 &-3017172422119994572 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -64,7 +76,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -78,6 +90,32 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &1389654506011198022 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk Cycle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: b4d13eea62c19834583aef8c4a4b8341, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &3503281327399106223 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -118,12 +156,15 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 6887978280577128434} m_Position: {x: 260, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1389654506011198022} + m_Position: {x: 295, y: 335, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_AnyStatePosition: {x: 450, y: 30, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} @@ -192,7 +233,8 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -3017172422119994572} - m_StateMachineBehaviours: [] + m_StateMachineBehaviours: + - {fileID: -6818889654973240792} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index 721bfc0..a2e4ba4 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -168,6 +168,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1696202146803246503} + - component: {fileID: 2766921630081200718} + - component: {fileID: 8343511731192482761} m_Layer: 3 m_Name: Armature m_TagString: Untagged @@ -191,6 +193,118 @@ Transform: m_Father: {fileID: 7726711927591515449} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2766921630081200718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 942893408219901933} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3dc835db21e8a7244a1e4ca279799cd6, type: 3} + m_Name: + m_EditorClassIdentifier: + grassStep: {fileID: 8300000, guid: 539d0bf64e3207c43bbdcd75fa6f271d, type: 3} + templeStep: {fileID: 8300000, guid: b4cbe01d1f5ccab4bbfbc780613fc59e, type: 3} + sandStep: {fileID: 8300000, guid: fb2c6dc162e24d94ebb3c3dba7cdb911, type: 3} + audioSource: {fileID: 8343511731192482761} +--- !u!82 &8343511731192482761 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 942893408219901933} + 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: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1650636546942593840 GameObject: m_ObjectHideFlags: 0 @@ -870,6 +984,8 @@ GameObject: - component: {fileID: 7831886137308850988} - component: {fileID: 7831886137308850989} - component: {fileID: 9124306867817734687} + - component: {fileID: 6340134095258607311} + - component: {fileID: -5973425731125482380} m_Layer: 3 m_Name: Player m_TagString: Player @@ -906,8 +1022,8 @@ CharacterController: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Height: 2 - m_Radius: 0.5 + m_Height: 3 + m_Radius: 1 m_SlopeLimit: 75 m_StepOffset: 1 m_SkinWidth: 0.08 @@ -945,8 +1061,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e12a799f5a50bc34a94898baf2917b7b, type: 3} m_Name: m_EditorClassIdentifier: - rayCastDistance: 3 - rayCastAngle: 30 + rayCastDistance: 6 + rayCastAngle: 75 sphereRadius: 0.5 --- !u!114 &7831886137308850989 MonoBehaviour: @@ -962,6 +1078,7 @@ MonoBehaviour: m_EditorClassIdentifier: Speed: 12.5 RotateSpeed: 720 + gravity: 9.8 --- !u!114 &9124306867817734687 MonoBehaviour: m_ObjectHideFlags: 0 @@ -974,6 +1091,118 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d14f1a4437a41724c91591bb70a63248, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &6340134095258607311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6949365541298368387} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3dc835db21e8a7244a1e4ca279799cd6, type: 3} + m_Name: + m_EditorClassIdentifier: + grassStep: {fileID: 8300000, guid: 539d0bf64e3207c43bbdcd75fa6f271d, type: 3} + templeStep: {fileID: 8300000, guid: b4cbe01d1f5ccab4bbfbc780613fc59e, type: 3} + sandStep: {fileID: 8300000, guid: fb2c6dc162e24d94ebb3c3dba7cdb911, type: 3} + audioSource: {fileID: -5973425731125482380} +--- !u!82 &-5973425731125482380 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6949365541298368387} + 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: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &7075691392410907683 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Audio/Footsteps.cs b/Assets/Scripts/Audio/Footsteps.cs index c553382..7e5085f 100644 --- a/Assets/Scripts/Audio/Footsteps.cs +++ b/Assets/Scripts/Audio/Footsteps.cs @@ -14,8 +14,9 @@ namespace Scampz.GameJam [SerializeField] private AudioSource audioSource; - private void Step() + public void Step() { + Debug.Log("Step SFX"); var clip = GetAudioClip(); audioSource.PlayOneShot(clip); }