diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_main_pencil.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_main_pencil.anim index 1e5bd760..1fad951d 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_main_pencil.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_main_pencil.anim @@ -109,23 +109,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: AnimationPivot_Blue/Blue/wing/right_Pencil - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0.08, 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: AnimationPivot_Blue/Blue/mouth + m_PositionCurves: [] m_ScaleCurves: - curve: serializedVersion: 2 @@ -460,13 +444,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 4034387391 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -927,63 +904,6 @@ AnimationClip: path: AnimationPivot_Blue/Blue/eye 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.x - path: AnimationPivot_Blue/Blue/mouth - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.08 - 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: AnimationPivot_Blue/Blue/mouth - 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: AnimationPivot_Blue/Blue/mouth - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_main_tired.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_main_tired.anim index 97dddeda..5c0b766f 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_main_tired.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_main_tired.anim @@ -126,22 +126,6 @@ AnimationClip: m_RotationOrder: 4 path: AnimationPivot_Blue/Blue/wing/right_c m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0.08, 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: AnimationPivot_Blue/Blue/mouth - curve: serializedVersion: 2 m_Curve: @@ -688,13 +672,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 4034387391 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 2251688353 attribute: 1 @@ -975,63 +952,6 @@ AnimationClip: path: AnimationPivot_Blue/Blue/eye/tired 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: AnimationPivot_Blue/Blue/mouth - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.08 - 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: AnimationPivot_Blue/Blue/mouth - 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: AnimationPivot_Blue/Blue/mouth - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body.png b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body.png index 28786753..2b4f0b05 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body.png and b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_b.png b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_b.png index 964f9fbc..7a833f51 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_b.png and b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_b.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_c.png b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_c.png index 67450608..c35684f8 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_c.png and b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_c.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 3da71ca6..dcb4cc0b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -494,7 +494,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 345743139} m_LocalRotation: {x: -0, y: -0, z: -0.0030166495, w: 0.99999547} - m_LocalPosition: {x: -0.612, y: -0.621, z: 0} + m_LocalPosition: {x: -0.67, y: -0.621, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 895514165} @@ -1476,7 +1476,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 552322376} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.084, z: 0} + m_LocalPosition: {x: 0, y: -0.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 456808379} @@ -1917,7 +1917,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 767719701} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.335, z: 0} + m_LocalPosition: {x: 0, y: 0.23100005, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1613525274} @@ -2382,7 +2382,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 943486953} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.07, z: 0} + m_LocalPosition: {x: 0, y: -0.06, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2124297504} @@ -5012,13 +5012,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2013092455} - m_LocalRotation: {x: -0, y: -0, z: -0.41421476, w: 0.9101792} - m_LocalPosition: {x: -0.637, y: -0.646, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0.34317738, w: 0.9392707} + m_LocalPosition: {x: -0.7, y: -0.68, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 895514165} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -48.940002} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -40.141003} --- !u!212 &2013092457 SpriteRenderer: m_ObjectHideFlags: 0 @@ -5251,7 +5251,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124297503} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.299, z: 0} + m_LocalPosition: {x: 0, y: 1.32, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 943486954}