diff --git a/Assets/Animations/World Entity Controllers/Base Entity Controllers/Creature Animator.controller b/Assets/Animations/World Entity Controllers/Base Entity Controllers/Creature Animator.controller index 6eca3ff5..182b300a 100644 --- a/Assets/Animations/World Entity Controllers/Base Entity Controllers/Creature Animator.controller +++ b/Assets/Animations/World Entity Controllers/Base Entity Controllers/Creature Animator.controller @@ -194,73 +194,79 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Strafe m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: Forward + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} - m_Name: Casted m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Casting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Grounded m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: IsDead m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Resurrecting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Dying m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: WoundedCrit m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Wound m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Emote Trigger m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Emote m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Body diff --git a/Assets/Animations/World Entity Controllers/Base Entity Controllers/Default Unit Animator.controller b/Assets/Animations/World Entity Controllers/Base Entity Controllers/Default Unit Animator.controller index fd406ede..46096a93 100644 --- a/Assets/Animations/World Entity Controllers/Base Entity Controllers/Default Unit Animator.controller +++ b/Assets/Animations/World Entity Controllers/Base Entity Controllers/Default Unit Animator.controller @@ -66,73 +66,79 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Strafe m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: Forward + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} - m_Name: Casted m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Casting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Grounded m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: IsDead m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Resurrecting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Dying m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: WoundedCrit m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Wound m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Emote Trigger m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Emote m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Body diff --git a/Assets/Animations/World Entity Controllers/Base Entity Controllers/Druid Cat Animator.controller b/Assets/Animations/World Entity Controllers/Base Entity Controllers/Druid Cat Animator.controller index 615d9c79..dcbd725f 100644 --- a/Assets/Animations/World Entity Controllers/Base Entity Controllers/Druid Cat Animator.controller +++ b/Assets/Animations/World Entity Controllers/Base Entity Controllers/Druid Cat Animator.controller @@ -270,7 +270,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -347,12 +347,12 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 1 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 --- !u!1102 &-2836361486855796504 @@ -453,12 +453,12 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.1 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 1 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 --- !u!114 &-2076129465936047717 @@ -678,109 +678,115 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Strafe m_Type: 1 m_DefaultFloat: 0.5 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} + - m_Name: Forward + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} - m_Name: Emote m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsDead m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsInstaCasting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsInstaCastingLegs m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: InEmoteBody m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: HasRunBody m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: HasRunLegs m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: HasFullState m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Casting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Grounded m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Resurrecting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Dying m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: WoundedCrit m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Casted m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Wound m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Emote Trigger m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Full Body Default @@ -1109,10 +1115,10 @@ AnimatorStateMachine: m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 1101000011506881540} + - {fileID: 1148797081232457844} - {fileID: 5068154577177676722} - {fileID: 6423971666041168755} - {fileID: 5355998432088661956} - - {fileID: 1148797081232457844} m_EntryTransitions: - {fileID: -7514092696429189508} - {fileID: 9221649508509234383} @@ -1307,12 +1313,12 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.2 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 --- !u!1101 &1101000010488442190 @@ -1388,7 +1394,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.35466385 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 0.8554782 m_HasExitTime: 0 @@ -1816,10 +1822,10 @@ AnimatorStateMachine: m_Position: {x: 250, y: 50, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: + - {fileID: 5136888004085538151} - {fileID: 1101000011045457560} - {fileID: -4726216032819895515} - {fileID: -3420134222173728388} - - {fileID: 5136888004085538151} m_EntryTransitions: - {fileID: 8044043954434395893} m_StateMachineTransitions: {} @@ -2043,9 +2049,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0.1 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 - m_ExitTime: 0.9 + m_ExitTime: 1 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -2160,12 +2166,12 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.1 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 1 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 --- !u!1101 &4460598015986965190 @@ -2266,12 +2272,12 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.1 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 1 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 --- !u!1101 &5355998432088661956 @@ -2305,7 +2311,7 @@ AnimatorStateTransition: m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 1 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 --- !u!1101 &5786259370285234145 @@ -2501,7 +2507,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.05 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 diff --git a/Assets/Animations/World Entity Controllers/Base Entity Controllers/Ragnaros Animator.controller b/Assets/Animations/World Entity Controllers/Base Entity Controllers/Ragnaros Animator.controller index 37a2dc40..6b570041 100644 --- a/Assets/Animations/World Entity Controllers/Base Entity Controllers/Ragnaros Animator.controller +++ b/Assets/Animations/World Entity Controllers/Base Entity Controllers/Ragnaros Animator.controller @@ -194,73 +194,79 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Strafe m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: Forward + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} - m_Name: Casted m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Casting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Grounded m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: IsDead m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Resurrecting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Dying m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: WoundedCrit m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Wound m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Emote Trigger m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Emote m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Body diff --git a/Assets/Animations/World Entity Controllers/Base Entity Controllers/Unit Animator.controller b/Assets/Animations/World Entity Controllers/Base Entity Controllers/Unit Animator.controller index 46474319..f405cb2e 100644 --- a/Assets/Animations/World Entity Controllers/Base Entity Controllers/Unit Animator.controller +++ b/Assets/Animations/World Entity Controllers/Base Entity Controllers/Unit Animator.controller @@ -655,7 +655,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.35466385 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 0.8554782 m_HasExitTime: 0 @@ -911,12 +911,12 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.1 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 1 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 --- !u!1101 &-5469080741142739015 @@ -1006,12 +1006,12 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.1 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 1 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 --- !u!1109 &-4978865350472792964 @@ -1057,12 +1057,12 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 1 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 --- !u!1109 &-4721510779590273142 @@ -1224,12 +1224,12 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.1 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 1 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 --- !u!1102 &-4130733810256749530 @@ -2258,6 +2258,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: Forward + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} - m_Name: Emote m_Type: 3 m_DefaultFloat: 0 @@ -2982,12 +2988,12 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.2 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 --- !u!1102 &912174740539705172 @@ -3384,10 +3390,10 @@ AnimatorStateMachine: m_Position: {x: 30, y: 0, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: + - {fileID: 4560311006423888537} - {fileID: -4925976848063193894} - {fileID: 4751033642131801129} - {fileID: -6319631299104102410} - - {fileID: 4560311006423888537} m_EntryTransitions: - {fileID: -6209667377663401641} m_StateMachineTransitions: {} @@ -4054,7 +4060,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.1 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 1 m_HasExitTime: 0 @@ -4433,7 +4439,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -4703,7 +4709,7 @@ AnimatorStateTransition: m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 1 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 --- !u!1109 &5378459402177768408 @@ -4764,9 +4770,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0.1 + m_TransitionDuration: 0.15 m_TransitionOffset: 0 - m_ExitTime: 0.9 + m_ExitTime: 1 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -5238,7 +5244,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.05 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 diff --git a/Assets/Animations/World Entity Controllers/Base Entity Controllers/World Entity Animator.controller b/Assets/Animations/World Entity Controllers/Base Entity Controllers/World Entity Animator.controller index bcba96f4..06a3c0ce 100644 --- a/Assets/Animations/World Entity Controllers/Base Entity Controllers/World Entity Animator.controller +++ b/Assets/Animations/World Entity Controllers/Base Entity Controllers/World Entity Animator.controller @@ -508,79 +508,85 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Strafe m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: Forward + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} - m_Name: Casted m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Casting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Grounded m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: IsDead m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Resurrecting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Dying m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: WoundIndex m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: WoundedCrit m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Wound m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Emote Trigger m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Emote m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Prefabs/Unit/Models/Druid Cat.prefab b/Assets/Prefabs/Unit/Models/Druid Cat.prefab index ab50f9fb..50bad728 100644 --- a/Assets/Prefabs/Unit/Models/Druid Cat.prefab +++ b/Assets/Prefabs/Unit/Models/Druid Cat.prefab @@ -220,10 +220,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: targetAnimator: {fileID: 724169619782448581} - targetBone: {fileID: 5614467091080765101} + targetBone: {fileID: 5085787027773180006} parameterRange: {x: 0, y: 1} - maxRotation: {x: 0, y: 45, z: 0} - parameterTarget: Strafe + maxRotation: {x: 0, y: 90, z: 0} + attackParam: IsInstaCasting + forwardParam: Forward + strafeParam: Strafe + overrideRotation: 1 --- !u!1 &6148578231299482095 GameObject: m_ObjectHideFlags: 0 @@ -951,12 +954,6 @@ Animator: type: 3} m_PrefabInstance: {fileID: 2448959160512820133} m_PrefabAsset: {fileID: 0} ---- !u!4 &5614467091080765101 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7788671484891983112, guid: 99922968ab6c8994780ce0c492470b54, - type: 3} - m_PrefabInstance: {fileID: 2448959160512820133} - m_PrefabAsset: {fileID: 0} --- !u!4 &8584255264953176785 stripped Transform: m_CorrespondingSourceObject: {fileID: 6259183036974342516, guid: 99922968ab6c8994780ce0c492470b54, diff --git a/Assets/Prefabs/Unit/Models/Mage.prefab b/Assets/Prefabs/Unit/Models/Mage.prefab index 3f939092..dd07e895 100644 --- a/Assets/Prefabs/Unit/Models/Mage.prefab +++ b/Assets/Prefabs/Unit/Models/Mage.prefab @@ -162,8 +162,31 @@ MonoBehaviour: targetAnimator: {fileID: 4912303732082699722} targetBone: {fileID: 4912303732073137064} parameterRange: {x: 0, y: 1} - maxRotation: {x: 0, y: 45, z: 0} - parameterTarget: Strafe + maxRotation: {x: 0, y: 60, z: 0} + attackParam: IsInstaCasting + forwardParam: Forward + strafeParam: Strafe + overrideRotation: 0 +--- !u!114 &3885398980776572891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4912303732073176956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d48023487fb778847bebedbce0a8cb9b, type: 3} + m_Name: + m_EditorClassIdentifier: + targetAnimator: {fileID: 4912303732082699722} + targetBone: {fileID: 5085787027773180006} + parameterRange: {x: 0, y: 1} + maxRotation: {x: 0, y: 20, z: 0} + attackParam: IsInstaCasting + forwardParam: Forward + strafeParam: Strafe + overrideRotation: 1 --- !u!1 &4997457317228204756 GameObject: m_ObjectHideFlags: 0 @@ -795,6 +818,42 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -43.41362 objectReference: {fileID: 0} + - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -5.773707 + objectReference: {fileID: 0} + - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -1.6384597 + objectReference: {fileID: 0} + - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.912625 + objectReference: {fileID: 0} + - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalPosition.x + value: -0.0000017769635 + objectReference: {fileID: 0} + - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalPosition.z + value: -0.0000002849847 + objectReference: {fileID: 0} - target: {fileID: 400156, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -1.920814 @@ -963,6 +1022,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -14.899305 objectReference: {fileID: 0} + - target: {fileID: 400178, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 4.8056483 + objectReference: {fileID: 0} + - target: {fileID: 400178, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 3.8928576 + objectReference: {fileID: 0} + - target: {fileID: 400178, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -59.37735 + objectReference: {fileID: 0} - target: {fileID: 400176, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -0.09134228 @@ -975,41 +1046,17 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.12559183 objectReference: {fileID: 0} - - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400244, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -5.773707 + value: -4.5666213 objectReference: {fileID: 0} - - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400244, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -1.6384597 + value: -2.0112474 objectReference: {fileID: 0} - - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400244, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 15.912625 - objectReference: {fileID: 0} - - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalPosition.x - value: -0.0000017769635 - objectReference: {fileID: 0} - - target: {fileID: 400130, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalPosition.z - value: -0.0000002849847 + value: 4.7545404 objectReference: {fileID: 0} - target: {fileID: 400202, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1023,6 +1070,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -0.93062216 objectReference: {fileID: 0} + - target: {fileID: 400200, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 17.248714 + objectReference: {fileID: 0} + - target: {fileID: 400200, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -1.2856544 + objectReference: {fileID: 0} + - target: {fileID: 400200, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -26.18657 + objectReference: {fileID: 0} - target: {fileID: 400204, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 1.1820438 @@ -1071,6 +1130,66 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.14370237 objectReference: {fileID: 0} + - target: {fileID: 400222, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 10.57513 + objectReference: {fileID: 0} + - target: {fileID: 400222, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 4.1495295 + objectReference: {fileID: 0} + - target: {fileID: 400222, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -54.82915 + objectReference: {fileID: 0} + - target: {fileID: 400122, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.0139498105 + objectReference: {fileID: 0} + - target: {fileID: 400122, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.20982644 + objectReference: {fileID: 0} + - target: {fileID: 400122, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.021007959 + objectReference: {fileID: 0} + - target: {fileID: 400126, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 7.937762 + objectReference: {fileID: 0} + - target: {fileID: 400126, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -8.220819 + objectReference: {fileID: 0} + - target: {fileID: 400126, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 100.04609 + objectReference: {fileID: 0} + - target: {fileID: 400124, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -1.6656603 + objectReference: {fileID: 0} + - target: {fileID: 400124, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 4.292015 + objectReference: {fileID: 0} + - target: {fileID: 400124, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 42.408436 + objectReference: {fileID: 0} + - target: {fileID: 400118, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 11.310474 + objectReference: {fileID: 0} + - target: {fileID: 400118, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 11.827376 + objectReference: {fileID: 0} + - target: {fileID: 400118, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 2.2458234 + objectReference: {fileID: 0} - target: {fileID: 400298, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -0.3772821 @@ -1299,17 +1418,29 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -1.0649216 objectReference: {fileID: 0} - - target: {fileID: 400178, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400128, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 4.8056483 + value: 0.13543113 objectReference: {fileID: 0} - - target: {fileID: 400178, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400128, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 3.8928576 + value: -2.2315614 objectReference: {fileID: 0} - - target: {fileID: 400178, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400128, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -59.37735 + value: -0.22999205 + objectReference: {fileID: 0} + - target: {fileID: 400132, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -7.707337 + objectReference: {fileID: 0} + - target: {fileID: 400132, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -2.8028326 + objectReference: {fileID: 0} + - target: {fileID: 400132, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 14.969284 objectReference: {fileID: 0} - target: {fileID: 400234, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1475,30 +1606,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -13.67067 objectReference: {fileID: 0} - - target: {fileID: 400244, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -4.5666213 - objectReference: {fileID: 0} - - target: {fileID: 400244, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -2.0112474 - objectReference: {fileID: 0} - - target: {fileID: 400244, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 4.7545404 - objectReference: {fileID: 0} - - target: {fileID: 400200, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 17.248714 - objectReference: {fileID: 0} - - target: {fileID: 400200, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -1.2856544 - objectReference: {fileID: 0} - - target: {fileID: 400200, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -26.18657 - objectReference: {fileID: 0} - target: {fileID: 400218, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -12.464435 @@ -1523,18 +1630,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -13.674537 objectReference: {fileID: 0} - - target: {fileID: 400222, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 10.57513 - objectReference: {fileID: 0} - - target: {fileID: 400222, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 4.1495295 - objectReference: {fileID: 0} - - target: {fileID: 400222, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -54.82915 - objectReference: {fileID: 0} - target: {fileID: 400220, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -0.6338995 @@ -1727,54 +1822,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 4.991151 objectReference: {fileID: 0} - - target: {fileID: 400122, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -0.0139498105 - objectReference: {fileID: 0} - - target: {fileID: 400122, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.20982644 - objectReference: {fileID: 0} - - target: {fileID: 400122, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -0.021007959 - objectReference: {fileID: 0} - - target: {fileID: 400126, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 7.937762 - objectReference: {fileID: 0} - - target: {fileID: 400126, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -8.220819 - objectReference: {fileID: 0} - - target: {fileID: 400126, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 100.04609 - objectReference: {fileID: 0} - - target: {fileID: 400124, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -1.6656603 - objectReference: {fileID: 0} - - target: {fileID: 400124, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 4.292015 - objectReference: {fileID: 0} - - target: {fileID: 400124, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 42.408436 - objectReference: {fileID: 0} - - target: {fileID: 400118, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 11.310474 - objectReference: {fileID: 0} - - target: {fileID: 400118, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 11.827376 - objectReference: {fileID: 0} - - target: {fileID: 400118, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 2.2458234 - objectReference: {fileID: 0} - target: {fileID: 400072, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -9.509879 @@ -1847,29 +1894,29 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -3.8740268 objectReference: {fileID: 0} - - target: {fileID: 400128, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400138, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0.13543113 + value: 21.791222 objectReference: {fileID: 0} - - target: {fileID: 400128, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400138, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -2.2315614 + value: -3.4950984 objectReference: {fileID: 0} - - target: {fileID: 400128, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400138, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0.22999205 + value: -22.201538 objectReference: {fileID: 0} - - target: {fileID: 400132, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400146, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -7.707337 + value: -3.6661034 objectReference: {fileID: 0} - - target: {fileID: 400132, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400146, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -2.8028326 + value: 3.6828275 objectReference: {fileID: 0} - - target: {fileID: 400132, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400146, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 14.969284 + value: 44.76208 objectReference: {fileID: 0} - target: {fileID: 400106, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1919,29 +1966,29 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 30.476439 objectReference: {fileID: 0} - - target: {fileID: 400138, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400160, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 21.791222 + value: -6.0035615 objectReference: {fileID: 0} - - target: {fileID: 400138, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400160, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -3.4950984 + value: -2.2275605 objectReference: {fileID: 0} - - target: {fileID: 400138, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400160, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -22.201538 + value: 24.725641 objectReference: {fileID: 0} - - target: {fileID: 400146, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400158, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -3.6661034 + value: -9.223981 objectReference: {fileID: 0} - - target: {fileID: 400146, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400158, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 3.6828275 + value: 4.6187797 objectReference: {fileID: 0} - - target: {fileID: 400146, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400158, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 44.76208 + value: -33.68113 objectReference: {fileID: 0} - target: {fileID: 400108, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1955,29 +2002,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 22.773119 objectReference: {fileID: 0} - - target: {fileID: 400160, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -6.0035615 - objectReference: {fileID: 0} - - target: {fileID: 400160, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -2.2275605 - objectReference: {fileID: 0} - - target: {fileID: 400160, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400170, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 24.725641 - objectReference: {fileID: 0} - - target: {fileID: 400158, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -9.223981 - objectReference: {fileID: 0} - - target: {fileID: 400158, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 4.6187797 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400158, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} + - target: {fileID: 400172, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -33.68113 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400110, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1991,14 +2022,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -28.528801 objectReference: {fileID: 0} - - target: {fileID: 400170, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400172, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 11a31d2865662a04aa8d8014fa817df6, type: 3} --- !u!1 &4912303732073176956 stripped diff --git a/Assets/Scripts/Client/Animation/Modifiers/AnimationRotationModifier.cs b/Assets/Scripts/Client/Animation/Modifiers/AnimationRotationModifier.cs index 4ee38448..dd5b671a 100644 --- a/Assets/Scripts/Client/Animation/Modifiers/AnimationRotationModifier.cs +++ b/Assets/Scripts/Client/Animation/Modifiers/AnimationRotationModifier.cs @@ -9,20 +9,39 @@ public class AnimationRotationModifier : MonoBehaviour [SerializeField, UsedImplicitly] private Transform targetBone; [SerializeField, UsedImplicitly] private Vector2 parameterRange; [SerializeField, UsedImplicitly] private Vector3 maxRotation; - [SerializeField, UsedImplicitly] private string parameterTarget; + [SerializeField, UsedImplicitly] private string attackParam; + [SerializeField, UsedImplicitly] private string forwardParam; + [SerializeField, UsedImplicitly] private string strafeParam; + [SerializeField, UsedImplicitly] private bool overrideRotation; - private int parameterHash; + private int strafeHash; + private int attackHash; + private int forwardHash; + + private float attackValue; + private float forwardValue; [UsedImplicitly] - private void Awake() => parameterHash = Animator.StringToHash(parameterTarget); + private void Awake() + { + strafeHash = Animator.StringToHash(strafeParam); + attackHash = Animator.StringToHash(attackParam); + forwardHash = Animator.StringToHash(forwardParam); + } [UsedImplicitly] private void LateUpdate() { - float currentValue = targetAnimator.GetFloat(parameterHash); + float currentValue = targetAnimator.GetFloat(strafeHash); + bool isAttacking = targetAnimator.GetBool(attackHash); + forwardValue = Mathf.MoveTowards(forwardValue, targetAnimator.GetFloat(forwardHash), 5 * Time.deltaTime); + attackValue = Mathf.MoveTowards(attackValue, isAttacking ? 1.0f : 0.0f, 10 * Time.deltaTime); + float rotationValue = Mathf.InverseLerp(parameterRange.x, parameterRange.y, currentValue); - Vector3 finalEulerRotation = Vector3.Lerp(-maxRotation, maxRotation, rotationValue); - targetBone.localRotation *= Quaternion.Euler(finalEulerRotation); + Vector3 finalEulerRotation = Vector3.Lerp(-maxRotation, maxRotation, rotationValue) * (1 - forwardValue / 2) * (1 - attackValue / 3); + + targetBone.localRotation = overrideRotation ? Quaternion.Euler(finalEulerRotation) + : targetBone.localRotation * Quaternion.Euler(finalEulerRotation); } } } diff --git a/Assets/Scripts/Client/Rendering/Unit Renderer/UnitModel.cs b/Assets/Scripts/Client/Rendering/Unit Renderer/UnitModel.cs index aad582fd..c2bc41ea 100644 --- a/Assets/Scripts/Client/Rendering/Unit Renderer/UnitModel.cs +++ b/Assets/Scripts/Client/Rendering/Unit Renderer/UnitModel.cs @@ -83,7 +83,12 @@ private void UpdateAnimations(float deltaTime) if (Mathf.Abs(strafeTarget - currentStrafe) > Mathf.Abs(strafeDelta)) Animator.SetFloat("Strafe", resultStrafe); - if (Renderer.Unit.HasMovementFlag(MovementFlags.Forward | MovementFlags.StrafeRight | MovementFlags.StrafeLeft)) + if (Renderer.Unit.HasMovementFlag(MovementFlags.Forward)) + Animator.SetFloat("Forward", 1.0f); + else + Animator.SetFloat("Forward", Mathf.Clamp(Animator.GetFloat("Forward") - 10 * deltaTime, 0.0f, 1.0f)); + + if (Renderer.Unit.HasMovementFlag(MovementFlags.Forward | MovementFlags.Backward | MovementFlags.StrafeRight | MovementFlags.StrafeLeft)) Animator.SetFloat("Speed", 1); else Animator.SetFloat("Speed", Mathf.Clamp(Animator.GetFloat("Speed") - 10 * deltaTime, 0.0f, 1.0f)); diff --git a/Assets/Scripts/Core/Movement/Controller/WarcraftCharacterController.cs b/Assets/Scripts/Core/Movement/Controller/WarcraftCharacterController.cs index 8a647c72..cf180b01 100644 --- a/Assets/Scripts/Core/Movement/Controller/WarcraftCharacterController.cs +++ b/Assets/Scripts/Core/Movement/Controller/WarcraftCharacterController.cs @@ -75,7 +75,6 @@ void IUnitBehaviour.DoUpdate(int deltaTime) bool movingRight = rawInputVelocity.x > 0; bool movingLeft = rawInputVelocity.x < 0; - bool moving = rawInputVelocity.magnitude > 0; if (movingRight) { @@ -90,7 +89,12 @@ void IUnitBehaviour.DoUpdate(int deltaTime) else unit.MovementInfo.RemoveMovementFlag(MovementFlags.StrafeRight | MovementFlags.StrafeLeft); - if (moving) + if (rawInputVelocity.z < 0) + unit.MovementInfo.AddMovementFlag(MovementFlags.Backward); + else + unit.MovementInfo.RemoveMovementFlag(MovementFlags.Backward); + + if (rawInputVelocity.z > 0) unit.MovementInfo.AddMovementFlag(MovementFlags.Forward); else unit.MovementInfo.RemoveMovementFlag(MovementFlags.Forward);