diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim index 81b0ce8..9b93d8a 100644 --- a/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim +++ b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim @@ -17,21 +17,36 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim index 01811f7..03d2789 100644 --- a/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim +++ b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim @@ -17,21 +17,36 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim index b99714c..98027a2 100644 --- a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim +++ b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim @@ -17,21 +17,36 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote.controller b/Assets/Fuki + Seiden/seiden-emote.controller index 4b28e9f..df2cf55 100644 --- a/Assets/Fuki + Seiden/seiden-emote.controller +++ b/Assets/Fuki + Seiden/seiden-emote.controller @@ -1,5 +1,56 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9186142541091539981 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-idle-neutral + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: cd2321cae068d4595922187bab1501f3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-7166047756952805489 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 7 + m_ConditionEvent: Animation + m_EventTreshold: 1 + 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.5 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-6822513122673356238 AnimatorStateMachine: serializedVersion: 6 @@ -10,37 +61,50 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: -2740153168469901383} - m_Position: {x: -80, y: 160, z: 0} + m_State: {fileID: 6164691065869988772} + m_Position: {x: 210, y: -250, z: 0} - serializedVersion: 1 - m_State: {fileID: -569036141754617882} - m_Position: {x: 80, y: 20, z: 0} + m_State: {fileID: 2974820294111061558} + m_Position: {x: 430, y: -240, z: 0} - serializedVersion: 1 - m_State: {fileID: -888380644526969811} - m_Position: {x: 300, y: 20, z: 0} + m_State: {fileID: -9186142541091539981} + m_Position: {x: -90, y: -270, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7840173655885811835} + m_Position: {x: 230, y: -190, z: 0} + - serializedVersion: 1 + m_State: {fileID: -500612317329436769} + m_Position: {x: 460, y: -190, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6145718434369378720} + m_Position: {x: 0, y: -190, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - - {fileID: -2196437746789456446} - - {fileID: 5409088207089677733} + - {fileID: 3658525340161196703} + - {fileID: 6736497761875868407} + - {fileID: -2269429987076585761} + - {fileID: 1711183836402485999} + - {fileID: 2485851883079793739} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 210, y: -60, z: 0} - m_EntryPosition: {x: -60, y: -100, z: 0} - m_ExitPosition: {x: 200, y: 100, z: 0} + m_AnyStatePosition: {x: 230, y: -370, z: 0} + m_EntryPosition: {x: -50, y: -370, z: 0} + m_ExitPosition: {x: 250, y: -50, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -2740153168469901383} ---- !u!1102 &-2740153168469901383 + m_DefaultState: {fileID: -9186142541091539981} +--- !u!1102 &-6145718434369378720 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-neutral + m_Name: seiden-emote-talk-neutral m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -7166047756952805489} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -56,7 +120,35 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-2196437746789456446 +--- !u!1109 &-4200133955589818273 +AnimatorTransition: + 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: 1 +--- !u!1109 &-3725529132504020838 +AnimatorTransition: + 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: 1 +--- !u!1101 &-2269429987076585761 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -65,34 +157,59 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 6 - m_ConditionEvent: Emotion - m_EventTreshold: 1 + m_ConditionEvent: Animation + m_EventTreshold: 2 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -569036141754617882} + m_DstState: {fileID: 6164691065869988772} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0 + m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 0 ---- !u!1102 &-888380644526969811 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1520562656543533555 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 7 + m_ConditionEvent: Animation + m_EventTreshold: 4 + 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 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-500612317329436769 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-blush + m_Name: seiden-emote-talk-blush m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 8161675390358475728} + - {fileID: 2540998140701847090} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -108,33 +225,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-569036141754617882 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-annoyed - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 5244133421129395689} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 967751f8a30cf409faadb0899fe76cc9, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -144,10 +234,10 @@ AnimatorController: m_Name: seiden-emote serializedVersion: 5 m_AnimatorParameters: - - m_Name: Emotion + - m_Name: Animation m_Type: 3 m_DefaultFloat: 0 - m_DefaultInt: 0 + m_DefaultInt: 1 m_DefaultBool: 0 m_Controller: {fileID: 0} m_AnimatorLayers: @@ -163,7 +253,7 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &5244133421129395689 +--- !u!1101 &804085019347685859 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -172,23 +262,23 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Emotion - m_EventTreshold: 1 + m_ConditionEvent: Animation + m_EventTreshold: 2 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.5 - m_HasExitTime: 0 + m_ExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &5409088207089677733 +--- !u!1101 &1711183836402485999 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -197,23 +287,48 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 6 - m_ConditionEvent: Emotion - m_EventTreshold: 2 + m_ConditionEvent: Animation + m_EventTreshold: 4 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -888380644526969811} + m_DstState: {fileID: 2974820294111061558} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + 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: 0 ---- !u!1101 &8161675390358475728 + m_CanTransitionToSelf: 1 +--- !u!1101 &2485851883079793739 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: Animation + m_EventTreshold: 5 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -500612317329436769} + 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 &2540998140701847090 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -222,19 +337,194 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Emotion - m_EventTreshold: 2 + m_ConditionEvent: Animation + m_EventTreshold: 5 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.5 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &2974820294111061558 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-idle-blush + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1520562656543533555} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: a072a3589d3d044d18323a6a7cab1c5e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &3658525340161196703 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: Animation + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6145718434369378720} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &4044890664384744729 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 7 + m_ConditionEvent: Animation + m_EventTreshold: 3 + 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.5 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &5407602098090957073 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New StateMachine + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} +--- !u!1102 &6164691065869988772 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-idle-annoyed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 804085019347685859} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: a5f48dd41f17f4abe914952ab3297525, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6736497761875868407 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: Animation + m_EventTreshold: 3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7840173655885811835} + 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!1102 &7840173655885811835 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-talk-annoyed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4044890664384744729} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 967751f8a30cf409faadb0899fe76cc9, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Fuki + Seiden/seiden-move.controller b/Assets/Fuki + Seiden/seiden-move.controller index 2bc8bcd..4bfa771 100644 --- a/Assets/Fuki + Seiden/seiden-move.controller +++ b/Assets/Fuki + Seiden/seiden-move.controller @@ -36,7 +36,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: Horizontal - m_EventTreshold: 0.001 + m_EventTreshold: 0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 @@ -46,7 +46,7 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -115,7 +115,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 3 m_ConditionEvent: Horizontal - m_EventTreshold: -0.001 + m_EventTreshold: -0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 @@ -124,8 +124,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.5 - m_HasExitTime: 0 + m_ExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -174,7 +174,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 @@ -198,7 +198,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: Horizontal - m_EventTreshold: -0.001 + m_EventTreshold: -0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -5184000313039322506} m_Solo: 0 @@ -207,9 +207,9 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 @@ -223,7 +223,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 3 m_ConditionEvent: Horizontal - m_EventTreshold: 0.001 + m_EventTreshold: 0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -1236971542150945798} m_Solo: 0 @@ -232,9 +232,9 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 diff --git a/Assets/Scenes/Benji's Scene.unity b/Assets/Scenes/Benji's Scene.unity index 3aab62b..1a088e4 100644 --- a/Assets/Scenes/Benji's Scene.unity +++ b/Assets/Scenes/Benji's Scene.unity @@ -455,7 +455,7 @@ SpriteRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 179847746} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -506,13 +506,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 179847746} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2, y: 2.08, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 2.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 101316509} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &717061313 GameObject: @@ -931,7 +931,6 @@ GameObject: - component: {fileID: 1641807375} - component: {fileID: 1641807374} - component: {fileID: 1641807373} - - component: {fileID: 1641807372} m_Layer: 3 m_Name: Char Movement m_TagString: Untagged @@ -956,21 +955,6 @@ Transform: m_Father: {fileID: 2067235194} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1641807372 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1641807370} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 84aafa4f9de096e4abfe9d463bffd26d, type: 3} - m_Name: - m_EditorClassIdentifier: - controller: {fileID: 1641807376} - animator: {fileID: 2105389528} - runSpeed: 40 --- !u!58 &1641807373 CircleCollider2D: m_ObjectHideFlags: 0 @@ -1149,7 +1133,7 @@ Transform: m_Children: - {fileID: 1641807371} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2067235195 SpriteRenderer: diff --git a/README.md b/README.md index 48d25de..2a3011a 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,16 @@ 1. Go to *Projects* > *Add project from disk* 1. Navigate to the cloned project folder from GitKraken 1. Open the project + +--- + +## Seiden emote animations + +``` +0: Neutral idle +1: Neutral talking +2: Annoyed idle +3: Annoyed talking +4: Blushing idle +5: Blushing talking +```