diff --git a/Assets/Resources/Sprites/Games/ClappyTrio/Animations/Bop.anim b/Assets/Resources/Sprites/Games/ClappyTrio/Animations/Bop.anim index ec7284df..f012ea28 100644 --- a/Assets/Resources/Sprites/Games/ClappyTrio/Animations/Bop.anim +++ b/Assets/Resources/Sprites/Games/ClappyTrio/Animations/Bop.anim @@ -428,7 +428,64 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Hands/handright - m_FloatCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Hands/handstogether + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Hands/handright + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Hands/handleft + classID: 1 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -559,6 +616,27 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 604036472 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 73026576 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 986104082 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 131153305 attribute: 0 @@ -1951,6 +2029,63 @@ AnimationClip: path: Hands/handright classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Hands/handstogether + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Hands/handright + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Hands/handleft + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/ClappyTrio/GameSprites.png.meta b/Assets/Resources/Sprites/Games/ClappyTrio/GameSprites.png.meta index 204ce0e0..87150bdd 100644 --- a/Assets/Resources/Sprites/Games/ClappyTrio/GameSprites.png.meta +++ b/Assets/Resources/Sprites/Games/ClappyTrio/GameSprites.png.meta @@ -83,6 +83,18 @@ TextureImporter: - first: 213: 478934498563711568 second: clapeffect_3 + - first: + 213: 7538691008291824435 + second: trioTiming + - first: + 213: 750180917687503391 + second: sing_border + - first: + 213: -8754115064420379011 + second: sign_middle + - first: + 213: -5709889983327001567 + second: sign_grapple externalObjects: {} serializedVersion: 11 mipmaps: @@ -750,6 +762,90 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: trioTiming + rect: + serializedVersion: 2 + x: 2 + y: 442 + width: 372 + height: 92 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3336aa4c78fce9860800000000000000 + internalID: 7538691008291824435 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sing_border + rect: + serializedVersion: 2 + x: 449 + y: 586 + width: 35 + height: 100 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f1a4a0ce19d296a00800000000000000 + internalID: 750180917687503391 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sign_middle + rect: + serializedVersion: 2 + x: 484 + y: 586 + width: 16 + height: 100 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d76d35eeab2238680800000000000000 + internalID: -8754115064420379011 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sign_grapple + rect: + serializedVersion: 2 + x: 977 + y: 617 + width: 46 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 124ab3dff4562c0b0800000000000000 + internalID: -5709889983327001567 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index d9d7b9be..c2c35b0c 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -123,6 +123,170 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &10060140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 10060141} + - component: {fileID: 10060142} + m_Layer: 0 + m_Name: sing_border (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &10060141 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10060140} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 5.55, y: 1.4439, z: 0} + m_LocalScale: {x: 1.5818431, y: 1.5818431, z: 1.5818431} + m_Children: [] + m_Father: {fileID: 1911843476} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &10060142 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10060140} + 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: 10 + m_Sprite: {fileID: 750180917687503391, guid: bfb4e4bb08acdb14792cdd4c46253ab0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.4861111, y: 1.4166666} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &17974367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 17974368} + - component: {fileID: 17974369} + m_Layer: 0 + m_Name: sing_border (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &17974368 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 17974367} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.0212, y: 1.4439, z: 0} + m_LocalScale: {x: 46.636703, y: 1.5818431, z: 1.5818431} + m_Children: [] + m_Father: {fileID: 1911843476} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &17974369 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 17974367} + 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: 10 + m_Sprite: {fileID: -8754115064420379011, guid: bfb4e4bb08acdb14792cdd4c46253ab0, 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.4861111, y: 1.4166666} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &49975354 GameObject: m_ObjectHideFlags: 0 @@ -153,6 +317,7 @@ Transform: m_Children: - {fileID: 1962334732} - {fileID: 1739654936} + - {fileID: 1911843476} m_Father: {fileID: 1923614611} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -169,17 +334,98 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: firstEnable: 0 - LionLeft: {fileID: 1962334731} + lionCount: 3 + Lion: + - {fileID: 1962334731} faces: - {fileID: -5723618315912617923, guid: bfb4e4bb08acdb14792cdd4c46253ab0, type: 3} - {fileID: -2914173702609090789, guid: bfb4e4bb08acdb14792cdd4c46253ab0, type: 3} - {fileID: -7678601869563919383, guid: bfb4e4bb08acdb14792cdd4c46253ab0, type: 3} - {fileID: -7561877552320588135, guid: bfb4e4bb08acdb14792cdd4c46253ab0, type: 3} - {fileID: 1205416701152040810, guid: bfb4e4bb08acdb14792cdd4c46253ab0, type: 3} - lionHeadLeft: {fileID: 0} - lionHeadMiddle: {fileID: 0} - lionHeadPlayer: {fileID: 0} playerHitLast: 0 +--- !u!1 &76440909 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 76440910} + - component: {fileID: 76440911} + m_Layer: 0 + m_Name: sing_border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &76440910 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76440909} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.543, y: 1.4439, z: 0} + m_LocalScale: {x: 1.5818431, y: 1.5818431, z: 1.5818431} + m_Children: [] + m_Father: {fileID: 1911843476} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &76440911 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76440909} + 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: 10 + m_Sprite: {fileID: 750180917687503391, guid: bfb4e4bb08acdb14792cdd4c46253ab0, 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.4861111, y: 1.4166666} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &96506772 GameObject: m_ObjectHideFlags: 0 @@ -1067,6 +1313,88 @@ Transform: m_Father: {fileID: 1161847961} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &311987792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 311987793} + - component: {fileID: 311987794} + m_Layer: 0 + m_Name: sign_grapple (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &311987793 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311987792} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.36, y: 3.6318, z: 0} + m_LocalScale: {x: 1.2869097, y: 1.6285626, z: 1} + m_Children: [] + m_Father: {fileID: 1911843476} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &311987794 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311987792} + 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: 20 + m_Sprite: {fileID: -5709889983327001567, guid: bfb4e4bb08acdb14792cdd4c46253ab0, 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.6388889, y: 2.0833333} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &325946115 GameObject: m_ObjectHideFlags: 0 @@ -2592,6 +2920,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &676311805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 676311806} + - component: {fileID: 676311807} + m_Layer: 0 + m_Name: trioTiming + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &676311806 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676311805} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.1287, y: 1.4078, z: 0} + m_LocalScale: {x: 1.2273316, y: 1.1856024, z: 1.2273316} + m_Children: [] + m_Father: {fileID: 1911843476} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &676311807 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676311805} + 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: 20 + m_Sprite: {fileID: 7538691008291824435, guid: bfb4e4bb08acdb14792cdd4c46253ab0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.1944447, y: 1.3055556} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &709067355 GameObject: m_ObjectHideFlags: 0 @@ -5739,6 +6149,88 @@ MonoBehaviour: pstate: 0 lstate: 0 endstate: 0 +--- !u!1 &1686953431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1686953432} + - component: {fileID: 1686953433} + m_Layer: 0 + m_Name: sign_grapple (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1686953432 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686953431} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 3.6318, z: 0} + m_LocalScale: {x: 1.2869097, y: 1.6285626, z: 1} + m_Children: [] + m_Father: {fileID: 1911843476} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1686953433 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686953431} + 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: 20 + m_Sprite: {fileID: -5709889983327001567, guid: bfb4e4bb08acdb14792cdd4c46253ab0, 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.6388889, y: 2.0833333} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1714583953 GameObject: m_ObjectHideFlags: 0 @@ -6261,6 +6753,88 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1840889840 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1840889841} + - component: {fileID: 1840889842} + m_Layer: 0 + m_Name: sign_grapple + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1840889841 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1840889840} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.3509, y: 3.6318, z: 0} + m_LocalScale: {x: 1.2869097, y: 1.6285626, z: 1} + m_Children: [] + m_Father: {fileID: 1911843476} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1840889842 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1840889840} + 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: 20 + m_Sprite: {fileID: -5709889983327001567, guid: bfb4e4bb08acdb14792cdd4c46253ab0, 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.6388889, y: 2.0833333} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1855769656 GameObject: m_ObjectHideFlags: 0 @@ -6471,6 +7045,43 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1911843475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1911843476} + m_Layer: 0 + m_Name: Sign + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1911843476 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1911843475} + 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: 76440910} + - {fileID: 17974368} + - {fileID: 10060141} + - {fileID: 676311806} + - {fileID: 1840889841} + - {fileID: 1686953432} + - {fileID: 311987793} + m_Father: {fileID: 49975355} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1917584306 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/DebugUI.cs b/Assets/Scripts/DebugUI.cs index 9c862730..54c445dd 100644 --- a/Assets/Scripts/DebugUI.cs +++ b/Assets/Scripts/DebugUI.cs @@ -15,10 +15,11 @@ namespace RhythmHeavenMania private TMP_Text SongPosBeats; private TMP_Text BPM; private TMP_Text currEvent; + private TMP_Text eventLength; private void Start() { - for (int i = 0; i < 3; i++) + for (int i = 0; i < 4; i++) { GameObject debug = Instantiate(Template, Template.transform.parent); debug.SetActive(true); @@ -35,6 +36,9 @@ namespace RhythmHeavenMania case 2: currEvent = debug.transform.GetChild(0).GetComponent(); break; + case 3: + eventLength = debug.transform.GetChild(0).GetComponent(); + break; } } } @@ -44,9 +48,15 @@ namespace RhythmHeavenMania SongPosBeats.text = $"SongPosBeats: {Conductor.instance.songPositionInBeats}"; BPM.text = $"BPM: {Conductor.instance.songBpm}"; if (GameManager.instance.currentEvent - 1 >= 0) + { currEvent.text = $"CurrentEvent: {GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent - 1].datamodel}"; + eventLength.text = $"Event Length: {GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent - 1].length}"; + } else + { currEvent.text = $"CurrentEvent: {GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent].datamodel}"; + eventLength.text = $"Event Length: {GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent].length}"; + } } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs b/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs index f1bca9ab..a276d72a 100644 --- a/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs +++ b/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs @@ -8,12 +8,11 @@ namespace RhythmHeavenMania.Games.ClappyTrio { public class ClappyTrio : Minigame { - [SerializeField] private GameObject LionLeft; - private GameObject LionMiddle; - private GameObject LionPlayer; + public int lionCount = 3; + + public List Lion; [SerializeField] private Sprite[] faces; - public SpriteRenderer lionHeadLeft, lionHeadMiddle, lionHeadPlayer; private bool isClapping; private float currentClappingLength; @@ -33,15 +32,42 @@ namespace RhythmHeavenMania.Games.ClappyTrio public override void OnGameSwitch() { - SetFace(0, 0); - SetFace(1, 0); - SetFace(2, 0); + for (int i = 0; i < Lion.Count; i++) + { + SetFace(i, 0); + } PlayAnimationAll("Idle"); } private void Start() { - LionMiddle = Instantiate(LionLeft, LionLeft.transform.parent); + float maxWidth = 9.2f; + float minus = 0; + + float newSpacing = maxWidth / lionCount; + + if (lionCount > 3) + { + Lion[0].transform.localPosition = new Vector3(-1.5f, 0); + maxWidth = 6.2f; + minus = 1.5f; + } + + for (int i = 1; i < lionCount; i++) + { + GameObject lion = Instantiate(Lion[0], Lion[0].transform.parent); + + // lion.transform.localPosition = new Vector3(Lion[0].transform.localPosition.x + (1.0333f * lionCount) - i, 0); + lion.transform.localPosition = new Vector3((newSpacing) * (i) - minus, 0); + Lion.Add(lion); + + if (i == lionCount - 1) + { + ClappyTrioPlayer = lion.AddComponent(); + } + } + + /*LionMiddle = Instantiate(LionLeft, LionLeft.transform.parent); LionMiddle.transform.localPosition = new Vector3(3.1f, 0); LionPlayer = Instantiate(LionLeft, LionLeft.transform.parent); @@ -51,7 +77,7 @@ namespace RhythmHeavenMania.Games.ClappyTrio lionHeadLeft = LionLeft.transform.GetChild(1).GetComponent(); lionHeadMiddle = LionMiddle.transform.GetChild(1).GetComponent(); - lionHeadPlayer = LionPlayer.transform.GetChild(1).GetComponent(); + lionHeadPlayer = LionPlayer.transform.GetChild(1).GetComponent();*/ } private void Update() @@ -60,31 +86,64 @@ namespace RhythmHeavenMania.Games.ClappyTrio { float songPosBeat = Conductor.instance.songPositionInBeats; - if (songPosBeat > lastClapStart && songPosBeat < lastClapStart + 1 && clapIndex == 0) + for (int i = 0; i < Lion.Count; i++) { + float minus = 0; + + // i spent like 25 minutes trying to figure out what was wrong with this when i forgot to subtract the currentClapLength :( + if (i == Lion.Count - 1) + minus = 0.35f; + + if (songPosBeat > lastClapStart + (currentClappingLength * (i) - minus) && songPosBeat < lastClapStart + (currentClappingLength * (i + 1)) && clapIndex == i) + { + if (i == Lion.Count - 1) + { + ClappyTrioPlayer.SetClapAvailability(lastClapStart + (currentClappingLength * i - 0.35f)); + + clapIndex = 0; + isClapping = false; + currentClappingLength = 0; + ClappyTrioPlayer.clapStarted = false; + } + else + { + SetFace(i, 4); + Lion[i].GetComponent().Play("Clap", 0, 0); + Jukebox.PlayOneShotGame("clappyTrio/leftClap"); + clapIndex++; + } + break; + } + } + + /*if (songPosBeat > lastClapStart && songPosBeat < lastClapStart + 1 && clapIndex == 0) + { + Debug.Log(Conductor.instance.songPositionInBeats); SetFace(0, 4); - LionLeft.GetComponent().Play("Clap", 0, 0); + Lion[0].GetComponent().Play("Clap", 0, 0); Jukebox.PlayOneShotGame("clappyTrio/leftClap"); clapIndex++; } else if (songPosBeat > lastClapStart + currentClappingLength && songPosBeat < lastClapStart + (currentClappingLength * 2) && clapIndex == 1) { + Debug.Log(Conductor.instance.songPositionInBeats); SetFace(1, 4); - LionMiddle.GetComponent().Play("Clap", 0, 0); + Lion[1].GetComponent().Play("Clap", 0, 0); Jukebox.PlayOneShotGame("clappyTrio/middleClap"); clapIndex++; } else if (songPosBeat > lastClapStart + (currentClappingLength * 2 - 0.35f) && clapIndex == 2) { + Debug.Log(Conductor.instance.songPositionInBeats); ClappyTrioPlayer.SetClapAvailability(lastClapStart + (currentClappingLength * 2 - 0.35f)); clapIndex = 0; isClapping = false; currentClappingLength = 0; ClappyTrioPlayer.clapStarted = false; - } + }*/ } } @@ -101,9 +160,10 @@ namespace RhythmHeavenMania.Games.ClappyTrio public void Prepare(int type) { - SetFace(0, type); - SetFace(1, type); - SetFace(2, type); + for (int i = 0; i < Lion.Count; i++) + { + SetFace(i, type); + } PlayAnimationAll("Prepare"); Jukebox.PlayOneShotGame("clappyTrio/ready"); } @@ -112,34 +172,39 @@ namespace RhythmHeavenMania.Games.ClappyTrio { if (playerHitLast) { - SetFace(0, 1); - SetFace(1, 1); - SetFace(2, 1); + for (int i = 0; i < Lion.Count; i++) + { + SetFace(i, 1); + } } else { - SetFace(0, 2); - SetFace(1, 2); - SetFace(2, 0); + for (int i = 0; i < Lion.Count; i++) + { + if (i == Lion.Count - 1) + { + SetFace(i, 0); + } + else + { + SetFace(i, 2); + } + } } PlayAnimationAll("Bop"); } private void PlayAnimationAll(string anim) { - LionLeft.GetComponent().Play(anim, -1, 0); - LionMiddle.GetComponent().Play(anim, -1, 0); - LionPlayer.GetComponent().Play(anim, -1, 0); + for (int i = 0; i < Lion.Count; i++) + { + Lion[i].GetComponent().Play(anim, -1, 0); + } } public void SetFace(int lion, int type) { - if (lion == 0) - lionHeadLeft.sprite = faces[type]; - if (lion == 1) - lionHeadMiddle.sprite = faces[type]; - if (lion == 2) - lionHeadPlayer.sprite = faces[type]; + Lion[lion].transform.GetChild(1).GetComponent().sprite = faces[type]; } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs b/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs index cae7c1bb..931f879a 100644 --- a/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs +++ b/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs @@ -13,7 +13,7 @@ namespace RhythmHeavenMania.Games.ClappyTrio public bool late; private float lastClapBeat; - private bool clapVacant; + [SerializeField] private bool clapVacant; private int lastIndex; @@ -105,7 +105,7 @@ namespace RhythmHeavenMania.Games.ClappyTrio this.canHit = false; } - ClappyTrio.instance.SetFace(2, 4); + ClappyTrio.instance.SetFace(ClappyTrio.instance.Lion.Count - 1, 4); this.GetComponent().Play("Clap", 0, 0); } }