janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 12:52:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Player Animations

Browse Source 
-Configured the human avatar and avatar masks
-Added aiming animation
-Added Idle animation
This commit is contained in:
juliuse98
2021-10-25 08:32:50 +02:00
parent e59f509df6
commit 8c2c3e10db
19 changed files with 685 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Animation.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2c3cc3a11b9034f439736e25c88f13e7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Animation/Animations.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0fb4e52060e990949b544210b71a2266
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Animation/Animatior Objects.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8b996c0ece643834bbdc6db3df644d3c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

78
Assets/Animation/Animatior Objects/PlayerAnimatior.controller Normal file
View File

@@ -0,0 +1,78 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-7052686061329051644
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New State
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: 1
m_Motion: {fileID: -8945691123924629249, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
m_Tag:
m_SpeedParameter: Time
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter: Time
--- !u!1107 &-2034536485000263243
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: -7052686061329051644}
m_Position: {x: 247.81976, y: 182.43098, 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: -7052686061329051644}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlayerAnimatior
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Time
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: -2034536485000263243}
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}

8
Assets/Animation/Animatior Objects/PlayerAnimatior.controller.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 37294cd9ecc09aa4a8f3cbdcf0f82dbc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Objects/Human.blend
View File

Binary file not shown.

BIN
Assets/Objects/Human.blend1
View File

Binary file not shown.

BIN
Assets/Objects/Human.fbx
View File

Binary file not shown.

299
Assets/Objects/Human.fbx.meta
View File

