From 214fc771934eda401c93a2bc49bfa564e420c6e2 Mon Sep 17 00:00:00 2001 From: ThePurpleAnon <100617766+ThePurpleAnon@users.noreply.github.com> Date: Sun, 19 May 2024 16:15:33 -0500 Subject: [PATCH] Frog Hop - The Rest of the Features (#942) * frogge * a frogge * le froge * a frogge bip * added spins that don't work i mean forgge * spin it boys le frogge * sounds are working i mean le frogge * changing the prefab bc people are stupid and dumb * frogge is almost at your door * thank you very frogge * almost done frogge * done coding frogge * anim stuff frogge * literally almost ready to PR frogge too real * too frogging real * done frogge :3 * done lol it is done frogge * Update frogHop.prefab oopsie doopsie frogge --- Assets/Resources/Games/frogHop.prefab | 598 ++++++++++++--- .../Games/FrogHop/ntrFrogBackup.prefab | 187 ++++- .../Games/FrogHop/ntrFrogLeader.prefab | 16 +- .../Games/FrogHop/ntrFrogSinger.prefab | 16 +- .../Games/FrogHop/Animations/BackupBump.anim | 212 ++++++ .../Animations/BackupFrogAnim.controller | 33 +- .../Games/FrogHop/Animations/BackupSpin.anim | 36 +- .../FrogHop/Animations/BackupTalkSpecial.anim | 708 ++++++++++++++++++ .../Animations/BackupTalkSpecial.anim.meta | 8 + .../Animations/LeaderFrogAnim.controller | 29 + .../FrogHop/Animations/LeaderTalkSpecial.anim | 447 +++++++++++ .../Animations/LeaderTalkSpecial.anim.meta | 8 + .../Animations/SingerFrogAnim.controller | 29 + .../FrogHop/Animations/SingerTalkSpecial.anim | 447 +++++++++++ .../Animations/SingerTalkSpecial.anim.meta | 8 + .../Sprites/Games/FrogHop/Gradient.png.meta | 123 +++ .../Games/FrogHop/Materials/BackupBody.mat | 6 +- .../Games/FrogHop/Materials/BackupHead.mat | 91 +++ .../FrogHop/Materials/BackupHead.mat.meta | 8 + .../Games/FrogHop/Materials/FrogBelts.mat | 91 +++ .../FrogHop/Materials/FrogBelts.mat.meta | 8 + .../Games/FrogHop/Materials/LeaderBody.mat | 6 +- .../Games/FrogHop/Materials/LeaderHead.mat | 91 +++ .../FrogHop/Materials/LeaderHead.mat.meta | 8 + .../Games/FrogHop/Materials/SingerBody.mat | 6 +- .../Games/FrogHop/Materials/SingerHead.mat | 91 +++ .../FrogHop/Materials/SingerHead.mat.meta | 8 + .../Sprites/Games/FrogHop/Materials/Stage.mat | 91 +++ .../Games/FrogHop/Materials/Stage.mat.meta | 8 + .../Games/FrogHop/froghopupscale4096.png.meta | 270 ++++++- Assets/Scripts/Games/FrogHop/FrogHop.cs | 683 +++++++++++++++-- Assets/Scripts/Games/FrogHop/ntrFrog.cs | 33 +- 32 files changed, 4167 insertions(+), 237 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkSpecial.anim create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkSpecial.anim.meta create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkSpecial.anim create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkSpecial.anim.meta create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkSpecial.anim create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkSpecial.anim.meta create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Gradient.png.meta create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Materials/BackupHead.mat create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Materials/BackupHead.mat.meta create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Materials/FrogBelts.mat create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Materials/FrogBelts.mat.meta create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderHead.mat create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderHead.mat.meta create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Materials/SingerHead.mat create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Materials/SingerHead.mat.meta create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Materials/Stage.mat create mode 100644 Assets/Resources/Sprites/Games/FrogHop/Materials/Stage.mat.meta diff --git a/Assets/Resources/Games/frogHop.prefab b/Assets/Resources/Games/frogHop.prefab index 72ced249..172ff255 100644 --- a/Assets/Resources/Games/frogHop.prefab +++ b/Assets/Resources/Games/frogHop.prefab @@ -26,7 +26,7 @@ RectTransform: m_GameObject: {fileID: 1957333825293202123} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 60, y: 11, z: 1} + m_LocalScale: {x: 200, y: 150, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 643350981976857931} @@ -210,10 +210,11 @@ Transform: - {fileID: 8800942377380684017} - {fileID: 5896889490787685960} - {fileID: 8340049764906587942} + - {fileID: 5985995335340767571} - {fileID: 665267706566016202} - {fileID: 3672416108430647415} - - {fileID: 3251596049959148941} - {fileID: 6107407590447943001} + - {fileID: 355226463457866789} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -230,7 +231,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SoundSequences: [] - scheduledInputs: [] PlayerFrog: {fileID: 295503966359763499} OtherFrogs: - {fileID: 957717307640835727} @@ -241,91 +241,24 @@ MonoBehaviour: Darkness: {fileID: 1957333825293202123} SpotlightFront: {fileID: 8406258651058782659} SpotlightBack: {fileID: 6260846628814890155} + SpotlightFrontColor: {fileID: 3731523235594691501} + SpotlightBackColor: {fileID: 8827201684015420044} Mike: {fileID: 2080936209624685161} ---- !u!1 &3684072535637705111 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3251596049959148941} - - component: {fileID: 455906784440038506} - m_Layer: 0 - m_Name: BG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3251596049959148941 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3684072535637705111} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 33, y: 0.4, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 643350981976857931} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &455906784440038506 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3684072535637705111} - 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: 0 - m_Sprite: {fileID: -942123187, 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: 1.8, y: 27} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + Mike2: {fileID: 1775850824882289999} + Stage: {fileID: 593621809109324230} + StageTop: {fileID: 9215649661797969362} + _FrogColors: + - {fileID: 2100000, guid: 35e154ebdda9d8e4db8ade46b61f9d40, type: 2} + - {fileID: 2100000, guid: 055142cae8544a0479fe3bad859e9d81, type: 2} + - {fileID: 2100000, guid: 1a21b8940d121de4d88f9e6cbb1d8897, type: 2} + - {fileID: 2100000, guid: 2d1ef6bdcdf84a0408be0fcb86d09d14, type: 2} + - {fileID: 2100000, guid: a7539100fedd4964fa42e7692aaa86dd, type: 2} + - {fileID: 2100000, guid: 3a9f6dae26fe99f4ea1aeb1592a066c8, type: 2} + - {fileID: 2100000, guid: 306bf76bed65f914cb6d63e3c485d358, type: 2} + - {fileID: 2100000, guid: e37e2bc42d5922d46859ffb98c1c8532, type: 2} + gradient: {fileID: 4771197301441571457} + bgLow: {fileID: 665131897783665543} + bgHigh: {fileID: 671081099106936405} --- !u!1 &4233280143836799923 GameObject: m_ObjectHideFlags: 0 @@ -410,6 +343,208 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4811808417601770654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 355226463457866789} + m_Layer: 0 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &355226463457866789 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4811808417601770654} + 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: 4087465951166680014} + - {fileID: 4250050188086210012} + - {fileID: 2442526550511116115} + m_Father: {fileID: 643350981976857931} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5022314642310917837 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4250050188086210012} + - component: {fileID: 671081099106936405} + m_Layer: 0 + m_Name: Color1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4250050188086210012 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5022314642310917837} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 38.353268, z: 0} + m_LocalScale: {x: 199.17188, y: 74.6719, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 355226463457866789} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &671081099106936405 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5022314642310917837} + 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: -70 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.3529412, g: 0.6117647, b: 0.15686275, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6077755733058252562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4087465951166680014} + - component: {fileID: 4771197301441571457} + m_Layer: 0 + m_Name: Gradient + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4087465951166680014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6077755733058252562} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1.0349, z: 0} + m_LocalScale: {x: 4.978325, y: 0.1368148, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 355226463457866789} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4771197301441571457 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6077755733058252562} + 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: -69 + m_Sprite: {fileID: 21300000, guid: 013e5f95212f12549aa336cf877c7741, type: 3} + m_Color: {r: 0.3529412, g: 0.6117647, b: 0.15686275, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 40, y: 30.000002} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6247206099220596406 GameObject: m_ObjectHideFlags: 0 @@ -525,7 +660,7 @@ Transform: m_Children: - {fileID: 5184237192129329593} m_Father: {fileID: 643350981976857931} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!331 &845326127449394562 SpriteMask: @@ -578,7 +713,7 @@ SpriteMask: m_BackSortingOrder: 0 m_IsCustomRangeActive: 0 m_SpriteSortPoint: 0 ---- !u!1 &7294692287861866293 +--- !u!1 &6671552557631406327 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -586,37 +721,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5896889490787685960} - - component: {fileID: 593621809109324230} + - component: {fileID: 2442526550511116115} + - component: {fileID: 665131897783665543} m_Layer: 0 - m_Name: Stage + m_Name: Color2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5896889490787685960 +--- !u!4 &2442526550511116115 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7294692287861866293} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1.91, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_GameObject: {fileID: 6671552557631406327} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -32.4, z: 0} + m_LocalScale: {x: 199.17188, y: 82.7137, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 643350981976857931} - m_RootOrder: 6 + m_Father: {fileID: 355226463457866789} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &593621809109324230 +--- !u!212 &665131897783665543 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7294692287861866293} + m_GameObject: {fileID: 6671552557631406327} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -650,7 +785,176 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: -75 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.83921576, g: 0.9333334, b: 0.6431373, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6795063011621241494 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9203636813642531590} + - component: {fileID: 9215649661797969362} + m_Layer: 0 + m_Name: StageTop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9203636813642531590 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6795063011621241494} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 1.4, z: 0} + m_LocalScale: {x: 1, y: 1.01, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5896889490787685960} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!212 &9215649661797969362 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6795063011621241494} + 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: -1 + m_Sprite: {fileID: 29431256, 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: 9.14, y: 20.56} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7294692287861866293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5896889490787685960} + - component: {fileID: 593621809109324230} + m_Layer: 0 + m_Name: Stage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5896889490787685960 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7294692287861866293} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1.91, z: 0} + m_LocalScale: {x: 0.56, y: 0.56, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9203636813642531590} + m_Father: {fileID: 643350981976857931} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &593621809109324230 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7294692287861866293} + 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: 2100000, guid: e37e2bc42d5922d46859ffb98c1c8532, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 m_Sprite: {fileID: -1741336105, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -693,7 +997,7 @@ Transform: m_Children: - {fileID: 5600193726614857350} m_Father: {fileID: 643350981976857931} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!331 &6297952489723827872 SpriteMask: @@ -746,6 +1050,90 @@ SpriteMask: m_BackSortingOrder: 0 m_IsCustomRangeActive: 0 m_SpriteSortPoint: 0 +--- !u!1 &8734431871708259266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5985995335340767571} + - component: {fileID: 1775850824882289999} + m_Layer: 0 + m_Name: Mike2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5985995335340767571 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8734431871708259266} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 5.101, y: -2.092, z: 0} + m_LocalScale: {x: 0.4539407, y: 0.4539407, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 643350981976857931} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1775850824882289999 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8734431871708259266} + 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: 30 + m_Sprite: {fileID: -1139616345, 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: 18.08, y: 9.46} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &134019144269366331 PrefabInstance: m_ObjectHideFlags: 0 @@ -838,6 +1226,10 @@ PrefabInstance: propertyPath: m_Name value: frogSinger objectReference: {fileID: 0} + - target: {fileID: 7540100217977202190, guid: c7511ce21973f1c40be9593107a96b27, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8030468029240119366, guid: c7511ce21973f1c40be9593107a96b27, type: 3} propertyPath: m_RootOrder value: 5 diff --git a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab index 521ade67..751c160e 100644 --- a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab +++ b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab @@ -168,6 +168,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3016568262142720693 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1812444507923636287} + - component: {fileID: 2089494895165657073} + m_Layer: 0 + m_Name: Tongue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1812444507923636287 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3016568262142720693} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.141, y: -0.895, z: 0} + m_LocalScale: {x: 1.0810812, y: 0.9302326, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2983375294669822441} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2089494895165657073 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3016568262142720693} + 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: 11 + m_Sprite: {fileID: 513611013, 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.52, y: 0.62} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3454404079075504657 GameObject: m_ObjectHideFlags: 0 @@ -336,6 +420,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3719553269274448688 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7234153482127955681} + - component: {fileID: 5706834139779863340} + m_Layer: 0 + m_Name: Belt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7234153482127955681 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3719553269274448688} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.015, y: 3.78, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8030468029240119366} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5706834139779863340 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3719553269274448688} + 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: 2100000, guid: 306bf76bed65f914cb6d63e3c485d358, type: 2} + 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: 1460441637, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + m_Color: {r: 0, g: 0, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.7, y: 1.28} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &4703565576716381731 GameObject: m_ObjectHideFlags: 0 @@ -472,7 +640,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 3a9f6dae26fe99f4ea1aeb1592a066c8, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -642,7 +810,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 3a9f6dae26fe99f4ea1aeb1592a066c8, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -793,6 +961,7 @@ Transform: - {fileID: 4348813302560787042} - {fileID: 1315192144780574573} - {fileID: 111554353140638987} + - {fileID: 7234153482127955681} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -836,8 +1005,17 @@ MonoBehaviour: - {fileID: 909234933672240153} - {fileID: 3660695675016261408} - {fileID: 4265139066045870079} + - {fileID: 2089494895165657073} MissFace: {fileID: 2983375294669822441} Head: {fileID: 406877900976759553} + Belt: {fileID: 5706834139779863340} + BodyMat: + - {fileID: 4338800780392838371} + - {fileID: 3660695675016261408} + HeadMat: + - {fileID: 406877900976759553} + - {fileID: 4265139066045870079} + - {fileID: 909234933672240153} --- !u!1 &8095984365337491922 GameObject: m_ObjectHideFlags: 0 @@ -866,7 +1044,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1812444507923636287} m_Father: {fileID: 2274190441780666158} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -890,7 +1069,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 3a9f6dae26fe99f4ea1aeb1592a066c8, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogLeader.prefab b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogLeader.prefab index 260ed2a7..45827f59 100644 --- a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogLeader.prefab +++ b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogLeader.prefab @@ -220,7 +220,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 2d1ef6bdcdf84a0408be0fcb86d09d14, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -304,7 +304,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 35e154ebdda9d8e4db8ade46b61f9d40, type: 2} + - {fileID: 2100000, guid: 306bf76bed65f914cb6d63e3c485d358, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -326,7 +326,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 20 m_Sprite: {fileID: 1460441637, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 1, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -411,11 +411,17 @@ MonoBehaviour: SpriteParts: - {fileID: 4338800780392838371} - {fileID: 406877900976759553} - - {fileID: 4128693103407085196} - {fileID: 5161764168841387940} - {fileID: 1060326674701855250} MissFace: {fileID: 0} Head: {fileID: 406877900976759553} + Belt: {fileID: 4128693103407085196} + BodyMat: + - {fileID: 4338800780392838371} + - {fileID: 1060326674701855250} + HeadMat: + - {fileID: 406877900976759553} + - {fileID: 5161764168841387940} --- !u!1 &8765760830273088637 GameObject: m_ObjectHideFlags: 0 @@ -468,7 +474,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 2d1ef6bdcdf84a0408be0fcb86d09d14, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogSinger.prefab b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogSinger.prefab index dfe6cd83..c0a9a373 100644 --- a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogSinger.prefab +++ b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogSinger.prefab @@ -52,7 +52,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1a21b8940d121de4d88f9e6cbb1d8897, type: 2} + - {fileID: 2100000, guid: 306bf76bed65f914cb6d63e3c485d358, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -74,7 +74,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 20 m_Sprite: {fileID: 1460441637, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -220,7 +220,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 055142cae8544a0479fe3bad859e9d81, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -304,7 +304,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 055142cae8544a0479fe3bad859e9d81, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -495,8 +495,14 @@ MonoBehaviour: SpriteParts: - {fileID: 5007591078639621851} - {fileID: 4042941232235986953} - - {fileID: 1307665614508407357} - {fileID: 5367215990793986928} - {fileID: 8895987175637078968} MissFace: {fileID: 0} Head: {fileID: 4042941232235986953} + Belt: {fileID: 1307665614508407357} + BodyMat: + - {fileID: 5007591078639621851} + - {fileID: 8895987175637078968} + HeadMat: + - {fileID: 4042941232235986953} + - {fileID: 5367215990793986928} diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupBump.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupBump.anim index 7c165498..f3d4ae4c 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupBump.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupBump.anim @@ -135,6 +135,49 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Pow + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.015, y: 3.78, 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.3, y: 3.853, 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.3, y: 3.836, 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.391, y: 3.749, 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: Belt m_ScaleCurves: [] m_FloatCurves: - curve: @@ -198,6 +241,19 @@ AnimationClip: path: Body classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 1460441637, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - time: 0.033333335 + value: {fileID: -438793446, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - time: 0.083333336 + value: {fileID: 604808928, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - time: 0.13333334 + value: {fileID: 1283662042, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + attribute: m_Sprite + path: Belt + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -226,6 +282,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3227899887 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3220792405 attribute: 3305885265 @@ -247,11 +310,22 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 3227899887 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: -468438990, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - {fileID: -564548870, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - {fileID: 624937397, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - {fileID: 1205983044, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: 1460441637, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: -438793446, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: 604808928, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: 1283662042, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -707,6 +781,144 @@ AnimationClip: path: Pow classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.015 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0.391 + 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: Belt + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.78 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 3.853 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 3.836 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 3.749 + 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: Belt + 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: Belt + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller index 1308eae7..d8f0e9f9 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller @@ -212,6 +212,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-3223211896180632501 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TalkSpecial + 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: 0893125bc1bcf0b4e80a0fe171815998, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-870158378032232553 AnimatorState: serializedVersion: 6 @@ -630,10 +656,13 @@ AnimatorStateMachine: m_Position: {x: 300, y: 0, z: 0} - serializedVersion: 1 m_State: {fileID: 126627792101002642} - m_Position: {x: 300, y: 100, z: 0} + m_Position: {x: 300, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: 3576333960843551535} - m_Position: {x: 300, y: 150, z: 0} + m_Position: {x: 300, y: 250, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3223211896180632501} + m_Position: {x: 300, y: 100, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSpin.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSpin.anim index 8de22ebf..2edb3ce6 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSpin.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupSpin.anim @@ -259,7 +259,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: -0.43800002, y: 4.6200004, z: 0} + value: {x: -0.43800002, y: 4.651, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -268,7 +268,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.28333333 - value: {x: 0.09200002, y: 4.448, z: 0} + value: {x: 0.068, y: 4.448, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -834,19 +834,19 @@ AnimationClip: - time: 0.06666667 value: {fileID: 0} - time: 0.13333334 - value: {fileID: 647119415, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + value: {fileID: 1740560889, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - time: 0.16666667 - value: {fileID: 1887587326, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + value: {fileID: -478035561, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - time: 0.2 - value: {fileID: 1415065090, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + value: {fileID: -1764988201, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - time: 0.23333333 - value: {fileID: -209849157, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + value: {fileID: 508067280, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - time: 0.28333333 - value: {fileID: 1124813998, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + value: {fileID: -2143145897, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - time: 0.35 - value: {fileID: 43378358, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + value: {fileID: 1164913045, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - time: 0.41666666 - value: {fileID: -1942676046, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + value: {fileID: 411833461, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} attribute: m_Sprite path: Belt classID: 212 @@ -1035,13 +1035,13 @@ AnimationClip: - {fileID: 1917159354, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - {fileID: 0} - {fileID: 0} - - {fileID: 647119415, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - - {fileID: 1887587326, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - - {fileID: 1415065090, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - - {fileID: -209849157, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - - {fileID: 1124813998, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - - {fileID: 43378358, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - - {fileID: -1942676046, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: 1740560889, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: -478035561, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: -1764988201, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: 508067280, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: -2143145897, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: 1164913045, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: 411833461, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - {fileID: 1845367735, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - {fileID: -1867282743, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} - {fileID: -692138095, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} @@ -2136,7 +2136,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.28333333 - value: 0.09200002 + value: 0.068 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2200,7 +2200,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 4.6200004 + value: 4.651 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkSpecial.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkSpecial.anim new file mode 100644 index 00000000..62639629 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkSpecial.anim @@ -0,0 +1,708 @@ +%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: BackupTalkSpecial + 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: 0, z: 0} + inSlope: {x: -0, y: -0, 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.0825, 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.21666667 + value: {x: 0, y: 0.04125001, 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.25 + value: {x: 0, y: 0.0272, 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.28333333 + value: {x: 0, y: 0, 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 + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: -0, y: -0, 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.925, y: 1.075, z: 1} + 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.21666667 + 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 + 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.25 + 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 + 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.28333333 + value: {x: 1, y: 1, z: 1} + 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 + 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.15 + 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: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.15 + 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/MissFace + 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.15 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Head/MissFace/Tongue + classID: 1 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1268735488, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - time: 0.15 + value: {fileID: -42314129, 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: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - 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: 2457983851 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1459982307 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1268735488, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: -42314129, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.28333333 + 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: -0 + outSlope: 0 + tangentMode: 69 + 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 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + 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.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -0 + outSlope: 0.55 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0.0825 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0.04125001 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0.0272 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + 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.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + 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 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + 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: -0 + outSlope: -0.4999999 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0.925 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0.9625 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0.98125 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 1 + 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_LocalScale.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -0 + outSlope: 0.5000003 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1.075 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 1.0375 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1.01875 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 1 + 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_LocalScale.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 1 + 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_LocalScale.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.15 + 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: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.15 + 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/MissFace + 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.15 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Head/MissFace/Tongue + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkSpecial.anim.meta b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkSpecial.anim.meta new file mode 100644 index 00000000..0f823b03 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupTalkSpecial.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0893125bc1bcf0b4e80a0fe171815998 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderFrogAnim.controller b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderFrogAnim.controller index 54bd8b72..5ada32b4 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderFrogAnim.controller +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderFrogAnim.controller @@ -279,6 +279,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &6177973819351591783 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TalkSpecial + 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: af876488e5d3f1143aadb55f236806e4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &7806995383136529903 AnimatorState: serializedVersion: 6 @@ -323,6 +349,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 5517401737522827016} m_Position: {x: 300, y: 50, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6177973819351591783} + m_Position: {x: 300, y: 100, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkSpecial.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkSpecial.anim new file mode 100644 index 00000000..6acc5b04 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkSpecial.anim @@ -0,0 +1,447 @@ +%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: LeaderTalkSpecial + 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: 0, z: 0} + inSlope: {x: -0, y: -0, z: -0} + outSlope: {x: 0, y: -0.87099993, 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.13065, z: 0} + inSlope: {x: -0, y: Infinity, z: -0} + 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.21666667 + value: {x: 0, y: -0.06201, 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.28333333 + value: {x: 0, y: 0, 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 + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: -0, y: -0, 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.075, y: 0.925, z: 1} + 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.21666667 + 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 + 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.28333333 + value: {x: 1, y: 1, z: 1} + 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 + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -347639578, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - time: 0.15 + value: {fileID: 1029520741, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + attribute: m_Sprite + path: Head + 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: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -347639578, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: 1029520741, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.28333333 + 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: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0 + inSlope: -0 + outSlope: Infinity + tangentMode: 101 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + 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.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -0 + outSlope: -0.87099993 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: -0.13065 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -0.06201 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + 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.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0 + inSlope: -0 + outSlope: Infinity + tangentMode: 101 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + 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: -0 + outSlope: 0.5000003 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1.075 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 1.0375 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 1 + 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_LocalScale.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -0 + outSlope: -0.4999999 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0.925 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0.9625 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 1 + 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_LocalScale.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 1 + 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_LocalScale.z + path: Head + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkSpecial.anim.meta b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkSpecial.anim.meta new file mode 100644 index 00000000..da2c3c25 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkSpecial.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af876488e5d3f1143aadb55f236806e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerFrogAnim.controller b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerFrogAnim.controller index b0eb775a..da19cf68 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerFrogAnim.controller +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerFrogAnim.controller @@ -55,6 +55,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 3337163530890900461} m_Position: {x: 300, y: 50, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6088900987291230561} + m_Position: {x: 300, y: 100, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -117,6 +120,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-6088900987291230561 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TalkSpecial + 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: e3cbb980c145d7c40bbe7fc8ae61f6f0, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-5194092987606448266 AnimatorState: serializedVersion: 6 diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkSpecial.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkSpecial.anim new file mode 100644 index 00000000..65e85edc --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkSpecial.anim @@ -0,0 +1,447 @@ +%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: SingerTalkSpecial + 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: 0, z: 0} + inSlope: {x: -0, y: -0, z: -0} + outSlope: {x: 0, y: -0.87099993, 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.13065, 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.21666667 + value: {x: 0, y: -0.06201, 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.28333333 + value: {x: 0, y: 0, 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 + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: -0, y: -0, 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.075, y: 0.925, z: 1} + 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.21666667 + 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 + 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.28333333 + value: {x: 1, y: 1, z: 1} + 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 + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1923961556, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - time: 0.15 + value: {fileID: -1692190699, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + attribute: m_Sprite + path: Head + 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: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 130111906 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1923961556, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + - {fileID: -1692190699, guid: 3c49c0fa809689d448ee90b3c1143d9f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.28333333 + 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: -0 + outSlope: 0 + tangentMode: 69 + 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 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + 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.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -0 + outSlope: -0.87099993 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: -0.13065 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -0.06201 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + 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.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + 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 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + 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: -0 + outSlope: 0.5000003 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1.075 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 1.0375 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 1 + 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_LocalScale.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -0 + outSlope: -0.4999999 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0.925 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0.9625 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 1 + 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_LocalScale.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 1 + 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_LocalScale.z + path: Head + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkSpecial.anim.meta b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkSpecial.anim.meta new file mode 100644 index 00000000..e22af1fe --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerTalkSpecial.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3cbb980c145d7c40bbe7fc8ae61f6f0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Gradient.png.meta b/Assets/Resources/Sprites/Games/FrogHop/Gradient.png.meta new file mode 100644 index 00000000..36922b06 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Gradient.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 013e5f95212f12549aa336cf877c7741 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: ntrfroghop/common + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/BackupBody.mat b/Assets/Resources/Sprites/Games/FrogHop/Materials/BackupBody.mat index 8d458bde..cc3525a0 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Materials/BackupBody.mat +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/BackupBody.mat @@ -84,8 +84,8 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 0.098039225, g: 0.3529412, b: 0.13725491, a: 1} - - _ColorBravo: {r: 1, g: 0.9960785, b: 0.43137258, a: 1} - - _ColorDelta: {r: 0.26666668, g: 1, b: 0.20392159, a: 1} + - _ColorAlpha: {r: 0.08627451, g: 0.32941177, b: 0.13725491, a: 1} + - _ColorBravo: {r: 1, g: 0.9686275, b: 0.41176474, a: 1} + - _ColorDelta: {r: 0.2392157, g: 0.8745099, b: 0.18823531, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/BackupHead.mat b/Assets/Resources/Sprites/Games/FrogHop/Materials/BackupHead.mat new file mode 100644 index 00000000..e5df436f --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/BackupHead.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BackupHead + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAlpha: {r: 0.2392157, g: 0.8745099, b: 0.18823531, a: 1} + - _ColorBravo: {r: 0.2392157, g: 0.8745099, b: 0.18823531, a: 1} + - _ColorDelta: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/BackupHead.mat.meta b/Assets/Resources/Sprites/Games/FrogHop/Materials/BackupHead.mat.meta new file mode 100644 index 00000000..b9341916 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/BackupHead.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a9f6dae26fe99f4ea1aeb1592a066c8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/FrogBelts.mat b/Assets/Resources/Sprites/Games/FrogHop/Materials/FrogBelts.mat new file mode 100644 index 00000000..6145f316 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/FrogBelts.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FrogBelts + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAlpha: {r: 0.9764706, g: 0.1764706, b: 0.3725491, a: 1} + - _ColorBravo: {r: 0.04705882, g: 0.34901977, b: 1, a: 1} + - _ColorDelta: {r: 0.11764711, g: 0.43529412, b: 0.09411764, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/FrogBelts.mat.meta b/Assets/Resources/Sprites/Games/FrogHop/Materials/FrogBelts.mat.meta new file mode 100644 index 00000000..aa13d931 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/FrogBelts.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 306bf76bed65f914cb6d63e3c485d358 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderBody.mat b/Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderBody.mat index b352e366..ea239567 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderBody.mat +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderBody.mat @@ -84,8 +84,8 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 0.91372555, g: 0.0627451, b: 0.35686275, a: 1} - - _ColorBravo: {r: 0.9725491, g: 0.83921576, b: 0.7843138, a: 1} - - _ColorDelta: {r: 1, g: 0.54901963, b: 0.32941177, a: 1} + - _ColorAlpha: {r: 0.9764706, g: 0.1764706, b: 0.3725491, a: 1} + - _ColorBravo: {r: 0.9764706, g: 0.84313726, b: 0.76862746, a: 1} + - _ColorDelta: {r: 1, g: 0.58431375, b: 0.30588233, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderHead.mat b/Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderHead.mat new file mode 100644 index 00000000..e3f7197d --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderHead.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LeaderHead + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAlpha: {r: 1, g: 0.58431375, b: 0.30588233, a: 1} + - _ColorBravo: {r: 0.92156863, g: 0.21176471, b: 0, a: 1} + - _ColorDelta: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderHead.mat.meta b/Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderHead.mat.meta new file mode 100644 index 00000000..bccd9b1b --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/LeaderHead.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d1ef6bdcdf84a0408be0fcb86d09d14 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/SingerBody.mat b/Assets/Resources/Sprites/Games/FrogHop/Materials/SingerBody.mat index 05c375d4..e24e4a1e 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Materials/SingerBody.mat +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/SingerBody.mat @@ -84,8 +84,8 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 0.058823533, g: 0.32156864, b: 1, a: 1} - - _ColorBravo: {r: 0.67058825, g: 0.9215687, b: 0.854902, a: 1} - - _ColorDelta: {r: 0.42352945, g: 0.64705884, b: 1, a: 1} + - _ColorAlpha: {r: 0.04705882, g: 0.34901977, b: 1, a: 1} + - _ColorBravo: {r: 0.6745098, g: 0.93333334, b: 0.8980392, a: 1} + - _ColorDelta: {r: 0.41176474, g: 0.6509805, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/SingerHead.mat b/Assets/Resources/Sprites/Games/FrogHop/Materials/SingerHead.mat new file mode 100644 index 00000000..66a18cc4 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/SingerHead.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SingerHead + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAlpha: {r: 0.41176474, g: 0.6509805, b: 1, a: 1} + - _ColorBravo: {r: 0.41176474, g: 0.6509804, b: 1, a: 1} + - _ColorDelta: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/SingerHead.mat.meta b/Assets/Resources/Sprites/Games/FrogHop/Materials/SingerHead.mat.meta new file mode 100644 index 00000000..0b5eedcf --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/SingerHead.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 055142cae8544a0479fe3bad859e9d81 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/Stage.mat b/Assets/Resources/Sprites/Games/FrogHop/Materials/Stage.mat new file mode 100644 index 00000000..d47ae151 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/Stage.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Stage + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAlpha: {r: 0.5803922, g: 0.7725491, b: 0.22352943, a: 1} + - _ColorBravo: {r: 0.7529412, g: 0.9529412, b: 0.42745098, a: 1} + - _ColorDelta: {r: 0.8352941, g: 0.9647059, b: 0.3529412, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/FrogHop/Materials/Stage.mat.meta b/Assets/Resources/Sprites/Games/FrogHop/Materials/Stage.mat.meta new file mode 100644 index 00000000..294097a7 --- /dev/null +++ b/Assets/Resources/Sprites/Games/FrogHop/Materials/Stage.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e37e2bc42d5922d46859ffb98c1c8532 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png.meta b/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png.meta index c2db1829..dd865c0d 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png.meta +++ b/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png.meta @@ -67,12 +67,12 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 + maxTextureSize: 8192 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 + textureCompression: 0 + compressionQuality: 100 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 @@ -487,8 +487,8 @@ TextureImporter: rect: serializedVersion: 2 x: 892 - y: 2864 - width: 147 + y: 2865 + width: 148 height: 159 alignment: 0 pivot: {x: 0, y: 0} @@ -865,9 +865,9 @@ TextureImporter: rect: serializedVersion: 2 x: 3069 - y: 2774 + y: 2773 width: 58 - height: 74 + height: 75 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -1200,9 +1200,9 @@ TextureImporter: name: froghopupscale4096_52 rect: serializedVersion: 2 - x: 2565 + x: 2564 y: 2481 - width: 86 + width: 87 height: 41 alignment: 0 pivot: {x: 0, y: 0} @@ -1473,10 +1473,10 @@ TextureImporter: name: froghopupscale4096_65 rect: serializedVersion: 2 - x: 2215 - y: 1624 - width: 1028 - height: 600 + x: 1958 + y: 1338 + width: 1071 + height: 620 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -1494,12 +1494,12 @@ TextureImporter: name: froghopupscale4096_66 rect: serializedVersion: 2 - x: 3284 - y: 893 + x: 3088 + y: 877 width: 90 height: 1350 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1662,10 +1662,10 @@ TextureImporter: name: froghopupscale4096_74 rect: serializedVersion: 2 - x: 2320 - y: 540 - width: 845 - height: 1002 + x: 2068 + y: 220 + width: 880 + height: 1035 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -1683,10 +1683,10 @@ TextureImporter: name: froghopupscale4096_75 rect: serializedVersion: 2 - x: 3411 - y: 508 - width: 594 - height: 841 + x: 3204 + y: 187 + width: 619 + height: 868 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -1784,6 +1784,216 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: froghopupscale4096_80 + rect: + serializedVersion: 2 + x: 2778 + y: 2635 + width: 101 + height: 30 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ed78500b8fa7da04885ed477c46ef067 + internalID: -438793446 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: froghopupscale4096_81 + rect: + serializedVersion: 2 + x: 3003 + y: 2636 + width: 83 + height: 27 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fb4b046ecdd1664478c011dd438742ab + internalID: 604808928 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: froghopupscale4096_83 + rect: + serializedVersion: 2 + x: 3221 + y: 2632 + width: 107 + height: 28 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cfc528a9507e85647836f0b605c9d30c + internalID: 1283662042 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: froghopupscale4096_82 + rect: + serializedVersion: 2 + x: 3216 + y: 2655 + width: 4 + height: 4 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e0bb41161c4f7794e90ef273c23b5f16 + internalID: 1306191882 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: froghopupscale4096_84 + rect: + serializedVersion: 2 + x: 3094 + y: 2636 + width: 8 + height: 6 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5e395dcbb86ecff44ab099d225d15a38 + internalID: 1920666639 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: froghopupscale4096_85 + rect: + serializedVersion: 2 + x: 3297 + y: 1124 + width: 476 + height: 1057 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ddf296d0d7637a848b15c0ac409a34e9 + internalID: 29431256 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: froghopupscale4096_86 + rect: + serializedVersion: 2 + x: 2027 + y: 2873 + width: 139 + height: 154 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: acd237fd42a647045bc01ac90348f5b1 + internalID: -42314129 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: froghopupscale4096_87 + rect: + serializedVersion: 2 + x: 2189 + y: 2926 + width: 26 + height: 31 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 52343728a57e45d4280bc740c530cde5 + internalID: 513611013 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: froghopupscale4096_88 + rect: + serializedVersion: 2 + x: 1658 + y: 2671 + width: 147 + height: 151 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1933a93918552a948b59e30e1106fd5b + internalID: -1692190699 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: froghopupscale4096_89 + rect: + serializedVersion: 2 + x: 1467 + y: 2460 + width: 147 + height: 151 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fe8983642b19ea847b60777878042041 + internalID: 1029520741 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -1874,6 +2084,16 @@ TextureImporter: froghopupscale4096_78: 405743774 froghopupscale4096_79: -509077333 froghopupscale4096_8: -2066054727 + froghopupscale4096_80: -438793446 + froghopupscale4096_81: 604808928 + froghopupscale4096_82: 1306191882 + froghopupscale4096_83: 1283662042 + froghopupscale4096_84: 1920666639 + froghopupscale4096_85: 29431256 + froghopupscale4096_86: -42314129 + froghopupscale4096_87: 513611013 + froghopupscale4096_88: -1692190699 + froghopupscale4096_89: 1029520741 froghopupscale4096_9: -316139819 spritePackingTag: pSDRemoveMatte: 0 diff --git a/Assets/Scripts/Games/FrogHop/FrogHop.cs b/Assets/Scripts/Games/FrogHop/FrogHop.cs index 0affdb5e..ffc9d07e 100644 --- a/Assets/Scripts/Games/FrogHop/FrogHop.cs +++ b/Assets/Scripts/Games/FrogHop/FrogHop.cs @@ -39,20 +39,43 @@ namespace HeavenStudio.Games.Loaders function = delegate { var e = eventCaller.currentEntity; if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { - instance.Count(e.beat, e["start"]); + instance.Count(e.beat, e["start"], e["leader"], e["backup"]); } }, preFunction = delegate { var e = eventCaller.currentEntity; - FrogHop.CountVox(e.beat); + FrogHop.CountVox(e.beat, e["leader"], e["backup"]); }, preFunctionLength = 0, parameters = new List() { new Param("start", true, "Start Shaking", "Start shaking after the count in."), + new Param("leader", true, "Orange Frog Counts", "Make Orange Frog count during this event."), + new Param("backup", false, "Group Counts", "Make the frogs in the back count during this event."), }, defaultLength = 4.0f, }, + new GameAction("countforce", "Count") + { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { + instance.CountForce(e.beat, e["leader"], e["backup"]); + } + }, + preFunction = delegate { + var e = eventCaller.currentEntity; + FrogHop.CountForceVox(e.beat, e["syllable"], e["leader"], e["backup"]); + }, + preFunctionLength = 0, + parameters = new List() + { + new Param("syllable", FrogHop.Number.One, "Type", "Which number the frog(s) should say."), + new Param("leader", true, "Orange Frog Counts", "Make Orange Frog count during this event."), + new Param("backup", false, "Group Counts", "Make the frogs in the back count during this event."), + }, + defaultLength = 1.0f, + }, new GameAction("hop", "Start Shaking") { preFunction = delegate { @@ -140,16 +163,22 @@ namespace HeavenStudio.Games.Loaders preFunction = delegate { var e = eventCaller.currentEntity; if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { - instance.ThankYou(e.beat, e["pitched"]); + instance.ThankYou(e.beat, e["pitched"], e["override"], e["overPitch"]); } }, parameters = new List() { - new Param("pitched", false, "Enable Pitching", "Makes the frog voices pitch up and down based on the song's tempo."), + new Param("override", false, "Pitch Override", "Whether the frog voice pitch will be determined automatically.", new List() + { + new Param.CollapseParam((x, _) => (bool)x, new string[] { "overPitch" }), + new Param.CollapseParam((x, _) => !(bool)x, new string[] { "pitched" }), + }), + new Param("overPitch", new EntityTypes.Float(0.25f, 4, 1), "Pitch", "Changes the frog voice pitch manually."), + new Param("pitched", false, "Enable Pitching", "Makes the frog voice pitch up and down based on the song's tempo."), }, defaultLength = 6.0f, }, - new GameAction("mouthwide", "Open Mouth (Wide)") + new GameAction("mouthwide", "Mouth Animation (Open Wide)") { function = delegate { var e = eventCaller.currentEntity; @@ -166,7 +195,7 @@ namespace HeavenStudio.Games.Loaders defaultLength = 0.5f, resizable = true, }, - new GameAction("mouthnarrow", "Open Mouth (Narrow)") + new GameAction("mouthnarrow", "Mouth Animation (Open Narrow)") { function = delegate { var e = eventCaller.currentEntity; @@ -183,6 +212,23 @@ namespace HeavenStudio.Games.Loaders defaultLength = 0.5f, resizable = true, }, + new GameAction("mouthspecial", "Mouth Animation (Special)") + { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { + instance.Wink("Special", e.beat + e.length, e["blue"], e["orange"], e["greens"]); + } + }, + parameters = new List() + { + new Param("blue", true, "Blue Winks", "Make Blue Frog wink during this event."), + new Param("orange", false, "Orange Smirks", "Make Orange Frog smirk during this event."), + new Param("greens", false, "Group Pogs", "Make the frogs in the back pog during this event."), + }, + defaultLength = 1f, + resizable = true, + }, new GameAction("spotlights", "Spotlights") { function = delegate { @@ -199,6 +245,141 @@ namespace HeavenStudio.Games.Loaders }, defaultLength = 0.5f, }, + new GameAction("colorSingerFrog", "Blue Frog Appearance") + { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { + instance.RecolorFrog(0, e["color1"], e["color2"], e["color3"], e["color4"], e["color5"], e["color6"], e["lipstick"], e["belt"]); + } + }, + parameters = new List() + { + new Param("color1", FrogHop.singerFrogColors[0], "Skin Color", "The color to set Blue Frog's skin to."), + new Param("color2", FrogHop.singerFrogColors[1], "Tummy Color", "The color to set Blue Frog's tummy to."), + new Param("color3", FrogHop.singerFrogColors[2], "Pants Color", "The color to set Blue Frog's pants to."), + new Param("color5", FrogHop.singerFrogColors[4], "Sclera Color", "The color to set Blue Frog's scleras to."), + new Param("belt", true, "Frog Has Belt", "Make Blue Frog wear a belt.", new List() + { + new Param.CollapseParam((x, _) => (bool)x, new string[] { "color4" }) + }), + new Param("color4", FrogHop.singerFrogColors[3], "Belt Color", "The color to set Blue Frog's belt to."), + new Param("lipstick", false, "Frog Has Lipstick", "Make Blue Frog wear lipstick.", new List() + { + new Param.CollapseParam((x, _) => (bool)x, new string[] { "color6" }) + }), + new Param("color6", FrogHop.singerFrogColors[5], "Lipstick Color", "The color to set Blue Frog's lipstick to."), + }, + defaultLength = 0.5f, + }, + new GameAction("colorLeaderFrog", "Orange Frog Appearance") + { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { + instance.RecolorFrog(2, e["color1"], e["color2"], e["color3"], e["color4"], e["color5"], e["color6"], e["lipstick"], e["belt"]); + } + }, + parameters = new List() + { + new Param("color1", FrogHop.leaderFrogColors[0], "Skin Color", "The color to set Orange Frog's skin to."), + new Param("color2", FrogHop.leaderFrogColors[1], "Tummy Color", "The color to set Orange Frog's tummy to."), + new Param("color3", FrogHop.leaderFrogColors[2], "Pants Color", "The color to set Orange Frog's pants to."), + new Param("color5", FrogHop.leaderFrogColors[4], "Sclera Color", "The color to set Orange Frog's scleras to."), + new Param("belt", true, "Frog Has Belt", "Make Orange Frog wear a belt.", new List() + { + new Param.CollapseParam((x, _) => (bool)x, new string[] { "color4" }) + }), + new Param("color4", FrogHop.leaderFrogColors[3], "Belt Color", "The color to set Orange Frog's belt to."), + new Param("lipstick", true, "Frog Has Lipstick", "Make Orange Frog wear lipstick.", new List() + { + new Param.CollapseParam((x, _) => (bool)x, new string[] { "color6" }) + }), + new Param("color6", FrogHop.leaderFrogColors[5], "Lipstick Color", "The color to set Orange Frog's lipstick to."), + }, + defaultLength = 0.5f, + }, + new GameAction("colorBackupFrog", "Green Frogs Appearance") + { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { + instance.RecolorFrog(4, e["color1"], e["color2"], e["color3"], e["color4"], e["color5"], e["color6"], e["lipstick"], e["belt"]); + } + }, + parameters = new List() + { + new Param("color1", FrogHop.backupFrogColors[0], "Skin Color", "The color to set Green Frogs' skin to."), + new Param("color2", FrogHop.backupFrogColors[1], "Tummy Color", "The color to set Green Frogs' tummy to."), + new Param("color3", FrogHop.backupFrogColors[2], "Pants Color", "The color to set Green Frogs' pants to."), + new Param("color5", FrogHop.backupFrogColors[4], "Sclera Color", "The color to set Green Frogs' scleras to."), + new Param("belt", false, "Frog Has Belt", "Make Green Frogs wear a belt.", new List() + { + new Param.CollapseParam((x, _) => (bool)x, new string[] { "color4" }) + }), + new Param("color4", FrogHop.backupFrogColors[3], "Belt Color", "The color to set Green Frogs' belt to."), + new Param("lipstick", false, "Frog Has Lipstick", "Make Green Frogs wear lipstick.", new List() + { + new Param.CollapseParam((x, _) => (bool)x, new string[] { "color6" }) + }), + new Param("color6", FrogHop.backupFrogColors[5], "Lipstick Color", "The color to set Green Frogs' lipstick to."), + }, + defaultLength = 0.5f, + }, + new GameAction("changeBgColor", "Background Appearance") + { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { + instance.ChangeBGColor(e.beat, e.length, e["colorFrom"], e["colorTo"], e["colorFrom2"], e["colorTo2"], e["ease"]); + } + }, + defaultLength = 4f, + resizable = true, + parameters = new List() + { + new Param("colorFrom", FrogHop.defaultBGColor, "Color A Start", "Set the top-most color of the background gradient at the start of the event."), + new Param("colorTo", FrogHop.defaultBGColor, "Color A End", "Set the top-most color of the background gradient at the end of the event."), + new Param("colorFrom2", FrogHop.defaultBGColorBottom, "Color B Start", "Set the bottom-most color of the background gradient at the start of the event."), + new Param("colorTo2", FrogHop.defaultBGColorBottom, "Color B End", "Set the bottom-most color of the background gradient at the end of the event."), + new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.") + } + }, + new GameAction("colorStage", "Stage Appearance") + { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { + instance.StageAppearance(e["color1"], e["color2"], e["color3"], e["color4"], e["mikeL"], e["mikeR"], e["color5"], e["color6"]); + } + }, + parameters = new List() + { + new Param("color1", FrogHop.stageColors[0], "Stage Top Color", "The color to set the stage's top to."), + new Param("color2", FrogHop.stageColors[1], "Stage Rim Color", "The color to set the stage's rim to."), + new Param("color3", FrogHop.stageColors[2], "Stage Trim Color", "The color to set the stage's trim to."), + new Param("color4", FrogHop.stageColors[3], "Stage Base Color", "The color to set the stage's base to."), + new Param("mikeL", true, "Left Microphone", "Enables the microphone in front of Blue Frog."), + new Param("mikeR", false, "Right Microphone", "Enables the microphone in front of Orange Frog."), + new Param("color5", Color.white, "Front Spotlight Color", "The color to set the front spotlights to."), + new Param("color6", Color.white, "Back Spotlight Color", "The color to set the back spotlights to."), + }, + defaultLength = 0.5f, + }, + new GameAction("disableBlue", "Toggle Blue Frog") + { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { + instance.DisableBlue(e["disable"]); + } + }, + parameters = new List() + { + new Param("disable", true, "Disable", "Makes blue frog disappear."), + }, + defaultLength = 0.5f, + }, new GameAction("force", "Force Hop") { preFunction = delegate { @@ -220,12 +401,18 @@ namespace HeavenStudio.Games.Loaders function = delegate { var e = eventCaller.currentEntity; if (eventCaller.gameManager.minigameObj.TryGetComponent(out FrogHop instance)) { - instance.Pitching(e["enabled"]); + instance.Pitching(e["pitched"], e["override"], e["overPitch"]); } }, parameters = new List() { - new Param("enabled", true, "Enable Pitching", "Makes the frog voices pitch up and down based on the song's tempo."), + new Param("override", false, "Pitch Override", "Whether the frog voice pitch will be determined automatically.", new List() + { + new Param.CollapseParam((x, _) => (bool)x, new string[] { "overPitch" }), + new Param.CollapseParam((x, _) => !(bool)x, new string[] { "pitched" }), + }), + new Param("overPitch", new EntityTypes.Float(0.25f, 4, 1), "Pitch", "Changes the frog voice pitch manually."), + new Param("pitched", false, "Enable Pitching", "Makes the frog voices pitch up and down based on the song's tempo."), }, defaultLength = 0.5f, }, @@ -244,14 +431,23 @@ namespace HeavenStudio.Games //definitions #region Definitions - [SerializeField] public ntrFrog PlayerFrog; - [SerializeField] public List OtherFrogs = new List(); - [SerializeField] public ntrFrog LeaderFrog; - [SerializeField] public ntrFrog SingerFrog; - [SerializeField] public GameObject Darkness; - [SerializeField] public GameObject SpotlightFront; - [SerializeField] public GameObject SpotlightBack; - [SerializeField] public SpriteRenderer Mike; + //general purpose stuff below + + [SerializeField] ntrFrog PlayerFrog; + [SerializeField] List OtherFrogs = new List(); + [SerializeField] ntrFrog LeaderFrog; + [SerializeField] ntrFrog SingerFrog; + [SerializeField] GameObject Darkness; + [SerializeField] GameObject SpotlightFront; + [SerializeField] GameObject SpotlightBack; + [SerializeField] SpriteRenderer SpotlightFrontColor; + [SerializeField] SpriteRenderer SpotlightBackColor; + [SerializeField] SpriteRenderer Mike; + [SerializeField] SpriteRenderer Mike2; + [SerializeField] SpriteRenderer Stage; + [SerializeField] SpriteRenderer StageTop; + [SerializeField] List _FrogColors = new List(); + List FrogColors = new(); List AllFrogs = new(); List FrontFrogs = new(); List BackFrogs = new(); @@ -267,8 +463,142 @@ namespace HeavenStudio.Games double startRegularHop = double.MinValue; static float globalPitch = 1; + float globalPitchOverride = -1; bool usesGlobalePitch = false; //oops i spelled global wrong lmao + public enum Number + { + One, + Two, + Three, + Four, + } + + //recolor stuff below + + private static readonly Dictionary singerFrogColorLookup = new() { + { 0, "#69A6FF" }, //skin + { 1, "#ACEEE5" }, //tummy + { 2, "#0C59FF" }, //pants + { 3, "#F92D5F" }, //belt + { 4, "#FFFFFF" }, //sclera + { 5, "#8B42C0" }, //lipstick + }; + private static List _singerFrogColors = new List(); + public static List singerFrogColors + { + get + { + for ( int i = 0; i < singerFrogColorLookup.Count; i++ ) + { + Color colorTemp; + ColorUtility.TryParseHtmlString(singerFrogColorLookup[i], out colorTemp); + _singerFrogColors.Add(colorTemp); + } + return _singerFrogColors; + } + } + + private static readonly Dictionary leaderFrogColorLookup = new() { + { 0, "#FF954E" }, //skin + { 1, "#F9D7C4" }, //tummy + { 2, "#F92D5F" }, //pants + { 3, "#0C59FF" }, //belt + { 4, "#FFFFFF" }, //sclera + { 5, "#EB3600" }, //lipstick + }; + private static List _leaderFrogColors = new List(); + public static List leaderFrogColors + { + get + { + for ( int i = 0; i < leaderFrogColorLookup.Count; i++ ) + { + Color colorTemp; + ColorUtility.TryParseHtmlString(leaderFrogColorLookup[i], out colorTemp); + _leaderFrogColors.Add(colorTemp); + } + return _leaderFrogColors; + } + } + + private static readonly Dictionary backupFrogColorLookup = new() { + { 0, "#3DDF30" }, //skin + { 1, "#FFF769" }, //tummy + { 2, "#165423" }, //pants + { 3, "#1E6F18" }, //belt + { 4, "#FFFFFF" }, //sclera + { 5, "#EB3600" }, //lipstick + }; + private static List _backupFrogColors = new List(); + public static List backupFrogColors + { + get + { + for ( int i = 0; i < backupFrogColorLookup.Count; i++ ) + { + Color colorTemp; + ColorUtility.TryParseHtmlString(backupFrogColorLookup[i], out colorTemp); + _backupFrogColors.Add(colorTemp); + } + return _backupFrogColors; + } + } + + private static readonly Dictionary stageColorLookup = new() { + { 0, "#FFFFFF" }, //top + { 1, "#C0F36D" }, //rim + { 2, "#D5F65A" }, //trim + { 3, "#94C539" }, //base + }; + private static List _stageColors = new List(); + public static List stageColors + { + get + { + for ( int i = 0; i < stageColorLookup.Count; i++ ) + { + Color colorTemp; + ColorUtility.TryParseHtmlString(stageColorLookup[i], out colorTemp); + _stageColors.Add(colorTemp); + } + return _stageColors; + } + } + + //bg stuff below + + [SerializeField] SpriteRenderer gradient; + [SerializeField] SpriteRenderer bgLow; + [SerializeField] SpriteRenderer bgHigh; + + double bgColorStartBeat = -1; + float bgColorLength = 0; + Util.EasingFunction.Ease lastEase; + Color colorFrom; + Color colorTo; + Color colorFrom2; + Color colorTo2; + + private static Color _defaultBGColor; + public static Color defaultBGColor + { + get + { + ColorUtility.TryParseHtmlString("#5A9C28", out _defaultBGColor); + return _defaultBGColor; + } + } + private static Color _defaultBGColorBottom; + public static Color defaultBGColorBottom + { + get + { + ColorUtility.TryParseHtmlString("#D6EEA4", out _defaultBGColorBottom); + return _defaultBGColorBottom; + } + } + const int IAAltDownCat = IAMAXCAT; const int IAAltUpCat = IAMAXCAT + 1; @@ -307,20 +637,37 @@ namespace HeavenStudio.Games public void Awake() { - globalPitch = (float)Conductor.instance.GetBpmAtBeat(Conductor.instance.songPositionInBeatsAsDouble) / 156; - - PersistThings(Conductor.instance.songPositionInBeatsAsDouble); + if (globalPitchOverride < 0) globalPitch = (float)Conductor.instance.GetBpmAtBeat(Conductor.instance.songPositionInBeatsAsDouble) / 156; + else globalPitch = globalPitchOverride; AllFrogs.Add(PlayerFrog); AllFrogs.AddRange(OtherFrogs); AllFrogs.Add(LeaderFrog); AllFrogs.Add(SingerFrog); + BackFrogs.Add(PlayerFrog); + BackFrogs.AddRange(OtherFrogs); + FrontFrogs.Add(LeaderFrog); FrontFrogs.Add(SingerFrog); - BackFrogs.Add(PlayerFrog); - BackFrogs.AddRange(OtherFrogs); + Material tempMat; + foreach (var mat in _FrogColors) + { + FrogColors.Add(new(mat)); + } + SingerFrog.AssignMaterials(FrogColors[0], FrogColors[1], FrogColors[6]); + LeaderFrog.AssignMaterials(FrogColors[2], FrogColors[3], FrogColors[6]); + SingerFrog.beltColor = Color.red; + LeaderFrog.beltColor = Color.green; + foreach (var a in BackFrogs) + { + a.AssignMaterials(FrogColors[4], FrogColors[5], FrogColors[6]); + a.beltColor = Color.blue; + } + Stage.material = FrogColors[7]; + + PersistThings(Conductor.instance.songPositionInBeatsAsDouble); whoToInputKTB = AllFrogs; } @@ -341,7 +688,7 @@ namespace HeavenStudio.Games if (entity.datamodel == "frogHop/count") { var e = entity; - Count(e.beat, e["start"]); + Count(e.beat, e["start"], e["leader"], e["backup"]); continue; } @@ -373,9 +720,14 @@ namespace HeavenStudio.Games public void Update() { + //bg stuff below + + BackgroundColorUpdate(Conductor.instance); + //voice pitch stuff below - globalPitch = (float)Conductor.instance.GetBpmAtBeat(Conductor.instance.songPositionInBeatsAsDouble) / 156; + if (globalPitchOverride < 0) globalPitch = (float)Conductor.instance.GetBpmAtBeat(Conductor.instance.songPositionInBeatsAsDouble) / 156; + else globalPitch = globalPitchOverride; //whiff stuff below @@ -472,35 +824,84 @@ namespace HeavenStudio.Games foreach (var a in FrogsToBop) { a.Bop(); } } - public void Count(double beat, bool start) + public void Count(double beat, bool start, bool leaderCounts, bool backupCounts) { var actions = new List(); - actions.Add(new(beat + 0.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); - actions.Add(new(beat + 1.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); - actions.Add(new(beat + 2.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); - actions.Add(new(beat + 3.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); + if (leaderCounts) + { + actions.Add(new(beat + 0.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); + actions.Add(new(beat + 1.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); + actions.Add(new(beat + 2.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); + actions.Add(new(beat + 3.0, delegate { Talk(new List() { LeaderFrog }, "Wide", beat); })); + } + if (backupCounts) + { + actions.Add(new(beat + 0.0, delegate { Talk(BackFrogs, "Wide", beat); })); + actions.Add(new(beat + 1.0, delegate { Talk(BackFrogs, "Wide", beat); })); + actions.Add(new(beat + 2.0, delegate { Talk(BackFrogs, "Wide", beat); })); + actions.Add(new(beat + 3.0, delegate { Talk(BackFrogs, "Wide", beat); })); + } + + actions.Sort((x, y) => x.beat.CompareTo(y.beat)); BeatAction.New(this, actions); if (start) Hop(beat + 4.0); } - public static void CountVox(double beat) + public static void CountVox(double beat, bool leaderCounts, bool backupCounts) { - globalPitch = (float)Conductor.instance.GetBpmAtBeat(Conductor.instance.songPositionInBeatsAsDouble) / 156; - bool usesGlobalePitch = GetPitched(Conductor.instance.songPositionInBeatsAsDouble); + float pitchToUse = GetPitch(Conductor.instance.songPositionInBeatsAsDouble); var sounds = new List(); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT1", beat + 0.0, usesGlobalePitch ? globalPitch : 1)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT2", beat + 1.0, usesGlobalePitch ? globalPitch : 1)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT3", beat + 2.0, usesGlobalePitch ? globalPitch : 1)); - sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT4", beat + 3.0, usesGlobalePitch ? globalPitch : 1)); + if (leaderCounts) + { + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT1", beat + 0.0, pitchToUse)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT2", beat + 1.0, pitchToUse)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT3", beat + 2.0, pitchToUse)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT4", beat + 3.0, pitchToUse)); + } + + if (backupCounts) + { + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT1_EXTRAS_CUSTOM", beat + 0.0, pitchToUse)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT2_EXTRAS_CUSTOM", beat + 1.0, pitchToUse)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT3_EXTRAS_CUSTOM", beat + 2.0, pitchToUse)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT4_EXTRAS_CUSTOM", beat + 3.0, pitchToUse)); + + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT1_PLAYER_CUSTOM", beat + 0.0, pitchToUse)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT2_PLAYER_CUSTOM", beat + 1.0, pitchToUse)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT3_PLAYER_CUSTOM", beat + 2.0, pitchToUse)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_COUNT4_PLAYER_CUSTOM", beat + 3.0, pitchToUse)); + } MultiSound.Play(sounds, forcePlay: true); } + public void CountForce(double beat, bool leaderCounts, bool backupCounts) + { + var actions = new List(); + + if (leaderCounts) Talk(new List() { LeaderFrog }, "Wide", beat); + + if (backupCounts) Talk(BackFrogs, "Wide", beat); + } + + public static void CountForceVox(double beat, int Number, bool leaderCounts, bool backupCounts) + { + float pitchToUse = GetPitch(Conductor.instance.songPositionInBeatsAsDouble); + + if (leaderCounts) SoundByte.PlayOneShotGame($"frogHop/SE_NTR_FROG_EN_COUNT" + (Number + 1)); + + if (backupCounts) + { + SoundByte.PlayOneShotGame($"frogHop/SE_NTR_FROG_EN_COUNT" + (Number + 1) + $"_EXTRAS_CUSTOM"); + SoundByte.PlayOneShotGame($"frogHop/SE_NTR_FROG_EN_COUNT" + (Number + 1) + $"_PLAYER_CUSTOM"); + } + } + public void Hop (double beat) { wantHop = beat - 1; @@ -511,9 +912,11 @@ namespace HeavenStudio.Games keepHopping = false; } - public void Pitching(bool enabled) + public void Pitching(bool enabled, bool manualPitch, float pitchValue) { - usesGlobalePitch = enabled; + usesGlobalePitch = enabled | manualPitch; + if (manualPitch) globalPitchOverride = pitchValue; + else globalPitchOverride = -1; } public void ForceHop(double beat, double length, bool front, bool back) @@ -567,14 +970,13 @@ namespace HeavenStudio.Games public static void TwoHopVox(double beat, bool enabled) { if (!enabled) return; - globalPitch = (float)Conductor.instance.GetBpmAtBeat(Conductor.instance.songPositionInBeatsAsDouble) / 156; - bool usesGlobalePitch = GetPitched(Conductor.instance.songPositionInBeatsAsDouble); + float pitchToUse = GetPitch(Conductor.instance.songPositionInBeatsAsDouble); var sounds = new List(); - 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_T_HA", beat, pitchToUse)); 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, usesGlobalePitch ? globalPitch : 1)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HAAI", beat + 0.5, pitchToUse)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_POP_HAAI", beat + 0.5)); MultiSound.Play(sounds, forcePlay: true); @@ -612,16 +1014,15 @@ namespace HeavenStudio.Games public static void ThreeHopVox(double beat, bool enabled) { if (!enabled) return; - globalPitch = (float)Conductor.instance.GetBpmAtBeat(Conductor.instance.songPositionInBeatsAsDouble) / 156; - bool usesGlobalePitch = GetPitched(Conductor.instance.songPositionInBeatsAsDouble); + float pitchToUse = GetPitch(Conductor.instance.songPositionInBeatsAsDouble); var sounds = new List(); - 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_T_HAI", beat, pitchToUse)); 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, usesGlobalePitch ? globalPitch : 1)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HAI", beat + 0.5, pitchToUse)); 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, usesGlobalePitch ? globalPitch : 1)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_HAI", beat + 1.0, pitchToUse)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_POP_DEFAULT", beat + 1.0)); MultiSound.Play(sounds, forcePlay: true); @@ -657,14 +1058,13 @@ namespace HeavenStudio.Games public static void SpinItBoysVox(double beat, bool enabled) { if (!enabled) return; - globalPitch = (float)Conductor.instance.GetBpmAtBeat(Conductor.instance.songPositionInBeatsAsDouble) / 156; - bool usesGlobalePitch = GetPitched(Conductor.instance.songPositionInBeatsAsDouble); + float pitchToUse = GetPitch(Conductor.instance.songPositionInBeatsAsDouble); var sounds = new List(); - 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_KURU_1", beat, pitchToUse)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_KURU_2", beat + 0.5, pitchToUse)); + sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_LIN", beat + 1.0, pitchToUse)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_T_SPIN", beat + 1.0)); MultiSound.Play(sounds, forcePlay: true); @@ -690,18 +1090,32 @@ namespace HeavenStudio.Games { 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); + if (front || !dark) { Mike.color = new Color(1, 1, 1, 1); Mike2.color = new Color(1, 1, 1, 1); } + else { Mike.color = new Color(0.5f, 0.5f, 0.5f, 1); Mike2.color = new Color(0.5f, 0.5f, 0.5f, 1); } Darkness.SetActive(dark); SpotlightFront.SetActive(front); SpotlightBack.SetActive(back); } - public void ThankYou(double beat, bool stretchToTempo) + public void ThankYou(double beat, bool stretchToTempo, bool manualPitch, float pitchValue) { - float pitch = stretchToTempo ? globalPitch * Conductor.instance.TimelinePitch : 1; - double offset = stretchToTempo ? (.2 / ((Conductor.instance.GetBpmAtBeat(beat) * Conductor.instance.TimelinePitch) / 156)) : .2; + float pitch; + double offset; + double stretch; + + if (!manualPitch) + { + pitch = stretchToTempo ? globalPitch * Conductor.instance.TimelinePitch : 1; + offset = stretchToTempo ? (.2 / ((Conductor.instance.GetBpmAtBeat(beat) * Conductor.instance.TimelinePitch) / 156)) : .2; + stretch = stretchToTempo ? 1 : 1 / (globalPitch * Conductor.instance.TimelinePitch); + } + else + { + pitch = pitchValue; + offset = .2 / (pitchValue / 1); + stretch = (pitchValue / Conductor.instance.TimelinePitch) / (Conductor.instance.GetBpmAtBeat(beat) / 156); + } MultiSound.Play(new MultiSound.Sound[] { @@ -710,7 +1124,6 @@ namespace HeavenStudio.Games var actions = new List(); var BlueFrog = new List() { SingerFrog }; - double stretch = stretchToTempo ? 1 : 1 / (globalPitch * Conductor.instance.TimelinePitch); actions.Add(new(beat, delegate { BopAnimation(BlueFrog); })); @@ -741,6 +1154,17 @@ namespace HeavenStudio.Games Talk(FrogsToTalk, syllable, animEnd); } + public void Wink(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); + + foreach (var a in FrogsToTalk) { a.Wink(syllable, animEnd); } + } + public void NPCHop(List FrogsToHop, bool isThisLong = false) { foreach (var a in FrogsToHop) { if (a != PlayerFrog) a.Hop(isLong: isThisLong); } @@ -846,34 +1270,167 @@ namespace HeavenStudio.Games public void Nothing(PlayerActionEvent caller) { } + public void DisableBlue(bool disable) + { + SingerFrog.gameObject.SetActive(!disable); + } + + public void RecolorFrog(int whichFrog, Color skinColor, Color tummyColor, Color pantsColor, Color beltColor, Color scleraColor, Color lipstickColor, bool lipstickEnabled, bool beltEnabled) + { + FrogColors[whichFrog + 0].SetColor("_ColorAlpha", pantsColor); + FrogColors[whichFrog + 0].SetColor("_ColorBravo", tummyColor); + FrogColors[whichFrog + 0].SetColor("_ColorDelta", skinColor); + + FrogColors[whichFrog + 1].SetColor("_ColorAlpha", skinColor); + FrogColors[whichFrog + 1].SetColor("_ColorBravo", lipstickEnabled ? lipstickColor : skinColor); + FrogColors[whichFrog + 1].SetColor("_ColorDelta", scleraColor); + + string beltToModify; + List beltToEnable; + switch (whichFrog) { + case 0: beltToModify = "_ColorAlpha"; beltToEnable = new List() { SingerFrog }; break; + case 2: beltToModify = "_ColorBravo"; beltToEnable = new List() { LeaderFrog }; break; + default: beltToModify = "_ColorDelta"; beltToEnable = BackFrogs; break; + } + + FrogColors[6].SetColor(beltToModify, beltColor); + foreach (var a in beltToEnable) { a.Belt.gameObject.SetActive(beltEnabled); } + } + + public void StageAppearance(Color stageColor1, Color stageColor2, Color stageColor3, Color stageColor4, bool leftMike, bool rightMike, Color frontSpotlightColor, Color backSpotlightColor) + { + StageTop.color = stageColor1; + FrogColors[7].SetColor("_ColorAlpha", stageColor4); + FrogColors[7].SetColor("_ColorBravo", stageColor2); + FrogColors[7].SetColor("_ColorDelta", stageColor3); + + Mike.enabled = leftMike; + Mike2.enabled = rightMike; + + Color transparent = new Color(1, 1, 1, 0.5f); + SpotlightFrontColor.color = frontSpotlightColor * transparent; + SpotlightBackColor.color = backSpotlightColor * transparent; + } + private void PersistThings(double beat) { var allEvents = GameManager.instance.Beatmap.Entities.FindAll(e => e.datamodel.Split('/')[0] is "frogHop"); var eventsBefore = allEvents.FindAll(e => e.beat < beat); - var lastPersistEvent = eventsBefore.FindLast(e => e.datamodel == "frogHop/pitching"); + var lastPersistEvent = eventsBefore.FindLast(e => e.datamodel == "frogHop/changeBgColor"); if (lastPersistEvent != null) { var e = lastPersistEvent; - Pitching(e["enabled"]); + ChangeBGColor(e.beat, e.length, e["colorFrom"], e["colorTo"], e["colorFrom2"], e["colorTo2"], e["ease"]); + } + else + { + colorFrom = defaultBGColor; + colorTo = defaultBGColor; + colorFrom2 = defaultBGColorBottom; + colorTo2 = defaultBGColorBottom; + } + + BackgroundColorUpdate(Conductor.instance); + + lastPersistEvent = eventsBefore.FindLast(e => e.datamodel == "frogHop/pitching"); + if (lastPersistEvent != null) + { + var e = lastPersistEvent; + Pitching(e["pitched"], e["override"], e["overPitch"]); + } + + lastPersistEvent = eventsBefore.FindLast(e => e.datamodel == "frogHop/colorSingerFrog"); + if (lastPersistEvent != null) + { + var e = lastPersistEvent; + RecolorFrog(0, e["color1"], e["color2"], e["color3"], e["color4"], e["color5"], e["color6"], e["lipstick"], e["belt"]); + } + + lastPersistEvent = eventsBefore.FindLast(e => e.datamodel == "frogHop/colorLeaderFrog"); + if (lastPersistEvent != null) + { + var e = lastPersistEvent; + RecolorFrog(2, e["color1"], e["color2"], e["color3"], e["color4"], e["color5"], e["color6"], e["lipstick"], e["belt"]); + } + + lastPersistEvent = eventsBefore.FindLast(e => e.datamodel == "frogHop/colorBackupFrog"); + if (lastPersistEvent != null) + { + var e = lastPersistEvent; + RecolorFrog(4, e["color1"], e["color2"], e["color3"], e["color4"], e["color5"], e["color6"], e["lipstick"], e["belt"]); + } + + lastPersistEvent = eventsBefore.FindLast(e => e.datamodel == "frogHop/colorStage"); + if (lastPersistEvent != null) + { + var e = lastPersistEvent; + StageAppearance(e["color1"], e["color2"], e["color3"], e["color4"], e["mikeL"], e["mikeR"], e["color5"], e["color6"]); + } + + lastPersistEvent = eventsBefore.FindLast(e => e.datamodel == "frogHop/spotlights"); + if (lastPersistEvent != null) + { + var e = lastPersistEvent; + Spotlights(e["front"], e["back"], e["dark"]); + } + + lastPersistEvent = eventsBefore.FindLast(e => e.datamodel == "frogHop/disableBlue"); + if (lastPersistEvent != null) + { + var e = lastPersistEvent; + DisableBlue(e["disable"]); } } - public static bool GetPitched(double beat) + public void ChangeBGColor(double beat, float length, Color color1, Color color2, Color color3, Color color4, int ease) + { + bgColorStartBeat = beat; + bgColorLength = length; + colorFrom = color1; + colorTo = color2; + colorFrom2 = color3; + colorTo2 = color4; + lastEase = (Util.EasingFunction.Ease)ease; + } + + private void BackgroundColorUpdate(Conductor cond) + { + float normalizedBeat = Mathf.Clamp01(cond.GetPositionFromBeat(bgColorStartBeat, bgColorLength)); + Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction(lastEase); + float newColorR = func(colorFrom.r, colorTo.r, normalizedBeat); + float newColorG = func(colorFrom.g, colorTo.g, normalizedBeat); + float newColorB = func(colorFrom.b, colorTo.b, normalizedBeat); + bgHigh.color = new Color(newColorR, newColorG, newColorB); + gradient.color = new Color(newColorR, newColorG, newColorB); + newColorR = func(colorFrom2.r, colorTo2.r, normalizedBeat); + newColorG = func(colorFrom2.g, colorTo2.g, normalizedBeat); + newColorB = func(colorFrom2.b, colorTo2.b, normalizedBeat); + bgLow.color = new Color(newColorR, newColorG, newColorB); + } + + public static float GetPitch(double beat) { var allEvents = GameManager.instance.Beatmap.Entities.FindAll(e => e.datamodel.Split('/')[0] is "frogHop"); var eventsBefore = allEvents.FindAll(e => e.beat < beat); - bool isPitched = false; + float finalPitch = 1; var lastPersistEvent = eventsBefore.FindLast(e => e.datamodel == "frogHop/pitching"); if (lastPersistEvent != null) { var e = lastPersistEvent; - isPitched = e["enabled"]; + if (!e["override"]) + { + if (e["pitched"]) finalPitch = (float)Conductor.instance.GetBpmAtBeat(Conductor.instance.songPositionInBeatsAsDouble) / 156; + } + else + { + finalPitch = e["overPitch"]; + } } - return isPitched; + return finalPitch; } #endregion diff --git a/Assets/Scripts/Games/FrogHop/ntrFrog.cs b/Assets/Scripts/Games/FrogHop/ntrFrog.cs index d3ae8816..41c154b3 100644 --- a/Assets/Scripts/Games/FrogHop/ntrFrog.cs +++ b/Assets/Scripts/Games/FrogHop/ntrFrog.cs @@ -16,11 +16,15 @@ namespace HeavenStudio.Games.Scripts_FrogHop [SerializeField] public List SpriteParts = new(); [SerializeField] public Transform MissFace; [SerializeField] public SpriteRenderer Head; + [SerializeField] public SpriteRenderer Belt; + [SerializeField] public List BodyMat = new(); + [SerializeField] public List HeadMat = new(); [NonSerialized] public int animSide = -1; [NonSerialized] public float scaleConstant = 1; [NonSerialized] public string loopAnim = null; [NonSerialized] public bool isBumped = false; + [NonSerialized] public Color beltColor; #endregion @@ -30,6 +34,7 @@ namespace HeavenStudio.Games.Scripts_FrogHop public void Start() { scaleConstant = FrogAnim.transform.localScale.x; + Head.flipX = animSide > 0; } #endregion @@ -62,6 +67,21 @@ namespace HeavenStudio.Games.Scripts_FrogHop { new BeatAction.Action(animEnd, delegate { FrogAnim.DoScaledAnimationAsync("Talk" + type, 0.5f, 0.5f, 1); loopAnim = null; }) }); } + public void Wink(string type, double animEnd) + { + SpriteRenderer isMissing = null; + if (MissFace != null) + { + isMissing = MissFace.GetComponent(); + if (isMissing.enabled) return; + } + + FrogAnim.DoScaledAnimationAsync("Talk" + type, 0.5f, 0.5f, 1); + + BeatAction.New(this, new List() + { new BeatAction.Action(animEnd, delegate { FrogAnim.DoScaledAnimationAsync("TalkWide", 0.5f, 1, 1); }) }); + } + public void Hop(int side = 0, bool isLong = false) { SwapSide(side); @@ -119,13 +139,20 @@ namespace HeavenStudio.Games.Scripts_FrogHop if (side != 0) animSide = side; else animSide *= -1; if (MissFace != null) MissFace.localScale = new Vector3(animSide, 1, 1); - Head.flipX = animSide > 0; + Head.flipX = animSide < 0; } public void Darken(bool reverse = false) { - if (!reverse) foreach (var a in SpriteParts) { a.color = new Color(0.5f, 0.5f, 0.5f, 1); } - else foreach (var a in SpriteParts) { a.color = new Color(1, 1, 1, 1); } + if (!reverse) { foreach (var a in SpriteParts) { a.color = new Color(0.5f, 0.5f, 0.5f, 1); } Belt.color = beltColor * new Color(0.5f, 0.5f, 0.5f, 1); } + else { foreach (var a in SpriteParts) { a.color = Color.white; } Belt.color = beltColor * Color.white; } + } + + public void AssignMaterials(Material BodyMatInput, Material HeadMatInput, Material BeltMatInput) + { + foreach (var a in BodyMat) { a.material = BodyMatInput; } + foreach (var a in HeadMat) { a.material = HeadMatInput; } + Belt.material = BeltMatInput; } #endregion