diff --git a/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Seasoning_Salt.anim b/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Seasoning_Salt.anim index 36d10cb1..227ae176 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Seasoning_Salt.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Seasoning_Salt.anim @@ -204,7 +204,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.2 + time: 1.2833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -213,7 +213,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.2166667 + time: 1.3 value: 1 inSlope: Infinity outSlope: Infinity @@ -326,7 +326,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.2 + time: 1.2833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -335,7 +335,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.2166667 + time: 1.3 value: 1 inSlope: Infinity outSlope: Infinity diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.anim b/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.anim index df2d1256..9849d8ec 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.anim @@ -131,16 +131,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: 0.165, y: 1.4756885, z: 0} - inSlope: {x: -1.7325, y: 0, z: 0} - outSlope: {x: -1.7325, y: 0, z: 0} + value: {x: 0.0007620752, y: 1.7516742, z: 0} + inSlope: {x: -2.4715707, y: 0, z: 0} + outSlope: {x: -2.4715707, 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.6666667 - value: {x: -0.22, y: 0.97, z: 0} + value: {x: -0.54847586, y: 0.97, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -149,7 +149,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.4166666 - value: {x: -0.22, y: 0.97, z: 0} + value: {x: -0.54847586, y: 0.97, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -158,9 +158,9 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.8333334 - value: {x: 0.1650001, y: 1.5146557, z: 0} - inSlope: {x: 1.386, y: 0, z: 0} - outSlope: {x: 1.386, y: 0, z: 0} + value: {x: 0.0007621944, y: 1.750053, z: 0} + inSlope: {x: 1.9772565, y: 0, z: 0} + outSlope: {x: 1.9772565, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -612,7 +612,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: -0.22 + value: -0.54847586 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -621,7 +621,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.4166666 - value: -0.22 + value: -0.54847586 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -658,7 +658,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 1.4756885 + value: 1.7516742 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -685,7 +685,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.8333334 - value: 1.5146557 + value: 1.750053 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.anim b/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.anim index 4db7731a..9e31ad5f 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.anim @@ -43,7 +43,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: 0.75 + time: 0.9166667 value: {x: 0, y: 0, z: -57.601} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -52,7 +52,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: 0.8333333 + time: 1 value: {x: 0, y: 0, z: -76.88219} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -61,7 +61,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.1666666 + time: 1.3333334 value: {x: 0, y: 0, z: -57.601} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -86,7 +86,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: 0.33333334 + time: 0.5 value: {x: 0, y: 0, z: 38.210003} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -95,7 +95,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.6666666 + time: 1.8333334 value: {x: 0, y: 0, z: 38.210003} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -104,7 +104,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 2.1666667 + time: 2.5166667 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -145,26 +145,26 @@ 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.6666667 - value: {x: 0, y: 3.24, 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.75 - value: {x: 0, y: 3.24, 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.8333333 + value: {x: 0, y: 3.24, 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.9166667 + value: {x: 0, y: 3.24, 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 value: {x: 0.059999585, y: 3.4500003, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -173,7 +173,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.0833334 + time: 1.25 value: {x: 0, y: 3.24, z: 0} inSlope: {x: 0, y: -1.2600017, z: 0} outSlope: {x: 0, y: -1.2600017, z: 0} @@ -182,7 +182,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.5 + time: 1.6666666 value: {x: 0, y: 0.88, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -206,35 +206,35 @@ 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.41666666 - value: {x: -0.76, y: 2.2165265, z: 0} - inSlope: {x: -0.10666657, y: 4.069533, z: 0} - outSlope: {x: -0.10666657, y: 4.069533, 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.5833333 - value: {x: -0.76644444, y: 2.81, z: 0} - inSlope: {x: -0.015333295, y: 2.0800016, z: 0} - outSlope: {x: -0.015333295, y: 2.0800016, 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.6666667 - value: {x: -0.7695416, y: 2.94, z: 0} - inSlope: {x: -0.07016658, y: 0, z: 0} - outSlope: {x: -0.07016658, y: 0, z: 0} + 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} 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.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} + 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.7692386, y: 2.94, z: 0} + inSlope: {x: -0.07622766, y: 0, z: 0} + outSlope: {x: -0.07622766, 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.9166667 value: {x: -0.78, y: 2.94, z: 0} inSlope: {x: -0.19199981, y: 0, z: 0} outSlope: {x: -0.19199981, y: 0, z: 0} @@ -243,7 +243,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: 0.8333333 + time: 1 value: {x: -0.98, y: 3.59, z: 0} inSlope: {x: -3.1829107, y: 4.501579, z: 0} outSlope: {x: -3.1829107, y: 4.501579, z: 0} @@ -252,17 +252,17 @@ AnimationClip: inWeight: {x: 1, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.9166667 - value: {x: -1.3428657, y: 3.7775657, z: 0} - inSlope: {x: -5.4012794, y: 0, z: 0} - outSlope: {x: -5.4012794, y: 0, z: 0} + time: 1.0833334 + value: {x: -1.3428658, y: 3.7775657, z: 0} + inSlope: {x: -5.40128, y: 0, z: 0} + outSlope: {x: -5.40128, 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 - value: {x: -1.8594495, y: 3.6782126, z: 0} + time: 1.1666666 + value: {x: -1.8594491, y: 3.6782126, z: 0} inSlope: {x: -6.872152, y: -2.3043666, z: 0} outSlope: {x: -6.872152, y: -2.3043666, z: 0} tangentMode: 0 @@ -270,16 +270,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 1, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.5 - value: {x: -4.6987295, y: 1.3380215, z: 0} - inSlope: {x: 0, y: -3.8162444, z: 0} - outSlope: {x: 0, y: -3.8162444, z: 0} + time: 1.6666666 + value: {x: -4.6987295, y: 1.338022, z: 0} + inSlope: {x: 0, y: -3.8162436, z: 0} + outSlope: {x: 0, y: -3.8162436, 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.6666666 + time: 1.8333334 value: {x: -4.6987295, y: 0.99, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -304,7 +304,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: 0.33333334 + time: 0.5 value: {x: 0.52, y: -2.34, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -313,7 +313,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.6666666 + time: 1.8333334 value: {x: 0.52, y: -2.34, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -322,7 +322,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 2.1666667 + time: 2.5166667 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -348,7 +348,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.1666666 + time: 1.3333334 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -357,7 +357,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.45 + time: 1.6166667 value: {x: 1.4566, y: 1.247581, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -366,7 +366,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.6666666 + time: 1.8333334 value: {x: 1.4566, y: 1.247581, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -392,7 +392,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.33333334 + time: 0.5 value: 1 inSlope: Infinity outSlope: Infinity @@ -401,7 +401,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: 1 inSlope: Infinity outSlope: Infinity @@ -410,7 +410,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 2.1666667 + time: 2.5166667 value: 0 inSlope: Infinity outSlope: Infinity @@ -438,16 +438,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.33333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.5 + time: 0.5 value: 0 inSlope: Infinity outSlope: Infinity @@ -465,8 +456,8 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 2.1666667 - value: 1 + time: 1.8333334 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -502,7 +493,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 + time: 1.3333334 value: 1 inSlope: 0 outSlope: 0 @@ -511,7 +502,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5 + time: 1.6666666 value: 0 inSlope: 0 outSlope: 0 @@ -520,7 +511,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: 0 inSlope: 0 outSlope: 0 @@ -769,7 +760,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.33333334 + time: 0.5 value: 1 inSlope: Infinity outSlope: Infinity @@ -778,7 +769,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: 1 inSlope: Infinity outSlope: Infinity @@ -787,7 +778,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 2.1666667 + time: 2.5166667 value: 0 inSlope: Infinity outSlope: Infinity @@ -815,16 +806,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.33333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.5 + time: 0.5 value: 0 inSlope: Infinity outSlope: Infinity @@ -842,8 +824,8 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 2.1666667 - value: 1 + time: 1.8333334 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -878,26 +860,26 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + 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.059999585 inSlope: 0 outSlope: 0 @@ -906,7 +888,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0833334 + time: 1.25 value: 0 inSlope: 0 outSlope: 0 @@ -915,7 +897,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5 + time: 1.6666666 value: 0 inSlope: 0 outSlope: 0 @@ -942,26 +924,26 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: 3.24 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 3.24 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 + value: 3.24 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 3.24 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 3.4500003 inSlope: 0 outSlope: 0 @@ -970,7 +952,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0833334 + time: 1.25 value: 3.24 inSlope: -1.2600017 outSlope: -1.2600017 @@ -979,7 +961,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5 + time: 1.6666666 value: 0.88 inSlope: 0 outSlope: 0 @@ -1006,24 +988,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 value: 0 @@ -1034,7 +998,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0833334 + time: 0.9166667 value: 0 inSlope: 0 outSlope: 0 @@ -1043,7 +1007,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.6666666 value: 0 inSlope: 0 outSlope: 0 @@ -1071,16 +1053,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.5833333 value: -0.76 - inSlope: -0.10666657 - outSlope: -0.10666657 + inSlope: -0.087272644 + outSlope: -0.087272644 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.9166667 value: -0.78 inSlope: -0.19199981 outSlope: -0.19199981 @@ -1089,7 +1071,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 + time: 1 value: -0.98 inSlope: -3.1829107 outSlope: -3.1829107 @@ -1098,7 +1080,7 @@ AnimationClip: inWeight: 1 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5 + time: 1.6666666 value: -4.6987295 inSlope: 0 outSlope: 0 @@ -1107,7 +1089,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: -4.6987295 inSlope: 0 outSlope: 0 @@ -1134,35 +1116,26 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: 2.2165265 - inSlope: 4.069533 - outSlope: 4.069533 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.5833333 - value: 2.81 - inSlope: 2.0800016 - outSlope: 2.0800016 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: 2.94 - inSlope: 0 - outSlope: 0 + value: 2.2165265 + inSlope: 3.165192 + outSlope: 3.165192 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.75 + value: 2.81 + inSlope: 2.0800018 + outSlope: 2.0800018 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 value: 2.94 inSlope: 0 outSlope: 0 @@ -1170,18 +1143,9 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: 3.59 - inSlope: 4.501579 - outSlope: 4.501579 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.9166667 - value: 3.7775657 + value: 2.94 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1190,6 +1154,24 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 + value: 3.59 + inSlope: 4.501579 + outSlope: 4.501579 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0833334 + value: 3.7775657 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1666666 value: 3.6782126 inSlope: -2.3043666 outSlope: -2.3043666 @@ -1198,7 +1180,7 @@ AnimationClip: inWeight: 1 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: 0.99 inSlope: 0 outSlope: 0 @@ -1245,7 +1227,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.9166667 value: 0 inSlope: 0 outSlope: 0 @@ -1254,7 +1236,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1263,7 +1245,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 + time: 1.3333334 value: 0 inSlope: 0 outSlope: 0 @@ -1291,7 +1273,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.9166667 value: 0 inSlope: 0 outSlope: 0 @@ -1300,7 +1282,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1309,7 +1291,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 + time: 1.3333334 value: 0 inSlope: 0 outSlope: 0 @@ -1337,7 +1319,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.9166667 value: -57.601 inSlope: 0 outSlope: 0 @@ -1346,7 +1328,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 + time: 1 value: -76.88219 inSlope: 0 outSlope: 0 @@ -1355,7 +1337,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 + time: 1.3333334 value: -57.601 inSlope: 0 outSlope: 0 @@ -1383,7 +1365,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 + time: 1.3333334 value: 1 inSlope: 0 outSlope: 0 @@ -1392,7 +1374,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5 + time: 1.6666666 value: 0 inSlope: 0 outSlope: 0 @@ -1401,7 +1383,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: 0 inSlope: 0 outSlope: 0 @@ -1429,7 +1411,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 + time: 1.3333334 value: 1 inSlope: 0 outSlope: 0 @@ -1438,7 +1420,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.45 + time: 1.6166667 value: 1.4566 inSlope: 0 outSlope: 0 @@ -1466,7 +1448,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 + time: 1.3333334 value: 1 inSlope: 0 outSlope: 0 @@ -1475,7 +1457,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.45 + time: 1.6166667 value: 1.247581 inSlope: 0 outSlope: 0 @@ -1503,7 +1485,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 + time: 1.3333334 value: 1 inSlope: 0 outSlope: 0 @@ -1512,7 +1494,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: 1 inSlope: 0 outSlope: 0 @@ -1540,7 +1522,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.5 value: 0.52 inSlope: 0 outSlope: 0 @@ -1549,7 +1531,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: 0.52 inSlope: 0 outSlope: 0 @@ -1558,7 +1540,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.1666667 + time: 2.5166667 value: 0 inSlope: 0 outSlope: 0 @@ -1586,7 +1568,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.5 value: -2.34 inSlope: 0 outSlope: 0 @@ -1595,7 +1577,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: -2.34 inSlope: 0 outSlope: 0 @@ -1604,7 +1586,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.1666667 + time: 2.5166667 value: 0 inSlope: 0 outSlope: 0 @@ -1632,7 +1614,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -1641,7 +1623,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: 0 inSlope: 0 outSlope: 0 @@ -1650,7 +1632,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.1666667 + time: 2.5166667 value: 0 inSlope: 0 outSlope: 0 @@ -1678,7 +1660,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -1687,7 +1669,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: 0 inSlope: 0 outSlope: 0 @@ -1696,7 +1678,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.1666667 + time: 2.5166667 value: 0 inSlope: 0 outSlope: 0 @@ -1724,7 +1706,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -1733,7 +1715,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: 0 inSlope: 0 outSlope: 0 @@ -1742,7 +1724,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.1666667 + time: 2.5166667 value: 0 inSlope: 0 outSlope: 0 @@ -1770,7 +1752,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.5 value: 38.210003 inSlope: 0 outSlope: 0 @@ -1779,7 +1761,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 1.8333334 value: 38.210003 inSlope: 0 outSlope: 0 @@ -1788,7 +1770,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.1666667 + time: 2.5166667 value: 0 inSlope: 0 outSlope: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim b/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim index 42980b13..e2dd0975 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim @@ -278,16 +278,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0.45486677, y: 1.3658292, z: 0} - inSlope: {x: -2.6823995, y: 0, z: 0} - outSlope: {x: -2.6823995, y: 0, z: 0} + 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} 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.6 - value: {x: -0.23361579, y: 0.42, z: 0} + value: {x: -0.5313616, y: 0.42, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -296,7 +296,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.3166667 - value: {x: -0.23361579, y: 0.42, z: 0} + value: {x: -0.5313616, y: 0.42, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -305,9 +305,9 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.75 - value: {x: 0.33441955, y: 1.4378207, z: 0} - inSlope: {x: 1.9468087, y: 0, z: 0} - outSlope: {x: 1.9468087, y: 0, z: 0} + 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} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -2211,7 +2211,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6 - value: -0.23361579 + value: -0.5313616 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -2220,7 +2220,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.3166667 - value: -0.23361579 + value: -0.5313616 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -2257,7 +2257,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 1.3658292 + value: 1.5350034 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim b/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim index 31eb7851..fdac52f9 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim @@ -109,7 +109,7 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: -7.8, y: 0, z: 0} - inSlope: {x: -0, y: 0, z: 0} + inSlope: {x: -1.3491658, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -356,6 +356,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2000748687 attribute: 1 @@ -391,13 +398,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 2458653248 attribute: 304273561 @@ -433,7 +433,7 @@ AnimationClip: - serializedVersion: 3 time: 0 value: -7.8 - inSlope: -0 + inSlope: -1.3491658 outSlope: 0 tangentMode: 5 weightedMode: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_GreenLaver.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_GreenLaver.prefab index d48b8d33..c41b8c0b 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_GreenLaver.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_GreenLaver.prefab @@ -252,7 +252,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7654310267968326443} m_LocalRotation: {x: -0.7491011, y: -0.5063468, z: 0.42714468, w: -0.0028031985} - m_LocalPosition: {x: -1.74, y: 0.93, z: 0.06} + m_LocalPosition: {x: -1.79, y: 0.38, z: 0.06} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7654310267302938657} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_SkimSilk.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_SkimSilk.prefab index fc7eaf50..5aab38fd 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_SkimSilk.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_SkimSilk.prefab @@ -435,7 +435,7 @@ Transform: m_GameObject: {fileID: 6178100819148698326} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6178100819463514148} - {fileID: 6178100819223801599} @@ -5250,8 +5250,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6178100819463514149} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.45, y: 1.11, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_LocalPosition: {x: 0.45, y: 0.84, z: 0} + m_LocalScale: {x: 0.75008696, y: 0.75008696, z: 0.75008696} m_Children: - {fileID: 6178100818886305487} - {fileID: 6178100818526358042} 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 4e126429..8f8d3c39 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_SoySauce.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_SoySauce.prefab @@ -189,7 +189,7 @@ Transform: m_GameObject: {fileID: 7320563079046373319} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7320563080363823678} - {fileID: 7320563078818934370} @@ -657,7 +657,7 @@ Transform: 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_LocalScale: {x: 0.90586, y: 0.90586, z: 0.90586} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: - {fileID: 7320563080627706948} m_Father: {fileID: 7320563079046373316} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_StrawberryPowder.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_StrawberryPowder.prefab index da0acb08..98f401f5 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_StrawberryPowder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_StrawberryPowder.prefab @@ -23,15 +23,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1797334534591656308} - m_LocalRotation: {x: -0, y: -0, z: 0.0105720395, w: 0.99994415} - m_LocalPosition: {x: 0.49, y: 0.97, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.47, y: 0.9, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1797334534632597764} - {fileID: 1797334536340312261} m_Father: {fileID: 1797334534968956420} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 1.2110001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1797334534632597763 GameObject: m_ObjectHideFlags: 0 @@ -203,7 +203,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1797334536051242744} m_LocalRotation: {x: -0.7738057, y: -0.46772274, z: 0.4267375, w: 0.01885305} - m_LocalPosition: {x: -1.84, y: 0.67, z: 0.06} + m_LocalPosition: {x: -1.8, y: 0.14, z: 0.06} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1797334534968956420} 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 fb5bcf2b..3f4fa284 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_honey.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_honey.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 3983476966158335238} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3983476966405814089} - {fileID: 3983476967329912522} @@ -334,7 +334,7 @@ Transform: 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_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: - {fileID: 3983476967628240554} - {fileID: 3983476967105718824}