@@ -4,8 +4,20 @@ ModelImporter:
serializedVersion: 21100 serializedVersion: 21100
internalIDToNameTable: internalIDToNameTable:
- first: - first:
74: 8349542763059015795 74: 6881873686158965456
second: Armature|Walk second: Armature|Falling
- first:
74: -8945691123924629249
second: Idle
- first:
74: 1079665108409675491
second: Armature|Jump
- first:
74: -3386421022173712162
second: Armature|yeet
- first:
74: -3176884680461750752
second: Aim
externalObjects: {} externalObjects: {}
materials: materials:
materialImportMode: 2 materialImportMode: 2
@@ -26,7 +38,7 @@ ModelImporter:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
animationCompression: 3 animationCompression: 0
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
@@ -35,10 +47,10 @@ ModelImporter:
extraUserProperties: [] extraUserProperties: []
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: Armature|Walk name: Idle
takeName: Armature|Walk takeName: Armature|Idle
internalID: 0 internalID: 0
firstFrame: 0 firstFrame: 1
lastFrame: 24 lastFrame: 24
wrapMode: 0 wrapMode: 0
orientationOffsetY: 0 orientationOffsetY: 0
@@ -56,11 +68,152 @@ ModelImporter:
keepOriginalPositionXZ: 0 keepOriginalPositionXZ: 0
heightFromFeet: 0 heightFromFeet: 0
mirror: 0 mirror: 0
bodyMask: 01000000010000000000000001000000010000000000000000000000000000000000000001000000010000000000000000000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Armature
weight: 1
- path: Armature/Foot_Control_L
weight: 1
- path: Armature/Foot_Control_R
weight: 1
- path: Armature/Hand_L.001
weight: 1
- path: Armature/Hand_R.001
weight: 1
- path: Armature/Hip
weight: 1
- path: Armature/Hip/Abdomen
weight: 1
- path: Armature/Hip/Abdomen/Chest
weight: 1
- path: Armature/Hip/Abdomen/Chest/Head
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_L
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L/Hand_L
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_R
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R/Hand_R
weight: 1
- path: Armature/Hip/Thigh_L
weight: 1
- path: Armature/Hip/Thigh_L/Shin_L
weight: 1
- path: Armature/Hip/Thigh_L/Shin_L/Foot_L
weight: 1
- path: Armature/Hip/Thigh_R
weight: 1
- path: Armature/Hip/Thigh_R/Shin_R
weight: 1
- path: Armature/Hip/Thigh_R/Shin_R/Foot_R
weight: 1
- path: Armature/LookAt
weight: 1
- path: Armature/Thigh_Control_L
weight: 1
- path: Armature/Thigh_Control_R
weight: 1
- path: Armature/UpperArm_Control_L
weight: 1
- path: Armature/UpperArm_Control_R
weight: 1
- path: Cube
weight: 1
maskType: 1
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
- serializedVersion: 16
name: Aim
takeName: Armature|Idle
internalID: 0
firstFrame: 34
lastFrame: 213
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 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: [] curves: []
events: [] events: []
transformMask: [] transformMask:
maskType: 3 - path:
weight: 1
- path: Armature
weight: 1
- path: Armature/Foot_Control_L
weight: 0
- path: Armature/Foot_Control_R
weight: 0
- path: Armature/Hand_L.001
weight: 0
- path: Armature/Hand_R.001
weight: 0
- path: Armature/Hip
weight: 1
- path: Armature/Hip/Abdomen
weight: 1
- path: Armature/Hip/Abdomen/Chest
weight: 1
- path: Armature/Hip/Abdomen/Chest/Head
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_L
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L/Hand_L
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_R
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R
weight: 1
- path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R/Hand_R
weight: 1
- path: Armature/Hip/Thigh_L
weight: 1
- path: Armature/Hip/Thigh_L/Shin_L
weight: 1
- path: Armature/Hip/Thigh_L/Shin_L/Foot_L
weight: 1
- path: Armature/Hip/Thigh_R
weight: 1
- path: Armature/Hip/Thigh_R/Shin_R
weight: 1
- path: Armature/Hip/Thigh_R/Shin_R/Foot_R
weight: 1
- path: Armature/LookAt
weight: 0
- path: Armature/Thigh_Control_L
weight: 0
- path: Armature/Thigh_Control_R
weight: 0
- path: Armature/UpperArm_Control_L
weight: 0
- path: Armature/UpperArm_Control_R
weight: 0
- path: Cube
weight: 0
maskType: 0
maskSource: {instanceID: 0} maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0 additiveReferencePoseFrame: 0
isReadable: 0 isReadable: 0
@@ -255,127 +408,127 @@ ModelImporter:
scale: {x: 100, y: 100, z: 100} scale: {x: 100, y: 100, z: 100}
- name: Hip - name: Hip
parentName: Armature parentName: Armature
position: {x: 7.948426e-10, y: 0.0000000017881393, z: 0.008924431} position: {x: 0.0000000011205334, y: 0.0000000023841857, z: 0.00892443}
rotation: {x: 0.7071068, y: -0.0000000020579487, z: -0.0000000020579605, w: 0.7071068} rotation: {x: 0.7071068, y: -0, z: -4.8445783e-15, w: 0.7071068}
scale: {x: 1, y: 1, z: 1} scale: {x: 1, y: 0.9999998, z: 0.9999998}
- name: Abdomen - name: Abdomen
parentName: Hip parentName: Hip
position: {x: -0, y: 0.0010998978, z: 0} position: {x: -0, y: 0.0010998979, z: 0}
rotation: {x: -0, y: -0.000000116415315, z: 7.1054274e-15, w: 1} rotation: {x: -0, y: -0.00000011920927, z: 7.1054274e-15, w: 1}
scale: {x: 0.9999999, y: 1, z: 0.9999999} scale: {x: 1, y: 0.99999994, z: 1}
- name: Chest - name: Chest
parentName: Abdomen parentName: Abdomen
position: {x: -0, y: 0.002230785, z: 0} position: {x: -0, y: 0.0022307856, z: 0}
rotation: {x: -0, y: -0, z: -0, w: 1} rotation: {x: -0, y: -0, z: -0, w: 1}
scale: {x: 1, y: 0.9999999, z: 0.99999994} scale: {x: 1, y: 1, z: 1}
- name: Head - name: Head
parentName: Chest parentName: Chest
position: {x: -0, y: 0.002965438, z: 0} position: {x: -0, y: 0.0029654386, z: 0}
rotation: {x: -1.6584554e-17, y: 1.1934986e-10, z: -1.4246027e-10, w: 1} rotation: {x: -1.6940657e-21, y: -2.1316282e-14, z: -1.4210855e-14, w: 1}
scale: {x: 0.99999994, y: 0.9999998, z: 0.99999994} scale: {x: 1, y: 1, z: 1}
- name: UpperArm_L - name: UpperArm_L
parentName: Chest parentName: Chest
position: {x: -0.0013659928, y: 0.0018180575, z: -0.00022726202} position: {x: -0.0013659928, y: 0.0018180588, z: -0.00022726202}
rotation: {x: -0.4864988, y: 0.46149784, z: 0.5357424, w: 0.51314586} rotation: {x: -0.48649895, y: 0.46149766, z: 0.53574246, w: 0.5131458}
scale: {x: 0.99999976, y: 0.9999995, z: 1} scale: {x: 0.99999994, y: 0.99999976, z: 1}
- name: Forearm_L - name: Forearm_L
parentName: UpperArm_L parentName: UpperArm_L
position: {x: -9.313225e-11, y: 0.0029282072, z: -7.4505804e-11} position: {x: 3.7252902e-11, y: 0.0029282074, z: 3.7252902e-11}
rotation: {x: -0.009157031, y: -0.09181186, z: -0.038012516, w: -0.99500847} rotation: {x: -0.009157182, y: -0.09181181, z: -0.038012523, w: -0.99500847}
scale: {x: 1.0000002, y: 0.9999999, z: 0.99999976} scale: {x: 0.9999999, y: 0.9999997, z: 1.0000002}
- name: Hand_L - name: Hand_L
parentName: Forearm_L parentName: Forearm_L
position: {x: -1.3038516e-10, y: 0.0018045367, z: -5.820766e-11} position: {x: -1.862645e-10, y: 0.001804537, z: -1.11758706e-10}
rotation: {x: 0.09934627, y: 0.7378955, z: -0.010978944, w: -0.667473} rotation: {x: 0.09934618, y: 0.7378954, z: -0.010979064, w: -0.6674731}
scale: {x: 1.0000004, y: 1.0000006, z: 0.99999994} scale: {x: 1, y: 1.0000002, z: 0.99999976}
- name: UpperArm_R - name: UpperArm_R
parentName: Chest parentName: Chest
position: {x: 0.0013659928, y: 0.0018180575, z: -0.00022726262} position: {x: 0.0013659928, y: 0.0018180588, z: -0.00022726266}
rotation: {x: 0.486499, y: 0.4614976, z: 0.53574234, w: -0.51314604} rotation: {x: 0.48649913, y: 0.46149755, z: 0.5357424, w: -0.513146}
scale: {x: 1.0000004, y: 1.0000004, z: 0.9999998} scale: {x: 1.0000004, y: 1.0000002, z: 1.0000001}
- name: Forearm_R - name: Forearm_R
parentName: UpperArm_R parentName: UpperArm_R
position: {x: 1.8626451e-11, y: 0.002928207, z: -5.401671e-10} position: {x: 1.11758706e-10, y: 0.0029282072, z: -2.7939676e-10}
rotation: {x: 0.009157239, y: -0.09181183, z: -0.038012635, w: 0.99500847} rotation: {x: 0.009157656, y: -0.09181198, z: -0.03801266, w: 0.99500847}
scale: {x: 1.0000006, y: 1.0000002, z: 1.0000002} scale: {x: 1.0000002, y: 0.9999999, z: 0.99999976}
- name: Hand_R - name: Hand_R
parentName: Forearm_R parentName: Forearm_R
position: {x: -7.4505804e-11, y: 0.0018045371, z: -5.3551046e-11} position: {x: -1.3038516e-10, y: 0.0018045371, z: -1.8626451e-11}
rotation: {x: -0.09934638, y: 0.73789537, z: -0.010979169, w: 0.66747296} rotation: {x: -0.09934641, y: 0.7378955, z: -0.010979316, w: 0.66747296}
scale: {x: 0.9999997, y: 0.9999999, z: 0.99999976} scale: {x: 0.9999999, y: 0.9999998, z: 0.99999976}
- name: Thigh_L - name: Thigh_L
parentName: Hip parentName: Hip
position: {x: -0.00069675926, y: -0.00007037975, z: -0.00040403535} position: {x: -0.00069675926, y: -0.000070379676, z: -0.00040403535}
rotation: {x: 0.7066821, y: -0.08031961, z: -0.70253026, w: -0.024505584} rotation: {x: 0.7066821, y: -0.08031961, z: -0.70253026, w: -0.024505585}
scale: {x: 1.000001, y: 1, z: 1.0000001} scale: {x: 1.0000002, y: 1.0000006, z: 0.99999976}
- name: Shin_L - name: Shin_L
parentName: Thigh_L parentName: Thigh_L
position: {x: -1.5366822e-10, y: 0.003972938, z: -1.6298145e-11} position: {x: 4.4703483e-10, y: 0.003972937, z: 0}
rotation: {x: -0.00014329328, y: 0.008907664, z: 0.05948525, w: -0.9981895} rotation: {x: -0.00014327465, y: 0.008907662, z: 0.05948522, w: -0.9981895}
scale: {x: 1.0000004, y: 1.0000004, z: 1} scale: {x: 1.0000012, y: 0.99999994, z: 1.0000004}
- name: Foot_L - name: Foot_L
parentName: Shin_L parentName: Shin_L
position: {x: -2.3283064e-12, y: 0.0039656768, z: 1.36788e-10} position: {x: -4.842877e-10, y: 0.0039656768, z: -1.2340023e-10}
rotation: {x: 0.45208237, y: -0.604719, z: -0.36648977, w: -0.54371107} rotation: {x: 0.45208246, y: -0.604719, z: -0.36648992, w: -0.54371107}
scale: {x: 0.9999999, y: 1.0000004, z: 0.9999999} scale: {x: 0.9999998, y: 1.0000002, z: 1.0000002}
- name: Thigh_R - name: Thigh_R
parentName: Hip parentName: Hip
position: {x: 0.00069675926, y: -0.00007037975, z: -0.00040403544} position: {x: 0.00069675926, y: -0.000070379676, z: -0.00040403535}
rotation: {x: 0.70668215, y: 0.080319576, z: 0.7025302, w: -0.024505673} rotation: {x: 0.70668215, y: 0.080319576, z: 0.7025302, w: -0.024505671}
scale: {x: 1.000001, y: 1.0000001, z: 1.0000005} scale: {x: 1.0000004, y: 1.0000004, z: 1}
- name: Shin_R - name: Shin_R
parentName: Thigh_R parentName: Thigh_R
position: {x: -8.8475643e-11, y: 0.003972937, z: 2.2933817e-10} position: {x: -3.7252902e-11, y: 0.003972937, z: -9.313225e-11}
rotation: {x: 0.00014321505, y: 0.008907782, z: 0.059485234, w: 0.9981895} rotation: {x: 0.00014320014, y: 0.00890778, z: 0.05948522, w: 0.9981895}
scale: {x: 1.0000005, y: 1.0000004, z: 1.0000005} scale: {x: 1.0000007, y: 0.9999999, z: 1}
- name: Foot_R - name: Foot_R
parentName: Shin_R parentName: Shin_R
position: {x: 3.7252902e-11, y: 0.003965677, z: -3.259629e-11} position: {x: 3.5390257e-10, y: 0.0039656763, z: -1.3853423e-10}
rotation: {x: -0.45208243, y: -0.604719, z: -0.36648992, w: 0.54371107} rotation: {x: -0.45208243, y: -0.604719, z: -0.36648992, w: 0.54371107}
scale: {x: 0.99999964, y: 0.99999946, z: 1.0000005} scale: {x: 0.99999994, y: 1.0000002, z: 0.9999997}
- name: Foot_Control_L - name: Foot_Control_L
parentName: Armature parentName: Armature
position: {x: -0.0013605166, y: -0.0016545627, z: -0.007761089} position: {x: -0.0018724086, y: 0.0002533596, z: -0.0075386786}
rotation: {x: 0.999981, y: -3.552714e-15, z: 1.0658142e-14, w: 0.006168336} rotation: {x: 0.999981, y: -3.552714e-15, z: 1.776357e-15, w: 0.006168336}
scale: {x: 1, y: 0.99999994, z: 1.000678} scale: {x: 1, y: 0.99999994, z: 1.0006776}
- name: Thigh_Control_L - name: Thigh_Control_L
parentName: Armature parentName: Armature
position: {x: -0.00093339814, y: -0.006269274, z: -0.0039872816} position: {x: -0.0012845839, y: -0.006269274, z: -0.0039872816}
rotation: {x: 0.98892564, y: -0.000000008188669, z: -0.14841183, w: -8.881784e-16} rotation: {x: 0.98892564, y: -0.000000008188669, z: -0.14841183, w: -8.881784e-16}
scale: {x: 1, y: 1, z: 0.99999994} scale: {x: 1, y: 1, z: 0.99999994}
- name: UpperArm_Control_L - name: UpperArm_Control_L
parentName: Armature parentName: Armature
position: {x: -0.00085530936, y: -0.0039713676, z: 0.003075037} position: {x: -0.0034226924, y: -0.0039713676, z: 0.0025702473}
rotation: {x: -0.2692533, y: -0.6538369, z: 0.6538369, w: 0.2692533} rotation: {x: -0.26925328, y: -0.6538369, z: 0.6538369, w: 0.26925328}
scale: {x: 0.72619903, y: 0.99999976, z: 0.7314929} scale: {x: 0.99999994, y: 1, z: 1}
- name: Hand_L.001 - name: Hand_L.001
parentName: Armature parentName: Armature
position: {x: -0.0022795226, y: -0.00026142012, z: 0.0010587472} position: {x: -0.004653928, y: -0.0010747877, z: 0.000071166156}
rotation: {x: 0.00009068196, y: -0.7071068, z: 0.7071068, w: 0.00009159633} rotation: {x: 0.00009068196, y: -0.7071068, z: 0.7071068, w: 0.00009159633}
scale: {x: 0.48980606, y: 0.99999964, z: 0.9999998} scale: {x: 0.9999995, y: 0.99999964, z: 0.9999998}
- name: Foot_Control_R - name: Foot_Control_R
parentName: Armature parentName: Armature
position: {x: 0.0013605207, y: 0.0031248948, z: -0.0069798133} position: {x: 0.0018724086, y: 0.0002533596, z: -0.0075386786}
rotation: {x: 0.999981, y: -0.000000025788854, z: -0.000004175075, w: 0.006168336} rotation: {x: 0.999981, y: -0.000000025788854, z: -0.000004175074, w: 0.006168336}
scale: {x: 1, y: 0.99999994, z: 1.000678} scale: {x: 1, y: 0.99999994, z: 1.0006776}
- name: Thigh_Control_R - name: Thigh_Control_R
parentName: Armature parentName: Armature
position: {x: 0.00093339814, y: -0.006269274, z: -0.0039872816} position: {x: 0.0012845839, y: -0.006269274, z: -0.0039872816}
rotation: {x: 0.98892564, y: -0.000000008188669, z: 0.14841184, w: 1.5543122e-15} rotation: {x: 0.98892564, y: -0.000000008188669, z: 0.14841184, w: 1.5543122e-15}
scale: {x: 1, y: 1, z: 1.0000001} scale: {x: 1, y: 1, z: 1.0000001}
- name: UpperArm_Control_R - name: UpperArm_Control_R
parentName: Armature parentName: Armature
position: {x: 0.00085530936, y: -0.0039713676, z: 0.003075037} position: {x: 0.0034226924, y: -0.0039713676, z: 0.0025702473}
rotation: {x: 0.2692533, y: -0.6538369, z: 0.6538369, w: -0.2692533} rotation: {x: 0.26925328, y: -0.6538369, z: 0.6538369, w: -0.26925328}
scale: {x: 0.72619903, y: 0.99999976, z: 0.7314929} scale: {x: 0.99999994, y: 1, z: 1}
- name: Hand_R.001 - name: Hand_R.001
parentName: Armature parentName: Armature
position: {x: 0.0022795226, y: -0.00026142012, z: 0.0010587472} position: {x: 0.004653928, y: -0.0010747877, z: 0.000071166156}
rotation: {x: -0.000090681955, y: -0.7071068, z: 0.7071068, w: -0.000091596325} rotation: {x: -0.000090681955, y: -0.7071068, z: 0.7071068, w: -0.000091596325}
scale: {x: 0.48980606, y: 0.99999964, z: 0.9999998} scale: {x: 0.9999995, y: 0.99999964, z: 0.9999998}
- name: LookAt - name: LookAt
parentName: Armature parentName: Armature
position: {x: -0, y: -0.0037967255, z: 0.0062961215} position: {x: -0, y: -0.0037967255, z: 0.0019327133}
rotation: {x: 0.7071068, y: -0.00000008429373, z: -0.000000084293724, w: 0.7071068} rotation: {x: 0.7071068, y: -0.00000008429373, z: -0.000000084293724, w: 0.7071068}
scale: {x: 1, y: 0.9999998, z: 0.9999998} scale: {x: 1, y: 0.9999998, z: 0.9999998}
armTwist: 0.5 armTwist: 0.5

