From 68dbc1c3497f4425b24c87efd6bea7cb9e3c9cba Mon Sep 17 00:00:00 2001 From: MindfulMinun Date: Fri, 25 Feb 2022 01:23:42 -0600 Subject: [PATCH 1/2] Oops, I forgot to save my scene ! --- Assets/Scenes/Benji's Scene.unity | 145 ++++++++++++------------------ 1 file changed, 57 insertions(+), 88 deletions(-) diff --git a/Assets/Scenes/Benji's Scene.unity b/Assets/Scenes/Benji's Scene.unity index 27deb00..cabd445 100644 --- a/Assets/Scenes/Benji's Scene.unity +++ b/Assets/Scenes/Benji's Scene.unity @@ -257,17 +257,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &264267745 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5439994587591701584, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - m_PrefabInstance: {fileID: 5439994587558609906} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 90da90214d3bb324a8ed8f5b046ba4b9, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &890980757 GameObject: m_ObjectHideFlags: 0 @@ -684,6 +673,63 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 22.02, y: 1} m_EdgeRadius: 0 +--- !u!1001 &1992293674 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5439994587395572144, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_Name + value: Seiden + objectReference: {fileID: 0} + - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_LocalPosition.y + value: 2.08 + objectReference: {fileID: 0} + - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} --- !u!1001 &1517753708608174288 PrefabInstance: m_ObjectHideFlags: 0 @@ -741,80 +787,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87a461560d9a85d45a9200acb45c6ac6, type: 3} ---- !u!1001 &5439994587558609906 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5439994587395572144, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_Name - value: Seiden - objectReference: {fileID: 0} - - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_LocalPosition.y - value: 2.08 - objectReference: {fileID: 0} - - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5439994587395572150, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5439994587591701584, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: OnLandEvent.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5439994587591701584, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: OnLandEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5439994587591701584, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: OnLandEvent.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5439994587591701612, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: animator - value: - objectReference: {fileID: 0} - - target: {fileID: 5439994587591701612, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} - propertyPath: controller - value: - objectReference: {fileID: 264267745} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} From 0b967a6fc38b84b577e3fd16ea9ebe7019823512 Mon Sep 17 00:00:00 2001 From: MindfulMinun Date: Fri, 25 Feb 2022 02:33:59 -0600 Subject: [PATCH 2/2] Merge Fuki emotes into one controller ( i hardly know her ) --- Assets/Expressions.cs | 2 +- ...iden-emote.controller => emote.controller} | 244 +++++++++++++++--- ....controller.meta => emote.controller.meta} | 0 Assets/Fuki + Seiden/fuki-emote.controller | 159 ------------ .../Fuki + Seiden/fuki-emote.controller.meta | 8 - .../seiden-emote-idle-neutral.anim | 4 +- Assets/Scenes/Benji's Scene.unity | 151 +---------- Assets/Scenes/Rizvee's Scene.unity | 21 +- README.md | 16 +- UserSettings/EditorUserSettings.asset | 35 +-- 10 files changed, 245 insertions(+), 395 deletions(-) rename Assets/Fuki + Seiden/{seiden-emote.controller => emote.controller} (71%) rename Assets/Fuki + Seiden/{seiden-emote.controller.meta => emote.controller.meta} (100%) delete mode 100644 Assets/Fuki + Seiden/fuki-emote.controller delete mode 100644 Assets/Fuki + Seiden/fuki-emote.controller.meta diff --git a/Assets/Expressions.cs b/Assets/Expressions.cs index 8c01d9d..857112b 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 / 400) % 6); + animator.SetInteger("Animation", (counter / 100) % 8); } } diff --git a/Assets/Fuki + Seiden/seiden-emote.controller b/Assets/Fuki + Seiden/emote.controller similarity index 71% rename from Assets/Fuki + Seiden/seiden-emote.controller rename to Assets/Fuki + Seiden/emote.controller index c603665..4adff22 100644 --- a/Assets/Fuki + Seiden/seiden-emote.controller +++ b/Assets/Fuki + Seiden/emote.controller @@ -26,6 +26,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-9011990944035887894 +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: -980265174454955779} + 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 &-7166047756952805489 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -43,10 +68,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.5 - m_HasExitTime: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -62,22 +87,28 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 6164691065869988772} - m_Position: {x: 210, y: -250, z: 0} + m_Position: {x: 170, y: -220, z: 0} - serializedVersion: 1 m_State: {fileID: 2974820294111061558} - m_Position: {x: 430, y: -240, z: 0} + m_Position: {x: 380, y: -220, z: 0} - serializedVersion: 1 m_State: {fileID: -9186142541091539981} - m_Position: {x: -90, y: -270, z: 0} + m_Position: {x: -190, y: -280, z: 0} - serializedVersion: 1 m_State: {fileID: 7840173655885811835} - m_Position: {x: 230, y: -190, z: 0} + m_Position: {x: 250, y: -170, z: 0} - serializedVersion: 1 m_State: {fileID: -500612317329436769} - m_Position: {x: 460, y: -190, z: 0} + m_Position: {x: 460, y: -170, z: 0} - serializedVersion: 1 m_State: {fileID: -6145718434369378720} - m_Position: {x: 0, y: -190, z: 0} + 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_AnyStateTransitions: - {fileID: 3658525340161196703} @@ -85,12 +116,14 @@ AnimatorStateMachine: - {fileID: -2269429987076585761} - {fileID: 1711183836402485999} - {fileID: 2485851883079793739} + - {fileID: -3509250570045320286} + - {fileID: -9011990944035887894} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - 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_AnyStatePosition: {x: 230, y: -490, z: 0} + m_EntryPosition: {x: -150, y: -430, z: 0} + m_ExitPosition: {x: 250, y: 40, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -9186142541091539981} --- !u!1102 &-6145718434369378720 @@ -148,6 +181,56 @@ AnimatorTransition: 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 +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: 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 &-2269429987076585761 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -165,14 +248,14 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 0 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_CanTransitionToSelf: 0 --- !u!1101 &-1520562656543533555 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -190,14 +273,41 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-980265174454955779 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fuki-emote-talk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3434982389580546436} + 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: ed0332668cfe44db989136bffb992b95, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-500612317329436769 AnimatorState: serializedVersion: 6 @@ -231,7 +341,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote + m_Name: emote serializedVersion: 5 m_AnimatorParameters: - m_Name: Animation @@ -270,10 +380,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -295,14 +405,14 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 0 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_CanTransitionToSelf: 0 --- !u!1101 &2485851883079793739 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -320,14 +430,14 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 0 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_CanTransitionToSelf: 0 --- !u!1101 &2540998140701847090 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -345,10 +455,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.5 - m_HasExitTime: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -397,10 +507,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -422,10 +532,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.5 - m_HasExitTime: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -493,14 +603,14 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 0 m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_CanTransitionToSelf: 0 --- !u!1102 &7840173655885811835 AnimatorState: serializedVersion: 6 @@ -528,3 +638,55 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &8061681909033147392 +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: 6 + 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 &8335976158152630961 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fuki-emote-idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8061681909033147392} + 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: 03a13ca6c311b479ab6e3a6314ae69ae, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Fuki + Seiden/seiden-emote.controller.meta b/Assets/Fuki + Seiden/emote.controller.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote.controller.meta rename to Assets/Fuki + Seiden/emote.controller.meta diff --git a/Assets/Fuki + Seiden/fuki-emote.controller b/Assets/Fuki + Seiden/fuki-emote.controller deleted file mode 100644 index aba529e..0000000 --- a/Assets/Fuki + Seiden/fuki-emote.controller +++ /dev/null @@ -1,159 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-6271199243074775951 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 8472944427699805513} - m_Position: {x: 450, y: 120, z: 0} - - serializedVersion: 1 - m_State: {fileID: 91135004081377505} - m_Position: {x: 140, y: 150, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: - - {fileID: -4707490893272235066} - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 530, y: 30, z: 0} - m_EntryPosition: {x: 190, y: 60, z: 0} - m_ExitPosition: {x: 480, y: 210, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 91135004081377505} ---- !u!1101 &-4707490893272235066 -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: 8472944427699805513} - 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: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 0 ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: fuki-emote - serializedVersion: 5 - m_AnimatorParameters: - - m_Name: Animation - m_Type: 3 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -6271199243074775951} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &91135004081377505 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: fuki-emote-idle - 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: 03a13ca6c311b479ab6e3a6314ae69ae, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1101 &2297267079411594454 -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 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &8472944427699805513 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: fuki-emote-talk - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 2297267079411594454} - 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: ed0332668cfe44db989136bffb992b95, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Fuki + Seiden/fuki-emote.controller.meta b/Assets/Fuki + Seiden/fuki-emote.controller.meta deleted file mode 100644 index 80aed1c..0000000 --- a/Assets/Fuki + Seiden/fuki-emote.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7fab186a63d0a442783b6a305f361154 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim index 3da1f14..8f38e78 100644 --- a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim +++ b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim @@ -32,7 +32,7 @@ AnimationClip: path: classID: 212 script: {fileID: 0} - m_SampleRate: 4 + m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -61,7 +61,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.016666668 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Scenes/Benji's Scene.unity b/Assets/Scenes/Benji's Scene.unity index cabd445..c6d1145 100644 --- a/Assets/Scenes/Benji's Scene.unity +++ b/Assets/Scenes/Benji's Scene.unity @@ -227,7 +227,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 5354992726988596434, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -235,7 +235,7 @@ SpriteRenderer: m_Size: {x: 0.25, y: 0.25} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!95 &171733766 @@ -257,51 +257,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &890980757 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 890980759} - - component: {fileID: 890980758} - m_Layer: 0 - m_Name: Fuki Emote - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &890980758 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 890980757} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 94816f70614b7460bb8fda6a86257bdd, type: 3} - m_Name: - m_EditorClassIdentifier: - animator: {fileID: 978350648} ---- !u!4 &890980759 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 890980757} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.74, y: 2.96, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 978350650} - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &967738952 GameObject: m_ObjectHideFlags: 0 @@ -347,108 +302,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animator: {fileID: 171733766} ---- !u!1 &978350647 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 978350650} - - component: {fileID: 978350649} - - component: {fileID: 978350648} - m_Layer: 0 - m_Name: Emote icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!95 &978350648 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 978350647} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 7fab186a63d0a442783b6a305f361154, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!212 &978350649 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 978350647} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: -1886119498855039967, guid: d48fd9d9f47b5467cb424240c7f9f276, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.25, y: 0.25} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &978350650 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 978350647} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 890980759} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1009898142 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Rizvee's Scene.unity b/Assets/Scenes/Rizvee's Scene.unity index 75f2038..d912c50 100644 --- a/Assets/Scenes/Rizvee's Scene.unity +++ b/Assets/Scenes/Rizvee's Scene.unity @@ -779,11 +779,17 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 904903484} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1fd41423fac95444da8286db867308b4, type: 3} m_Name: m_EditorClassIdentifier: + followCam: {fileID: 0} + staticCam: {fileID: 0} + smoothSpeed: 1 + rayLength: 4 + target: {fileID: 0} + rb: {fileID: 0} --- !u!114 &904903487 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1069,6 +1075,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: controller: {fileID: 1044829896} + animator: {fileID: 0} runSpeed: 40 --- !u!58 &1044829893 CircleCollider2D: @@ -1155,6 +1162,8 @@ MonoBehaviour: m_GroundCheck: {fileID: 860984838} m_CeilingCheck: {fileID: 1477138878} m_CrouchDisableCollider: {fileID: 1044829894} + m_Grounded: 0 + m_Velocity: {x: 0, y: 0, z: 0} OnLandEvent: m_PersistentCalls: m_Calls: [] @@ -1754,9 +1763,9 @@ MonoBehaviour: pages: - asdfsadfasfdsadfasdfsdfasdfasdf - ahhhhhhhhhhhhhhh - emotes: 0100000003000000 + emotes: 0700000007000000 controller: {fileID: 9100000, guid: 7eb4fdbc838e84a8e83347d54fd48aa6, type: 2} - startSprite: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + startSprite: {fileID: -1886119498855039967, guid: d48fd9d9f47b5467cb424240c7f9f276, type: 3} audioManager: {fileID: 1586724389} isTalking: 1 --- !u!4 &1977072049 @@ -1811,7 +1820,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1196539433 - m_SortingLayer: 2 + m_SortingLayer: 1 m_SortingOrder: 0 m_Sprite: {fileID: 4887068915747301843, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1920,7 +1929,7 @@ PrefabInstance: - target: {fileID: 4883996976931216989, guid: 6ea336e93a8128346aad568255a7e6af, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + objectReference: {fileID: -1886119498855039967, guid: d48fd9d9f47b5467cb424240c7f9f276, type: 3} - target: {fileID: 4883996976931216989, guid: 6ea336e93a8128346aad568255a7e6af, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -2242,7 +2251,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1027733709 - m_SortingLayer: 1 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f1a2cb3f7f820294b8bf45a3cf11e89a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/README.md b/README.md index 2a3011a..4eac193 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,15 @@ --- -## Seiden emote animations +## Emote animations ``` -0: Neutral idle -1: Neutral talking -2: Annoyed idle -3: Annoyed talking -4: Blushing idle -5: Blushing talking +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 ``` diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 47a6117..0b42055 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,43 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb flags: 0 - RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe - flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820 + value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe - flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25 flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820 + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820 + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb + flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820 + value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe flags: 0 vcSharedLogLevel: value: 0d5e400f0650