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 0a343d76..c4ac93aa 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_stay_back.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_stay_back.anim @@ -663,25 +663,6 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/Cheeks 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 - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -758,6 +739,34 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/headphone classID: 212 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 + - serializedVersion: 3 + time: 1 + 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/glasses + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -899,13 +908,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1876538255 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 943256095 attribute: 2086281974 @@ -934,6 +936,13 @@ AnimationClip: typeID: 212 customType: 26 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2607760651 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2117826404 attribute: 1 @@ -2335,25 +2344,6 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/Cheeks 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 - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -2658,6 +2648,34 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/headphone classID: 212 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 + - serializedVersion: 3 + time: 1 + 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/glasses + 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 3c6ae63e..10729c86 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_back.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_back.anim @@ -958,25 +958,6 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/Cheeks 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 - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1053,6 +1034,34 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/headphone classID: 212 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 + - serializedVersion: 3 + time: 1 + 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/glasses + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -1243,13 +1252,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1876538255 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 943256095 attribute: 2086281974 @@ -1278,6 +1280,13 @@ AnimationClip: typeID: 212 customType: 26 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2607760651 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3641428209 attribute: 1 @@ -3567,25 +3576,6 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/Cheeks 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 - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -3890,6 +3880,34 @@ AnimationClip: path: NormalBody_FrontBack/AnimationPivot/normal/decoration/headphone classID: 212 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 + - serializedVersion: 3 + time: 1 + 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/glasses + 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 9c6d1698..ac079481 100644 --- a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab +++ b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab @@ -5348,6 +5348,7 @@ GameObject: - component: {fileID: 8951347046735010126} - component: {fileID: 7213583640106143312} - component: {fileID: 9050575574056621052} + - component: {fileID: 2153250242167548933} m_Layer: 0 m_Name: customer_normal m_TagString: Untagged @@ -5469,6 +5470,32 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 2, y: 2} m_EdgeRadius: 0 +--- !u!114 &2153250242167548933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886416728471897999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &4886416728477582529 GameObject: m_ObjectHideFlags: 0