diff --git a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab index 8eb89ed..34097f5 100644 --- a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab @@ -8332,7 +8332,8 @@ MonoBehaviour: nitroItem: {fileID: 11400000, guid: a1c26807795a7ac4f83567455ce978ce, type: 2} nitroVelBoost: 40 nitroAccBoost: 0.4 - boostSound: {fileID: 0} + boostSound: {fileID: 5916013765019698878} + isNitroing: 0 --- !u!114 &7688428083034862391 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Racer/Animations/KR_Maya_Racer_Walk_V01_Brow.fbx.meta b/Assets/Racer/Animations/KR_Maya_Racer_Walk_V01_Brow.fbx.meta index d41d432..e5164b9 100644 --- a/Assets/Racer/Animations/KR_Maya_Racer_Walk_V01_Brow.fbx.meta +++ b/Assets/Racer/Animations/KR_Maya_Racer_Walk_V01_Brow.fbx.meta @@ -18,8 +18,7 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: - rigImportErrors: "Avatar creation failed:\n\tTransform 'RigForMocapTemplate_3:Spine1_Joint' - is not an ancestor of 'Head_Joint'\n" + rigImportErrors: rigImportWarnings: animationImportErrors: animationImportWarnings: @@ -34,7 +33,50 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + internalID: 0 + firstFrame: 360 + lastFrame: 429 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: + - time: 0.12339964 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.69248813 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 358 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Racer/Animations/KR_Maya_Racer_Wallrun_V01_Brow.fbx.meta b/Assets/Racer/Animations/KR_Maya_Racer_Wallrun_V01_Brow.fbx.meta index 072067b..f6490f9 100644 --- a/Assets/Racer/Animations/KR_Maya_Racer_Wallrun_V01_Brow.fbx.meta +++ b/Assets/Racer/Animations/KR_Maya_Racer_Wallrun_V01_Brow.fbx.meta @@ -18,8 +18,7 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: - rigImportErrors: "Invalid Avatar Rig Configuration. Missing or invalid transform:\n\tRequired - human bone 'Head' not found\n" + rigImportErrors: rigImportWarnings: animationImportErrors: animationImportWarnings: @@ -34,7 +33,50 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + internalID: 0 + firstFrame: 2 + lastFrame: 22 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: + - time: 0.59072596 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.03896443 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0.96 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Racer/Animations/KR_Maya_Racer_jog_V01_Brow.fbx.meta b/Assets/Racer/Animations/KR_Maya_Racer_jog_V01_Brow.fbx.meta index 86881cf..15ccfee 100644 --- a/Assets/Racer/Animations/KR_Maya_Racer_jog_V01_Brow.fbx.meta +++ b/Assets/Racer/Animations/KR_Maya_Racer_jog_V01_Brow.fbx.meta @@ -18,11 +18,13 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: - rigImportErrors: "Invalid Avatar Rig Configuration. Missing or invalid transform:\n\tRequired - human bone 'Head' not found\n" + rigImportErrors: rigImportWarnings: animationImportErrors: - animationImportWarnings: + animationImportWarnings: "\nClip 'Take 001' has import animation warnings that + might lower retargeting quality:\nNote: Activate translation DOF on avatar + to improve retargeting quality.\n\t'R_Wrist_Joint' has translation animation + that will be discarded.\n" animationRetargetingWarnings: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 @@ -34,7 +36,50 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + internalID: 0 + firstFrame: 235 + lastFrame: 279 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: + - time: 0.40231866 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.8767172 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Racer/Animations/Running (InPlace).fbx.meta b/Assets/Racer/Animations/Running (InPlace).fbx.meta index 772513d..daac5f2 100644 --- a/Assets/Racer/Animations/Running (InPlace).fbx.meta +++ b/Assets/Racer/Animations/Running (InPlace).fbx.meta @@ -58,7 +58,21 @@ ModelImporter: mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 curves: [] - events: [] + events: + - time: 0.34705368 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.87365913 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 transformMask: [] maskType: 3 maskSource: {instanceID: 0} diff --git a/Assets/Racer/Animations/Running (RootMotion).fbx.meta b/Assets/Racer/Animations/Running (RootMotion).fbx.meta index 0aeb068..4300a0a 100644 --- a/Assets/Racer/Animations/Running (RootMotion).fbx.meta +++ b/Assets/Racer/Animations/Running (RootMotion).fbx.meta @@ -58,7 +58,21 @@ ModelImporter: mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 curves: [] - events: [] + events: + - time: 0.35687563 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.83912206 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 transformMask: [] maskType: 3 maskSource: {instanceID: 0} diff --git a/Assets/Racer/Animations/Walking (RootMotion).fbx.meta b/Assets/Racer/Animations/Walking (RootMotion).fbx.meta index e379674..d3c3f56 100644 --- a/Assets/Racer/Animations/Walking (RootMotion).fbx.meta +++ b/Assets/Racer/Animations/Walking (RootMotion).fbx.meta @@ -58,7 +58,21 @@ ModelImporter: mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 curves: [] - events: [] + events: + - time: 0.36695912 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.8935717 + functionName: Step + data: + objectReferenceParameter: {instanceID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 transformMask: [] maskType: 3 maskSource: {instanceID: 0} diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/Nitro/NitroNitroingState.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/Nitro/NitroNitroingState.cs index 6202f4e..ad97f39 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/Nitro/NitroNitroingState.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/Nitro/NitroNitroingState.cs @@ -7,6 +7,7 @@ public class NitroNitroingState : NitroBaseState private float tempTimer; // temporary timer private float actualMaxVel; // actual max velocity + public AudioSource nitroSound; public override void EnterState(NitroStateManager nSM, NitroBaseState previousState){ actualMaxVel = nSM.pStats.MaxVel; // saves previous max velocity @@ -14,12 +15,16 @@ public class NitroNitroingState : NitroBaseState nSM.pStats.CurAcc += nSM.nitroAccBoost; // increases acceleration nSM.pStats.MaxVel += nSM.nitroVelBoost; // increases max velocity + + nSM.isNitroing = true; tempTimer = 5; // how long we will be sped up + } public override void ExitState(NitroStateManager nSM, NitroBaseState nextState){ nSM.pStats.CurAcc = nSM.pStats.Acc; // reset acceleration nSM.pStats.MaxVel = actualMaxVel; // reset maximum velocity + nSM.isNitroing = false; } public override void UpdateState(NitroStateManager nSM){ diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs index 634a70c..5f39ac1 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs @@ -44,6 +44,7 @@ public class NitroStateManager : NetworkBehaviour public float nitroAccBoost = .4f; public AudioSource boostSound; + public bool isNitroing = false; void Awake(){ @@ -104,5 +105,6 @@ public class NitroStateManager : NetworkBehaviour currentState = state; animationManager.updateCurrentPriority(); currentState.EnterState(this, previousState); + boostSound.Play(); } }