diff --git a/Assets/Resources/Games/coinToss.prefab b/Assets/Resources/Games/coinToss.prefab index 736c0c296..239b439f7 100644 --- a/Assets/Resources/Games/coinToss.prefab +++ b/Assets/Resources/Games/coinToss.prefab @@ -25,7 +25,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1491714170662666650} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.53499997, y: 0.95, z: 0} + m_LocalPosition: {x: -2.15, y: 4.96, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2083908003750235240} @@ -138,6 +138,7 @@ MonoBehaviour: isEligible: 0 triggersAutoplay: 1 startBeat: 0 + audienceReacting: 0 --- !u!1 &4255918877615705356 GameObject: m_ObjectHideFlags: 0 @@ -164,10 +165,10 @@ Transform: m_GameObject: {fileID: 4255918877615705356} m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 4, y: 4, z: 4} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3170172331476655201} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} --- !u!212 &1683760499118769418 SpriteRenderer: @@ -245,7 +246,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4297773475502933893} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.5475, y: 0.23750001, z: 0} + m_LocalPosition: {x: -2.12, y: 0.9, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2083908003750235240} @@ -327,14 +328,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4499006981041317361} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.52, y: 0.78, z: 0} - m_LocalScale: {x: 4, y: 4, z: 4} + m_LocalPosition: {x: -4.520001, y: 0.78000045, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1615845594994777750} - {fileID: 7476450758015735169} - {fileID: 6893508837926585267} m_Father: {fileID: 3170172331476655201} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1726275418879872698 SpriteRenderer: @@ -493,7 +494,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5008687997479124527} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 14.9296875, y: 8.525, z: 1} m_Children: [] @@ -576,7 +577,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7629969691203504755} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.689, y: 0.403, z: 0} + m_LocalPosition: {x: -2.72, y: 1.83, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2083908003750235240} @@ -684,6 +685,7 @@ MonoBehaviour: firstEnable: 0 isThrowing: 0 coin_cue: {fileID: 2284767481152605812} + current_coin: {fileID: 0} handAnimator: {fileID: 6887173419118620922} --- !u!1 &9176706498249536598 GameObject: @@ -713,8 +715,8 @@ Transform: m_LocalPosition: {x: 6.66, y: -3.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2083908003750235240} - {fileID: 531613198458803261} + - {fileID: 2083908003750235240} m_Father: {fileID: 8906338938816874952} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_success.anim b/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_success.anim index c381e1d0c..b0125f4ab 100644 --- a/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_success.anim +++ b/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_success.anim @@ -38,13 +38,22 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: -4.52, y: 0.88, z: 0} + value: {x: -4.52, y: 0.896, z: 0} inSlope: {x: 0, y: Infinity, z: 0} outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 1, z: 0.33333334} outWeight: {x: 0.33333334, y: 0, z: 0.33333334} + - serializedVersion: 3 + time: 0.35 + value: {x: -4.52, y: 0.914, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0, z: 0.33333334} - serializedVersion: 3 time: 0.4 value: {x: -4.52, y: 0.78, z: 0} @@ -297,6 +306,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.35 + value: -4.52 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.4 value: -4.52 @@ -336,13 +354,22 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0.88 + value: 0.896 inSlope: Infinity outSlope: Infinity tangentMode: 0 weightedMode: 0 inWeight: 1 outWeight: 0 + - serializedVersion: 3 + time: 0.35 + value: 0.914 + inSlope: Infinity + outSlope: Infinity + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 - serializedVersion: 3 time: 0.4 value: 0.78 @@ -389,6 +416,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.35 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.4 value: 0 diff --git a/Assets/Resources/Sprites/Games/CoinToss/Animations/Pickup.anim b/Assets/Resources/Sprites/Games/CoinToss/Animations/Pickup.anim index aaeea6576..d87642ef0 100644 --- a/Assets/Resources/Sprites/Games/CoinToss/Animations/Pickup.anim +++ b/Assets/Resources/Sprites/Games/CoinToss/Animations/Pickup.anim @@ -63,7 +63,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.5475, y: 0.23750001, z: 0} + value: {x: -2.2, y: 0.93, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -72,7 +72,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.41666666 - value: {x: -1.143, y: 0.677, z: 0} + value: {x: -6.02, y: 3.07, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -81,7 +81,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.46666667 - value: {x: -0.5475, y: 0.23750001, z: 0} + value: {x: -2.04, y: 0.94, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -658,7 +658,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.5475 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -667,7 +667,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.41666666 - value: -1.143 + value: -6.02 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -676,7 +676,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: -0.5475 + value: -2.04 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -695,7 +695,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.23750001 + value: 0.93 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -704,7 +704,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.41666666 - value: 0.677 + value: 3.07 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -713,7 +713,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: 0.23750001 + value: 0.94 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png b/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png index 3208f63c2..9e7edfbc5 100644 Binary files a/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png and b/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png differ diff --git a/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png.meta b/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png.meta index a783142a9..b0eee2fdf 100644 --- a/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png.meta +++ b/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png.meta @@ -134,9 +134,9 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 425 - width: 167 - height: 86 + y: 1700 + width: 668 + height: 344 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -155,9 +155,9 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 321 - width: 167 - height: 102 + y: 1284 + width: 664 + height: 406 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -176,9 +176,9 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 209 - width: 167 - height: 110 + y: 836 + width: 666 + height: 438 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -197,9 +197,9 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 97 - width: 167 - height: 110 + y: 390 + width: 668 + height: 438 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -218,9 +218,9 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 17 - width: 215 - height: 78 + y: 70 + width: 860 + height: 310 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -238,10 +238,10 @@ TextureImporter: name: sprsh_cointoss_closed_90 rect: serializedVersion: 2 - x: 169 - y: 417 - width: 182 - height: 94 + x: 676 + y: 1668 + width: 726 + height: 380 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -259,10 +259,10 @@ TextureImporter: name: sprsh_cointoss_closed_45 rect: serializedVersion: 2 - x: 169 - y: 321 - width: 182 - height: 94 + x: 676 + y: 1286 + width: 728 + height: 374 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -280,10 +280,10 @@ TextureImporter: name: sprsh_cointoss_closed_01 rect: serializedVersion: 2 - x: 169 - y: 225 - width: 182 - height: 94 + x: 676 + y: 900 + width: 728 + height: 376 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -301,10 +301,10 @@ TextureImporter: name: sprsh_cointoss_closed_02 rect: serializedVersion: 2 - x: 169 - y: 121 - width: 182 - height: 102 + x: 676 + y: 486 + width: 728 + height: 404 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -322,10 +322,10 @@ TextureImporter: name: sprsh_cointoss_whoosh rect: serializedVersion: 2 - x: 353 - y: 273 - width: 46 - height: 230 + x: 1412 + y: 1092 + width: 184 + height: 920 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -343,10 +343,10 @@ TextureImporter: name: sprsh_cointoss_sleeve rect: serializedVersion: 2 - x: 401 - y: 337 - width: 87 - height: 142 + x: 1606 + y: 1350 + width: 344 + height: 566 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -364,12 +364,12 @@ TextureImporter: name: sprsh_cointoss_45 rect: serializedVersion: 2 - x: 457 - y: 273 - width: 54 - height: 54 + x: 1829 + y: 1094 + width: 215 + height: 212 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -385,12 +385,12 @@ TextureImporter: name: sprsh_cointoss_shockwave rect: serializedVersion: 2 - x: 401 - y: 273 - width: 54 - height: 54 + x: 1604 + y: 1092 + width: 216 + height: 216 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: []