165
Assets/Objects/HumanAnimationControler.controller
View File

@@ -1,28 +1,13 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!206 &-7127493751781251651 --- !u!1102 &-4969741544625218604
BlendTree:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Blend Tree
m_Childs: []
m_BlendParameter: Blend
m_BlendParameterY: Blend
m_MinThreshold: 0
m_MaxThreshold: 1
m_UseAutomaticThresholds: 1
m_NormalizedBlendValues: 0
m_BlendType: 0
--- !u!1102 &-1129337770131920209
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Armature|Walk m_Name: Aim
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: [] m_Transitions: []
@@ -34,13 +19,39 @@ AnimatorState:
m_SpeedParameterActive: 0 m_SpeedParameterActive: 0
m_MirrorParameterActive: 0 m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0 m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0 m_TimeParameterActive: 1
m_Motion: {fileID: 8349542763059015795, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} m_Motion: {fileID: -3176884680461750752, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
m_Tag:
m_SpeedParameter: Time
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter: Time
--- !u!1102 &-781170557910458175
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Aim
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: 1
m_Motion: {fileID: -3176884680461750752, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
m_Tag: m_Tag:
m_SpeedParameter: m_SpeedParameter:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter: Time
--- !u!1107 &-29801462378204144 --- !u!1107 &-29801462378204144
AnimatorStateMachine: AnimatorStateMachine:
serializedVersion: 6 serializedVersion: 6
@@ -49,13 +60,7 @@ AnimatorStateMachine:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Base Layer m_Name: Base Layer
m_ChildStates: m_ChildStates: []
- serializedVersion: 1
m_State: {fileID: -1129337770131920209}
m_Position: {x: 240, y: 70, z: 0}
- serializedVersion: 1
m_State: {fileID: 1753614070743940096}
m_Position: {x: 130, y: 180, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@@ -65,7 +70,7 @@ AnimatorStateMachine:
m_EntryPosition: {x: 50, y: 120, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -1129337770131920209} m_DefaultState: {fileID: 0}
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -75,12 +80,18 @@ AnimatorController:
m_Name: HumanAnimationControler m_Name: HumanAnimationControler
serializedVersion: 5 serializedVersion: 5
m_AnimatorParameters: m_AnimatorParameters:
- m_Name: Time
m_Type: 1
m_DefaultFloat: 1
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: Blend - m_Name: Blend
m_Type: 1 m_Type: 1
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 0} m_Controller: {fileID: 9100000}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer
@@ -94,14 +105,38 @@ AnimatorController:
m_IKPass: 0 m_IKPass: 0
m_SyncedLayerAffectsTiming: 0 m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
--- !u!1102 &1753614070743940096 - serializedVersion: 5
m_Name: idle
m_StateMachine: {fileID: 6188539927546276906}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 1
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
- serializedVersion: 5
m_Name: yeet3
m_StateMachine: {fileID: 2359803421989368082}
m_Mask: {fileID: 31900000, guid: 6c0f24f42b987ce4884915e4f15bba46, type: 2}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 1
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &111108561234939883
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Blend Tree m_Name: New State
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: [] m_Transitions: []
@@ -114,9 +149,75 @@ AnimatorState:
m_MirrorParameterActive: 0 m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0 m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0 m_TimeParameterActive: 0
m_Motion: {fileID: -7127493751781251651} m_Motion: {fileID: -8945691123924629249, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
m_Tag: m_Tag:
m_SpeedParameter: m_SpeedParameter:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1107 &949450522252485443
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Aim
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -781170557910458175}
m_Position: {x: 230, 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: -781170557910458175}
--- !u!1107 &2359803421989368082
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: yeet3
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -4969741544625218604}
m_Position: {x: 320, y: 80, 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: -4969741544625218604}
--- !u!1107 &6188539927546276906
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: idle
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 111108561234939883}
m_Position: {x: 321.26492, y: 66.38924, 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: 111108561234939883}

