Commit 9c888552 authored by Unknown's avatar Unknown

Max please Fix it

parent 16a38a9a
......@@ -21,8 +21,14 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Velocity
m_Type: 1
- m_Name: isAirborn
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: isSwimming
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
......@@ -40,6 +46,31 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1101075609259888222
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: isSwimming
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102520368784087144}
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: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101126477975004928
AnimatorStateTransition:
m_ObjectHideFlags: 1
......@@ -65,7 +96,7 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101173485595333566
--- !u!1101 &1101222034008660088
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -73,11 +104,11 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 4
m_ConditionEvent: Velocity
- m_ConditionMode: 1
m_ConditionEvent: isJumping
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102444073478022288}
m_DstState: {fileID: 1102435503339803072}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
......@@ -85,12 +116,12 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101222034008660088
--- !u!1101 &1101272815921876274
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -98,14 +129,42 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
- m_ConditionMode: 4
m_ConditionEvent: Speed
m_EventTreshold: 0.01
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102179534927017740}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.5
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101471969701449560
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: isJumping
m_EventTreshold: 0
- m_ConditionMode: 3
m_ConditionEvent: Velocity
- m_ConditionMode: 4
m_ConditionEvent: Speed
m_EventTreshold: 0.01
- m_ConditionMode: 2
m_ConditionEvent: isAirborn
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102435503339803072}
m_DstState: {fileID: 1102179534927017740}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
......@@ -118,7 +177,7 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101272815921876274
--- !u!1101 &1101582114856806606
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -129,6 +188,9 @@ AnimatorStateTransition:
- m_ConditionMode: 4
m_ConditionEvent: Speed
m_EventTreshold: 0.01
- m_ConditionMode: 2
m_ConditionEvent: isSwimming
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102179534927017740}
m_Solo: 0
......@@ -137,13 +199,13 @@ AnimatorStateTransition:
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.5
m_HasExitTime: 0
m_ExitTime: 0.25
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101455395832926336
--- !u!1101 &1101753829782908642
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -152,7 +214,7 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: isJumping
m_ConditionEvent: isSwimming
m_EventTreshold: 0
- m_ConditionMode: 3
m_ConditionEvent: Speed
......@@ -165,13 +227,13 @@ AnimatorStateTransition:
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_ExitTime: 0.25
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101470993624968216
--- !u!1101 &1101851187104618148
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -179,14 +241,17 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 4
- m_ConditionMode: 2
m_ConditionEvent: isJumping
m_EventTreshold: 0
- m_ConditionMode: 3
m_ConditionEvent: Speed
m_EventTreshold: 0.01
- m_ConditionMode: 2
m_ConditionEvent: isJumping
m_ConditionEvent: isAirborn
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102179534927017740}
m_DstState: {fileID: 1102850552635528860}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
......@@ -194,7 +259,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
......@@ -234,10 +299,11 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jump
m_Speed: 1
m_Speed: 0.8
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101173485595333566}
- {fileID: 1101851187104618148}
- {fileID: 1101471969701449560}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -247,25 +313,25 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 733c4b175af79a94ba2ccac99a015b26, type: 2}
m_Motion: {fileID: 7400000, guid: 5c579b168d0eb42c493f5226b501d78c, type: 2}
m_Tag:
m_SpeedParameter:
m_SpeedParameter: Velocity
m_MirrorParameter:
m_CycleOffsetParameter:
m_CycleOffsetParameter: Speed
m_TimeParameter:
--- !u!1102 &1102444073478022288
--- !u!1102 &1102520368784087144
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fall
m_Name: Swim_Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101455395832926336}
- {fileID: 1101470993624968216}
- {fileID: 1101582114856806606}
- {fileID: 1101753829782908642}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -275,7 +341,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Motion: {fileID: 7400000, guid: 8b0442f4e7c74344d9be1bd2430cb562, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
......@@ -298,13 +364,13 @@ AnimatorState:
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_SpeedParameterActive: 1
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 61d8ccf0d78f99545ac761cbadc8e4c7, type: 2}
m_Tag:
m_SpeedParameter:
m_SpeedParameter: Speed
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
......@@ -327,11 +393,12 @@ AnimatorStateMachine:
m_State: {fileID: 1102435503339803072}
m_Position: {x: 36, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102444073478022288}
m_Position: {x: 144, y: -96, z: 0}
m_State: {fileID: 1102520368784087144}
m_Position: {x: 36, y: 240, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 1101222034008660088}
- {fileID: 1101075609259888222}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
......
......@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_Jump 1
m_Name: Player_Fall_Test
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
......
......@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_Jump 1
m_Name: Player_Jump_Test
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment