From b2518659ab844febf7c662365e67ca822b4cc450 Mon Sep 17 00:00:00 2001 From: Jenny <jen333jjou@icloud.com> Date: Thu, 15 Apr 2021 19:50:56 +0100 Subject: [PATCH] implemented all basic animations except activate guardian cos not sure we need it - could have it be part of a larger awakening animation/cut scene --- .../Animations/Charactertest1@Flying.fbx.meta | 8 +- .../Charactertest1@Jumping Up.fbx.meta | 105 --- .../Charactertest1@Standing Idle.fbx.meta | 8 +- .../Charactertest1@Taking Item.fbx.meta | 634 ++++++++++++++- ...tertest1@Jumping Up.fbx => Jumping Up.fbx} | Bin Assets/Animations/Jumping Up.fbx.meta | 724 ++++++++++++++++++ Assets/Animations/Movement.controller | 138 ---- .../Animations/Walk&Run Movement.controller | 387 ++++++++++ ...meta => Walk&Run Movement.controller.meta} | 0 Assets/Scenes/Game/SampleScene.unity | 53 +- Assets/Scripts/PlayerPickUp.cs | 15 +- Assets/Scripts/SCTPSController.cs | 66 +- Packages/manifest.json | 6 +- Packages/packages-lock.json | 22 +- ProjectSettings/ProjectVersion.txt | 4 +- 15 files changed, 1852 insertions(+), 318 deletions(-) delete mode 100644 Assets/Animations/Charactertest1@Jumping Up.fbx.meta rename Assets/Animations/{Charactertest1@Jumping Up.fbx => Jumping Up.fbx} (100%) create mode 100644 Assets/Animations/Jumping Up.fbx.meta delete mode 100644 Assets/Animations/Movement.controller create mode 100644 Assets/Animations/Walk&Run Movement.controller rename Assets/Animations/{Movement.controller.meta => Walk&Run Movement.controller.meta} (100%) diff --git a/Assets/Animations/Charactertest1@Flying.fbx.meta b/Assets/Animations/Charactertest1@Flying.fbx.meta index 2937930..4d39f2a 100644 --- a/Assets/Animations/Charactertest1@Flying.fbx.meta +++ b/Assets/Animations/Charactertest1@Flying.fbx.meta @@ -26,7 +26,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 @@ -91,13 +91,13 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 3 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 additionalBone: 0 userData: diff --git a/Assets/Animations/Charactertest1@Jumping Up.fbx.meta b/Assets/Animations/Charactertest1@Jumping Up.fbx.meta deleted file mode 100644 index a944b55..0000000 --- a/Assets/Animations/Charactertest1@Jumping Up.fbx.meta +++ /dev/null @@ -1,105 +0,0 @@ -fileFormatVersion: 2 -guid: b63853c2a526b2642b9e0330cd389f6d -ModelImporter: - serializedVersion: 20200 - internalIDToNameTable: - - first: - 74: -203655887218126122 - second: mixamo.com - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Animations/Charactertest1@Standing Idle.fbx.meta b/Assets/Animations/Charactertest1@Standing Idle.fbx.meta index ea53c00..c77dfd1 100644 --- a/Assets/Animations/Charactertest1@Standing Idle.fbx.meta +++ b/Assets/Animations/Charactertest1@Standing Idle.fbx.meta @@ -26,7 +26,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 @@ -91,13 +91,13 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 3 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 additionalBone: 0 userData: diff --git a/Assets/Animations/Charactertest1@Taking Item.fbx.meta b/Assets/Animations/Charactertest1@Taking Item.fbx.meta index 73cafd3..f0d9b4d 100644 --- a/Assets/Animations/Charactertest1@Taking Item.fbx.meta +++ b/Assets/Animations/Charactertest1@Taking Item.fbx.meta @@ -5,7 +5,7 @@ ModelImporter: internalIDToNameTable: - first: 74: -203655887218126122 - second: mixamo.com + second: Taking Item externalObjects: {} materials: materialImportMode: 2 @@ -26,14 +26,43 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Taking Item + takeName: mixamo.com + internalID: 0 + firstFrame: 25 + lastFrame: 85 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -79,8 +108,597 @@ ModelImporter: importAnimation: 1 humanDescription: serializedVersion: 3 - human: [] - skeleton: [] + human: + - boneName: mixamorig:Hips + humanName: Hips + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftUpLeg + humanName: LeftUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightUpLeg + humanName: RightUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftLeg + humanName: LeftLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightLeg + humanName: RightLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftFoot + humanName: LeftFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightFoot + humanName: RightFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine + humanName: Spine + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine1 + humanName: Chest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Neck + humanName: Neck + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Head + humanName: Head + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftShoulder + humanName: LeftShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightShoulder + humanName: RightShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftArm + humanName: LeftUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightArm + humanName: RightUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftForeArm + humanName: LeftLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightForeArm + humanName: RightLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHand + humanName: LeftHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHand + humanName: RightHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftToeBase + humanName: LeftToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightToeBase + humanName: RightToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb1 + humanName: Left Thumb Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb2 + humanName: Left Thumb Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb3 + humanName: Left Thumb Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex1 + humanName: Left Index Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex2 + humanName: Left Index Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex3 + humanName: Left Index Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb1 + humanName: Right Thumb Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb2 + humanName: Right Thumb Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb3 + humanName: Right Thumb Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex1 + humanName: Right Index Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex2 + humanName: Right Index Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex3 + humanName: Right Index Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine2 + humanName: UpperChest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + skeleton: + - name: Charactertest1@Taking Item(Clone) + parentName: + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: Cube.001 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855696, y: 0, z: -0, w: 1} + scale: {x: 72.698494, y: 72.698494, z: 72.698494} + - name: Cube.002 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 100, y: 100, z: 100} + - name: Cube.003 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 100, y: 100, z: 100} + - name: Cube.004 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855696, y: 0, z: -0, w: 1} + scale: {x: 32.315575, y: 32.315575, z: 32.315575} + - name: Plane.015 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 100, y: 100, z: 100} + - name: Plane.018 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 11.005094, y: 11.859858, z: 20.894962} + - name: Plane.019 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855696, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.859858, z: 20.89496} + - name: Plane.020 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.423213, z: 21.420563} + - name: Plane.021 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.423213, z: 21.420563} + - name: Plane.022 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.477191, z: 21.357346} + - name: Plane.023 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.477191, z: 21.357346} + - name: Plane.024 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.157782, z: 21.724476} + - name: Plane.025 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.157782, z: 21.724476} + - name: Plane.026 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.477191, z: 21.357346} + - name: Plane.027 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.157782, z: 21.724476} + - name: Plane.028 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.157782, z: 21.724476} + - name: Plane.029 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: -9.553427e-16, y: -0.000000021855694, z: 1, w: 0.00000004371139} + scale: {x: -18.012484, y: -21.057007, z: -59.84319} + - name: Plane.030 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.477191, z: 21.357346} + - name: Plane.031 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.157782, z: 21.724476} + - name: Sphere.007 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 20.968952, y: 20.46638, z: 20.46638} + - name: Sphere.008 + parentName: Charactertest1@Taking Item(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 20.968952, y: 20.46638, z: 20.46638} + - name: mixamorig:Hips + parentName: Charactertest1@Taking Item(Clone) + position: {x: 0.00037504613, y: 7.219307, z: -0.00465358} + rotation: {x: -0.000000003225858, y: -0.007092844, z: -4.885538e-10, w: 0.99997485} + scale: {x: 1, y: 1, z: 1.0000001} + - name: mixamorig:Spine + parentName: mixamorig:Hips + position: {x: -0, y: 0.5408198, z: -0.028299851} + rotation: {x: -0.026137011, y: 0.000000007423693, z: 0.0000000011257402, w: 0.9996584} + scale: {x: 1.0000023, y: 0.9999998, z: 1.0000012} + - name: mixamorig:Spine1 + parentName: mixamorig:Spine + position: {x: -0, y: 0.63181955, z: -5.5386207e-10} + rotation: {x: -0.00000001862645, y: -9.4926275e-11, z: 0.0000000018140742, w: 1} + scale: {x: 1.0000026, y: 0.99999976, z: 1.0000014} + - name: mixamorig:Spine2 + parentName: mixamorig:Spine1 + position: {x: -0, y: 0.7220798, z: 0.0000000019118065} + rotation: {x: 0.0000000037252899, y: 0.000000008894932, z: -0.000000003089522, + w: 1} + scale: {x: 1.0000031, y: 0.99999976, z: 1.000002} + - name: mixamorig:LeftShoulder + parentName: mixamorig:Spine2 + position: {x: -0.36793843, y: 0.74340284, z: -0.0036735907} + rotation: {x: 0.5416463, y: -0.45354533, z: 0.54710174, w: 0.44899416} + scale: {x: 1.0000001, y: 0.9999998, z: 1.0000005} + - name: mixamorig:LeftArm + parentName: mixamorig:LeftShoulder + position: {x: 3.8727463e-10, y: 0.7485276, z: -0.0000000070955} + rotation: {x: -0.057157762, y: 0.0005720853, z: -0.009070574, w: 0.99832386} + scale: {x: 0.99999994, y: 0.99999624, z: 1.0000048} + - name: mixamorig:LeftForeArm + parentName: mixamorig:LeftArm + position: {x: 0.0000000015536795, y: 2.0721738, z: -0.00000003006127} + rotation: {x: -0.036274362, y: 0.00057305465, z: -0.01578451, w: 0.9992171} + scale: {x: 0.9999998, y: 1.0000004, z: 1.0000002} + - name: mixamorig:LeftHand + parentName: mixamorig:LeftForeArm + position: {x: 0.0000000023798523, y: 1.8394047, z: -0.000000009237039} + rotation: {x: -0.084110275, y: -0.08142792, z: 0.09681363, w: 0.98839366} + scale: {x: 1.0000001, y: 0.9999992, z: 1.000001} + - name: mixamorig:LeftHandIndex1 + parentName: mixamorig:LeftHand + position: {x: -7.039837e-10, y: 0.14661053, z: 0.001731802} + rotation: {x: -0.0012411618, y: 0.0024664986, z: -0.1113787, w: 0.99377424} + scale: {x: 1, y: 0.9999998, z: 1.0000005} + - name: mixamorig:LeftHandIndex2 + parentName: mixamorig:LeftHandIndex1 + position: {x: -0.007353681, y: 0.23973179, z: -4.2080686e-11} + rotation: {x: -0.03436861, y: 0.001908714, z: -0.014341325, w: -0.9993046} + scale: {x: 1.0000005, y: 1.0000021, z: 0.9999985} + - name: mixamorig:LeftHandIndex3 + parentName: mixamorig:LeftHandIndex2 + position: {x: 0.0009448636, y: 0.1996789, z: -9.754382e-10} + rotation: {x: 0.034034852, y: 0.0035575046, z: 0.014852086, w: 0.999304} + scale: {x: 0.99999994, y: 1.0000007, z: 0.9999991} + - name: mixamorig:LeftHandIndex4 + parentName: mixamorig:LeftHandIndex3 + position: {x: 0.006408819, y: 0.15649386, z: -0.000000008215569} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandThumb1 + parentName: mixamorig:LeftHand + position: {x: 0.1282106, y: 0.055299208, z: 0.0000000017014434} + rotation: {x: -0.0017746309, y: 0.001950539, z: 0.3071253, w: -0.95166546} + scale: {x: 1.0000005, y: 1.0000002, z: 0.9999997} + - name: mixamorig:LeftHandThumb2 + parentName: mixamorig:LeftHandThumb1 + position: {x: 0.053699546, y: 0.09794785, z: -8.209025e-10} + rotation: {x: -0.011697315, y: -0.0146373715, z: -0.21888967, w: 0.97556967} + scale: {x: 1.0000004, y: 1.0000001, z: 1.0000006} + - name: mixamorig:LeftHandThumb3 + parentName: mixamorig:LeftHandThumb2 + position: {x: 0.0001653505, y: 0.15805909, z: 5.788994e-11} + rotation: {x: 0.011658229, y: -0.007565669, z: -0.14023875, w: 0.99002016} + scale: {x: 1.0000004, y: 1.0000014, z: 0.9999997} + - name: mixamorig:LeftHandThumb4 + parentName: mixamorig:LeftHandThumb3 + position: {x: -0.05386491, y: 0.149309, z: 0.0000000023226392} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightShoulder + parentName: mixamorig:Spine2 + position: {x: 0.36793843, y: 0.7433959, z: -0.0035413443} + rotation: {x: -0.5417489, y: -0.4534593, z: 0.5470086, w: -0.44907057} + scale: {x: 1.0000002, y: 1.0000001, z: 1.0000005} + - name: mixamorig:RightArm + parentName: mixamorig:RightShoulder + position: {x: -3.694491e-10, y: 0.7485276, z: -0.000000007096449} + rotation: {x: -0.057812728, y: 0.00010520218, z: -0.0016647873, w: 0.99832606} + scale: {x: 1, y: 0.9999961, z: 1.0000045} + - name: mixamorig:RightForeArm + parentName: mixamorig:RightArm + position: {x: -0.0000000010593078, y: 2.0722198, z: -0.000000023587392} + rotation: {x: -0.036525678, y: -0.00041317538, z: 0.011303007, w: 0.9992687} + scale: {x: 0.99999994, y: 0.99999994, z: 1.0000004} + - name: mixamorig:RightHand + parentName: mixamorig:RightForeArm + position: {x: 2.8623426e-10, y: 1.8391527, z: -0.000000009120559} + rotation: {x: -0.12208952, y: 0.09344305, z: -0.082704656, w: 0.98464334} + scale: {x: 1.0000004, y: 0.999999, z: 1.0000008} + - name: mixamorig:RightHandIndex1 + parentName: mixamorig:RightHand + position: {x: -7.75331e-10, y: 0.13994496, z: 0.0014135188} + rotation: {x: 0.035126634, y: 0.0022372971, z: 0.09299118, w: 0.99504465} + scale: {x: 0.99999994, y: 0.9999998, z: 1.0000002} + - name: mixamorig:RightHandIndex2 + parentName: mixamorig:RightHandIndex1 + position: {x: 0.008389707, y: 0.24768238, z: 3.4438571e-10} + rotation: {x: 0.036182366, y: 0.0016239245, z: -0.013806136, w: 0.9992485} + scale: {x: 1.0000001, y: 1.0000021, z: 0.99999815} + - name: mixamorig:RightHandIndex3 + parentName: mixamorig:RightHandIndex2 + position: {x: -0.0006258501, y: 0.1954544, z: 0.0000000021126263} + rotation: {x: 0.035732765, y: -0.002638126, z: -0.014870922, w: 0.99924725} + scale: {x: 1.0000001, y: 1.0000007, z: 0.99999946} + - name: mixamorig:RightHandIndex4 + parentName: mixamorig:RightHandIndex3 + position: {x: -0.007763855, y: 0.18442066, z: 0.0000000047759494} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandThumb1 + parentName: mixamorig:RightHand + position: {x: -0.13571754, y: 0.06794449, z: 0.0000000011719488} + rotation: {x: 0.0008620097, y: 0.00089801836, z: 0.29305452, w: 0.9560949} + scale: {x: 1.0000004, y: 1.0000002, z: 1.0000001} + - name: mixamorig:RightHandThumb2 + parentName: mixamorig:RightHandThumb1 + position: {x: -0.058740314, y: 0.10626592, z: 0.0000000013114304} + rotation: {x: -0.0052951896, y: 0.006539125, z: 0.22136793, w: 0.97515404} + scale: {x: 0.99999994, y: 1, z: 1.0000002} + - name: mixamorig:RightHandThumb3 + parentName: mixamorig:RightHandThumb2 + position: {x: 0.00035771955, y: 0.15045163, z: 2.1944632e-10} + rotation: {x: -0.001979268, y: -0.0016758849, z: 0.16839693, w: 0.98571587} + scale: {x: 0.99999994, y: 1.0000002, z: 1.0000001} + - name: mixamorig:RightHandThumb4 + parentName: mixamorig:RightHandThumb3 + position: {x: 0.05838259, y: 0.13527179, z: 3.8946268e-10} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Neck + parentName: mixamorig:Spine2 + position: {x: -0, y: 0.8123395, z: 0.00000001906559} + rotation: {x: 0.026137033, y: -0.000000018969418, z: -5.9271127e-10, w: 0.9996584} + scale: {x: 1.000002, y: 1.0000001, z: 1.0000023} + - name: mixamorig:Head + parentName: mixamorig:Neck + position: {x: -0, y: 0.44286758, z: 0.025470257} + rotation: {x: -0.000000026077029, y: 0.0000000102570965, z: -0.0000000031858973, + w: 1} + scale: {x: 1.0000017, y: 1.0000001, z: 1.0000017} + - name: mixamorig:HeadTop_End + parentName: mixamorig:Head + position: {x: -0, y: 2.0231571, z: 0.11635604} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftUpLeg + parentName: mixamorig:Hips + position: {x: -0.5225438, y: -0.3014296, z: 0.0056235455} + rotation: {x: -0.0008244638, y: 0.023163721, z: 0.9990987, w: 0.035561178} + scale: {x: 0.9999998, y: 1.0000018, z: 1.0000019} + - name: mixamorig:LeftLeg + parentName: mixamorig:LeftUpLeg + position: {x: -0.000000019510379, y: 3.235485, z: -0.0000000025300215} + rotation: {x: -0.06281907, y: -0.0010531492, z: 0.01672937, w: 0.99788415} + scale: {x: 1, y: 1.0000004, z: 1.0000005} + - name: mixamorig:LeftFoot + parentName: mixamorig:LeftLeg + position: {x: 0.0000000026896692, y: 3.1761355, z: 0.000000014775105} + rotation: {x: -0.5855805, y: 0.033328824, z: -0.024107495, w: -0.80956995} + scale: {x: 0.9999998, y: 0.9999996, z: 0.99999946} + - name: mixamorig:LeftToeBase + parentName: mixamorig:LeftFoot + position: {x: -0.0000000026723739, y: 0.84323645, z: 0.0000000031586103} + rotation: {x: 0.18721563, y: 0.0019752067, z: 0.010363199, w: 0.98226225} + scale: {x: 1.0000001, y: 0.99999994, z: 1.0000001} + - name: mixamorig:LeftToe_End + parentName: mixamorig:LeftToeBase + position: {x: -7.8852974e-10, y: 0.33891705, z: 1.1985549e-10} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightUpLeg + parentName: mixamorig:Hips + position: {x: 0.5225438, y: -0.3014296, z: -0.024223551} + rotation: {x: 0.0010145553, y: 0.028519755, z: 0.99896085, w: -0.035536584} + scale: {x: 1.0000005, y: 1.000001, z: 1.0000002} + - name: mixamorig:RightLeg + parentName: mixamorig:RightUpLeg + position: {x: 0.000000013190711, y: 3.237273, z: -0.000000013679309} + rotation: {x: -0.0677963, y: 0.0011335283, z: -0.016678829, w: 0.9975592} + scale: {x: 1, y: 1.0000004, z: 1.0000001} + - name: mixamorig:RightFoot + parentName: mixamorig:RightLeg + position: {x: 3.2275274e-10, y: 3.1759453, z: 0.000000007477601} + rotation: {x: -0.5851435, y: -0.033541482, z: 0.02423415, w: -0.80987334} + scale: {x: 0.99999994, y: 1.0000004, z: 1.0000004} + - name: mixamorig:RightToeBase + parentName: mixamorig:RightFoot + position: {x: -0.000000001445571, y: 0.84261924, z: -0.0000000084226155} + rotation: {x: 0.18721712, y: -0.0021064188, z: -0.011051593, w: 0.9822542} + scale: {x: 1, y: 0.9999998, z: 1} + - name: mixamorig:RightToe_End + parentName: mixamorig:RightToeBase + position: {x: 3.0934827e-10, y: 0.3342694, z: -1.0382905e-10} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} armTwist: 0.5 foreArmTwist: 0.5 upperLegTwist: 0.5 @@ -91,13 +709,13 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 3 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 additionalBone: 0 userData: diff --git a/Assets/Animations/Charactertest1@Jumping Up.fbx b/Assets/Animations/Jumping Up.fbx similarity index 100% rename from Assets/Animations/Charactertest1@Jumping Up.fbx rename to Assets/Animations/Jumping Up.fbx diff --git a/Assets/Animations/Jumping Up.fbx.meta b/Assets/Animations/Jumping Up.fbx.meta new file mode 100644 index 0000000..5b38264 --- /dev/null +++ b/Assets/Animations/Jumping Up.fbx.meta @@ -0,0 +1,724 @@ +fileFormatVersion: 2 +guid: b63853c2a526b2642b9e0330cd389f6d +ModelImporter: + serializedVersion: 20200 + internalIDToNameTable: + - first: + 74: -203655887218126122 + second: Jumping Up + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 3 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: + - serializedVersion: 16 + name: Jumping Up + takeName: mixamo.com + internalID: 0 + firstFrame: 0 + lastFrame: 25 + 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: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: + - boneName: mixamorig:Hips + humanName: Hips + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftUpLeg + humanName: LeftUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightUpLeg + humanName: RightUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftLeg + humanName: LeftLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightLeg + humanName: RightLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftFoot + humanName: LeftFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightFoot + humanName: RightFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine + humanName: Spine + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine1 + humanName: Chest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Neck + humanName: Neck + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Head + humanName: Head + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftShoulder + humanName: LeftShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightShoulder + humanName: RightShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftArm + humanName: LeftUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightArm + humanName: RightUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftForeArm + humanName: LeftLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightForeArm + humanName: RightLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHand + humanName: LeftHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHand + humanName: RightHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftToeBase + humanName: LeftToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightToeBase + humanName: RightToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb1 + humanName: Left Thumb Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb2 + humanName: Left Thumb Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb3 + humanName: Left Thumb Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex1 + humanName: Left Index Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex2 + humanName: Left Index Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex3 + humanName: Left Index Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb1 + humanName: Right Thumb Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb2 + humanName: Right Thumb Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb3 + humanName: Right Thumb Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex1 + humanName: Right Index Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex2 + humanName: Right Index Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex3 + humanName: Right Index Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine2 + humanName: UpperChest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + skeleton: + - name: Charactertest1@Jumping Up(Clone) + parentName: + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: Cube.001 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855696, y: 0, z: -0, w: 1} + scale: {x: 72.698494, y: 72.698494, z: 72.698494} + - name: Cube.002 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 100, y: 100, z: 100} + - name: Cube.003 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 100, y: 100, z: 100} + - name: Cube.004 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855696, y: 0, z: -0, w: 1} + scale: {x: 32.315575, y: 32.315575, z: 32.315575} + - name: Plane.015 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 100, y: 100, z: 100} + - name: Plane.018 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 11.005094, y: 11.859858, z: 20.894962} + - name: Plane.019 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855696, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.859858, z: 20.89496} + - name: Plane.020 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.423213, z: 21.420563} + - name: Plane.021 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.423213, z: 21.420563} + - name: Plane.022 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.477191, z: 21.357346} + - name: Plane.023 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.477191, z: 21.357346} + - name: Plane.024 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.157782, z: 21.724476} + - name: Plane.025 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.157782, z: 21.724476} + - name: Plane.026 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.477191, z: 21.357346} + - name: Plane.027 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.157782, z: 21.724476} + - name: Plane.028 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.157782, z: 21.724476} + - name: Plane.029 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: -9.553427e-16, y: -0.000000021855694, z: 1, w: 0.00000004371139} + scale: {x: -18.012484, y: -21.057007, z: -59.84319} + - name: Plane.030 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.477191, z: 21.357346} + - name: Plane.031 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 9.839824, y: 11.157782, z: 21.724476} + - name: Sphere.007 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 20.968952, y: 20.46638, z: 20.46638} + - name: Sphere.008 + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} + scale: {x: 20.968952, y: 20.46638, z: 20.46638} + - name: mixamorig:Hips + parentName: Charactertest1@Jumping Up(Clone) + position: {x: -0.010330573, y: 7.219305, z: -0.0579498} + rotation: {x: 0.000000002358633, y: -0.007092852, z: 1.6730508e-11, w: 0.99997485} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Spine + parentName: mixamorig:Hips + position: {x: -0, y: 0.5408198, z: -0.028299851} + rotation: {x: -0.026137022, y: 0.000000089425114, z: 4.7481924e-10, w: 0.9996584} + scale: {x: 1.0000023, y: 1, z: 1.0000012} + - name: mixamorig:Spine1 + parentName: mixamorig:Spine + position: {x: -0, y: 0.63181955, z: -5.5386207e-10} + rotation: {x: -0.000000027939674, y: -0.000000109339, z: -0.000000003856261, + w: 1} + scale: {x: 1.0000026, y: 0.9999998, z: 1.0000015} + - name: mixamorig:Spine2 + parentName: mixamorig:Spine1 + position: {x: -0, y: 0.7220798, z: 0.0000000019118065} + rotation: {x: 0.000000014901159, y: 0.000000043759083, z: -0.000000001773015, + w: 1} + scale: {x: 1.000003, y: 0.9999996, z: 1.0000018} + - name: mixamorig:LeftShoulder + parentName: mixamorig:Spine2 + position: {x: -0.36793843, y: 0.74340284, z: -0.0036735907} + rotation: {x: 0.54164624, y: -0.4535453, z: 0.5471017, w: 0.4489941} + scale: {x: 1, y: 0.99999994, z: 1.0000002} + - name: mixamorig:LeftArm + parentName: mixamorig:LeftShoulder + position: {x: 3.8727463e-10, y: 0.7485276, z: -0.0000000070955} + rotation: {x: -0.057157792, y: 0.00057215994, z: -0.009070606, w: 0.9983238} + scale: {x: 0.99999994, y: 0.99999636, z: 1.0000044} + - name: mixamorig:LeftForeArm + parentName: mixamorig:LeftArm + position: {x: 0.0000000015536795, y: 2.0721738, z: -0.00000003006127} + rotation: {x: -0.03627431, y: 0.00057306734, z: -0.015784554, w: 0.99921703} + scale: {x: 0.9999996, y: 1.0000008, z: 1.0000006} + - name: mixamorig:LeftHand + parentName: mixamorig:LeftForeArm + position: {x: 0.0000000023798523, y: 1.8394047, z: -0.000000009237039} + rotation: {x: -0.084110275, y: -0.08142792, z: 0.0968137, w: 0.9883937} + scale: {x: 1.0000007, y: 0.99999946, z: 1.0000005} + - name: mixamorig:LeftHandIndex1 + parentName: mixamorig:LeftHand + position: {x: -7.039837e-10, y: 0.14661053, z: 0.001731802} + rotation: {x: -0.001241617, y: 0.0024666341, z: -0.111378774, w: 0.99377424} + scale: {x: 1.0000007, y: 0.99999994, z: 1.0000012} + - name: mixamorig:LeftHandIndex2 + parentName: mixamorig:LeftHandIndex1 + position: {x: -0.007353681, y: 0.23973179, z: -4.2080686e-11} + rotation: {x: -0.034368917, y: 0.001908761, z: -0.014341574, w: -0.9993045} + scale: {x: 1.0000004, y: 1.0000017, z: 0.9999985} + - name: mixamorig:LeftHandIndex3 + parentName: mixamorig:LeftHandIndex2 + position: {x: 0.0009448636, y: 0.1996789, z: -9.754382e-10} + rotation: {x: 0.03403006, y: 0.0035574688, z: 0.01485252, w: 0.9993042} + scale: {x: 0.9999996, y: 1.0000006, z: 0.9999986} + - name: mixamorig:LeftHandIndex4 + parentName: mixamorig:LeftHandIndex3 + position: {x: 0.006408819, y: 0.15649386, z: -0.000000008215569} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandThumb1 + parentName: mixamorig:LeftHand + position: {x: 0.1282106, y: 0.055299208, z: 0.0000000017014434} + rotation: {x: -0.0017749593, y: 0.0019506887, z: 0.3071276, w: -0.95166475} + scale: {x: 1.0000004, y: 1.0000004, z: 0.99999994} + - name: mixamorig:LeftHandThumb2 + parentName: mixamorig:LeftHandThumb1 + position: {x: 0.053699546, y: 0.09794785, z: -8.209025e-10} + rotation: {x: -0.01169568, y: -0.0146381855, z: -0.21889085, w: 0.9755694} + scale: {x: 0.9999997, y: 0.99999934, z: 1.0000006} + - name: mixamorig:LeftHandThumb3 + parentName: mixamorig:LeftHandThumb2 + position: {x: 0.0001653505, y: 0.15805909, z: 5.788994e-11} + rotation: {x: 0.011655974, y: -0.007566346, z: -0.14023708, w: 0.9900205} + scale: {x: 1.0000006, y: 1.000001, z: 0.9999997} + - name: mixamorig:LeftHandThumb4 + parentName: mixamorig:LeftHandThumb3 + position: {x: -0.05386491, y: 0.149309, z: 0.0000000023226392} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightShoulder + parentName: mixamorig:Spine2 + position: {x: 0.36793843, y: 0.7433959, z: -0.0035413443} + rotation: {x: -0.54174894, y: -0.4534594, z: 0.5470086, w: -0.44907057} + scale: {x: 1, y: 0.9999997, z: 1.0000004} + - name: mixamorig:RightArm + parentName: mixamorig:RightShoulder + position: {x: -3.694491e-10, y: 0.7485276, z: -0.000000007096449} + rotation: {x: -0.05781304, y: 0.000105336294, z: -0.0016647575, w: 0.9983261} + scale: {x: 1.0000008, y: 0.9999971, z: 1.0000036} + - name: mixamorig:RightForeArm + parentName: mixamorig:RightArm + position: {x: -0.0000000010593078, y: 2.0722198, z: -0.000000023587392} + rotation: {x: -0.0365258, y: -0.00041327515, z: 0.01130307, w: 0.9992687} + scale: {x: 0.9999992, y: 1.0000005, z: 1.0000001} + - name: mixamorig:RightHand + parentName: mixamorig:RightForeArm + position: {x: 2.8623426e-10, y: 1.8391527, z: -0.000000009120559} + rotation: {x: -0.12208943, y: 0.093443125, z: -0.08270475, w: 0.9846434} + scale: {x: 1, y: 0.999999, z: 1.0000008} + - name: mixamorig:RightHandIndex1 + parentName: mixamorig:RightHand + position: {x: -7.75331e-10, y: 0.13994496, z: 0.0014135188} + rotation: {x: 0.035124145, y: 0.0022371397, z: 0.09299101, w: 0.99504477} + scale: {x: 1, y: 1.0000005, z: 1.0000002} + - name: mixamorig:RightHandIndex2 + parentName: mixamorig:RightHandIndex1 + position: {x: 0.008389707, y: 0.24768238, z: 3.4438571e-10} + rotation: {x: 0.036183015, y: 0.0016238817, z: -0.0138061065, w: 0.99924856} + scale: {x: 1.0000005, y: 1.0000015, z: 0.9999992} + - name: mixamorig:RightHandIndex3 + parentName: mixamorig:RightHandIndex2 + position: {x: -0.0006258501, y: 0.1954544, z: 0.0000000021126263} + rotation: {x: 0.035733536, y: -0.0026381004, z: -0.01487046, w: 0.9992473} + scale: {x: 1.0000002, y: 1.0000011, z: 0.9999991} + - name: mixamorig:RightHandIndex4 + parentName: mixamorig:RightHandIndex3 + position: {x: -0.007763855, y: 0.18442066, z: 0.0000000047759494} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandThumb1 + parentName: mixamorig:RightHand + position: {x: -0.13571754, y: 0.06794449, z: 0.0000000011719488} + rotation: {x: 0.00086207624, y: 0.00089807756, z: 0.2930543, w: 0.95609504} + scale: {x: 1.0000006, y: 1.0000008, z: 1.0000002} + - name: mixamorig:RightHandThumb2 + parentName: mixamorig:RightHandThumb1 + position: {x: -0.058740314, y: 0.10626592, z: 0.0000000013114304} + rotation: {x: -0.0052883755, y: 0.0065406645, z: 0.22136743, w: 0.9751543} + scale: {x: 0.99999994, y: 0.99999946, z: 1.0000002} + - name: mixamorig:RightHandThumb3 + parentName: mixamorig:RightHandThumb2 + position: {x: 0.00035771955, y: 0.15045163, z: 2.1944632e-10} + rotation: {x: -0.001983767, y: -0.00167471, z: 0.16839965, w: 0.98571545} + scale: {x: 1.0000002, y: 1.0000002, z: 1.0000001} + - name: mixamorig:RightHandThumb4 + parentName: mixamorig:RightHandThumb3 + position: {x: 0.05838259, y: 0.13527179, z: 3.8946268e-10} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Neck + parentName: mixamorig:Spine2 + position: {x: -0, y: 0.8123395, z: 0.00000001906559} + rotation: {x: 0.026137065, y: -0.00000001163049, z: 0.000000003774573, w: 0.9996584} + scale: {x: 1.0000024, y: 1.0000001, z: 1.0000027} + - name: mixamorig:Head + parentName: mixamorig:Neck + position: {x: -0, y: 0.44286758, z: 0.025470257} + rotation: {x: -0.000000035390254, y: 0.0000000022377191, z: 0.0000000015442402, + w: 1} + scale: {x: 1.0000012, y: 1.0000004, z: 1.0000014} + - name: mixamorig:HeadTop_End + parentName: mixamorig:Head + position: {x: -0, y: 2.0231571, z: 0.11635604} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftUpLeg + parentName: mixamorig:Hips + position: {x: -0.5225438, y: -0.3014296, z: 0.0056235455} + rotation: {x: -0.0008244741, y: 0.0231637, z: 0.9990987, w: 0.03556117} + scale: {x: 0.9999998, y: 1.0000023, z: 1.0000015} + - name: mixamorig:LeftLeg + parentName: mixamorig:LeftUpLeg + position: {x: -0.000000019510379, y: 3.235485, z: -0.0000000025300215} + rotation: {x: -0.06281907, y: -0.0010531804, z: 0.016729368, w: 0.99788415} + scale: {x: 1.0000001, y: 1, z: 1.0000005} + - name: mixamorig:LeftFoot + parentName: mixamorig:LeftLeg + position: {x: 0.0000000026896692, y: 3.1761355, z: 0.000000014775105} + rotation: {x: -0.5855805, y: 0.0333288, z: -0.024107506, w: -0.8095699} + scale: {x: 0.9999999, y: 1, z: 1.0000004} + - name: mixamorig:LeftToeBase + parentName: mixamorig:LeftFoot + position: {x: -0.0000000026723739, y: 0.84323645, z: 0.0000000031586103} + rotation: {x: 0.18721566, y: 0.0019751806, z: 0.0103631895, w: 0.9822622} + scale: {x: 1, y: 1.0000005, z: 1.0000002} + - name: mixamorig:LeftToe_End + parentName: mixamorig:LeftToeBase + position: {x: -7.8852974e-10, y: 0.33891705, z: 1.1985549e-10} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightUpLeg + parentName: mixamorig:Hips + position: {x: 0.5225438, y: -0.3014296, z: -0.024223551} + rotation: {x: 0.0010145671, y: 0.028519752, z: 0.99896085, w: -0.035536595} + scale: {x: 1.0000001, y: 1, z: 1.0000004} + - name: mixamorig:RightLeg + parentName: mixamorig:RightUpLeg + position: {x: 0.000000013190711, y: 3.237273, z: -0.000000013679309} + rotation: {x: -0.067796305, y: 0.0011335372, z: -0.01667888, w: 0.9975592} + scale: {x: 1, y: 1.0000004, z: 1.0000001} + - name: mixamorig:RightFoot + parentName: mixamorig:RightLeg + position: {x: 3.2275274e-10, y: 3.1759453, z: 0.000000007477601} + rotation: {x: -0.5851435, y: -0.033541474, z: 0.0242341, w: -0.80987334} + scale: {x: 0.9999999, y: 1.0000004, z: 1.0000001} + - name: mixamorig:RightToeBase + parentName: mixamorig:RightFoot + position: {x: -0.000000001445571, y: 0.84261924, z: -0.0000000084226155} + rotation: {x: 0.18721715, y: -0.002106402, z: -0.011051629, w: 0.9822542} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightToe_End + parentName: mixamorig:RightToeBase + position: {x: 3.0934827e-10, y: 0.3342694, z: -1.0382905e-10} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 1 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 3 + humanoidOversampling: 1 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Movement.controller b/Assets/Animations/Movement.controller deleted file mode 100644 index 446c957..0000000 --- a/Assets/Animations/Movement.controller +++ /dev/null @@ -1,138 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-1194338768271148849 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Movement - 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: 1454392591854354392} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &-940347541621852193 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Walking - 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: -203655887218126122, guid: a241555694cc7dd479079987f1bc0709, - type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Movement - serializedVersion: 5 - m_AnimatorParameters: - - m_Name: Speed - m_Type: 1 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 2999564432888764922} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!206 &1454392591854354392 -BlendTree: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Blend Tree - m_Childs: - - serializedVersion: 2 - m_Motion: {fileID: -203655887218126122, guid: a241555694cc7dd479079987f1bc0709, - type: 3} - m_Threshold: 0 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: -203655887218126122, guid: 577610a62f20f6f4fa2e54c3e6ae8201, - type: 3} - m_Threshold: 1 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - m_BlendParameter: Speed - m_BlendParameterY: Blend - m_MinThreshold: 0 - m_MaxThreshold: 1 - m_UseAutomaticThresholds: 1 - m_NormalizedBlendValues: 0 - m_BlendType: 0 ---- !u!1107 &2999564432888764922 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -1194338768271148849} - m_Position: {x: 378.02396, y: 165.14769, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, 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} - m_DefaultState: {fileID: -1194338768271148849} diff --git a/Assets/Animations/Walk&Run Movement.controller b/Assets/Animations/Walk&Run Movement.controller new file mode 100644 index 0000000..5487ed5 --- /dev/null +++ b/Assets/Animations/Walk&Run Movement.controller @@ -0,0 +1,387 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-3711777729671264661 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: PickUp + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1738909679716458128} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.903537 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3623236038910904520 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: PickUp + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1194338768271148849} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-3440396586697471135 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Jump + 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: -203655887218126122, guid: b63853c2a526b2642b9e0330cd389f6d, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-1738909679716458128 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Picking + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3623236038910904520} + 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: -203655887218126122, guid: 6e87e845d8792fb46af3db43bf045a5b, + type: 3} + m_Tag: + m_SpeedParameter: AnimSpeed + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-1194338768271148849 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Movement + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5949650201554861832} + - {fileID: -3711777729671264661} + 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: 1454392591854354392} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-940347541621852193 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walking + 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: -203655887218126122, guid: a241555694cc7dd479079987f1bc0709, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk&Run Movement + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Speed + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Jump + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: AnimSpeed + m_Type: 1 + m_DefaultFloat: 1 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: PickUp + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2999564432888764922} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!206 &1454392591854354392 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: -203655887218126122, guid: 1623875f3821aaf45b2ac750bd9c417c, + type: 3} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: -203655887218126122, guid: a241555694cc7dd479079987f1bc0709, + type: 3} + m_Threshold: 0.33333334 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: -203655887218126122, guid: 577610a62f20f6f4fa2e54c3e6ae8201, + type: 3} + m_Threshold: 0.6666667 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: -203655887218126122, guid: 1760928a173bf91459ce945e14bbb44d, + type: 3} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + m_BlendParameter: Speed + m_BlendParameterY: Blend + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!1107 &2999564432888764922 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -1194338768271148849} + m_Position: {x: 378.02396, y: 165.14769, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6424911460868658083} + m_Position: {x: 540, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1738909679716458128} + m_Position: {x: 270, y: 60, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, 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} + m_DefaultState: {fileID: -1194338768271148849} +--- !u!1101 &5276141037687623862 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Jump + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1194338768271148849} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.70000005 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5949650201554861832 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Jump + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6424911460868658083} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.903537 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &6424911460868658083 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Jumping + m_Speed: 0.5 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5276141037687623862} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 1 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -203655887218126122, guid: b63853c2a526b2642b9e0330cd389f6d, + type: 3} + m_Tag: + m_SpeedParameter: AnimSpeed + m_MirrorParameter: + m_CycleOffsetParameter: Speed + m_TimeParameter: Speed +--- !u!1101 &6964413758257151049 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3440396586697471135} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.903537 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/Movement.controller.meta b/Assets/Animations/Walk&Run Movement.controller.meta similarity index 100% rename from Assets/Animations/Movement.controller.meta rename to Assets/Animations/Walk&Run Movement.controller.meta diff --git a/Assets/Scenes/Game/SampleScene.unity b/Assets/Scenes/Game/SampleScene.unity index 5ca7fa6..a9f8e46 100644 --- a/Assets/Scenes/Game/SampleScene.unity +++ b/Assets/Scenes/Game/SampleScene.unity @@ -5336,7 +5336,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-74200 + m_Name: pb_Mesh-7834 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -6077,7 +6077,7 @@ PrefabInstance: - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_Size.x - value: 9 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} @@ -6087,7 +6087,7 @@ PrefabInstance: - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_Size.z - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} @@ -6494,6 +6494,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 180372361} m_Modifications: + - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, + type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, + type: 3} + propertyPath: m_Size.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, + type: 3} + propertyPath: m_Size.z + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_RootOrder @@ -7278,6 +7293,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 180372361} m_Modifications: + - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, + type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, + type: 3} + propertyPath: m_Size.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, + type: 3} + propertyPath: m_Size.z + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_RootOrder @@ -9272,7 +9302,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-74188 + m_Name: pb_Mesh-7822 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9437,6 +9467,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 180372361} m_Modifications: + - target: {fileID: 3752708378666022456, guid: 191e7f512cc777648a8866ec5318a7d8, + type: 3} + propertyPath: m_Size.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3752708378666022456, guid: 191e7f512cc777648a8866ec5318a7d8, + type: 3} + propertyPath: m_Size.z + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_RootOrder @@ -9556,6 +9596,11 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 1331997591070191852, guid: 2342577add2bab844a55e25cc4fea601, + type: 3} + propertyPath: pushPower + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1331997591070191852, guid: 2342577add2bab844a55e25cc4fea601, type: 3} propertyPath: glideForward diff --git a/Assets/Scripts/PlayerPickUp.cs b/Assets/Scripts/PlayerPickUp.cs index aa5f26d..ac83a2c 100644 --- a/Assets/Scripts/PlayerPickUp.cs +++ b/Assets/Scripts/PlayerPickUp.cs @@ -14,11 +14,15 @@ public class PlayerPickUp : MonoBehaviour public bool canThrow; + private Animator anim; + void Start() { interactiveobjects = new List<GameObject>(); Cursor.visible = false; Cursor.lockState = CursorLockMode.Locked; + + anim = GetComponentInChildren<Animator>(); } void Update() { @@ -26,7 +30,9 @@ public class PlayerPickUp : MonoBehaviour { if (!hasItem && interactiveobjects.Count > 0) { - PickUpObject(); + PlayPickUpAnim(); + //PickUpObject(); + Invoke("PickUpObject", 1); } else if (hasItem) @@ -37,6 +43,8 @@ public class PlayerPickUp : MonoBehaviour if (hasItem == true) { + anim.SetBool("PickUp", false); + ObjectIWantToPickUp.GetComponent<Rigidbody>().velocity = Vector3.zero; ObjectIWantToPickUp.GetComponent<Rigidbody>().constraints = RigidbodyConstraints.FreezeRotation; @@ -133,4 +141,9 @@ public class PlayerPickUp : MonoBehaviour } return interactiveobjects[s]; } + + private void PlayPickUpAnim() + { + anim.SetBool("PickUp", true); + } } diff --git a/Assets/Scripts/SCTPSController.cs b/Assets/Scripts/SCTPSController.cs index 86c3465..858cafb 100644 --- a/Assets/Scripts/SCTPSController.cs +++ b/Assets/Scripts/SCTPSController.cs @@ -63,6 +63,8 @@ public class SCTPSController : MonoBehaviour public bool walking; public bool running; + public float jumpLength; + void Start() { characterController = GetComponent<CharacterController>(); @@ -90,6 +92,7 @@ public class SCTPSController : MonoBehaviour if (Input.GetButton("Jump") && canMove) { moveDirection.y = jumpSpeed; + jumpLength += 0.1f; } if (Input.GetKey(KeyCode.LeftShift)) @@ -157,42 +160,18 @@ public class SCTPSController : MonoBehaviour } } - if (!amIdle && !Input.GetKey(KeyCode.LeftShift)) + if (!amIdle && characterController.isGrounded && !Input.GetKey(KeyCode.LeftShift)) { walking = true; running = false; Walk(); } - else if (!amIdle && Input.GetKey(KeyCode.LeftShift)) + else if (!amIdle && characterController.isGrounded && Input.GetKey(KeyCode.LeftShift)) { walking = false; running = true; Run(); } - - /* - if (Input.GetKey(KeyCode.W)) - { - Walk(); - runWalk = true; - runRun = false; - } - else - { - Idle(); - } - - if (Input.GetKey(KeyCode.LeftShift)) - { - Run(); - runRun = true; - runWalk = false; - } - else - { - Idle(); - } - */ } private void FixedUpdate() @@ -200,6 +179,7 @@ public class SCTPSController : MonoBehaviour if (!Input.GetKey("d") && !Input.GetKey("a") && !Input.GetKey("w") && !Input.GetKey("s")) { amIdle = true; + Idle(); } else { @@ -215,6 +195,20 @@ public class SCTPSController : MonoBehaviour onGround = false; } + if (Input.GetButton("Jump")) + { + jumpLength += 1f; + } + + if (jumpLength > 0) + { + Jump(); + } + else if (jumpLength == 0) + { + anim.SetBool("Jump", false); + } + CheckGrounded(); if (canGlide) @@ -232,6 +226,8 @@ public class SCTPSController : MonoBehaviour moveDirection.x = Input.GetAxis("Horizontal") * glideSpeed; moveDirection.z = Input.GetAxis("Vertical") * glideSpeed; moveDirection = transform.TransformDirection(moveDirection); + + Glide(); } else { @@ -259,6 +255,7 @@ public class SCTPSController : MonoBehaviour doubleJumpsDone = 0; inAir = 0; jumpsPressed = 0; + jumpLength = 0; } if (doubleJumpsDone >= 2) @@ -335,33 +332,26 @@ public class SCTPSController : MonoBehaviour private void Idle() { - //anim.enabled = false; - - amIdle = true; + anim.SetFloat("Speed", 0f); } private void Walk() { - anim.SetFloat("Speed", 0f); + anim.SetFloat("Speed", 0.333f); } private void Run() { - anim.SetFloat("Speed", 1f); + anim.SetFloat("Speed", 0.666f); } private void Jump() { - // + anim.SetBool("Jump", true); } private void Glide() { - // - } - - private void PickUp() - { - // + anim.SetFloat("Speed", 1f); } } diff --git a/Packages/manifest.json b/Packages/manifest.json index abfd4df..d26eb48 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -9,10 +9,10 @@ "com.unity.polybrush": "1.0.2", "com.unity.postprocessing": "3.0.3", "com.unity.probuilder": "4.5.0", - "com.unity.render-pipelines.lightweight": "10.3.2", - "com.unity.test-framework": "1.1.22", + "com.unity.render-pipelines.lightweight": "10.4.0", + "com.unity.test-framework": "1.1.24", "com.unity.textmeshpro": "3.0.1", - "com.unity.timeline": "1.4.6", + "com.unity.timeline": "1.4.7", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 26ac21c..00e1783 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -109,7 +109,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "10.3.2", + "version": "10.4.0", "depth": 2, "source": "registry", "dependencies": { @@ -118,23 +118,23 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.lightweight": { - "version": "10.3.2", + "version": "10.4.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.render-pipelines.universal": "10.3.2", - "com.unity.postprocessing": "3.0.1" + "com.unity.render-pipelines.universal": "10.4.0", + "com.unity.postprocessing": "2.1.7" }, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.universal": { - "version": "10.3.2", + "version": "10.4.0", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.render-pipelines.core": "10.3.2", - "com.unity.shadergraph": "10.3.2" + "com.unity.render-pipelines.core": "10.4.0", + "com.unity.shadergraph": "10.4.0" }, "url": "https://packages.unity.com" }, @@ -153,17 +153,17 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "10.3.2", + "version": "10.4.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "10.3.2", + "com.unity.render-pipelines.core": "10.4.0", "com.unity.searcher": "4.3.1" }, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.22", + "version": "1.1.24", "depth": 0, "source": "registry", "dependencies": { @@ -183,7 +183,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.6", + "version": "1.4.7", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4db0bd0..6e2d7ba 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.0f1 -m_EditorVersionWithRevision: 2020.3.0f1 (c7b5465681fb) +m_EditorVersion: 2020.3.3f1 +m_EditorVersionWithRevision: 2020.3.3f1 (76626098c1c4) -- GitLab