diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.anim b/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.anim index 9e31ad5f..bdaf5c92 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.anim @@ -208,18 +208,18 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5833333 - value: {x: -0.76, y: 2.2165265, z: 0} - inSlope: {x: -0.087272644, y: 3.165192, z: 0} - outSlope: {x: -0.087272644, y: 3.165192, z: 0} + value: {x: -0.76, y: 2.427342, z: 0} + inSlope: {x: -0.087272644, y: 4.1881547, z: 0} + outSlope: {x: -0.087272644, y: 4.1881547, 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} + outWeight: {x: 0.33333334, y: 0.5300091, z: 0.33333334} - serializedVersion: 3 time: 0.75 - value: {x: -0.7656363, y: 2.81, z: 0} - inSlope: {x: -0.020181654, y: 2.0800018, z: 0} - outSlope: {x: -0.020181654, y: 2.0800018, z: 0} + value: {x: -0.7656363, y: 2.8802743, z: 0} + inSlope: {x: -0.020181654, y: 0.9556121, z: 0} + outSlope: {x: -0.020181654, y: 0.9556121, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -1118,18 +1118,18 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5833333 - value: 2.2165265 - inSlope: 3.165192 - outSlope: 3.165192 - tangentMode: 136 + value: 2.427342 + inSlope: 4.1881547 + outSlope: 4.1881547 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.5300091 - serializedVersion: 3 time: 0.75 - value: 2.81 - inSlope: 2.0800018 - outSlope: 2.0800018 + value: 2.8802743 + inSlope: 0.9556121 + outSlope: 0.9556121 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -1226,33 +1226,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.9166667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - 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 @@ -1272,33 +1245,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.9166667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - 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 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim b/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim index e2dd0975..654a6a3b 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim @@ -269,7 +269,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.87, y: 1.11, z: 0} + value: {x: 0.95, y: 0.95, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -278,9 +278,9 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0.3428675, y: 1.5350034, z: 0} - inSlope: {x: -3.4060874, y: 0, z: 0} - outSlope: {x: -3.4060874, y: 0, z: 0} + value: {x: 0.39277488, y: 1.5350034, z: 0} + inSlope: {x: -3.6005316, y: 0, z: 0} + outSlope: {x: -3.6005316, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -305,16 +305,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.75 - value: {x: 0.18992466, y: 1.4378207, z: 0} - inSlope: {x: 2.4720404, y: 0, z: 0} - outSlope: {x: 2.4720404, y: 0, z: 0} + value: {x: 0.23110095, y: 1.4378207, z: 0} + inSlope: {x: 2.6131628, y: 0, z: 0} + outSlope: {x: 2.6131628, 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} - serializedVersion: 3 time: 2.1666667 - value: {x: 0.87, y: 1.11, z: 0} + value: {x: 0.95, y: 0.95, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -2202,7 +2202,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.87 + value: 0.95 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -2229,7 +2229,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 2.1666667 - value: 0.87 + value: 0.95 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -2248,7 +2248,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.11 + value: 0.95 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -2293,7 +2293,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 2.1666667 - value: 1.11 + value: 0.95 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_caramel.anim b/popcorn/Assets/MyGame/Resource/Animation/material_caramel.anim index 1851a3e2..12638d1d 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_caramel.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_caramel.anim @@ -26,24 +26,6 @@ AnimationClip: 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.46666667 - value: {x: 0, y: 0, z: 15.511001} - inSlope: {x: 0, y: 0, z: 37.09895} - outSlope: {x: 0, y: 0, z: 37.09895} - 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.6333333 - value: {x: 0, y: 0, z: 23.496} - inSlope: {x: 0, y: 0, z: 48.33} - outSlope: {x: 0, y: 0, z: 48.33} - 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.73333335 value: {x: 0, y: 0, z: 28.399002} @@ -54,25 +36,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: {x: 0, y: 0, z: 22.908} - inSlope: {x: 0, y: 0, z: -16.154669} - outSlope: {x: 0, y: 0, z: -16.154669} + inSlope: {x: 0, y: 0, z: -17.340004} + outSlope: {x: 0, y: 0, z: -17.340004} 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: 1.4833333 - value: {x: 0, y: 0, z: 16.283} - inSlope: {x: 0, y: 0, z: -45.816} - outSlope: {x: 0, y: 0, z: -45.816} - 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: 1.8333334 + time: 2 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -108,14 +81,14 @@ AnimationClip: - serializedVersion: 3 time: 1.25 value: {x: 0, y: 0, z: 0.726} - inSlope: {x: 0, y: 0, z: -1.585455} - outSlope: {x: 0, y: 0, z: -1.585455} + inSlope: {x: 0, y: 0, z: -1.538824} + outSlope: {x: 0, y: 0, z: -1.538824} 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: 1.3333334 + time: 1.35 value: {x: 0, y: 0, z: -1.7} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -138,8 +111,35 @@ AnimationClip: outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.30002612, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.73333335 + value: {x: -8.429491, y: -0.40610737, 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} + - serializedVersion: 3 + time: 1.35 + value: {x: -8.429491, y: -0.40610737, 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} + - serializedVersion: 3 + time: 2 + value: {x: -7.8, y: 0, z: 0} + inSlope: {x: 0.9684475, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.30002612, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -228,22 +228,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: caramel_container_diagonal/inside_e - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.16, y: 0.33, 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: caramel_container_diagonal m_ScaleCurves: [] m_FloatCurves: - curve: @@ -277,7 +261,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0 inSlope: Infinity outSlope: Infinity @@ -286,7 +270,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4833333 + time: 1.55 value: 1 inSlope: Infinity outSlope: Infinity @@ -295,7 +279,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.7333333 + time: 1.8666667 value: 0 inSlope: Infinity outSlope: Infinity @@ -332,7 +316,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.7333333 + time: 1.8666667 value: 1 inSlope: Infinity outSlope: Infinity @@ -369,7 +353,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 1 inSlope: Infinity outSlope: Infinity @@ -378,7 +362,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4833333 + time: 1.55 value: 0 inSlope: Infinity outSlope: Infinity @@ -415,7 +399,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0 inSlope: Infinity outSlope: Infinity @@ -452,7 +436,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 1 inSlope: Infinity outSlope: Infinity @@ -489,7 +473,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0 inSlope: Infinity outSlope: Infinity @@ -683,7 +667,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0 inSlope: Infinity outSlope: Infinity @@ -869,20 +853,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1423800722 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.8333334 + m_StopTime: 2 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -910,6 +887,33 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.73333335 + value: -8.429491 + inSlope: 0 + outSlope: 0 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.35 + value: -8.429491 + inSlope: 0 + outSlope: 0 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: -7.8 + inSlope: 0.9684475 + outSlope: 0 + tangentMode: 5 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -929,6 +933,33 @@ AnimationClip: weightedMode: 0 inWeight: 0.30002612 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.73333335 + value: -0.40610737 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.35 + value: -0.40610737 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.30002612 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -948,6 +979,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + 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 @@ -1025,52 +1065,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.46666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6333333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.73333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.4833333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -1098,52 +1093,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.46666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6333333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.73333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.4833333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -1170,24 +1120,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.46666667 - value: 15.511001 - inSlope: 37.09895 - outSlope: 37.09895 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6333333 - value: 23.496 - inSlope: 48.33 - outSlope: 48.33 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.73333335 value: 28.399002 @@ -1198,25 +1130,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 22.908 - inSlope: -16.154669 - outSlope: -16.154669 + inSlope: -17.340004 + outSlope: -17.340004 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4833333 - value: 16.283 - inSlope: -45.816 - outSlope: -45.816 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -1262,7 +1185,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0 inSlope: Infinity outSlope: Infinity @@ -1271,7 +1194,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4833333 + time: 1.55 value: 1 inSlope: Infinity outSlope: Infinity @@ -1280,7 +1203,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.7333333 + time: 1.8666667 value: 0 inSlope: Infinity outSlope: Infinity @@ -1317,7 +1240,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.7333333 + time: 1.8666667 value: 1 inSlope: Infinity outSlope: Infinity @@ -1354,7 +1277,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 1 inSlope: Infinity outSlope: Infinity @@ -1363,7 +1286,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4833333 + time: 1.55 value: 0 inSlope: Infinity outSlope: Infinity @@ -1400,7 +1323,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0 inSlope: Infinity outSlope: Infinity @@ -1437,7 +1360,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 1 inSlope: Infinity outSlope: Infinity @@ -1474,7 +1397,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0 inSlope: Infinity outSlope: Infinity @@ -1668,7 +1591,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0 inSlope: Infinity outSlope: Infinity @@ -1825,7 +1748,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0 inSlope: 0 outSlope: 0 @@ -1871,7 +1794,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0 inSlope: 0 outSlope: 0 @@ -1910,14 +1833,14 @@ AnimationClip: - serializedVersion: 3 time: 1.25 value: 0.726 - inSlope: -1.585455 - outSlope: -1.585455 + inSlope: -1.538824 + outSlope: -1.538824 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: -1.7 inSlope: 0 outSlope: 0 @@ -2080,63 +2003,6 @@ AnimationClip: path: caramel_container_diagonal/inside_e classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.16 - 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: caramel_container_diagonal - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.33 - 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: caramel_container_diagonal - 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.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: caramel_container_diagonal - classID: 4 - script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_chocolate.anim b/popcorn/Assets/MyGame/Resource/Animation/material_chocolate.anim index 0c769183..35587cf2 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_chocolate.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_chocolate.anim @@ -45,7 +45,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.75 + time: 2 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -111,33 +111,6 @@ AnimationClip: 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.14240885, y: 0.102900244, z: 0} - inSlope: {x: -0.5445044, y: 0, z: 0} - outSlope: {x: -0.5445044, 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} - - serializedVersion: 3 - time: 0.8333333 - value: {x: -0.30298722, y: 0.0141887665, z: 0} - inSlope: {x: 0, y: -0.042040795, z: 0} - outSlope: {x: 0, y: -0.042040795, 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} - - serializedVersion: 3 - time: 1.75 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.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 @@ -182,14 +155,14 @@ AnimationClip: - serializedVersion: 3 time: 0.98333335 value: {x: -2.49, y: -1.31, z: 0} - inSlope: {x: 0, y: -0.011428425, z: 0} - outSlope: {x: 0, y: -0.011428425, z: 0} + inSlope: {x: 0, y: -0.010786378, z: 0} + outSlope: {x: 0, y: -0.010786378, 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} - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: {x: -2.69, y: -1.72, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -201,6 +174,49 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: chocolate/chocolate_container_diagonal/inside_e + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.3, y: 0.35, 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} + - serializedVersion: 3 + time: 0.85 + value: {x: -0.33, y: 0.07, 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} + - serializedVersion: 3 + time: 1.2333333 + value: {x: -0.33, y: 0.07, 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} + - serializedVersion: 3 + time: 2 + value: {x: 0.3, y: 0.35, 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: chocolate m_ScaleCurves: [] m_FloatCurves: - curve: @@ -225,7 +241,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -234,7 +250,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.5333333 + time: 1.6833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -280,7 +296,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.5333333 + time: 1.6833333 value: 1 inSlope: Infinity outSlope: Infinity @@ -437,7 +453,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -511,7 +527,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -539,7 +555,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -576,7 +592,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -604,7 +620,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -623,7 +639,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 1.4833333 + time: 1.6 value: 1 inSlope: 0 outSlope: 0 @@ -632,7 +648,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.75 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -678,7 +694,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 1 inSlope: Infinity outSlope: Infinity @@ -687,7 +703,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.5333333 + time: 1.6833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -724,7 +740,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: 0 outSlope: 0 @@ -747,13 +763,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 1474464331 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 3199216888 attribute: 1 @@ -768,6 +777,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 645624620 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1474464331 attribute: 4 @@ -887,13 +903,20 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1474464331 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.75 + m_StopTime: 2 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -978,24 +1001,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: -0.30298722 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.75 - 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 @@ -1015,33 +1020,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0.102900244 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: 0.0141887665 - inSlope: -0.042040795 - outSlope: -0.042040795 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.75 - 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 @@ -1061,15 +1039,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.75 - 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 @@ -1090,7 +1059,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.75 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -1118,7 +1087,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.75 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -1164,7 +1133,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.75 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -1201,7 +1170,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -1210,7 +1179,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.5333333 + time: 1.6833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -1256,7 +1225,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.5333333 + time: 1.6833333 value: 1 inSlope: Infinity outSlope: Infinity @@ -1581,7 +1550,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -1655,7 +1624,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -1683,7 +1652,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -1720,7 +1689,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -1748,7 +1717,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -1767,7 +1736,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 1.4833333 + time: 1.6 value: 1 inSlope: 0 outSlope: 0 @@ -1776,7 +1745,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.75 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -1822,7 +1791,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 1 inSlope: Infinity outSlope: Infinity @@ -1831,7 +1800,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.5333333 + time: 1.6833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -1868,7 +1837,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: 0 outSlope: 0 @@ -1905,7 +1874,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: -2.69 inSlope: 0 outSlope: 0 @@ -1935,14 +1904,14 @@ AnimationClip: - serializedVersion: 3 time: 0.98333335 value: -1.31 - inSlope: -0.011428425 - outSlope: -0.011428425 + inSlope: -0.010786378 + outSlope: -0.010786378 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: -1.72 inSlope: 0 outSlope: 0 @@ -1979,7 +1948,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4 + time: 1.4833333 value: 0 inSlope: 0 outSlope: 0 @@ -1994,6 +1963,144 @@ AnimationClip: path: chocolate/chocolate_container_diagonal/inside_e classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: -0.33 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2333333 + value: -0.33 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.3 + 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: chocolate + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.35 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: 0.07 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2333333 + value: 0.07 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.35 + 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: chocolate + 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.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.85 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + 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: chocolate + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_SoySauce.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_SoySauce.prefab index 8f8d3c39..40b60447 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_SoySauce.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_SoySauce.prefab @@ -656,7 +656,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7320563080363823673} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.87, y: 1.11, z: 0} + m_LocalPosition: {x: 0.95, y: 0.95, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: - {fileID: 7320563080627706948} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_butter.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_butter.prefab index ef7f9498..8d10ea0c 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_butter.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_butter.prefab @@ -772,7 +772,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2280379107414394055} m_LocalRotation: {x: -0, y: -0, z: 0.24113074, w: 0.9704926} - m_LocalPosition: {x: -0.22, y: 0.03, z: 0} + m_LocalPosition: {x: 0.2, y: 0.32, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2280379106847340708} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_caramel.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_caramel.prefab index eda13afd..331bccb3 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_caramel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_caramel.prefab @@ -105,7 +105,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1559048619959632112} m_LocalRotation: {x: -0, y: -0, z: 0.24113074, w: 0.9704926} - m_LocalPosition: {x: -0.1999998, y: 0.09198761, z: 0} + m_LocalPosition: {x: 0.19, y: 0.31, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1559048620527658062} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_chocolate.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_chocolate.prefab index 50569b87..97213c18 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_chocolate.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_chocolate.prefab @@ -510,8 +510,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5394121589889874258} - m_LocalRotation: {x: -0, y: -0, z: 0.22168677, w: 0.9751179} - m_LocalPosition: {x: -0.338, y: 0.025292397, z: 0} + m_LocalRotation: {x: -0, y: -0, z: 0.20082128, w: 0.97962797} + m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5394121589948580500} @@ -521,7 +521,7 @@ Transform: - {fileID: 5394121590793028025} m_Father: {fileID: 5394121590586343943} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 25.616001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 23.170002} --- !u!212 &5394121589889874256 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_honey.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_honey.prefab index 3f4fa284..d39128b5 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_honey.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_honey.prefab @@ -333,7 +333,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3983476966405814090} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.44, y: 0.72, z: 0} + m_LocalPosition: {x: 0.54, y: 0.43, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: - {fileID: 3983476967628240554} @@ -449,7 +449,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3983476966571562207} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.689, y: -3.1301281, z: 0} + m_LocalPosition: {x: -1.5890001, y: -3.420128, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3983476966158335237} @@ -1268,7 +1268,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3983476967329912523} m_LocalRotation: {x: -0, y: -0, z: 0.24113074, w: 0.9704926} - m_LocalPosition: {x: -0.1999998, y: 0.09198761, z: 0} + m_LocalPosition: {x: -0.09999989, y: -0.19801235, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3983476967956574801} @@ -1466,7 +1466,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3983476967744647174} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.686, y: -2.866, z: 0} + m_LocalPosition: {x: -1.5860001, y: -3.156, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3983476966158335237}