11
Assets/Objects/HumanArms.mask Normal file
View File

@@ -0,0 +1,11 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!319 &31900000
AvatarMask:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: HumanArms
m_Mask: 00000000010000000100000000000000000000000100000001000000010000000100000000000000000000000100000001000000
m_Elements: []

8
Assets/Objects/HumanArms.mask.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6c0f24f42b987ce4884915e4f15bba46
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 31900000
userData:
assetBundleName:
assetBundleVariant:

67
Assets/Objects/HumanLegs.mask Normal file
View File

@@ -0,0 +1,67 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!319 &31900000
AvatarMask:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: HumanLegs
m_Mask: 01000000010000000000000001000000010000000000000000000000000000000000000001000000010000000000000000000000
m_Elements:
- m_Path:
m_Weight: 1
- m_Path: Armature
m_Weight: 1
- m_Path: Armature/Foot_Control_L
m_Weight: 1
- m_Path: Armature/Foot_Control_R
m_Weight: 1
- m_Path: Armature/Hand_L.001
m_Weight: 1
- m_Path: Armature/Hand_R.001
m_Weight: 1
- m_Path: Armature/Hip
m_Weight: 1
- m_Path: Armature/Hip/Abdomen
m_Weight: 1
- m_Path: Armature/Hip/Abdomen/Chest
m_Weight: 1
- m_Path: Armature/Hip/Abdomen/Chest/Head
m_Weight: 1
- m_Path: Armature/Hip/Abdomen/Chest/UpperArm_L
m_Weight: 1
- m_Path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L
m_Weight: 1
- m_Path: Armature/Hip/Abdomen/Chest/UpperArm_L/Forearm_L/Hand_L
m_Weight: 1
- m_Path: Armature/Hip/Abdomen/Chest/UpperArm_R
m_Weight: 1
- m_Path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R
m_Weight: 1
- m_Path: Armature/Hip/Abdomen/Chest/UpperArm_R/Forearm_R/Hand_R
m_Weight: 1
- m_Path: Armature/Hip/Thigh_L
m_Weight: 1
- m_Path: Armature/Hip/Thigh_L/Shin_L
m_Weight: 1
- m_Path: Armature/Hip/Thigh_L/Shin_L/Foot_L
m_Weight: 1
- m_Path: Armature/Hip/Thigh_R
m_Weight: 1
- m_Path: Armature/Hip/Thigh_R/Shin_R
m_Weight: 1
- m_Path: Armature/Hip/Thigh_R/Shin_R/Foot_R
m_Weight: 1
- m_Path: Armature/LookAt
m_Weight: 1
- m_Path: Armature/Thigh_Control_L
m_Weight: 1
- m_Path: Armature/Thigh_Control_R
m_Weight: 1
- m_Path: Armature/UpperArm_Control_L
m_Weight: 1
- m_Path: Armature/UpperArm_Control_R
m_Weight: 1
- m_Path: Cube
m_Weight: 1

