diff --git a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_stay_back.anim b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_stay_back.anim index 3cc91fba..91452801 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_stay_back.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_stay_back.anim @@ -397,6 +397,25 @@ AnimationClip: path: NormalBody_side classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: NormalBody_FrontBack/Customer_order + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -482,6 +501,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3046951510 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2117826404 attribute: 1 @@ -1557,6 +1583,25 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/leg/right_front classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: NormalBody_FrontBack/Customer_order + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab index d293cc78..4fa6c54a 100644 --- a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab +++ b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab @@ -1184,7 +1184,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4886416729687176283} - - {fileID: 4886416729748261545} m_Father: {fileID: 4886416730379292501} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1392,12 +1391,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4886416729748261544} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.06, y: 2.401, z: 0} + m_LocalPosition: {x: 1.06, y: 1.35, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4886416730275037410} - {fileID: 4886416729808650664} - m_Father: {fileID: 4886416729300277785} + m_Father: {fileID: 4886416730379292501} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4886416729748261546 @@ -2113,7 +2112,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4886416730379292501} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4886416730229582017 SpriteRenderer: @@ -2451,6 +2450,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4886416729300277785} + - {fileID: 4886416729748261545} - {fileID: 4886416730229582016} m_Father: {fileID: 4886416728471897984} m_RootOrder: 0