From 2a787789fa3fdac1f9c2525967749788141b5328 Mon Sep 17 00:00:00 2001 From: MindfulMinun Date: Fri, 25 Feb 2022 19:20:33 -0600 Subject: [PATCH] Add more emotes to Fuki & Seiden heads --- Assets/Expressions.cs | 2 +- .../OLD_fuki-emote-spritesheet.png | Bin 0 -> 693 bytes .../OLD_fuki-emote-spritesheet.png.meta | 168 ++++ Assets/Fuki + Seiden/emote.controller | 943 +++++++++++++----- .../Fuki + Seiden/fuki-emote-idle-laugh.anim | 68 ++ .../fuki-emote-idle-laugh.anim.meta | 8 + .../fuki-emote-idle-neutral.anim | 68 ++ ...meta => fuki-emote-idle-neutral.anim.meta} | 0 .../Fuki + Seiden/fuki-emote-spritesheet.png | Bin 693 -> 963 bytes .../fuki-emote-spritesheet.png.meta | 70 +- .../Fuki + Seiden/fuki-emote-talk-laugh.anim | 71 ++ .../fuki-emote-talk-laugh.anim.meta | 8 + ...talk.anim => fuki-emote-talk-neutral.anim} | 10 +- ...meta => fuki-emote-talk-neutral.anim.meta} | 0 .../seiden-emote-idle-annoyed.anim | 24 +- .../seiden-emote-idle-blush.anim | 24 +- ...e-idle.anim => seiden-emote-idle-cry.anim} | 6 +- .../seiden-emote-idle-cry.anim.meta | 8 + .../seiden-emote-idle-neutral.anim | 23 +- .../seiden-emote-spritesheet.png | Bin 1050 -> 1209 bytes .../seiden-emote-spritesheet.png.meta | 110 +- .../seiden-emote-talk-annoyed.anim | 8 +- .../seiden-emote-talk-blush.anim | 28 +- .../Fuki + Seiden/seiden-emote-talk-cry.anim | 71 ++ .../seiden-emote-talk-cry.anim.meta | 8 + .../seiden-emote-talk-neutral.anim | 26 +- Assets/Scene 1 Assets/PlayerMovement.cs | 11 +- README.md | 20 +- UserSettings/EditorUserSettings.asset | 24 +- 29 files changed, 1366 insertions(+), 441 deletions(-) create mode 100644 Assets/Fuki + Seiden/OLD_fuki-emote-spritesheet.png create mode 100644 Assets/Fuki + Seiden/OLD_fuki-emote-spritesheet.png.meta create mode 100644 Assets/Fuki + Seiden/fuki-emote-idle-laugh.anim create mode 100644 Assets/Fuki + Seiden/fuki-emote-idle-laugh.anim.meta create mode 100644 Assets/Fuki + Seiden/fuki-emote-idle-neutral.anim rename Assets/Fuki + Seiden/{fuki-emote-talk.anim.meta => fuki-emote-idle-neutral.anim.meta} (100%) create mode 100644 Assets/Fuki + Seiden/fuki-emote-talk-laugh.anim create mode 100644 Assets/Fuki + Seiden/fuki-emote-talk-laugh.anim.meta rename Assets/Fuki + Seiden/{fuki-emote-talk.anim => fuki-emote-talk-neutral.anim} (79%) rename Assets/Fuki + Seiden/{fuki-emote-idle.anim.meta => fuki-emote-talk-neutral.anim.meta} (100%) rename Assets/Fuki + Seiden/{fuki-emote-idle.anim => seiden-emote-idle-cry.anim} (87%) create mode 100644 Assets/Fuki + Seiden/seiden-emote-idle-cry.anim.meta create mode 100644 Assets/Fuki + Seiden/seiden-emote-talk-cry.anim create mode 100644 Assets/Fuki + Seiden/seiden-emote-talk-cry.anim.meta diff --git a/Assets/Expressions.cs b/Assets/Expressions.cs index 857112b..ca816a9 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("Animation", (counter / 100) % 8); + animator.SetInteger("Animation", (counter / 100) % 12); } } diff --git a/Assets/Fuki + Seiden/OLD_fuki-emote-spritesheet.png b/Assets/Fuki + Seiden/OLD_fuki-emote-spritesheet.png new file mode 100644 index 0000000000000000000000000000000000000000..69606cafa9b04a97b5559edbc58a27fe96fa3bf5 GIT binary patch literal 693 zcmV;m0!safP)X1^@s6b5wmq00001b5ch_0Itp) z=>Px%Z%IT!R9Hvdm`^A~K^(_tlO%W4I#3*?R=LQ51EO54gFgp~3nd5TCOJ_KQd}qp z{|>k)3dKQtQIs4h4pz8JlIT12o1HiFX5M@2&BeRu?Tq*NedhO@`R&^T3vsn~O#R5y z-d^v;?e*1uBE%yCr~H*+4T2tCm~1izlD%H%WBCfj#qbqL)pzp@BvV6yD~Sm$6KGV`oc;p(JP$WN<+!C_63~9uWc{AXNl`%Ae6a3CPwq8CMLWh#Xkd z>|o!RvLcJb$q*v8m6Cy9*$Zad{5023#wEie5+*wy#o!`XDH#xU)k#Y3 zD|FJmy{@pYY_TXY*94Ac=uB-BdSQ;3{8XpeFIe@riO*wo=}?$2}coe!4R9BR;=gwl*igX)6D<=+&>x{ z1K>)cIySh~fG6>sP}; zCzlE^m6dIu#KF*BtmrsKqr)XPMj1#wgt|YC1-(>Zo(qQcojpB0EPiz8x+)PK2lemT zBJRzu<@F;(Tnr-|fVSE$9`Nz)ffhK8(E#Q|m5Gz#E207rGy-kxS!J2s5k~iak%^n} bZ$y3psN1gZVTs5a00000NkvXXu0mjf{M0iE literal 0 HcmV?d00001 diff --git a/Assets/Fuki + Seiden/OLD_fuki-emote-spritesheet.png.meta b/Assets/Fuki + Seiden/OLD_fuki-emote-spritesheet.png.meta new file mode 100644 index 0000000..f63cd09 --- /dev/null +++ b/Assets/Fuki + Seiden/OLD_fuki-emote-spritesheet.png.meta @@ -0,0 +1,168 @@ +fileFormatVersion: 2 +guid: d48fd9d9f47b5467cb424240c7f9f276 +TextureImporter: + internalIDToNameTable: + - first: + 213: -1886119498855039967 + second: Fuki_neutral_spritesheet_0 + - first: + 213: -7381896143297181974 + second: Fuki_neutral_spritesheet_1 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 8 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Fuki_neutral_spritesheet_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 25 + height: 25 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 12cbec21f4823d5e0800000000000000 + internalID: -1886119498855039967 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fuki_neutral_spritesheet_1 + rect: + serializedVersion: 2 + x: 25 + y: 0 + width: 25 + height: 25 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ae602f1919c3e8990800000000000000 + internalID: -7381896143297181974 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/emote.controller b/Assets/Fuki + Seiden/emote.controller index 4adff22..41c174b 100644 --- a/Assets/Fuki + Seiden/emote.controller +++ b/Assets/Fuki + Seiden/emote.controller @@ -26,7 +26,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-9011990944035887894 +--- !u!1101 &-8928688994004155217 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -36,9 +36,9 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 6 m_ConditionEvent: Animation - m_EventTreshold: 7 + m_EventTreshold: 9 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -980265174454955779} + m_DstState: {fileID: 8335976158152630961} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -46,12 +46,12 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 ---- !u!1101 &-7166047756952805489 +--- !u!1101 &-8448815323595242859 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -61,21 +61,88 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 7 m_ConditionEvent: Animation - m_EventTreshold: 1 + m_EventTreshold: 5 + m_DstStateMachine: {fileID: -6822513122673356238} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1109 &-8344222937871743569 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Animation + m_EventTreshold: 7 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 m_IsExit: 1 + serializedVersion: 1 +--- !u!1101 &-7139873116847977765 +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: 8 + m_DstStateMachine: {fileID: 3888872809625766950} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-7043013701698749837 +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: 6 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8789650945926465091} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 --- !u!1107 &-6822513122673356238 AnimatorStateMachine: serializedVersion: 6 @@ -85,45 +152,41 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 6164691065869988772} - m_Position: {x: 170, y: -220, z: 0} - - serializedVersion: 1 - m_State: {fileID: 2974820294111061558} - m_Position: {x: 380, y: -220, z: 0} - serializedVersion: 1 m_State: {fileID: -9186142541091539981} m_Position: {x: -190, y: -280, z: 0} + m_ChildStateMachines: - serializedVersion: 1 - m_State: {fileID: 7840173655885811835} - m_Position: {x: 250, y: -170, z: 0} + m_StateMachine: {fileID: 3888872809625766950} + m_Position: {x: 410, y: -320, z: 0} - serializedVersion: 1 - m_State: {fileID: -500612317329436769} - m_Position: {x: 460, y: -170, z: 0} - - serializedVersion: 1 - m_State: {fileID: -6145718434369378720} - m_Position: {x: 30, y: -170, z: 0} - - serializedVersion: 1 - m_State: {fileID: 8335976158152630961} - m_Position: {x: 590, y: -220, z: 0} - - serializedVersion: 1 - m_State: {fileID: -980265174454955779} - m_Position: {x: 680, y: -170, z: 0} - m_ChildStateMachines: [] + m_StateMachine: {fileID: 2725725133087353897} + m_Position: {x: 140, y: -320, z: 0} m_AnyStateTransitions: - - {fileID: 3658525340161196703} - - {fileID: 6736497761875868407} - - {fileID: -2269429987076585761} - - {fileID: 1711183836402485999} - - {fileID: 2485851883079793739} - - {fileID: -3509250570045320286} - - {fileID: -9011990944035887894} + - {fileID: 5226731004042896544} + - {fileID: -8928688994004155217} + - {fileID: -4104638928889460040} + - {fileID: 9165086555867742468} + - {fileID: -7139873116847977765} + - {fileID: -4980749491851591332} + - {fileID: 239973291005616504} + - {fileID: 1738093522195429833} + - {fileID: -1325621610416132743} + - {fileID: 7646481811888375047} + - {fileID: -7043013701698749837} + - {fileID: -785878110477201914} m_EntryTransitions: [] - m_StateMachineTransitions: {} + m_StateMachineTransitions: + - first: {fileID: 3888872809625766950} + second: + - {fileID: 4019173831156896918} + - first: {fileID: 2725725133087353897} + second: + - {fileID: -8344222937871743569} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 230, y: -490, z: 0} + m_AnyStatePosition: {x: 290, y: -470, z: 0} m_EntryPosition: {x: -150, y: -430, z: 0} - m_ExitPosition: {x: 250, y: 40, z: 0} + m_ExitPosition: {x: 290, y: -150, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -9186142541091539981} --- !u!1102 &-6145718434369378720 @@ -137,7 +200,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -7166047756952805489} + - {fileID: 464207999318129420} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -153,60 +216,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !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 &-3509250570045320286 -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: 6 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 8335976158152630961} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 0 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 0 ---- !u!1101 &-3434982389580546436 +--- !u!1101 &-5162305119635176898 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -216,22 +226,47 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 7 m_ConditionEvent: Animation - m_EventTreshold: 7 - m_DstStateMachine: {fileID: 0} + m_EventTreshold: 11 + m_DstStateMachine: {fileID: -6822513122673356238} m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 - m_IsExit: 1 + m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-2269429987076585761 +--- !u!1101 &-5152751745891609981 +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: -6822513122673356238} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-4980749491851591332 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -251,12 +286,12 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 ---- !u!1101 &-1520562656543533555 +--- !u!1101 &-4218554834643160175 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -266,21 +301,176 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 7 m_ConditionEvent: Animation - m_EventTreshold: 4 + m_EventTreshold: 9 + m_DstStateMachine: {fileID: -6822513122673356238} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !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!1101 &-4104638928889460040 +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: 10 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1583094560127037844} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !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 &-1651788835466967045 +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: -6822513122673356238} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-1583094560127037844 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fuki-emote-idle-laugh + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 9006343171695620225} + 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: cb6d9303f09d04bfda6bc97633cedecc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-1459581781856730014 +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: 2 + m_DstStateMachine: {fileID: -6822513122673356238} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1325621610416132743 +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: 4 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2974820294111061558} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 --- !u!1102 &-980265174454955779 AnimatorState: serializedVersion: 6 @@ -288,11 +478,10 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fuki-emote-talk + m_Name: fuki-emote-idle-neutral m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -3434982389580546436} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -308,6 +497,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-785878110477201914 +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: 7 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6604384124808756958} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 --- !u!1102 &-500612317329436769 AnimatorState: serializedVersion: 6 @@ -319,7 +533,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 2540998140701847090} + - {fileID: -8448815323595242859} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -347,7 +561,7 @@ AnimatorController: - m_Name: Animation m_Type: 3 m_DefaultFloat: 0 - m_DefaultInt: 1 + m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} m_AnimatorLayers: @@ -363,134 +577,7 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &804085019347685859 -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: 2 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 1 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1711183836402485999 -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: 4 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 2974820294111061558} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 0 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 0 ---- !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 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 0 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 0 ---- !u!1101 &2540998140701847090 -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: 5 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 1 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - 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 +--- !u!1101 &239973291005616504 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -510,12 +597,12 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 ---- !u!1101 &4044890664384744729 +--- !u!1101 &464207999318129420 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -524,18 +611,237 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 + m_ConditionEvent: Animation + m_EventTreshold: 1 + m_DstStateMachine: {fileID: -6822513122673356238} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1738093522195429833 +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 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &2025333688701883931 +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: 7 + m_DstStateMachine: {fileID: -6822513122673356238} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &2725725133087353897 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Seiden's Emotes + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 6164691065869988772} + m_Position: {x: 250, y: -80, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2974820294111061558} + m_Position: {x: 250, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7840173655885811835} + m_Position: {x: 250, y: -30, z: 0} + - serializedVersion: 1 + m_State: {fileID: -500612317329436769} + m_Position: {x: 250, y: 70, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6145718434369378720} + m_Position: {x: 250, y: -130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8789650945926465091} + m_Position: {x: 250, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6604384124808756958} + m_Position: {x: 250, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4596056633320439673} + m_Position: {x: -30, y: 100, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -10, y: -130, z: 0} + m_EntryPosition: {x: -10, y: -10, z: 0} + m_ExitPosition: {x: 10, y: 180, z: 0} + m_ParentStateMachinePosition: {x: 530, y: 160, z: 0} + m_DefaultState: {fileID: 4596056633320439673} +--- !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: -5152751745891609981} + 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!1107 &3888872809625766950 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Fuki's Emotes + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 8335976158152630961} + m_Position: {x: -140, y: 220, z: 0} + - serializedVersion: 1 + m_State: {fileID: -980265174454955779} + m_Position: {x: 320, y: 280, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1583094560127037844} + m_Position: {x: -40, y: 280, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5838018138267826007} + m_Position: {x: 80, y: 330, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 10, y: 130, z: 0} + m_EntryPosition: {x: 300, y: 130, z: 0} + m_ExitPosition: {x: 220, y: 410, z: 0} + m_ParentStateMachinePosition: {x: -60, y: 420, z: 0} + m_DefaultState: {fileID: -980265174454955779} +--- !u!1109 &4019173831156896918 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: Animation + m_EventTreshold: 8 + m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 m_IsExit: 1 + serializedVersion: 1 +--- !u!1102 &4596056633320439673 +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 &5226731004042896544 +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: 0 + m_DstStateMachine: {fileID: 2725725133087353897} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -559,6 +865,33 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 0} +--- !u!1102 &5838018138267826007 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fuki-emote-talk-laugh + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5162305119635176898} + 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: 35021ec3a11fc44ccb3175d828537075, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &6164691065869988772 AnimatorState: serializedVersion: 6 @@ -570,7 +903,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 804085019347685859} + - {fileID: -1459581781856730014} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -586,7 +919,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &6736497761875868407 +--- !u!1102 &6604384124808756958 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-talk-cry + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2025333688701883931} + 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: 70a80c4471222496f9734443d28fe3b9, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &7646481811888375047 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -596,9 +956,9 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 6 m_ConditionEvent: Animation - m_EventTreshold: 3 + m_EventTreshold: 5 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 7840173655885811835} + m_DstState: {fileID: -500612317329436769} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -606,7 +966,7 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -622,7 +982,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 4044890664384744729} + - {fileID: -1651788835466967045} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -638,7 +998,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &8061681909033147392 +--- !u!1101 &7857812978528664658 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -649,17 +1009,17 @@ AnimatorStateTransition: - m_ConditionMode: 7 m_ConditionEvent: Animation m_EventTreshold: 6 - m_DstStateMachine: {fileID: 0} + m_DstStateMachine: {fileID: -6822513122673356238} m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 - m_IsExit: 1 + m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 @@ -670,11 +1030,11 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fuki-emote-idle + m_Name: fuki-emote-talk-neutral m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 8061681909033147392} + - {fileID: -4218554834643160175} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -690,3 +1050,80 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &8789650945926465091 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-idle-cry + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 7857812978528664658} + 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: 8f2e5f2b940814dcaa6afec90416e303, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &9006343171695620225 +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: 10 + m_DstStateMachine: {fileID: -6822513122673356238} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &9165086555867742468 +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: 11 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5838018138267826007} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 diff --git a/Assets/Fuki + Seiden/fuki-emote-idle-laugh.anim b/Assets/Fuki + Seiden/fuki-emote-idle-laugh.anim new file mode 100644 index 0000000..1318533 --- /dev/null +++ b/Assets/Fuki + Seiden/fuki-emote-idle-laugh.anim @@ -0,0 +1,68 @@ +%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: fuki-emote-idle-laugh + 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: + - curve: + - time: 0 + value: {fileID: -1197645311261903289, guid: bb320d191f76f4228ad733eb9b5ce880, 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: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1197645311261903289, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.25 + 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/fuki-emote-idle-laugh.anim.meta b/Assets/Fuki + Seiden/fuki-emote-idle-laugh.anim.meta new file mode 100644 index 0000000..35416ba --- /dev/null +++ b/Assets/Fuki + Seiden/fuki-emote-idle-laugh.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb6d9303f09d04bfda6bc97633cedecc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/fuki-emote-idle-neutral.anim b/Assets/Fuki + Seiden/fuki-emote-idle-neutral.anim new file mode 100644 index 0000000..5ee11c0 --- /dev/null +++ b/Assets/Fuki + Seiden/fuki-emote-idle-neutral.anim @@ -0,0 +1,68 @@ +%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: fuki-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: + - curve: + - time: 0 + value: {fileID: 2505844562292807002, guid: bb320d191f76f4228ad733eb9b5ce880, 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: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 2505844562292807002, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.25 + 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/fuki-emote-talk.anim.meta b/Assets/Fuki + Seiden/fuki-emote-idle-neutral.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-emote-talk.anim.meta rename to Assets/Fuki + Seiden/fuki-emote-idle-neutral.anim.meta diff --git a/Assets/Fuki + Seiden/fuki-emote-spritesheet.png b/Assets/Fuki + Seiden/fuki-emote-spritesheet.png index 69606cafa9b04a97b5559edbc58a27fe96fa3bf5..a4aa29619d3c8ab3fb10396d3eebcd37d79da964 100644 GIT binary patch delta 954 zcmV;r14aC`1;YoB7k@Gc1^@s69zTe&00001b5ch_0Itp)=>Px&eMv+?RA@upm_29} zK@^4eAwk4mg=e9lr3eYwgcMpBiIB#m@TXAFMnNnDI|)__79wb)V4=}MZ2}4^Xd!8Y z1jN#S7CtfQMI=b%44m=q-I@I%b9dEgvOn|Y+;8sOne6Fhe}73kG;wK7hO)A}M2{32?(%C71Scu4IIX<3g5Ckfp@ty#391W8Lu@Z@a z$mdP7gSwGfiGPBm6yaE96D9Rl2XC{o;%8q8<3TJ%BuJeA(H}5uvEM{NtVFnl%kk^Z zI-%sb!kunq`F6HC*yNU&%LuYzDFO}bgnFxO0)sJ-fua5nm#8gU&t?S>YmpELg1WG6 zdv@d77Z+IBdBOvc5czr%8POoAMKlPHPu7w8j%iGrjQ34!SG5i|lFoxYRJKR%Q3zAj77<97W*K3~1v83&kQloWW3!X1p+2qu9S32>vSQ}Q} zS$}K3mbG{0K)Ud?pj&qdv6dPebk@EW0!yt?$cUA%C9`g!(TcCdrD5rvwc=|L#MGc; zv0IvFZD>^bTH4x-xqt{ZW}eBV74ptfXyia3Nb@ZAc^Z0NWu8e8D-FMES(;~hX*IQ+ z@cUW@ofK*+(!|%Ir)6r;Nf=9Cs}+MzelxkHG|zNhS$Joi`dR=?<(+lrYZ1cKp!;up ct$z{ZH;iXm>{H|cOaK4?07*qoM6N<$g3DpZp8x;= delta 682 zcmV;b0#*IP2ek!|7k?QD1^@s6b5wmq00001b5ch_0Itp)=>Px%Z%IT!R9Hvdm`^A~ zK^(_tlO%W4I#3*?R=LQ51EO54gFgp~3nd5TCOJ_KQd}qp{|>k)3dKQtQIs4h4pz8J zlIT12o1HiFX5M@2&BeRu?Tq*NedhO@`R&^T3vsn~O#R5y-hW>2#qIUgej>yp0;l|y zVGV*FUYKk$29mvA=VSQ_#l`RyN!54r3?x%Sfh&m#E#sYRV=x^_C~k%(f)#3;pJQiB zhoK~B5@c{eC@4EF7#)a+p2n6e^^#K{mMww02B zU)c+0+x#@wPk+WG!y^(VKm-aIx=jCL5^=@gB3LOI5O&o`O71Ik(!IT|u&->fC^6Rz zE`p;_J!+%K;2Fq3Ve*3~sWBy6o+7KG4p!5!b+a%M;1K>)cIySh~fG6>sP};CzlE^m6dIu#KF*B ztmrsKqr)XPMj1#wgt|YC1-(>Zo(qQcojpB0EPiz8x+)PK2lemTBJRzu<@F;(Tnr-| zfVSE$9`Nz)ffhK8(E#Q|m5Gz#E207rGy-kxStDhc-4RCjf02os@oz+a0jS%q?_r6^ Q8vpPx(b4f%&RCr$PTs>$M zK@@(mP+J9U1Wh1t1pEm{Yy*NGVv|zPs1O2jO%S!PywbvmrU^p2MEf90I6=Wi!4MFI zcyN%UurMhEu}}+7-elkMc6R>ub`}i0ZF1S0-S2%fZ)SGCe19(k5OB=YYCYa;^!VZQ z*Qr_jLq zN~@3*!!`iUQGdx0iHMOBL4bSBnsEe-Bg2U$1bF_LQmjf0FA*d`hik4ZKKKgP?jB3q z;_v!gu@Q-Zp@htZ^y!uI_qo*A1C4BR=jeiJT7Zbxt1WDjQL?{3v#3wiZ zOk_fc#KN$q7WOV5je+4o6>G1%X^UT-f3~!t(h$kGh~Qj|iIE{flUfHM5>5ummrq-7 z;QWORwP=`#RE6Or^03uZ;c+4u=+)M_3@3h$h^)NW$t=G#*>xhZFswwdH?L1!&XB<9 zV-kspk$>3`X+@&6(249Dn}A230cL(JXGUc1-~`+{3GjDyS&xa6+iD7)P;!nXu#AfrhT_h1u1Ulmc7J&}T@@xSSPy{+XwM3vxl+3aspa^uX#|{zbN{E0W z(DBp~fi9v5SV*7?d9Nrd(DjQU0-derM4+1-3X*4SBA^I#q%4X+mnf96L_iVfXw?#d zPFuf4pi4T$I7ec;+f18hYz*T*A`Uw2dVg`y?RJ9K2x<`ly}A~5vN-58bF(<;l4Z{& z0*Zr4}5Rv}zSKp5Z-A<}=sdNNgD5prc;%)qfm@ z`~?czh(IR-ohw(Q#5J%Mm^#tWVRkDZT_h#0`6_BDakc1LycjJfK1hjcQk!clJeCsI zB&~cRpwkK%tNfH6LG&75e8Y={Ap+f=7U)Q~k`mWuE&Xo=w(8S<{907*qoM6N<$f+XP`wEzGB delta 1042 zcmV+t1nv8|37QCy7k^6#1^@s6G7{9d00001b5ch_0Itp)=>Px&)Ja4^RA@u(n!jrl zK@`X58m$$y5j4WVkwOiJwgEv8@gET4F9-oilR_;lue30NX@Zb0>OUY#I6=WiK?#UO zJUB>FSePpWvC-z_JK49qotxR2xt&G9w@vPLXZQO)^XA9iH-E380*<9tYs8z)96y|Y zoqzSN5%36ald2k}LD0jOS57$txwG_HUt8(-Cjv^PVHGbtywg^yx9RQCSfJDzV;~S% z{&I6a_)c35AH7#crVn^Qbc0S?t#_U)-*Br#qX3c%AgJD^8gBg#haglBOkEmo5DJWj zRmc!S8>LFKQhxwRsF8y};ND`(ngMHOI9LY2$DeJ8)v4hH0R$aob7lR(S9SgFvAiw5 zn{&kll0rj+kN`fL!9wKzYF{B+w(AtR38IG>gQ;6%41@Rf~3?KdugQJ;wwrF z3}pm!!S-W|zoz&!e!cvplXLL$nL?6m8cq=0=@T-C08Mn94*^N3Vf|sn-+~FowlNY2 z_6{6tds}Me$FAP_X$kjbg~L?Q7z3F-*BK!g^MCkxdR7f~cGbes>HHD`Z%&;kG({Wp zeiNn+4J!x*hoI;PIfpj5=k14HsSyE?kmo_$Z0FLj3POlK#J3#M^$-YZn_9yOVh$Mu z@Oa_-7}Kq_L;1N_kdzuhUQ|`{EF_~DZdsz&+L?)mZbk+$h2A#6ovk@ks7^H}SHT4QKMgwkCda`II`dprgKkodD1**t&H*w8#O7;Fsv!oQ zYt@Qz8pWW?Y+3G|i9yGQmKb!#M5|%~ia}>vwPJm(lqR4Ubd(WaNmGb9hc;r+Wj$pb zTB)nsY*|UIVf{ysRM4U8rGjq16TF3>4u2ES>uaHtrGm~VZk7tVY}qR_0i}YD?+sK3 zDHU`Hs`R9S&h;`V6?Bn7{rlZ(~mjeEk3OcGTwbgF%Ycal-2~tHv zD(HMpV@Tndudq!j==h}MyS1zAo3bJXofvfEReDlEN2B6jsi6A<$$M<|{QAxM01E&B M07*qoM6N<$f+bzoJ^%m! diff --git a/Assets/Fuki + Seiden/seiden-emote-spritesheet.png.meta b/Assets/Fuki + Seiden/seiden-emote-spritesheet.png.meta index 003a1ae..ead2c4d 100644 --- a/Assets/Fuki + Seiden/seiden-emote-spritesheet.png.meta +++ b/Assets/Fuki + Seiden/seiden-emote-spritesheet.png.meta @@ -1,25 +1,31 @@ fileFormatVersion: 2 -guid: f99a1e623eb554e4aa4314aba18b2531 +guid: 988542481b0a24544b2dcef350a5461f TextureImporter: internalIDToNameTable: - first: - 213: -8109058881888065430 - second: seiden-emotes_0 + 213: 6254823859401255868 + second: seiden-emote-spritesheet_0 - first: - 213: 5354992726988596434 - second: seiden-emotes_1 + 213: -1597024810717329901 + second: seiden-emote-spritesheet_1 - first: - 213: 6776477941202382221 - second: seiden-emotes_2 + 213: 513348755380462125 + second: seiden-emote-spritesheet_2 - first: - 213: -2826190552252792257 - second: seiden-emotes_3 + 213: -4444019599912485171 + second: seiden-emote-spritesheet_3 - first: - 213: 1232664573060430783 - second: seiden-emotes_4 + 213: -1871821792033348118 + second: seiden-emote-spritesheet_4 - first: - 213: 5625398474919881811 - second: seiden-emotes_5 + 213: -2170293955171528748 + second: seiden-emote-spritesheet_5 + - first: + 213: -3403767949682752304 + second: seiden-emote-spritesheet_6 + - first: + 213: -7728925550398990426 + second: seiden-emote-spritesheet_7 externalObjects: {} serializedVersion: 11 mipmaps: @@ -121,7 +127,49 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: seiden-emotes_0 + name: seiden-emote-spritesheet_0 + rect: + serializedVersion: 2 + x: 0 + y: 75 + width: 25 + height: 25 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cbbef3029299dc650800000000000000 + internalID: 6254823859401255868 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: seiden-emote-spritesheet_1 + rect: + serializedVersion: 2 + x: 25 + y: 75 + width: 25 + height: 25 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 31645b3656a36d9e0800000000000000 + internalID: -1597024810717329901 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: seiden-emote-spritesheet_2 rect: serializedVersion: 2 x: 0 @@ -135,14 +183,14 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: a68e55a19e5d67f80800000000000000 - internalID: -8109058881888065430 + spriteID: d22675229f7cf1700800000000000000 + internalID: 513348755380462125 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: seiden-emotes_1 + name: seiden-emote-spritesheet_3 rect: serializedVersion: 2 x: 25 @@ -156,14 +204,14 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 2d4a4f26381c05a40800000000000000 - internalID: 5354992726988596434 + spriteID: dceb75428bba352c0800000000000000 + internalID: -4444019599912485171 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: seiden-emotes_2 + name: seiden-emote-spritesheet_4 rect: serializedVersion: 2 x: 0 @@ -177,14 +225,14 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: d8d63a1c8c2ea0e50800000000000000 - internalID: 6776477941202382221 + spriteID: ae5640b5ff3f506e0800000000000000 + internalID: -1871821792033348118 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: seiden-emotes_3 + name: seiden-emote-spritesheet_5 rect: serializedVersion: 2 x: 25 @@ -198,14 +246,14 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: f324861aaaa57c8d0800000000000000 - internalID: -2826190552252792257 + spriteID: 4dfc2df752191e1e0800000000000000 + internalID: -2170293955171528748 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: seiden-emotes_4 + name: seiden-emote-spritesheet_6 rect: serializedVersion: 2 x: 0 @@ -219,14 +267,14 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: fbbb974f5ed4b1110800000000000000 - internalID: 1232664573060430783 + spriteID: 0d4cc4d651363c0d0800000000000000 + internalID: -3403767949682752304 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: seiden-emotes_5 + name: seiden-emote-spritesheet_7 rect: serializedVersion: 2 x: 25 @@ -240,8 +288,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 35caf99bb1e611e40800000000000000 - internalID: 5625398474919881811 + spriteID: 6a7170959275db490800000000000000 + internalID: -7728925550398990426 vertices: [] indices: edges: [] diff --git a/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim b/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim index 555fe13..0c4d103 100644 --- a/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim +++ b/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim @@ -20,9 +20,9 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + value: {fileID: -1871821792033348118, guid: 988542481b0a24544b2dcef350a5461f, type: 3} - time: 0.25 - value: {fileID: -2826190552252792257, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + value: {fileID: -2170293955171528748, guid: 988542481b0a24544b2dcef350a5461f, type: 3} attribute: m_Sprite path: classID: 212 @@ -42,8 +42,8 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} - - {fileID: -2826190552252792257, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + - {fileID: -1871821792033348118, guid: 988542481b0a24544b2dcef350a5461f, type: 3} + - {fileID: -2170293955171528748, guid: 988542481b0a24544b2dcef350a5461f, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim b/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim index 0e24b76..a62d429 100644 --- a/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim +++ b/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim @@ -20,22 +20,13 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + value: {fileID: -3403767949682752304, guid: 988542481b0a24544b2dcef350a5461f, type: 3} - time: 0.25 - value: {fileID: 5625398474919881811, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + value: {fileID: -7728925550398990426, guid: 988542481b0a24544b2dcef350a5461f, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} - - time: 0.5 - value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} - attribute: m_Sprite - path: - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_SampleRate: 4 m_WrapMode: 0 m_Bounds: @@ -50,24 +41,15 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 - - serializedVersion: 2 - path: 0 - attribute: 2015549526 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 1 pptrCurveMapping: - - {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} - - {fileID: 5625398474919881811, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} - - {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} - - {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + - {fileID: -3403767949682752304, guid: 988542481b0a24544b2dcef350a5461f, type: 3} + - {fileID: -7728925550398990426, guid: 988542481b0a24544b2dcef350a5461f, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.75 + m_StopTime: 0.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote-talk-cry.anim b/Assets/Fuki + Seiden/seiden-emote-talk-cry.anim new file mode 100644 index 0000000..b589e68 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-talk-cry.anim @@ -0,0 +1,71 @@ +%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-talk-cry + 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: + - curve: + - time: 0 + value: {fileID: 6254823859401255868, guid: 988542481b0a24544b2dcef350a5461f, type: 3} + - time: 0.25 + value: {fileID: -1597024810717329901, guid: 988542481b0a24544b2dcef350a5461f, 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: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 6254823859401255868, guid: 988542481b0a24544b2dcef350a5461f, type: 3} + - {fileID: -1597024810717329901, guid: 988542481b0a24544b2dcef350a5461f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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-talk-cry.anim.meta b/Assets/Fuki + Seiden/seiden-emote-talk-cry.anim.meta new file mode 100644 index 0000000..4edd7fb --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-talk-cry.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70a80c4471222496f9734443d28fe3b9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim b/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim index fae4ae3..f78cafe 100644 --- a/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim +++ b/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim @@ -20,22 +20,13 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + value: {fileID: 513348755380462125, guid: 988542481b0a24544b2dcef350a5461f, type: 3} - time: 0.25 - value: {fileID: 5354992726988596434, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + value: {fileID: -4444019599912485171, guid: 988542481b0a24544b2dcef350a5461f, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} - - time: 0.25 - value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} - attribute: m_Sprite - path: - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_SampleRate: 4 m_WrapMode: 0 m_Bounds: @@ -50,18 +41,9 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 - - serializedVersion: 2 - path: 0 - attribute: 2015549526 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 1 pptrCurveMapping: - - {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} - - {fileID: 5354992726988596434, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} - - {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} - - {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + - {fileID: 513348755380462125, guid: 988542481b0a24544b2dcef350a5461f, type: 3} + - {fileID: -4444019599912485171, guid: 988542481b0a24544b2dcef350a5461f, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Scene 1 Assets/PlayerMovement.cs b/Assets/Scene 1 Assets/PlayerMovement.cs index 839e406..2c4c084 100644 --- a/Assets/Scene 1 Assets/PlayerMovement.cs +++ b/Assets/Scene 1 Assets/PlayerMovement.cs @@ -17,9 +17,7 @@ public class PlayerMovement : MonoBehaviour { void Awake() { if (health == null) { Debug.Log("Health not found! Please attach the Health script to the player so the player can take damage."); - } - Debug.Log(health); - if (health != null) { + } else { health.OnHit.AddListener(OnHit); health.OnDead.AddListener(OnDead); } @@ -28,10 +26,6 @@ public class PlayerMovement : MonoBehaviour { // Update is called once per frame void Update() { horizontalMove = Input.GetAxisRaw("Horizontal") * runSpeed; - - if (healthBarAnimator != null) { - healthBarAnimator.SetInteger("Health", health.currentHealth); - } if (Input.GetButtonDown("Jump")) { jump = true; @@ -48,6 +42,9 @@ public class PlayerMovement : MonoBehaviour { } else if (animator != null) { animator.SetFloat("Horizontal", Input.GetAxis("Horizontal")); animator.SetBool("Airborne", !controller.m_Grounded); + if (healthBarAnimator != null) { + healthBarAnimator.SetInteger("Health", health.currentHealth); + } } } void FixedUpdate() { diff --git a/README.md b/README.md index 4eac193..5ef6ae3 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,16 @@ ## Emote animations ``` -0: Seiden neutral idle -1: Seiden neutral talking -2: Seiden annoyed idle -3: Seiden annoyed talking -4: Seiden blushing idle -5: Seiden blushing talking -6: Fuki idle -7: Fuki talking + 0: Seiden idle neutral + 1: Seiden talking neutral + 2: Seiden idle annoyed + 3: Seiden talking annoyed + 4: Seiden idle blushing + 5: Seiden talking blushing + 6: Seiden idle crying + 7: Seiden talking crying + 8: Fuki idle neutral + 9: Fuki talking neutral +10: Fuki idle laughing +11: Fuki talking laughing ``` diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index b378976..98402ea 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb + value: 22424703114646680e0b0227036c6c1313191d7b623d28393930 flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb + value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb + value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe + value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb + flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b + value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b - flags: 0 - RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820 flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b + flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25 + value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb flags: 0 vcSharedLogLevel: value: 0d5e400f0650