diff --git a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF MrUpbeat.mat b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF MrUpbeat.mat new file mode 100644 index 000000000..b8acc5f79 --- /dev/null +++ b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF MrUpbeat.mat @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOT-Rodin Pro DB SDF MrUpbeat + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - MASK_HARD + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 3307759631967023827, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _CullMode: 2 + - _Diffuse: 0.5 + - _FaceDilate: 1 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 10 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 1 + - _PerspectiveFilter: 0 + - _Reflectivity: 10 + - _ScaleRatioA: 0.41142857 + - _ScaleRatioB: 0 + - _ScaleRatioC: 0 + - _ScaleX: 69 + - _ScaleY: 69 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _SpecularPower: 2 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 1024 + - _TextureWidth: 1024 + - _UnderlayDilate: -1 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.75 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF MrUpbeat.mat.meta b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF MrUpbeat.mat.meta new file mode 100644 index 000000000..ad7e0c599 --- /dev/null +++ b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF MrUpbeat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa00f193fe038984592034ad7d5c2a42 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF.asset b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF.asset index fa4dcf448..80fd2c678 100644 --- a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF.asset +++ b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro DB SDF.asset @@ -2,14 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &-6562250930271150993 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: FOT-Rodin Pro DB Atlas Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} - m_ShaderKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -39,6 +40,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Ambient: 0.5 - _Bevel: 0.5 @@ -129,6 +131,7 @@ MonoBehaviour: m_StyleName: DB m_PointSize: 135 m_Scale: 1 + m_UnitsPerEM: 0 m_LineHeight: 270 m_AscentLine: 118.8 m_CapLine: 106 @@ -159,6 +162,7 @@ MonoBehaviour: m_Height: 0 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 2 m_Metrics: m_Width: 16.203125 @@ -173,6 +177,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 3 m_Metrics: m_Width: 42.25 @@ -187,6 +192,7 @@ MonoBehaviour: m_Height: 40 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 4 m_Metrics: m_Width: 86 @@ -201,6 +207,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 5 m_Metrics: m_Width: 75.1875 @@ -215,6 +222,7 @@ MonoBehaviour: m_Height: 125 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 6 m_Metrics: m_Width: 117.4375 @@ -229,6 +237,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 7 m_Metrics: m_Width: 94.5 @@ -243,6 +252,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 8 m_Metrics: m_Width: 16.1875 @@ -257,6 +267,7 @@ MonoBehaviour: m_Height: 40 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 9 m_Metrics: m_Width: 39.828125 @@ -271,6 +282,7 @@ MonoBehaviour: m_Height: 136 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 10 m_Metrics: m_Width: 39.828125 @@ -285,6 +297,7 @@ MonoBehaviour: m_Height: 136 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 11 m_Metrics: m_Width: 61.953125 @@ -299,6 +312,7 @@ MonoBehaviour: m_Height: 61 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 12 m_Metrics: m_Width: 77.21875 @@ -313,6 +327,7 @@ MonoBehaviour: m_Height: 75 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 13 m_Metrics: m_Width: 16.875 @@ -327,6 +342,7 @@ MonoBehaviour: m_Height: 39 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 14 m_Metrics: m_Width: 47.515625 @@ -341,6 +357,7 @@ MonoBehaviour: m_Height: 15 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 15 m_Metrics: m_Width: 16.875 @@ -355,6 +372,7 @@ MonoBehaviour: m_Height: 19 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 16 m_Metrics: m_Width: 54 @@ -369,6 +387,7 @@ MonoBehaviour: m_Height: 113 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 17 m_Metrics: m_Width: 77.21875 @@ -383,6 +402,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 18 m_Metrics: m_Width: 38.078125 @@ -397,6 +417,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 19 m_Metrics: m_Width: 72.625 @@ -411,6 +432,7 @@ MonoBehaviour: m_Height: 108 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 20 m_Metrics: m_Width: 76.40625 @@ -425,6 +447,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 21 m_Metrics: m_Width: 83.03125 @@ -439,6 +462,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 22 m_Metrics: m_Width: 76.8125 @@ -453,6 +477,7 @@ MonoBehaviour: m_Height: 109 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 23 m_Metrics: m_Width: 77.765625 @@ -467,6 +492,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 24 m_Metrics: m_Width: 73.84375 @@ -481,6 +507,7 @@ MonoBehaviour: m_Height: 107 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 25 m_Metrics: m_Width: 79.25 @@ -495,6 +522,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 26 m_Metrics: m_Width: 77.75 @@ -509,6 +537,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 27 m_Metrics: m_Width: 16.609375 @@ -523,6 +552,7 @@ MonoBehaviour: m_Height: 75 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 28 m_Metrics: m_Width: 16.609375 @@ -537,6 +567,7 @@ MonoBehaviour: m_Height: 94 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 29 m_Metrics: m_Width: 62.359375 @@ -551,6 +582,7 @@ MonoBehaviour: m_Height: 84 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 30 m_Metrics: m_Width: 74.515625 @@ -565,6 +597,7 @@ MonoBehaviour: m_Height: 43 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 31 m_Metrics: m_Width: 62.375 @@ -579,6 +612,7 @@ MonoBehaviour: m_Height: 84 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 32 m_Metrics: m_Width: 69.53125 @@ -593,6 +627,7 @@ MonoBehaviour: m_Height: 108 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 33 m_Metrics: m_Width: 106.921875 @@ -607,6 +642,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 34 m_Metrics: m_Width: 94.90625 @@ -621,6 +657,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 35 m_Metrics: m_Width: 77.359375 @@ -635,6 +672,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 36 m_Metrics: m_Width: 85.859375 @@ -649,6 +687,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 37 m_Metrics: m_Width: 84.921875 @@ -663,6 +702,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 38 m_Metrics: m_Width: 71.828125 @@ -677,6 +717,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 39 m_Metrics: m_Width: 66.96875 @@ -691,6 +732,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 40 m_Metrics: m_Width: 89.09375 @@ -705,6 +747,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 41 m_Metrics: m_Width: 79.25 @@ -719,6 +762,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 42 m_Metrics: m_Width: 15.921875 @@ -733,6 +777,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 43 m_Metrics: m_Width: 46.171875 @@ -747,6 +792,7 @@ MonoBehaviour: m_Height: 109 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 44 m_Metrics: m_Width: 81.9375 @@ -761,6 +807,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 45 m_Metrics: m_Width: 65.75 @@ -775,6 +822,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 46 m_Metrics: m_Width: 98.671875 @@ -789,6 +837,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 47 m_Metrics: m_Width: 78.828125 @@ -803,6 +852,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 48 m_Metrics: m_Width: 92.328125 @@ -817,6 +867,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 49 m_Metrics: m_Width: 74.515625 @@ -831,6 +882,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 50 m_Metrics: m_Width: 92.328125 @@ -845,6 +897,7 @@ MonoBehaviour: m_Height: 127 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 51 m_Metrics: m_Width: 80.859375 @@ -859,6 +912,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 52 m_Metrics: m_Width: 76.8125 @@ -873,6 +927,7 @@ MonoBehaviour: m_Height: 111 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 53 m_Metrics: m_Width: 78.15625 @@ -887,6 +942,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 54 m_Metrics: m_Width: 79.109375 @@ -901,6 +957,7 @@ MonoBehaviour: m_Height: 109 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 55 m_Metrics: m_Width: 89.640625 @@ -915,6 +972,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 56 m_Metrics: m_Width: 119.609375 @@ -929,6 +987,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 57 m_Metrics: m_Width: 85.3125 @@ -943,6 +1002,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 58 m_Metrics: m_Width: 85.1875 @@ -957,6 +1017,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 59 m_Metrics: m_Width: 75.34375 @@ -971,6 +1032,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 60 m_Metrics: m_Width: 35.234375 @@ -985,6 +1047,7 @@ MonoBehaviour: m_Height: 134 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 62 m_Metrics: m_Width: 35.359375 @@ -999,6 +1062,7 @@ MonoBehaviour: m_Height: 134 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 63 m_Metrics: m_Width: 68.578125 @@ -1013,6 +1077,7 @@ MonoBehaviour: m_Height: 65 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 64 m_Metrics: m_Width: 67.5 @@ -1027,6 +1092,7 @@ MonoBehaviour: m_Height: 10 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 65 m_Metrics: m_Width: 34.96875 @@ -1041,6 +1107,7 @@ MonoBehaviour: m_Height: 30 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 66 m_Metrics: m_Width: 73.03125 @@ -1055,6 +1122,7 @@ MonoBehaviour: m_Height: 79 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 67 m_Metrics: m_Width: 68.984375 @@ -1069,6 +1137,7 @@ MonoBehaviour: m_Height: 108 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 68 m_Metrics: m_Width: 66.96875 @@ -1083,6 +1152,7 @@ MonoBehaviour: m_Height: 79 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 69 m_Metrics: m_Width: 70.203125 @@ -1097,6 +1167,7 @@ MonoBehaviour: m_Height: 108 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 70 m_Metrics: m_Width: 69.9375 @@ -1111,6 +1182,7 @@ MonoBehaviour: m_Height: 79 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 71 m_Metrics: m_Width: 41.1875 @@ -1125,6 +1197,7 @@ MonoBehaviour: m_Height: 108 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 72 m_Metrics: m_Width: 69.125 @@ -1139,6 +1212,7 @@ MonoBehaviour: m_Height: 105 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 73 m_Metrics: m_Width: 65.484375 @@ -1153,6 +1227,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 74 m_Metrics: m_Width: 15.671875 @@ -1167,6 +1242,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 75 m_Metrics: m_Width: 35.78125 @@ -1181,6 +1257,7 @@ MonoBehaviour: m_Height: 133 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 76 m_Metrics: m_Width: 65.875 @@ -1195,6 +1272,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 77 m_Metrics: m_Width: 15.25 @@ -1209,6 +1287,7 @@ MonoBehaviour: m_Height: 106 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 78 m_Metrics: m_Width: 98.6875 @@ -1223,6 +1302,7 @@ MonoBehaviour: m_Height: 77 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 79 m_Metrics: m_Width: 65.484375 @@ -1237,6 +1317,7 @@ MonoBehaviour: m_Height: 77 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 80 m_Metrics: m_Width: 73.984375 @@ -1251,6 +1332,7 @@ MonoBehaviour: m_Height: 79 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 81 m_Metrics: m_Width: 68.984375 @@ -1265,6 +1347,7 @@ MonoBehaviour: m_Height: 104 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 82 m_Metrics: m_Width: 70.203125 @@ -1279,6 +1362,7 @@ MonoBehaviour: m_Height: 104 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 83 m_Metrics: m_Width: 39.5625 @@ -1293,6 +1377,7 @@ MonoBehaviour: m_Height: 77 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 84 m_Metrics: m_Width: 62.359375 @@ -1307,6 +1392,7 @@ MonoBehaviour: m_Height: 79 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 85 m_Metrics: m_Width: 42.515625 @@ -1321,6 +1407,7 @@ MonoBehaviour: m_Height: 101 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 86 m_Metrics: m_Width: 65.609375 @@ -1335,6 +1422,7 @@ MonoBehaviour: m_Height: 77 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 87 m_Metrics: m_Width: 71.140625 @@ -1349,6 +1437,7 @@ MonoBehaviour: m_Height: 75 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 88 m_Metrics: m_Width: 103.28125 @@ -1363,6 +1452,7 @@ MonoBehaviour: m_Height: 75 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 89 m_Metrics: m_Width: 71.40625 @@ -1377,6 +1467,7 @@ MonoBehaviour: m_Height: 75 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 90 m_Metrics: m_Width: 70.59375 @@ -1391,6 +1482,7 @@ MonoBehaviour: m_Height: 103 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 91 m_Metrics: m_Width: 63.046875 @@ -1405,6 +1497,7 @@ MonoBehaviour: m_Height: 75 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 92 m_Metrics: m_Width: 36.859375 @@ -1419,6 +1512,7 @@ MonoBehaviour: m_Height: 136 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 93 m_Metrics: m_Width: 11.203125 @@ -1433,6 +1527,7 @@ MonoBehaviour: m_Height: 113 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 94 m_Metrics: m_Width: 36.859375 @@ -1447,6 +1542,7 @@ MonoBehaviour: m_Height: 136 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 95 m_Metrics: m_Width: 46.4375 @@ -1461,6 +1557,7 @@ MonoBehaviour: m_Height: 22 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 97 m_Metrics: m_Width: 54 @@ -1475,6 +1572,7 @@ MonoBehaviour: m_Height: 113 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 668 m_Metrics: m_Width: 110.15625 @@ -1489,6 +1587,7 @@ MonoBehaviour: m_Height: 21 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 - m_Index: 728 m_Metrics: m_Width: 117.859375 @@ -1503,6 +1602,7 @@ MonoBehaviour: m_Height: 119 m_Scale: 1 m_AtlasIndex: 0 + m_ClassDefinitionType: 0 m_CharacterTable: - m_ElementType: 1 m_Unicode: 32 diff --git a/Assets/Resources/Games/mrUpbeat.prefab b/Assets/Resources/Games/mrUpbeat.prefab index 7b03b9c55..5c27b056c 100644 --- a/Assets/Resources/Games/mrUpbeat.prefab +++ b/Assets/Resources/Games/mrUpbeat.prefab @@ -9,8 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4485966734002228350} - - component: {fileID: 1614535701461294964} - component: {fileID: 2897060438308778760} + - component: {fileID: 1614535701461294964} m_Layer: 0 m_Name: AntennaLight m_TagString: Untagged @@ -25,32 +25,14 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.008, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] 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 @@ -62,6 +44,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -70,7 +53,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: de6ec7258944d824c85cbcb172095b2a, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -90,8 +73,8 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 - m_Sprite: {fileID: -1808759476897028762, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + m_SortingOrder: 10 + m_Sprite: {fileID: 823626875365731854, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -102,6 +85,27 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &1614535701461294964 +Animator: + serializedVersion: 5 + 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_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1456959186295915410 GameObject: m_ObjectHideFlags: 0 @@ -129,6 +133,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.006, y: 0.76, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1584116570229233278} m_RootOrder: 2 @@ -144,6 +149,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -211,6 +217,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1584116570229233278} - {fileID: 6950861003573010513} @@ -219,7 +226,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &2256168985014220240 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -232,10 +239,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1895376594866699655 GameObject: m_ObjectHideFlags: 0 @@ -263,6 +272,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1584116570229233278} m_RootOrder: 1 @@ -278,6 +288,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -345,6 +356,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 862280508089709600} m_RootOrder: 1 @@ -360,6 +372,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -390,7 +403,7 @@ SpriteRenderer: 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_Color: {r: 0.12156863, g: 0, b: 0, a: 0.18039216} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -427,6 +440,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} m_LocalPosition: {x: 0.556, y: -0.074, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1584116570229233278} m_RootOrder: 3 @@ -442,6 +456,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -510,6 +525,7 @@ Transform: m_LocalRotation: {x: 0, y: -0, z: 0.9659259, w: -0.25881898} m_LocalPosition: {x: 0, y: -2.623, z: 0} m_LocalScale: {x: 1.05, y: 1.05, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7248900333300803150} m_RootOrder: 1 @@ -525,6 +541,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -567,7 +584,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &4547664343140929301 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -580,10 +597,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &4230431238859698318 GameObject: m_ObjectHideFlags: 0 @@ -611,6 +630,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1584116570229233278} m_RootOrder: 0 @@ -626,6 +646,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -666,6 +687,200 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4832125457190649999 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3242105452747297828} + - component: {fileID: 7002390330640987317} + - component: {fileID: 1328881971056076866} + - component: {fileID: 6703009748212989289} + m_Layer: 0 + m_Name: Letter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3242105452747297828 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4832125457190649999} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.6749878, y: 3.15} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &7002390330640987317 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4832125457190649999} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fa00f193fe038984592034ad7d5c2a42, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1337 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &1328881971056076866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4832125457190649999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: fa00f193fe038984592034ad7d5c2a42, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4291690238 + m_fontColor: {r: 0.99607843, g: 0.99607843, b: 0.8039216, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 5 + m_fontSizeBase: 5 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 7002390330640987317} + m_maskType: 0 +--- !u!95 &6703009748212989289 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4832125457190649999} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: d962828c1f0c71347992dfc1449f496b, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &6060117916978306099 GameObject: m_ObjectHideFlags: 0 @@ -693,6 +908,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4485966734002228350} m_Father: {fileID: 6950861003573010513} @@ -709,6 +925,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -776,6 +993,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2124424146951847609} - {fileID: 3332517713256108722} @@ -796,6 +1014,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -830,7 +1049,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 2.125, y: 2.1041667} + m_Size: {x: 2.1250002, y: 2.1041813} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -863,6 +1082,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1039565176908573975} m_Father: {fileID: 1584121333826078951} @@ -879,6 +1099,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -946,9 +1167,11 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8701843541313247389} - {fileID: 7821851253613277009} + - {fileID: 3242105452747297828} - {fileID: 862280508089709600} m_Father: {fileID: 0} m_RootOrder: 0 @@ -971,6 +1194,13 @@ MonoBehaviour: firstEnable: 0 metronomeAnim: {fileID: 4547664343140929301} man: {fileID: 8160414645038680372} + blipMaterial: {fileID: 2100000, guid: de6ec7258944d824c85cbcb172095b2a, type: 2} + bg: {fileID: 7037067448840752386} + shadowSr: + - {fileID: 6548992874688888731} + - {fileID: 5137804451209053898} + - {fileID: 4164580634482561143} + stepIterate: 0 --- !u!1 &8412912829583803381 GameObject: m_ObjectHideFlags: 0 @@ -998,6 +1228,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 862280508089709600} m_RootOrder: 0 @@ -1013,6 +1244,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1043,7 +1275,7 @@ SpriteRenderer: 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_Color: {r: 0.12, g: 0, b: 0, a: 0.18039216} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -1080,12 +1312,13 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.92, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7864236320873353852} - {fileID: 4285463118267461702} - {fileID: 1584121333826078951} m_Father: {fileID: 7248900333300803150} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8160414645038680372 MonoBehaviour: @@ -1099,14 +1332,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e4fa18aec69a2e949a7e2d4e33bdd2b9, type: 3} m_Name: m_EditorClassIdentifier: - game: {fileID: 8728962026160321644} - animator: {fileID: 2256168985014220240} - blipAnimator: {fileID: 1614535701461294964} + anim: {fileID: 2256168985014220240} + blipAnim: {fileID: 1614535701461294964} + letterAnim: {fileID: 6703009748212989289} shadows: - {fileID: 8412912829583803381} - {fileID: 2066794384027118212} - targetBeat: 0.25 + blipText: {fileID: 1328881971056076866} stepTimes: 0 + blipSize: 0 + blipString: M --- !u!1 &8959999179820051615 GameObject: m_ObjectHideFlags: 0 @@ -1134,6 +1369,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.523, y: 0.016, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1584116570229233278} m_RootOrder: 4 @@ -1149,6 +1385,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1179,11 +1416,11 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: -2 m_Sprite: {fileID: -5599596391108488658, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.1215686, g: 0, b: 0, a: 0.18039216} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.9583334, y: 1.6041666} + m_Size: {x: 2.1250002, y: 0.77083874} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1215,7 +1452,8 @@ Transform: 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: 74.89795, y: 40.89256, z: 3.443584} + m_LocalScale: {x: 69, y: 42, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7248900333300803150} m_RootOrder: 0 @@ -1231,6 +1469,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1261,7 +1500,7 @@ SpriteRenderer: 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_Color: {r: 0.8784314, g: 0.8784314, b: 0.8784314, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip1.anim similarity index 99% rename from Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim rename to Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip1.anim index 7c6442600..8b9d5c89f 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip1.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Blip + m_Name: Blip1 serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip1.anim.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip1.anim.meta new file mode 100644 index 000000000..70d2b11a3 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip1.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8426e37bb0ec4c244aaba1d03bf10e0e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip2.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip2.anim new file mode 100644 index 000000000..596d4f00d --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip2.anim @@ -0,0 +1,234 @@ +%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: Blip2 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.009, y: 0.017, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.4454, y: 1.4454, z: 1.4454} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + 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 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.009 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.017 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + 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 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.4454 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.4454 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.4454 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip2.anim.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip2.anim.meta new file mode 100644 index 000000000..d9589c8ab --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7ccc14b377b4024998c3a9c72925d42 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip3.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip3.anim new file mode 100644 index 000000000..813daab6e --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip3.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: Blip3 + 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: -1221532570, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - time: 0.016666668 + value: {fileID: -1839324359, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - time: 0.033333335 + value: {fileID: 1848041093, 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: -1221532570, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - {fileID: -1839324359, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - {fileID: 1848041093, 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/Blip3.anim.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip3.anim.meta new file mode 100644 index 000000000..8847a246d --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip3.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d0ab61c1e57ff8a4989a170a68ab71be +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip4.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip4.anim new file mode 100644 index 000000000..ae27a139d --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip4.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: Blip4 + 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: -1921142482, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - time: 0.016666668 + value: {fileID: 1603879706, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - time: 0.033333335 + value: {fileID: 1104172675, 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: -1921142482, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - {fileID: 1603879706, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - {fileID: 1104172675, 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/Blip4.anim.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip4.anim.meta new file mode 100644 index 000000000..fce84ad87 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip4.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00464c90c22345442aeb86beffb95478 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip5.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip5.anim new file mode 100644 index 000000000..acc5008b0 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip5.anim @@ -0,0 +1,154 @@ +%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: Blip5 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.183, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 219566257, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - time: 0.016666668 + value: {fileID: 1559131365, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - time: 0.033333335 + value: {fileID: -2109729356, 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 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: + - {fileID: 219566257, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - {fileID: 1559131365, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} + - {fileID: -2109729356, 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.183 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + 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 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + 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 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip5.anim.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip5.anim.meta new file mode 100644 index 000000000..756215f39 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip5.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8222a6c732956fd4f8ed08efcd7b9c8b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller index 383586687..a56fedb9a 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/BlipAnimator.controller @@ -1,13 +1,13 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-5338859024521178731 +--- !u!1102 &-5992893389277055597 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Blip + m_Name: Blip5 m_Speed: 0.25 m_CycleOffset: 0 m_Transitions: [] @@ -20,7 +20,59 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 64c8a1564282a444cb0392113029b861, type: 2} + m_Motion: {fileID: 7400000, guid: 8222a6c732956fd4f8ed08efcd7b9c8b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-5338859024521178731 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blip1 + 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: 8426e37bb0ec4c244aaba1d03bf10e0e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-3182954434238827081 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blip3 + 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: d0ab61c1e57ff8a4989a170a68ab71be, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -48,6 +100,58 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &356327066498645755 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blip4 + 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: 00464c90c22345442aeb86beffb95478, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &4111389524046232210 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blip2 + 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: b7ccc14b377b4024998c3a9c72925d42, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &5157214750414911887 AnimatorStateMachine: serializedVersion: 6 @@ -59,10 +163,22 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 7345739688119431093} - m_Position: {x: 360, y: 0, z: 0} + m_Position: {x: 340, y: 10, z: 0} - serializedVersion: 1 m_State: {fileID: -5338859024521178731} m_Position: {x: 340, y: 90, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4111389524046232210} + m_Position: {x: 340, y: 140, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3182954434238827081} + m_Position: {x: 340, y: 190, z: 0} + - serializedVersion: 1 + m_State: {fileID: 356327066498645755} + m_Position: {x: 340, y: 240, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5992893389277055597} + m_Position: {x: 340, y: 290, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterAnimator.controller b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterAnimator.controller new file mode 100644 index 000000000..40792e784 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterAnimator.controller @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6973241838888870808 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: StepLeft + 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: 37707cc2c2686d94ea12646889996023, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-6675537026643194175 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Nothing + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-777172598389968400 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: StepRight + 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: 1ef687ca3c0e7924b8569974db6ff4dd, 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: LetterAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 5570846061059316407} + 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 &5570846061059316407 +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: -6675537026643194175} + m_Position: {x: 450, y: 30, z: 0} + - serializedVersion: 1 + m_State: {fileID: -777172598389968400} + m_Position: {x: 580, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6973241838888870808} + m_Position: {x: 320, y: 110, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 470, y: -100, z: 0} + m_EntryPosition: {x: 470, y: -40, z: 0} + m_ExitPosition: {x: 470, y: -160, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6675537026643194175} diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterAnimator.controller.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterAnimator.controller.meta new file mode 100644 index 000000000..b533b1430 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d962828c1f0c71347992dfc1449f496b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepLeft.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepLeft.anim new file mode 100644 index 000000000..87a959ac9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepLeft.anim @@ -0,0 +1,179 @@ +%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: LetterStepLeft + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.677 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.02 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 3.13 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 3.15 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1460864421 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.033333335 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.677 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.02 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 3.13 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 3.15 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + 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/LetterStepLeft.anim.meta similarity index 79% rename from Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim.meta rename to Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepLeft.anim.meta index 9ced91ad5..5453be454 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/Blip.anim.meta +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepLeft.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 64c8a1564282a444cb0392113029b861 +guid: 37707cc2c2686d94ea12646889996023 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepRight.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepRight.anim new file mode 100644 index 000000000..890f3aac4 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepRight.anim @@ -0,0 +1,179 @@ +%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: LetterStepRight + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.677 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.02 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 3.13 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 3.15 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1460864421 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.033333335 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.677 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.02 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 3.13 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 3.15 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepRight.anim.meta b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepRight.anim.meta new file mode 100644 index 000000000..958e53e33 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/LetterStepRight.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ef687ca3c0e7924b8569974db6ff4dd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/blip.mat b/Assets/Resources/Sprites/Games/MrUpbeat/blip.mat new file mode 100644 index 000000000..bf9831d88 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/blip.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: blip + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAlpha: {r: 0, g: 0, b: 0, a: 1} + - _ColorBravo: {r: 0, g: 1, b: 0, a: 1} + - _ColorDelta: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/blip.mat.meta b/Assets/Resources/Sprites/Games/MrUpbeat/blip.mat.meta new file mode 100644 index 000000000..3cfda5904 --- /dev/null +++ b/Assets/Resources/Sprites/Games/MrUpbeat/blip.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de6ec7258944d824c85cbcb172095b2a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png index c52feb3fb..36080c35d 100644 Binary files a/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png and b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png differ diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta index a5ac27dde..626b819d7 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta +++ b/Assets/Resources/Sprites/Games/MrUpbeat/mrupbeat_main.png.meta @@ -113,7 +113,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 48 + spritePixelsToUnits: 192 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -133,7 +133,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -174,16 +174,16 @@ TextureImporter: name: mrupbeat_head_normal rect: serializedVersion: 2 - x: 217 - y: 449 - width: 62 - height: 61 + x: 868 + y: 1796 + width: 248 + height: 244 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: d1512f74a017739e0800000000000000 internalID: -1641719250182597347 @@ -195,16 +195,16 @@ TextureImporter: name: mrupbeat_head_blink rect: serializedVersion: 2 - x: 281 - y: 449 - width: 62 - height: 61 + x: 1124 + y: 1796 + width: 248 + height: 244 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 0c308b81ec25e6e80800000000000000 internalID: -8183512427754159168 @@ -216,16 +216,16 @@ TextureImporter: name: mrupbeat_head_shocked rect: serializedVersion: 2 - x: 345 - y: 449 - width: 62 - height: 61 + x: 1380 + y: 1796 + width: 248 + height: 244 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 06bffe14acc822600800000000000000 internalID: 442070513753258848 @@ -237,16 +237,16 @@ TextureImporter: name: mrupbeat_miss_fx rect: serializedVersion: 2 - x: 409 - y: 449 - width: 102 - height: 61 + x: 1636 + y: 1796 + width: 408 + height: 244 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 5a3fcdb6914562940800000000000000 internalID: 5270992882044302245 @@ -258,16 +258,16 @@ TextureImporter: name: mrupbeat_shadow_left rect: serializedVersion: 2 - x: 313 - y: 369 - width: 94 - height: 77 + x: 1252 + y: 1476 + width: 376 + height: 308 alignment: 9 pivot: {x: 0.46770754, y: 0.18134259} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: ce5e0f8e5b8d327b0800000000000000 internalID: -5250114464775084564 @@ -279,16 +279,16 @@ TextureImporter: name: mrupbeat_shadow_right rect: serializedVersion: 2 - x: 217 - y: 369 - width: 94 - height: 77 + x: 868 + y: 1476 + width: 376 + height: 308 alignment: 9 pivot: {x: 0.8090567, y: 0.16817167} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: cd425218a4dd56a20800000000000000 internalID: 3055091234304763100 @@ -300,16 +300,16 @@ TextureImporter: name: mrupbeat_smear_fx_0 rect: serializedVersion: 2 - x: 1 - y: 105 - width: 110 - height: 53 + x: 4 + y: 420 + width: 440 + height: 212 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 7b5b56b629ff81220800000000000000 internalID: 2456994601062741431 @@ -321,16 +321,16 @@ TextureImporter: name: mrupbeat_smear_fx_1 rect: serializedVersion: 2 - x: 113 - y: 98 - width: 70 - height: 60 + x: 452 + y: 392 + width: 280 + height: 240 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 131d12396bc7d82c0800000000000000 internalID: -4427745735040970447 @@ -342,16 +342,16 @@ TextureImporter: name: mrupbeat_smear_fx_2 rect: serializedVersion: 2 - x: 185 - y: 97 - width: 46 - height: 61 + x: 740 + y: 388 + width: 184 + height: 244 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 499a34f32526cfb50800000000000000 internalID: 6628280856970766740 @@ -363,16 +363,16 @@ TextureImporter: name: mrupbeat_antenna rect: serializedVersion: 2 - x: 281 - y: 113 - width: 54 - height: 45 + x: 1124 + y: 452 + width: 216 + height: 180 alignment: 9 pivot: {x: 0.5925926, y: 0.51111114} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 4ad8de96d6bb82fd0800000000000000 internalID: -2366435525580190300 @@ -384,16 +384,16 @@ TextureImporter: name: mrupbeat_antenna_light_0 rect: serializedVersion: 2 - x: 233 - y: 113 - width: 46 - height: 45 + x: 932 + y: 452 + width: 184 + height: 180 alignment: 9 - pivot: {x: 0.7173913, y: 0.51111114} + pivot: {x: 0.7174, y: 0.51} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: e0ea3a5874c1e6b00800000000000000 internalID: 823626875365731854 @@ -405,16 +405,16 @@ TextureImporter: name: mrupbeat_antenna_light_1 rect: serializedVersion: 2 - x: 385 - y: 113 - width: 46 - height: 45 + x: 1540 + y: 452 + width: 184 + height: 180 alignment: 9 - pivot: {x: 0.7173913, y: 0.51111114} + pivot: {x: 0.7174, y: 0.51} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 6d7469eac91630d80800000000000000 internalID: -8285671563859703850 @@ -426,16 +426,16 @@ TextureImporter: name: mrupbeat_antenna_light_2 rect: serializedVersion: 2 - x: 337 - y: 113 - width: 46 - height: 45 + x: 1348 + y: 452 + width: 184 + height: 180 alignment: 9 - pivot: {x: 0.7173913, y: 0.51111114} + pivot: {x: 0.7174, y: 0.51} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 6656e67c6def5e6e0800000000000000 internalID: -1808759476897028762 @@ -447,16 +447,16 @@ TextureImporter: name: mrupbeat_metronome rect: serializedVersion: 2 - x: 1 - y: 1 - width: 414 - height: 62 + x: 6 + y: 4 + width: 1656 + height: 248 alignment: 9 - pivot: {x: 0.5770048, y: 0.50376165} + pivot: {x: 0.575, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 489c8679efe992c10800000000000000 internalID: 2029327923406227844 @@ -468,16 +468,16 @@ TextureImporter: name: mrupbeat_step_0 rect: serializedVersion: 2 - x: 113 - y: 225 - width: 102 - height: 86 + x: 452 + y: 900 + width: 408 + height: 344 alignment: 9 pivot: {x: 0.42319235, y: 0.1975449} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: c257799ec1a218900800000000000000 internalID: 684874922003494188 @@ -489,16 +489,16 @@ TextureImporter: name: mrupbeat_step_1 rect: serializedVersion: 2 - x: 113 - y: 313 - width: 102 - height: 93 + x: 452 + y: 1252 + width: 408 + height: 372 alignment: 9 pivot: {x: 0.42973134, y: 0.1378374} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 7667ba0d4474404e0800000000000000 internalID: -2016408372270893465 @@ -510,16 +510,16 @@ TextureImporter: name: mrupbeat_step_2 rect: serializedVersion: 2 - x: 113 - y: 409 - width: 102 - height: 101 + x: 452 + y: 1636 + width: 408 + height: 404 alignment: 9 pivot: {x: 0.44062924, y: 0.14561266} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: ab59c60d1c3af43c0800000000000000 internalID: -4373096660332669510 @@ -531,16 +531,16 @@ TextureImporter: name: mrupbeat_fall_0 rect: serializedVersion: 2 - x: 1 - y: 433 - width: 110 - height: 77 + x: 4 + y: 1732 + width: 440 + height: 308 alignment: 9 pivot: {x: 0.23131311, y: 0.2206722} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: b0577a1c68861ac00800000000000000 internalID: 910123527689434379 @@ -552,16 +552,16 @@ TextureImporter: name: mrupbeat_fall_1 rect: serializedVersion: 2 - x: 1 - y: 361 - width: 110 - height: 69 + x: 4 + y: 1444 + width: 440 + height: 276 alignment: 9 pivot: {x: 0.25480798, y: 0.24740025} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: dc4148012f06bd460800000000000000 internalID: 7267509016467870925 @@ -573,18 +573,18 @@ TextureImporter: name: mrupbeat_fall_2 rect: serializedVersion: 2 - x: 1 - y: 225 - width: 110 - height: 61 + x: 4 + y: 900 + width: 440 + height: 244 alignment: 9 pivot: {x: 0.19380306, y: 0.24692748} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] - spriteID: 8acdab1cbd71b90f0800000000000000 + spriteID: 22c7d20975fdbdc30800000000000000 internalID: 4385344229349358626 vertices: [] indices: @@ -594,16 +594,16 @@ TextureImporter: name: mrupbeat_fall_3 rect: serializedVersion: 2 - x: 1 - y: 161 - width: 110 - height: 61 + x: 4 + y: 644 + width: 440 + height: 244 alignment: 9 pivot: {x: 0.1929862, y: 0.21257469} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: dcef749124666b8c0800000000000000 internalID: -3983884386284601651 @@ -615,19 +615,334 @@ TextureImporter: name: mrupbeat_shadow_fall rect: serializedVersion: 2 - x: 353 - y: 209 - width: 102 - height: 37 + x: 1412 + y: 836 + width: 408 + height: 148 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: [] + tessellationDetail: -1 + bones: [] + spriteID: e225b6e00cc3a42b0800000000000000 + internalID: -5599596391108488658 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_0 + rect: + serializedVersion: 2 + x: 2087 + y: 1739 + width: 274 + height: 273 + alignment: 9 + pivot: {x: 1, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: e225b6e00cc3a42b0800000000000000 - internalID: -5599596391108488658 + spriteID: 6e085ab157fc51d4b8919eed0bbed063 + internalID: -2109729356 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_1 + rect: + serializedVersion: 2 + x: 2474 + y: 1771 + width: 205 + height: 208 + alignment: 9 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f49a06fca53fc7b4abe8649503d1dbc7 + internalID: 1104172675 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_2 + rect: + serializedVersion: 2 + x: 2851 + y: 1771 + width: 159 + height: 160 + alignment: 9 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c317ad675a2c9e142aa43307e416da40 + internalID: 1848041093 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_3 + rect: + serializedVersion: 2 + x: 3226 + y: 1770 + width: 115 + height: 114 + alignment: 9 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1291cc5abb7f6cf4094cc4f2054983a0 + internalID: -1123406618 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_4 + rect: + serializedVersion: 2 + x: 2087 + y: 1386 + width: 274 + height: 273 + alignment: 9 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7425b693d12a28947b9c44290c87240f + internalID: 1559131365 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_5 + rect: + serializedVersion: 2 + x: 2474 + y: 1419 + width: 206 + height: 206 + alignment: 9 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5034675b48c4fac48b7ca72affb5d257 + internalID: 1603879706 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_6 + rect: + serializedVersion: 2 + x: 2852 + y: 1419 + width: 158 + height: 158 + alignment: 9 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 76ab99f01d26f954c9ac53e7fd5a9940 + internalID: -1839324359 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_7 + rect: + serializedVersion: 2 + x: 3226 + y: 1416 + width: 115 + height: 116 + alignment: 9 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4e2205bd5ae4abc41b156bacd2b94f2d + internalID: 1875985905 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_8 + rect: + serializedVersion: 2 + x: 2087 + y: 1034 + width: 274 + height: 273 + alignment: 9 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bf3f53968ecd256489c86c556651e97a + internalID: 219566257 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_9 + rect: + serializedVersion: 2 + x: 2474 + y: 1066 + width: 206 + height: 206 + alignment: 9 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7e56cde8342f3054e83a15b40b1e095a + internalID: -1921142482 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_10 + rect: + serializedVersion: 2 + x: 2852 + y: 1066 + width: 158 + height: 159 + alignment: 9 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 317ed81527ee0604ab4741879df51d61 + internalID: -1221532570 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_11 + rect: + serializedVersion: 2 + x: 3226 + y: 1063 + width: 115 + height: 115 + alignment: 9 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a5782e747f873104da5bdacd7042f711 + internalID: 899455387 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_12 + rect: + serializedVersion: 2 + x: 3495 + y: 1754 + width: 381 + height: 255 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b998ae3e6493bdd45bf0ce951024ce70 + internalID: -2014763855 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_13 + rect: + serializedVersion: 2 + x: 3495 + y: 1376 + width: 381 + height: 255 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 67b6d15c47a148d4f825a61a7ef411a3 + internalID: -1248414130 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mrupbeat_main_14 + rect: + serializedVersion: 2 + x: 3495 + y: 1115 + width: 381 + height: 255 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: df282a88c9990804bbe1be6b69352b8b + internalID: 1471741028 vertices: [] indices: edges: [] @@ -654,6 +969,21 @@ TextureImporter: mrupbeat_head_blink: -8183512427754159168 mrupbeat_head_normal: -1641719250182597347 mrupbeat_head_shocked: 442070513753258848 + mrupbeat_main_0: -2109729356 + mrupbeat_main_1: 1104172675 + mrupbeat_main_10: -1221532570 + mrupbeat_main_11: 899455387 + mrupbeat_main_12: -2014763855 + mrupbeat_main_13: -1248414130 + mrupbeat_main_14: 1471741028 + mrupbeat_main_2: 1848041093 + mrupbeat_main_3: -1123406618 + mrupbeat_main_4: 1559131365 + mrupbeat_main_5: 1603879706 + mrupbeat_main_6: -1839324359 + mrupbeat_main_7: 1875985905 + mrupbeat_main_8: 219566257 + mrupbeat_main_9: -1921142482 mrupbeat_metronome: 2029327923406227844 mrupbeat_miss_fx: 5270992882044302245 mrupbeat_shadow_fall: -5599596391108488658 diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs index 3e96687ca..ccac35137 100644 --- a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; using System; -using Starpelly; +using DG.Tweening; using HeavenStudio.Util; @@ -15,26 +15,69 @@ namespace HeavenStudio.Games.Loaders public static Minigame AddGame(EventCaller eventCaller) { return new Minigame("mrUpbeat", "Mr. Upbeat", "ffffff", false, false, new List() { - new GameAction("stepping", "Start Stepping") + new GameAction("start stepping", "Start Stepping") { - preFunction = delegate {var e = eventCaller.currentEntity; MrUpbeat.Stepping(e.beat, e.length); }, + preFunction = delegate {var e = eventCaller.currentEntity; MrUpbeat.StartStepping(e.beat, e.length, e["force"]); }, defaultLength = 4f, resizable = true, + parameters = new List() + { + new Param("force", false, "Force Mr. Downbeat", "Forces inputs to not be only on the offbeats"), + } }, - new GameAction("blipping", "Beeping") + new GameAction("ding", "Ding!") { - function = delegate {var e = eventCaller.currentEntity; MrUpbeat.Blipping(e.beat, e.length); }, - defaultLength = 4f, - resizable = true, - inactiveFunction = delegate {var e = eventCaller.currentEntity; MrUpbeat.Blipping(e.beat, e.length); }, - }, - new GameAction("ding!", "Ding!") - { - function = delegate { MrUpbeat.instance.Ding(eventCaller.currentEntity["toggle"]); }, + function = delegate { + var e = eventCaller.currentEntity; + MrUpbeat.instance.Ding(eventCaller.currentEntity["toggle"], e["stopBlipping"]); }, defaultLength = 0.5f, parameters = new List() { - new Param("toggle", false, "Applause") + new Param("toggle", false, "Applause", "Plays an applause sound effect."), + new Param("stopBlipping", true, "Stop Blipping?", "When the stepping stops, should the blipping stop too?"), + } + }, + new GameAction("changeBG", "Change Background Color") + { + function = delegate { + var e = eventCaller.currentEntity; + MrUpbeat.instance.FadeBackgroundColor(e["start"], e["end"], e.length, e["toggle"]); }, + defaultLength = 1f, + resizable = true, + parameters = new List() + { + new Param("start", new Color(0.878f, 0.878f, 0.878f), "Start Color", "The start color for the fade or the color that will be switched to if -instant- is ticked on."), + new Param("end", new Color(0.878f, 0.878f, 0.878f), "End Color", "The end color for the fade."), + new Param("toggle", false, "Instant", "Should the background instantly change color?") + } + }, + new GameAction("upbeatColors", "Upbeat Colors") + { + function = delegate { + var e = eventCaller.currentEntity; + MrUpbeat.instance.UpbeatColors(e["blipColor"], e["setShadow"], e["shadowColor"]); + }, + defaultLength = 0.5f, + parameters = new List() + { + new Param("blipColor", new Color(0, 1f, 0), "Blip Color", "Change blip color"), + new Param("setShadow", false, "Set Shadow Color?", "Should Mr. Upbeat's shadow be custom?"), + new Param("shadowColor", new Color(1f, 1f, 1f, 0), "Shadow Color", "If \"Set Shadow Color\" is checked, this will set the shadow's color."), + } + }, + new GameAction("blipEvents", "Blip Events") + { + function = delegate { + var e = eventCaller.currentEntity; + MrUpbeat.instance.BlipEvents(e["letter"], e["shouldGrow"], e["resetBlip"], e["blip"]); + }, + defaultLength = 0.5f, + parameters = new List() + { + new Param("letter", "", "Letter To Appear", "Which letter to appear on the blip"), + new Param("shouldGrow", true, "Grow Antenna?", "Should Mr. Upbeat's antenna grow?"), + new Param("resetBlip", false, "Reset Antenna?", "Should Mr. Upbeat's antenna reset?"), + new Param("blip", true, "Should Blip?", "Should Mr. Upbeat blip every offbeat?"), } }, }); @@ -48,160 +91,135 @@ namespace HeavenStudio.Games public class MrUpbeat : Minigame { - static List queuedBeeps = new List(); - static List queuedInputs = new List(); - public struct queuedUpbeatInputs - { - public float beat; - public bool goRight; - } + static List queuedInputs = new List(); [Header("References")] - public Animator metronomeAnim; - public UpbeatMan man; + [SerializeField] Animator metronomeAnim; + [SerializeField] UpbeatMan man; + [SerializeField] Material blipMaterial; + [SerializeField] SpriteRenderer bg; + [SerializeField] SpriteRenderer[] shadowSr; [Header("Properties")] - bool startLeft; + private Tween bgColorTween; + public int stepIterate = 0; + public static float downbeatMod = 0.5f; + public static bool shouldBlip; + static bool noDing; public static MrUpbeat instance; private void Awake() { instance = this; + + blipMaterial.SetColor("_ColorBravo", new Color(0, 1f, 0)); + } + + private void Start() + { + man.Blip(); } void OnDestroy() { - if (!Conductor.instance.isPlaying || Conductor.instance.isPaused) - { + if (!Conductor.instance.isPlaying || Conductor.instance.isPaused) { if (queuedInputs.Count > 0) queuedInputs.Clear(); - if (queuedBeeps.Count > 0) queuedBeeps.Clear(); } + + // these variables wouldn't get reset, even when you go in and out of unity play mode??? + shouldBlip = false; + stepIterate = 0; } public void Update() { var cond = Conductor.instance; - if (cond.isPlaying && !cond.isPaused) - { - if (queuedInputs.Count > 0) - { - foreach (var input in queuedInputs) - { - ScheduleInput(cond.songPositionInBeats, input.beat - cond.songPositionInBeats, InputType.STANDARD_DOWN, Success, Miss, Nothing); - if (input.goRight) - { - BeatAction.New(instance.gameObject, new List() - { - new BeatAction.Action(input.beat - 0.5f, delegate { MrUpbeat.instance.metronomeAnim.DoScaledAnimationAsync("MetronomeGoLeft", 0.5f); }), - new BeatAction.Action(input.beat - 0.5f, delegate { Jukebox.PlayOneShotGame("mrUpbeat/metronomeRight"); }), - }); - } - else - { - BeatAction.New(instance.gameObject, new List() - { - new BeatAction.Action(input.beat - 0.5f, delegate { MrUpbeat.instance.metronomeAnim.DoScaledAnimationAsync("MetronomeGoRight", 0.5f); }), - new BeatAction.Action(input.beat - 0.5f, delegate { Jukebox.PlayOneShotGame("mrUpbeat/metronomeLeft"); }), - }); - } - } - if (queuedInputs.Count % 2 != 0) - { - startLeft = true; - } - else - { - startLeft = false; + if (cond.isPlaying && !cond.isPaused) { + if (queuedInputs.Count > 0) { + foreach (var input in queuedInputs) { + string dir = stepIterate % 2 == 1 ? "Right" : "Left"; + BeatAction.New(instance.gameObject, new List() { + new BeatAction.Action(input, delegate { + instance.metronomeAnim.DoScaledAnimationAsync("MetronomeGo" + dir, 0.5f); + Jukebox.PlayOneShotGame("mrUpbeat/metronome" + dir); + ScheduleInput(input, 0.5f, InputType.STANDARD_DOWN, Success, Miss, Nothing); + if (MrUpbeat.noDing) queuedInputs.Add(input + 1); + }), + }); + stepIterate++; } queuedInputs.Clear(); } - if (PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN)) - { + + if (PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN)) { man.Step(); } } - - if (queuedBeeps.Count > 0) { - var beepAnims = new List(); - foreach (var item in queuedBeeps) - { - beepAnims.Add(new BeatAction.Action(item, delegate { man.blipAnimator.Play("Blip", 0, 0); })); - } - BeatAction.New(instance.gameObject, beepAnims); - queuedBeeps.Clear(); - } } - public void Ding(bool applause) + public void Ding(bool applause, bool stopBlipping) { Jukebox.PlayOneShotGame("mrUpbeat/ding"); if (applause) Jukebox.PlayOneShot("applause"); + if (stopBlipping) shouldBlip = false; + } + + public static void StartStepping(float beat, float length, bool force) + { + // mr. downbeat stuff. god i hate mr. downbeat + // force != true means that mr. upbeat will always blip/step on the offbeats + beat = force ? beat - 0.5f : MathF.Floor(beat); + downbeatMod = force ? (beat % 1) : 0.5f; + + if (GameManager.instance.currentGame != "mrUpbeat") { + Blipping(beat, length); + MrUpbeat.shouldBlip = true; + } else { + BeatAction.New(instance.gameObject, new List() { + new BeatAction.Action(beat, delegate { + MrUpbeat.shouldBlip = true; + }), + }); + } + var dings = EventCaller.GetAllInGameManagerList("mrUpbeat", new string[] { "ding" }); + if (dings.Count == 0) { + MrUpbeat.noDing = true; + queuedInputs.Add(beat + (force ? length : MathF.Floor(length))); + return; + } + MrUpbeat.noDing = false; + int whichDing = 0; + for (int i = 0; i < dings.Count; i++) { + if (dings[i].beat > beat) { + whichDing = i; + break; + } + } + for (int i = (int)length; i < dings[whichDing].beat - beat; i++) { + queuedInputs.Add(beat + i - (force ? downbeatMod : 0)); + } } public static void Blipping(float beat, float length) { - List beeps = new List(); - - for (int i = 0; i < length + 1; i++) - { - beeps.Add(new MultiSound.Sound("mrUpbeat/blip", beat + i)); - queuedBeeps.Add(beat + i); - } - - MultiSound.Play(beeps.ToArray(), forcePlay: true); - } - - public static void Stepping(float beat, float length) - { - if (GameManager.instance.currentGame == "mrUpbeat") - { - float offSet = 0; - if (MrUpbeat.instance.startLeft) - { - offSet = 1; - } - for (int i = 0; i < length + 1; i++) - { - MrUpbeat.instance.ScheduleInput(beat - 1, 1 + i, InputType.STANDARD_DOWN, MrUpbeat.instance.Success, MrUpbeat.instance.Miss, MrUpbeat.instance.Nothing); - if ((i + offSet) % 2 == 0) - { - BeatAction.New(instance.gameObject, new List() - { - new BeatAction.Action(beat + i - 0.5f, delegate { MrUpbeat.instance.metronomeAnim.DoScaledAnimationAsync("MetronomeGoLeft", 0.5f); }), - new BeatAction.Action(beat + i - 0.5f, delegate { Jukebox.PlayOneShotGame("mrUpbeat/metronomeRight"); }), - }); - } - else - { - BeatAction.New(instance.gameObject, new List() - { - new BeatAction.Action(beat + i - 0.5f, delegate { MrUpbeat.instance.metronomeAnim.DoScaledAnimationAsync("MetronomeGoRight", 0.5f); }), - new BeatAction.Action(beat + i - 0.5f, delegate { Jukebox.PlayOneShotGame("mrUpbeat/metronomeLeft"); }), - }); + List blips = new List(); + var switchGames = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame" }); + int whichSwitch = 0; + if (switchGames.Count != 0) { + for (int i = 0; i < switchGames.Count; i++) { + if (switchGames[i].beat > beat) { + whichSwitch = i; + break; } + } + } - } - if ((length + 1) % 2 != 0) - { - MrUpbeat.instance.startLeft = true; - } - else - { - MrUpbeat.instance.startLeft = false; - } - } - else - { - for (int i = 0; i < length + 1; i++) - { - queuedInputs.Add(new queuedUpbeatInputs - { - beat = beat + i, - goRight = i % 2 == 0 - }); - } + for (int i = 0; i < switchGames[whichSwitch].beat - beat - 0.5f; i++) { + blips.Add(new MultiSound.Sound("mrUpbeat/blip", beat + 0.5f + i)); } + + MultiSound.Play(blips.ToArray(), forcePlay: true); } public void Success(PlayerActionEvent caller, float state) @@ -214,13 +232,41 @@ namespace HeavenStudio.Games man.Fall(); } - bool isPlaying(Animator anim, string stateName) + public void ChangeBackgroundColor(Color color, float beats) { - if (anim.GetCurrentAnimatorStateInfo(0).IsName(stateName) && - anim.GetCurrentAnimatorStateInfo(0).normalizedTime < 1.0f) - return true; - else - return false; + var seconds = Conductor.instance.secPerBeat * beats; + + if (bgColorTween != null) + bgColorTween.Kill(true); + + if (seconds == 0) { + bg.color = color; + } else { + bgColorTween = bg.DOColor(color, seconds); + } + } + + public void FadeBackgroundColor(Color start, Color end, float beats, bool instant) + { + ChangeBackgroundColor(start, 0f); + if (!instant) ChangeBackgroundColor(end, beats); + } + + public void UpbeatColors(Color blipColor, bool setShadow, Color shadowColor) + { + blipMaterial.SetColor("_ColorBravo", blipColor); + + if (setShadow) foreach (var shadow in shadowSr) { + shadow.color = new Color(shadowColor.r, shadowColor.g, shadowColor.b, 1); + } + } + + public void BlipEvents(string inputLetter, bool shouldGrow, bool resetBlip, bool blip) + { + if (shouldGrow && man.blipSize < 4) man.blipSize++; + if (resetBlip) man.blipSize = 0; + man.blipString = inputLetter; + shouldBlip = blip; } public void Nothing(PlayerActionEvent caller) {} diff --git a/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs b/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs index 1c3dd181a..0787f0830 100644 --- a/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs +++ b/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using System; using Starpelly; +using TMPro; using HeavenStudio.Util; @@ -11,60 +12,61 @@ namespace HeavenStudio.Games.Scripts_MrUpbeat public class UpbeatMan : MonoBehaviour { [Header("References")] - public MrUpbeat game; - public Animator animator; - public Animator blipAnimator; - public GameObject[] shadows; + [SerializeField] Animator anim; + [SerializeField] Animator blipAnim; + [SerializeField] Animator letterAnim; + [SerializeField] GameObject[] shadows; + [SerializeField] TMP_Text blipText; - public float targetBeat = 0.25f; public int stepTimes = 0; - private bool stepped = false; - private bool onGround = false; + public int blipSize = 0; + public string blipString = "M"; - public GameEvent blip = new GameEvent(); - - public void Idle() + public void Blip() { - stepTimes = 0; - transform.localScale = new Vector3(1, 1); - animator.Play("Idle", 0, 0); + float c = Conductor.instance.songPositionInBeats; + // checks if the position is on an offbeat; accurate until you get down to 20 fps or so (i.e unplayable) + float pos = ((MathF.Floor(c * 10)/10 % 1) == 0.5f) ? MathF.Floor(c) : MathF.Round(c); + + // recursive, should happen on the offbeat (unless downbeatMod is different) + BeatAction.New(gameObject, new List() { + new BeatAction.Action(pos + MrUpbeat.downbeatMod, delegate { + if (MrUpbeat.shouldBlip) { + Jukebox.PlayOneShotGame("mrUpbeat/blip"); + blipAnim.Play("Blip"+(blipSize+1), 0, 0); + blipText.text = (blipSize == 4 && blipString != "") ? blipString : ""; + } + }), + new BeatAction.Action(pos + MrUpbeat.downbeatMod + 0.999f, delegate { + Blip(); + }), + }); } public void Step() { stepTimes++; + + bool x = (stepTimes % 2 == 1); + shadows[0].SetActive(!x); + shadows[1].SetActive(x); + transform.localScale = new Vector3(x ? -1 : 1, 1); - animator.Play("Step", 0, 0); + anim.DoScaledAnimationAsync("Step", 0.5f); + letterAnim.DoScaledAnimationAsync(x ? "StepRight" : "StepLeft", 0.5f); Jukebox.PlayOneShotGame("mrUpbeat/step"); - - onGround = false; - CheckShadows(); } public void Fall() { - animator.Play("Fall", 0, 0); + blipSize = 0; + blipAnim.Play("Idle", 0, 0); + blipText.text = ""; + + anim.DoScaledAnimationAsync("Fall", 0.5f); Jukebox.PlayOneShot("miss"); shadows[0].SetActive(false); shadows[1].SetActive(false); - onGround = true; - } - - private void CheckShadows() - { - if (onGround) return; - - if (stepTimes % 2 == 1) - { - shadows[0].SetActive(false); - shadows[1].SetActive(true); - transform.localScale = new Vector3(-1, 1); - } else - { - shadows[0].SetActive(true); - shadows[1].SetActive(false); - transform.localScale = new Vector3(1, 1); - } } } } \ No newline at end of file