diff --git a/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_AdvanceForward.anim b/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_AdvanceForward.anim index 0fdf8620..9cb7e165 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_AdvanceForward.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_AdvanceForward.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -7.360388, y: -1.164978, z: 0} + value: {x: -7.8, y: -1.164978, z: 0} inSlope: {x: -6.1807756, y: 12.682302, z: 0} outSlope: {x: 0, y: 12.682302, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.23473154, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: -7.360388, y: 0.2621523, z: 0} + value: {x: -7.8, y: 0.2621523, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.41666666 - value: {x: -7.360388, y: 0, z: 0} + value: {x: -7.8, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -47,7 +47,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5833333 - value: {x: -7.360388, y: 0, z: 0} + value: {x: -7.8, y: 0, z: 0} inSlope: {x: -0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -146,7 +146,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -7.360388 + value: -7.8 inSlope: -6.1807756 outSlope: 0 tangentMode: 5 @@ -155,7 +155,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5833333 - value: -7.360388 + value: -7.8 inSlope: -0 outSlope: 0 tangentMode: 5 @@ -218,6 +218,15 @@ AnimationClip: - 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.5833333 value: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Return.anim b/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Return.anim index 8dce2e99..0ab05298 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Return.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Return.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -7.360388, y: 0, z: 0} + value: {x: -7.8, y: 0, z: 0} inSlope: {x: -0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: -7.360388, y: -0.548996, z: 0} + value: {x: -7.8, y: -0.548996, z: 0} inSlope: {x: -0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -119,7 +119,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -7.360388 + value: -7.8 inSlope: -0 outSlope: 0 tangentMode: 5 @@ -128,7 +128,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: -7.360388 + value: -7.8 inSlope: -0 outSlope: 0 tangentMode: 5 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim b/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim index 1699bfac..40314cb5 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim @@ -90,7 +90,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -7.360388, y: 0, z: 0} + value: {x: -7.8, y: 0, z: 0} inSlope: {x: -0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -99,7 +99,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.41666666 - value: {x: -7.360388, y: 0, z: 0} + value: {x: -7.8, y: 0, z: 0} inSlope: {x: -0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -108,7 +108,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 2 - value: {x: -7.360388, y: 0, z: 0} + value: {x: -7.8, y: 0, z: 0} inSlope: {x: -0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -382,7 +382,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -7.360388 + value: -7.8 inSlope: -0 outSlope: 0 tangentMode: 5 @@ -391,7 +391,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.41666666 - value: -7.360388 + value: -7.8 inSlope: -0 outSlope: 0 tangentMode: 5 @@ -400,7 +400,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 2 - value: -7.360388 + value: -7.8 inSlope: -0 outSlope: 0 tangentMode: 5 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index a910a60b..a09ab861 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -5156,6 +5156,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1528220821} m_Modifications: + - target: {fileID: 1797334534591656309, guid: c8a1853c5a41447b09a68a46b13c92cb, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.57 + objectReference: {fileID: 0} - target: {fileID: 1797334534968956419, guid: c8a1853c5a41447b09a68a46b13c92cb, type: 3} propertyPath: m_Name