diff --git a/Assets/Resources/Animations/Camera Controller.controller b/Assets/Resources/Animations/Camera Controller.controller index 01328a8..1805593 100644 --- a/Assets/Resources/Animations/Camera Controller.controller +++ b/Assets/Resources/Animations/Camera Controller.controller @@ -10,7 +10,8 @@ AnimatorState: m_Name: motion_1 m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -726798588149099762} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -26,6 +27,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: animSpeed +--- !u!1101 &-726798588149099762 +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: isLoop + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1046042063806159501} + 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!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -40,19 +66,25 @@ AnimatorController: m_DefaultFloat: 1 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: next m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: next_s m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: isLoop + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Resources/Animations/Camera Override Controller.overrideController b/Assets/Resources/Animations/Camera Override Controller.overrideController index af04098..02c8508 100644 --- a/Assets/Resources/Animations/Camera Override Controller.overrideController +++ b/Assets/Resources/Animations/Camera Override Controller.overrideController @@ -7,5 +7,7 @@ AnimatorOverrideController: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Camera Override Controller - m_Controller: {fileID: 9100000, guid: 09aea86c4ae2e9345a1cfb74dd3b27b1, type: 2} - m_Clips: [] + m_Controller: {fileID: 9100000, guid: 31e8857c44e57504abdcd9f9e7f5a041, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: ad7fc1d5eece1a946a437cd1bb81bf90, type: 2} + m_OverrideClip: {fileID: 7400000, guid: ad7fc1d5eece1a946a437cd1bb81bf90, type: 2} diff --git a/Assets/Resources/Animations/Controller.controller b/Assets/Resources/Animations/Controller.controller index fea65a5..39ec241 100644 --- a/Assets/Resources/Animations/Controller.controller +++ b/Assets/Resources/Animations/Controller.controller @@ -172,6 +172,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-1549130795032811926 +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: next_s + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3046527319765726241} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1046042063806159501 AnimatorState: serializedVersion: 6 @@ -186,6 +211,7 @@ AnimatorState: - {fileID: -4072449279223152736} - {fileID: 4924304428553221412} - {fileID: 2301727553135486704} + - {fileID: -1549130795032811926} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -222,6 +248,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: next_e + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} - m_Name: next_s m_Type: 9 m_DefaultFloat: 0 @@ -311,7 +343,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: next_s + m_ConditionEvent: next_e m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -3716543570628925844} diff --git a/Assets/Resources/Animations/Face Controller.controller b/Assets/Resources/Animations/Face Controller.controller index d90a48d..818334a 100644 --- a/Assets/Resources/Animations/Face Controller.controller +++ b/Assets/Resources/Animations/Face Controller.controller @@ -53,7 +53,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: next + m_ConditionEvent: next_ear m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1852960806115855217} @@ -162,6 +162,7 @@ AnimatorState: - {fileID: 6545945057203326228} - {fileID: -5535793450531703588} - {fileID: -1936462703163530381} + - {fileID: 1048258714893053744} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -208,7 +209,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: next_s + m_ConditionEvent: next_e_ear m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 2299752178252451017} @@ -233,7 +234,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: next_s + m_ConditionEvent: next_e m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -6094577992812725622} @@ -303,6 +304,30 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: next_e + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: next_ear + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: next_s_ear + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: next_e_ear + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} - m_Name: IsLoop m_Type: 4 m_DefaultFloat: 0 @@ -334,6 +359,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &1048258714893053744 +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: next_s + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5919795636781688472} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &1849748066309416537 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -377,7 +427,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 3ea5c07300fddb0428f90a5f85f22ee5, type: 2} + m_Motion: {fileID: 7400000, guid: 25d196474525e4d4cb78d6a9dceb41c3, type: 2} m_Tag: m_SpeedParameter: animSpeed m_MirrorParameter: @@ -435,7 +485,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: e87804bd4e9dfd340912754040005c7d, type: 2} + m_Motion: {fileID: 7400000, guid: 68a88f2f1320ed549bfceadc3eb2f897, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -462,7 +512,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 1ed7870865d17344faf4aaa14ec2bf03, type: 2} + m_Motion: {fileID: 7400000, guid: 2fab42b8220c52942b2f939aa2ccc806, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -546,6 +596,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &7087575452039640196 +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: next_s_ear + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1924499013513400557} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &7927037578270948742 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -607,6 +682,7 @@ AnimatorState: - {fileID: -4576748960832017223} - {fileID: -6751304010843963277} - {fileID: -3563160534198110594} + - {fileID: 7087575452039640196} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -616,7 +692,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: ad7fc1d5eece1a946a437cd1bb81bf90, type: 2} + m_Motion: {fileID: 7400000, guid: c5a6a1785f58a954eb727d33f955e2ed, type: 2} m_Tag: m_SpeedParameter: animSpeed m_MirrorParameter: diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index c68cfb1..a554445 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -48760,7 +48760,7 @@ MonoBehaviour: _Global_FogMinDistance: {x: 0, y: 0, z: 0, w: 0} _Global_FogLength: {x: 0, y: 0, z: 0, w: 0} _RimHorizonOffset: 0 - _UVEmissivePower: 0 + _UVEmissivePower: 1 _AmbientColor: {r: 0, g: 0, b: 0, a: 0} scrollPosition: {x: 0, y: 0} --- !u!4 &2048991191