8
Assets/Objects/HumanLegs.mask.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 260396a74121dac48aa1a8521a962289
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 31900000
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Prefabs.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 123289491df93c64a9a9d746addc9a62
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

112
Assets/Player.prefab → Assets/Prefabs/Player.prefab
View File

@@ -13,6 +13,7 @@ GameObject:
- component: {fileID: 6272346181302961294} - component: {fileID: 6272346181302961294}
- component: {fileID: 6272346181302961297} - component: {fileID: 6272346181302961297}
- component: {fileID: 3531617101327355807} - component: {fileID: 3531617101327355807}
- component: {fileID: 4705578737523903129}
m_Layer: 0 m_Layer: 0
m_Name: Player m_Name: Player
m_TagString: Player m_TagString: Player
@@ -31,6 +32,7 @@ Transform:
m_LocalPosition: {x: 0, y: 2.15, z: 0} m_LocalPosition: {x: 0, y: 2.15, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 8217141752490496735}
- {fileID: 2458562619286483438} - {fileID: 2458562619286483438}
- {fileID: 6272346182417644039} - {fileID: 6272346182417644039}
- {fileID: 223626088105882255} - {fileID: 223626088105882255}
@@ -73,7 +75,7 @@ MonoBehaviour:
neckStartAngle: 0 neckStartAngle: 0
maxCameraAngle: 90 maxCameraAngle: 90
minCameraAngle: -90 minCameraAngle: -90
neckLength: 0.2 neckLength: 0
mouseSmoothTime: 0 mouseSmoothTime: 0
lockCursor: 1 lockCursor: 1
walkSpeed: 6 walkSpeed: 6
@@ -84,10 +86,11 @@ MonoBehaviour:
gravity: -13 gravity: -13
jumpHeight: 1 jumpHeight: 1
groundCheck: {fileID: 6272346182417644039} groundCheck: {fileID: 6272346182417644039}
groundDistance: 0.3 groundDistance: 0.15
groundMask: groundMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 64 m_Bits: 64
playerAnimator: {fileID: 0}
isGrounded: 0 isGrounded: 0
--- !u!114 &6272346181302961297 --- !u!114 &6272346181302961297
MonoBehaviour: MonoBehaviour:
@@ -121,6 +124,21 @@ MonoBehaviour:
PrefabHashGenerator: Player PrefabHashGenerator: Player
AlwaysReplicateAsRoot: 0 AlwaysReplicateAsRoot: 0
DontDestroyWithOwner: 0 DontDestroyWithOwner: 0
--- !u!114 &4705578737523903129
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6272346181302961293}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e8d0727d5ae3244e3b569694d3912374, type: 3}
m_Name:
m_EditorClassIdentifier:
SendRate: 0.1
m_Animator: {fileID: 0}
m_TrackedParamFlags: 0
--- !u!1 &6272346181657429393 --- !u!1 &6272346181657429393
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -147,7 +165,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6272346181657429393} m_GameObject: {fileID: 6272346181657429393}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.3, z: 0} m_LocalPosition: {x: 0, y: 0.235, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 223626088105882255} m_Father: {fileID: 223626088105882255}
@@ -232,7 +250,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6272346181302961296} m_Father: {fileID: 6272346181302961296}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7697277603114630017 --- !u!1 &7697277603114630017
GameObject: GameObject:
@@ -263,7 +281,7 @@ Transform:
m_Children: m_Children:
- {fileID: 6272346181657429396} - {fileID: 6272346181657429396}
m_Father: {fileID: 6272346181302961296} m_Father: {fileID: 6272346181302961296}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8690889598169456425 --- !u!1 &8690889598169456425
GameObject: GameObject:
@@ -295,7 +313,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6272346181302961296} m_Father: {fileID: 6272346181302961296}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &390397068222218691 --- !u!33 &390397068222218691
MeshFilter: MeshFilter:
@@ -312,8 +330,8 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8690889598169456425} m_GameObject: {fileID: 8690889598169456425}
m_Enabled: 1 m_Enabled: 0
m_CastShadows: 1 m_CastShadows: 0
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1
m_StaticShadowCaster: 0 m_StaticShadowCaster: 0
@@ -347,3 +365,81 @@ MeshRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!1001 &8467787226490041652
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6272346181302961296}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalScale.z
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_Name
value: Human
objectReference: {fileID: 0}
- target: {fileID: 5866666021909216657, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: bcfd120671431f84097ebc1045370f76, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
--- !u!4 &8217141752490496735 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3}
m_PrefabInstance: {fileID: 8467787226490041652}
m_PrefabAsset: {fileID: 0}

