diff --git a/popcorn/Assets/MyGame/Resource/Animation/title_logo.anim b/popcorn/Assets/MyGame/Resource/Animation/title_logo.anim index f3478b7d..c4a0f237 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/title_logo.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/title_logo.anim @@ -20,7 +20,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.25 + time: 0.083333336 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -29,7 +29,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: 0.5833333 + time: 0.33333334 value: {x: 1.05, y: 1.05, z: 1.05} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -38,16 +38,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.71666664 + time: 0.46666667 value: {x: 1, y: 1, z: 1} - inSlope: {x: -0.352941, y: -0.352941, z: -0.352941} - outSlope: {x: -0.352941, y: -0.352941, z: -0.352941} + inSlope: {x: -0.35294107, y: -0.35294107, z: -0.35294107} + outSlope: {x: -0.35294107, y: -0.35294107, z: -0.35294107} 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.8666667 + time: 0.6166667 value: {x: 0.95, y: 0.95, z: 0.95} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -56,7 +56,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.0833334 + time: 0.8333333 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -73,7 +73,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 1 inSlope: Infinity outSlope: Infinity @@ -116,7 +116,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0833334 + m_StopTime: 0.8333333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -136,7 +136,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.25 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -145,7 +145,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 0.33333334 value: 1.05 inSlope: 0 outSlope: 0 @@ -154,16 +154,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.71666664 + time: 0.46666667 value: 1 - inSlope: -0.352941 - outSlope: -0.352941 + inSlope: -0.35294107 + outSlope: -0.35294107 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8666667 + time: 0.6166667 value: 0.95 inSlope: 0 outSlope: 0 @@ -172,7 +172,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0833334 + time: 0.8333333 value: 1 inSlope: 0 outSlope: 0 @@ -191,7 +191,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.25 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -200,7 +200,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 0.33333334 value: 1.05 inSlope: 0 outSlope: 0 @@ -209,16 +209,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.71666664 + time: 0.46666667 value: 1 - inSlope: -0.352941 - outSlope: -0.352941 + inSlope: -0.35294107 + outSlope: -0.35294107 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8666667 + time: 0.6166667 value: 0.95 inSlope: 0 outSlope: 0 @@ -227,7 +227,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0833334 + time: 0.8333333 value: 1 inSlope: 0 outSlope: 0 @@ -246,7 +246,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.25 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -255,7 +255,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 0.33333334 value: 1.05 inSlope: 0 outSlope: 0 @@ -264,16 +264,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.71666664 + time: 0.46666667 value: 1 - inSlope: -0.352941 - outSlope: -0.352941 + inSlope: -0.35294107 + outSlope: -0.35294107 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8666667 + time: 0.6166667 value: 0.95 inSlope: 0 outSlope: 0 @@ -282,7 +282,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0833334 + time: 0.8333333 value: 1 inSlope: 0 outSlope: 0 @@ -301,7 +301,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 1 inSlope: Infinity outSlope: Infinity diff --git a/popcorn/Assets/MyGame/Scenes/Title/Title.unity b/popcorn/Assets/MyGame/Scenes/Title/Title.unity index c98a4a81..c5a727db 100644 --- a/popcorn/Assets/MyGame/Scenes/Title/Title.unity +++ b/popcorn/Assets/MyGame/Scenes/Title/Title.unity @@ -3242,7 +3242,7 @@ Transform: m_GameObject: {fileID: 1650380469} 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.2800665, y: 1.2800665, z: 1.2800665} m_Children: [] m_Father: {fileID: 1559522525} m_RootOrder: 0 @@ -3319,7 +3319,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1650380469} serializedVersion: 6 - lengthInSec: 0.3 + lengthInSec: 0.2 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -3394,7 +3394,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.6 + scalar: 0.5 minScalar: 5 maxCurve: serializedVersion: 2 @@ -4144,7 +4144,7 @@ ParticleSystem: rateOverTime: serializedVersion: 2 minMaxState: 0 - scalar: 150 + scalar: 300 minScalar: 10 maxCurve: serializedVersion: 2