From 4b3bfeda1b3252b19f57f84af1ce4cdeb7149880 Mon Sep 17 00:00:00 2001 From: Starpelly Date: Sun, 26 Dec 2021 02:25:17 -0500 Subject: [PATCH] Spaceball costumes --- .../Spaceball/Animations/Ball/BallLow.anim | 300 ++++++++++++++---- .../Games/Spaceball/Animations/Idle.anim | 32 +- .../Games/Spaceball/Animations/Swing.anim | 72 +++-- .../Spaceball/Spaceball_Player_2.png.meta | 152 ++++++++- .../Spaceball/Spaceball_Player_3.png.meta | 152 ++++++++- Assets/Scenes/Game.unity | 21 ++ Assets/Scripts/Beatmap.cs | 2 +- Assets/Scripts/EventCaller.cs | 3 +- Assets/Scripts/Games/Spaceball/Spaceball.cs | 12 +- .../Scripts/Games/Spaceball/SpaceballBall.cs | 6 +- .../Games/Spaceball/SpaceballPlayer.cs | 23 ++ Assets/spaceball.json | 15 +- 12 files changed, 649 insertions(+), 141 deletions(-) diff --git a/Assets/Resources/Sprites/Games/Spaceball/Animations/Ball/BallLow.anim b/Assets/Resources/Sprites/Games/Spaceball/Animations/Ball/BallLow.anim index 29917827..bc89db0e 100644 --- a/Assets/Resources/Sprites/Games/Spaceball/Animations/Ball/BallLow.anim +++ b/Assets/Resources/Sprites/Games/Spaceball/Animations/Ball/BallLow.anim @@ -27,7 +27,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 2 + time: 0.6666667 value: {x: 0, y: 0, z: -207.4} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -46,125 +46,157 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: -4.02, y: -1.914, z: 0} - inSlope: {x: 0, y: 15.249893, z: 0} - outSlope: {x: 2.7755, y: 15.249893, z: 0} + inSlope: {x: 0, y: 49.17825, z: 0} + outSlope: {x: 8.3265, y: 49.17825, z: 0} tangentMode: 0 weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.3454978, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.26629093, z: 0.33333334} - serializedVersion: 3 - time: 1.1 + time: 0.36666667 value: {x: -0.96694994, y: 5.086, z: 0} - inSlope: {x: 2.7754996, y: -1.5654044, z: -0} - outSlope: {x: 2.7754996, y: -1.5654044, z: 0} + inSlope: {x: 8.326498, y: -1.5654044, z: -0} + outSlope: {x: 8.326498, y: -1.5654044, z: 0} tangentMode: 0 weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333343, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 2 + time: 0.6666667 value: {x: 1.531, y: -3.459, z: 0} - inSlope: {x: 2.7755, y: -16.612738, z: -0} - outSlope: {x: 0, y: -16.612738, z: 0} + inSlope: {x: 8.3265, y: -119.49154, z: -0} + outSlope: {x: 0, y: -119.49154, z: 0} tangentMode: 0 weightedMode: 3 - inWeight: {x: 0.33333328, y: 0.28651318, z: 0.33333334} + inWeight: {x: 0.33333328, y: 0.07569194, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 path: BallHolder - m_ScaleCurves: [] + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.0536, y: 0.3384, 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: spaceballtest0 (1) + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.0672796, y: 1.059605, z: 1.0484223} + 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: spaceballtest0 (1) m_FloatCurves: [] m_PPtrCurves: - curve: - time: 0 value: {fileID: 21300000, guid: 7b1636bc53db72742b5cdfd9c94a8c44, type: 3} - - time: 0.05 + - time: 0.016666668 value: {fileID: 21300000, guid: 16d181419b6d32745b613e810e1f3cb6, type: 3} - - time: 0.1 + - time: 0.033333335 value: {fileID: 21300000, guid: ee532cdbfaa8ea549b7d58f01af9e69a, type: 3} - - time: 0.15 + - time: 0.05 value: {fileID: 21300000, guid: 43ab594a764782946a55624aaaf547ff, type: 3} - - time: 0.2 + - time: 0.06666667 value: {fileID: 21300000, guid: 325572bcafd466d45ac4c62c081bf727, type: 3} - - time: 0.25 + - time: 0.083333336 value: {fileID: 21300000, guid: 6ffedcd5be36042459bdd05a2ae83f42, type: 3} - - time: 0.3 + - time: 0.1 value: {fileID: 21300000, guid: f8ec577e18bf7864f9f13b1aa4102e6e, type: 3} - - time: 0.35 + - time: 0.11666667 value: {fileID: 21300000, guid: a810df80c154b424490a2c3c1ede1ef5, type: 3} - - time: 0.4 + - time: 0.13333334 value: {fileID: 21300000, guid: 1581fefd227b4f240881390b07d67b83, type: 3} - - time: 0.45 + - time: 0.15 value: {fileID: 21300000, guid: 1cf6acf4845a45e4fab5509b2980a8f5, type: 3} - - time: 0.5 + - time: 0.16666667 value: {fileID: 21300000, guid: 144985138d4f1cf4aa7ce66148b9d66c, type: 3} - - time: 0.55 + - time: 0.18333334 value: {fileID: 21300000, guid: 8976d1c4acdbb21448cf428f0b78affb, type: 3} - - time: 0.6 + - time: 0.2 value: {fileID: 21300000, guid: 67cb6a1a540e38548a432da0c045cf81, type: 3} - - time: 0.65 + - time: 0.21666667 value: {fileID: 21300000, guid: bf7a70fa4af6d1f40b3ff83a57f98f84, type: 3} - - time: 0.7 + - time: 0.23333333 value: {fileID: 21300000, guid: ce7970348d75c4148841db9cfda3f2d2, type: 3} - - time: 0.75 + - time: 0.25 value: {fileID: 21300000, guid: d0f252a237ad4414487a04af4fd02fd4, type: 3} - - time: 0.8 + - time: 0.26666668 value: {fileID: 21300000, guid: 01eabf19d324d1e4f866a46bfe3037c0, type: 3} - - time: 0.85 + - time: 0.28333333 value: {fileID: 21300000, guid: 43157454d9d31284dba0c43277cb3149, type: 3} - - time: 0.9 + - time: 0.3 value: {fileID: 21300000, guid: 9c94e6536612c454aa57bca805a7e125, type: 3} - - time: 0.95 + - time: 0.31666666 value: {fileID: 21300000, guid: 2cd493aec162f9241a2a567513b58ed6, type: 3} - - time: 1 + - time: 0.33333334 value: {fileID: 21300000, guid: 1e00355a261c4f24e910e189de3d54b7, type: 3} - - time: 1.05 + - time: 0.35 value: {fileID: 21300000, guid: 619016726675fb84da1e37299fcf2bf6, type: 3} - - time: 1.1 + - time: 0.36666667 value: {fileID: 21300000, guid: 7ed35864918d63948a7036f7b88b2d57, type: 3} - - time: 1.15 + - time: 0.38333333 value: {fileID: 21300000, guid: 6c408705a61ff1a4f8c346654d1eaca4, type: 3} - - time: 1.2 + - time: 0.4 value: {fileID: 21300000, guid: c698b75703c5ad04189181fb299ea910, type: 3} - - time: 1.25 + - time: 0.41666666 value: {fileID: 21300000, guid: 56bed6562817d9449b06e3f0ef147850, type: 3} - - time: 1.3 + - time: 0.43333334 value: {fileID: 21300000, guid: 58de2570a9fb47743bfe41e5fd8562cf, type: 3} - - time: 1.35 + - time: 0.45 value: {fileID: 21300000, guid: 4342678496d8d1e40a6887b3f6f3952e, type: 3} - - time: 1.4 + - time: 0.46666667 value: {fileID: 21300000, guid: 5f089a030e35cbc419410df5fc831b49, type: 3} - - time: 1.45 + - time: 0.48333332 value: {fileID: 21300000, guid: 6d03914922d17504e86d5fff6f7c2d3f, type: 3} - - time: 1.5 + - time: 0.5 value: {fileID: 21300000, guid: 793fac609ecd2d946bcd8437e1a6e422, type: 3} - - time: 1.55 + - time: 0.51666665 value: {fileID: 21300000, guid: b6b07c5e0381cae4a9adb86e27ad817a, type: 3} - - time: 1.6 + - time: 0.53333336 value: {fileID: 21300000, guid: 981f74e01de7dab49bd099af7714c9ef, type: 3} - - time: 1.65 + - time: 0.55 value: {fileID: 21300000, guid: f7f965eb9148f304a8651ed563b39644, type: 3} - - time: 1.7 + - time: 0.56666666 value: {fileID: 21300000, guid: 5f79dd697270ed2498c04770db5f6dcc, type: 3} - - time: 1.75 + - time: 0.5833333 value: {fileID: 21300000, guid: 5aa6663dc2256be498edfb563ba68dcd, type: 3} - - time: 1.8 + - time: 0.6 value: {fileID: 21300000, guid: bdacc09fdd597394cab5056eee36af5a, type: 3} - - time: 1.85 + - time: 0.6166667 value: {fileID: 21300000, guid: 3f8dfd0ac5d19cd41a0aa7d7728ff9e8, type: 3} - - time: 1.9 + - time: 0.6333333 value: {fileID: 21300000, guid: 587a29b5aa280c74a83275b404664b50, type: 3} - - time: 1.95 + - time: 0.65 value: {fileID: 21300000, guid: 4f8fe2b6833c24740b1e6640a7f9fc98, type: 3} - - time: 2 + - time: 0.6666667 value: {fileID: 21300000, guid: f27d06d371fe2f6438979e671c105b39, type: 3} attribute: m_Sprite path: spaceballtest0 (1) classID: 212 script: {fileID: 0} - m_SampleRate: 20 + m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -192,6 +224,20 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 1808602102 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1808602102 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 7b1636bc53db72742b5cdfd9c94a8c44, type: 3} - {fileID: 21300000, guid: 16d181419b6d32745b613e810e1f3cb6, type: 3} @@ -239,7 +285,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 2.05 + m_StopTime: 0.68333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -262,15 +308,15 @@ AnimationClip: time: 0 value: -4.02 inSlope: 0 - outSlope: 2.7755 + outSlope: 8.3265 tangentMode: 69 weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2 + time: 0.6666667 value: 1.531 - inSlope: 2.7755 + inSlope: 8.3265 outSlope: 0 tangentMode: 69 weightedMode: 3 @@ -289,14 +335,14 @@ AnimationClip: - serializedVersion: 3 time: 0 value: -1.914 - inSlope: 15.249893 - outSlope: 15.249893 + inSlope: 49.17825 + outSlope: 49.17825 tangentMode: 0 weightedMode: 3 inWeight: 0.33333334 - outWeight: 0.3454978 + outWeight: 0.26629093 - serializedVersion: 3 - time: 1.1 + time: 0.36666667 value: 5.086 inSlope: -1.5654044 outSlope: -1.5654044 @@ -305,13 +351,13 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2 + time: 0.6666667 value: -3.459 - inSlope: -16.612738 - outSlope: -16.612738 + inSlope: -119.49154 + outSlope: -119.49154 tangentMode: 0 weightedMode: 3 - inWeight: 0.28651318 + inWeight: 0.07569194 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -333,7 +379,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1 + time: 0.36666667 value: 0 inSlope: -0 outSlope: 0 @@ -342,7 +388,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2 + time: 0.6666667 value: 0 inSlope: -0 outSlope: 0 @@ -370,7 +416,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2 + time: 0.6666667 value: 0 inSlope: 0 outSlope: 0 @@ -398,7 +444,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2 + time: 0.6666667 value: 0 inSlope: 0 outSlope: 0 @@ -426,7 +472,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2 + time: 0.6666667 value: -207.4 inSlope: 0 outSlope: 0 @@ -441,6 +487,120 @@ AnimationClip: path: BallHolder/SpriteRotHolder classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.0536 + 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: spaceballtest0 (1) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3384 + 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: spaceballtest0 (1) + 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: spaceballtest0 (1) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.0672796 + 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: spaceballtest0 (1) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.059605 + 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: spaceballtest0 (1) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.0484223 + 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: spaceballtest0 (1) + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/Spaceball/Animations/Idle.anim b/Assets/Resources/Sprites/Games/Spaceball/Animations/Idle.anim index 48a8debf..ea52f6da 100644 --- a/Assets/Resources/Sprites/Games/Spaceball/Animations/Idle.anim +++ b/Assets/Resources/Sprites/Games/Spaceball/Animations/Idle.anim @@ -17,36 +17,21 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: -7969101441138513416, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} - attribute: m_Sprite - path: Sprite - classID: 212 - 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: 850496168 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: -7969101441138513416, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} + genericBindings: [] + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.016666668 + m_StopTime: 0 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -65,4 +50,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: SetSprite + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/Spaceball/Animations/Swing.anim b/Assets/Resources/Sprites/Games/Spaceball/Animations/Swing.anim index 60ac6b2b..8c3cd279 100644 --- a/Assets/Resources/Sprites/Games/Spaceball/Animations/Swing.anim +++ b/Assets/Resources/Sprites/Games/Spaceball/Animations/Swing.anim @@ -17,48 +17,21 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: -3597924984213406025, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} - - time: 0.05 - value: {fileID: -2754269979427108517, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} - - time: 0.1 - value: {fileID: 1484695007764172264, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} - - time: 0.15 - value: {fileID: -4397913084546680220, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} - - time: 0.43333334 - value: {fileID: -4397913084546680220, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} - attribute: m_Sprite - path: Sprite - classID: 212 - 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: 850496168 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: -3597924984213406025, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} - - {fileID: -2754269979427108517, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} - - {fileID: 1484695007764172264, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} - - {fileID: -4397913084546680220, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} - - {fileID: -4397913084546680220, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} + genericBindings: [] + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.45000002 + m_StopTime: 0.43333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -77,4 +50,39 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: SetSprite + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 1 + messageOptions: 0 + - time: 0.05 + functionName: SetSprite + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 2 + messageOptions: 0 + - time: 0.1 + functionName: SetSprite + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 3 + messageOptions: 0 + - time: 0.15 + functionName: SetSprite + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 4 + messageOptions: 0 + - time: 0.43333334 + functionName: SetSprite + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 4 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/Spaceball/Spaceball_Player_2.png.meta b/Assets/Resources/Sprites/Games/Spaceball/Spaceball_Player_2.png.meta index 45d1019d..28c665ca 100644 --- a/Assets/Resources/Sprites/Games/Spaceball/Spaceball_Player_2.png.meta +++ b/Assets/Resources/Sprites/Games/Spaceball/Spaceball_Player_2.png.meta @@ -1,7 +1,22 @@ fileFormatVersion: 2 guid: 345cdeebdf48fd6428df7c685385b267 TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: -4949174322852393655 + second: Spaceball_Player_2_0 + - first: + 213: 3365178227022463474 + second: Spaceball_Player_2_1 + - first: + 213: -7043806042153501721 + second: Spaceball_Player_2_2 + - first: + 213: -6281578518888007599 + second: Spaceball_Player_2_3 + - first: + 213: 8401854151048007729 + second: Spaceball_Player_2_4 externalObjects: {} serializedVersion: 11 mipmaps: @@ -41,12 +56,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 72 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -75,9 +90,138 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Spaceball_Player_2_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 303 + height: 470 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 94d06eadc20015bb0800000000000000 + internalID: -4949174322852393655 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spaceball_Player_2_1 + rect: + serializedVersion: 2 + x: 303 + y: 0 + width: 303 + height: 470 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2f18d8b94c383be20800000000000000 + internalID: 3365178227022463474 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spaceball_Player_2_2 + rect: + serializedVersion: 2 + x: 606 + y: 0 + width: 303 + height: 470 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7ebb0be69bf5f3e90800000000000000 + internalID: -7043806042153501721 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spaceball_Player_2_3 + rect: + serializedVersion: 2 + x: 909 + y: 0 + width: 303 + height: 470 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 158b4f84e9953d8a0800000000000000 + internalID: -6281578518888007599 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spaceball_Player_2_4 + rect: + serializedVersion: 2 + x: 1212 + y: 0 + width: 303 + height: 470 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1309bdfd5d1699470800000000000000 + internalID: 8401854151048007729 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Resources/Sprites/Games/Spaceball/Spaceball_Player_3.png.meta b/Assets/Resources/Sprites/Games/Spaceball/Spaceball_Player_3.png.meta index d56db504..c06450f0 100644 --- a/Assets/Resources/Sprites/Games/Spaceball/Spaceball_Player_3.png.meta +++ b/Assets/Resources/Sprites/Games/Spaceball/Spaceball_Player_3.png.meta @@ -1,7 +1,22 @@ fileFormatVersion: 2 guid: c37344be03f682348ace55262e2f57d2 TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: -2958710581570484910 + second: Spaceball_Player_3_0 + - first: + 213: 5082551717538876746 + second: Spaceball_Player_3_1 + - first: + 213: 816561731058611720 + second: Spaceball_Player_3_2 + - first: + 213: -8641696380238954509 + second: Spaceball_Player_3_3 + - first: + 213: -2661094518974622399 + second: Spaceball_Player_3_4 externalObjects: {} serializedVersion: 11 mipmaps: @@ -41,12 +56,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 72 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -75,9 +90,138 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Spaceball_Player_3_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 303 + height: 470 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2554d48e66c80f6d0800000000000000 + internalID: -2958710581570484910 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spaceball_Player_3_1 + rect: + serializedVersion: 2 + x: 303 + y: 0 + width: 303 + height: 470 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a4dc47ccbd9d88640800000000000000 + internalID: 5082551717538876746 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spaceball_Player_3_2 + rect: + serializedVersion: 2 + x: 606 + y: 0 + width: 303 + height: 470 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8063dec6192055b00800000000000000 + internalID: 816561731058611720 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spaceball_Player_3_3 + rect: + serializedVersion: 2 + x: 909 + y: 0 + width: 303 + height: 470 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3fff3178de6821880800000000000000 + internalID: -8641696380238954509 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Spaceball_Player_3_4 + rect: + serializedVersion: 2 + x: 1212 + y: 0 + width: 303 + height: 470 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 14557c252a4e11bd0800000000000000 + internalID: -2661094518974622399 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 5f6ae058..87075fa0 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -13197,6 +13197,27 @@ MonoBehaviour: m_EditorClassIdentifier: EligibleHits: [] currentHitInList: 0 + costume: 0 + PlayerSprite: {fileID: 198549519} + PlayerSpriteSheets: + - sprites: + - {fileID: -7969101441138513416, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} + - {fileID: -3597924984213406025, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} + - {fileID: -2754269979427108517, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} + - {fileID: 1484695007764172264, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} + - {fileID: -4397913084546680220, guid: 7fbbca0e969f682488f19a39adc6aa62, type: 3} + - sprites: + - {fileID: -4949174322852393655, guid: 345cdeebdf48fd6428df7c685385b267, type: 3} + - {fileID: 3365178227022463474, guid: 345cdeebdf48fd6428df7c685385b267, type: 3} + - {fileID: -7043806042153501721, guid: 345cdeebdf48fd6428df7c685385b267, type: 3} + - {fileID: -6281578518888007599, guid: 345cdeebdf48fd6428df7c685385b267, type: 3} + - {fileID: 8401854151048007729, guid: 345cdeebdf48fd6428df7c685385b267, type: 3} + - sprites: + - {fileID: -2958710581570484910, guid: c37344be03f682348ace55262e2f57d2, type: 3} + - {fileID: 5082551717538876746, guid: c37344be03f682348ace55262e2f57d2, type: 3} + - {fileID: 816561731058611720, guid: c37344be03f682348ace55262e2f57d2, type: 3} + - {fileID: -8641696380238954509, guid: c37344be03f682348ace55262e2f57d2, type: 3} + - {fileID: -2661094518974622399, guid: c37344be03f682348ace55262e2f57d2, type: 3} --- !u!95 &1850992748 Animator: serializedVersion: 3 diff --git a/Assets/Scripts/Beatmap.cs b/Assets/Scripts/Beatmap.cs index d7fa5217..e2e0ace8 100644 --- a/Assets/Scripts/Beatmap.cs +++ b/Assets/Scripts/Beatmap.cs @@ -16,7 +16,7 @@ namespace RhythmHeavenMania public int track; public float length; public float valA; - public string type; + public int type; public string datamodel; public object Clone() diff --git a/Assets/Scripts/EventCaller.cs b/Assets/Scripts/EventCaller.cs index 24e00881..bd49b3e9 100644 --- a/Assets/Scripts/EventCaller.cs +++ b/Assets/Scripts/EventCaller.cs @@ -19,7 +19,7 @@ namespace RhythmHeavenMania private float currentLength; private float currentValA; private string currentSwitchGame; - private string currentType; + private int currentType; public delegate void EventCallback(); @@ -90,6 +90,7 @@ namespace RhythmHeavenMania { new GameAction("shoot", delegate { Spaceball.instance.Shoot(currentBeat, false, currentType); }, true ), new GameAction("shootHigh", delegate { Spaceball.instance.Shoot(currentBeat, true, currentType); }, true ), + new GameAction("costume", delegate { Spaceball.instance.Costume(currentType); }, true ), // new GameAction("cameraZoom", delegate { Spaceball.instance.CameraZoom(currentBeat, currentLength, currentValA); } ), }) }; diff --git a/Assets/Scripts/Games/Spaceball/Spaceball.cs b/Assets/Scripts/Games/Spaceball/Spaceball.cs index 91885524..18aa8b07 100644 --- a/Assets/Scripts/Games/Spaceball/Spaceball.cs +++ b/Assets/Scripts/Games/Spaceball/Spaceball.cs @@ -106,8 +106,6 @@ namespace RhythmHeavenMania.Games.Spaceball float dist = allCameraEvents[currentZoomIndex].valA * -1; - print(dist); - if (dist > 0) currentZoomCamDistance = 0; else @@ -115,12 +113,13 @@ namespace RhythmHeavenMania.Games.Spaceball } } - public void Shoot(float beat, bool high, string type) + public void Shoot(float beat, bool high, int type) { GameObject ball = Instantiate(Ball); ball.transform.parent = Ball.transform.parent; ball.SetActive(true); ball.GetComponent().startBeat = beat; + if (high) { ball.GetComponent().high = true; @@ -131,12 +130,17 @@ namespace RhythmHeavenMania.Games.Spaceball Jukebox.PlayOneShotGame("spaceball/shoot"); } - if (type == "riceball") + if (type == 1) { ball.GetComponent().Sprite.sprite = Balls[1]; } Dispenser.GetComponent().Play("DispenserShoot", 0, 0); } + + public void Costume(int type) + { + SpaceballPlayer.instance.SetCostume(type); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/Spaceball/SpaceballBall.cs b/Assets/Scripts/Games/Spaceball/SpaceballBall.cs index 2976769d..b7a27e76 100644 --- a/Assets/Scripts/Games/Spaceball/SpaceballBall.cs +++ b/Assets/Scripts/Games/Spaceball/SpaceballBall.cs @@ -35,9 +35,11 @@ namespace RhythmHeavenMania.Games.Spaceball float normalizedBeatAnim = Conductor.instance.GetLoopPositionFromBeat(startBeat, beatLength + 0.2f); if (high) - anim.Play("BallHigh", -1, normalizedBeatAnim); + anim.Play("BallHigh", 0, normalizedBeatAnim); else - anim.Play("BallLow", -1, normalizedBeatAnim); + anim.Play("BallLow", 0, normalizedBeatAnim); + + anim.speed = 0; float normalizedBeat = Conductor.instance.GetLoopPositionFromBeat(startBeat, beatLength); diff --git a/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs b/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs index 4f50e37f..3a6e64f9 100644 --- a/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs +++ b/Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs @@ -14,6 +14,17 @@ namespace RhythmHeavenMania.Games.Spaceball public List EligibleHits = new List(); [SerializeField] private int currentHitInList = 0; + public int costume; + + public SpriteRenderer PlayerSprite; + public List PlayerSpriteSheets = new List(); + + [System.Serializable] + public class SpriteSheet + { + public List sprites; + } + public static SpaceballPlayer instance { get; set; } private void Awake() @@ -37,6 +48,12 @@ namespace RhythmHeavenMania.Games.Spaceball } } + public void SetCostume(int costume) + { + this.costume = costume; + anim.Play("Idle", 0, 0); + } + public void Swing() { bool canHit = (EligibleHits.Count > 0) && (currentHitInList < EligibleHits.Count); @@ -70,9 +87,15 @@ namespace RhythmHeavenMania.Games.Spaceball } else Jukebox.PlayOneShotGame("spaceball/swing"); + anim.Play("Swing", 0, 0); } + public void SetSprite(int id) + { + PlayerSprite.sprite = PlayerSpriteSheets[costume].sprites[id]; + } + private void RemoveBall() { if (currentHitInList < EligibleHits.Count) diff --git a/Assets/spaceball.json b/Assets/spaceball.json index 3e35e4c5..7d9c1783 100644 --- a/Assets/spaceball.json +++ b/Assets/spaceball.json @@ -15,7 +15,7 @@ }, { "beat": 4, - "type": "riceball", + "type": 1, "datamodel": "spaceball/shoot" }, { @@ -40,6 +40,11 @@ "beat": 11, "datamodel": "gameManager/switchGame/spaceball" }, + { + "beat": 11, + "type": 1, + "datamodel": "spaceball/costume" + }, { "beat": 14, "datamodel": "spaceball/shoot" @@ -59,7 +64,12 @@ }, { "beat": 22, - "type": "riceball", + "type": 2, + "datamodel": "spaceball/costume" + }, + { + "beat": 22, + "type": 1, "datamodel": "spaceball/shootHigh" }, { @@ -68,7 +78,6 @@ }, { "beat": 28, - "type": "high", "datamodel": "spaceball/shootHigh" }, {