From 63fcfb1eeb59bf6736af0c75ac982a8cac6d15e1 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 3 Jun 2022 19:59:29 +0900 Subject: [PATCH] =?UTF-8?q?=E6=BC=94=E5=87=BA=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Animation/material_BlackPepper.anim | 8 +-- .../Animation/material_GratedCheese.anim | 8 +-- .../Resource/Animation/material_SoySauce.anim | 50 +++++++++---------- .../MyGame/Scenes/Cooking/Cooking.unity | 1 - 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.anim b/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.anim index 99c09efc..ad672928 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.anim @@ -19,7 +19,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: -10} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -91,7 +91,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.6666666 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: -10} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -507,7 +507,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -10 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -579,7 +579,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666666 - value: 0 + value: -10 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_GratedCheese.anim b/popcorn/Assets/MyGame/Resource/Animation/material_GratedCheese.anim index 6a938a90..d79df366 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_GratedCheese.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_GratedCheese.anim @@ -19,7 +19,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 10} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -55,7 +55,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.8333334 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 10} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -579,7 +579,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 10 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -615,7 +615,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.8333334 - value: 0 + value: 10 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim b/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim index fe5ac67e..e35b18a0 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.anim @@ -19,7 +19,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 10} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -55,7 +55,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.8333334 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 10} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -685,6 +685,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 - serializedVersion: 2 path: 187815291 attribute: 4 @@ -769,13 +776,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -970,7 +970,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 10 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1006,7 +1006,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.8333334 - value: 0 + value: 10 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -2005,7 +2005,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: + path: inside_f classID: 4 script: {fileID: 0} - curve: @@ -2015,17 +2015,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: + path: inside_f classID: 4 script: {fileID: 0} - curve: @@ -2038,6 +2028,16 @@ AnimationClip: path: inside_f classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: + classID: 4 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -2045,7 +2045,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: inside_f + path: classID: 4 script: {fileID: 0} - curve: @@ -2055,7 +2055,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: inside_f + path: classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 0605daab..73252feb 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -3794,7 +3794,6 @@ MonoBehaviour: m_EditorClassIdentifier: startDuration: 0.5 waitAction: 5 - toppingData: {fileID: 0} --- !u!4 &1549560953 stripped Transform: m_CorrespondingSourceObject: {fileID: 3304524446890359875, guid: b6962e1bf9c39435ba9957b90e6bf3ce,