diff --git a/Assets/Resources/Games/spaceSoccer.prefab b/Assets/Resources/Games/spaceSoccer.prefab index cc8771ab0..ecd18285e 100644 --- a/Assets/Resources/Games/spaceSoccer.prefab +++ b/Assets/Resources/Games/spaceSoccer.prefab @@ -72,7 +72,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: -100 m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3} - m_Color: {r: 0.43921572, g: 0.9725491, b: 0.5647059, a: 1} + m_Color: {r: 0.45098042, g: 1, b: 0.5803922, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -107,8 +107,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 257854180901420889} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.8686998, y: 0.3261, z: 0} - m_LocalScale: {x: 1.0345623, y: 1.0010417, z: 1.0151522} + m_LocalPosition: {x: -3.384, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} m_Children: [] m_Father: {fileID: 482351987616570803} m_RootOrder: 0 @@ -292,8 +292,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 8336007186072323660} handleType: 0 - leftHandleLocalPosition: {x: -2.3238418, y: 11.478075, z: 0} - rightHandleLocalPosition: {x: 2.3238418, y: -11.478075, z: -0} + leftHandleLocalPosition: {x: -1.668371, y: 12.237039, z: 0} + rightHandleLocalPosition: {x: 1.668371, y: -12.237039, z: -0} --- !u!1 &1349843762207368530 GameObject: m_ObjectHideFlags: 0 @@ -1410,6 +1410,7 @@ MonoBehaviour: toeCurve: {fileID: 8336007186072323660} dispensedBeat: 0 dispensing: 0 + hitTimes: 0 canKick: 0 --- !u!1 &4832865564766322567 GameObject: @@ -1951,8 +1952,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 8336007186072323660} handleType: 0 - leftHandleLocalPosition: {x: -1.0425408, y: -7.0436463, z: -0} - rightHandleLocalPosition: {x: 1.0425408, y: 7.0436463, z: 0} + leftHandleLocalPosition: {x: -0.7524991, y: -7.840443, z: -0} + rightHandleLocalPosition: {x: 0.7524991, y: 7.840443, z: 0} --- !u!1 &7976131226454805035 GameObject: m_ObjectHideFlags: 0 @@ -2029,8 +2030,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 6429945450899169262} handleType: 0 - leftHandleLocalPosition: {x: -2.0023239, y: 9.526556, z: 0} - rightHandleLocalPosition: {x: 2.0023239, y: -9.526556, z: -0} + leftHandleLocalPosition: {x: -2.191154, y: 12.986072, z: 0} + rightHandleLocalPosition: {x: 2.191154, y: -12.986072, z: -0} --- !u!1 &8665788574861104969 GameObject: m_ObjectHideFlags: 0 @@ -2241,5 +2242,5 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 6429945450899169262} handleType: 0 - leftHandleLocalPosition: {x: -2.8676462, y: -14.786469, z: -0} - rightHandleLocalPosition: {x: 2.8676462, y: 14.786469, z: 0} + leftHandleLocalPosition: {x: -2.66308, y: -13.201346, z: -0} + rightHandleLocalPosition: {x: 2.66308, y: 13.201346, z: 0} diff --git a/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickLeft.anim b/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickLeft.anim index 731f5a940..6209d8ba3 100644 --- a/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickLeft.anim +++ b/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickLeft.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.303, y: 2.202, z: 0} + value: {x: 0.238, y: 2.464, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -28,8 +28,8 @@ AnimationClip: inWeight: {x: 0, y: 0, z: 0} outWeight: {x: 0, y: 0, z: 0} - serializedVersion: 3 - time: 0.13333334 - value: {x: 0.26, y: 2.34, z: 0} + time: 0.1 + value: {x: 0.212, y: 2.596, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -37,8 +37,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.21666667 - value: {x: 0.297, y: 2.491, z: 0} + time: 0.16666667 + value: {x: 0.241, y: 2.744, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -46,17 +46,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.35 - value: {x: 0.164, y: 2.543, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.4 - value: {x: 0, y: 2.733, z: 0} + time: 0.26666668 + value: {x: 0.13, y: 2.795, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -72,7 +63,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.139, y: 0.717, z: 0} + value: {x: 0.586, y: 0.373, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -80,8 +71,8 @@ AnimationClip: inWeight: {x: 0, y: 0, z: 0} outWeight: {x: 0, y: 0, z: 0} - serializedVersion: 3 - time: 0.35 - value: {x: 0.054, y: 0.654, z: 0} + time: 0.16666667 + value: {x: 0.558, y: 0.373, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -89,51 +80,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.4 - value: {x: 0, y: 0.753, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Holder/Torso - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.627, y: 0.232, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0, z: 0} - outWeight: {x: 0, y: 0, z: 0} - - serializedVersion: 3 - time: 0.21666667 - value: {x: 0.552, y: 0.232, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.35 - value: {x: 0.427, y: 0.203, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.4 - value: {x: 0.2850001, y: 0.199, z: 0} + time: 0.26666668 + value: {x: 0.422, y: 0.344, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -149,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.5, y: 0.233, z: 0} + value: {x: -0.574, y: 0.377, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -157,8 +105,8 @@ AnimationClip: inWeight: {x: 0, y: 0, z: 0} outWeight: {x: 0, y: 0, z: 0} - serializedVersion: 3 - time: 0.21666667 - value: {x: -0.546, y: 0.242, z: 0} + time: 0.16666667 + value: {x: -0.604, y: 0.377, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -166,17 +114,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.35 - value: {x: -0.682, y: 0.22, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.4 - value: {x: -0.848, y: 0.212, z: 0} + time: 0.26666668 + value: {x: -0.724, y: 0.329, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -192,32 +131,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.7379999, y: -2.485, 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: Holder/RightLeg - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.296, y: -0.886, z: 0} + value: {x: 0.115, y: 0.836, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0, y: 0, z: 0} - outWeight: {x: 0, y: 0, z: 0} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.4 - value: {x: -0.03500009, y: -0.847, z: 0} + time: 0.26666668 + value: {x: 0.073, y: 0.794, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -227,13 +150,13 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Holder/LowerTorso + path: Holder/Torso - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.482, y: -1.71, z: 0} + value: {x: -0.37, y: -1.581, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -241,8 +164,17 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.13333334 - value: {x: -0.461, y: -1.74, z: 0} + time: 0.1 + value: {x: -0.37, y: -1.629, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: -0.055, y: -2.26, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -251,7 +183,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: -0.006, y: -2.371, z: 0} + value: {x: 0.179, y: -2.406, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -259,26 +191,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 - value: {x: 0.204, y: -2.5, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.35 - value: {x: 0.057, y: -2.467, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.4 - value: {x: 0.04699993, y: -2.655, z: 0} + time: 0.26666668 + value: {x: 0.003, y: -2.572, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -295,52 +209,83 @@ AnimationClip: - curve: - time: 0 value: {fileID: -4756013695868691969, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.13333334 + - time: 0.1 value: {fileID: -4339478730206458095, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.4 - value: {fileID: -4901794926734046506, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} attribute: m_Sprite path: Holder/Head classID: 212 script: {fileID: 0} - curve: - time: 0 + value: {fileID: 2914744087563887584, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} + - time: 0.26666668 value: {fileID: -2950019292274531361, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.35 - value: {fileID: 1331937126919517603, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.4 - value: {fileID: 4316165930547777794, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} attribute: m_Sprite path: Holder/Torso classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: 31104100975739196, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} + value: {fileID: 21300000, guid: c8222410dbbe3ad42b28b0eb63ba6664, type: 3} + - time: 0.016666668 + value: {fileID: 21300000, guid: 67322efa5c8b9f844a187742ce9ecec5, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: 1df35156dcaf0e34e9dccf5b25066029, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: 26b5e4a204ef47041b4d940562abf6c9, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: dda2034e62e5ee944a72e32432412dee, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: f2a8838b90c455d4aab370444dd38749, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 4d529db15ec34a2428c3bf4c22ab3f75, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: 0e9c2c82480067c439d02f435580b04c, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 1144c022cf6ded0428e4256319cf0a64, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 0febfd2c2d69f454b9ffd0d46b020c97, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: d23c142c20ac6dd4586401016936dfa3, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: bdaf8d0a90d4d8d47be17b54cc20e88b, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 144082f046a66d14f918776f959a1b48, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 78f53a06251642a49bf09e5e54a9f51b, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: 061c7ba18db217d4caa2b997934e8e5f, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 1fe4261905c3db044bae2465796e755d, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: 919e28b312e63da4aa2eaa0362a456e7, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: 2b5456868cbde2641b88b335d89e57db, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 173589b13bcf3a548b3dbab0ec8afef8, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: b5c6bb0e9ae54444eb18629ef876e160, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 23912ac2b6744f84297edd6d0e1aea51, type: 3} + - time: 0.35 + value: {fileID: 21300000, guid: b0bb051290046d8419dc4fd2f13d5f2f, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: c3d92d250892df44583a48c37e158f46, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: 13c2f5dd43b1d2b45a477b38df2d9e6d, type: 3} attribute: m_Sprite - path: Holder/RightLeg - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: 3897377649561355716, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.4 - value: {fileID: -1720273043946688001, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - attribute: m_Sprite - path: Holder/LowerTorso + path: Square (3) classID: 212 script: {fileID: 0} - curve: - time: 0 value: {fileID: 434938072123433104, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.21666667 + - time: 0.16666667 value: {fileID: 4331073688640613404, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.28333333 + - time: 0.21666667 value: {fileID: 569701050227369887, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.35 + - time: 0.26666668 value: {fileID: -5912951922301171794, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.4 - value: {fileID: 31104100975739196, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} attribute: m_Sprite path: Holder/LeftLeg classID: 212 @@ -359,13 +304,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1903750507 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 4172274273 attribute: 1 @@ -381,7 +319,7 @@ AnimationClip: customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2272283310 + path: 1903750507 attribute: 1 script: {fileID: 0} typeID: 4 @@ -409,14 +347,7 @@ AnimationClip: customType: 23 isPPtrCurve: 1 - serializedVersion: 2 - path: 3667742504 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 2272283310 + path: 2827832259 attribute: 0 script: {fileID: 0} typeID: 212 @@ -429,39 +360,50 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 - - serializedVersion: 2 - path: 3667742504 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: - {fileID: -4756013695868691969, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - {fileID: -4339478730206458095, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: -4901794926734046506, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} + - {fileID: 2914744087563887584, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - {fileID: -2950019292274531361, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: 1331937126919517603, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: 4316165930547777794, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: 31104100975739196, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: 3897377649561355716, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: -1720273043946688001, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} + - {fileID: 21300000, guid: c8222410dbbe3ad42b28b0eb63ba6664, type: 3} + - {fileID: 21300000, guid: 67322efa5c8b9f844a187742ce9ecec5, type: 3} + - {fileID: 21300000, guid: 1df35156dcaf0e34e9dccf5b25066029, type: 3} + - {fileID: 21300000, guid: 26b5e4a204ef47041b4d940562abf6c9, type: 3} + - {fileID: 21300000, guid: dda2034e62e5ee944a72e32432412dee, type: 3} + - {fileID: 21300000, guid: f2a8838b90c455d4aab370444dd38749, type: 3} + - {fileID: 21300000, guid: 4d529db15ec34a2428c3bf4c22ab3f75, type: 3} + - {fileID: 21300000, guid: 0e9c2c82480067c439d02f435580b04c, type: 3} + - {fileID: 21300000, guid: 1144c022cf6ded0428e4256319cf0a64, type: 3} + - {fileID: 21300000, guid: 0febfd2c2d69f454b9ffd0d46b020c97, type: 3} + - {fileID: 21300000, guid: d23c142c20ac6dd4586401016936dfa3, type: 3} + - {fileID: 21300000, guid: bdaf8d0a90d4d8d47be17b54cc20e88b, type: 3} + - {fileID: 21300000, guid: 144082f046a66d14f918776f959a1b48, type: 3} + - {fileID: 21300000, guid: 78f53a06251642a49bf09e5e54a9f51b, type: 3} + - {fileID: 21300000, guid: 061c7ba18db217d4caa2b997934e8e5f, type: 3} + - {fileID: 21300000, guid: 1fe4261905c3db044bae2465796e755d, type: 3} + - {fileID: 21300000, guid: 919e28b312e63da4aa2eaa0362a456e7, type: 3} + - {fileID: 21300000, guid: 2b5456868cbde2641b88b335d89e57db, type: 3} + - {fileID: 21300000, guid: 173589b13bcf3a548b3dbab0ec8afef8, type: 3} + - {fileID: 21300000, guid: b5c6bb0e9ae54444eb18629ef876e160, type: 3} + - {fileID: 21300000, guid: 23912ac2b6744f84297edd6d0e1aea51, type: 3} + - {fileID: 21300000, guid: b0bb051290046d8419dc4fd2f13d5f2f, type: 3} + - {fileID: 21300000, guid: c3d92d250892df44583a48c37e158f46, type: 3} + - {fileID: 21300000, guid: 13c2f5dd43b1d2b45a477b38df2d9e6d, type: 3} - {fileID: 434938072123433104, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - {fileID: 4331073688640613404, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - {fileID: 569701050227369887, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - {fileID: -5912951922301171794, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: 31104100975739196, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.4166667 + m_StopTime: 0.4 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -477,7 +419,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.303 + value: 0.238 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -485,485 +427,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.13333334 - value: 0.26 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0.297 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0.164 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - 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_LocalPosition.x - path: Holder/Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 2.202 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 2.34 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 2.491 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 2.543 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 2.733 - 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_LocalPosition.y - path: Holder/Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - 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_LocalPosition.z - path: Holder/Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.139 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.35 - value: 0.054 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - 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_LocalPosition.x - path: Holder/Torso - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.717 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.35 - value: 0.654 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0.753 - 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_LocalPosition.y - path: Holder/Torso - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.35 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - 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_LocalPosition.z - path: Holder/Torso - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.627 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.21666667 - value: 0.552 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0.427 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0.2850001 - 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_LocalPosition.x - path: Holder/LeftArm - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.232 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.21666667 - value: 0.232 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0.203 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0.199 - 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_LocalPosition.y - path: Holder/LeftArm - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - 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_LocalPosition.z - path: Holder/LeftArm - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.5 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.21666667 - value: -0.546 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: -0.682 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: -0.848 - 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_LocalPosition.x - path: Holder/RightArm - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.233 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.21666667 - value: 0.242 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0.22 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 + time: 0.1 value: 0.212 inSlope: Infinity outSlope: Infinity @@ -971,6 +435,301 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.241 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0.13 + 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_LocalPosition.x + path: Holder/Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2.464 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 2.596 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 2.744 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 2.795 + 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_LocalPosition.y + path: Holder/Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + 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_LocalPosition.z + path: Holder/Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.586 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0.558 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0.422 + 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_LocalPosition.x + path: Holder/LeftArm + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.373 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0.373 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0.344 + 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_LocalPosition.y + path: Holder/LeftArm + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + 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_LocalPosition.z + path: Holder/LeftArm + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.574 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: -0.604 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: -0.724 + 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_LocalPosition.x + path: Holder/RightArm + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.377 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0.377 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0.329 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -991,7 +750,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.21666667 + time: 0.16666667 value: 0 inSlope: Infinity outSlope: Infinity @@ -1000,16 +759,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.35 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 + time: 0.26666668 value: 0 inSlope: Infinity outSlope: Infinity @@ -1029,73 +779,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.7379999 - 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: Holder/RightLeg - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -2.485 - 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: Holder/RightLeg - 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: Holder/RightLeg - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.296 + value: 0.115 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 - value: -0.03500009 + time: 0.26666668 + value: 0.073 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1106,7 +799,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Holder/LowerTorso + path: Holder/Torso classID: 4 script: {fileID: 0} - curve: @@ -1114,16 +807,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.886 + value: 0.836 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 - value: -0.847 + time: 0.26666668 + value: 0.794 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1134,7 +827,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Holder/LowerTorso + path: Holder/Torso classID: 4 script: {fileID: 0} - curve: @@ -1147,10 +840,10 @@ AnimationClip: outSlope: Infinity tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.26666668 value: 0 inSlope: Infinity outSlope: Infinity @@ -1162,7 +855,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Holder/LowerTorso + path: Holder/Torso classID: 4 script: {fileID: 0} - curve: @@ -1170,7 +863,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.482 + value: -0.37 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1178,8 +871,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 - value: -0.461 + time: 0.1 + value: -0.37 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -0.055 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1188,7 +890,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: -0.006 + value: 0.179 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1196,26 +898,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 - value: 0.204 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0.057 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0.04699993 + time: 0.26666668 + value: 0.003 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1234,7 +918,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.71 + value: -1.581 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1242,8 +926,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 - value: -1.74 + time: 0.1 + value: -1.629 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -2.26 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1252,7 +945,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: -2.371 + value: -2.406 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1260,26 +953,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 - value: -2.5 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: -2.467 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: -2.655 + time: 0.26666668 + value: -2.572 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1306,7 +981,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 value: 0 inSlope: Infinity outSlope: Infinity @@ -1324,25 +1008,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 + time: 0.26666668 value: 0 inSlope: Infinity outSlope: Infinity diff --git a/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickLeft.anim.meta b/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickLeft.anim.meta index 999c065d4..355605fa6 100644 --- a/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickLeft.anim.meta +++ b/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickLeft.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9d8b68c5ac526c84ca51cab516742ef2 +guid: 05c0a0dee77b0bd40a6cb9a6b777ec93 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickRight.anim b/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickRight.anim index a3dcef3d7..130281a08 100644 --- a/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickRight.anim +++ b/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickRight.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.303, y: 2.202, z: 0} + value: {x: 0.238, y: 2.464, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -28,8 +28,8 @@ AnimationClip: inWeight: {x: 0, y: 0, z: 0} outWeight: {x: 0, y: 0, z: 0} - serializedVersion: 3 - time: 0.13333334 - value: {x: 0.26, y: 2.34, z: 0} + time: 0.1 + value: {x: 0.212, y: 2.596, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -37,8 +37,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.21666667 - value: {x: 0.297, y: 2.491, z: 0} + time: 0.16666667 + value: {x: 0.241, y: 2.744, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -46,23 +46,14 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.35 - value: {x: 0.164, y: 2.543, z: 0} + time: 0.26666668 + value: {x: 0.13, y: 2.795, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.4 - value: {x: 0, y: 2.733, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -72,7 +63,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.627, y: 0.232, z: 0} + value: {x: 0.586, y: 0.373, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -80,8 +71,8 @@ AnimationClip: inWeight: {x: 0, y: 0, z: 0} outWeight: {x: 0, y: 0, z: 0} - serializedVersion: 3 - time: 0.21666667 - value: {x: 0.552, y: 0.232, z: 0} + time: 0.16666667 + value: {x: 0.558, y: 0.373, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -89,49 +80,24 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.35 - value: {x: 0.427, y: 0.203, z: 0} + time: 0.26666668 + value: {x: 0.422, y: 0.344, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.4 - value: {x: 0.2850001, y: 0.199, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 path: Holder/LeftArm - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.4 - value: {x: 0.04699993, y: -2.655, 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: Holder/LeftLeg - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.296, y: -0.886, z: 0} + value: {x: -0.574, y: 0.377, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -139,33 +105,8 @@ AnimationClip: inWeight: {x: 0, y: 0, z: 0} outWeight: {x: 0, y: 0, z: 0} - serializedVersion: 3 - time: 0.4 - value: {x: -0.03500009, y: -0.847, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Holder/LowerTorso - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -0.5, y: 0.233, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0, z: 0} - outWeight: {x: 0, y: 0, z: 0} - - serializedVersion: 3 - time: 0.21666667 - value: {x: -0.546, y: 0.242, z: 0} + time: 0.16666667 + value: {x: -0.604, y: 0.377, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -173,23 +114,14 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.35 - value: {x: -0.682, y: 0.22, z: 0} + time: 0.26666668 + value: {x: -0.724, y: 0.329, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.4 - value: {x: -0.848, y: 0.212, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -199,7 +131,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.998, y: -1.704, z: 0} + value: {x: 0.115, y: 0.836, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -207,8 +139,42 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.13333334 - value: {x: -0.998, y: -1.77, z: 0} + time: 0.26666668 + value: {x: 0.073, y: 0.794, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Holder/Torso + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -1.054, y: -1.563, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.1 + value: {x: -1.054, y: -1.6, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: -0.781, y: -2.213, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -217,7 +183,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: -0.775, y: -2.3101, z: 0} + value: {x: -0.614, y: -2.392, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -225,117 +191,95 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 - value: {x: -0.587, y: -2.451, z: 0} + time: 0.26666668 + value: {x: -0.751, y: -2.466, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.35 - value: {x: -0.743, y: -2.462, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.4 - value: {x: -0.7379999, y: -2.485, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 path: Holder/RightLeg - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.139, y: 0.717, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0, z: 0} - outWeight: {x: 0, y: 0, z: 0} - - serializedVersion: 3 - time: 0.35 - value: {x: 0.054, y: 0.654, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.4 - value: {x: 0, y: 0.753, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Holder/Torso m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: - curve: - time: 0 - value: {fileID: -4756013695868691969, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} + value: {fileID: 21300000, guid: 85285fc4fa793c447a696cf0d29cbd31, type: 3} + - time: 0.016666668 + value: {fileID: 21300000, guid: 876aea4a8b33fcc4a867695bb5035868, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: eb8a8558179e8d9428f1f4278746e56a, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: ae99273e77678da4a984870a869ba309, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 0196ca03c69b6bf4a89fe50912f41b2c, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 9b552c0212205734cabb17b0d32407c0, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: bd629d3b2db93f840bdcaa079db21f69, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: cc8a7e536434aa9428c778c9cf1fffbf, type: 3} - time: 0.13333334 + value: {fileID: 21300000, guid: 3908d6e952ca2414583d87968b2da294, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: a057ea808ce1b22408507a3bb1491ddc, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 91f984c7f28e5a64688456c1c803bc13, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: 1299fe603ea7f8c4c9d2073b355725b6, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 3ad165d14b919c14dbeb71c865e2ef64, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 8e5a5c36f3435b74698e95dae1b2082d, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: 8ae4bb3e4cce9804686b0e0756f52cbc, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 5f2ae6b9b25e45c468fea9b30b311122, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: 000f8ff15f9083a4886ceb8f7d67ce23, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: ce1d7ec314cf6544c87cebb1683597ba, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 5625d0e9805faac4b9dd09758cd48170, type: 3} + attribute: m_Sprite + path: Square (3) + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -4756013695868691969, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} + - time: 0.1 value: {fileID: -4339478730206458095, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.4 - value: {fileID: -4901794926734046506, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} attribute: m_Sprite path: Holder/Head classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: 3897377649561355716, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.4 - value: {fileID: -1720273043946688001, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} + value: {fileID: 2914744087563887584, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} + - time: 0.26666668 + value: {fileID: -2950019292274531361, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} attribute: m_Sprite - path: Holder/LowerTorso + path: Holder/Torso classID: 212 script: {fileID: 0} - curve: - time: 0 value: {fileID: 434938072123433104, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.21666667 + - time: 0.16666667 value: {fileID: 4331073688640613404, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.28333333 + - time: 0.21666667 value: {fileID: 569701050227369887, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.35 + - time: 0.26666668 value: {fileID: -5912951922301171794, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} attribute: m_Sprite path: Holder/RightLeg classID: 212 script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -2950019292274531361, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.35 - value: {fileID: 1331937126919517603, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - time: 0.4 - value: {fileID: 4316165930547777794, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - attribute: m_Sprite - path: Holder/Torso - classID: 212 - script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -358,14 +302,14 @@ AnimationClip: customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2272283310 + path: 924037619 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 924037619 + path: 1903750507 attribute: 1 script: {fileID: 0} typeID: 4 @@ -379,12 +323,12 @@ AnimationClip: customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 1903750507 - attribute: 1 + path: 2827832259 + attribute: 0 script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 + typeID: 212 + customType: 23 + isPPtrCurve: 1 - serializedVersion: 2 path: 862337961 attribute: 0 @@ -393,7 +337,7 @@ AnimationClip: customType: 23 isPPtrCurve: 1 - serializedVersion: 2 - path: 2272283310 + path: 1903750507 attribute: 0 script: {fileID: 0} typeID: 212 @@ -406,44 +350,45 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 - - serializedVersion: 2 - path: 1903750507 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 354493626 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: + - {fileID: 21300000, guid: 85285fc4fa793c447a696cf0d29cbd31, type: 3} + - {fileID: 21300000, guid: 876aea4a8b33fcc4a867695bb5035868, type: 3} + - {fileID: 21300000, guid: eb8a8558179e8d9428f1f4278746e56a, type: 3} + - {fileID: 21300000, guid: ae99273e77678da4a984870a869ba309, type: 3} + - {fileID: 21300000, guid: 0196ca03c69b6bf4a89fe50912f41b2c, type: 3} + - {fileID: 21300000, guid: 9b552c0212205734cabb17b0d32407c0, type: 3} + - {fileID: 21300000, guid: bd629d3b2db93f840bdcaa079db21f69, type: 3} + - {fileID: 21300000, guid: cc8a7e536434aa9428c778c9cf1fffbf, type: 3} + - {fileID: 21300000, guid: 3908d6e952ca2414583d87968b2da294, type: 3} + - {fileID: 21300000, guid: a057ea808ce1b22408507a3bb1491ddc, type: 3} + - {fileID: 21300000, guid: 91f984c7f28e5a64688456c1c803bc13, type: 3} + - {fileID: 21300000, guid: 1299fe603ea7f8c4c9d2073b355725b6, type: 3} + - {fileID: 21300000, guid: 3ad165d14b919c14dbeb71c865e2ef64, type: 3} + - {fileID: 21300000, guid: 8e5a5c36f3435b74698e95dae1b2082d, type: 3} + - {fileID: 21300000, guid: 8ae4bb3e4cce9804686b0e0756f52cbc, type: 3} + - {fileID: 21300000, guid: 5f2ae6b9b25e45c468fea9b30b311122, type: 3} + - {fileID: 21300000, guid: 000f8ff15f9083a4886ceb8f7d67ce23, type: 3} + - {fileID: 21300000, guid: ce1d7ec314cf6544c87cebb1683597ba, type: 3} + - {fileID: 21300000, guid: 5625d0e9805faac4b9dd09758cd48170, type: 3} - {fileID: -4756013695868691969, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - {fileID: -4339478730206458095, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: -4901794926734046506, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: 3897377649561355716, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: -1720273043946688001, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} + - {fileID: 2914744087563887584, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} + - {fileID: -2950019292274531361, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - {fileID: 434938072123433104, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - {fileID: 4331073688640613404, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - {fileID: 569701050227369887, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - {fileID: -5912951922301171794, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: -2950019292274531361, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: 1331937126919517603, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - - {fileID: 4316165930547777794, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.4166667 + m_StopTime: 0.3166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -459,7 +404,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.303 + value: 0.238 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -467,519 +412,306 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.13333334 - value: 0.26 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0.297 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0.164 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Holder/Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 2.202 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 2.34 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 2.491 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 2.543 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 2.733 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Holder/Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Holder/Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.627 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.21666667 - value: 0.552 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0.427 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0.2850001 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Holder/LeftArm - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.232 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.21666667 - value: 0.232 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0.203 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0.199 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Holder/LeftArm - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Holder/LeftArm - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.4 - value: 0.04699993 - 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: Holder/LeftLeg - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.4 - value: -2.655 - 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: Holder/LeftLeg - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.4 - 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: Holder/LeftLeg - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.296 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.4 - value: -0.03500009 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Holder/LowerTorso - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.886 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.4 - value: -0.847 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Holder/LowerTorso - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Holder/LowerTorso - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.5 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.21666667 - value: -0.546 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: -0.682 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: -0.848 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Holder/RightArm - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.233 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.21666667 - value: 0.242 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0.22 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 + time: 0.1 value: 0.212 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.241 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0.13 + 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_LocalPosition.x + path: Holder/Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2.464 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 2.596 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 2.744 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 2.795 + 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_LocalPosition.y + path: Holder/Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + 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_LocalPosition.z + path: Holder/Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.586 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0.558 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0.422 + 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_LocalPosition.x + path: Holder/LeftArm + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.373 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0.373 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0.344 + 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_LocalPosition.y + path: Holder/LeftArm + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + 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_LocalPosition.z + path: Holder/LeftArm + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.574 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: -0.604 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: -0.724 + 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_LocalPosition.x + path: Holder/RightArm + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.377 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0.377 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0.329 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1003,7 +735,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.21666667 + time: 0.16666667 value: 0 inSlope: Infinity outSlope: Infinity @@ -1012,7 +744,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.35 + time: 0.26666668 value: 0 inSlope: Infinity outSlope: Infinity @@ -1020,15 +752,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1041,7 +764,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.998 + value: 0.115 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1049,8 +772,101 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 - value: -0.998 + time: 0.26666668 + value: 0.073 + 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_LocalPosition.x + path: Holder/Torso + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.836 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0.794 + 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_LocalPosition.y + path: Holder/Torso + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + 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_LocalPosition.z + path: Holder/Torso + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.054 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: -1.054 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -0.781 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1059,7 +875,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: -0.775 + value: -0.614 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1067,32 +883,14 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 - value: -0.587 + time: 0.26666668 + value: -0.751 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: -0.743 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: -0.7379999 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1105,7 +903,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.704 + value: -1.563 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1113,8 +911,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 - value: -1.77 + time: 0.1 + value: -1.6 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -2.213 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1123,7 +930,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: -2.3101 + value: -2.392 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1131,32 +938,14 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 - value: -2.451 + time: 0.26666668 + value: -2.466 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: -2.462 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: -2.485 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1177,7 +966,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 value: 0 inSlope: Infinity outSlope: Infinity @@ -1195,7 +993,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.26666668 value: 0 inSlope: Infinity outSlope: Infinity @@ -1203,24 +1001,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.35 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1228,117 +1008,6 @@ AnimationClip: path: Holder/RightLeg classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.139 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.35 - value: 0.054 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Holder/Torso - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.717 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.35 - value: 0.654 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0.753 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Holder/Torso - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.35 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Holder/Torso - classID: 4 - script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickRight.anim.meta b/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickRight.anim.meta index da44395a5..2a91e789f 100644 --- a/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickRight.anim.meta +++ b/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickRight.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 86f86d1bf4236e248bf2dfa49c38483e +guid: 3c5a4f185ff7fd9439a76c39dee3d8b9 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/Space Kicker.controller b/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/Space Kicker.controller index 278d84150..9b3fb233f 100644 --- a/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/Space Kicker.controller +++ b/Assets/Resources/Sprites/Games/SpaceSoccer/Animations/Space Kicker.controller @@ -40,6 +40,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -6379243465187239046} m_Position: {x: 130, y: -130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8478891986015278982} + m_Position: {x: 10, y: -80, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -71,7 +74,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 86f86d1bf4236e248bf2dfa49c38483e, type: 2} + m_Motion: {fileID: 7400000, guid: 3c5a4f185ff7fd9439a76c39dee3d8b9, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -98,7 +101,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 9d8b68c5ac526c84ca51cab516742ef2, type: 2} + m_Motion: {fileID: 7400000, guid: 05c0a0dee77b0bd40a6cb9a6b777ec93, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -174,3 +177,29 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &8478891986015278982 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: High + 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: 7400000, guid: c8a487e47c47df84faa2f2809a36bd27, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main - Copy.png b/Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main - Copy.png new file mode 100644 index 000000000..94c99e128 Binary files /dev/null and b/Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main - Copy.png differ diff --git a/Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main - Copy.png.meta b/Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main - Copy.png.meta new file mode 100644 index 000000000..042c24699 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main - Copy.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 8858e627b1f5e4443946fbf02509b2f2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main.png b/Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main.png index 94c99e128..e18d50741 100644 Binary files a/Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main.png and b/Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main.png differ diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 811e81b03..4339d9844 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -7940,8 +7940,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f86858990a87c764892672104bdaef1f, type: 3} m_Name: m_EditorClassIdentifier: - level: {fileID: 4900000, guid: 5e794baa94fb06d4f939aaf032fab5ea, type: 3} - music: {fileID: 8300000, guid: f3b9f9179bad8394a98f617bda265a62, type: 3} + level: {fileID: 4900000, guid: fafaeee85f4121643a0699a4de97da53, type: 3} + music: {fileID: 8300000, guid: a0589cdba27fb254e90da17b4804c2fe, type: 3} debugUI: 0 playOnStart: 0 editor: 1 diff --git a/Assets/Scripts/Games/SpaceSoccer/Ball.cs b/Assets/Scripts/Games/SpaceSoccer/Ball.cs index 837b3a406..6d1cbbe92 100644 --- a/Assets/Scripts/Games/SpaceSoccer/Ball.cs +++ b/Assets/Scripts/Games/SpaceSoccer/Ball.cs @@ -71,17 +71,22 @@ namespace RhythmHeavenMania.Games.SpaceSoccer { Jukebox.PlayOneShotGame("spaceSoccer/highkicktoe1_hit"); + lastSpriteRot = spriteHolder.transform.eulerAngles.z; + kicked.enabled = false; highKicked.enabled = true; highKicked.startBeat = Conductor.instance.songPositionInBeats; highKickCurve.KeyPoints[0].transform.position = holder.transform.position; + ResetState(); } public void Toe() { Jukebox.PlayOneShotGame("spaceSoccer/highkicktoe3_hit"); + lastSpriteRot = spriteHolder.transform.eulerAngles.z; + highKicked.enabled = false; kicked.enabled = false; kickPrepare = false; @@ -90,6 +95,7 @@ namespace RhythmHeavenMania.Games.SpaceSoccer toe.startBeat = Conductor.instance.songPositionInBeats; toeCurve.KeyPoints[0].transform.position = holder.transform.position; + ResetState(); } private void Update() @@ -106,9 +112,9 @@ namespace RhythmHeavenMania.Games.SpaceSoccer if (PlayerInput.Pressed()) { - Kick(); if (state.perfect) { + Kick(); } } } @@ -130,16 +136,16 @@ namespace RhythmHeavenMania.Games.SpaceSoccer if (PlayerInput.Pressed()) { - if (kicker.canHighKick) - { - HighKick(); - } - else if (kicker.canKick) - { - Kick(); - } if (state.perfect) { + if (kicker.canHighKick) + { + HighKick(); + } + else if (kicker.canKick) + { + Kick(); + } // print(normalizedBeat); } } @@ -150,6 +156,10 @@ namespace RhythmHeavenMania.Games.SpaceSoccer holder.transform.position = highKickCurve.GetPoint(normalizedBeatAnim); spriteHolder.transform.eulerAngles = new Vector3(0, 0, Mathf.Lerp(lastSpriteRot, -460f, normalizedBeatAnim)); + float normalizedBeat = Conductor.instance.GetLoopPositionFromBeat(highKicked.startBeat, 1.5f); + StateCheck(normalizedBeat); + // if (state.perfect) Debug.Break(); + if (PlayerInput.Pressed()) { kickPrepare = true; @@ -159,7 +169,10 @@ namespace RhythmHeavenMania.Games.SpaceSoccer { if (PlayerInput.PressedUp()) { - Toe(); + if (state.perfect) + { + Toe(); + } } } }