zenayi/Scampz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix idle animation

Browse Source
This commit is contained in:
Zenny
2022-08-19 12:35:27 -07:00
parent c4ecdf5ce9
commit 4e39c75095
3 changed files with 46 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
Assets/Player/Model/FBXModel.fbx.meta
View File

@@ -47,64 +47,6 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: Armature|walk (1)
takeName: Armature|walk
internalID: 0
firstFrame: 0
lastFrame: 109
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: Armature|Shader NodetreeAction
takeName: Armature|Shader NodetreeAction
internalID: 0
firstFrame: 0
lastFrame: 1
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
- serializedVersion: 16
name: Armature|still
takeName: Armature|still
@@ -159,41 +101,77 @@ ModelImporter:
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events:
- time: 0.05680478
- time: 0.027722007
functionName: Step
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0.23307759
- time: 0.20399483
functionName: Step
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0.4022537
- time: 0.37317088
functionName: Step
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0.5671016
- time: 0.53801876
functionName: Step
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0.72520363
- time: 0.6961208
functionName: Step
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0.8990031
functionName: Step
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
- serializedVersion: 16
name: Armature|Idle
takeName: Armature|Idle
internalID: 0
firstFrame: 0
lastFrame: 79
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}

36
Assets/Player/Model/PlayerModel.controller
View File

@@ -73,10 +73,10 @@ AnimatorController:
m_AnimatorParameters:
- m_Name: Speed
m_Type: 1
m_DefaultFloat: 0
m_DefaultFloat: 1
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -90,32 +90,6 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &1389654506011198022
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Walk Cycle
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: 7400000, guid: b4d13eea62c19834583aef8c4a4b8341, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &3503281327399106223
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -156,9 +130,6 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 6887978280577128434}
m_Position: {x: 260, y: 270, z: 0}
- serializedVersion: 1
m_State: {fileID: 1389654506011198022}
m_Position: {x: 295, y: 335, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -233,8 +204,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: -3017172422119994572}
m_StateMachineBehaviours:
- {fileID: -6818889654973240792}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1

5
Assets/Player/Player.prefab
View File

@@ -1076,9 +1076,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 05cf47d54a6d28d47b5d9b54e95d2751, type: 3}
m_Name:
m_EditorClassIdentifier:
Speed: 12.5
Speed: 6
RotateSpeed: 720
gravity: 9.8
--- !u!114 &9124306867817734687
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1118,7 +1117,7 @@ AudioSource:
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0