diff --git a/popcorn/Assets/MyGame/Resource/Animation/title_logo.anim b/popcorn/Assets/MyGame/Resource/Animation/title_logo.anim index 06420a6a..4d4f62dd 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/title_logo.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/title_logo.anim @@ -274,4 +274,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.15 + functionName: OnPlaySE + data: se_cooking_corn_Pop + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Material/title/title_logo.png b/popcorn/Assets/MyGame/Resource/Material/title/title_logo.png index 3e088baa..47f2bae5 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/title/title_logo.png and b/popcorn/Assets/MyGame/Resource/Material/title/title_logo.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Title/Title.unity b/popcorn/Assets/MyGame/Scenes/Title/Title.unity index b144c22a..69396f1c 100644 --- a/popcorn/Assets/MyGame/Scenes/Title/Title.unity +++ b/popcorn/Assets/MyGame/Scenes/Title/Title.unity @@ -485,6 +485,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2063870805} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -802,6 +807,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 231039073} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -958,6 +968,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 231039073} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -1309,6 +1324,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 231039073} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -1384,6 +1404,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 231039073} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -1608,6 +1633,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 231039073} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -1764,6 +1794,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2063870805} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -2163,6 +2198,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2063870805} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -2400,6 +2440,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 231039073} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -2924,6 +2969,7 @@ GameObject: m_Component: - component: {fileID: 1559522525} - component: {fileID: 1559522526} + - component: {fileID: 1559522527} m_Layer: 0 m_Name: logo m_TagString: Untagged @@ -2966,6 +3012,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1559522527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1559522524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &1650380469 GameObject: m_ObjectHideFlags: 0 @@ -3693,7 +3765,7 @@ ParticleSystem: angle: 6.44 length: 5 boxThickness: {x: 0, y: 0, z: 0} - radiusThickness: 1 + radiusThickness: 0.97 donutRadius: 0.2 m_Position: {x: 0, y: 0, z: 0} m_Rotation: {x: 0, y: 0, z: 0} @@ -7947,6 +8019,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2063870805} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -8227,6 +8304,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2063870805} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -8302,6 +8384,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2063870805} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder @@ -8545,6 +8632,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2063870805} m_Modifications: + - target: {fileID: 2963075757041185889, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} propertyPath: m_RootOrder