From 7137144cf388be8eaccf1d5842b8e34c95797fa6 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Thu, 14 Dec 2023 22:38:51 +0000
Subject: [PATCH] Changed animation handling
---
Assets/Characters/Player/AC_Player.controller | 19 +---
Assets/Characters/Player/rotor_stop.anim | 36 ++++++++-
Assets/Characters/Player/rotor_start.anim | 5 -
Assets/Characters/Player/rotor_fly.anim | 6
Assets/Characters/Player/AC_Flying.controller | 144 ++++++++++++++++++++++++++++++++++-
5 files changed, 178 insertions(+), 32 deletions(-)
diff --git a/Assets/Characters/Player/AC_Flying.controller b/Assets/Characters/Player/AC_Flying.controller
index 268cc37..a7e4569 100644
--- a/Assets/Characters/Player/AC_Flying.controller
+++ b/Assets/Characters/Player/AC_Flying.controller
@@ -31,6 +31,31 @@
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -4363231531035811044}
+--- !u!1101 &-5613851916980422824
+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: IsFlying
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -4692003973031684304}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 1
+ m_HasExitTime: 1
+ m_HasFixedDuration: 0
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &-4692003973031684304
AnimatorState:
serializedVersion: 6
@@ -39,9 +64,11 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: rotor_stop
- m_Speed: 1
+ m_Speed: 5
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: 1512958023872308249}
+ - {fileID: -1339749953466549265}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -51,7 +78,7 @@
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 0}
+ m_Motion: {fileID: 7400000, guid: 2089a965dc1b72949bfcd5fa5d2aa655, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -100,10 +127,63 @@
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
- m_ExitTime: 1
+ m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-1339749953466549265
+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: IsFlying
+ m_EventTreshold: 0
+ - m_ConditionMode: 2
+ m_ConditionEvent: IsGrounded
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 706672698126450382}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 1
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-284580581868711020
+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: IsFlying
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -4692003973031684304}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
@@ -148,10 +228,11 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: rotor_start
- m_Speed: 1
+ m_Speed: 5
m_CycleOffset: 0
m_Transitions:
- {fileID: -3256331238631696850}
+ - {fileID: -284580581868711020}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -167,6 +248,53 @@
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &1512958023872308249
+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: -4363231531035811044}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 1
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &4153286522409613419
+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: IsGrounded
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -4692003973031684304}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 1
+ m_HasExitTime: 1
+ m_HasFixedDuration: 0
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1101 &7011382255060591458
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -203,9 +331,11 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: rotor_fly
- m_Speed: 1
+ m_Speed: 5
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: -5613851916980422824}
+ - {fileID: 4153286522409613419}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
diff --git a/Assets/Characters/Player/AC_Player.controller b/Assets/Characters/Player/AC_Player.controller
index 9da6a87..26c2159 100644
--- a/Assets/Characters/Player/AC_Player.controller
+++ b/Assets/Characters/Player/AC_Player.controller
@@ -9,9 +9,6 @@
m_Name:
m_Conditions:
- m_ConditionMode: 2
- m_ConditionEvent: IsMoving
- m_EventTreshold: 0
- - m_ConditionMode: 2
m_ConditionEvent: IsFlying
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
@@ -66,9 +63,6 @@
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsMoving
- m_EventTreshold: 0
- - m_ConditionMode: 2
- m_ConditionEvent: IsFlying
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 68305137226140118}
@@ -126,7 +120,7 @@
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
- m_TransitionDuration: 0
+ m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
@@ -148,19 +142,19 @@
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 0}
+ m_Controller: {fileID: 9100000}
- m_Name: IsFlying
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 0}
+ m_Controller: {fileID: 9100000}
- m_Name: IsGrounded
m_Type: 4
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
@@ -238,11 +232,8 @@
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- - m_ConditionMode: 2
+ - m_ConditionMode: 1
m_ConditionEvent: IsGrounded
- m_EventTreshold: 0
- - m_ConditionMode: 2
- m_ConditionEvent: IsFlying
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 68305137226140118}
diff --git a/Assets/Characters/Player/rotor_fly.anim b/Assets/Characters/Player/rotor_fly.anim
index 09a8aa7..08c4120 100644
--- a/Assets/Characters/Player/rotor_fly.anim
+++ b/Assets/Characters/Player/rotor_fly.anim
@@ -22,14 +22,14 @@
curve:
- time: 0
value: {fileID: -1782493911, guid: 7551401a93967bf45af3ab223a74d737, type: 3}
- - time: 0.083333336
+ - time: 0.5
value: {fileID: 935882150, guid: 7551401a93967bf45af3ab223a74d737, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
flags: 2
- m_SampleRate: 12
+ m_SampleRate: 2
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
@@ -53,7 +53,7 @@
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.16666667
+ m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
diff --git a/Assets/Characters/Player/rotor_start.anim b/Assets/Characters/Player/rotor_start.anim
index 48ca1f3..3e40309 100644
--- a/Assets/Characters/Player/rotor_start.anim
+++ b/Assets/Characters/Player/rotor_start.anim
@@ -28,8 +28,6 @@
value: {fileID: -524974412, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
- time: 0.75
value: {fileID: 43499823, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
- - time: 1.25
- value: {fileID: -140900564, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
attribute: m_Sprite
path:
classID: 212
@@ -56,13 +54,12 @@
- {fileID: -140900564, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
- {fileID: -524974412, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
- {fileID: 43499823, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
- - {fileID: -140900564, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1.5
+ m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
diff --git a/Assets/Characters/Player/rotor_stop.anim b/Assets/Characters/Player/rotor_stop.anim
index 8744d71..ea7e99f 100644
--- a/Assets/Characters/Player/rotor_stop.anim
+++ b/Assets/Characters/Player/rotor_stop.anim
@@ -17,15 +17,43 @@
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
- m_PPtrCurves: []
- m_SampleRate: 60
+ m_PPtrCurves:
+ - serializedVersion: 2
+ curve:
+ - time: 0
+ value: {fileID: 43499823, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
+ - time: 0.25
+ value: {fileID: -524974412, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
+ - time: 0.5
+ value: {fileID: -140900564, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
+ - time: 0.75
+ value: {fileID: 1804080735, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ flags: 2
+ m_SampleRate: 4
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ isIntCurve: 0
+ isSerializeReferenceCurve: 0
+ pptrCurveMapping:
+ - {fileID: 43499823, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
+ - {fileID: -524974412, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
+ - {fileID: -140900564, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
+ - {fileID: 1804080735, guid: 27a3c1de00b16624da61c799b9a79d42, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
--
Gitblit v1.9.3