From df09fdfe21477e6acce94c5e4d972cda59b8bf08 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon, 11 Dec 2023 18:57:50 +0100 Subject: [PATCH] Double date ! --- Assets/Resources/Games/doubleDate.prefab | 15 +- .../DoubleDate/Animations/Boy.controller | 207 ++++++++++- .../DoubleDate/Animations/IdleBop2.anim.meta | 2 +- .../DoubleDate/Animations/IdleStare.anim.meta | 2 +- .../Animations/WeaselsAppearUpset.anim | 314 ---------------- .../DoubleDate/Animations/WeaselsHappy.anim | 45 --- .../DoubleDate/Animations/WeaselsHide.anim | 296 +++++++++------- .../DoubleDate/Animations/WeaselsHit.anim | 334 ++++++++---------- Assets/Scripts/Games/DoubleDate/DoubleDate.cs | 142 +++++++- 9 files changed, 654 insertions(+), 703 deletions(-) diff --git a/Assets/Resources/Games/doubleDate.prefab b/Assets/Resources/Games/doubleDate.prefab index dc3f154ac..99aa965a4 100644 --- a/Assets/Resources/Games/doubleDate.prefab +++ b/Assets/Resources/Games/doubleDate.prefab @@ -486,7 +486,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &5057601987836241533 Transform: m_ObjectHideFlags: 0 @@ -495,7 +495,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 527631771265542313} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.186, y: -2.816, z: 1.835911} + m_LocalPosition: {x: 3.24, y: -7.75, z: 1.835911} m_LocalScale: {x: 0.37757048, y: 0.37757048, z: 0.3775703} m_ConstrainProportionsScale: 0 m_Children: [] @@ -14954,6 +14954,17 @@ MonoBehaviour: weasels: {fileID: 1744652231623238581} treeAnim: {fileID: 2725162487030184716} clouds: {fileID: 2827042187832415127} + girlObj: {fileID: 924406857522765850} + girlWeaselObj: {fileID: 9083234075388257105} + girlWeaselShockObj: {fileID: 527631771265542313} + doubleDateCellAnim: {fileID: 2100000, guid: fc4d078e5116cc74bad3552a6fc3e25d, type: 2} + bgSquare: {fileID: 6265365961793110146} + bgGradient: {fileID: 9108262814518596854} + bgIntro: {fileID: 8188186736342864057, guid: 1f442840d85d9e944819c7e21ab38483, type: 3} + bgLong: {fileID: -3642036459305862908, guid: 1f442840d85d9e944819c7e21ab38483, type: 3} + _skyColor: {r: 0.64705884, g: 1, b: 1, a: 1} + noonColor: {r: 0.9529412, g: 0.87058824, b: 0.7764706, a: 1} + _animSpeed: 1 cloudSpeed: 0.06 cloudDistance: 20 floorHeight: -2.75 diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/Boy.controller b/Assets/Resources/Sprites/Games/DoubleDate/Animations/Boy.controller index b60096e24..5c078dc35 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/Boy.controller +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/Boy.controller @@ -12,6 +12,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 8680951295974053903} + - {fileID: -2005884859337095864} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -27,6 +28,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-7145460388143093117 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Stare + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3405943571545831607} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-6799072240324898049 AnimatorState: serializedVersion: 6 @@ -39,6 +65,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -3535509983601444973} + - {fileID: -3479999408142932893} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -65,28 +92,28 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 388957863343072032} - m_Position: {x: 280, y: 60, z: 0} + m_Position: {x: 270, y: 90, z: 0} - serializedVersion: 1 m_State: {fileID: -2996248315630427433} - m_Position: {x: 300, y: 280, z: 0} + m_Position: {x: 280, y: -60, z: 0} - serializedVersion: 1 m_State: {fileID: -8014542166285188035} - m_Position: {x: 140, y: 570, z: 0} + m_Position: {x: 280, y: 520, z: 0} - serializedVersion: 1 m_State: {fileID: -2251364074182031245} - m_Position: {x: 510, y: 80, z: 0} + m_Position: {x: 730, y: 210, z: 0} - serializedVersion: 1 m_State: {fileID: -6799072240324898049} - m_Position: {x: 480, y: 150, z: 0} + m_Position: {x: 520, y: 210, z: 0} - serializedVersion: 1 m_State: {fileID: 3405943571545831607} - m_Position: {x: 435, y: 565, z: 0} + m_Position: {x: 420, y: 380, z: 0} - serializedVersion: 1 m_State: {fileID: 124305183826925708} m_Position: {x: -150, y: 280, z: 0} - serializedVersion: 1 m_State: {fileID: -1689300076074279085} - m_Position: {x: 60, y: 280, z: 0} + m_Position: {x: 90, y: 210, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -104,7 +131,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Stare + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 388957863343072032} m_Solo: 0 @@ -119,6 +149,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-3479999408142932893 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Stare + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3405943571545831607} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-2996248315630427433 AnimatorState: serializedVersion: 6 @@ -131,6 +186,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -2716712429378287557} + - {fileID: 8774774855782899104} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -153,7 +209,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Stare + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 388957863343072032} m_Solo: 0 @@ -180,6 +239,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 8776336292964998845} + - {fileID: 1758649360909108008} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -195,6 +255,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-2005884859337095864 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Stare + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 388957863343072032} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1689300076074279085 AnimatorState: serializedVersion: 6 @@ -207,6 +292,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 5072795465433690740} + - {fileID: -7145460388143093117} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -230,7 +316,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Boy serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Stare + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -278,9 +370,10 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Idle - m_Speed: 0 + m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 3715916914083105168} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -296,6 +389,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &1758649360909108008 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Stare + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3405943571545831607} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &3405943571545831607 AnimatorState: serializedVersion: 6 @@ -322,6 +440,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &3715916914083105168 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Stare + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3405943571545831607} + 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: 1 --- !u!1101 &5072795465433690740 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -329,7 +472,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Stare + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 388957863343072032} m_Solo: 0 @@ -351,7 +497,35 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Stare + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3405943571545831607} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &8774774855782899104 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Stare + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 3405943571545831607} m_Solo: 0 @@ -373,7 +547,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Stare + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 388957863343072032} m_Solo: 0 diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/IdleBop2.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/IdleBop2.anim.meta index 9c628afbd..a1fd1fcab 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/IdleBop2.anim.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/IdleBop2.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: ntrdj/common + assetBundleName: rvldate/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/IdleStare.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/IdleStare.anim.meta index 28e0f5f7a..626475fb1 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/IdleStare.anim.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/IdleStare.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: rvldate/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsAppearUpset.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsAppearUpset.anim index 0657a0e81..0db29b8b4 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsAppearUpset.anim +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsAppearUpset.anim @@ -135,40 +135,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Shock1 - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 3.186, y: -2.816, z: 11} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.13333334 - value: {x: 3.186, y: -2.816, z: 11} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.2 - value: {x: 3.186, y: -2.816, z: 11} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Shock2 - curve: serializedVersion: 2 m_Curve: @@ -453,43 +419,6 @@ AnimationClip: path: Shock1 classID: 212 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Shock2 - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -564,43 +493,6 @@ AnimationClip: path: WeaselBoy classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: WeaselGirl - classID: 1 - script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -697,13 +589,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 4119893686 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 3018599444 attribute: 1 @@ -760,13 +645,6 @@ AnimationClip: typeID: 212 customType: 26 isPPtrCurve: 0 - - serializedVersion: 2 - path: 4119893686 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 4119893686 attribute: 3762991556 @@ -781,13 +659,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1933900214 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 1822017292 attribute: 0 @@ -1067,154 +938,6 @@ AnimationClip: path: Shock1 classID: 212 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 3.186 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.13333334 - value: 3.186 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 3.186 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Shock2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -2.816 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.13333334 - value: -2.816 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: -2.816 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Shock2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 11 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.13333334 - value: 11 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 11 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Shock2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Shock2 - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1757,43 +1480,6 @@ AnimationClip: path: WeaselBoy/WeaselBoyHead classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: WeaselGirl - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHappy.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHappy.anim index a106910eb..552d158b6 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHappy.anim +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHappy.anim @@ -380,25 +380,6 @@ AnimationClip: path: WeaselBoy/WeaselBoyArm classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: WeaselGirl/WeaselGirlArm - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -551,13 +532,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 2314837333 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 2314837333 attribute: 3762991556 @@ -1519,25 +1493,6 @@ AnimationClip: path: WeaselGirl/WeaselGirlHead classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: WeaselGirl/WeaselGirlArm - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHide.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHide.anim index 88a9131ac..68ad7e5e2 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHide.anim +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHide.anim @@ -283,6 +283,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.033333335 + value: {x: 3.38, y: -7.49, z: 1.835911} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 value: {x: 4.07, y: -2.538, z: 1.835911} @@ -301,58 +310,46 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: 3.93, y: -7.14, z: 1.835911} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 path: Shock2 - m_ScaleCurves: [] - m_FloatCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + value: {x: 4.88388, y: -3.3399043, z: -9.439873} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + time: 0.23333333 + value: {x: 4.88388, y: -3.5, z: -9.439873} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_IsActive - path: Shock2 - classID: 1 - script: {fileID: 0} + path: WeaselGirl + m_ScaleCurves: [] + m_FloatCurves: - curve: serializedVersion: 2 m_Curve: @@ -473,34 +470,6 @@ AnimationClip: path: Shock2 classID: 212 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.23333333 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: WeaselGirl - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -654,6 +623,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1933900214 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3484930362 attribute: 4 @@ -668,13 +644,6 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 - - serializedVersion: 2 - path: 4119893686 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 1822017292 attribute: 2086281974 @@ -696,13 +665,6 @@ AnimationClip: typeID: 212 customType: 26 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1933900214 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 1355217192 attribute: 2086281974 @@ -1521,52 +1483,6 @@ AnimationClip: path: WeaselGirl/WeaselGirlBody classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Shock2 - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1773,6 +1689,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 3.38 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 value: 4.07 @@ -1791,6 +1716,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 3.93 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1810,6 +1744,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: -7.49 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 value: -2.538 @@ -1828,6 +1771,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: -7.14 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1847,6 +1799,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 1.835911 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 value: 1.835911 @@ -1865,6 +1826,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 1.835911 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1934,7 +1904,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: WeaselGirl + path: WeaselBoy classID: 1 script: {fileID: 0} - curve: @@ -1942,28 +1912,84 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 4.88388 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 0 + value: 4.88388 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_IsActive - path: WeaselBoy - classID: 1 + attribute: m_LocalPosition.x + path: WeaselGirl + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -3.3399043 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: -3.5 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: WeaselGirl + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -9.439873 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: -9.439873 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: WeaselGirl + classID: 4 script: {fileID: 0} m_EulerEditorCurves: - curve: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHit.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHit.anim index e9b5e5ddb..0ee93e4c2 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHit.anim +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHit.anim @@ -172,7 +172,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 3.186, y: -2.816, z: 11} + value: {x: 2.13, y: -8.04, z: 1.835911} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -190,7 +190,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: 3.831, y: -2.504, z: 1.835911} + value: {x: 2.91, y: -7.81, z: 1.835911} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -1053,6 +1053,31 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: WeaselBoy/WeaselBoyArm + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 4.88388, y: -3.3399043, z: -9.439873} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.7 + value: {x: 4.88388, y: -4.2, z: -9.439873} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: WeaselGirl m_ScaleCurves: [] m_FloatCurves: - curve: @@ -1129,43 +1154,6 @@ AnimationClip: path: Shock1 classID: 212 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.033333335 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Shock2 - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1213,34 +1201,6 @@ AnimationClip: path: WeaselBoy classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.7 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: WeaselGirl - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1672,6 +1632,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1933900214 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3484930362 attribute: 4 @@ -1714,13 +1681,6 @@ AnimationClip: typeID: 212 customType: 26 isPPtrCurve: 0 - - serializedVersion: 2 - path: 4119893686 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 4119893686 attribute: 3762991556 @@ -1735,13 +1695,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1933900214 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 1266787161 attribute: 3762991556 @@ -2082,7 +2035,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 3.186 + value: 2.13 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2100,7 +2053,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: 3.831 + value: 2.91 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2119,7 +2072,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -2.816 + value: -8.04 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2137,7 +2090,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: -2.504 + value: -7.81 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2156,7 +2109,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 11 + value: 1.835911 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2188,43 +2141,6 @@ AnimationClip: path: Shock2 classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.033333335 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Shock2 - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -3253,34 +3169,6 @@ AnimationClip: path: WeaselBoy/WeaselBoyHead classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.7 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: WeaselGirl - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -5576,7 +5464,121 @@ AnimationClip: path: WeaselBoy/WeaselBoyArm classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 4.88388 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.7 + value: 4.88388 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: WeaselGirl + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -3.3399043 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.7 + value: -4.2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: WeaselGirl + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -9.439873 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.7 + value: -9.439873 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: WeaselGirl + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: WeaselBoy/WeaselBoyBody + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: WeaselBoy/WeaselBoyBody + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: WeaselBoy/WeaselBoyBody + classID: 4 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -5637,36 +5639,6 @@ AnimationClip: path: WeaselBoy/WeaselBoyArm classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: WeaselBoy/WeaselBoyBody - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: WeaselBoy/WeaselBoyBody - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: WeaselBoy/WeaselBoyBody - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] diff --git a/Assets/Scripts/Games/DoubleDate/DoubleDate.cs b/Assets/Scripts/Games/DoubleDate/DoubleDate.cs index e2cc3724f..59d295588 100644 --- a/Assets/Scripts/Games/DoubleDate/DoubleDate.cs +++ b/Assets/Scripts/Games/DoubleDate/DoubleDate.cs @@ -39,6 +39,37 @@ namespace HeavenStudio.Games.Loaders preFunctionLength = 1f, defaultLength = 2.5f, }, + new GameAction("blush", "Blush") + { + function = delegate { DoubleDate.instance.GirlBlush(); } + }, + new GameAction("toggleGirls", "Girls Presence") + { + function = delegate { DoubleDate.instance.ToggleGirls(eventCaller.currentEntity["b"]); }, + defaultLength = 0.5f, + parameters = new() + { + new("b", false, "Present?") + } + }, + new GameAction("stare", "Boy Stare") + { + function = delegate { DoubleDate.instance.ToggleStare(eventCaller.currentEntity["b"]); }, + defaultLength = 0.5f, + parameters = new() + { + new("b", true, "Should stare?") + } + }, + new GameAction("time", "Time of Day") + { + function = delegate { DoubleDate.instance.SetTime(eventCaller.currentEntity["d"]); }, + defaultLength = 0.5f, + parameters = new() + { + new("d", DoubleDate.DayTime.Noon, "Time") + } + } }, new List() {"rvl", "normal"}, "rvldate", "en", @@ -67,8 +98,21 @@ namespace HeavenStudio.Games [SerializeField] DoubleDateWeasels weasels; [SerializeField] Animator treeAnim; [SerializeField] GameObject clouds; + [SerializeField] private GameObject girlObj; + [SerializeField] private GameObject girlWeaselObj; + [SerializeField] private GameObject girlWeaselShockObj; + [SerializeField] private Material doubleDateCellAnim; + [SerializeField] private SpriteRenderer bgSquare; + [SerializeField] private SpriteRenderer bgGradient; + [SerializeField] private Sprite bgIntro; + [SerializeField] private Sprite bgLong; + + private Color squareColor; [Header("Variables")] + [SerializeField] private Color _skyColor; + [SerializeField] private Color noonColor; + [SerializeField] private float _animSpeed = 1.25f; [SerializeField] public float cloudSpeed; [SerializeField] public float cloudDistance; [SerializeField] public float floorHeight; @@ -114,9 +158,67 @@ namespace HeavenStudio.Games } } + public void CheckGirlsPresence(double beat) + { + var allEvents = EventCaller.GetAllInGameManagerList("doubleDate", new string[] { "toggleGirls" }).FindAll(x => x.beat < beat); + if (allEvents.Count == 0) return; + allEvents.Sort((x, y) => x.beat.CompareTo(y.beat)); + + ToggleGirls(allEvents[^1]["b"]); + } + + public void CheckBoyStare(double beat) + { + var allEvents = EventCaller.GetAllInGameManagerList("doubleDate", new string[] { "stare" }).FindAll(x => x.beat < beat); + if (allEvents.Count == 0) return; + allEvents.Sort((x, y) => x.beat.CompareTo(y.beat)); + + ToggleStare(allEvents[^1]["b"]); + } + + public enum DayTime + { + Day, + Noon + } + + private void DayTimeCheck(double beat) + { + var allEvents = EventCaller.GetAllInGameManagerList("doubleDate", new string[] { "time" }).FindAll(x => x.beat < beat); + if (allEvents.Count == 0) return; + allEvents.Sort((x, y) => x.beat.CompareTo(y.beat)); + + SetTime(allEvents[^1]["d"]); + } + + public void SetTime(int time) + { + if (time == (int)DayTime.Noon) + { + doubleDateCellAnim.SetColor("_Color", noonColor); + bgSquare.color = squareColor; + bgGradient.sprite = bgLong; + return; + } + + doubleDateCellAnim.SetColor("_Color", Color.white); + bgSquare.color = _skyColor; + bgGradient.sprite = bgIntro; + } + public override void OnPlay(double beat) { queuedBalls.Clear(); + CheckGirlsPresence(beat); + CheckBoyStare(beat); + DayTimeCheck(beat); + } + + public override void OnGameSwitch(double beat) + { + CheckGirlsPresence(beat); + CheckBoyStare(beat); + DayTimeCheck(beat); } private void OnDestroy() { @@ -131,6 +233,8 @@ namespace HeavenStudio.Games { instance = this; SetupBopRegion("doubleDate", "bop", "autoBop"); + doubleDateCellAnim.SetColor("_Color", noonColor); + squareColor = bgSquare.color; } private void Start() { @@ -176,11 +280,11 @@ namespace HeavenStudio.Games } if (PlayerInput.GetIsAction(InputAction_TouchPress)) { - boyAnim.DoScaledAnimationAsync("Ready", 1f); + boyAnim.DoScaledAnimationAsync("Ready", _animSpeed); } if (PlayerInput.GetIsAction(InputAction_TouchRelease) && !IsExpectingInputNow(InputAction_FlickPress)) { - boyAnim.DoScaledAnimationAsync("UnReady", 1f); + boyAnim.DoScaledAnimationAsync("UnReady", _animSpeed); } if (PlayerInput.GetIsAction(InputAction_FlickPress) && !IsExpectingInputNow(InputAction_FlickPress)) { @@ -190,6 +294,26 @@ namespace HeavenStudio.Games clouds.transform.position = Vector3.left * ((Time.realtimeSinceStartup * cloudSpeed) % cloudDistance); } + public void GirlBlush() + { + girlAnim.DoScaledAnimationAsync("GirlBlush", _animSpeed); + } + + public void ToggleGirls(bool active) + { + girlObj.SetActive(active); + girlWeaselObj.SetActive(active); + girlWeaselShockObj.SetActive(active); + } + + private bool _isStaring = false; + + public void ToggleStare(bool active) + { + boyAnim.SetBool("Stare", active); + _isStaring = active; + } + public void ToggleBop(bool go) { canBop = go; @@ -213,10 +337,10 @@ namespace HeavenStudio.Games { if (canBop) { - boyAnim.DoScaledAnimationAsync("IdleBop", 1f); + boyAnim.DoScaledAnimationAsync(_isStaring ? "IdleBop2" : "IdleBop", _animSpeed); } if (Conductor.instance.songPositionInBeatsAsDouble > lastGirlGacha) - girlAnim.DoScaledAnimationAsync("GirlBop", 1f); + girlAnim.DoScaledAnimationAsync("GirlBop", _animSpeed); weasels.Bop(); } @@ -224,12 +348,12 @@ namespace HeavenStudio.Games { if (hit) { - boyAnim.DoScaledAnimationAsync("Kick", 0.5f); + boyAnim.DoScaledAnimationAsync("Kick", _animSpeed); if (jump) { weasels.Jump(); lastGirlGacha = Conductor.instance.songPositionInBeatsAsDouble + 0.5f; - girlAnim.DoScaledAnimationAsync("GirlLookUp", 0.5f); + girlAnim.DoScaledAnimationAsync("GirlLookUp", _animSpeed); } else if (weaselsHappy) weasels.Happy(); if (!forceNoLeaves) @@ -239,14 +363,14 @@ namespace HeavenStudio.Games new BeatAction.Action(Conductor.instance.songPositionInBeatsAsDouble + 1f, delegate { leaves.Play(); - treeAnim.DoScaledAnimationAsync("TreeRustle", 1f); + treeAnim.DoScaledAnimationAsync("TreeRustle", _animSpeed); }) }); } } else { - boyAnim.DoScaledAnimationAsync("Barely", 0.5f); + boyAnim.DoScaledAnimationAsync("Barely", _animSpeed); weasels.Surprise(); } } @@ -331,7 +455,7 @@ namespace HeavenStudio.Games public void MissKick(double beat, bool hit = false) { lastGirlGacha = Conductor.instance.songPositionInBeatsAsDouble + 1.5f; - girlAnim.DoScaledAnimationAsync("GirlSad", 0.5f); + girlAnim.DoScaledAnimationAsync("GirlSad", _animSpeed); if (hit) { lastHitWeasel = Conductor.instance.songPositionInBeatsAsDouble;