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 c4ac93aa..8747b600 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_stay_back.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_stay_back.anim @@ -517,7 +517,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -687,7 +687,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -767,6 +767,44 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/glasses classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_behind_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_beside_boy + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -943,6 +981,20 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3166419053 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 26320838 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2117826404 attribute: 1 @@ -2084,7 +2136,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2482,7 +2534,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2676,6 +2728,44 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/glasses classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_behind_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_beside_boy + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_back.anim b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_back.anim index 10729c86..1f19e836 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_back.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_back.anim @@ -830,7 +830,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -982,7 +982,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1062,6 +1062,63 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/glasses 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/AnimationPivot/normal/decoration/Blue_Previous_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_behind_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_beside_boy + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -1287,6 +1344,27 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1979265170 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3166419053 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 26320838 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3641428209 attribute: 1 @@ -3334,7 +3412,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3714,7 +3792,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3908,6 +3986,63 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/glasses 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/AnimationPivot/normal/decoration/Blue_Previous_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_behind_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_beside_boy + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_front.anim b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_front.anim index 4cb572ec..9fbe4fd2 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_front.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_front.anim @@ -762,7 +762,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -828,7 +828,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -842,6 +842,63 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/Blue_Previous classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_beside_boy + 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/AnimationPivot/normal/decoration/Blue_behind_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_Previous_boy + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -997,6 +1054,27 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 26320838 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3166419053 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1979265170 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 639644667 attribute: 1 @@ -3039,7 +3117,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3276,7 +3354,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3290,6 +3368,63 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/Blue_Previous classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_beside_boy + 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/AnimationPivot/normal/decoration/Blue_behind_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_Previous_boy + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_front_eat.anim b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_front_eat.anim index e92be081..9231de98 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_front_eat.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_front_eat.anim @@ -871,7 +871,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -928,7 +928,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -942,6 +942,63 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/Blue_Previous classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_beside_boy + 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/AnimationPivot/normal/decoration/Blue_behind_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_Previous_boy + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -1104,6 +1161,27 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 26320838 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3166419053 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1979265170 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 943256095 attribute: 1 @@ -3255,7 +3333,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3483,7 +3561,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3497,6 +3575,63 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/Blue_Previous classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_beside_boy + 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/AnimationPivot/normal/decoration/Blue_behind_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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/AnimationPivot/normal/decoration/Blue_Previous_boy + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side.anim b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side.anim index d0490be5..af8d490f 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side.anim @@ -275,38 +275,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: NormalBody_side/AnimationPivot/normal/leg/right_back - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -0.139, y: 0.956, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: NormalBody_side/AnimationPivot/normal/decoration/Blue_beside - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: NormalBody_side/AnimationPivot/normal/decoration - curve: serializedVersion: 2 m_Curve: @@ -492,9 +460,28 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_FlipX - path: NormalBody_side/AnimationPivot/normal/decoration/Blue_beside - classID: 212 + attribute: m_IsActive + path: NormalBody_side/AnimationPivot/normal/decoration/Beard_a_Previous + 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_side/AnimationPivot/normal/decoration/Blue_beside_boy + classID: 1 script: {fileID: 0} - curve: serializedVersion: 2 @@ -512,7 +499,26 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: NormalBody_side/AnimationPivot/normal/decoration/Beard_a_Previous + path: NormalBody_side/AnimationPivot/normal/decoration/Blue_Previous_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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_side/AnimationPivot/normal/decoration/Blue_behind_boy classID: 1 script: {fileID: 0} m_PPtrCurves: [] @@ -593,13 +599,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1371562689 - attribute: 555744692 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 3975929729 attribute: 2086281974 @@ -608,17 +607,24 @@ AnimationClip: customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 1371562689 - attribute: 1 + path: 1626423639 + attribute: 2086281974 script: {fileID: 0} - typeID: 4 + typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2341156917 - attribute: 1 + path: 2093487482 + attribute: 2086281974 script: {fileID: 0} - typeID: 4 + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3722143484 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 @@ -1817,82 +1823,6 @@ AnimationClip: path: NormalBody_side/AnimationPivot/normal/decoration/Blue_behind classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_FlipX - path: NormalBody_side/AnimationPivot/normal/decoration/Blue_beside - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.139 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: NormalBody_side/AnimationPivot/normal/decoration/Blue_beside - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.956 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: NormalBody_side/AnimationPivot/normal/decoration/Blue_beside - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: NormalBody_side/AnimationPivot/normal/decoration/Blue_beside - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1912,63 +1842,6 @@ AnimationClip: path: NormalBody_side/AnimationPivot/normal/decoration/Beard_a_Previous classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: NormalBody_side/AnimationPivot/normal/decoration - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: NormalBody_side/AnimationPivot/normal/decoration - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: NormalBody_side/AnimationPivot/normal/decoration - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -2026,6 +1899,63 @@ AnimationClip: path: NormalBody_side/AnimationPivot/normal/decoration/hat 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_side/AnimationPivot/normal/decoration/Blue_beside_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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_side/AnimationPivot/normal/decoration/Blue_Previous_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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_side/AnimationPivot/normal/decoration/Blue_behind_boy + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side_eat.anim b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side_eat.anim index 1bfc5cf8..0e51ebc3 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side_eat.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side_eat.anim @@ -339,7 +339,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.139, y: 0.956, z: 0} + value: {x: 0.113, y: 0.956, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -813,6 +813,44 @@ AnimationClip: path: NormalBody_side/AnimationPivot/normal/decoration/Beard_a_Previous classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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_side/AnimationPivot/normal/decoration/Blue_behind_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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_side/AnimationPivot/normal/decoration/Blue_Previous_boy + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -947,6 +985,20 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3722143484 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2093487482 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 976976767 attribute: 1 @@ -2622,7 +2674,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.139 + value: 0.113 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -2807,6 +2859,44 @@ AnimationClip: path: NormalBody_side/AnimationPivot/normal/decoration/hat classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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_side/AnimationPivot/normal/decoration/Blue_behind_boy + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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_side/AnimationPivot/normal/decoration/Blue_Previous_boy + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Decoration/Customer_b_decoration_cap_Blue_beside.png b/popcorn/Assets/MyGame/Resource/Material/Customer/Decoration/Customer_b_decoration_cap_Blue_beside.png index 16053ccf..c7a71f68 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Customer/Decoration/Customer_b_decoration_cap_Blue_beside.png and b/popcorn/Assets/MyGame/Resource/Material/Customer/Decoration/Customer_b_decoration_cap_Blue_beside.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Customer/Decoration/Customer_b_decoration_cap_Brown_beside.png b/popcorn/Assets/MyGame/Resource/Material/Customer/Decoration/Customer_b_decoration_cap_Brown_beside.png index f2991962..4bf3bf68 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Customer/Decoration/Customer_b_decoration_cap_Brown_beside.png and b/popcorn/Assets/MyGame/Resource/Material/Customer/Decoration/Customer_b_decoration_cap_Brown_beside.png differ diff --git a/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_LightBlue.prefab b/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_LightBlue.prefab index 219125e8..cfe34575 100644 --- a/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_LightBlue.prefab +++ b/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_LightBlue.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4778961819742410224} - component: {fileID: 3359655993273838623} m_Layer: 0 - m_Name: Blue_behind + m_Name: Blue_behind_boy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -125,7 +125,7 @@ GameObject: - component: {fileID: 7135295202498048657} - component: {fileID: 6438397854112066445} m_Layer: 0 - m_Name: Blue_beside + m_Name: Blue_beside_boy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -206,7 +206,7 @@ GameObject: - component: {fileID: 484030178927504762} - component: {fileID: 6645063960983947009} m_Layer: 0 - m_Name: Blue_Previous + m_Name: Blue_Previous_boy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -287,7 +287,7 @@ GameObject: - component: {fileID: 2231428607318945097} - component: {fileID: 4703085674721892823} m_Layer: 0 - m_Name: Blue_beside + m_Name: Blue_beside_boy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -368,7 +368,7 @@ GameObject: - component: {fileID: 3660405908602654176} - component: {fileID: 4037506710791449229} m_Layer: 0 - m_Name: Blue_behind + m_Name: Blue_behind_boy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -449,7 +449,7 @@ GameObject: - component: {fileID: 9093639618464825213} - component: {fileID: 6959736154458539640} m_Layer: 0 - m_Name: Blue_Previous + m_Name: Blue_Previous_boy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0