gjcampbell/Super-Robo-Squad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaked animations so the animation sequence during a fight is very tightly knit

Browse Source
This commit is contained in:
Gregory Campbell
2020-07-22 20:20:16 -04:00
parent 24428ff312
commit 95eabfac13
5 changed files with 14 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Animations/Enemy Attack.controller
+4 -27
View File
@@ -12,7 +12,6 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: -4540420866084089111}
- {fileID: 5026858282347151247}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -70,10 +69,10 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@@ -92,7 +91,7 @@ AnimatorController:
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
@@ -123,7 +122,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999976
m_TransitionDuration: 0
m_TransitionOffset: 0.0030431175
m_ExitTime: 0.7242597
m_HasExitTime: 1
@@ -158,25 +157,3 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &5026858282347151247
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: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
Assets/Animations/Hit Effect On Enemy.controller
+2 -2
View File
@@ -59,14 +59,14 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -5157466714835473944}
m_Position: {x: 330, y: 70, z: 0}
m_Position: {x: 290, y: 90, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 80, y: 150, z: 0}
m_EntryPosition: {x: 60, y: 90, z: 0}
m_ExitPosition: {x: 350, y: -10, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -5157466714835473944}
Assets/Animations/Hit Effect On Party.controller
+1 -1
View File
@@ -37,7 +37,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -2395946064351981642}
m_Position: {x: 200, y: 0, z: 0}
m_Position: {x: 310, y: 120, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Assets/Animations/Party Member Attack.controller
+3 -26
View File
@@ -17,7 +17,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999994
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.9970888
m_HasExitTime: 1
@@ -25,28 +25,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3706022438014928763
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: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-2218011393197299101
AnimatorStateMachine:
serializedVersion: 5
@@ -84,7 +62,6 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 8630730884189380663}
- {fileID: -3706022438014928763}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -172,10 +149,10 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Assets/Scripts/GMScript.cs
+4 -5
View File
@@ -583,8 +583,7 @@ public class GMScript : MonoBehaviour
audioPlayer.PlayOneShot(SoundEffects[2]);
yield return new WaitForSeconds(
attack.GetCurrentAnimatorStateInfo(0).length
+attack.GetCurrentAnimatorStateInfo(0).normalizedTime);
attack.GetCurrentAnimatorStateInfo(0).length*0.45f);
attack.SetTrigger("AttackTrigger");
@@ -1089,10 +1088,10 @@ public class GMScript : MonoBehaviour
audioPlayer.PlayOneShot(SoundEffects[2]);
yield return new WaitForSeconds(
enemyAttackAnim.GetCurrentAnimatorStateInfo(0).length
+enemyAttackAnim.GetCurrentAnimatorStateInfo(0).normalizedTime);
enemyAttackAnim.GetCurrentAnimatorStateInfo(0).length*0.45f);
//enemyAttackAnim.SetTrigger("AttackTrigger");
enemyAttackAnim.SetTrigger("AttackTrigger");
}
IEnumerator PreAttackBuffAnimEnemy()