From 6b44813ea5ebf6a1c84ece8c10c4e3862d91895e Mon Sep 17 00:00:00 2001 From: hirokei Date: Thu, 11 Nov 2021 14:14:14 +0900 Subject: [PATCH] =?UTF-8?q?=E5=85=84=E5=BC=9F=E3=83=87=E3=82=B6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=80=81Main=E6=BC=94=E5=87=BA=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Brother/Brother_blue_main_pencil.anim | 678 +------- .../Brother/Brother_blue_main_tired.anim | 1429 +++++++---------- .../Main_conversation_Blue_wing_b.png.meta | 2 +- .../Brother/Main_conversation_Blue_wing_c.png | Bin 1859 -> 1917 bytes .../Main_conversation_Blue_wing_c.png.meta | 2 +- .../Main_conversation_Blue_wing_mat.png | Bin 0 -> 1532 bytes .../Main_conversation_Blue_wing_mat.png.meta | 92 ++ .../Main_conversation_Blue_wing_stretch.png | Bin 0 -> 2138 bytes ...in_conversation_Blue_wing_stretch.png.meta | 92 ++ .../Brother/Main_conversation_ef_tired.png | Bin 0 -> 1777 bytes .../Main_conversation_ef_tired.png.meta | 92 ++ ...ain_conversation_pink_body_beside_wing.png | Bin 4098 -> 3895 bytes ...onversation_pink_body_beside_wing.png.meta | 4 +- .../MyGame/Resource/Material/Brother/c.png | Bin 0 -> 4098 bytes .../Resource/Material/Brother/c.png.meta | 92 ++ .../marketing_salesclerk_pink_sleepy.png | Bin 981 -> 3182 bytes .../marketing_salesclerk_pink_wing.png | Bin 3392 -> 3710 bytes .../marketing_salesclerk_pink_wing_a.png | Bin 3339 -> 3214 bytes popcorn/Assets/MyGame/Scenes/Main/Main.unity | 392 ++++- .../marketing/Prefabs/Brother_pink.prefab | 4 +- .../MyGame/Scenes/marketing/marketing.unity | 5 + 21 files changed, 1326 insertions(+), 1558 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_mat.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_mat.png.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_stretch.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_stretch.png.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_tired.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_tired.png.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/c.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/c.png.meta 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 183d82f6..1e5bd760 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 @@ -57,74 +57,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: AnimationPivot_Blue/Blue/mouth/down - - 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.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 5 - 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.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: AnimationPivot_Blue/Blue/wing/left - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: -1, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.7333333 - value: {x: -0.060000002, y: -0.99700004, z: -3.404} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 4 - value: {x: 0.044000003, y: -0.9990001, z: 2.5010002} - inSlope: {x: 0, y: -0.00091835554, z: 0} - outSlope: {x: 0, y: -0.00091835554, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 5 - value: {x: 0, y: -1, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: AnimationPivot_Blue/Blue/wing/right - curve: serializedVersion: 2 m_Curve: @@ -194,58 +126,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: AnimationPivot_Blue/Blue/mouth - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 2 - value: {x: 0.873, y: -0.81, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 3 - value: {x: 0.85, y: -0.8, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 3.5 - value: {x: 0.873, y: -0.81, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 4 - value: {x: 0.85, y: -0.8, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 5 - value: {x: 0.873, y: -0.81, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: AnimationPivot_Blue/Blue/wing/right_Pencil m_ScaleCurves: - curve: serializedVersion: 2 @@ -388,25 +268,6 @@ AnimationClip: m_RotationOrder: 4 path: AnimationPivot_Blue/Blue/eye m_FloatCurves: - - 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: AnimationPivot_Blue/Blue/wing/right - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -502,6 +363,25 @@ AnimationClip: path: AnimationPivot_Blue/Blue/wing/right_c 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: AnimationPivot_Blue/Blue/wing/left_c + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -510,13 +390,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 4222620993 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 3148046598 attribute: 4 @@ -524,13 +397,6 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 - - serializedVersion: 2 - path: 2437803436 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 - serializedVersion: 2 path: 4222620993 attribute: 4 @@ -552,13 +418,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 2437803436 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 3066665537 attribute: 2086281974 @@ -594,6 +453,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 4271125427 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 4034387391 attribute: 1 @@ -601,13 +467,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 2452488154 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -1263,412 +1122,6 @@ AnimationClip: path: AnimationPivot_Blue/Blue/mouth/down 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: AnimationPivot_Blue/Blue/wing/left - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: AnimationPivot_Blue/Blue/wing/left - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: AnimationPivot_Blue/Blue/wing/left - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.7333333 - value: -0.060000002 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4 - value: 0.044000003 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: AnimationPivot_Blue/Blue/wing/right - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.7333333 - value: -0.99700004 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4 - value: -0.9990001 - inSlope: -0.00091835554 - outSlope: -0.00091835554 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: -1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: AnimationPivot_Blue/Blue/wing/right - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.7333333 - value: -3.404 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4 - value: 2.5010002 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: AnimationPivot_Blue/Blue/wing/right - 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: AnimationPivot_Blue/Blue/wing/right - classID: 1 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 2 - value: 0.873 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3 - value: 0.85 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.5 - value: 0.873 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4 - value: 0.85 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0.873 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: AnimationPivot_Blue/Blue/wing/right_Pencil - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 2 - value: -0.81 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3 - value: -0.8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.5 - value: -0.81 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4 - value: -0.8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: -0.81 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: AnimationPivot_Blue/Blue/wing/right_Pencil - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: AnimationPivot_Blue/Blue/wing/right_Pencil - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1929,6 +1382,25 @@ AnimationClip: path: AnimationPivot_Blue/Blue/wing/right_c 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: AnimationPivot_Blue/Blue/wing/left_c + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -1960,66 +1432,6 @@ AnimationClip: path: AnimationPivot_Blue/Blue/mouth/down classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: AnimationPivot_Blue/Blue/wing/right - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: AnimationPivot_Blue/Blue/wing/right - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: AnimationPivot_Blue/Blue/wing/right - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: AnimationPivot_Blue/Blue/wing/left - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: AnimationPivot_Blue/Blue/wing/left - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: AnimationPivot_Blue/Blue/wing/left - 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 681e31bf..97dddeda 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 @@ -62,7 +62,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: -0.34600002} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -70,24 +70,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 5 - 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.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: AnimationPivot_Blue/Blue/wing/left - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: -1, z: 0} + time: 2.5 + value: {x: 0, y: 0, z: -8.373} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -95,94 +79,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 5 - value: {x: 0, y: -1, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: AnimationPivot_Blue/Blue/wing/right - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: -7.201} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.5 - value: {x: 0, y: 0, z: -11.527} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 3.0166667 - value: {x: 0, y: 0, z: -11.527} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 4.516667 - value: {x: 0, y: 0, z: -7.201} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: AnimationPivot_Blue/Blue/wing/right_c - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 7.3830004} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.5 - value: {x: 0, y: 0, z: 11.950001} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 3.0166667 - value: {x: 0, y: 0, z: 11.950001} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 4.516667 - value: {x: 0, y: 0, z: 7.3830004} + time: 5.016667 + value: {x: 0, y: 0, z: -0.34600002} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -193,6 +91,40 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: AnimationPivot_Blue/Blue/wing/left_c + - 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.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2.5 + value: {x: 0, y: 0, z: 10.751} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 5.016667 + 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.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: AnimationPivot_Blue/Blue/wing/right_c m_PositionCurves: - curve: serializedVersion: 2 @@ -215,87 +147,17 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.935, y: -0.771, z: 0} + value: {x: 0, y: 1.12, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.5 - value: {x: 0.936, y: -0.753, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 3.0166667 - value: {x: 0.936, y: -0.753, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 4.516667 - value: {x: 0.935, y: -0.771, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + 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/wing/right_c - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -0.98, y: -0.782, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.5 - value: {x: -0.985, y: -0.758, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 3.0166667 - value: {x: -0.985, y: -0.758, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 4.516667 - value: {x: -0.98, y: -0.782, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: AnimationPivot_Blue/Blue/wing/left_c + path: AnimationPivot_Blue/Blue m_ScaleCurves: - curve: serializedVersion: 2 @@ -353,7 +215,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -424,25 +286,6 @@ AnimationClip: path: AnimationPivot_Blue/Blue/eye/tired 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: AnimationPivot_Blue/Blue/wing/right - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -538,6 +381,158 @@ AnimationClip: path: AnimationPivot_Blue/Blue/body 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: AnimationPivot_Blue/Blue/ef/Tired + 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: AnimationPivot_Blue/Blue/wing/right_mat_p + 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: AnimationPivot_Blue/Blue/wing/left_mat_p + 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: AnimationPivot_Blue/Blue/wing/right_mat_t + 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: AnimationPivot_Blue/Blue/wing/left_mat_t + 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: AnimationPivot_Blue/Blue/wing/left_c_p + 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: AnimationPivot_Blue/Blue/wing/right_c + 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: AnimationPivot_Blue/Blue/wing/left_c + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -546,20 +541,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 1950916587 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 4271125427 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 3148046598 attribute: 4 @@ -568,14 +549,14 @@ AnimationClip: customType: 4 isPPtrCurve: 0 - serializedVersion: 2 - path: 1950916587 + path: 4271125427 attribute: 4 script: {fileID: 0} typeID: 4 customType: 4 isPPtrCurve: 0 - serializedVersion: 2 - path: 4271125427 + path: 1950916587 attribute: 4 script: {fileID: 0} typeID: 4 @@ -616,13 +597,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 2437803436 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 4222620993 attribute: 2086281974 @@ -658,6 +632,62 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1551991817 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3150530796 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1173498760 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3164900597 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1117777809 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1556562081 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1950916587 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4271125427 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 4034387391 attribute: 1 @@ -666,18 +696,11 @@ AnimationClip: customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2452488154 - attribute: 4 + path: 2251688353 + attribute: 1 script: {fileID: 0} typeID: 4 - customType: 4 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 2437803436 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 + customType: 0 isPPtrCurve: 0 - serializedVersion: 2 path: 602786904 @@ -692,7 +715,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 5 + m_StopTime: 5.016667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -824,7 +847,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1147,193 +1170,6 @@ AnimationClip: path: AnimationPivot_Blue/Blue/mouth/down 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: AnimationPivot_Blue/Blue/wing/left - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: AnimationPivot_Blue/Blue/wing/left - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: AnimationPivot_Blue/Blue/wing/left - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: AnimationPivot_Blue/Blue/wing/right - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: -1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: AnimationPivot_Blue/Blue/wing/right - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: AnimationPivot_Blue/Blue/wing/right - 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: AnimationPivot_Blue/Blue/wing/right - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1372,282 +1208,6 @@ AnimationClip: path: AnimationPivot_Blue/Blue/wing/right_b classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.935 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: 0.936 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0166667 - value: 0.936 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 - value: 0.935 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: AnimationPivot_Blue/Blue/wing/right_c - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.771 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: -0.753 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0166667 - value: -0.753 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 - value: -0.771 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: AnimationPivot_Blue/Blue/wing/right_c - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0166667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: AnimationPivot_Blue/Blue/wing/right_c - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0166667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: AnimationPivot_Blue/Blue/wing/right_c - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0166667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: AnimationPivot_Blue/Blue/wing/right_c - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -7.201 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: -11.527 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0166667 - value: -11.527 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 - value: -7.201 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: AnimationPivot_Blue/Blue/wing/right_c - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1710,45 +1270,18 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.98 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: -0.985 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0166667 - value: -0.985 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 - value: -0.98 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: AnimationPivot_Blue/Blue/wing/left_c + path: AnimationPivot_Blue/Blue classID: 4 script: {fileID: 0} - curve: @@ -1756,45 +1289,18 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.782 + value: 1.12 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: -0.758 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0166667 - value: -0.758 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 - value: -0.782 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: AnimationPivot_Blue/Blue/wing/left_c + path: AnimationPivot_Blue/Blue classID: 4 script: {fileID: 0} - curve: @@ -1807,42 +1313,110 @@ AnimationClip: outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0166667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: AnimationPivot_Blue/Blue/wing/left_c + path: AnimationPivot_Blue/Blue 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: AnimationPivot_Blue/Blue/ef/Tired + 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: AnimationPivot_Blue/Blue/wing/right_mat_p + 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: AnimationPivot_Blue/Blue/wing/left_mat_p + 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: AnimationPivot_Blue/Blue/wing/right_mat_t + 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: AnimationPivot_Blue/Blue/wing/left_mat_t + classID: 1 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1856,7 +1430,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5 + time: 2.5 value: 0 inSlope: 0 outSlope: 0 @@ -1865,16 +1439,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.0166667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 + time: 5.016667 value: 0 inSlope: 0 outSlope: 0 @@ -1902,7 +1467,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5 + time: 2.5 value: 0 inSlope: 0 outSlope: 0 @@ -1911,16 +1476,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.0166667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 + time: 5.016667 value: 0 inSlope: 0 outSlope: 0 @@ -1940,7 +1496,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 7.3830004 + value: -0.34600002 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1948,8 +1504,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5 - value: 11.950001 + time: 2.5 + value: -8.373 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1957,17 +1513,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.0166667 - value: 11.950001 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.516667 - value: 7.3830004 + time: 5.016667 + value: -0.34600002 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1981,6 +1528,174 @@ AnimationClip: path: AnimationPivot_Blue/Blue/wing/left_c 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.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.016667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: AnimationPivot_Blue/Blue/wing/right_c + 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.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.016667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: AnimationPivot_Blue/Blue/wing/right_c + 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.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: 10.751 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.016667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: AnimationPivot_Blue/Blue/wing/right_c + 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: AnimationPivot_Blue/Blue/wing/left_c_p + 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: AnimationPivot_Blue/Blue/wing/right_c + 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: AnimationPivot_Blue/Blue/wing/left_c + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -2012,66 +1727,6 @@ AnimationClip: path: AnimationPivot_Blue/Blue/mouth/down classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: AnimationPivot_Blue/Blue/wing/left - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: AnimationPivot_Blue/Blue/wing/left - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: AnimationPivot_Blue/Blue/wing/left - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: AnimationPivot_Blue/Blue/wing/right - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: AnimationPivot_Blue/Blue/wing/right - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: AnimationPivot_Blue/Blue/wing/right - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_b.png.meta index aff9295f..27d84ef0 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_b.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_b.png.meta @@ -44,7 +44,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 9 - spritePivot: {x: 0.8684312, y: 0.27775392} + spritePivot: {x: 0.9524105, y: 0.19232437} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 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 f6300a08ad89e7f0668eb6b517210aa920d90d94..6745060873d533dc5c85e39d6095cf7219c68f0e 100644 GIT binary patch delta 1901 zcmV-z2a@>14*d=xiBL{Q4GJ0x0000DNk~Le000120000{2nGNE0H={UagiY>e+M5) zL_t(|+U%WAXk0}c$7i>-q(*e35G{Jxh_(?@-R58dQnIF(94tmp0S_kFgC1;>i%=EP zfP#vWrk?y$k{rbJV6xi?wqVmOROoszs|{G9m<=?L29ym*Ay1EEAv!FCFk(0d9fXWez(NNw_>3CoIueElpF)RugnAV6aKLS#r3vD=k>Z z47F30wvSyw9;|Esz7e|Vt1;^{ZRkb%`}R^RB<|8>sUJE^o+-%$zX?=B-{kgTp{`h^%xc|%MrqO(Kf|FzwC+h<4 zzyGWae!aLjHTUru1A-M6Al`FtD|@J;!x5re{kXhr!2aRdGP{<~d-3EUf}E>axCC~D zX9-mmPAZ*XmOHoLHmb*ie~#iB+!hEd zI;poT4>eH_oPMIOuj#fud+K^bac4^l>pXmz-Mq2RHrLmsHbEAVB#X!f3YQK##XV?S zf8V;r9_j2fe5~Gu00H1wj5&37DPplkfL(QRafi`XiZy`x1_szGrzV^RHdCBQAae`P z+dYWU75pk{0@#<|e|*CU@FfD=9|T<6gHVSS*$7799DDVIaVwepnO6lImsmp5)`ySu zM%p6KmjJMXlq@3d#u9MJ1UcbStAg!4H+)?7D+z89DKBu-qBm_6!T$ULj@wv5LX;&$ z-4Z+ko)S&G$5o>?=sDO30Zv&)u#Rwh?0)fJR~KtkDF7b!e-*iyQEFrX@UzEW5ZVKu zDiFh!`E4Uw!j4OtPxuJ*v{U4!wBO1l>D2qnJGQt^!Q9EA?-`WAz02+u4?L)&)_N67 z01vyig(yrfR>&HX)QmPhU-K5i;F_A=1O!8*JDS9?N|cM z*kubv58>aC!g7C!GCSZ>Cl=4Y`ea53z{kkR)AeV z5{=7-zgdyTH2PoyU>)pW+#0nz;L?-RB5QE5#WPYue*>rvU<-EphIb1Ld9eJ!@2=(} zy=31GDmDYc5*<2p1mlq16LxU3c5uIy*&* zUMy~C7Y!_s`yztwNbztLSR)2tvC+BGX&>@hL7!5hsBLk3JZVV)cnd}E1-d&xtx0sYVH1cr zl(td@g5L+!FF%_z$_!YApK;tu`})kg?}=<-Ht>229PkDQ+$W1*bOL~kNCX^M1qw!# zf1ik@D_6Fm%F;U64i;ThDteLMN@o9H3D?~oQ@O?sw+Pg=QLZ^)-KgTFdL3Rr_R)u- z`!7!9J0qi_r;B6>p7t#$S7+iDah7**?JBQ91e;L3Ot|CqU!A|ek_Qfi7Qy(t0Jhwk ztixNk6+&FYH33sQOOWx^akt2agA_hAf9wVjQ2r(8h<*RH*JY)!Fx&N#*W-JtD@K5? z65tQm|MhQzD%FyaT@h<5D~2Z`ip#y+i*Ulwfl0vPiD%H~R1~fyin9dS{6enXLnPw^ zyp0b*5i)}+NV1a!5U>f@jMrQkR{)^eWhrGk;kRmZ&?R26lLd>=(h^7jig9_?e{SM~ zj-gx^61g?@CSdc23TQL^Q|MUnUD%Lc9$^=RPnXTO!{PW2@M0cY$$HcOp-2MUSt*ezY%o_SCW|| nBpqOZ&l41wmX?-8{|PVv|41!uEjwU=00000NkvXXu0mjfjBkxK delta 1843 zcmV-32h8~W4#N&1iBL{Q4GJ0x0000DNk~Le000150000^2nGNE0HE&ykC7oKe+K1A zL_t(|+U%T9XdG1>$KRSBsu4*QVvB-_XseKFl7s1`bnU5yMiWn4d&mZR(1S^H5&uCF z@ehcSv>vS5kn|v?9%9xACWodQ{6n{g?rH;-C}sl&Vnp3bQK+KtyM2S}8^$SS)g0?)MxpU0j(GEB;BPs zU(M1jgMC<`Cn5y7o$m6IW+euFlmah?>HcqukV7{qwt>g5!u#pgVnDmJ!$(tYp@j-~ z=t2MU_gb26`9rDH3OLCC_o%f0~AmT+(1Xb9HOwN>IyW4YXz{uiu~BM{kFMDKL2Q% zTv}XIJ!FajFU1-(1>9cYy-m8#>k>Fpz}{*|NumaT;k|uyO9puz==jW;39`Prs?r>u zJsx?`EVx;KtD0)fPfwRUf4tUGk_Z@ZlEF>aG7iAI&%FLdIe02$CA~rPDiZ;~ZDP6$ z{cR6RMgzzno;;M5pe?}lD3c3vjvtF;$ zVE>?N_pULH3?wgJ&86smBuoKLhdtQYN$$9_Sr#O>(=A2WByuYoS>K?kH$xJ5N$2+a z_qOf4y}6mh(e7$(B@gZEB3CcxWhr2i!p4@N!2fh}4f`-@QgkzMHvE6jjgOJNU0t%K zV3cQXd_05Z9*m3Mf85we;%@jKkH7c=UNXp}#*eBvTo-66m-FK^5HwY{@G$z@B7@gfeJiKyTG;$cO|s z9CXq*Xk$bLb`SOH9s{~Mu*VE&jj#o|b_<&u=nb^OC|BLVe-@;E!z!S;{dmRqZgmwP zpE&-ME3dYL=8n5&Kb`j<9Ms_YQ9$s zw7Sm`G<#(;#XAb)wI(QT)oPJf%d(D9ry~{TN7S8HI|W4{X!d@P>(!WMWxU$k@Ptzy zZM<5uaY2i`f7)ap8bOP^+DM0H&|#};3acs1=Tjf+Fy?H6;faC)T^-OR16refe`VQt zbT#x@FvDrdH)xZ2{MUgKBoni4Ko?9d?F?Bk&wAEv)=_Y&OLbwWi$V2(z%p(@FY!Kv zE~(~^aWepx3_}!o#iBCMS*IYNFsC?nf$yD{URJ4Jf9!YNVPU;PE^Pd&^%4{jlioZr zq!OF@or;VaWJh-G-nB*?X7~ei=l=b%_TrD&Iw#MF>dU2|b1NG~Oui#<}Sk z4zb6?uNQ>cu=a<-zPwXTz&?%LsnR@ACPwUgFJj zkYygf|FS8{F3{uamFclB&%X;wwgJyj;Ah!K50D!x19&w&A=9k0e?**qK){A4qIc>=v#kyn#%`Q?f%M5e=Z8(; ztAw$tQsheyvw^90hd@(gV83B{Sg4%D!wM!Zh@KWeMmB;V=_ZYY)=Q=hboiZ66t#uA z@k3z^X>xttulLOnC^j>cOyD#s;{~u|T^ofJ1rfB+UDI!CM7MJPB~5i z59z+o$b+r`o@T=VUV$U4=-0i1W9&fNfV)|)6Iy&S=!Lsu2ilejwzKU3$9s{lXKS$x hy)k3aw|@l~08R=u>n&}=&j0`b2>?k&PDHLkV1fx~ezpJr diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_c.png.meta b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_c.png.meta index 7aebdfdb..34ab6337 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_c.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_c.png.meta @@ -44,7 +44,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 9 - spritePivot: {x: 0.31190616, y: 0.8154786} + spritePivot: {x: 0.51703435, y: 0.93382186} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_mat.png b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_wing_mat.png new file mode 100644 index 0000000000000000000000000000000000000000..6dcb7c7290fba4571638e1cb41f5bfd6b15a7fea GIT binary patch literal 1532 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 TC&+C<00000NkvXXu0mjfp?p$L literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_tired.png.meta b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_tired.png.meta new file mode 100644 index 00000000..41682c71 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_ef_tired.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 29d3f6b3a66e94341b7bbe2cbba5844b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_pink_body_beside_wing.png b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_pink_body_beside_wing.png index 5909f7bacc4bd0249accf4b0c9c4d4c04ff54775..91d9fec58e1c4b8c1ac187c5032248d08db6f85d 100644 GIT binary patch literal 3895 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 A>Hq)$ diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_pink_body_beside_wing.png.meta b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_pink_body_beside_wing.png.meta index ad61efb8..60225496 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_pink_body_beside_wing.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_pink_body_beside_wing.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 20f234410596cf94abfb8b9bd374cc55 +guid: 1f63f549a844a405f967ae234d22a08d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -44,7 +44,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 9 - spritePivot: {x: 0.30221057, y: 0.64204866} + spritePivot: {x: 0.27067193, y: 0.70853204} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/c.png b/popcorn/Assets/MyGame/Resource/Material/Brother/c.png new file mode 100644 index 0000000000000000000000000000000000000000..5909f7bacc4bd0249accf4b0c9c4d4c04ff54775 GIT binary patch literal 4098 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 A>Hq)$ literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/c.png.meta b/popcorn/Assets/MyGame/Resource/Material/Brother/c.png.meta new file mode 100644 index 00000000..ad61efb8 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/c.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 20f234410596cf94abfb8b9bd374cc55 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 9 + spritePivot: {x: 0.30221057, y: 0.64204866} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_sleepy.png b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_sleepy.png index 74b5170896a512488f7fe3583b7d4f4312848595..2c246dfb7886caefb90987fa904145fda8c4be3b 100644 GIT binary patch literal 3182 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 Gk@inLQ63-w literal 981 zcmV;`11kK9P)ym3^z<0?NSgJrQAb^z$%o3OmG7}5~f)L4_o!#Y<8h{`miJ$lQ zcJ|FstJIapL~`)+_g_iFS2NnAafYpE`tsY4&zW-q03-tW3frwkU@jtu4GDSS5Hslj z{|LMF0F}K061E}&1`NK8R7VL>i|mIC9^+o;M^VG)$p{jBA|YTl0s^KI0?s2KATuTa zlE;Cjl_AGjq5zCVn+X{}97P0x3Xs86S4yFoB3(12WrZtl@KZ~IM8f_s$06Qm-f`_6 z?CzKZEaAL+=e2k_X8=Dpxn48^>9Z4GumlLCZ(O@fEZ+RA zVv-8(P0{i1zNBBqjRoKd&DTlo^PHZ}-jVbRiS(@~06^Yp+&J3dRhuHhD&VX z_3J9?i-1B%#LVEhEp@A`g=7dEJgWzj=*IR*jR_#%z3~LTuq}NnP7rPgo!j060V22O z+zC2ClK+RoB%X&FX^ZZ)bd%IMQ|HB{%AQGlT!h^-rW<*3DJOLFF zxE)<%OC4fAVCMjQX{k?Sqk|m+CNDEgaziSe9;1PRSER1jpoV})@c(OyYIWHw0X={( z7A0C6J;6r-_-Yc%;9N(8*`vQCSaE$;GB~-tlmQCQ^VACgnhjC* z^i}y|hK}`JNuA*&B=8rmlc)?2m2bAUMv_{AW zb@`p(O!;4lmXi~GYAc_E`LA%T<`;#HMb%dme+3u-(eh89Ng+5c00000NkvXXu0mjf D^rN_x diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_wing.png b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_wing.png index acde6cbe97c648cfe41e5ca1a623cc374e567598..048705e26e77ca7808be0b4892ad89eb40f7cd87 100644 GIT binary patch delta 3708 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 afB^u@H)=^q4!EWO0000 delta 3388 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 P00000NkvXXu0mjfE<6Fa diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 0d8e6e9a..5bacb88d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -391,6 +391,87 @@ Transform: m_Father: {fileID: 767719702} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &345743139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 345743140} + - component: {fileID: 345743141} + m_Layer: 0 + m_Name: left_c_p + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &345743140 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 895514165} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.34600002} +--- !u!212 &345743141 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 345743139} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 30 + m_Sprite: {fileID: 21300000, guid: 3b2af36eaeaff5c459042ec3842e2260, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.84, y: 1.14} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &368140930 GameObject: m_ObjectHideFlags: 0 @@ -407,7 +488,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &368140931 Transform: m_ObjectHideFlags: 0 @@ -416,11 +497,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 368140930} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.931, y: -0.812, z: 0} + m_LocalPosition: {x: 0.845, y: -0.3630284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 895514165} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &368140932 SpriteRenderer: @@ -461,7 +542,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 30 - m_Sprite: {fileID: 21300000, guid: 3b2af36eaeaff5c459042ec3842e2260, type: 3} + m_Sprite: {fileID: 21300000, guid: 41dd06900966b468c8e48dffca78367a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 1 m_FlipY: 0 @@ -910,7 +991,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &485432103 Transform: m_ObjectHideFlags: 0 @@ -1163,7 +1244,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 555484377} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.121, y: -0.312, z: 0} + m_LocalPosition: {x: 0.06, y: -0.3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1436460246} @@ -1208,7 +1289,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 15 - m_Sprite: {fileID: 21300000, guid: 20f234410596cf94abfb8b9bd374cc55, type: 3} + m_Sprite: {fileID: 21300000, guid: 1f63f549a844a405f967ae234d22a08d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -1477,7 +1558,7 @@ GameObject: - component: {fileID: 720964442} - component: {fileID: 720964443} m_Layer: 0 - m_Name: right + m_Name: right_mat_p m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1490,13 +1571,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 720964441} - m_LocalRotation: {x: -0, y: -0.008727774, z: -0, w: 0.9999619} - m_LocalPosition: {x: 0.544, y: -0.3, z: 0} + m_LocalRotation: {x: 0.0019462635, y: -0.008508002, z: 0.22298805, w: 0.9747821} + m_LocalPosition: {x: 0.66, y: -0.739, z: 0.002} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 895514165} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: -1, z: 0} + m_LocalEulerAnglesHint: {x: 0.43500003, y: -0.901, z: 25.767002} --- !u!212 &720964443 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1536,7 +1617,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: 243fab8dc0a603547882af8aa042970c, type: 3} + m_Sprite: {fileID: 21300000, guid: e6b26901214c046bf802d86bcc48a2cb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 1 m_FlipY: 0 @@ -1612,6 +1693,7 @@ Transform: - {fileID: 820941156} - {fileID: 485432103} - {fileID: 1039014659} + - {fileID: 1844151705} m_Father: {fileID: 2124297504} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1631,7 +1713,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &811671645 Transform: m_ObjectHideFlags: 0 @@ -1639,13 +1721,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 811671644} - m_LocalRotation: {x: -0, y: -0, z: 0.064384595, w: 0.99792516} - m_LocalPosition: {x: -0.98, y: -0.782, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0.0030166495, w: 0.99999547} + m_LocalPosition: {x: -0.908, y: -0.384, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 895514165} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.3830004} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.34600002} --- !u!212 &811671646 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1685,7 +1767,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 30 - m_Sprite: {fileID: 21300000, guid: 3b2af36eaeaff5c459042ec3842e2260, type: 3} + m_Sprite: {fileID: 21300000, guid: 41dd06900966b468c8e48dffca78367a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -1712,7 +1794,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &820941156 Transform: m_ObjectHideFlags: 0 @@ -1919,10 +2001,13 @@ Transform: m_Children: - {fileID: 2013092456} - {fileID: 720964442} + - {fileID: 1070103300} + - {fileID: 1330490840} - {fileID: 1760476834} - {fileID: 1906074464} - {fileID: 368140931} - {fileID: 811671645} + - {fileID: 345743140} m_Father: {fileID: 2124297504} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2266,7 +2351,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1039014659 Transform: m_ObjectHideFlags: 0 @@ -2416,6 +2501,87 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1066410797} m_PrefabAsset: {fileID: 0} +--- !u!1 &1070103299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1070103300} + - component: {fileID: 1070103301} + m_Layer: 0 + m_Name: left_mat_t + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1070103300 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070103299} + m_LocalRotation: {x: -0, y: -0, z: -0.34512597, w: 0.93855643} + m_LocalPosition: {x: -0.679, y: -0.517, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 895514165} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -40.379} +--- !u!212 &1070103301 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070103299} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 21300000, guid: e6b26901214c046bf802d86bcc48a2cb, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.6, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1122085163 GameObject: m_ObjectHideFlags: 0 @@ -2992,6 +3158,87 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1330490839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1330490840} + - component: {fileID: 1330490841} + m_Layer: 0 + m_Name: right_mat_t + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1330490840 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330490839} + m_LocalRotation: {x: 0.0019462635, y: -0.008508002, z: 0.22298805, w: 0.9747821} + m_LocalPosition: {x: 0.643, y: -0.537, z: 0.004} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 895514165} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0.43500003, y: -0.901, z: 25.767002} +--- !u!212 &1330490841 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330490839} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 21300000, guid: e6b26901214c046bf802d86bcc48a2cb, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.6, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 --- !u!1 &1423285229 GameObject: m_ObjectHideFlags: 0 @@ -3445,11 +3692,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1760476833} m_LocalRotation: {x: -0, y: -0, z: 0.08242244, w: 0.9965975} - m_LocalPosition: {x: 0.873, y: -0.81, z: 0} + m_LocalPosition: {x: 0.945, y: -0.916, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 895514165} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 9.456} --- !u!212 &1760476835 SpriteRenderer: @@ -3662,6 +3909,87 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1796729966} m_PrefabAsset: {fileID: 0} +--- !u!1 &1844151704 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1844151705} + - component: {fileID: 1844151706} + m_Layer: 0 + m_Name: Tired + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1844151705 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844151704} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.52, y: -0.49, z: 0.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 792465137} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1844151706 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844151704} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 11 + m_Sprite: {fileID: 21300000, guid: 29d3f6b3a66e94341b7bbe2cbba5844b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.74, y: 0.82} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1850158120 GameObject: m_ObjectHideFlags: 0 @@ -3913,13 +4241,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1906074463} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.672, y: -0.385, z: 0} + m_LocalRotation: {x: -0, y: -0, z: 0.26021427, w: 0.9655509} + m_LocalPosition: {x: 0.66, y: -0.733, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 895514165} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 30.166002} --- !u!212 &1906074465 SpriteRenderer: m_ObjectHideFlags: 0 @@ -3959,7 +4287,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: c76af01fab66ed446831c47fb68dd5e0, type: 3} + m_Sprite: {fileID: 21300000, guid: e6b26901214c046bf802d86bcc48a2cb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -4181,7 +4509,7 @@ GameObject: - component: {fileID: 2013092456} - component: {fileID: 2013092457} m_Layer: 0 - m_Name: left + m_Name: left_mat_p m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4194,13 +4522,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2013092455} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.587, y: -0.2999997, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0.41421476, w: 0.9101792} + m_LocalPosition: {x: -0.637, y: -0.646, 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -48.940002} --- !u!212 &2013092457 SpriteRenderer: m_ObjectHideFlags: 0 @@ -4240,7 +4568,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: 243fab8dc0a603547882af8aa042970c, type: 3} + m_Sprite: {fileID: 21300000, guid: e6b26901214c046bf802d86bcc48a2cb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Brother_pink.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Brother_pink.prefab index 22a70ae9..d5fc50b8 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Brother_pink.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Brother_pink.prefab @@ -1053,7 +1053,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7854448233980325406} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.121, y: -0.312, z: 0} + m_LocalPosition: {x: 0.1, y: -0.345, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7854448233253257508} @@ -1107,7 +1107,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 + m_MaskInteraction: 2 m_SpriteSortPoint: 0 --- !u!1 &7854448234362698001 GameObject: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 6c8a1df1..4aeaa33c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -3252,6 +3252,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7854448234382150009, guid: febae22cb9bba384992e30ac63891778, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: febae22cb9bba384992e30ac63891778, type: 3} --- !u!4 &1189290113 stripped