diff --git a/Assets/Resources/Games/frogHop.prefab b/Assets/Resources/Games/frogHop.prefab index abd2b69c9..ba5c4de4f 100644 --- a/Assets/Resources/Games/frogHop.prefab +++ b/Assets/Resources/Games/frogHop.prefab @@ -197,7 +197,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3446676100132537491} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.2, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -274,6 +274,7 @@ MonoBehaviour: Darkness: {fileID: 1957333825293202123} SpotlightFront: {fileID: 8406258651058782659} SpotlightBack: {fileID: 6260846628814890155} + Mike: {fileID: 2080936209624685161} --- !u!1 &3684072535637705111 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab index cf6969c61..994b82080 100644 --- a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab +++ b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab @@ -1,5 +1,173 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2096908997696424581 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 111554353140638987} + - component: {fileID: 643263609379698530} + m_Layer: 0 + m_Name: Pow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &111554353140638987 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2096908997696424581} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8030468029240119366} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &643263609379698530 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2096908997696424581} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 11 + m_Sprite: {fileID: 725172185, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.54, y: 2.78} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2355745558680841082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5377989430527580588} + - component: {fileID: 445213838982346724} + m_Layer: 0 + m_Name: Drop2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5377989430527580588 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2355745558680841082} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.5, y: 1.35, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1928088692806592196} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &445213838982346724 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2355745558680841082} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 9 + m_Sprite: {fileID: -52450457, guid: 3c49c0fa809689d448ee90b3c1143d9f, 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.62, y: 0.7} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3454404079075504657 GameObject: m_ObjectHideFlags: 0 @@ -84,6 +252,174 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3642174313135477299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5187816101010928312} + - component: {fileID: 1944082169282802312} + m_Layer: 0 + m_Name: Drop4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5187816101010928312 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3642174313135477299} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.1, y: 0.54, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1928088692806592196} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1944082169282802312 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3642174313135477299} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 9 + m_Sprite: {fileID: -1341583786, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.78, y: 0.48} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4703565576716381731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 123020946329926532} + - component: {fileID: 8036333144486588367} + m_Layer: 0 + m_Name: Drop3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &123020946329926532 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4703565576716381731} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.5, y: 1.3500004, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1928088692806592196} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8036333144486588367 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4703565576716381731} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 9 + m_Sprite: {fileID: -52450457, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.62, y: 0.7} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5247599167469175257 GameObject: m_ObjectHideFlags: 0 @@ -280,7 +616,9 @@ Transform: m_LocalPosition: {x: 0, y: 7.3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2983375294669822441} + - {fileID: 1928088692806592196} m_Father: {fileID: 8030468029240119366} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -336,6 +674,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6562393534867778759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3467174418877012118} + - component: {fileID: 5969053606050411304} + m_Layer: 0 + m_Name: Drop1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3467174418877012118 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6562393534867778759} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.1, y: 0.54, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1928088692806592196} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5969053606050411304 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6562393534867778759} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 9 + m_Sprite: {fileID: -1341583786, guid: 3c49c0fa809689d448ee90b3c1143d9f, 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.78, y: 0.48} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &7540100217977202190 GameObject: m_ObjectHideFlags: 0 @@ -370,6 +792,7 @@ Transform: - {fileID: 2274190441780666158} - {fileID: 4348813302560787042} - {fileID: 1315192144780574573} + - {fileID: 111554353140638987} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -412,3 +835,124 @@ MonoBehaviour: - {fileID: 406877900976759553} - {fileID: 909234933672240153} - {fileID: 3660695675016261408} + - {fileID: 4265139066045870079} + MissFace: {fileID: 2983375294669822441} +--- !u!1 &8095984365337491922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2983375294669822441} + - component: {fileID: 4265139066045870079} + m_Layer: 0 + m_Name: MissFace + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2983375294669822441 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8095984365337491922} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2274190441780666158} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4265139066045870079 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8095984365337491922} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 10 + m_Sprite: {fileID: 766709013, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.9, y: 3.02} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &9047897857995295221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1928088692806592196} + m_Layer: 0 + m_Name: Sweat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1928088692806592196 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9047897857995295221} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3467174418877012118} + - {fileID: 5377989430527580588} + - {fileID: 123020946329926532} + - {fileID: 5187816101010928312} + m_Father: {fileID: 2274190441780666158} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sfx/games/frogHop/miss2.ogg b/Assets/Resources/Sfx/games/frogHop/miss2.ogg new file mode 100644 index 000000000..582941979 Binary files /dev/null and b/Assets/Resources/Sfx/games/frogHop/miss2.ogg differ diff --git a/Assets/Resources/Sfx/games/frogHop/miss2.ogg.meta b/Assets/Resources/Sfx/games/frogHop/miss2.ogg.meta new file mode 100644 index 000000000..9792df17a --- /dev/null +++ b/Assets/Resources/Sfx/games/frogHop/miss2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: eda30acc125594a4190b74e036978bf2 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/frogHop/sigh.ogg b/Assets/Resources/Sfx/games/frogHop/sigh.ogg new file mode 100644 index 000000000..6c9b00713 Binary files /dev/null and b/Assets/Resources/Sfx/games/frogHop/sigh.ogg differ diff --git a/Assets/Resources/Sfx/games/frogHop/sigh.ogg.meta b/Assets/Resources/Sfx/games/frogHop/sigh.ogg.meta new file mode 100644 index 000000000..6c64154a2 --- /dev/null +++ b/Assets/Resources/Sfx/games/frogHop/sigh.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f3b19c56e0cf2ed419e0a617f897c5e0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/frogHop/thankYou.ogg b/Assets/Resources/Sfx/games/frogHop/thankYou.ogg new file mode 100644 index 000000000..84f0dda6a Binary files /dev/null and b/Assets/Resources/Sfx/games/frogHop/thankYou.ogg differ diff --git a/Assets/Resources/Sfx/games/frogHop/thankYou.ogg.meta b/Assets/Resources/Sfx/games/frogHop/thankYou.ogg.meta new file mode 100644 index 000000000..7157d8abc --- /dev/null +++ b/Assets/Resources/Sfx/games/frogHop/thankYou.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 228840bbcd5fe2d4ebe42fdbdf33044b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupBump.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupBump.anim new file mode 100644 index 000000000..e06bff2c1 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupBump.anim @@ -0,0 +1,713 @@ +%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: BackupBump + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 3, z: 0} + 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.033333335 + value: {x: 0.048, y: 2.993, z: 0} + 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.083333336 + value: {x: 0.124, y: 2.983, z: 0} + 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: 0.133, y: 2.953, z: 0} + 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: Body + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 7.3, z: 0} + 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.033333335 + value: {x: 0.590909, y: 6.927273, z: 0} + 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.083333336 + value: {x: 0.94545454, y: 6.703636, z: 0} + 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: 1.3, y: 6.48, z: 0} + 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: Head + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -1.28, y: 5.15, z: 0} + 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.033333335 + value: {x: -1.148, y: 5.263, z: 0} + 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.083333336 + value: {x: -1.063, y: 5.31, z: 0} + 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: Pow + m_ScaleCurves: [] + m_FloatCurves: + - 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: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Pow + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 19 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: Pow + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 732579995, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - time: 0.033333335 + value: {fileID: -2097973220, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - time: 0.083333336 + value: {fileID: -581762266, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - time: 0.13333334 + value: {fileID: 379179964, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + attribute: m_Sprite + path: Body + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2073732236 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3220792405 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3220792405 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3220792405 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 732579995, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: -2097973220, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: -581762266, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: 379179964, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.15 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.048 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.124 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0.133 + 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: Body + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 2.993 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 2.983 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 2.953 + 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: Body + 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.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + 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: Body + 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.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.590909 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.94545454 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1.3 + 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: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 7.3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 6.927273 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 6.703636 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 6.48 + 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: Head + 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.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + 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: Head + 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: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Pow + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.28 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: -1.148 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -1.063 + 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: Pow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 5.15 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 5.263 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 5.31 + 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: Pow + 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.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + 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: Pow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 19 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: Pow + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupBump.anim.meta b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupBump.anim.meta new file mode 100644 index 000000000..fa6b049a8 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupBump.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 16721a331a50ece43ac1e0add78a6aa6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller index bec64f5eb..1308eae79 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller @@ -83,6 +83,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1107 &-7200875042807933816 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sweat + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 8615823016802671678} + m_Position: {x: 0, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: 9052980451085875346} + m_Position: {x: 300, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 0, y: 0, z: 0} + m_EntryPosition: {x: 0, y: 100, z: 0} + m_ExitPosition: {x: 0, y: 300, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 8615823016802671678} --- !u!1102 &-6317254270972426023 AnimatorState: serializedVersion: 6 @@ -247,6 +272,44 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Sweat + m_StateMachine: {fileID: -7200875042807933816} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &126627792101002642 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Glare + 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: ca718567849f646459b9c9b7b064185f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &2012604058134410195 AnimatorState: serializedVersion: 6 @@ -273,6 +336,58 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &3576333960843551535 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ouch + 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: 686680d113fcc6d4fb3522f404a076ff, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &3590859535673775604 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bump + 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: 16721a331a50ece43ac1e0add78a6aa6, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &4045285821077351263 AnimatorState: serializedVersion: 6 @@ -326,6 +441,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -8454991624733208466} m_Position: {x: 300, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3590859535673775604} + m_Position: {x: 300, y: 250, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -440,6 +558,58 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &8615823016802671678 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 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: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &9052980451085875346 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sweat + 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: 517a635052d131a4d9cf50796954eb35, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &9130614243355873966 AnimatorStateMachine: serializedVersion: 6 @@ -458,6 +628,12 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -7680610523810078142} m_Position: {x: 300, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 126627792101002642} + m_Position: {x: 300, y: 100, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3576333960843551535} + m_Position: {x: 300, y: 150, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupGlare.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupGlare.anim new file mode 100644 index 000000000..68c8a7aeb --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupGlare.anim @@ -0,0 +1,215 @@ +%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: BackupGlare + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - 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: 1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 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_Enabled + path: Head + 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: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 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_Enabled + path: Head/MissFace + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 130111906 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1459982307 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: + - 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: 1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 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_Enabled + path: Head + 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: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 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_Enabled + path: Head/MissFace + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupGlare.anim.meta b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupGlare.anim.meta new file mode 100644 index 000000000..c3c100ea9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupGlare.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca718567849f646459b9c9b7b064185f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupOuch.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupOuch.anim new file mode 100644 index 000000000..c24ec83c0 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupOuch.anim @@ -0,0 +1,233 @@ +%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: BackupOuch + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - 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: 1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 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_Enabled + path: Head + 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: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 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_Enabled + path: Head/MissFace + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 766709013, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - time: 1 + value: {fileID: 604791460, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + attribute: m_Sprite + path: Head/MissFace + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 130111906 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1459982307 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1459982307 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 766709013, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: 604791460, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: + - 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: 1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 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_Enabled + path: Head + 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: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 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_Enabled + path: Head/MissFace + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupOuch.anim.meta b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupOuch.anim.meta new file mode 100644 index 000000000..6afcf5526 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupOuch.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 686680d113fcc6d4fb3522f404a076ff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSpin.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSpin.anim index f80851e37..f000280b9 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSpin.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSpin.anim @@ -413,52 +413,6 @@ AnimationClip: path: Belt 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.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - 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 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Head - classID: 212 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -799,6 +753,44 @@ AnimationClip: path: Smear 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Head + classID: 1 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -933,13 +925,6 @@ AnimationClip: typeID: 212 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 130111906 - attribute: 3305885265 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 2994065992 attribute: 3305885265 @@ -989,6 +974,20 @@ AnimationClip: typeID: 212 customType: 26 isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2073732236 attribute: 0 @@ -1537,52 +1536,6 @@ AnimationClip: path: Belt 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.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - 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 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Head - classID: 212 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -2634,6 +2587,44 @@ AnimationClip: path: Smear 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Head + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSweat.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSweat.anim new file mode 100644 index 000000000..8af0b1ce3 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSweat.anim @@ -0,0 +1,116 @@ +%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: BackupSweat + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - 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.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: Head/Sweat + classID: 1 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 26763215 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.06666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: + - 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.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: Head/Sweat + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSweat.anim.meta b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSweat.anim.meta new file mode 100644 index 000000000..cbf28f5ef --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSweat.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 517a635052d131a4d9cf50796954eb35 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkNarrow.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkNarrow.anim index 7c7ea4366..58ebc640b 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkNarrow.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkNarrow.anim @@ -22,14 +22,14 @@ AnimationClip: time: 0 value: {x: 0, y: 0, z: 0} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: 0.7333333, z: 0} + outSlope: {x: 0, y: 0.55, z: 0} 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.15 - value: {x: 0, y: 0.11, z: 0} + value: {x: 0, y: 0.0825, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0, y: 0.055000003, z: 0} + value: {x: 0, y: 0.04125001, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -47,7 +47,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0, y: 0.027500004, z: 0} + value: {x: 0, y: 0.020625003, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -75,14 +75,14 @@ AnimationClip: time: 0 value: {x: 1, y: 1, z: 1} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: -0.6666668, y: 0.6666668, z: 0} + outSlope: {x: -0.4999999, y: 0.5000003, z: 0} 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.15 - value: {x: 0.9, y: 1.1, z: 1} + value: {x: 0.925, y: 1.075, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -91,7 +91,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0.95, y: 1.05, z: 1} + value: {x: 0.9625, y: 1.0375, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -100,7 +100,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0.975, y: 1.025, z: 1} + value: {x: 0.98125, y: 1.01875, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -254,14 +254,14 @@ AnimationClip: time: 0 value: 0 inSlope: -0 - outSlope: 0.7333333 + outSlope: 0.55 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.11 + value: 0.0825 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -270,7 +270,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 0.055000003 + value: 0.04125001 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -279,7 +279,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0.027500004 + value: 0.020625003 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -364,14 +364,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: -0.6666668 + outSlope: -0.4999999 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.9 + value: 0.925 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -380,7 +380,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 0.95 + value: 0.9625 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -389,7 +389,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0.975 + value: 0.98125 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -419,14 +419,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: 0.6666668 + outSlope: 0.5000003 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 1.1 + value: 1.075 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -435,7 +435,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 1.05 + value: 1.0375 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -444,7 +444,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 1.025 + value: 1.01875 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkWide.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkWide.anim index 32ab31adb..72090c718 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkWide.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkWide.anim @@ -22,14 +22,14 @@ AnimationClip: time: 0 value: {x: 0, y: 0, z: 0} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: -1.4666666, z: 0} + outSlope: {x: 0, y: -1.1, z: 0} 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.15 - value: {x: 0, y: -0.22, z: 0} + value: {x: 0, y: -0.165, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0, y: -0.11000001, z: 0} + value: {x: 0, y: -0.1, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -66,14 +66,14 @@ AnimationClip: time: 0 value: {x: 1, y: 1, z: 1} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0.6666668, y: -0.6666668, z: 0} + outSlope: {x: 0.5000003, y: -0.4999999, z: 0} 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.15 - value: {x: 1.1, y: 0.9, z: 1} + value: {x: 1.075, y: 0.925, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -82,7 +82,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 1.05, y: 0.95, z: 1} + value: {x: 1.0375, y: 0.9625, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -224,14 +224,14 @@ AnimationClip: time: 0 value: 0 inSlope: -0 - outSlope: -1.4666666 + outSlope: -1.1 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: -0.22 + value: -0.165 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -240,7 +240,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: -0.11000001 + value: -0.1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -316,14 +316,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: 0.6666668 + outSlope: 0.5000003 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 1.1 + value: 1.075 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -332,7 +332,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 1.05 + value: 1.0375 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -362,14 +362,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: -0.6666668 + outSlope: -0.4999999 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.9 + value: 0.925 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -378,7 +378,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 0.95 + value: 0.9625 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkNarrow.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkNarrow.anim index 43cdabe2a..8ee7a7636 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkNarrow.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkNarrow.anim @@ -22,14 +22,14 @@ AnimationClip: time: 0 value: {x: 0, y: 0, z: 0} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: 0.7333333, z: 0} + outSlope: {x: 0, y: 0.55, z: 0} 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.15 - value: {x: 0, y: 0.11, z: 0} + value: {x: 0, y: 0.0825, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0, y: 0.055000003, z: 0} + value: {x: 0, y: 0.04125001, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -66,14 +66,14 @@ AnimationClip: time: 0 value: {x: 1, y: 1, z: 1} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: -0.6666668, y: 0.6666668, z: 0} + outSlope: {x: -0.4999999, y: 0.5000003, z: 0} 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.15 - value: {x: 0.9, y: 1.1, z: 1} + value: {x: 0.925, y: 1.075, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -82,7 +82,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0.95, y: 1.05, z: 1} + value: {x: 0.9625, y: 1.0375, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -224,14 +224,14 @@ AnimationClip: time: 0 value: 0 inSlope: -0 - outSlope: 0.7333333 + outSlope: 0.55 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.11 + value: 0.0825 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -240,7 +240,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 0.055000003 + value: 0.04125001 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -316,14 +316,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: -0.6666668 + outSlope: -0.4999999 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.9 + value: 0.925 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -332,7 +332,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 0.95 + value: 0.9625 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -362,14 +362,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: 0.6666668 + outSlope: 0.5000003 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 1.1 + value: 1.075 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -378,7 +378,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 1.05 + value: 1.0375 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkWide.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkWide.anim index f9872a022..58711f1e7 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkWide.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkWide.anim @@ -22,14 +22,14 @@ AnimationClip: time: 0 value: {x: 0, y: 0, z: 0} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: -1.4666666, z: 0} + outSlope: {x: 0, y: -1.6666666, z: 0} 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.15 - value: {x: 0, y: -0.22, z: 0} + value: {x: 0, y: -0.25, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0, y: -0.11000001, z: 0} + value: {x: 0, y: -0.0825, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -66,14 +66,14 @@ AnimationClip: time: 0 value: {x: 1, y: 1, z: 1} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0.6666668, y: -0.6666668, z: 0} + outSlope: {x: 0.5000003, y: -0.4999999, z: 0} 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.15 - value: {x: 1.1, y: 0.9, z: 1} + value: {x: 1.075, y: 0.925, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -82,7 +82,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 1.05, y: 0.95, z: 1} + value: {x: 1.0375, y: 0.9625, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -183,15 +183,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 value: 0 @@ -224,14 +215,14 @@ AnimationClip: time: 0 value: 0 inSlope: -0 - outSlope: -1.4666666 + outSlope: -1.6666666 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: -0.22 + value: -0.25 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -240,7 +231,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: -0.11000001 + value: -0.0825 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -275,15 +266,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 value: 0 @@ -316,14 +298,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: 0.6666668 + outSlope: 0.5000003 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 1.1 + value: 1.075 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -332,7 +314,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 1.05 + value: 1.0375 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -362,14 +344,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: -0.6666668 + outSlope: -0.4999999 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.9 + value: 0.925 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -378,7 +360,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 0.95 + value: 0.9625 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkNarrow.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkNarrow.anim index f1c3645b0..5f75623f2 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkNarrow.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkNarrow.anim @@ -22,14 +22,14 @@ AnimationClip: time: 0 value: {x: 0, y: 0, z: 0} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: 0.7333333, z: 0} + outSlope: {x: 0, y: 0.55, z: 0} 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.15 - value: {x: 0, y: 0.11, z: 0} + value: {x: 0, y: 0.0825, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0, y: 0.055000003, z: 0} + value: {x: 0, y: 0.04125001, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -47,7 +47,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0, y: 0.027500004, z: 0} + value: {x: 0, y: 0.020625003, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -75,14 +75,14 @@ AnimationClip: time: 0 value: {x: 1, y: 1, z: 1} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: -0.6666668, y: 0.6666668, z: 0} + outSlope: {x: -0.4999999, y: 0.5000003, z: 0} 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.15 - value: {x: 0.9, y: 1.1, z: 1} + value: {x: 0.925, y: 1.075, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -91,7 +91,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0.95, y: 1.05, z: 1} + value: {x: 0.9625, y: 1.0375, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -100,7 +100,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0.975, y: 1.025, z: 1} + value: {x: 0.98125, y: 1.01875, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -254,14 +254,14 @@ AnimationClip: time: 0 value: 0 inSlope: -0 - outSlope: 0.7333333 + outSlope: 0.55 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.11 + value: 0.0825 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -270,7 +270,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 0.055000003 + value: 0.04125001 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -279,7 +279,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0.027500004 + value: 0.020625003 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -364,14 +364,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: -0.6666668 + outSlope: -0.4999999 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.9 + value: 0.925 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -380,7 +380,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 0.95 + value: 0.9625 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -389,7 +389,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0.975 + value: 0.98125 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -419,14 +419,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: 0.6666668 + outSlope: 0.5000003 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 1.1 + value: 1.075 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -435,7 +435,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 1.05 + value: 1.0375 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -444,7 +444,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 1.025 + value: 1.01875 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkWide.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkWide.anim index f2fc4f6ac..ef2b8fd7b 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkWide.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkWide.anim @@ -22,14 +22,14 @@ AnimationClip: time: 0 value: {x: 0, y: 0, z: 0} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: -1.4666666, z: 0} + outSlope: {x: 0, y: -1.1, z: 0} 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.15 - value: {x: 0, y: -0.22, z: 0} + value: {x: 0, y: -0.165, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0, y: -0.11000001, z: 0} + value: {x: 0, y: -0.08250002, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -66,14 +66,14 @@ AnimationClip: time: 0 value: {x: 1, y: 1, z: 1} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0.6666668, y: -0.6666668, z: 0} + outSlope: {x: 0.5000003, y: -0.4999999, z: 0} 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.15 - value: {x: 1.1, y: 0.9, z: 1} + value: {x: 1.075, y: 0.925, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -82,7 +82,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 1.05, y: 0.95, z: 1} + value: {x: 1.0375, y: 0.9625, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -224,14 +224,14 @@ AnimationClip: time: 0 value: 0 inSlope: -0 - outSlope: -1.4666666 + outSlope: -1.1 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: -0.22 + value: -0.165 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -240,7 +240,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: -0.11000001 + value: -0.08250002 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -316,14 +316,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: 0.6666668 + outSlope: 0.5000003 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 1.1 + value: 1.075 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -332,7 +332,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 1.05 + value: 1.0375 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -362,14 +362,14 @@ AnimationClip: time: 0 value: 1 inSlope: -0 - outSlope: -0.6666668 + outSlope: -0.4999999 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.9 + value: 0.925 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -378,7 +378,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 0.95 + value: 0.9625 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/FrogHop/froghopupscale8192.png b/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png similarity index 100% rename from Assets/Resources/Sprites/Games/FrogHop/froghopupscale8192.png rename to Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png diff --git a/Assets/Resources/Sprites/Games/FrogHop/froghopupscale8192.png.meta b/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png.meta similarity index 100% rename from Assets/Resources/Sprites/Games/FrogHop/froghopupscale8192.png.meta rename to Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png.meta diff --git a/Assets/Scripts/Games/FrogHop/FrogHop.cs b/Assets/Scripts/Games/FrogHop/FrogHop.cs index c6e1dc013..2afab143c 100644 --- a/Assets/Scripts/Games/FrogHop/FrogHop.cs +++ b/Assets/Scripts/Games/FrogHop/FrogHop.cs @@ -16,21 +16,23 @@ namespace HeavenStudio.Games.Loaders { public static Minigame AddGame(EventCaller eventCaller) { - return new Minigame("frogHop", "Frog Hop", "ffffff", false, false, new List() + return new Minigame("frogHop", "Frog Hop", "195A23", false, false, new List() { new GameAction("bop", "Bop") { function = delegate { var e = eventCaller.currentEntity; if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { - instance.Bop(e.beat, e.length, e["bop"]); + instance.Bop(e.beat, e.length, e["blue"], e["orange"], e["greens"]); } }, - resizable = true, parameters = new List() { - new Param("bop", FrogHop.WhoBops.All, "Bop", "Set the character(s) to bop for the duration of this event."), - } + new Param("blue", true, "Blue Bops", "Make Blue Frog bop during this event."), + new Param("orange", true, "Orange Bops", "Make Orange Frog bop during this event."), + new Param("greens", true, "Group Bops", "Make the frogs in the back bop during this event."), + }, + resizable = true, }, new GameAction("count", "Count In") { @@ -54,18 +56,29 @@ namespace HeavenStudio.Games.Loaders instance.Hop(e.beat); } }, + preFunctionLength = 1, + }, + new GameAction("stop", "Stop Shaking") + { + preFunction = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { + instance.Stop(e.beat); + } + }, }, new GameAction("twoshake", "Ya-hoo!") { function = delegate { var e = eventCaller.currentEntity; if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { - instance.TwoHop(e.beat, e["spotlights"]); + instance.TwoHop(e.beat, e["spotlights"], e["jazz"]); } }, parameters = new List() { new Param("spotlights", true, "Automatic Spotlights", "Handles spotlight switching automatically."), + new Param("jazz", false, "Jumpin' Jazz", "Mouth animations will be based on Frog Hop 2."), }, defaultLength = 4.0f, }, @@ -74,12 +87,13 @@ namespace HeavenStudio.Games.Loaders function = delegate { var e = eventCaller.currentEntity; if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { - instance.ThreeHop(e.beat, e["spotlights"]); + instance.ThreeHop(e.beat, e["spotlights"], e["jazz"]); } }, parameters = new List() { new Param("spotlights", true, "Automatic Spotlights", "Handles spotlight switching automatically."), + new Param("jazz", false, "Jumpin' Jazz", "Mouth animations will be based on Frog Hop 2."), }, defaultLength = 4.0f, }, @@ -88,31 +102,16 @@ namespace HeavenStudio.Games.Loaders function = delegate { var e = eventCaller.currentEntity; if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { - instance.SpinItBoys(e.beat, e["spotlights"]); + instance.SpinItBoys(e.beat, e["spotlights"], e["jazz"]); } }, parameters = new List() { new Param("spotlights", true, "Automatic Spotlights", "Handles spotlight switching automatically."), + new Param("jazz", false, "Jumpin' Jazz", "Mouth animations will be based on Frog Hop 2."), }, defaultLength = 4.0f, }, - new GameAction("spotlights", "Spotlights") - { - function = delegate { - var e = eventCaller.currentEntity; - if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { - instance.Spotlights(e["front"], e["back"], e["dark"]); - } - }, - parameters = new List() - { - new Param("front", true, "Front Lights", "Enables the spotlights on the front frogs."), - new Param("back", false, "Back Lights", "Enables the spotlights on the back frogs."), - new Param("dark", true, "Darken Stage", "Darkens the stage, allowing the spotlights to be seen."), - }, - defaultLength = 0.5f, - }, new GameAction("mouthwide", "Open Mouth (Wide)") { function = delegate { @@ -147,6 +146,36 @@ namespace HeavenStudio.Games.Loaders defaultLength = 0.5f, resizable = true, }, + new GameAction("spotlights", "Spotlights") + { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { + instance.Spotlights(e["front"], e["back"], e["dark"]); + } + }, + parameters = new List() + { + new Param("front", true, "Front Lights", "Enables the spotlights on the front frogs."), + new Param("back", false, "Back Lights", "Enables the spotlights on the back frogs."), + new Param("dark", true, "Darken Stage", "Darkens the stage, allowing the spotlights to be seen."), + }, + defaultLength = 0.5f, + }, + new GameAction("pitching", "Enable Pitched Voices") + { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { + instance.Pitching(e["enabled"]); + } + }, + parameters = new List() + { + new Param("enabled", true, "Enable Pitching", "Makes the frog voices pitch up and down based on the song's tempo."), + }, + defaultLength = 0.5f, + }, } ); } @@ -169,6 +198,7 @@ namespace HeavenStudio.Games [SerializeField] public GameObject Darkness; [SerializeField] public GameObject SpotlightFront; [SerializeField] public GameObject SpotlightBack; + [SerializeField] public SpriteRenderer Mike; List AllFrogs = new(); List FrontFrogs = new(); List BackFrogs = new(); @@ -183,14 +213,8 @@ namespace HeavenStudio.Games double startNoHop = double.MinValue; double startRegularHop = double.MinValue; - - public enum WhoBops - { - Front, - Back, - All, - None, - } + float globalPitch = 1; + bool usesGlobalePitch = false; //oops i spelled global wrong lmao const int IAAltDownCat = IAMAXCAT; const int IAAltUpCat = IAMAXCAT + 1; @@ -244,25 +268,38 @@ namespace HeavenStudio.Games whoToInputKTB = AllFrogs; } - public void LateUpdate() + public void Update() { + //voice pitch stuff below + + globalPitch = (float)Conductor.instance.GetBpmAtBeat(Conductor.instance.songPositionInBeatsAsDouble) / 156; + //whiff stuff below - //if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress)) - //{ - // PlayerFrog.Hop(); - //} -// - //if (PlayerInput.GetIsAction(InputAction_AltPress) && !IsExpectingInputNow(InputAction_AltPress)) - //{ - // PlayerFrog.Charge(); - //} -// - //if (PlayerInput.GetIsAction(InputAction_AltRelease) && !IsExpectingInputNow(InputAction_AltRelease)) - //{ - // PlayerFrog.Spin(); - //} + if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress)) + { + PlayerFrog.Hop(); + SoundByte.PlayOneShot("miss"); + LightMiss(true); + } + if (PlayerInput.GetIsAction(InputAction_AltPress) && !IsExpectingInputNow(InputAction_AltPress) && PlayerInput.CurrentControlStyle != InputController.ControlStyles.Touch) + { + PlayerFrog.Charge(); + SoundByte.PlayOneShot("miss"); + LightMiss(true); + } + + if (PlayerInput.GetIsAction(InputAction_AltRelease) && !IsExpectingInputNow(InputAction_AltRelease)) + { + PlayerFrog.Spin(); + SoundByte.PlayOneShotGame("frogHop/sigh", volume: 1.5f); + LightMiss(true); + } + } + + public void LateUpdate() + { //ktb stuff below if (wantHop != double.MinValue) @@ -306,22 +343,21 @@ namespace HeavenStudio.Games //frog hop methods #region Frog Hop Methods - public void Bop(double beat, float length, int bop) + public void Bop(double beat, float length, bool blue, bool orange, bool greens) { - var bopInterp = new List(); + var FrogsToBop = new List(); + + if (blue) FrogsToBop.Add(SingerFrog); + if (orange) FrogsToBop.Add(LeaderFrog); + if (greens) FrogsToBop.AddRange(BackFrogs); - switch (bop) - { - case 0: bopInterp = FrontFrogs; break; - case 1: bopInterp = BackFrogs; break; - case 2: bopInterp = AllFrogs; break; - default: break; - } var actions = new List(); + for (int i = 0; i < length; i++) { - actions.Add(new(beat + i, delegate { BopAnimation(bopInterp); })); + actions.Add(new(beat + i, delegate { BopAnimation(FrogsToBop); })); } + BeatAction.New(this, actions); } @@ -336,16 +372,16 @@ namespace HeavenStudio.Games var sounds = new List(); actions.Add(new(beat + 0.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT1", beat + 0.0)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT1", beat + 0.0, usesGlobalePitch ? globalPitch : 1)); actions.Add(new(beat + 1.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT2", beat + 1.0)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT2", beat + 1.0, usesGlobalePitch ? globalPitch : 1)); actions.Add(new(beat + 2.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT3", beat + 2.0)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT3", beat + 2.0, usesGlobalePitch ? globalPitch : 1)); actions.Add(new(beat + 3.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT4", beat + 3.0)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT4", beat + 3.0, usesGlobalePitch ? globalPitch : 1)); BeatAction.New(this, actions); MultiSound.Play(sounds); @@ -358,7 +394,17 @@ namespace HeavenStudio.Games wantHop = beat - 1; } - public void TwoHop (double beat, bool spotlights) + public void Stop (double beat) + { + keepHopping = false; + } + + public void Pitching(bool enabled) + { + usesGlobalePitch = enabled; + } + + public void TwoHop (double beat, bool spotlights, bool jumpinJazz) { CueCommon(beat, spotlights); @@ -367,17 +413,17 @@ namespace HeavenStudio.Games //call actions.Add(new(beat + 0.0, delegate { NPCHop(FrontFrogs); Talk(new List() { LeaderFrog }, "Wide", beat); })); - actions.Add(new(beat + 0.5, delegate { NPCHop(FrontFrogs, true); Talk(new List() { LeaderFrog }, "Narrow", beat + 1.5); })); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HA", beat)); + actions.Add(new(beat + 0.5, delegate { NPCHop(FrontFrogs, true); Talk(new List() { LeaderFrog }, "Narrow", jumpinJazz ? beat + 2.5 : beat + 1.5); })); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HA", beat, usesGlobalePitch ? globalPitch : 1)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_POP_DEFAULT", beat)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HAAI", beat + 0.5)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HAAI", beat + 0.5, usesGlobalePitch ? globalPitch : 1)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_POP_HAAI", beat + 0.5)); //response actions.Add(new(beat + 2.0, delegate { NPCHop(BackFrogs); Talk(BackFrogs, "Wide", beat); })); - actions.Add(new(beat + 2.5, delegate { NPCHop(BackFrogs, true); Talk(BackFrogs, "Narrow", beat + 3.5); })); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HA", beat + 2.0)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HAAI", beat + 2.5)); + actions.Add(new(beat + 2.5, delegate { NPCHop(BackFrogs, true); Talk(BackFrogs, "Narrow", jumpinJazz ? beat + 4.5 : beat + 3.5); })); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HA", beat + 2.0, usesGlobalePitch ? globalPitch : 1)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HAAI", beat + 2.5, usesGlobalePitch ? globalPitch : 1)); //inputs ScheduleInput(beat, 2.0, InputAction_BasicPress, PlayerHopYa, PlayerMiss, Nothing); @@ -387,7 +433,7 @@ namespace HeavenStudio.Games MultiSound.Play(sounds); } - public void ThreeHop (double beat, bool spotlights) + public void ThreeHop (double beat, bool spotlights, bool jumpinJazz) { CueCommon(beat, spotlights); @@ -395,23 +441,23 @@ namespace HeavenStudio.Games var sounds = new List(); //call - actions.Add(new(beat + 0.0, delegate { NPCHop(FrontFrogs); Talk(new List() { LeaderFrog }, "Narrow", beat); })); - actions.Add(new(beat + 0.5, delegate { NPCHop(FrontFrogs); Talk(new List() { LeaderFrog }, "Narrow", beat); })); - actions.Add(new(beat + 1.0, delegate { NPCHop(FrontFrogs, true); Talk(new List() { LeaderFrog }, "Narrow", beat); })); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HAI", beat)); + actions.Add(new(beat + 0.0, delegate { NPCHop(FrontFrogs); Talk(new List() { LeaderFrog }, "Narrow", jumpinJazz ? beat + 2.5 : beat); })); + actions.Add(new(beat + 0.5, delegate { NPCHop(FrontFrogs); if (!jumpinJazz) Talk(new List() { LeaderFrog }, "Narrow", beat); })); + actions.Add(new(beat + 1.0, delegate { NPCHop(FrontFrogs, true); if (!jumpinJazz) Talk(new List() { LeaderFrog }, "Narrow", beat); })); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HAI", beat, usesGlobalePitch ? globalPitch : 1)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_POP_DEFAULT", beat)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HAI", beat + 0.5)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HAI", beat + 0.5, usesGlobalePitch ? globalPitch : 1)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_POP_DEFAULT", beat + 0.5)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HAI", beat + 1.0)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HAI", beat + 1.0, usesGlobalePitch ? globalPitch : 1)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_POP_DEFAULT", beat + 1.0)); //response - actions.Add(new(beat + 2.0, delegate { NPCHop(BackFrogs); Talk(BackFrogs, "Narrow", beat); })); - actions.Add(new(beat + 2.5, delegate { NPCHop(BackFrogs); Talk(BackFrogs, "Narrow", beat); })); - actions.Add(new(beat + 3.0, delegate { NPCHop(BackFrogs, true); Talk(BackFrogs, "Narrow", beat); })); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HAI", beat + 2.0)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HAI", beat + 2.5)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HAI", beat + 3.0)); + actions.Add(new(beat + 2.0, delegate { NPCHop(BackFrogs); Talk(BackFrogs, "Narrow", jumpinJazz ? beat + 4.5 : beat); })); + actions.Add(new(beat + 2.5, delegate { NPCHop(BackFrogs); if (!jumpinJazz) Talk(BackFrogs, "Narrow", beat); })); + actions.Add(new(beat + 3.0, delegate { NPCHop(BackFrogs, true); if (!jumpinJazz) Talk(BackFrogs, "Narrow", beat); })); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HAI", beat + 2.0, usesGlobalePitch ? globalPitch : 1)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HAI", beat + 2.5, usesGlobalePitch ? globalPitch : 1)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HAI", beat + 3.0, usesGlobalePitch ? globalPitch : 1)); //inputs ScheduleInput(beat, 2.0, InputAction_BasicPress, PlayerHopYeah, PlayerMiss, Nothing); @@ -422,7 +468,7 @@ namespace HeavenStudio.Games MultiSound.Play(sounds); } - public void SpinItBoys (double beat, bool spotlights) + public void SpinItBoys (double beat, bool spotlights, bool jumpinJazz) { CueCommon(beat, spotlights); @@ -432,22 +478,22 @@ namespace HeavenStudio.Games //call actions.Add(new(beat + 0.0, delegate { NPCCharge(FrontFrogs); Talk(new List() { LeaderFrog }, "Narrow", beat); })); actions.Add(new(beat + 1.0, delegate { NPCSpin(FrontFrogs); Talk(new List() { LeaderFrog }, "Wide", beat); })); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_KURU_1", beat)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_KURU_2", beat + 0.5)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_LIN", beat + 1.0)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_KURU_1", beat, usesGlobalePitch ? globalPitch : 1)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_KURU_2", beat + 0.5, usesGlobalePitch ? globalPitch : 1)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_LIN", beat + 1.0, usesGlobalePitch ? globalPitch : 1)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_SPIN", beat + 1.0)); //response - actions.Add(new(beat + 2.0, delegate { NPCCharge(BackFrogs); Talk(BackFrogs, "Narrow", beat); })); + actions.Add(new(beat + 2.0, delegate { NPCCharge(BackFrogs); Talk(BackFrogs, "Narrow", jumpinJazz ? beat + 3.0 : beat); })); actions.Add(new(beat + 3.0, delegate { NPCSpin(BackFrogs); Talk(BackFrogs, "Wide", beat); })); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_KURU_1", beat + 2.0)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_KURU_2", beat + 2.5)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_LIN", beat + 3.0)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_KURU_1", beat + 2.0, usesGlobalePitch ? globalPitch : 1)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_KURU_2", beat + 2.5, usesGlobalePitch ? globalPitch : 1)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_LIN", beat + 3.0, usesGlobalePitch ? globalPitch : 1)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_SPIN", beat + 3.0)); //inputs ScheduleInput(beat, 2.0, InputAction_AltPress, PlayerHopCharge, PlayerMiss, Nothing); - ScheduleInput(beat, 3.0, InputAction_AltRelease, PlayerSpin, PlayerMiss, Nothing); + ScheduleInput(beat, 3.0, InputAction_AltRelease, PlayerSpin, PlayerMissNoFlip, Nothing); BeatAction.New(this, actions); MultiSound.Play(sounds); @@ -472,11 +518,31 @@ namespace HeavenStudio.Games public void Spotlights(bool front, bool back, bool dark = true) { foreach (var a in FrontFrogs) { a.Darken(front || !dark); } + + if (front || !dark) Mike.color = new Color(1, 1, 1, 1); + else Mike.color = new Color(0.5f, 0.5f, 0.5f, 1); + Darkness.SetActive(dark); SpotlightFront.SetActive(front); SpotlightBack.SetActive(back); } + public void Talk(List FrogsToTalk, string syllable, double animEnd) + { + foreach (var a in FrogsToTalk) { a.Talk(syllable, animEnd); } + } + + public void Sing(string syllable, double animEnd, bool blue, bool orange, bool greens) + { + var FrogsToTalk = new List(); + + if (blue) FrogsToTalk.Add(SingerFrog); + if (orange) FrogsToTalk.Add(LeaderFrog); + if (greens) FrogsToTalk.AddRange(BackFrogs); + + Talk(FrogsToTalk, syllable, animEnd); + } + public void NPCHop(List FrogsToHop, bool isThisLong = false) { foreach (var a in FrogsToHop) { if (a != PlayerFrog) a.Hop(isLong: isThisLong); } @@ -494,35 +560,40 @@ namespace HeavenStudio.Games public void PlayerHopNormal(PlayerActionEvent caller, float state) { - SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_BEAT"); + if (state >= 1f || state <= -1f) { SoundByte.PlayOneShotGame("frogHop/miss2", volume: 1.5f); LightMiss(sweat: true); } + else SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_BEAT"); PlayerHop(); } public void PlayerHopYa(PlayerActionEvent caller, float state) { - SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_HA"); - SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_POP_DEFAULT"); + SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_HA", pitch: usesGlobalePitch ? globalPitch : 1); + if (state >= 1f || state <= -1f) { SoundByte.PlayOneShotGame("frogHop/miss2", volume: 1.5f); LightMiss(sweat: true); } + else SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_POP_DEFAULT"); PlayerHop(); } public void PlayerHopHoo(PlayerActionEvent caller, float state) { - SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_HAAI"); - SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_POP_HAAI"); + SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_HAAI", pitch: usesGlobalePitch ? globalPitch : 1); + if (state >= 1f || state <= -1f) { SoundByte.PlayOneShotGame("frogHop/miss2", volume: 1.5f); LightMiss(sweat: true); } + else SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_POP_HAAI"); PlayerHop(true); } public void PlayerHopYeah(PlayerActionEvent caller, float state) { - SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_HAI"); - SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_POP_DEFAULT"); + SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_HAI", pitch: usesGlobalePitch ? globalPitch : 1); + if (state >= 1f || state <= -1f) { SoundByte.PlayOneShotGame("frogHop/miss2", volume: 1.5f); LightMiss(sweat: true); } + else SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_POP_DEFAULT"); PlayerHop(); } public void PlayerHopYeahAccent(PlayerActionEvent caller, float state) { - SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_HAI"); - SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_POP_DEFAULT"); + SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_HAI", pitch: usesGlobalePitch ? globalPitch : 1); + if (state >= 1f || state <= -1f) { SoundByte.PlayOneShotGame("frogHop/miss2", volume: 1.5f); LightMiss(sweat: true); } + else SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_POP_DEFAULT"); PlayerHop(true); } @@ -538,43 +609,45 @@ namespace HeavenStudio.Games MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_P_KURU_1", beat), - new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_P_KURU_2", beat + 0.5) + new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_P_KURU_1", beat, usesGlobalePitch ? globalPitch : 1), + new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_P_KURU_2", beat + 0.5, usesGlobalePitch ? globalPitch : 1) }); + if (state >= 1f || state <= -1f) { SoundByte.PlayOneShotGame("frogHop/miss2", volume: 1.5f); LightMiss(sweat: true); } globalAnimSide *= -1; PlayerFrog.Charge(globalAnimSide); } public void PlayerSpin(PlayerActionEvent caller, float state) { - SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_LIN"); + SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_P_LIN", pitch: usesGlobalePitch ? globalPitch : 1); + if (state >= 1f || state <= -1f) { SoundByte.PlayOneShotGame("frogHop/miss2", volume: 1.5f); LightMiss(); } PlayerFrog.Spin(); } public void PlayerMiss(PlayerActionEvent caller) { globalAnimSide *= -1; + LightMiss(); + + if (globalAnimSide > 0) PlayerFrog.Bump(); + } + + public void PlayerMissNoFlip(PlayerActionEvent caller) + { + LightMiss(); + PlayerFrog.Bump(); + } + + public void LightMiss(bool whiff = false, bool sweat = false) + { + if (whiff) ScoreMiss(0.5f); + if (sweat) PlayerFrog.Sweat(); + foreach (var a in OtherFrogs) { a.Glare(); } } public void Nothing(PlayerActionEvent caller) { } - public void Talk(List FrogsToTalk, string syllable, double animEnd) - { - foreach (var a in FrogsToTalk) { a.Talk(syllable, animEnd); } - } - - public void Sing(string syllable, double animEnd, bool blue, bool orange, bool greens) - { - var FrogsToTalk = new List(); - - if (blue) FrogsToTalk.Add(SingerFrog); - if (orange) FrogsToTalk.Add(LeaderFrog); - if (greens) FrogsToTalk.AddRange(BackFrogs); - - Talk(FrogsToTalk, syllable, animEnd); - } - #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/Games/FrogHop/ntrFrog.cs b/Assets/Scripts/Games/FrogHop/ntrFrog.cs index 4a0de815f..47378e9d1 100644 --- a/Assets/Scripts/Games/FrogHop/ntrFrog.cs +++ b/Assets/Scripts/Games/FrogHop/ntrFrog.cs @@ -14,10 +14,12 @@ namespace HeavenStudio.Games.Scripts_FrogHop [SerializeField] public Animator FrogAnim; [SerializeField] public List SpriteParts = new(); + [SerializeField] public Transform MissFace; [NonSerialized] public int animSide = -1; [NonSerialized] public float scaleConstant = 1; [NonSerialized] public string loopAnim = null; + [NonSerialized] public bool isBumped = false; #endregion @@ -37,6 +39,7 @@ namespace HeavenStudio.Games.Scripts_FrogHop public void Bop() { FrogAnim.DoScaledAnimationAsync("Bop", 0.5f, animLayer: 0); + isBumped = false; } public void Update() @@ -46,6 +49,13 @@ namespace HeavenStudio.Games.Scripts_FrogHop public void Talk(string type, double animEnd) { + SpriteRenderer isMissing = null; + if (MissFace != null) + { + isMissing = MissFace.GetComponent(); + if (isMissing.enabled) return; + } + loopAnim = type; BeatAction.New(this, new List() { new BeatAction.Action(animEnd, delegate { FrogAnim.DoScaledAnimationAsync("Talk" + type, 0.5f, 0.5f, 1); loopAnim = null; }) }); @@ -57,6 +67,8 @@ namespace HeavenStudio.Games.Scripts_FrogHop FrogAnim.transform.localScale = new Vector3(animSide * scaleConstant, scaleConstant, 1); FrogAnim.DoScaledAnimationAsync(isLong ? "LongHop" : "Hop", 0.5f, animLayer: 0); + + isBumped = false; } public void Charge(int side = 0) @@ -65,17 +77,47 @@ namespace HeavenStudio.Games.Scripts_FrogHop FrogAnim.transform.localScale = new Vector3(animSide * scaleConstant, scaleConstant, 1); FrogAnim.DoScaledAnimationAsync("Charge", 0.5f, animLayer: 0); + + isBumped = false; } public void Spin() { FrogAnim.DoScaledAnimationAsync("Spin", 0.5f, animLayer: 0); + + isBumped = false; + } + + public void Glare() + { + FrogAnim.DoScaledAnimationAsync("Glare", 0.5f, 0.5f, 1); + } + + public void Sweat() + { + FrogAnim.DoScaledAnimationAsync("Sweat", 0.5f, 0.5f, animLayer: 2); + } + + public void Bump() + { + if (!isBumped) + { + isBumped = true; + FrogAnim.transform.localScale = new Vector3(scaleConstant, scaleConstant, 1); + + FrogAnim.DoScaledAnimationAsync("Ouch", 0.5f, 0.5f, 1); + FrogAnim.DoScaledAnimationAsync("Bump", 0.5f, animLayer: 0); + + SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_MISS"); + SoundByte.PlayOneShotGame("frogHop/SE_NTR_FROG_EN_MISS_BOING"); + } } public void SwapSide(int side) { if (side != 0) animSide = side; else animSide *= -1; + if (MissFace != null) MissFace.localScale = new Vector3(animSide, 1, 1); } public void Darken(bool reverse = false)