diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother.controller b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother.controller index f227542c..4478bf0c 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother.controller @@ -68,13 +68,16 @@ AnimatorStateMachine: m_Position: {x: 310, y: 120, z: 0} - serializedVersion: 1 m_State: {fileID: 2248593463434949668} - m_Position: {x: 350, y: 190, z: 0} + m_Position: {x: 350, y: 270, z: 0} - serializedVersion: 1 m_State: {fileID: 3603799768492295907} - m_Position: {x: 400, y: 340, z: 0} + m_Position: {x: 400, y: 420, z: 0} - serializedVersion: 1 m_State: {fileID: -5442313241527987121} - m_Position: {x: 380, y: 270, z: 0} + m_Position: {x: 380, y: 350, z: 0} + - serializedVersion: 1 + m_State: {fileID: 914737976247534988} + m_Position: {x: 330, y: 560, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 6442717320784534736} @@ -156,31 +159,31 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Open m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: CleaningA m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: CleaningB m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: MoveSideways m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -219,6 +222,32 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &914737976247534988 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Brother_blue_MoveSideways + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 8b6d6dc1741234719808a06428753f0f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &1763129385586290165 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -277,7 +306,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Brother_blue_MoveSideways + m_Name: Brother_blue_cleaning_c m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -290,7 +319,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 8b6d6dc1741234719808a06428753f0f, type: 2} + m_Motion: {fileID: 7400000, guid: 44376049858e1415bae1c7f691f0d1ec, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_a.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_a.anim index 3432a181..a707703b 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_a.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_a.anim @@ -19,7 +19,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.53300005, y: -0.846, z: 32.213} + value: {x: 0.215, y: -0.97700006, z: 12.407001} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -28,7 +28,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.96666664 - value: {x: 0.53300005, y: -0.846, z: 51.659004} + value: {x: 0.53300005, y: -0.846, z: 17.220491} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -37,7 +37,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 3 - value: {x: 0.53300005, y: -0.846, z: 32.213} + value: {x: 0.215, y: -0.97700006, z: 12.407001} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -652,7 +652,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.53300005 + value: 0.215 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -670,7 +670,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: 0.53300005 + value: 0.215 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -689,7 +689,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.846 + value: -0.97700006 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -707,7 +707,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: -0.846 + value: -0.97700006 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -726,7 +726,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 32.213 + value: 12.407001 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -735,7 +735,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.96666664 - value: 51.659004 + value: 17.220491 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -744,7 +744,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: 32.213 + value: 12.407001 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim index 1781d394..9c68fb79 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim @@ -224,7 +224,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.5166667 + time: 1.5 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -445,7 +445,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 2 + time: 1.5 value: 1 inSlope: Infinity outSlope: Infinity @@ -1604,7 +1604,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5166667 + time: 1.5 value: 0 inSlope: 0 outSlope: 0 @@ -1650,7 +1650,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5166667 + time: 1.5 value: 0 inSlope: 0 outSlope: 0 @@ -1696,7 +1696,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5166667 + time: 1.5 value: 0 inSlope: 0 outSlope: 0 @@ -1761,7 +1761,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 2 + time: 1.5 value: 1 inSlope: Infinity outSlope: Infinity diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim new file mode 100644 index 00000000..58a29e64 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim @@ -0,0 +1,1926 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Brother_blue_cleaning_c + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -2.286} + 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: 0.96666664 + value: {x: 0, y: 0, z: 7.4690003} + 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, y: 0, z: -2.286} + 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/armPivot + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 39.795002} + 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: 0.96666664 + value: {x: 0, y: 0, z: 30.469002} + 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, y: 0, z: 39.795002} + 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/armPivot/left_mat_p/left_c_p + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.117000006, y: -0.99300003, z: -6.7400002} + 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: 0.96666664 + value: {x: -0.21700001, y: -0.9760001, z: -12.56} + 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.117000006, y: -0.99300003, z: -6.7400002} + 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: 1, z: 5.9100003} + 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: 0.96666664 + value: {x: 0, y: 1, z: 13.0720005} + 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, y: 1, z: 5.9100003} + 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/left_c_p (1) + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -49.982002} + 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: 0.96666664 + value: {x: 0, y: 0, z: -50.45} + 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, y: 0, z: -49.982002} + 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/armPivot/left_mat_p + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.9, y: -1.49, 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: 0.96666664 + value: {x: 1.9, y: -1.5515827, 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: 1.9, y: -1.49, 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 + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.93, y: 0.79, z: -0.1870522} + 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: 0.96666664 + value: {x: 1.18, y: 1.03, z: -0.1870522} + 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/Effect_Sweat + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0.4109997, 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/eye + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0.03, 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: + - serializedVersion: 3 + time: 0 + value: {x: 0.94, y: -0.46, z: 0.10000002} + 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/wing/armPivot/left_mat_p/left_c_p/marketing_salesclerk_Blue_item_a + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.48, y: -0.34, z: -0.32} + 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.48, y: -0.34, z: -0.32} + 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/left_c_p (1) + m_ScaleCurves: [] + m_FloatCurves: + - 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/Effect_Sweat + classID: 1 + 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: 0.96666664 + value: 0.003921569 + 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_Color.a + path: AnimationPivot_Blue/Blue/Effect_Sweat + classID: 212 + 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 + - serializedVersion: 3 + time: 3 + 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/armPivot + 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 + - serializedVersion: 3 + time: 3 + 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 + 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 + - serializedVersion: 3 + time: 3 + 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: + - 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/left_c_p (1) + classID: 1 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: b527a655d1b194d48b7105083e0bd07e, type: 3} + attribute: m_Sprite + path: AnimationPivot_Blue/Blue/body + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 788391832 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1852547998 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 750500411 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3533235330 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2437803436 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2867301688 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2049319054 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1852547998 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1852547998 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 750500411 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2452488154 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2437803436 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2867301688 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 36684837 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 602786904 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4034387391 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2810077196 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2867301688 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: b527a655d1b194d48b7105083e0bd07e, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 3 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.9 + 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 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.49 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: -1.5515827 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: -1.49 + 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 + 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: 0.96666664 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: AnimationPivot_Blue + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.93 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: 1.18 + 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/Effect_Sweat + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.79 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: 1.03 + 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/Effect_Sweat + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.1870522 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: -0.1870522 + 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/Effect_Sweat + 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/Effect_Sweat + classID: 1 + 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: 0.96666664 + value: 0.003921569 + 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_Color.a + path: AnimationPivot_Blue/Blue/Effect_Sweat + classID: 212 + 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/eye + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4109997 + 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/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.z + 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.03 + 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: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: AnimationPivot_Blue/Blue/wing/armPivot + 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: 0.96666664 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: AnimationPivot_Blue/Blue/wing/armPivot + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.286 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: 7.4690003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: -2.286 + 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/armPivot + 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 + - serializedVersion: 3 + time: 3 + 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/armPivot + 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.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: AnimationPivot_Blue/Blue/wing/armPivot/left_mat_p/left_c_p + 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: 0.96666664 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: AnimationPivot_Blue/Blue/wing/armPivot/left_mat_p/left_c_p + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 39.795002 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: 30.469002 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 39.795002 + 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/armPivot/left_mat_p/left_c_p + 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 + - serializedVersion: 3 + time: 3 + 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 + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.117000006 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: -0.21700001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: -0.117000006 + 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: -0.99300003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: -0.9760001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: -0.99300003 + 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: -6.7400002 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: -12.56 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: -6.7400002 + 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 + - serializedVersion: 3 + time: 3 + 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: + - serializedVersion: 3 + time: 0 + value: 0.94 + 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/wing/armPivot/left_mat_p/left_c_p/marketing_salesclerk_Blue_item_a + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.46 + 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/wing/armPivot/left_mat_p/left_c_p/marketing_salesclerk_Blue_item_a + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.10000002 + 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/wing/armPivot/left_mat_p/left_c_p/marketing_salesclerk_Blue_item_a + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.48 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0.48 + 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/left_c_p (1) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.34 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: -0.34 + 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/left_c_p (1) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.32 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: -0.32 + 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/left_c_p (1) + 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: 0.96666664 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: AnimationPivot_Blue/Blue/wing/right/left_c_p (1) + 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: 0.96666664 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + 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/left_c_p (1) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 5.9100003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: 13.0720005 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 5.9100003 + 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/left_c_p (1) + 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: 0.96666664 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: AnimationPivot_Blue/Blue/wing/armPivot/left_mat_p + 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: 0.96666664 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: AnimationPivot_Blue/Blue/wing/armPivot/left_mat_p + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -49.982002 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: -50.45 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: -49.982002 + 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/armPivot/left_mat_p + 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/left_c_p (1) + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: + - 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.z + path: AnimationPivot_Blue/Blue/wing/armPivot/left_mat_p/left_c_p + 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/armPivot/left_mat_p/left_c_p + 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/armPivot/left_mat_p/left_c_p + 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/armPivot + 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/armPivot + 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/armPivot + 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/armPivot/left_mat_p + 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/armPivot/left_mat_p + 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/armPivot/left_mat_p + 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/left_c_p (1) + 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/left_c_p (1) + 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/left_c_p (1) + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim.meta b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim.meta new file mode 100644 index 00000000..49ba40b7 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_c.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 44376049858e1415bae1c7f691f0d1ec +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Animation/closed_siqnboard.anim b/popcorn/Assets/MyGame/Resource/Animation/closed_siqnboard.anim index 4aeb1706..39bb5a28 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/closed_siqnboard.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/closed_siqnboard.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.38, z: 0} + value: {x: 0, y: -0.29, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: -0.69, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -114,6 +114,34 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: + - 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: 0.33333334 + 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: m_Color.a + path: signboard + classID: 212 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -147,7 +175,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.38 + value: -0.29 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -156,7 +184,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 0 + value: -0.69 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -198,34 +226,6 @@ AnimationClip: path: signboard 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: 0.33333334 - 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: m_Color.a - path: signboard - classID: 212 - script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_item_a.png b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_item_a.png index 7f880577..0fbeed6d 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_item_a.png and b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_item_a.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png new file mode 100644 index 00000000..a517eb76 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png.meta new file mode 100644 index 00000000..8736a0f7 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: ad8dc90a2b434734d9f505455440c3ce +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/UI/ui_button_SpeechBalloon_order_receive.png b/popcorn/Assets/MyGame/Resource/UI/ui_button_SpeechBalloon_order_receive.png index 273dc466..54b108bf 100644 Binary files a/popcorn/Assets/MyGame/Resource/UI/ui_button_SpeechBalloon_order_receive.png and b/popcorn/Assets/MyGame/Resource/UI/ui_button_SpeechBalloon_order_receive.png differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_release.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_release.wav index fb6e6084..ab6d95fb 100644 Binary files a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_release.wav and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_release.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_buy.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_buy.wav index f047ea65..7d562f13 100644 Binary files a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_buy.wav and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_buy.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_coin_get.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_coin_get.wav index ed435601..eadb3211 100644 Binary files a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_coin_get.wav and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_coin_get.wav differ diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index 9553c670..de3c75a5 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab @@ -440,7 +440,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -1611,7 +1611,7 @@ RectTransform: m_GameObject: {fileID: 8736114271125803633} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 8736114271608715056} m_RootOrder: 0 @@ -2095,11 +2095,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 40 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -2173,7 +2173,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -2362,7 +2362,7 @@ RectTransform: m_GameObject: {fileID: 8736114271690247984} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 8736114270874397686} m_RootOrder: 0 @@ -2475,11 +2475,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 40 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -2553,7 +2553,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab index 6a06faf3..c33d330e 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab @@ -145,11 +145,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 40 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -192,7 +192,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -4, y: -32} - m_SizeDelta: {x: 180, y: 30} + m_SizeDelta: {x: 200, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2616693359242844619 CanvasRenderer: @@ -223,10 +223,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 32 m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 0 m_AlignByGeometry: 0 @@ -1089,7 +1089,7 @@ RectTransform: m_GameObject: {fileID: 2616693360790595339} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 2616693360524817895} m_RootOrder: 0 @@ -1768,7 +1768,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -4, y: -32} - m_SizeDelta: {x: 180, y: 30} + m_SizeDelta: {x: 200, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2613791861564653275 CanvasRenderer: @@ -1799,7 +1799,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 32 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 3 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index 2c34cc46..0d4c2c34 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -363,11 +363,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 40 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 055061b5..3fae1767 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -5443,11 +5443,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 664519285002385818, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -5768,11 +5763,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3672624745086876516, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -115.7 - objectReference: {fileID: 0} - target: {fileID: 3832433339922076370, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 420bd61e..fa8608a1 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -221,7 +221,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 922, y: 1700} + m_SizeDelta: {x: 930, y: 1700} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915277521603128 CanvasRenderer: @@ -446,7 +446,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -313, y: 0} + m_AnchoredPosition: {x: -331, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4082915277894373616 @@ -633,8 +633,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 446, y: -57.6} - m_SizeDelta: {x: 580, y: 100} + m_AnchoredPosition: {x: 453, y: -57.6} + m_SizeDelta: {x: 630, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915277970689976 CanvasRenderer: @@ -665,18 +665,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 28 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 28 + m_MinSize: 30 + m_MaxSize: 32 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u305F\u304F\u3055\u3093\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u304C\u6B32\u3057\u3044\u306A" + m_Text: "\u5DEE\u3057\u5165\u308C\u306B\u6301\u3063\u3066\u884C\u304D\u305F\u3044\u304B\u3089\u6CA2\u5C71\u6B32\u3057\u3044\u306D\u3093" --- !u!1 &4082915278008547938 GameObject: m_ObjectHideFlags: 0 @@ -1151,7 +1151,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 52} - m_SizeDelta: {x: 922, y: 1700} + m_SizeDelta: {x: 930, y: 1700} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2145851308931691871 MonoBehaviour: @@ -1212,7 +1212,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 4} m_SizeDelta: {x: 118, y: 118} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915278807493228 @@ -2034,7 +2034,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 635} - m_SizeDelta: {x: 750, y: 116} + m_SizeDelta: {x: 780, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4082915279204653804 GameObject: @@ -2070,8 +2070,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 43, y: 0} - m_SizeDelta: {x: 656, y: 116} + m_AnchoredPosition: {x: 36.000008, y: 0} + m_SizeDelta: {x: 710, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915279204653793 CanvasRenderer: @@ -2340,7 +2340,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 66} - m_SizeDelta: {x: 818, y: 1310} + m_SizeDelta: {x: 830, y: 1310} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5023734004673988866 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index efa347e8..229fa382 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -656,7 +656,7 @@ MonoBehaviour: m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 4 + m_MinSize: 40 m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 @@ -1024,7 +1024,7 @@ MonoBehaviour: m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 4 + m_MinSize: 40 m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 @@ -1176,7 +1176,7 @@ MonoBehaviour: m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 4 + m_MinSize: 40 m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index 1c954471..8c27b935 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -86,7 +86,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -141, y: 62} + m_AnchoredPosition: {x: -141, y: 49} m_SizeDelta: {x: 82, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754686575543082 @@ -389,7 +389,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 720, y: 820} + m_SizeDelta: {x: 760, y: 820} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9217531184726761281 MonoBehaviour: @@ -440,7 +440,7 @@ RectTransform: m_GameObject: {fileID: 4315754687099534942} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.15, y: 1.15, z: 1.15} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: - {fileID: 4315754688526726639} - {fileID: 3058138224988021536} @@ -451,7 +451,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 117} - m_SizeDelta: {x: 550, y: 0} + m_SizeDelta: {x: 600, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4315754687099534941 MonoBehaviour: @@ -466,12 +466,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 24 m_Right: 0 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 30 + m_Spacing: 35 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -713,7 +713,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 115, y: -17} - m_SizeDelta: {x: 600, y: 125} + m_SizeDelta: {x: 630, y: 125} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687599301558 CanvasRenderer: @@ -746,16 +746,16 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 32 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u305F\u304F\u3055\u3093\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u304C\u6B32\u3057\u3044\u306A" + m_Text: "\u5DEE\u3057\u5165\u308C\u306B\u6301\u3063\u3066\u884C\u304D\u305F\u3044\u304B\u3089\u6CA2\u5C71\u6B32\u3057\u3044\u306D\u3093" --- !u!1 &4315754687615340676 GameObject: m_ObjectHideFlags: 0 @@ -1031,7 +1031,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 548} - m_SizeDelta: {x: 876, y: 234} + m_SizeDelta: {x: 900, y: 234} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687733902327 CanvasRenderer: @@ -1108,7 +1108,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -154} - m_SizeDelta: {x: 668, y: 156} + m_SizeDelta: {x: 710, y: 156} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687736309298 CanvasRenderer: @@ -1182,7 +1182,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 720, y: 820} + m_SizeDelta: {x: 760, y: 820} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687931289287 CanvasRenderer: @@ -1570,14 +1570,14 @@ RectTransform: m_GameObject: {fileID: 4315754688350645386} m_LocalRotation: {x: -0, y: -0, z: 0.09801341, w: 0.99518514} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} m_Children: [] m_Father: {fileID: 4315754687733902321} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11.250001} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -305.69998, y: -5.9000854} + m_AnchoredPosition: {x: -317, y: -5.9000854} m_SizeDelta: {x: 118, y: 118} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688350645385 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index 437a8ded..fb029f11 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -1219,7 +1219,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 100} - m_SizeDelta: {x: 600, y: 50} + m_SizeDelta: {x: 620, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6701890202664346919 CanvasRenderer: @@ -1250,11 +1250,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 25 + m_MinSize: 0 + m_MaxSize: 36 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1367,7 +1367,7 @@ MonoBehaviour: m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 3 + m_MinSize: 30 m_MaxSize: 35 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab index 89a62320..acfb6f4b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab @@ -36,7 +36,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 550, y: 74} + m_SizeDelta: {x: 600, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2576005101485369442 MonoBehaviour: @@ -89,8 +89,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -12, y: 0} - m_SizeDelta: {x: 345, y: 60} + m_AnchoredPosition: {x: -13, y: 0} + m_SizeDelta: {x: 370, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1266659963782799781 CanvasRenderer: @@ -121,18 +121,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 35 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3" + m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" --- !u!1 &1266659964433289958 GameObject: m_ObjectHideFlags: 0 @@ -243,7 +243,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -12, y: 0} m_SizeDelta: {x: 550, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6078742360956254766 @@ -280,7 +280,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -12, y: 0} m_SizeDelta: {x: 524, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6134255696156549157 @@ -353,7 +353,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 210, y: -10} + m_AnchoredPosition: {x: 241, y: -10} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7526028034810490598 @@ -542,7 +542,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.780001} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -222.99997, y: 0} + m_AnchoredPosition: {x: -242, y: 0} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8690967114179661769 @@ -580,7 +580,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -50, y: 0} - m_SizeDelta: {x: 426, y: 74} + m_SizeDelta: {x: 470, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1519306445017384389 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab index 60a05424..b12a7b5d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab @@ -467,7 +467,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -47.7, y: -115.7} - m_SizeDelta: {x: 246, y: 108} + m_SizeDelta: {x: 308, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7833017117414415851 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity index b89203f3..813c1e46 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity @@ -346,17 +346,17 @@ PrefabInstance: - target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 312 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -155 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, type: 3} @@ -466,17 +466,17 @@ PrefabInstance: - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 99 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -155 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3850846013988262856, guid: 6592613d31e034734bea16833d6345c1, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index b5a36fb0..401cae25 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -109,8 +109,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 41} - m_SizeDelta: {x: 580, y: 220} + m_AnchoredPosition: {x: 0, y: 48} + m_SizeDelta: {x: 630, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4753495964141152955 CanvasRenderer: @@ -455,7 +455,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 198, y: 50} - m_Spacing: {x: 8, y: 20} + m_Spacing: {x: 15, y: 15} m_Constraint: 0 m_ConstraintCount: 2 --- !u!114 &5342480092941596622 @@ -1147,7 +1147,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 302} + m_AnchoredPosition: {x: 0, y: 297} m_SizeDelta: {x: 650, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3856012875447652418 @@ -1560,7 +1560,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.3, y: 0} - m_SizeDelta: {x: 560, y: 198} + m_SizeDelta: {x: 610, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875694233249 CanvasRenderer: @@ -1591,7 +1591,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 28 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -1601,8 +1601,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1.3 - m_Text: "\u30C1\u30FB\u30AD\u30FC\u30F3\u6D77\u3067\u4F5C\u3089\u308C\u305F\r\n\u7279\u7523\u306E\u5869\u3092\u3075\u3093\u3060\u3093\u306B\u4F7F\u3063\u305F\r\n\u5B9A\u756A\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" + m_LineSpacing: 1.2 + m_Text: "\u3053\u3060\u308F\u308A\u306E\u30AB\u30AB\u30AA\u8C46\u3067\u4F5C\u3089\u308C\u305F\r\n\u677F\u72B6\u306E\u30C1\u30E7\u30B3\u30EC\u30FC\u30C8\r\n\u305D\u306E\u307E\u307E\u98DF\u3079\u3066\u3082\u7F8E\u5473\u3057\u3044\u304C\u5DE5\u592B\u6B21\u7B2C\u3067\r\n\u69D8\u3005\u306A\u5473\u308F\u3044\u3092\u5F15\u304D\u51FA\u3059\u3053\u3068\u304C\u3067\u304D\u308B" --- !u!1 &3856012875805691664 GameObject: m_ObjectHideFlags: 0 @@ -2112,7 +2112,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 15} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3856012876438822079 @@ -2537,6 +2537,11 @@ PrefabInstance: propertyPath: m_Name value: RareDetails (4) objectReference: {fileID: 0} + - target: {fileID: 68604352306250142, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_Pivot.x @@ -2560,7 +2565,7 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2570,17 +2575,17 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 198 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2620,12 +2625,12 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 99 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -155 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3260,6 +3265,11 @@ PrefabInstance: propertyPath: m_Name value: RareDetails (5) objectReference: {fileID: 0} + - target: {fileID: 68604352306250142, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_Pivot.x @@ -3283,7 +3293,7 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3293,17 +3303,17 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 198 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3343,12 +3353,12 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 312 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -155 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab index db0270d2..86756184 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab @@ -428,7 +428,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.6, y: -26.2} + m_AnchoredPosition: {x: 108, y: -26.2} m_SizeDelta: {x: 145, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5542324150579234386 @@ -460,18 +460,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 32 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 28 - m_MaxSize: 32 - m_Alignment: 4 + m_MinSize: 3 + m_MaxSize: 35 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "10\xD710\u500B" + m_Text: "10\u500B" --- !u!1 &4755900518491743640 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab index 1cdc0176..02b0b134 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab @@ -680,7 +680,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e9f8cd23420f7d741a5c8c9c41ad0a95, type: 3} + m_Sprite: {fileID: 21300000, guid: ad8dc90a2b434734d9f505455440c3ce, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 1f40d24d..74ee2b32 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -566,7 +566,8 @@ Transform: m_LocalRotation: {x: -0, y: -0.008727774, z: -0, w: 0.9999619} m_LocalPosition: {x: 0.45, y: -0.091, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 708142970} m_Father: {fileID: 286834612} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: -1, z: 0} @@ -3007,7 +3008,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 668553842} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0.69, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1199276395} @@ -3380,6 +3381,87 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &708142969 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 708142970} + - component: {fileID: 708142971} + m_Layer: 0 + m_Name: left_c_p (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &708142970 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708142969} + m_LocalRotation: {x: 0.00044996565, y: 0.008716168, z: 0.05155364, w: 0.99863213} + m_LocalPosition: {x: 0.4079568, y: -0.35089907, z: -0.31922168} + m_LocalScale: {x: -1, y: 1, z: 1.25} + m_Children: [] + m_Father: {fileID: 151001428} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 57.367004} +--- !u!212 &708142971 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708142969} + 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!1001 &713264522 PrefabInstance: m_ObjectHideFlags: 0 @@ -3894,6 +3976,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6969874152703327186, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 274 + objectReference: {fileID: 0} - target: {fileID: 7545339558603919741, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x @@ -5976,7 +6063,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -2 + m_SortingOrder: -3 m_Sprite: {fileID: 21300000, guid: 08d7212f8dfc74ed0b9ded9c125cefef, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -6346,7 +6433,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1199276394} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.94, z: 0} + m_LocalPosition: {x: 0, y: 1.11, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 668553843} @@ -8022,7 +8109,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1603646714} m_LocalRotation: {x: -0, y: -0, z: 0.102078564, w: 0.9947763} - m_LocalPosition: {x: 0.39, y: -0.47, z: 0.10000002} + m_LocalPosition: {x: 0.39, y: -0.47, z: 0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1026166059} @@ -14222,7 +14309,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1866866950} m_LocalRotation: {x: -0, y: -0, z: 0.1947258, w: 0.98085773} - m_LocalPosition: {x: 0.66, y: 3.05, z: -0.17762177} + m_LocalPosition: {x: 1.16, y: 2.84, z: -0.17762177} m_LocalScale: {x: 1.1998432, y: 1.1699773, z: 1.1869801} m_Children: [] m_Father: {fileID: 443832894} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index d8e8ec54..c5b82243 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -27,14 +27,14 @@ RectTransform: m_GameObject: {fileID: 847466213409106283} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 2646634445844468798} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -68.500015, y: -44.700024} + m_AnchoredPosition: {x: -63.3, y: -42.1} m_SizeDelta: {x: 70, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6556948699061727839 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index bf87af73..13c1facf 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -155,8 +155,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.0000129, y: -6.9999743} - m_SizeDelta: {x: 700, y: 242} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 850, y: 320} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &25014322 MonoBehaviour: @@ -341,8 +341,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 5} - m_SizeDelta: {x: 650, y: 100} + m_AnchoredPosition: {x: 0, y: -5} + m_SizeDelta: {x: 800, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &255490370 MonoBehaviour: @@ -365,7 +365,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 28 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -375,7 +375,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1.3 + m_LineSpacing: 1.2 m_Text: "\u30BF\u30F3\u30AF\u304C\u3044\u3063\u3071\u3044\u3067\u4F5C\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u2026\r\n\u3059\u3050\u306B\u7A7A\u304D\u3092\u4F5C\u308A\u305F\u3044\u5834\u5408\u306F\u8A66\u98DF\u3092\u4F7F\u3063\u3066\u307F\u3088\u3046\uFF01" --- !u!222 &255490371 CanvasRenderer: @@ -412,7 +412,7 @@ RectTransform: m_GameObject: {fileID: 269597408} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 1853630203} m_RootOrder: 0 @@ -635,7 +635,7 @@ RectTransform: m_GameObject: {fileID: 430811414} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 1037294271} m_RootOrder: 0 @@ -869,7 +869,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 600, y: 200} + m_SizeDelta: {x: 680, y: 230} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &649320304 MonoBehaviour: @@ -1113,7 +1113,7 @@ RectTransform: m_GameObject: {fileID: 729526675} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 843133639} m_RootOrder: 0 @@ -1234,8 +1234,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -174, y: 154} - m_SizeDelta: {x: 230, y: 112} + m_AnchoredPosition: {x: -174, y: 164} + m_SizeDelta: {x: 230, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &843133640 MonoBehaviour: @@ -1454,14 +1454,14 @@ RectTransform: m_GameObject: {fileID: 878944767} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 1626721124} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 47, y: -27.00003} + m_AnchoredPosition: {x: 56, y: -18.99999} m_SizeDelta: {x: 70, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &878944769 @@ -1777,7 +1777,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 20, y: 50} - m_SizeDelta: {x: 960, y: 1300} + m_SizeDelta: {x: 960, y: 1350} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1037294270 GameObject: @@ -1815,8 +1815,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 157, y: 154} - m_SizeDelta: {x: 230, y: 112} + m_AnchoredPosition: {x: 157, y: 164} + m_SizeDelta: {x: 230, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1037294272 MonoBehaviour: @@ -2011,7 +2011,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 550, y: 180} + m_SizeDelta: {x: 650, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1116792172 MonoBehaviour: @@ -2034,7 +2034,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 27 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -2044,8 +2044,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1.3 - m_Text: "\u30C1\u30FB\u30AD\u30FC\u30F3\u6D77\u3067\u4F5C\u3089\u308C\u305F\u7279\u7523\u306E\u5869\r\n\u3068\u3066\u3082\u307E\u308D\u3084\u304B\u306A\u5869\u3067\r\n\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306B\u5408\u3046\u3053\u3068\u9593\u9055\u3044\u306A\u3057" + m_LineSpacing: 1.2 + m_Text: "\u8702\u871C\u306E\u7F8E\u5473\u3057\u3055\u304C\u3001\u30D0\u30BF\u30FC\u306B\u652F\u3048\u3089\u308C\u3066\r\n\u30B8\u30E5\u30EF\u30C3\u3068\u6EA2\u308C\u51FA\u3059\r\n\u512A\u3057\u304F\u3042\u307E\u301C\u3044\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" --- !u!222 &1116792173 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2081,14 +2081,14 @@ RectTransform: m_GameObject: {fileID: 1125711447} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 1464412874} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1, y: 105} + m_AnchoredPosition: {x: -1, y: 101} m_SizeDelta: {x: 406, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1125711449 @@ -2163,7 +2163,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 960, y: 1300} + m_SizeDelta: {x: 960, y: 1350} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1157984680 MonoBehaviour: @@ -2240,7 +2240,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -10, y: 539} + m_AnchoredPosition: {x: -10, y: 554} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1160535648 @@ -2450,8 +2450,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -9, y: 163.00005} - m_SizeDelta: {x: 600, y: 200} + m_AnchoredPosition: {x: -9, y: 174} + m_SizeDelta: {x: 700, y: 230} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1408233925 PrefabInstance: @@ -2687,7 +2687,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -7.600019, y: -310} + m_AnchoredPosition: {x: -10, y: -335} m_SizeDelta: {x: 710, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1484296443 @@ -2952,7 +2952,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.5, y: 30.999977} + m_AnchoredPosition: {x: -0.5, y: 41.499954} m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1517415306 @@ -3030,7 +3030,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -7, y: -255} + m_AnchoredPosition: {x: -7, y: -265} m_SizeDelta: {x: 700, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1649038406 @@ -3177,7 +3177,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -117, y: -26.5} + m_AnchoredPosition: {x: -117, y: -16} m_SizeDelta: {x: 185, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1826815493 @@ -3213,7 +3213,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 28} + m_AnchoredPosition: {x: 0, y: 36} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1853630202 @@ -3253,8 +3253,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 157, y: 154} - m_SizeDelta: {x: 230, y: 112} + m_AnchoredPosition: {x: 157, y: 164} + m_SizeDelta: {x: 230, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1853630204 MonoBehaviour: @@ -3497,7 +3497,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 81, y: -231} + m_AnchoredPosition: {x: 81, y: -226} m_SizeDelta: {x: 495, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2045825934 @@ -3531,7 +3531,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 1.2 m_Text: "\u30B7\u30F3\u30D7\u30EB\u306A\u30D5\u30C3\u7D20\u52A0\u5DE5\u306E\u30D5\u30E9\u30A4\u30D1\u30F3\r\n\u5B89\u5B9A\u3057\u305F\u4F7F\u3044\u3084\u3059\u3055\u3067\u521D\u5FC3\u8005\u306B\u3082\u30AA\u30B9\u30B9\u30E1\r\n\u5927\u6210\u529F\u3067\u58F2\u5024\u304C5%\u30A2\u30C3\u30D7" --- !u!222 &2045825935 CanvasRenderer: @@ -3776,7 +3776,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -31.00003} + m_AnchoredPosition: {x: 0, y: -29} m_SizeDelta: {x: 194, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2124266408 @@ -3849,8 +3849,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -7, y: -48} - m_SizeDelta: {x: 700, y: 220} + m_AnchoredPosition: {x: -7, y: -56} + m_SizeDelta: {x: 780, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &318270869295207907 MonoBehaviour: