diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_conversation_Sweat.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_conversation_Sweat.anim index 02fb5c44..96c0bf4d 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_conversation_Sweat.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_conversation_Sweat.anim @@ -424,15 +424,6 @@ AnimationClip: outWeight: 0 - serializedVersion: 3 time: 4 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 4.016667 value: 1 inSlope: Infinity outSlope: Infinity @@ -461,15 +452,6 @@ AnimationClip: outWeight: 0 - serializedVersion: 3 time: 4 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 4.016667 value: 0 inSlope: Infinity outSlope: Infinity @@ -690,7 +672,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 4.016667 + m_StopTime: 4 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -1484,15 +1466,6 @@ AnimationClip: outWeight: 0 - serializedVersion: 3 time: 4 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 4.016667 value: 1 inSlope: Infinity outSlope: Infinity @@ -1521,15 +1494,6 @@ AnimationClip: outWeight: 0 - serializedVersion: 3 time: 4 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 4.016667 value: 0 inSlope: Infinity outSlope: Infinity diff --git a/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity b/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity index 0f8cac83..a839c697 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity @@ -1092,7 +1092,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &260681351 Transform: m_ObjectHideFlags: 0