add some extra assets FX and SFX

Assets/Game Kit Controller/Scripts/Player/playerController.cs

@@ -212,6 +212,8 @@ public class playerController : MonoBehaviour
 
     public int playerNonLocalAvatarID;
 
+    public int characterModelID = 0;
+
     [Space]
     [Header ("AI Settings")]
     [Space]
@@ -720,6 +722,7 @@ public class playerController : MonoBehaviour
 
     Transform currentTemporalPlayerParent;
 
+    bool keepCameraRelativeMovementWhenNotAiming;
 
     public bool useRelativeMovementToLockedCamera;
     public bool ladderFound;
@@ -782,6 +785,8 @@ public class playerController : MonoBehaviour
 
     public bool ignoreNewGroundAdherenceActive;
 
+    bool ignoreInputOnNewGroundAdherenceActive;
+
     [Space]
     [Header ("Weapons And Powers State")]
     [Space]
@@ -1261,6 +1266,9 @@ public class playerController : MonoBehaviour
 
     public bool moveIputPaused;
 
+    [HideInInspector] public float characterScale = 1;
+    [HideInInspector] public bool customCharacterScaleActive;
+
     //Physics variables
     public Vector3 currentVelocity;
     RaycastHit hit;
@@ -2529,9 +2537,6 @@ public class playerController : MonoBehaviour
                 }
 
                 if (externalForceOnAirActive) {
-                    //					airMove = externalForceOnAirValue;
-                    //					currentVelocity = Vector3.Lerp (currentVelocity, airMove, currentFixedUpdateDeltaTime * externalForceOnAirControlValue);
-
                     velocityChange = externalForceOnAirValue - mainRigidbody.linearVelocity;
 
                     velocityChange = Vector3.ClampMagnitude (velocityChange, maxVelocityChange);
@@ -3298,7 +3303,9 @@ public class playerController : MonoBehaviour
                 } else {
                     if (activateExtraRotationInQuickTurnMovement) {
                         Quaternion quickTurnRotatation = Quaternion.LookRotation (currentMoveInput, playerTransformUp);
-                        mainRigidbody.rotation = Quaternion.Lerp (mainRigidbody.rotation, quickTurnRotatation, quickTurnMovementRotationSpeed * currentFixedUpdateDeltaTime);
+
+                        mainRigidbody.rotation =
+                            Quaternion.Lerp (mainRigidbody.rotation, quickTurnRotatation, quickTurnMovementRotationSpeed * currentFixedUpdateDeltaTime);
                     }
                 }
             }
