diff --git a/Assets/Expressions.cs b/Assets/Expressions.cs index 1f8b8e4..8c01d9d 100644 --- a/Assets/Expressions.cs +++ b/Assets/Expressions.cs @@ -14,6 +14,6 @@ public class Expressions : MonoBehaviour { // Update is called once per frame void Update() { counter++; - animator.SetInteger("Emotion", (counter / 200) % 3); + animator.SetInteger("Animation", (counter / 400) % 6); } } diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim new file mode 100644 index 0000000..81b0ce8 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-idle-annoyed + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + 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: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta new file mode 100644 index 0000000..0362278 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5f48dd41f17f4abe914952ab3297525 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim new file mode 100644 index 0000000..01811f7 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-idle-blush + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + 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: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim.meta b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim.meta new file mode 100644 index 0000000..922cbc9 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a072a3589d3d044d18323a6a7cab1c5e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim new file mode 100644 index 0000000..b99714c --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-idle-neutral + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + 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: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta new file mode 100644 index 0000000..8dfee12 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd2321cae068d4595922187bab1501f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-emote-annoyed.anim b/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim similarity index 98% rename from Assets/Fuki + Seiden/seiden-emote-annoyed.anim rename to Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim index d758037..555fe13 100644 --- a/Assets/Fuki + Seiden/seiden-emote-annoyed.anim +++ b/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-annoyed + m_Name: seiden-emote-talk-annoyed serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote-annoyed.anim.meta b/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-annoyed.anim.meta rename to Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-blush.anim b/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim similarity index 98% rename from Assets/Fuki + Seiden/seiden-emote-blush.anim rename to Assets/Fuki + Seiden/seiden-emote-talk-blush.anim index ef69496..5ac73cc 100644 --- a/Assets/Fuki + Seiden/seiden-emote-blush.anim +++ b/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-blush + m_Name: seiden-emote-talk-blush serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote-blush.anim.meta b/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-blush.anim.meta rename to Assets/Fuki + Seiden/seiden-emote-talk-blush.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-neutral.anim b/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim similarity index 98% rename from Assets/Fuki + Seiden/seiden-emote-neutral.anim rename to Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim index 48076e5..e7251ed 100644 --- a/Assets/Fuki + Seiden/seiden-emote-neutral.anim +++ b/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-neutral + m_Name: seiden-emote-talk-neutral serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote-neutral.anim.meta b/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-neutral.anim.meta rename to Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim.meta