From 1edb5fb16c618248cfe20efcb06daaecad82a833 Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 4 Mar 2022 14:54:04 -0500 Subject: [PATCH 1/7] Mr Upbeat Spritesheet --- Assets/Resources/Sprites/Games/MrUpbeat.meta | 8 ++ .../Games/MrUpbeat/mrupbeat_main.png.meta | 108 ++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat.meta create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta diff --git a/Assets/Resources/Sprites/Games/MrUpbeat.meta b/Assets/Resources/Sprites/Games/MrUpbeat.meta new file mode 100644 index 00000000..f9041e85 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f722359eab3325498449458a2f29d0b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta new file mode 100644 index 00000000..8669525a --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 2781bda31bd88924b9bc88f6c301b1d9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 72 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + 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: 1024 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From 5e2e80fb86bfe56a3d00aebef12dfca8a6ae54bf Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 4 Mar 2022 14:54:24 -0500 Subject: [PATCH 2/7] Mr Upbeat Sprite Definitions --- .../Games/MrUpbeat/mrupbeat_main.png.meta | 532 +++++++++++++++++- 1 file changed, 530 insertions(+), 2 deletions(-) diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta index 8669525a..54e2db98 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta +++ b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta @@ -1,7 +1,73 @@ fileFormatVersion: 2 guid: 2781bda31bd88924b9bc88f6c301b1d9 TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: -1641719250182597347 + second: mrupbeat_head_normal + - first: + 213: -8183512427754159168 + second: mrupbeat_head_blink + - first: + 213: 442070513753258848 + second: mrupbeat_head_shocked + - first: + 213: 5270992882044302245 + second: mrupbeat_miss_fx + - first: + 213: -5250114464775084564 + second: mrupbeat_shadow_left + - first: + 213: 3055091234304763100 + second: mrupbeat_shadow_right + - first: + 213: 2456994601062741431 + second: mrupbeat_smear_fx_0 + - first: + 213: -4427745735040970447 + second: mrupbeat_smear_fx_1 + - first: + 213: 6628280856970766740 + second: mrupbeat_smear_fx_2 + - first: + 213: -2366435525580190300 + second: mrupbeat_antenna + - first: + 213: 823626875365731854 + second: mrupbeat_antenna_light_0 + - first: + 213: -8285671563859703850 + second: mrupbeat_main_11 + - first: + 213: -1808759476897028762 + second: mrupbeat_antenna_light_2 + - first: + 213: 2029327923406227844 + second: mrupbeat_main_13 + - first: + 213: 684874922003494188 + second: mrupbeat_step_0 + - first: + 213: -2016408372270893465 + second: mrupbeat_step_1 + - first: + 213: -4373096660332669510 + second: mrupbeat_step_2 + - first: + 213: 910123527689434379 + second: mrupbeat_fall_0 + - first: + 213: 7267509016467870925 + second: mrupbeat_fall_1 + - first: + 213: -5599596391108488658 + second: mrupbeat_fall_2 + - first: + 213: -1109266650601169752 + second: mrupbeat_fall_3 + - first: + 213: -3983884386284601651 + second: mrupbeat_fall_4 externalObjects: {} serializedVersion: 11 mipmaps: @@ -89,7 +155,469 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: mrupbeat_head_normal + rect: + serializedVersion: 2 + x: 217 + y: 449 + width: 62 + height: 61 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d1512f74a017739e0800000000000000 + internalID: -1641719250182597347 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_head_blink + rect: + serializedVersion: 2 + x: 281 + y: 449 + width: 62 + height: 61 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0c308b81ec25e6e80800000000000000 + internalID: -8183512427754159168 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_head_shocked + rect: + serializedVersion: 2 + x: 345 + y: 449 + width: 62 + height: 61 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 06bffe14acc822600800000000000000 + internalID: 442070513753258848 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_miss_fx + rect: + serializedVersion: 2 + x: 409 + y: 449 + width: 102 + height: 61 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5a3fcdb6914562940800000000000000 + internalID: 5270992882044302245 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_shadow_left + rect: + serializedVersion: 2 + x: 313 + y: 369 + width: 94 + height: 77 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ce5e0f8e5b8d327b0800000000000000 + internalID: -5250114464775084564 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_shadow_right + rect: + serializedVersion: 2 + x: 217 + y: 369 + width: 94 + height: 77 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cd425218a4dd56a20800000000000000 + internalID: 3055091234304763100 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_smear_fx_0 + rect: + serializedVersion: 2 + x: 1 + y: 105 + width: 110 + height: 53 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7b5b56b629ff81220800000000000000 + internalID: 2456994601062741431 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_smear_fx_1 + rect: + serializedVersion: 2 + x: 113 + y: 98 + width: 70 + height: 60 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 131d12396bc7d82c0800000000000000 + internalID: -4427745735040970447 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_smear_fx_2 + rect: + serializedVersion: 2 + x: 185 + y: 97 + width: 46 + height: 61 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 499a34f32526cfb50800000000000000 + internalID: 6628280856970766740 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_antenna + rect: + serializedVersion: 2 + x: 281 + y: 113 + width: 54 + height: 45 + alignment: 9 + pivot: {x: 0.5925926, y: 0.51111114} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4ad8de96d6bb82fd0800000000000000 + internalID: -2366435525580190300 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_antenna_light_0 + rect: + serializedVersion: 2 + x: 233 + y: 113 + width: 46 + height: 45 + alignment: 9 + pivot: {x: 0.7173913, y: 0.51111114} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e0ea3a5874c1e6b00800000000000000 + internalID: 823626875365731854 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_11 + rect: + serializedVersion: 2 + x: 385 + y: 113 + width: 46 + height: 45 + alignment: 9 + pivot: {x: 0.7173913, y: 0.51111114} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6d7469eac91630d80800000000000000 + internalID: -8285671563859703850 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_antenna_light_2 + rect: + serializedVersion: 2 + x: 337 + y: 113 + width: 46 + height: 45 + alignment: 9 + pivot: {x: 0.7173913, y: 0.51111114} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6656e67c6def5e6e0800000000000000 + internalID: -1808759476897028762 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_13 + rect: + serializedVersion: 2 + x: 1 + y: 1 + width: 414 + height: 62 + alignment: 9 + pivot: {x: 0.5770048, y: 0.50376165} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 489c8679efe992c10800000000000000 + internalID: 2029327923406227844 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_step_0 + rect: + serializedVersion: 2 + x: 113 + y: 225 + width: 102 + height: 86 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c257799ec1a218900800000000000000 + internalID: 684874922003494188 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_step_1 + rect: + serializedVersion: 2 + x: 113 + y: 313 + width: 102 + height: 93 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7667ba0d4474404e0800000000000000 + internalID: -2016408372270893465 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_step_2 + rect: + serializedVersion: 2 + x: 113 + y: 409 + width: 102 + height: 101 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ab59c60d1c3af43c0800000000000000 + internalID: -4373096660332669510 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_fall_0 + rect: + serializedVersion: 2 + x: 1 + y: 433 + width: 110 + height: 77 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b0577a1c68861ac00800000000000000 + internalID: 910123527689434379 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_fall_1 + rect: + serializedVersion: 2 + x: 1 + y: 361 + width: 110 + height: 69 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dc4148012f06bd460800000000000000 + internalID: 7267509016467870925 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_fall_2 + rect: + serializedVersion: 2 + x: 1 + y: 289 + width: 110 + height: 69 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e225b6e00cc3a42b0800000000000000 + internalID: -5599596391108488658 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_fall_3 + rect: + serializedVersion: 2 + x: 1 + y: 225 + width: 110 + height: 61 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8acdab1cbd71b90f0800000000000000 + internalID: -1109266650601169752 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_fall_4 + rect: + serializedVersion: 2 + x: 1 + y: 161 + width: 110 + height: 61 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dcef749124666b8c0800000000000000 + internalID: -3983884386284601651 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] From 2d7a559738c34aaca4e4379c55db60da836a7f33 Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 4 Mar 2022 15:18:01 -0500 Subject: [PATCH 3/7] Mr Upbeat scene setup --- Assets/Resources/Games/mrUpbeat.prefab | 675 ++++++++++++++++++ Assets/Resources/Games/mrUpbeat.prefab.meta | 7 + Assets/Resources/Sfx/games/mrUpbeat.meta | 8 + .../Sfx/games/mrUpbeat/applause.ogg.meta | 22 + .../Sfx/games/mrUpbeat/blip.ogg.meta | 22 + .../Sfx/games/mrUpbeat/ding.ogg.meta | 22 + .../Sfx/games/mrUpbeat/metronomeLeft.ogg.meta | 22 + .../games/mrUpbeat/metronomeRight.ogg.meta | 22 + .../Sfx/games/mrUpbeat/step.ogg.meta | 22 + .../Games/MrUpbeat/mrupbeat_main.png.meta | 54 +- 10 files changed, 849 insertions(+), 27 deletions(-) create mode 100644 Assets/Resources/Games/mrUpbeat.prefab create mode 100644 Assets/Resources/Games/mrUpbeat.prefab.meta create mode 100644 Assets/Resources/Sfx/games/mrUpbeat.meta create mode 100644 Assets/Resources/Sfx/games/mrUpbeat/applause.ogg.meta create mode 100644 Assets/Resources/Sfx/games/mrUpbeat/blip.ogg.meta create mode 100644 Assets/Resources/Sfx/games/mrUpbeat/ding.ogg.meta create mode 100644 Assets/Resources/Sfx/games/mrUpbeat/metronomeLeft.ogg.meta create mode 100644 Assets/Resources/Sfx/games/mrUpbeat/metronomeRight.ogg.meta create mode 100644 Assets/Resources/Sfx/games/mrUpbeat/step.ogg.meta diff --git a/Assets/Resources/Games/mrUpbeat.prefab b/Assets/Resources/Games/mrUpbeat.prefab new file mode 100644 index 00000000..482a4f94 --- /dev/null +++ b/Assets/Resources/Games/mrUpbeat.prefab @@ -0,0 +1,675 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1089093179602596564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4485966734002228350} + - component: {fileID: 2897060438308778760} + m_Layer: 0 + m_Name: AntennaLight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4485966734002228350 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1089093179602596564} + 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: [] + m_Father: {fileID: 1039565176908573975} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2897060438308778760 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1089093179602596564} + 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: 1 + m_Sprite: {fileID: -1808759476897028762, guid: 2781bda31bd88924b9bc88f6c301b1d9, 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.9583333, y: 0.9375} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1488695648487991734 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1584121333826078951} + m_Layer: 0 + m_Name: Holder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1584121333826078951 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488695648487991734} + 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: 1584116570229233278} + - {fileID: 6950861003573010513} + m_Father: {fileID: 862280508089709600} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3862020474253857803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7821851253613277009} + - component: {fileID: 6546086356517948521} + m_Layer: 0 + m_Name: Metronome + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7821851253613277009 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3862020474253857803} + m_LocalRotation: {x: 0, y: -0, z: 0.9848078, w: -0.17364809} + m_LocalPosition: {x: 0, y: -2.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 200} +--- !u!212 &6546086356517948521 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3862020474253857803} + 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: -1 + m_Sprite: {fileID: 2029327923406227844, guid: 2781bda31bd88924b9bc88f6c301b1d9, 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.75, y: 0.8611111} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6060117916978306099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1039565176908573975} + - component: {fileID: 291082444034729785} + m_Layer: 0 + m_Name: Antenna + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1039565176908573975 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6060117916978306099} + m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.39, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4485966734002228350} + m_Father: {fileID: 6950861003573010513} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} +--- !u!212 &291082444034729785 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6060117916978306099} + 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: -2366435525580190300, guid: 2781bda31bd88924b9bc88f6c301b1d9, 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.125, y: 0.9375} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6323841328481104373 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1584116570229233278} + - component: {fileID: 8375453706624526722} + m_Layer: 0 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1584116570229233278 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6323841328481104373} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1584121333826078951} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8375453706624526722 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6323841328481104373} + 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: -4373096660332669510, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.125, y: 2.1041667} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6662761892151722129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6950861003573010513} + - component: {fileID: 1481602873875342590} + m_Layer: 0 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6950861003573010513 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6662761892151722129} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.675, y: 1.31, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1039565176908573975} + m_Father: {fileID: 1584121333826078951} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1481602873875342590 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6662761892151722129} + 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: 1 + m_Sprite: {fileID: -1641719250182597347, guid: 2781bda31bd88924b9bc88f6c301b1d9, 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.2916666, y: 1.2708334} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7248900333300803145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7248900333300803150} + m_Layer: 0 + m_Name: mrUpbeat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7248900333300803150 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7248900333300803145} + 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: 8701843541313247389} + - {fileID: 7821851253613277009} + - {fileID: 862280508089709600} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8412912829583803381 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7864236320873353852} + - component: {fileID: 6548992874688888731} + m_Layer: 0 + m_Name: Shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7864236320873353852 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8412912829583803381} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.561, y: 0.026, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 862280508089709600} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6548992874688888731 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8412912829583803381} + 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: -2 + m_Sprite: {fileID: -5250114464775084564, guid: 2781bda31bd88924b9bc88f6c301b1d9, 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.9583334, y: 1.6041666} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8472146464158439961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 862280508089709600} + m_Layer: 0 + m_Name: MrUpbeat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &862280508089709600 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8472146464158439961} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.99, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7864236320873353852} + - {fileID: 1584121333826078951} + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8963803634876878173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8701843541313247389} + - component: {fileID: 7037067448840752386} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8701843541313247389 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8963803634876878173} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 20, y: 10, z: 1} + m_Children: [] + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7037067448840752386 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8963803634876878173} + 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: -32768 + m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.84, y: 1.6} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Resources/Games/mrUpbeat.prefab.meta b/Assets/Resources/Games/mrUpbeat.prefab.meta new file mode 100644 index 00000000..3fb9e174 --- /dev/null +++ b/Assets/Resources/Games/mrUpbeat.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7b2532abb5b31af4a9f8fa7eab51932e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat.meta b/Assets/Resources/Sfx/games/mrUpbeat.meta new file mode 100644 index 00000000..73b1a030 --- /dev/null +++ b/Assets/Resources/Sfx/games/mrUpbeat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fde352b7985c7b345a5b7acee85fd1b1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/applause.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/applause.ogg.meta new file mode 100644 index 00000000..180c20e5 --- /dev/null +++ b/Assets/Resources/Sfx/games/mrUpbeat/applause.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ca38ae19ffadb9849aa7258a14f14b80 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/blip.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/blip.ogg.meta new file mode 100644 index 00000000..1419c3e3 --- /dev/null +++ b/Assets/Resources/Sfx/games/mrUpbeat/blip.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ee60287ddedb03542b29e2d9f1fd8c2f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/ding.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/ding.ogg.meta new file mode 100644 index 00000000..324b3a5d --- /dev/null +++ b/Assets/Resources/Sfx/games/mrUpbeat/ding.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: bb0f607b92283c74b984a72171e9f0ad +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/metronomeLeft.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/metronomeLeft.ogg.meta new file mode 100644 index 00000000..8b9e008f --- /dev/null +++ b/Assets/Resources/Sfx/games/mrUpbeat/metronomeLeft.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 993580e1cd5092d479df83855e15e96e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/metronomeRight.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/metronomeRight.ogg.meta new file mode 100644 index 00000000..01496d6f --- /dev/null +++ b/Assets/Resources/Sfx/games/mrUpbeat/metronomeRight.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 43383fedafd42f34db22f1228cf4d456 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/mrUpbeat/step.ogg.meta b/Assets/Resources/Sfx/games/mrUpbeat/step.ogg.meta new file mode 100644 index 00000000..4dee5199 --- /dev/null +++ b/Assets/Resources/Sfx/games/mrUpbeat/step.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 051a392b248db1d489afbeeeeda177f0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta index 54e2db98..b7897c45 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta +++ b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta @@ -37,13 +37,13 @@ TextureImporter: second: mrupbeat_antenna_light_0 - first: 213: -8285671563859703850 - second: mrupbeat_main_11 + second: mrupbeat_antenna_light_1 - first: 213: -1808759476897028762 second: mrupbeat_antenna_light_2 - first: 213: 2029327923406227844 - second: mrupbeat_main_13 + second: mrupbeat_metronome - first: 213: 684874922003494188 second: mrupbeat_step_0 @@ -112,7 +112,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 72 + spritePixelsToUnits: 48 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -165,7 +165,7 @@ TextureImporter: width: 62 height: 61 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: [] @@ -186,7 +186,7 @@ TextureImporter: width: 62 height: 61 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: [] @@ -207,7 +207,7 @@ TextureImporter: width: 62 height: 61 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: [] @@ -228,7 +228,7 @@ TextureImporter: width: 102 height: 61 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: [] @@ -248,8 +248,8 @@ TextureImporter: y: 369 width: 94 height: 77 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 9 + pivot: {x: 0.46770754, y: 0.18134259} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -269,8 +269,8 @@ TextureImporter: y: 369 width: 94 height: 77 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 9 + pivot: {x: 0.8090567, y: 0.16817167} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -291,7 +291,7 @@ TextureImporter: width: 110 height: 53 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: [] @@ -312,7 +312,7 @@ TextureImporter: width: 70 height: 60 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: [] @@ -333,7 +333,7 @@ TextureImporter: width: 46 height: 61 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: [] @@ -388,7 +388,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: mrupbeat_main_11 + name: mrupbeat_antenna_light_1 rect: serializedVersion: 2 x: 385 @@ -430,7 +430,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: mrupbeat_main_13 + name: mrupbeat_metronome rect: serializedVersion: 2 x: 1 @@ -458,8 +458,8 @@ TextureImporter: y: 225 width: 102 height: 86 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 9 + pivot: {x: 0.42319235, y: 0.1975449} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -479,8 +479,8 @@ TextureImporter: y: 313 width: 102 height: 93 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 9 + pivot: {x: 0.42973134, y: 0.1378374} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -500,8 +500,8 @@ TextureImporter: y: 409 width: 102 height: 101 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 9 + pivot: {x: 0.44062924, y: 0.14561266} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -522,7 +522,7 @@ TextureImporter: width: 110 height: 77 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: [] @@ -543,7 +543,7 @@ TextureImporter: width: 110 height: 69 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: [] @@ -564,7 +564,7 @@ TextureImporter: width: 110 height: 69 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: [] @@ -585,7 +585,7 @@ TextureImporter: width: 110 height: 61 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: [] @@ -606,7 +606,7 @@ TextureImporter: width: 110 height: 61 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: [] From 6d4a283eff9d31906f63a1011e858987774a7cf5 Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 4 Mar 2022 15:47:40 -0500 Subject: [PATCH 4/7] Mr Upbeat Animation Setup --- Assets/Resources/Games/mrUpbeat.prefab | 59 ++++++++ .../Sprites/Games/MrUpbeat/Animations.meta | 8 ++ .../Games/MrUpbeat/Animations/Blip.anim | 74 ++++++++++ .../Games/MrUpbeat/Animations/Blip.anim.meta | 8 ++ .../Animations/BlipAnimator.controller | 101 ++++++++++++++ .../Animations/BlipAnimator.controller.meta | 8 ++ .../Games/MrUpbeat/Animations/BlipIdle.anim | 68 +++++++++ .../MrUpbeat/Animations/BlipIdle.anim.meta | 8 ++ .../Games/MrUpbeat/Animations/Fall.anim | 53 +++++++ .../Games/MrUpbeat/Animations/Fall.anim.meta | 8 ++ .../Games/MrUpbeat/Animations/Idle.anim | 53 +++++++ .../Games/MrUpbeat/Animations/Idle.anim.meta | 8 ++ .../Animations/MrUpbeatAnimator.controller | 130 ++++++++++++++++++ .../MrUpbeatAnimator.controller.meta | 8 ++ .../Games/MrUpbeat/Animations/Step.anim | 53 +++++++ .../Games/MrUpbeat/Animations/Step.anim.meta | 8 ++ Assets/Scripts/Games/MrUpbeat.meta | 8 ++ Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs | 29 ++++ .../Scripts/Games/MrUpbeat/MrUpbeat.cs.meta | 11 ++ 19 files changed, 703 insertions(+) create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations.meta create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim.meta create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller.meta create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipIdle.anim create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipIdle.anim.meta create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/Fall.anim create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/Fall.anim.meta create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim.meta create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/MrUpbeatAnimator.controller create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/MrUpbeatAnimator.controller.meta create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim create mode 100644 Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim.meta create mode 100644 Assets/Scripts/Games/MrUpbeat.meta create mode 100644 Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs create mode 100644 Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs.meta diff --git a/Assets/Resources/Games/mrUpbeat.prefab b/Assets/Resources/Games/mrUpbeat.prefab index 482a4f94..26d8e6d6 100644 --- a/Assets/Resources/Games/mrUpbeat.prefab +++ b/Assets/Resources/Games/mrUpbeat.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4485966734002228350} + - component: {fileID: 1614535701461294964} - component: {fileID: 2897060438308778760} m_Layer: 0 m_Name: AntennaLight @@ -31,6 +32,25 @@ Transform: m_Father: {fileID: 1039565176908573975} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1614535701461294964 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1089093179602596564} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e6e4ddc5d5e73a246b2032b4e92596c9, 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!212 &2897060438308778760 SpriteRenderer: m_ObjectHideFlags: 0 @@ -91,6 +111,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1584121333826078951} + - component: {fileID: 2256168985014220240} m_Layer: 0 m_Name: Holder m_TagString: Untagged @@ -114,6 +135,25 @@ Transform: m_Father: {fileID: 862280508089709600} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &2256168985014220240 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488695648487991734} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: a5f93a456c442bc458973d17286581d9, 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 &3862020474253857803 GameObject: m_ObjectHideFlags: 0 @@ -453,6 +493,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7248900333300803150} + - component: {fileID: 8728962026160321644} m_Layer: 0 m_Name: mrUpbeat m_TagString: Untagged @@ -477,6 +518,24 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8728962026160321644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7248900333300803145} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a258517e5332c824a8b81a03036fc2a8, type: 3} + m_Name: + m_EditorClassIdentifier: + EligibleHits: [] + firstEnable: 0 + metronome: {fileID: 3862020474253857803} + animator: {fileID: 2256168985014220240} + blipAnimator: {fileID: 1614535701461294964} + shadows: [] --- !u!1 &8412912829583803381 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations.meta new file mode 100644 index 00000000..df884865 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30b8c2122b272a942b53d678823ef13a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim new file mode 100644 index 00000000..7c644260 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim @@ -0,0 +1,74 @@ +%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: Blip + 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: + - curve: + - time: 0 + value: {fileID: 823626875365731854, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - time: 0.016666668 + value: {fileID: -8285671563859703850, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - time: 0.033333335 + value: {fileID: -1808759476897028762, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + attribute: m_Sprite + path: + 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: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 823626875365731854, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - {fileID: -8285671563859703850, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - {fileID: -1808759476897028762, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.050000004 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim.meta new file mode 100644 index 00000000..9ced91ad --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64c8a1564282a444cb0392113029b861 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller new file mode 100644 index 00000000..1d560d6d --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5338859024521178731 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blip + m_Speed: 0.25 + 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: 64c8a1564282a444cb0392113029b861, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlipAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 5157214750414911887} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &5157214750414911887 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 7345739688119431093} + m_Position: {x: 360, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5338859024521178731} + m_Position: {x: 350, y: 90, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 7345739688119431093} +--- !u!1102 &7345739688119431093 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 0.25 + 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: 0041c21820d2e7e4898cf890693ecb50, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller.meta new file mode 100644 index 00000000..2e5b929c --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6e4ddc5d5e73a246b2032b4e92596c9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipIdle.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipIdle.anim new file mode 100644 index 00000000..ded580ee --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipIdle.anim @@ -0,0 +1,68 @@ +%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: BlipIdle + 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: + - curve: + - time: 0 + value: {fileID: -1808759476897028762, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + attribute: m_Sprite + path: + 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: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1808759476897028762, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipIdle.anim.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipIdle.anim.meta new file mode 100644 index 00000000..4f6ee002 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0041c21820d2e7e4898cf890693ecb50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Fall.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Fall.anim new file mode 100644 index 00000000..da82216e --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Fall.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: Fall + 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: 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Fall.anim.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Fall.anim.meta new file mode 100644 index 00000000..a564e86c --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Fall.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 59bf7ac787443f048835c856516d6e8c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim new file mode 100644 index 00000000..c89c1003 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.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: Idle + 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: 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim.meta new file mode 100644 index 00000000..e37cfe2c --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 530b9769fa55bcd4e82dd6957d734984 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/MrUpbeatAnimator.controller b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/MrUpbeatAnimator.controller new file mode 100644 index 00000000..2862272b --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/MrUpbeatAnimator.controller @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-995366258227929513 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 5793650782800196468} + m_Position: {x: 311.5, y: 24.5, z: 0} + - serializedVersion: 1 + m_State: {fileID: -757977064401545672} + m_Position: {x: 330, y: 80, z: 0} + - serializedVersion: 1 + m_State: {fileID: -718537531738724324} + m_Position: {x: 320, y: 140, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5793650782800196468} +--- !u!1102 &-757977064401545672 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Step + m_Speed: 0.25 + 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: 0742cb7e03bad4a4a82e49668c4bbdf4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-718537531738724324 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Fall + m_Speed: 0.25 + 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: 59bf7ac787443f048835c856516d6e8c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MrUpbeatAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -995366258227929513} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &5793650782800196468 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 0.25 + 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: 530b9769fa55bcd4e82dd6957d734984, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/MrUpbeatAnimator.controller.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/MrUpbeatAnimator.controller.meta new file mode 100644 index 00000000..fa766b92 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/MrUpbeatAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5f93a456c442bc458973d17286581d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim new file mode 100644 index 00000000..f1c1fef1 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.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: Step + 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: 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim.meta new file mode 100644 index 00000000..db0a35c8 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0742cb7e03bad4a4a82e49668c4bbdf4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/MrUpbeat.meta b/Assets/Scripts/Games/MrUpbeat.meta new file mode 100644 index 00000000..b12ae0e7 --- /dev/null +++ b/Assets/Scripts/Games/MrUpbeat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f22d820fe1dee4e469a337fa3e97fe7b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs new file mode 100644 index 00000000..6ac611b4 --- /dev/null +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using System; +using Starpelly; + +using RhythmHeavenMania.Util; + +namespace RhythmHeavenMania.Games.MrUpbeat +{ + public class MrUpbeat : Minigame + { + [Header("References")] + public GameObject metronome; + public Animator animator; + public Animator blipAnimator; + public GameObject[] shadows; + + public static MrUpbeat instance; + + private void Awake() + { + instance = this; + } + + + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs.meta b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs.meta new file mode 100644 index 00000000..b8608c7a --- /dev/null +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a258517e5332c824a8b81a03036fc2a8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From d22009e79c1781b637726d595ce8cdcb61cbef95 Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 4 Mar 2022 17:03:57 -0500 Subject: [PATCH 5/7] Mr Upbeat Programming progress Autoplay works but it doesn't work otherwise --- Assets/Resources/Games/mrUpbeat.prefab | 35 +++- .../Animations/BlipAnimator.controller | 2 +- .../Games/MrUpbeat/Animations/Idle.anim | 143 +++++++++++++- .../Games/MrUpbeat/Animations/Step.anim | 185 +++++++++++++++++- Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs | 31 ++- Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs | 92 +++++++++ .../Scripts/Games/MrUpbeat/UpbeatMan.cs.meta | 11 ++ Assets/Scripts/Minigames.cs | 5 + 8 files changed, 485 insertions(+), 19 deletions(-) create mode 100644 Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs create mode 100644 Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs.meta diff --git a/Assets/Resources/Games/mrUpbeat.prefab b/Assets/Resources/Games/mrUpbeat.prefab index 26d8e6d6..6874555f 100644 --- a/Assets/Resources/Games/mrUpbeat.prefab +++ b/Assets/Resources/Games/mrUpbeat.prefab @@ -533,9 +533,8 @@ MonoBehaviour: EligibleHits: [] firstEnable: 0 metronome: {fileID: 3862020474253857803} - animator: {fileID: 2256168985014220240} - blipAnimator: {fileID: 1614535701461294964} - shadows: [] + man: {fileID: 8160414645038680372} + nextBeat: 0 --- !u!1 &8412912829583803381 GameObject: m_ObjectHideFlags: 0 @@ -627,6 +626,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 862280508089709600} + - component: {fileID: 8160414645038680372} m_Layer: 0 m_Name: MrUpbeat m_TagString: Untagged @@ -650,6 +650,35 @@ Transform: m_Father: {fileID: 7248900333300803150} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8160414645038680372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8472146464158439961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4fa18aec69a2e949a7e2d4e33bdd2b9, type: 3} + m_Name: + m_EditorClassIdentifier: + inList: 0 + lastState: 0 + state: + gameObject: {fileID: 0} + early: 0 + perfect: 0 + late: 0 + createBeat: 0 + eligibleHitsList: [] + aceTimes: 0 + isEligible: 0 + triggersAutoplay: 1 + game: {fileID: 8728962026160321644} + animator: {fileID: 2256168985014220240} + blipAnimator: {fileID: 1614535701461294964} + shadows: [] + stepTimes: 0 --- !u!1 &8963803634876878173 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller index 1d560d6d..38358668 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller @@ -62,7 +62,7 @@ AnimatorStateMachine: m_Position: {x: 360, y: 0, z: 0} - serializedVersion: 1 m_State: {fileID: -5338859024521178731} - m_Position: {x: 350, y: 90, z: 0} + m_Position: {x: 340, y: 90, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim index c89c1003..2e6e7c3e 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Idle.anim @@ -14,24 +14,71 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.675, y: 1.31, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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.016666668 + value: {x: -0.675, y: 1.31, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Head m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -4373096660332669510, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + attribute: m_Sprite + path: Body + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 130111906 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: + - {fileID: -4373096660332669510, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.016666668 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -46,7 +93,91 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: -0.675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + 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: 1.31 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 1.31 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + 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: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + 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} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim index f1c1fef1..43f18c4c 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim @@ -14,24 +14,86 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.675, y: 1.08, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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.016666668 + value: {x: -0.675, y: 1.23, z: 0} + inSlope: {x: 0, y: 6.8999968, z: 0} + outSlope: {x: 0, y: 6.8999968, 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.033333335 + value: {x: -0.675, y: 1.31, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Head m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 684874922003494188, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - time: 0.016666668 + value: {fileID: -2016408372270893465, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - time: 0.033333335 + value: {fileID: -4373096660332669510, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + attribute: m_Sprite + path: Body + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 130111906 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 684874922003494188, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - {fileID: -2016408372270893465, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - {fileID: -4373096660332669510, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.050000004 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -46,7 +108,118 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: -0.675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: -0.675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + 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: 1.08 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 1.23 + inSlope: 6.8999968 + outSlope: 6.8999968 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 1.31 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + 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: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + 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} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs index 6ac611b4..505deaeb 100644 --- a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs @@ -12,9 +12,11 @@ namespace RhythmHeavenMania.Games.MrUpbeat { [Header("References")] public GameObject metronome; - public Animator animator; - public Animator blipAnimator; - public GameObject[] shadows; + public UpbeatMan man; + + public float nextBeat; + public bool canGo = false; + public static MrUpbeat instance; @@ -23,6 +25,29 @@ namespace RhythmHeavenMania.Games.MrUpbeat instance = this; } + private void Update() + { + List gos = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "mrUpbeat/go"); + for(int i=0; i Conductor.instance.songPositionInBeats) + { + canGo = true; + break; + } else + { + canGo = false; + } + } + + float normalizedBeat = Conductor.instance.GetPositionFromBeat(nextBeat, 0.5f); + //StateCheck(normalizedBeat); + } + + public void SetInterval(float beat) + { + nextBeat = beat; + } } diff --git a/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs b/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs new file mode 100644 index 00000000..4455894c --- /dev/null +++ b/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs @@ -0,0 +1,92 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using System; +using Starpelly; + +using RhythmHeavenMania.Util; + +namespace RhythmHeavenMania.Games.MrUpbeat +{ + public class UpbeatMan : PlayerActionObject + { + [Header("References")] + public MrUpbeat game; + public Animator animator; + public Animator blipAnimator; + public GameObject[] shadows; + + public int stepTimes = 0; + + public GameEvent blip = new GameEvent(); + + private void Update() + { + float normalizedBeat = Conductor.instance.GetPositionFromBeat(game.nextBeat, 0.5f); + StateCheck(normalizedBeat); + CheckIfFall(normalizedBeat); + + if (PlayerInput.Pressed(true)) + { + if (state.perfect) + { + Step(); + } else if (state.notPerfect()) + { + Fall(); + } + } + } + + public void ProgressBeat() + { + game.nextBeat += 1f; + Blip(); + } + + public override void OnAce() + { + Step(); + } + + public void Step() + { + if (!game.canGo) return; + + stepTimes++; + + Jukebox.PlayOneShotGame("mrUpbeat/step"); + + if (stepTimes % 2 == 1) + transform.localScale = new Vector3(-1, 1); + else + transform.localScale = new Vector3(1, 1); + + ProgressBeat(); + } + + public void Fall() + { + if (!game.canGo) return; + + Jukebox.PlayOneShot("miss"); + } + + private void CheckIfFall(float normalizedBeat) + { + if (normalizedBeat > Minigame.LateTime()) + { + Fall(); + ProgressBeat(); + } + } + + public void Blip() + { + Jukebox.PlayOneShotGame("mrUpbeat/blip"); + blipAnimator.Play("Blip", 0, 0); + } + + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs.meta b/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs.meta new file mode 100644 index 00000000..36b78110 --- /dev/null +++ b/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e4fa18aec69a2e949a7e2d4e33bdd2b9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 1f973204..9237b010 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -17,6 +17,7 @@ using RhythmHeavenMania.Games.BuiltToScaleDS; using RhythmHeavenMania.Games.TapTrial; using RhythmHeavenMania.Games.CropStomp; using RhythmHeavenMania.Games.WizardsWaltz; +using RhythmHeavenMania.Games.MrUpbeat; namespace RhythmHeavenMania { @@ -373,6 +374,10 @@ namespace RhythmHeavenMania new GameAction("start interval", delegate { WizardsWaltz.instance.SetIntervalStart(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, 4f, true), new GameAction("plant", delegate { WizardsWaltz.instance.SpawnFlower(eventCaller.currentEntity.beat); }, 0.5f, false), }), + new Minigame("mrUpbeat", "Mr. Upbeat \n[WIP don't use]", "FFFFFF", false, false, new List() + { + new GameAction("go", delegate { }, 4f, true), + }), /*new Minigame("spaceDance", "Space Dance", "B888F8", new List() { }), From 5c3730cf9d2d3beff3c9f44757057cd1e6e91aed Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 4 Mar 2022 22:10:10 -0500 Subject: [PATCH 6/7] Slightly functional Mr. Upbeat --- Assets/Resources/Games/mrUpbeat.prefab | 93 ++++++++++++++- .../Editor/GameIcons/mrUpbeat.png.meta | 108 ++++++++++++++++++ Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs | 45 +++++++- Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs | 62 +++++----- Assets/Scripts/Minigames.cs | 3 +- 5 files changed, 275 insertions(+), 36 deletions(-) create mode 100644 Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta diff --git a/Assets/Resources/Games/mrUpbeat.prefab b/Assets/Resources/Games/mrUpbeat.prefab index 6874555f..ac6b1b67 100644 --- a/Assets/Resources/Games/mrUpbeat.prefab +++ b/Assets/Resources/Games/mrUpbeat.prefab @@ -133,7 +133,7 @@ Transform: - {fileID: 1584116570229233278} - {fileID: 6950861003573010513} m_Father: {fileID: 862280508089709600} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &2256168985014220240 Animator: @@ -154,6 +154,88 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2066794384027118212 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4285463118267461702} + - component: {fileID: 5137804451209053898} + m_Layer: 0 + m_Name: ShadowR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4285463118267461702 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2066794384027118212} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.561, y: 0.026, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 862280508089709600} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5137804451209053898 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2066794384027118212} + 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: -2 + m_Sprite: {fileID: 3055091234304763100, guid: 2781bda31bd88924b9bc88f6c301b1d9, 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.9583334, y: 1.6041666} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3862020474253857803 GameObject: m_ObjectHideFlags: 0 @@ -534,7 +616,7 @@ MonoBehaviour: firstEnable: 0 metronome: {fileID: 3862020474253857803} man: {fileID: 8160414645038680372} - nextBeat: 0 + canGo: 0 --- !u!1 &8412912829583803381 GameObject: m_ObjectHideFlags: 0 @@ -546,7 +628,7 @@ GameObject: - component: {fileID: 7864236320873353852} - component: {fileID: 6548992874688888731} m_Layer: 0 - m_Name: Shadow + m_Name: ShadowL m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -646,6 +728,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7864236320873353852} + - {fileID: 4285463118267461702} - {fileID: 1584121333826078951} m_Father: {fileID: 7248900333300803150} m_RootOrder: 2 @@ -677,7 +760,9 @@ MonoBehaviour: game: {fileID: 8728962026160321644} animator: {fileID: 2256168985014220240} blipAnimator: {fileID: 1614535701461294964} - shadows: [] + shadows: + - {fileID: 8412912829583803381} + - {fileID: 2066794384027118212} stepTimes: 0 --- !u!1 &8963803634876878173 GameObject: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta new file mode 100644 index 00000000..a4299da0 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 2387f6ba3501b5041bd7085fcd046301 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs index 505deaeb..4dea3eda 100644 --- a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs @@ -14,9 +14,10 @@ namespace RhythmHeavenMania.Games.MrUpbeat public GameObject metronome; public UpbeatMan man; - public float nextBeat; + public GameEvent beat = new GameEvent(); + public GameEvent offbeat = new GameEvent(); public bool canGo = false; - + private int beatCount = 0; public static MrUpbeat instance; @@ -27,6 +28,11 @@ namespace RhythmHeavenMania.Games.MrUpbeat private void Update() { + if (canGo) + metronome.transform.eulerAngles = new Vector3(0, 0, 270 - Mathf.Cos(Mathf.PI * Conductor.instance.songPositionInBeats) * 75); + //else + // metronome.transform.eulerAngles = new Vector3(0, 0, 200); + List gos = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "mrUpbeat/go"); for(int i=0; i Minigame.LateTime()) + { + //Fall(); + targetBeat += 100f; + return; + } + + if (PlayerInput.Pressed()) { if (state.perfect) { Step(); - } else if (state.notPerfect()) + } + else if(state.notPerfect()) { Fall(); } + else + { + Step(); + } } } - public void ProgressBeat() - { - game.nextBeat += 1f; - Blip(); - } - public override void OnAce() { + if (!game.canGo) return; + Step(); } + public void Idle() + { + stepTimes = 0; + transform.localScale = new Vector3(1, 1); + animator.Play("Idle", 0, 0); + } + public void Step() { - if (!game.canGo) return; - stepTimes++; + animator.Play("Step", 0, 0); Jukebox.PlayOneShotGame("mrUpbeat/step"); if (stepTimes % 2 == 1) + { + shadows[0].SetActive(false); + shadows[1].SetActive(true); transform.localScale = new Vector3(-1, 1); - else + } else + { + shadows[0].SetActive(true); + shadows[1].SetActive(false); transform.localScale = new Vector3(1, 1); - - ProgressBeat(); + } } public void Fall() { - if (!game.canGo) return; - + animator.Play("Fall", 0, 0); Jukebox.PlayOneShot("miss"); } - private void CheckIfFall(float normalizedBeat) - { - if (normalizedBeat > Minigame.LateTime()) - { - Fall(); - ProgressBeat(); - } - } - public void Blip() { Jukebox.PlayOneShotGame("mrUpbeat/blip"); diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 9237b010..647f78f0 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -376,7 +376,8 @@ namespace RhythmHeavenMania }), new Minigame("mrUpbeat", "Mr. Upbeat \n[WIP don't use]", "FFFFFF", false, false, new List() { - new GameAction("go", delegate { }, 4f, true), + new GameAction("prepare", delegate { MrUpbeat.instance.SetInterval(eventCaller.currentEntity.beat); }, 0.5f, true), + new GameAction("go", delegate { MrUpbeat.instance.Go(eventCaller.currentEntity.beat); }, 4f, true), }), /*new Minigame("spaceDance", "Space Dance", "B888F8", new List() { From 2ed99853a3b266566a5eb69d5a548983de836f79 Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Fri, 4 Mar 2022 22:18:06 -0500 Subject: [PATCH 7/7] Added smear fx to Mr. Upbeat --- Assets/Resources/Games/mrUpbeat.prefab | 169 +++++++++++++++- .../Games/MrUpbeat/Animations/Step.anim | 180 +++++++++++++++++- 2 files changed, 339 insertions(+), 10 deletions(-) diff --git a/Assets/Resources/Games/mrUpbeat.prefab b/Assets/Resources/Games/mrUpbeat.prefab index ac6b1b67..1582b203 100644 --- a/Assets/Resources/Games/mrUpbeat.prefab +++ b/Assets/Resources/Games/mrUpbeat.prefab @@ -154,6 +154,88 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1895376594866699655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3332517713256108722} + - component: {fileID: 6754897488810019599} + m_Layer: 0 + m_Name: StepSmearFoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3332517713256108722 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1895376594866699655} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.81, y: 0.41, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1584116570229233278} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6754897488810019599 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1895376594866699655} + 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: 6628280856970766740, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.2916667, y: 1.1041666} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2066794384027118212 GameObject: m_ObjectHideFlags: 0 @@ -318,6 +400,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4230431238859698318 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2124424146951847609} + - component: {fileID: 1253952869686795039} + m_Layer: 0 + m_Name: StepSmearHead + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2124424146951847609 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4230431238859698318} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.32, y: 1.44, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1584116570229233278} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1253952869686795039 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4230431238859698318} + 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: 2456994601062741431, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.2916667, y: 1.1041666} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6060117916978306099 GameObject: m_ObjectHideFlags: 0 @@ -428,7 +592,9 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.5, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 2124424146951847609} + - {fileID: 3332517713256108722} m_Father: {fileID: 1584121333826078951} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -763,6 +929,7 @@ MonoBehaviour: shadows: - {fileID: 8412912829583803381} - {fileID: 2066794384027118212} + targetBeat: 0.25 stepTimes: 0 --- !u!1 &8963803634876878173 GameObject: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim index 43f18c4c..e6cf676b 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Step.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.675, y: 1.08, z: 0} + value: {x: -0.675, y: 1.18, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,9 +29,9 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.016666668 - value: {x: -0.675, y: 1.23, z: 0} - inSlope: {x: 0, y: 6.8999968, z: 0} - outSlope: {x: 0, y: 6.8999968, z: 0} + value: {x: -0.675, y: 1.29, z: 0} + inSlope: {x: 0, y: 2.3999975, z: 0} + outSlope: {x: 0, y: 2.3999975, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -50,7 +50,81 @@ AnimationClip: m_RotationOrder: 4 path: Head m_ScaleCurves: [] - m_FloatCurves: [] + 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.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.050000004 + 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: Body/StepSmearHead + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.050000004 + 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: Body/StepSmearFoot + classID: 1 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -77,6 +151,20 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2429381691 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4273054516 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2073732236 attribute: 0 @@ -151,7 +239,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.08 + value: 1.18 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -160,9 +248,9 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.016666668 - value: 1.23 - inSlope: 6.8999968 - outSlope: 6.8999968 + value: 1.29 + inSlope: 2.3999975 + outSlope: 2.3999975 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -220,6 +308,80 @@ AnimationClip: 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.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.050000004 + 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: Body/StepSmearHead + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.050000004 + 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: Body/StepSmearFoot + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0