From cdb6a8ea95e47c870af99fa479f77717c299bc65 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 5 Nov 2021 15:35:19 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resource/Animation/title_logo.anim | 105 +++++++++++++----- .../Assets/MyGame/Scenes/Title/Title.unity | 16 +-- 2 files changed, 83 insertions(+), 38 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/title_logo.anim b/popcorn/Assets/MyGame/Resource/Animation/title_logo.anim index 7640b1f9..f3478b7d 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 + time: 0.25 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.33333334 + time: 0.5833333 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.46666667 + time: 0.71666664 value: {x: 1, y: 1, z: 1} - inSlope: {x: -0.35294107, y: -0.35294107, z: -0.35294107} - outSlope: {x: -0.35294107, y: -0.35294107, z: -0.35294107} + inSlope: {x: -0.352941, y: -0.352941, z: -0.352941} + outSlope: {x: -0.352941, y: -0.352941, z: -0.352941} 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.6166667 + time: 0.8666667 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: 0.8333333 + time: 1.0833334 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -68,7 +68,26 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: - m_FloatCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.083333336 + 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: Particle System + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -84,13 +103,20 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 922205677 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.8333333 + m_StopTime: 1.0833334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -110,7 +136,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -119,7 +145,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.5833333 value: 1.05 inSlope: 0 outSlope: 0 @@ -128,16 +154,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.46666667 + time: 0.71666664 value: 1 - inSlope: -0.35294107 - outSlope: -0.35294107 + inSlope: -0.352941 + outSlope: -0.352941 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.8666667 value: 0.95 inSlope: 0 outSlope: 0 @@ -146,7 +172,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 + time: 1.0833334 value: 1 inSlope: 0 outSlope: 0 @@ -165,7 +191,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -174,7 +200,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.5833333 value: 1.05 inSlope: 0 outSlope: 0 @@ -183,16 +209,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.46666667 + time: 0.71666664 value: 1 - inSlope: -0.35294107 - outSlope: -0.35294107 + inSlope: -0.352941 + outSlope: -0.352941 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.8666667 value: 0.95 inSlope: 0 outSlope: 0 @@ -201,7 +227,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 + time: 1.0833334 value: 1 inSlope: 0 outSlope: 0 @@ -220,7 +246,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -229,7 +255,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.5833333 value: 1.05 inSlope: 0 outSlope: 0 @@ -238,16 +264,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.46666667 + time: 0.71666664 value: 1 - inSlope: -0.35294107 - outSlope: -0.35294107 + inSlope: -0.352941 + outSlope: -0.352941 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.8666667 value: 0.95 inSlope: 0 outSlope: 0 @@ -256,7 +282,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 + time: 1.0833334 value: 1 inSlope: 0 outSlope: 0 @@ -271,6 +297,25 @@ AnimationClip: path: classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.083333336 + 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: Particle System + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Title/Title.unity b/popcorn/Assets/MyGame/Scenes/Title/Title.unity index af53014c..5e22d30b 100644 --- a/popcorn/Assets/MyGame/Scenes/Title/Title.unity +++ b/popcorn/Assets/MyGame/Scenes/Title/Title.unity @@ -1110,7 +1110,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 150 m_Sprite: {fileID: 21300000, guid: bb188fd763f57c0429accb1301e0f529, type: 3} m_Color: {r: 1, g: 0.99215686, b: 0.88235295, a: 0.6117647} m_FlipX: 0 @@ -2017,7 +2017,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 50 + m_SortingOrder: 151 m_Sprite: {fileID: 21300000, guid: 0f6fa6e29967c9b4d963817afc7844bc, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3068,9 +3068,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ea50a3e8d99284d0e9e8cc98a40f7dfe, type: 3} m_Name: m_EditorClassIdentifier: - startObject: {fileID: 1863899077} customerInterval: - value: 10 + value: 3 + startObject: {fileID: 1863899077} customerData: {fileID: 1628914680} customerControllerPrefab: {fileID: 5715829407227760309, guid: 6fbb038c9aae840f2bea57bce30740f7, type: 3} @@ -3227,7 +3227,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1650380469} serializedVersion: 6 - lengthInSec: 0.5 + lengthInSec: 0.6 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -3302,7 +3302,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.5 + scalar: 1 minScalar: 5 maxCurve: serializedVersion: 2 @@ -4052,7 +4052,7 @@ ParticleSystem: rateOverTime: serializedVersion: 2 minMaxState: 0 - scalar: 200 + scalar: 500 minScalar: 10 maxCurve: serializedVersion: 2 @@ -8567,7 +8567,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1863899077} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 471624820}