diff --git a/popcorn/Assets/MyGame/Resource/Animation/popcorn_package.anim b/popcorn/Assets/MyGame/Resource/Animation/popcorn_package.anim index df69665a..8426a255 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/popcorn_package.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/popcorn_package.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.39, z: 0} + value: {x: -0.4, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,15 +29,6 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: 0, y: -0.032, 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.25 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -71,15 +62,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.25 - value: {x: 1, y: 1, z: 1} - 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 @@ -148,7 +130,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.16666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -169,7 +151,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -0.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -185,15 +167,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - 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 @@ -206,7 +179,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.39 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -215,15 +188,6 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: -0.032 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -259,15 +223,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - 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 @@ -324,15 +279,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -361,15 +307,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -398,15 +335,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 1 - 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/Scenes/Cooking/Prefabs/old.meta b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/old.meta new file mode 100644 index 00000000..611831cd --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/old.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e99ef633deb94254b822c70bcbc3b6fd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/FailurecMeter.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/old/FailurecMeter.prefab similarity index 100% rename from popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/FailurecMeter.prefab rename to popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/old/FailurecMeter.prefab diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/FailurecMeter.prefab.meta b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/old/FailurecMeter.prefab.meta similarity index 100% rename from popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/FailurecMeter.prefab.meta rename to popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/old/FailurecMeter.prefab.meta diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/MissTextEffect.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/old/MissTextEffect.prefab similarity index 100% rename from popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/MissTextEffect.prefab rename to popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/old/MissTextEffect.prefab diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/MissTextEffect.prefab.meta b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/old/MissTextEffect.prefab.meta similarity index 100% rename from popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/MissTextEffect.prefab.meta rename to popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/old/MissTextEffect.prefab.meta