From 4fe6c5eda5be0e01dc7958ad89f16cecd748b2a5 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sat, 30 Dec 2023 22:17:51 -0500 Subject: [PATCH] stretchable BG change --- .../Prefabs/Games/PajamaParty/Monkey.prefab | 10 +- .../Anime/Monkey/MonkeyAwake_H.anim | 291 +++++++++++++----- .../Scripts/Games/PajamaParty/PajamaParty.cs | 1 + 3 files changed, 219 insertions(+), 83 deletions(-) diff --git a/Assets/Resources/Prefabs/Games/PajamaParty/Monkey.prefab b/Assets/Resources/Prefabs/Games/PajamaParty/Monkey.prefab index 4821bdea2..7c269572d 100644 --- a/Assets/Resources/Prefabs/Games/PajamaParty/Monkey.prefab +++ b/Assets/Resources/Prefabs/Games/PajamaParty/Monkey.prefab @@ -221,7 +221,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -366,7 +366,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -516,7 +516,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -937,7 +937,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1105,7 +1105,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyAwake_H.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyAwake_H.anim index 7fcd5a87c..a0a985b7a 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyAwake_H.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyAwake_H.anim @@ -163,7 +163,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 88.28} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -195,7 +195,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 88.28} + value: {x: 0, y: 0, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -381,7 +381,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.22, z: 0} + value: {x: 0.19, y: 0.38, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -413,7 +413,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.19, y: 0.38, z: 0} + value: {x: -1.26, y: 0.019999996, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -599,7 +599,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 1, z: 1} + value: {x: 0.75, y: 1.42, z: 1} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -631,7 +631,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.75, y: 1.42, z: 1} + value: {x: 1.45, y: 1.12, z: 1} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -892,7 +892,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1006,7 +1006,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1101,7 +1101,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1115,6 +1115,63 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3137255 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: LegOther + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.39 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: LegOther + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.78 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: LegOther + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -1206,28 +1263,21 @@ AnimationClip: script: {fileID: 0} - curve: - time: 0 - value: {fileID: 0} + value: {fileID: -9185421532643117166, guid: 29e676de02a66324c803aef4d162c58e, type: 3} attribute: m_Sprite path: Leg classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: 8148159563688161889, guid: 29e676de02a66324c803aef4d162c58e, type: 3} + value: {fileID: 0} attribute: m_Sprite path: Leg/LegAttatch classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} - attribute: m_Materials.Array.data[0] - path: LegOther - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -9185421532643117166, guid: 29e676de02a66324c803aef4d162c58e, type: 3} + value: {fileID: 8148159563688161889, guid: 29e676de02a66324c803aef4d162c58e, type: 3} attribute: m_Sprite path: LegOther classID: 212 @@ -1239,6 +1289,13 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + attribute: m_Materials.Array.data[0] + path: LegOther + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1757,13 +1814,6 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 - - serializedVersion: 2 - path: 164936018 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 21 - isPPtrCurve: 1 - serializedVersion: 2 path: 164936018 attribute: 0 @@ -1778,6 +1828,13 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 164936018 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 - serializedVersion: 2 path: 164936018 attribute: 1304800921 @@ -1806,6 +1863,27 @@ AnimationClip: typeID: 212 customType: 22 isPPtrCurve: 0 + - serializedVersion: 2 + path: 164936018 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 164936018 + attribute: 4197328169 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 164936018 + attribute: 2368279999 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} - {fileID: -1822500885626475538, guid: 29e676de02a66324c803aef4d162c58e, type: 3} @@ -1821,11 +1899,11 @@ AnimationClip: - {fileID: 0} - {fileID: 7415402508438333597, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 0} - - {fileID: 0} - - {fileID: 8148159563688161889, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} - {fileID: -9185421532643117166, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 0} + - {fileID: 8148159563688161889, guid: 29e676de02a66324c803aef4d162c58e, type: 3} + - {fileID: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -3673,7 +3751,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 0.19 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3692,7 +3770,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.22 + value: 0.38 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3768,7 +3846,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 88.28 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3787,7 +3865,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.75 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3806,7 +3884,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.42 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3844,7 +3922,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -4129,7 +4207,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.19 + value: -1.26 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -4148,7 +4226,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.38 + value: 0.019999996 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -4224,7 +4302,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 88.28 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -4243,7 +4321,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.75 + value: 1.45 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -4262,7 +4340,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.42 + value: 1.12 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -4300,7 +4378,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -4566,7 +4644,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -4580,6 +4658,63 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3137255 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: LegOther + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.39 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: LegOther + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.78 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: LegOther + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -4857,8 +4992,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Leg + attribute: m_LocalEulerAngles.z + path: LegOther classID: 4 script: {fileID: 0} - curve: @@ -4868,7 +5003,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Leg + path: LegOther classID: 4 script: {fileID: 0} - curve: @@ -4877,8 +5012,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Leg + attribute: m_LocalEulerAngles.x + path: LegOther classID: 4 script: {fileID: 0} - curve: @@ -4911,26 +5046,6 @@ AnimationClip: path: Leg/LegAttatch classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: LegOther - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: LegOther - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -4938,16 +5053,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: LegOther - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x path: LegOther/LegAttatch classID: 4 script: {fileID: 0} @@ -4967,10 +5072,40 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z + attribute: m_LocalEulerAngles.x path: LegOther/LegAttatch classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Leg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Leg + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Leg + classID: 4 + script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Scripts/Games/PajamaParty/PajamaParty.cs b/Assets/Scripts/Games/PajamaParty/PajamaParty.cs index 8ea0c5f9d..50d6624f4 100644 --- a/Assets/Scripts/Games/PajamaParty/PajamaParty.cs +++ b/Assets/Scripts/Games/PajamaParty/PajamaParty.cs @@ -67,6 +67,7 @@ namespace HeavenStudio.Games.Loaders { function = delegate { var e = eventCaller.currentEntity; PajamaParty.instance.OpenBackground(e.beat, e.length, e["instant"]); }, defaultLength = 4f, + resizable = true, parameters = new List() { new Param("instant", false, "Instant", "Instantly open / close the background"),