dushes/Run-and-capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Anim fixes

Browse Source
This commit is contained in:
AlexMamontow 2021-09-14 15:53:19 +03:00
parent 404a942acd
commit 7b413d4f54
9 changed files with 184521 additions and 28487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73428
Assets/Animation/Character/MJ2.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/Animation/Character/MJ2.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9dd3a0a7b64c33c45b2ff87106004a95
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

56558
Assets/Animation/Character/MoveJump.anim
View File

File diff suppressed because it is too large Load Diff

82500
Assets/Animation/Character/MoveJump_Alt.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/Animation/Character/MoveJump_Alt.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ef0ece59ba174f54580bf64daee37e25
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

140
Assets/Animation/Character/TestController.controller
View File

@ -1,5 +1,33 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-9016822592688904379
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: isMoving
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: Move
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 9222683897014232595}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.53125
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-8830492758554575506
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -192,6 +220,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-4341192428833849287
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: Move
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 9222683897014232595}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-2148098699553998022
AnimatorState:
serializedVersion: 6
@ -219,6 +272,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-2134087441845793314
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: 7761001461743940837}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-1814359555783770735
AnimatorStateMachine:
serializedVersion: 6
@ -242,19 +317,23 @@ AnimatorStateMachine:
m_Position: {x: 700, y: 50, z: 0}
- serializedVersion: 1
m_State: {fileID: 5596697925261898950}
m_Position: {x: 360, y: 240, z: 0}
m_Position: {x: 280, y: 300, z: 0}
- serializedVersion: 1
m_State: {fileID: 4786967278910117454}
m_Position: {x: 630, y: 220, z: 0}
- serializedVersion: 1
m_State: {fileID: -5598420769396632500}
m_Position: {x: 204.32285, y: -106.826416, z: 0}
- serializedVersion: 1
m_State: {fileID: 9222683897014232595}
m_Position: {x: 490, y: 330, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_AnyStateTransitions:
- {fileID: -4341192428833849287}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_AnyStatePosition: {x: 370, y: 450, z: 0}
m_EntryPosition: {x: 420, y: -100, z: 0}
m_ExitPosition: {x: 790, y: -90, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
@ -390,7 +469,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.06
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.53125
m_HasExitTime: 0
@ -442,6 +521,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &3194042182353462480
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: isMoving
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7761001461743940837}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.05
m_TransitionOffset: 0
m_ExitTime: 0.53125
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &3829735724663763854
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -678,6 +782,7 @@ AnimatorState:
- {fileID: 1079191915755825572}
- {fileID: -7864811333266388210}
- {fileID: 9203944948200205386}
- {fileID: -9016822592688904379}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -740,3 +845,30 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &9222683897014232595
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: AlternativeMovement
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 3194042182353462480}
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: 9dd3a0a7b64c33c45b2ff87106004a95, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

350
Assets/Scenes/Level_1.unity
View File

File diff suppressed because it is too large Load Diff

14
Assets/Scripts/AnimationController.cs
View File

@ -26,15 +26,19 @@ public class AnimationController : MonoBehaviour
string activationTrigger = "";
switch(newState)
{
/*case CharacterState.Move:
activationTrigger = "Move";
break;*/
case CharacterState.Move:
_characterAnimator.SetBool("isMoving", true);
activationTrigger = "Move";
break;
/*case CharacterState.Move:
_characterAnimator.SetBool("isMoving", true);
return;
case CharacterState.Idle:
_characterAnimator.SetBool("isMoving", false);
return;*/
if (CustomInput.leftInput.magnitude < 0.3f)
{
_characterAnimator.SetBool("isMoving", false);
}
break;
case CharacterState.Action:
activationTrigger = GetActionName(_playerState);
break;

2
ProjectSettings/ProjectSettings.asset
View File

@ -127,7 +127,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.30
bundleVersion: 0.34
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0