From 41675d9bbd809ea9611bef1feea3f6a116841736 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue, 17 Jan 2023 22:29:03 +0100 Subject: [PATCH] Finished all input anims, trying to fix bugs --- Assets/Resources/Games/workingDough.prefab | 551 +++++++++++------- .../Animations/Background.controller | 12 + .../Animations/Background.controller.meta | 8 + .../Animations/BackgroundBlack.anim | 53 ++ .../Animations/BackgroundBlack.anim.meta | 8 + .../Animations/BackgroundFlash.anim | 53 ++ .../Animations/BackgroundFlash.anim.meta | 8 + .../Games/WorkingDough/WorkingDough.cs | 30 +- 8 files changed, 514 insertions(+), 209 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/WorkingDough/Animations/Background.controller create mode 100644 Assets/Resources/Sprites/Games/WorkingDough/Animations/Background.controller.meta create mode 100644 Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundBlack.anim create mode 100644 Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundBlack.anim.meta create mode 100644 Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundFlash.anim create mode 100644 Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundFlash.anim.meta diff --git a/Assets/Resources/Games/workingDough.prefab b/Assets/Resources/Games/workingDough.prefab index 1bd1575e9..ff4294020 100644 --- a/Assets/Resources/Games/workingDough.prefab +++ b/Assets/Resources/Games/workingDough.prefab @@ -164,88 +164,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &187722483609391191 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4183868655151631777} - - component: {fileID: 2638987478277819149} - m_Layer: 0 - m_Name: CoverUpBigBall - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &4183868655151631777 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 187722483609391191} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.373, y: 0.379, z: 0} - m_LocalScale: {x: 2, y: 2, z: 1} - m_Children: [] - m_Father: {fileID: 8664857966238409550} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2638987478277819149 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 187722483609391191} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: -7404805908248315402, guid: 7bc82af4cf328374596aff0ade3ad198, 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.54, y: 0.54} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &235293979783291810 GameObject: m_ObjectHideFlags: 0 @@ -1300,6 +1218,106 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2322717689214915123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8143872481622385456} + - component: {fileID: 4967848311778099039} + m_Layer: 0 + m_Name: PlayerWrongInputTooWeakCurveSecond + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8143872481622385456 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2322717689214915123} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5793400924267770470} + - {fileID: 2385921571894669065} + m_Father: {fileID: 7783840079727272764} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4967848311778099039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2322717689214915123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 2890700379947741735} + - {fileID: 4393664911240074220} + normalizedTime: 0.5 +--- !u!1 &2326262125212745733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3845125901109371022} + - component: {fileID: 1779814683928860541} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3845125901109371022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2326262125212745733} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.3473256, y: 0.43953764, z: 0} + m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} + m_Children: [] + m_Father: {fileID: 7152359084356618618} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1779814683928860541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2326262125212745733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 8607846603513681346} + handleType: 0 + leftHandleLocalPosition: {x: -0.13946886, y: -0.459842, z: -0} + rightHandleLocalPosition: {x: 0.13946886, y: 0.459842, z: 0} --- !u!1 &2381724555849182230 GameObject: m_ObjectHideFlags: 0 @@ -1382,6 +1400,53 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2421662666668732080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7300243984550199186} + - component: {fileID: 4206405240897349205} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7300243984550199186 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2421662666668732080} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.490642, y: 0.59492743, z: 0} + m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} + m_Children: [] + m_Father: {fileID: 7152359084356618618} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4206405240897349205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2421662666668732080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 8607846603513681346} + handleType: 0 + leftHandleLocalPosition: {x: -0.2584646, y: 0.38661402, z: -0} + rightHandleLocalPosition: {x: 0.2584646, y: -0.38661402, z: 0} --- !u!1 &2480862097650250615 GameObject: m_ObjectHideFlags: 0 @@ -1417,6 +1482,8 @@ Transform: - {fileID: 8647614307582174740} - {fileID: 915100655504103976} - {fileID: 1644622483066383819} + - {fileID: 7152359084356618618} + - {fileID: 8143872481622385456} m_Father: {fileID: 6649979826100345915} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1713,88 +1780,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &3372940973489305557 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6937023919503173750} - - component: {fileID: 7996422698033974278} - m_Layer: 0 - m_Name: CoverUpSmallBall - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &6937023919503173750 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3372940973489305557} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.373, y: 0.379, z: 0} - m_LocalScale: {x: 2, y: 2, z: 1} - m_Children: [] - m_Father: {fileID: 8664857966238409550} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7996422698033974278 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3372940973489305557} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7027999062844758930, guid: 7bc82af4cf328374596aff0ade3ad198, 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.54, y: 0.54} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &3387628262679600308 GameObject: m_ObjectHideFlags: 0 @@ -2260,6 +2245,59 @@ Transform: m_Father: {fileID: 8664857966238409550} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3886824050635040507 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7152359084356618618} + - component: {fileID: 8607846603513681346} + m_Layer: 0 + m_Name: PlayerWrongInputTooWeakCurveFirst + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7152359084356618618 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3886824050635040507} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3845125901109371022} + - {fileID: 7300243984550199186} + m_Father: {fileID: 7783840079727272764} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8607846603513681346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3886824050635040507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 1779814683928860541} + - {fileID: 4206405240897349205} + normalizedTime: 0.5 --- !u!1 &3903811528646241144 GameObject: m_ObjectHideFlags: 0 @@ -3668,6 +3706,53 @@ MonoBehaviour: - {fileID: 3925141610230844464} - {fileID: 8127602560730923833} normalizedTime: 0.5 +--- !u!1 &6240684586513503121 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5793400924267770470} + - component: {fileID: 2890700379947741735} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5793400924267770470 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6240684586513503121} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.489421, y: 0.5964288, z: 0} + m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} + m_Children: [] + m_Father: {fileID: 8143872481622385456} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2890700379947741735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6240684586513503121} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 4967848311778099039} + handleType: 0 + leftHandleLocalPosition: {x: -0.75050807, y: 0.937541, z: -0} + rightHandleLocalPosition: {x: 0.75050807, y: -0.937541, z: 0} --- !u!1 &6454711984138343158 GameObject: m_ObjectHideFlags: 0 @@ -4129,8 +4214,6 @@ Transform: - {fileID: 2357574740889550392} - {fileID: 6649979826100345915} - {fileID: 3491369334223495169} - - {fileID: 4183868655151631777} - - {fileID: 6937023919503173750} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4172,11 +4255,12 @@ MonoBehaviour: missImpact: {fileID: 3671400511784411788} breakParticleHolder: {fileID: 3655014313607904575} breakParticleEffect: {fileID: 7092067838963999155, guid: 7c65e9923fdccef44b26a7928589b03c, type: 3} + backgroundAnimator: {fileID: 392146592251496725} intervalStarted: 0 beatInterval: 4 bigMode: 0 bigModePlayer: 0 - shouldMiss: 0 + shouldMiss: 1 npcEnterUpCurve: {fileID: 6730385833915579299} npcEnterDownCurve: {fileID: 3504723415704178103} npcExitUpCurve: {fileID: 4792586782904593327} @@ -4189,6 +4273,8 @@ MonoBehaviour: playerMissCurveSecond: {fileID: 4303798721264846725} playerBarelyCurveFirst: {fileID: 2815349102627779420} playerBarelyCurveSecond: {fileID: 6348331742515097747} + playerWrongInputTooWeakFirstCurve: {fileID: 8607846603513681346} + playerWrongInputTooWeakSecondCurve: {fileID: 4967848311778099039} whiteArrowSprite: {fileID: 4320069646217575972, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} redArrowSprite: {fileID: -8128542972832989050, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} --- !u!1 &7902238381489812969 @@ -4231,6 +4317,7 @@ GameObject: m_Component: - component: {fileID: 3839262427627558499} - component: {fileID: 3042461638084902694} + - component: {fileID: 392146592251496725} m_Layer: 0 m_Name: Background m_TagString: Untagged @@ -4331,6 +4418,25 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &392146592251496725 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7961625227087982507} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c8199038685e43a46ab4236eda7214af, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &8086581422421511166 GameObject: m_ObjectHideFlags: 0 @@ -4413,6 +4519,53 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8106715541317775329 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2385921571894669065} + - component: {fileID: 4393664911240074220} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2385921571894669065 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8106715541317775329} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.118283, y: -5.5189896, z: 0} + m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1} + m_Children: [] + m_Father: {fileID: 8143872481622385456} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4393664911240074220 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8106715541317775329} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 4967848311778099039} + handleType: 0 + leftHandleLocalPosition: {x: -0.04068124, y: 0.45819384, z: -0} + rightHandleLocalPosition: {x: 0.04068124, y: -0.45819384, z: 0} --- !u!1 &8145138357967239947 GameObject: m_ObjectHideFlags: 0 @@ -5029,9 +5182,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} ---- !u!212 &2579826803543780890 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 3030844290571685458, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} +--- !u!1 &616834573968593202 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 93931120266719610, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} m_PrefabInstance: {fileID: 703364313440182344} m_PrefabAsset: {fileID: 0} --- !u!4 &1997314980016149808 stripped @@ -5039,9 +5192,9 @@ Transform: m_CorrespondingSourceObject: {fileID: 1330032459800393080, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} m_PrefabInstance: {fileID: 703364313440182344} m_PrefabAsset: {fileID: 0} ---- !u!1 &616834573968593202 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 93931120266719610, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} +--- !u!212 &2579826803543780890 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3030844290571685458, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} m_PrefabInstance: {fileID: 703364313440182344} m_PrefabAsset: {fileID: 0} --- !u!1001 &934185431241313563 @@ -5105,6 +5258,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} +--- !u!1 &1812191928769694571 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1571991866295846512, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + m_PrefabInstance: {fileID: 934185431241313563} + m_PrefabAsset: {fileID: 0} --- !u!1 &997886481462902296 stripped GameObject: m_CorrespondingSourceObject: {fileID: 85516462381953795, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} @@ -5115,11 +5273,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 3261934242483390250, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} m_PrefabInstance: {fileID: 934185431241313563} m_PrefabAsset: {fileID: 0} ---- !u!1 &1812191928769694571 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1571991866295846512, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} - m_PrefabInstance: {fileID: 934185431241313563} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7873819805929247186 PrefabInstance: m_ObjectHideFlags: 0 @@ -5186,16 +5339,16 @@ GameObject: m_CorrespondingSourceObject: {fileID: 85516462381953795, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} m_PrefabInstance: {fileID: 7873819805929247186} m_PrefabAsset: {fileID: 0} ---- !u!1 &8689056816715732898 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1571991866295846512, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} - m_PrefabInstance: {fileID: 7873819805929247186} - m_PrefabAsset: {fileID: 0} --- !u!4 &4612207789681334008 stripped Transform: m_CorrespondingSourceObject: {fileID: 3261934242483390250, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} m_PrefabInstance: {fileID: 7873819805929247186} m_PrefabAsset: {fileID: 0} +--- !u!1 &8689056816715732898 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1571991866295846512, guid: 081ed264ff8a94f4081ee6b1dbb4b144, type: 3} + m_PrefabInstance: {fileID: 7873819805929247186} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7887385672556259939 PrefabInstance: m_ObjectHideFlags: 0 @@ -5261,16 +5414,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} ---- !u!212 &5150472726866256945 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 3030844290571685458, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} - m_PrefabInstance: {fileID: 7887385672556259939} - m_PrefabAsset: {fileID: 0} --- !u!1 &7798029629324958489 stripped GameObject: m_CorrespondingSourceObject: {fileID: 93931120266719610, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} m_PrefabInstance: {fileID: 7887385672556259939} m_PrefabAsset: {fileID: 0} +--- !u!212 &5150472726866256945 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3030844290571685458, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} + m_PrefabInstance: {fileID: 7887385672556259939} + m_PrefabAsset: {fileID: 0} --- !u!4 &9151496975992790811 stripped Transform: m_CorrespondingSourceObject: {fileID: 1330032459800393080, guid: f8416695a86cf2f4ba791f8f8f919c6f, type: 3} @@ -5341,9 +5494,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} ---- !u!1 &4037367352976057591 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4705658423790815665, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} +--- !u!4 &3116227703445627125 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5941751787586211251, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} m_PrefabInstance: {fileID: 8739876439371148614} m_PrefabAsset: {fileID: 0} --- !u!212 &1388675758678105055 stripped @@ -5351,9 +5504,9 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 7642562862446130841, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} m_PrefabInstance: {fileID: 8739876439371148614} m_PrefabAsset: {fileID: 0} ---- !u!4 &3116227703445627125 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5941751787586211251, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} +--- !u!1 &4037367352976057591 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4705658423790815665, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} m_PrefabInstance: {fileID: 8739876439371148614} m_PrefabAsset: {fileID: 0} --- !u!1001 &8777656193206751016 @@ -5421,6 +5574,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} +--- !u!1 &4079597890152482457 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4705658423790815665, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} + m_PrefabInstance: {fileID: 8777656193206751016} + m_PrefabAsset: {fileID: 0} --- !u!212 &1432049725433526705 stripped SpriteRenderer: m_CorrespondingSourceObject: {fileID: 7642562862446130841, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} @@ -5431,8 +5589,3 @@ Transform: m_CorrespondingSourceObject: {fileID: 5941751787586211251, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} m_PrefabInstance: {fileID: 8777656193206751016} m_PrefabAsset: {fileID: 0} ---- !u!1 &4079597890152482457 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4705658423790815665, guid: 70a0fe0884e19d64e90444b2c8ffccbb, type: 3} - m_PrefabInstance: {fileID: 8777656193206751016} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/Background.controller b/Assets/Resources/Sprites/Games/WorkingDough/Animations/Background.controller new file mode 100644 index 000000000..a236ee0ab --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/Background.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Background + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/Background.controller.meta b/Assets/Resources/Sprites/Games/WorkingDough/Animations/Background.controller.meta new file mode 100644 index 000000000..042746cec --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/Background.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c8199038685e43a46ab4236eda7214af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundBlack.anim b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundBlack.anim new file mode 100644 index 000000000..36c75313a --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundBlack.anim @@ -0,0 +1,53 @@ +%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: BackgroundBlack + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + 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: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundBlack.anim.meta b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundBlack.anim.meta new file mode 100644 index 000000000..258fd21ae --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundBlack.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f90e2f0684cd8a4db67e4f04134289a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundFlash.anim b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundFlash.anim new file mode 100644 index 000000000..8a09cb602 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundFlash.anim @@ -0,0 +1,53 @@ +%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: BackgroundFlash + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + 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: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundFlash.anim.meta b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundFlash.anim.meta new file mode 100644 index 000000000..2e01581ef --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/BackgroundFlash.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4756c4898a8e5644ab43c92a805e7fba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/WorkingDough/WorkingDough.cs b/Assets/Scripts/Games/WorkingDough/WorkingDough.cs index 5475ff319..2a02e019f 100644 --- a/Assets/Scripts/Games/WorkingDough/WorkingDough.cs +++ b/Assets/Scripts/Games/WorkingDough/WorkingDough.cs @@ -62,6 +62,7 @@ namespace HeavenStudio.Games [SerializeField] GameObject missImpact; [SerializeField] Transform breakParticleHolder; [SerializeField] GameObject breakParticleEffect; + [SerializeField] Animator backgroundAnimator; [Header("Variables")] public bool intervalStarted; @@ -82,7 +83,7 @@ namespace HeavenStudio.Games public float interval; } private List currentBalls = new List(); - public bool shouldMiss; + public bool shouldMiss = true; [Header("Curves")] public BezierCurve3D npcEnterUpCurve; @@ -97,6 +98,8 @@ namespace HeavenStudio.Games public BezierCurve3D playerMissCurveSecond; public BezierCurve3D playerBarelyCurveFirst; public BezierCurve3D playerBarelyCurveSecond; + public BezierCurve3D playerWrongInputTooWeakFirstCurve; + public BezierCurve3D playerWrongInputTooWeakSecondCurve; [Header("Resources")] public Sprite whiteArrowSprite; @@ -109,6 +112,11 @@ namespace HeavenStudio.Games instance = this; } + void Start() + { + shouldMiss = true; + } + public void SetIntervalStart(float beat, float interval) { if (!intervalStarted) @@ -150,9 +158,8 @@ namespace HeavenStudio.Games }), }); } - - intervalStartBeat = beat; beatInterval = interval; + intervalStartBeat = beat; } public void SpawnBall(float beat, bool isBig) @@ -266,15 +273,13 @@ namespace HeavenStudio.Games ballComponent.deletingAutomatically = false; currentBalls.Add(spawnedBall); - spawnedBall.SetActive(true); - if (isBig && !bigModePlayer) { PlayerBallTransporters.GetComponent().Play("PlayerGoBigMode", 0, 0); bigModePlayer = true; } - shouldMiss = true; + //shouldMiss = true; if (isBig) { ScheduleInput(beat, 1, InputType.STANDARD_ALT_DOWN, JustBig, MissBig, Nothing); @@ -286,11 +291,11 @@ namespace HeavenStudio.Games ScheduleUserInput(beat, 1, InputType.STANDARD_ALT_DOWN, WrongInputSmall, Nothing, Nothing); } - arrowSRLeftPlayer.sprite = redArrowSprite; - BeatAction.New(doughDudesPlayer, new List() { + new BeatAction.Action(beat, delegate { spawnedBall.SetActive(true); }), + new BeatAction.Action(beat, delegate { arrowSRLeftPlayer.sprite = redArrowSprite; }), new BeatAction.Action(beat + 0.1f, delegate { arrowSRLeftPlayer.sprite = whiteArrowSprite; }), }); } @@ -379,6 +384,7 @@ namespace HeavenStudio.Games { new BeatAction.Action(ball.beat - (ball.beat - intervalStartBeat), delegate { if (!intervalStarted) SetIntervalStart(ball.beat, beatInterval); }), new BeatAction.Action(ball.beat - (ball.beat - intervalStartBeat), delegate { InstantExitBall(ball.beat, ball.isBig, ball.beat - intervalStartBeat); }), + new BeatAction.Action(ball.beat - (ball.beat - intervalStartBeat) + beatInterval, delegate { SpawnPlayerBall(ball.beat + beatInterval, ball.isBig); }), }); } @@ -396,6 +402,9 @@ namespace HeavenStudio.Games currentBalls.Remove(currentBall); GameObject.Destroy(currentBall); } + doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); + Jukebox.PlayOneShotGame("workingDough/BigBallTooWeak"); + SpawnPlayerBallResult(beat, true, playerWrongInputTooWeakFirstCurve, playerWrongInputTooWeakSecondCurve, 0.5f, 1f); playerImpact.SetActive(true); BeatAction.New(instance.gameObject, new List() { @@ -485,7 +494,7 @@ namespace HeavenStudio.Games doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); playerImpact.SetActive(true); - SpawnPlayerBallResult(beat, false, playerBarelyCurveFirst, playerBarelyCurveSecond, 1f, 1f); + SpawnPlayerBallResult(beat, false, playerBarelyCurveFirst, playerBarelyCurveSecond, 0.75f, 1f); BeatAction.New(instance.gameObject, new List() { new BeatAction.Action(beat + 0.1f, delegate { playerImpact.SetActive(false); }), @@ -510,7 +519,7 @@ namespace HeavenStudio.Games doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); playerImpact.SetActive(true); - SpawnPlayerBallResult(beat, true, playerBarelyCurveFirst, playerBarelyCurveSecond, 1f, 1f); + SpawnPlayerBallResult(beat, true, playerBarelyCurveFirst, playerBarelyCurveSecond, 0.75f, 1f); BeatAction.New(instance.gameObject, new List() { new BeatAction.Action(beat + 0.1f, delegate { playerImpact.SetActive(false); }), @@ -526,6 +535,7 @@ namespace HeavenStudio.Games { Jukebox.PlayOneShotGame("workingDough/rightBig"); doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); + backgroundAnimator.Play("BackgroundFlash", 0, 0); } else {