0
Assets/Player.prefab.meta → Assets/Prefabs/Player.prefab.meta
View File

16
Assets/Scenes/TestScene.unity
View File

@@ -1080,18 +1080,6 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Player value: Player
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6272346181302961294, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3}
propertyPath: speedUpVal
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 6272346181302961294, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3}
propertyPath: sprintSpeed
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6272346181302961294, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3}
propertyPath: groundDistance
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 6272346181302961296, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3} - target: {fileID: 6272346181302961296, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6 value: 6
@@ -1136,10 +1124,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6272346181657429395, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3}
propertyPath: near clip plane
value: 0.15
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2935eead9a075fd489d6a6dc273a5999, type: 3}
--- !u!1 &1960893053 --- !u!1 &1960893053

10
Assets/Scripts/Player/PlayerController.cs
View File

@@ -34,6 +34,11 @@ public class PlayerController : MonoBehaviour
[SerializeField] private float groundDistance = 0.4f; [SerializeField] private float groundDistance = 0.4f;
[SerializeField] private LayerMask groundMask; [SerializeField] private LayerMask groundMask;
[Header("Animations")]
[SerializeField]private Animator playerAnimator;
private float animationVal = 0.0f;
float f = 0.5f;
public bool isGrounded; public bool isGrounded;
private float viewPitch = 0f; private float viewPitch = 0f;
private float velocityY = 0.0f; private float velocityY = 0.0f;
@@ -49,6 +54,7 @@ public class PlayerController : MonoBehaviour
private void Start() private void Start()
{ {
playerAnimator = GetComponentInChildren<Animator>();
controller = GetComponent<CharacterController>(); controller = GetComponent<CharacterController>();
if (lockCursor) if (lockCursor)
{ {
@@ -57,11 +63,15 @@ public class PlayerController : MonoBehaviour
} }
//Position the camera at the height of the neck (set by the neckLength) //Position the camera at the height of the neck (set by the neckLength)
neckLength = Vector3.Distance(playerCamera.position, playerNeck.position);
playerCamera.position = playerNeck.position; playerCamera.position = playerNeck.position;
playerCamera.position += playerNeck.up * neckLength; playerCamera.position += playerNeck.up * neckLength;
} }
private void Update() private void Update()
{ {
f = (viewPitch + 90f) / 180f;
playerAnimator.SetFloat("Time", 1-f);
UpdateMouseLook(); UpdateMouseLook();
Grounded(); Grounded();
UpdateMovement(); UpdateMovement();