@@ -3366,7 +3373,6 @@ public class playerController : MonoBehaviour
                 }
 
                 if (rotateInLookDirectionResult) {
-
                     bool ZGFFModeOnAir = ((zeroGravityModeOn || freeFloatingModeOn) && !playerOnGround);
 
                     if (!ZGFFModeOnAir) {
@@ -3386,7 +3392,9 @@ public class playerController : MonoBehaviour
 
                         Quaternion currentRotation = Quaternion.LookRotation (targetDirection, playerTransformUp);
 
-                        targetRotation = Quaternion.Lerp (mainRigidbody.rotation, currentRotation, aimTurnSpeed * currentFixedUpdateDeltaTime);
+                        float currentFixedDeltaTime = getCurrentFixedDeltaTime ();
+
+                        targetRotation = Quaternion.Lerp (mainRigidbody.rotation, currentRotation, aimTurnSpeed * currentFixedDeltaTime);
 
                         bool canRotatePlayer = (!lookAlwaysInCameraDirection ||
                                                (lookAlwaysInCameraDirection && !lookOnlyIfMoving) ||
@@ -3404,8 +3412,7 @@ public class playerController : MonoBehaviour
                         if (newAngle >= Mathf.Abs (thresholdAngleDifference)) {
                             //if the player is not moving, set the turnamount to rotate him around, setting its turn animation properly
                             if (canRotatePlayer) {
-                                targetRotation = Quaternion.Lerp (mainRigidbody.rotation, currentRotation, autoTurnSpeed * currentFixedUpdateDeltaTime);
-                                //							mainRigidbody.MoveRotation (targetRotation);
+                                targetRotation = Quaternion.Lerp (mainRigidbody.rotation, currentRotation, autoTurnSpeed * currentFixedDeltaTime);
 
                                 Vector3 lookDelta = playerTransform.InverseTransformDirection (targetDirection * 100);
 
@@ -3414,7 +3421,7 @@ public class playerController : MonoBehaviour
                                 turnAmount += lookAngle * .01f * 6;
                             }
                         } else {
-                            turnAmount = Mathf.MoveTowards (turnAmount, 0, currentFixedUpdateDeltaTime * 2);
+                            turnAmount = Mathf.MoveTowards (turnAmount, 0, currentFixedDeltaTime * 2);
                         }
 
                         if (rotateDirectlyTowardCameraOnStrafe || fullBodyAwarenessActive) {
@@ -3448,7 +3455,8 @@ public class playerController : MonoBehaviour
                                 lookCameraDirectionInFBAIsCurrentlyActive = true;
                             } else {
                                 if ((zeroGravityModeOn || freeFloatingModeOn) && isPlayerMovingOn3dWorld ()) {
-                                    Quaternion targetRotation = Quaternion.Lerp (playerTransform.rotation, playerCameraTransform.rotation, zeroGravityLookCameraSpeed * currentFixedUpdateDeltaTime);
+                                    Quaternion targetRotation = Quaternion.Lerp (playerTransform.rotation,
+                                        playerCameraTransform.rotation, zeroGravityLookCameraSpeed * getCurrentFixedDeltaTime ());
 
                                     playerTransform.rotation = targetRotation;
                                 }
@@ -3943,9 +3951,12 @@ public class playerController : MonoBehaviour
                 if (!gravityForcePaused && !zeroGravityModeOn && !freeFloatingModeOn && !wallRunningActive && !pauseAllPlayerDownForces && !externalControlBehaviorForAirTypeActive) {
                     mainRigidbody.AddForce (mainRigidbody.mass * gravityForce * playerTransformUp);
 
-                    extraGravityForce = (gravityForce * gravityMultiplier) * playerTransformUp + (-gravityForce) * playerTransformUp;
+                    if (gravityMultiplier != 0) {
+                        extraGravityForce = (gravityForce * gravityMultiplier) * playerTransformUp
+                        + (-gravityForce) * playerTransformUp;
 
-                    mainRigidbody.AddForce (extraGravityForce);
+                        mainRigidbody.AddForce (extraGravityForce);
+                    }
                 }
             }
 
@@ -4331,7 +4342,19 @@ public class playerController : MonoBehaviour
                     currentWalkSpeedOnLockedCamera = 1;
                 }
 
-                if (!playerIsAiming && playerCameraManager.isShowCameraCursorWhenNotAimingActive ()) {
+                bool useMainCameraRelativeDirectionResult = false;
+
+                if (!playerIsAiming) {
+                    if (playerCameraManager.isShowCameraCursorWhenNotAimingActive ()) {
+                        useMainCameraRelativeDirectionResult = true;
+
+                        if (keepCameraRelativeMovementWhenNotAiming) {
+                            useMainCameraRelativeDirectionResult = false;
+                        }
+                    }
+                }
+
+                if (useMainCameraRelativeDirectionResult) {
                     lockedCameraMoveInput = currentWalkSpeedOnLockedCamera *
                         (verticalInput * playerCameraTransform.forward + horizontalInput * mainCameraTransform.right);
                 } else {
@@ -4890,6 +4913,10 @@ public class playerController : MonoBehaviour
                         currentMoveSpeedMultiplier = moveSpeedMultiplier;
                     }
 
+                    if (customCharacterScaleActive) {
+                        currentMoveSpeedMultiplier *= characterScale;
+                    }
+
                     characterVelocity = (currentMoveSpeedMultiplier * animator.deltaPosition) / Time.deltaTime;
                 } else {
                     currentNoRootMovementSpeed = 1;
@@ -5524,6 +5551,17 @@ public class playerController : MonoBehaviour
         return currentDeltaTime;
     }
 
+    float getCurrentFixedDeltaTime ()
+    {
+        float currentFixedDeltaTime = Time.fixedDeltaTime;
+
+        if (regularMovementOnBulletTime) {
+            currentFixedDeltaTime *= GKC_Utils.getCurrentDeltaTime ();
+        }
+
+        return currentFixedDeltaTime;
+    }
+
     public float getCurrentScaleTime ()
     {
         return GKC_Utils.getCurrentDeltaTime ();
@@ -5562,6 +5600,24 @@ public class playerController : MonoBehaviour
         currentHeight = capsule.height;
     }
 
+    public void setPlayerColliderCapsuleScaleWithCenterAsRadius (float capsuleHeight)
+    {
+        setPlayerColliderCapsuleScale (capsuleHeight);
+
+        Vector3 capsuleCenter = capsule.center;
+
+        if (capsuleCenter.y < capsule.radius) {
+            capsuleCenter = new Vector3 (capsuleCenter.x, capsule.radius, capsuleCenter.z);
+
+            capsule.center = capsuleCenter;
+        }
+    }
+
+    public void setCapsuleHeightOnCrouch (float newValue)
+    {
+        capsuleHeightOnCrouch = newValue;
+    }
+
     public void setPlayerColliderCapsuleCenter (Vector3 newValue)
     {
         capsule.center = newValue;
@@ -5616,6 +5672,13 @@ public class playerController : MonoBehaviour
         return characterRadius;
     }
 
+    public void setCharacterCustomScale (float newValue)
+    {
+        characterScale = newValue;
+
+        customCharacterScaleActive = characterScale != 1;
+    }
+
     public void setPlaceToShootPositionOffset (float newValue)
     {
         if (newValue > 0) {
@@ -8167,7 +8230,7 @@ public class playerController : MonoBehaviour
     }
 
     public void setLockedCameraState (bool state, bool useTankControlsValue, bool useRelativeMovementToLockedCameraValue,
-                                      bool playerCanMoveOnAimInTankModeValue)
+                                      bool playerCanMoveOnAimInTankModeValue, bool keepCameraRelativeMovementWhenNotAimingValue)
     {
         lockedCameraActive = state;
 
@@ -8179,6 +8242,8 @@ public class playerController : MonoBehaviour
 
         useRelativeMovementToLockedCamera = useRelativeMovementToLockedCameraValue;
 
+        keepCameraRelativeMovementWhenNotAiming = keepCameraRelativeMovementWhenNotAimingValue;
+
         if (!lockedCameraActive) {
             checkCameraDirectionFromLockedToFree = true;
         }
@@ -8588,6 +8653,16 @@ public class playerController : MonoBehaviour
         playerID = newID;
     }
 
+    public void setCharacterModelID (int newID)
+    {
+        characterModelID = newID;
+    }
+
+    public int getCharacterModelID ()
+    {
+        return characterModelID;
+    }
+
     public bool isPlayerNonLocalAvatar ()
     {
         return playerIsNonLocalAvatar;
@@ -9479,6 +9554,13 @@ public class playerController : MonoBehaviour
         return animator;
     }
 
+    public void setNewRuntimeAnimatorController (RuntimeAnimatorController newRuntimeAnimatorController)
+    {
+        if (animator.runtimeAnimatorController != newRuntimeAnimatorController) {
+            animator.runtimeAnimatorController = newRuntimeAnimatorController;
+        }
+    }
+
     public void setAnimatorState (bool state)
     {
         animator.enabled = state;
@@ -10314,6 +10396,12 @@ public class playerController : MonoBehaviour
         ignoreNewGroundAdherenceActive = state;
     }
 
+
+    public void setInoreInputOnNewGroundAdherenceActive (bool state)
+    {
+        ignoreInputOnNewGroundAdherenceActive = state;
+    }
+
     Vector3 GetInputDirection ()
     {
         if (lockedCameraActive && useRelativeMovementToLockedCamera && !usedByAI) {
@@ -10349,6 +10437,10 @@ public class playerController : MonoBehaviour
             }
         }
 
+        if (ignoreInputOnNewGroundAdherenceActive) {
+            moveDirectionInput = Vector3.zero;
+        }
+
         Vector3 mainMovementDirection = moveDirectionInput.normalized;
 
         //if (usedByAI || (hitAngle > minAngleToUsedInputNormalized) || (walkSpeed <= 0.5f)) {
@@ -10365,7 +10457,6 @@ public class playerController : MonoBehaviour
             }
         }
 
-
         Vector3 desiredMove = moveDirectionInput * dt;
         Vector3 futurePos = playerTransform.position + desiredMove;
         dbgFuturePos = futurePos;
@@ -10656,7 +10747,7 @@ public class playerController : MonoBehaviour
 
     bool TryGetGroundAtPosition (Vector3 samplePos, Vector3 localUp, out RaycastHit hitInfo)
     {
-        float originHeight = capsule.height + 1f;
+        float originHeight = (currentHeight / 4) + 1f;
 
         Vector3 origin = samplePos + localUp * originHeight;