diff --git a/Assets/Graphics/Models/Soldier/SoldierAnim.fbx b/Assets/Graphics/Models/Soldier/SoldierAnim.fbx deleted file mode 100644 index 5ca11fd..0000000 Binary files a/Assets/Graphics/Models/Soldier/SoldierAnim.fbx and /dev/null differ diff --git a/Assets/Graphics/Models/Soldier/SoldierAnim.fbx.meta b/Assets/Graphics/Models/Soldier/SoldierAnim.fbx.meta deleted file mode 100644 index d00d116..0000000 --- a/Assets/Graphics/Models/Soldier/SoldierAnim.fbx.meta +++ /dev/null @@ -1,584 +0,0 @@ -fileFormatVersion: 2 -guid: f4a651f8db888f24f89c447a975f1a04 -ModelImporter: - serializedVersion: 20101 - internalIDToNameTable: - - first: - 74: -2101640418457204544 - second: Soldier|Idle - - first: - 74: 5601054235094793752 - second: Soldier|ReverseRun - - first: - 74: -6390282035870482739 - second: Soldier|Run - - first: - 74: -4987167507176748680 - second: Soldier|StrafeLeft - - first: - 74: 4767594854432372465 - second: Soldier|StrafeRight - externalObjects: {} - materials: - materialImportMode: 1 - 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: 1 - animationCompression: 3 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: - - serializedVersion: 16 - name: Soldier|Idle - takeName: Soldier|Idle - internalID: 0 - firstFrame: 0 - lastFrame: 50 - 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 - - serializedVersion: 16 - name: Soldier|ReverseRun - takeName: Soldier|ReverseRun - internalID: 0 - firstFrame: 0 - lastFrame: 15 - 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 - - serializedVersion: 16 - name: Soldier|Run - takeName: Soldier|Run - internalID: 0 - firstFrame: 0 - lastFrame: 16 - 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 - - serializedVersion: 16 - name: Soldier|StrafeLeft - takeName: Soldier|StrafeLeft - internalID: 0 - firstFrame: 0 - lastFrame: 16 - 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 - - serializedVersion: 16 - name: Soldier|StrafeRight - takeName: Soldier|StrafeRight - internalID: 0 - firstFrame: 0 - lastFrame: 16 - 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: [] - 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: ABD - 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: THIGH.L - 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: THIGH.R - 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: CALF.L - 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: CALF.R - 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: FOOT.L - 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: FOOT.R - 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: RIBS - 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: 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: UA.L - 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: UA.R - 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: LA.L - 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: LA.R - 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: HAND.L - 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: HAND.R - 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: VISOR - humanName: LeftEye - 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: SoldierAnim(Clone) - parentName: - position: {x: -0, y: 2.5, z: 0.000000014901161} - rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - scale: {x: 100, y: 100, z: 100} - - name: ROOT - parentName: SoldierAnim(Clone) - position: {x: -0, y: 0, z: 0.00071418716} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: ABD - parentName: ROOT - position: {x: -0, y: 0, z: -0.0069999993} - rotation: {x: -0.048626926, y: -0.74804616, z: -0.66043836, w: -0.043400798} - scale: {x: 1, y: 1, z: 1} - - name: RIBS - parentName: ABD - position: {x: -0, y: 0.009, z: 0} - rotation: {x: -0.1722261, y: 0.13130702, z: -0.022178113, w: 0.97601473} - scale: {x: 1, y: 1, z: 1} - - name: HEAD - parentName: RIBS - position: {x: -1.4901161e-10, y: 0.007999999, z: 0.0010000002} - rotation: {x: 0.000000007436028, y: 0.0000000023283078, z: 0.0000000020081645, w: 1} - scale: {x: 0.9999999, y: 0.99999994, z: 1.0000001} - - name: VISOR - parentName: HEAD - position: {x: -0, y: 0.0034999999, z: 0.0015000001} - rotation: {x: -0.7071068, y: 0.0000000078613756, z: -0.000000004527494, w: 0.7071067} - scale: {x: 1.0000001, y: 0.99999994, z: 0.99999994} - - name: VISOR_end - parentName: VISOR - position: {x: -0, y: 0.007, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: IK_ELBOW.L - parentName: RIBS - position: {x: 0.011000001, y: 0.005, z: 0.0069999998} - rotation: {x: -0.00000009261351, y: 0.7071068, z: 0.7071067, w: -0.000000095700415} - scale: {x: 1, y: 1.0000001, z: 0.99999994} - - name: IK_ELBOW.L_end - parentName: IK_ELBOW.L - position: {x: -0, y: 0.0039999993, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: IK_ELBOW.R - parentName: RIBS - position: {x: -0.012593046, y: -0.008577216, z: 0.00216412} - rotation: {x: -0.00000009261351, y: 0.7071068, z: 0.7071067, w: -0.000000095700415} - scale: {x: 1, y: 1.0000001, z: 0.99999994} - - name: IK_ELBOW.R_end - parentName: IK_ELBOW.R - position: {x: -0, y: 0.004, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: RIBS.001 - parentName: RIBS - position: {x: -0.0025000002, y: 0.0049999994, z: 0.0045000003} - rotation: {x: -0.000000091954966, y: 0.7071068, z: 0.7071067, w: -0.00000009635896} - scale: {x: 1, y: 1, z: 0.99999994} - - name: RIBS.001_end - parentName: RIBS.001 - position: {x: -0, y: 0.0039999997, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: RIBS.002 - parentName: RIBS - position: {x: 0.0025000002, y: 0.0049999985, z: 0.0045} - rotation: {x: -0.000000091954966, y: 0.7071068, z: 0.7071067, w: -0.00000009635896} - scale: {x: 1, y: 1, z: 0.99999994} - - name: RIBS.002_end - parentName: RIBS.002 - position: {x: -0, y: 0.0039999997, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: UA.L - parentName: RIBS - position: {x: 0.0050000004, y: 0.0050000013, z: -1.4901161e-10} - rotation: {x: -0.25881338, y: -0.35643357, z: -0.6474062, w: 0.6219614} - scale: {x: 1.0000001, y: 0.9999999, z: 1} - - name: LA.L - parentName: UA.L - position: {x: -4.4703483e-10, y: 0.0050000004, z: 0} - rotation: {x: 0.00000023841855, y: 0.000000029802319, z: 0.10999472, w: 0.9939322} - scale: {x: 1.0000001, y: 0.9999998, z: 0.9999999} - - name: HAND.L - parentName: LA.L - position: {x: 0.0009899496, y: 0.006929647, z: -0.000000001899898} - rotation: {x: 0.12963182, y: 0.38310888, z: -0.21792468, w: 0.88821846} - scale: {x: 1.0000004, y: 0.99999994, z: 0.99999994} - - name: HAND.L_end - parentName: HAND.L - position: {x: -0, y: 0.002, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: UA.R - parentName: RIBS - position: {x: -0.0050000004, y: 0.0050000004, z: -3.7252902e-11} - rotation: {x: 0.61042506, y: -0.52075094, z: -0.39007396, w: -0.45171022} - scale: {x: 1.0000002, y: 1, z: 1.0000001} - - name: LA.R - parentName: UA.R - position: {x: 2.3283064e-10, y: 0.0050000004, z: 0.0000000010244549} - rotation: {x: -0.011050998, y: 0.0181154, z: 0.06518548, w: -0.9976476} - scale: {x: 0.9999999, y: 0.9999999, z: 1} - - name: HAND.R - parentName: LA.R - position: {x: -0.0009899507, y: 0.006929649, z: 2.2351741e-10} - rotation: {x: 0.45790857, y: -0.7481502, z: -0.058447834, w: -0.47662863} - scale: {x: 1.0000001, y: 1.0000002, z: 0.99999976} - - name: HAND.R_end - parentName: HAND.R - position: {x: -0, y: 0.0020000003, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: THIGH.L - parentName: ABD - position: {x: 0.002, y: 0, z: -1.4901161e-10} - rotation: {x: 0.9990588, y: -0.000000017840092, z: -0.000000018974822, w: 0.043377537} - scale: {x: 1, y: 1, z: 1} - - name: CALF.L - parentName: THIGH.L - position: {x: 2.5382814e-11, y: 0.006999998, z: -4.417373e-12} - rotation: {x: -0.21973658, y: -0.00000004264304, z: -0.0000000096049915, w: 0.97555923} - scale: {x: 1, y: 0.99999994, z: 1} - - name: FOOT.L - parentName: CALF.L - position: {x: 1.3302966e-10, y: 0.010049876, z: -0.0000000014505097} - rotation: {x: 0.86758906, y: 0.00000004239978, z: -0.00000005016151, w: 0.49728194} - scale: {x: 1, y: 0.99999976, z: 0.9999998} - - name: FOOT.L_end - parentName: FOOT.L - position: {x: -0, y: 0.0019999999, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: THIGH.R - parentName: ABD - position: {x: -0.002, y: 0, z: -1.4901161e-10} - rotation: {x: 0.99873745, y: -0.017810801, z: -0.0057523083, w: -0.04661742} - scale: {x: 1, y: 0.99999994, z: 0.99999994} - - name: CALF.R - parentName: THIGH.R - position: {x: 9.2946165e-11, y: 0.006999998, z: 6.6033423e-10} - rotation: {x: -0.34425038, y: -0.0000094193965, z: -0.000024950132, w: 0.93887794} - scale: {x: 1, y: 0.99999994, z: 0.9999999} - - name: FOOT.R - parentName: CALF.R - position: {x: -1.3252439e-11, y: 0.010049877, z: 1.0254215e-10} - rotation: {x: 0.8865622, y: -0.002245962, z: -0.018566435, w: 0.46223122} - scale: {x: 1, y: 1, z: 0.9999999} - - name: FOOT.R_end - parentName: FOOT.R - position: {x: -0, y: 0.0019999999, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: IK_FOOT.L - parentName: ROOT - position: {x: 0.002, y: -0.0056860396, z: -0.02264523} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: IK_FOOT.L_end - parentName: IK_FOOT.L - position: {x: -0, y: 0.0039999997, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: IK_FOOT.R - parentName: ROOT - position: {x: -0.002, y: 0.0031428204, z: -0.022681827} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 0.9999999, z: 0.9999999} - - name: IK_FOOT.R_end - parentName: IK_FOOT.R - position: {x: -0, y: 0.0039999997, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: IK_KNEE.L - parentName: ROOT - position: {x: 0.002, y: 0.012192632, z: -0.01233113} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: IK_KNEE.L_end - parentName: IK_KNEE.L - position: {x: -0, y: 0.0040000007, z: 0} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: IK_KNEE.R - parentName: ROOT - position: {x: -0.002, y: 0.012192632, z: -0.01233113} - rotation: {x: 0, y: -0, z: -0, w: 1} - scale: {x: 1, y: 1, z: 1} - - name: IK_KNEE.R_end - parentName: IK_KNEE.R - position: {x: -0, y: 0.0040000007, z: 0} - 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: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 3 - humanoidOversampling: 1 - avatarSetup: 1 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Graphics/Models/Soldier/SoldierAnimator.controller b/Assets/Graphics/Models/Soldier/SoldierAnimator.controller index 74e62a0..320dc7e 100644 --- a/Assets/Graphics/Models/Soldier/SoldierAnimator.controller +++ b/Assets/Graphics/Models/Soldier/SoldierAnimator.controller @@ -84,13 +84,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Right m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -113,7 +113,7 @@ BlendTree: m_Name: PlayerAnimBlend m_Childs: - serializedVersion: 2 - m_Motion: {fileID: 5601054235094793752, guid: f4a651f8db888f24f89c447a975f1a04, type: 3} + m_Motion: {fileID: 5601054235094793752, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_Threshold: 0 m_Position: {x: -1, y: 0} m_TimeScale: 1 @@ -121,7 +121,7 @@ BlendTree: m_DirectBlendParameter: Blend m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: -6390282035870482739, guid: f4a651f8db888f24f89c447a975f1a04, type: 3} + m_Motion: {fileID: -6390282035870482739, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_Threshold: 0.33333334 m_Position: {x: 1, y: 0} m_TimeScale: 1 @@ -129,15 +129,15 @@ BlendTree: m_DirectBlendParameter: Blend m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: -4987167507176748680, guid: f4a651f8db888f24f89c447a975f1a04, type: 3} + m_Motion: {fileID: -4987167507176748680, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_Threshold: 0.6666667 - m_Position: {x: 0, y: -1} + m_Position: {x: -0, y: -1} m_TimeScale: 1 m_CycleOffset: 0 m_DirectBlendParameter: Blend m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: 4767594854432372465, guid: f4a651f8db888f24f89c447a975f1a04, type: 3} + m_Motion: {fileID: 4767594854432372465, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_Threshold: 1 m_Position: {x: 0, y: 1} m_TimeScale: 1 @@ -145,7 +145,7 @@ BlendTree: m_DirectBlendParameter: Blend m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: -2101640418457204544, guid: f4a651f8db888f24f89c447a975f1a04, type: 3} + m_Motion: {fileID: -2101640418457204544, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_Threshold: 1.3333333 m_Position: {x: 0, y: 0} m_TimeScale: 1 diff --git a/Assets/Graphics/Models/Soldier/SoldierM.fbx b/Assets/Graphics/Models/Soldier/SoldierM.fbx index f0150ab..fffa6a0 100644 Binary files a/Assets/Graphics/Models/Soldier/SoldierM.fbx and b/Assets/Graphics/Models/Soldier/SoldierM.fbx differ diff --git a/Assets/Graphics/Models/Soldier/SoldierM.fbx.meta b/Assets/Graphics/Models/Soldier/SoldierM.fbx.meta index 4b88c05..c3ab02a 100644 --- a/Assets/Graphics/Models/Soldier/SoldierM.fbx.meta +++ b/Assets/Graphics/Models/Soldier/SoldierM.fbx.meta @@ -53,7 +53,152 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Soldier|Idle + takeName: Soldier|Idle + internalID: 0 + firstFrame: 0 + lastFrame: 50 + 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 + - serializedVersion: 16 + name: Soldier|ReverseRun + takeName: Soldier|ReverseRun + internalID: 0 + firstFrame: 0 + lastFrame: 16 + 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 + - serializedVersion: 16 + name: Soldier|Run + takeName: Soldier|Run + internalID: 0 + firstFrame: 0 + lastFrame: 16 + 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 + - serializedVersion: 16 + name: Soldier|StrafeLeft + takeName: Soldier|StrafeLeft + internalID: 0 + firstFrame: 0 + lastFrame: 16 + 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 + - serializedVersion: 16 + name: Soldier|StrafeRight + takeName: Soldier|StrafeRight + internalID: 0 + firstFrame: 0 + lastFrame: 16 + 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: [] diff --git a/RawAssets/Soldier/SoldierM.blend b/RawAssets/Soldier/SoldierM.blend index 99f3867..06ff3bb 100644 Binary files a/RawAssets/Soldier/SoldierM.blend and b/RawAssets/Soldier/SoldierM.blend differ