Fix male and female animations

This commit is contained in:
Vova
2024-04-30 15:24:15 +03:00
parent 3116437c46
commit a0b031133a
24 changed files with 172327 additions and 17524 deletions
@@ -20,7 +20,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 0dcb0896f53be0e44bfaa90cb10a5aa8, type: 2}
m_Motion: {fileID: 7400000, guid: 166cbec1f8e36f74e85526591cc3b0a8, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -328,7 +328,7 @@ BlendTree:
m_Name: Blend Tree
m_Childs:
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 0afa30af1b6de9d498a425df45346d43, type: 2}
m_Motion: {fileID: 7400000, guid: 166cbec1f8e36f74e85526591cc3b0a8, type: 2}
m_Threshold: 0
m_Position: {x: 0, y: 0}
m_TimeScale: 1
@@ -336,7 +336,7 @@ BlendTree:
m_DirectBlendParameter: Blend
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 66ef447927d74f24cb56d4378edb5bf1, type: 2}
m_Motion: {fileID: 7400000, guid: 4ba2b5c74b4980447a96099bf79a3725, type: 2}
m_Threshold: 0.25
m_Position: {x: 0, y: 1}
m_TimeScale: 1
@@ -344,7 +344,7 @@ BlendTree:
m_DirectBlendParameter: Blend
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: d7535373931dd704e98e70e7b32c7c9c, type: 2}
m_Motion: {fileID: 7400000, guid: 677e046655542704883ac285f8eda2ed, type: 2}
m_Threshold: 0.5
m_Position: {x: 0, y: 2}
m_TimeScale: 1
@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Female Start Walking
m_Name: Female_Start_Walking
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Walk
m_Name: Female_Walk
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
File diff suppressed because it is too large Load Diff
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0dcb0896f53be0e44bfaa90cb10a5aa8
guid: 166cbec1f8e36f74e85526591cc3b0a8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
File diff suppressed because it is too large Load Diff
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 75a8040195548774ab6fe8b348daba35
guid: 4ba2b5c74b4980447a96099bf79a3725
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 677e046655542704883ac285f8eda2ed
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
@@ -21,8 +21,8 @@ ModelImporter:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
importConstraints: 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
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
Binary file not shown.
@@ -1,107 +0,0 @@
fileFormatVersion: 2
guid: 125e9b229c65df44d8270a120a62385b
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
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
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
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
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8d5dc8aa74d80604fb0ad829b076072d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
+98
View File
@@ -0,0 +1,98 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &7219624446532144712
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_Name
value: Eric
objectReference: {fileID: 0}
- target: {fileID: 5866666021909216657, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: 6abd17ae3669e8d448186fd24a2aadb7, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
insertIndex: -1
addedObject: {fileID: 7956992099179694207}
m_SourcePrefab: {fileID: 100100000, guid: 97466f1da416f094e9e81beaab7c4853, type: 3}
--- !u!1 &7561592149499409177 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
m_PrefabInstance: {fileID: 7219624446532144712}
m_PrefabAsset: {fileID: 0}
--- !u!114 &7956992099179694207
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7561592149499409177}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cf9ddd6d77ff9a7479edaeb2c8ae1078, type: 3}
m_Name:
m_EditorClassIdentifier:
Sex: 1
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e34c8052381fd694cbbdfb2c7f5d3839
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+17 -17
View File
@@ -1791,9 +1791,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 349281313}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 250, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 250, y: -90}
m_SizeDelta: {x: 480, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &249161732
@@ -4332,7 +4332,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 749553635}
serializedVersion: 2
m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956}
m_LocalRotation: {x: 0.3826835, y: 0.000000022481233, z: -0.000000009312033, w: 0.92387956}
m_LocalPosition: {x: 29.11, y: 5, z: -5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -4411,12 +4411,12 @@ MonoBehaviour:
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
quality: 3
frameInfluence: 0.1
jitterScale: 1
mipBias: 0
varianceClampScale: 0.9
contrastAdaptiveSharpening: 0
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!81 &749553639
AudioListener:
m_ObjectHideFlags: 0
@@ -4864,7 +4864,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 835327588}
serializedVersion: 2
m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956}
m_LocalRotation: {x: 0.3826835, y: 0.000000022481233, z: -0.000000009312033, w: 0.92387956}
m_LocalPosition: {x: 29.11, y: 5, z: -5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -7555,12 +7555,12 @@ MonoBehaviour:
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
quality: 3
frameInfluence: 0.1
jitterScale: 1
mipBias: 0
varianceClampScale: 0.9
contrastAdaptiveSharpening: 0
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!20 &1598414013
Camera:
m_ObjectHideFlags: 0
+1 -1
View File
@@ -25,7 +25,7 @@ public abstract class BaseCharacter : MonoBehaviour
_animator = GetComponentInChildren<Animator>();
_characterDescriptor = GetComponentInChildren<CharacterDescriptor>();
_characterSex = _characterDescriptor.Sex;
SetPlayerAnimation(AnimationStates.Idle);
SetPlayerAnimation(AnimationStates.Walking);
}
private void Update()