diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim index 66fa3c08..ba604218 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim @@ -732,7 +732,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5833333 + time: 0.9166667 value: 0 inSlope: Infinity outSlope: Infinity @@ -741,7 +741,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.6 + time: 1 value: 1 inSlope: Infinity outSlope: Infinity @@ -775,6 +775,34 @@ AnimationClip: path: pt_Hit_c classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + 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: pt_Smoke_c (1) + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -944,6 +972,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 741289173 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -2595,7 +2630,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5833333 + time: 0.9166667 value: 0 inSlope: Infinity outSlope: Infinity @@ -2604,7 +2639,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.6 + time: 1 value: 1 inSlope: Infinity outSlope: Infinity @@ -2638,6 +2673,34 @@ AnimationClip: path: pt_Hit_c classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + 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: pt_Smoke_c (1) + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab index 22a863dd..3633d94a 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab @@ -30,6 +30,7 @@ Transform: m_Children: - {fileID: 2000043922596723899} - {fileID: 9165202840736919352} + - {fileID: 3329976228366573394} - {fileID: 8366474694430641870} m_Father: {fileID: 0} m_RootOrder: 0 @@ -84,6 +85,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4881018188335882927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3329976228366573394} + - component: {fileID: 4553206951139253898} + m_Layer: 0 + m_Name: tree_center (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3329976228366573394 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4881018188335882927} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.99, y: 1.36, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3769247313527994625} + m_Father: {fileID: 7170547486884922313} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4553206951139253898 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4881018188335882927} + 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: 3 + m_Sprite: {fileID: 21300000, guid: 200146f616682b4499568c3795b157cf, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.48, y: 1.76} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6320076065680994612 GameObject: m_ObjectHideFlags: 0 @@ -109,7 +192,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6320076065680994612} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.11, y: 0.65, z: 0} + m_LocalPosition: {x: -1.14, y: 0.41, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6296419824617624433} @@ -196,7 +279,7 @@ Transform: m_Children: - {fileID: 3743485536561059171} m_Father: {fileID: 7170547486884922313} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7392310108678024470 SpriteRenderer: @@ -273,7 +356,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9197360416021838947} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.63, y: 2.27, z: 0} + m_LocalPosition: {x: 0.61, y: 2.37, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4826568820401640802} @@ -330,6 +413,91 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &4304742951693597515 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3329976228366573394} + m_Modifications: + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.57 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.28 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835659, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_Name + value: Item center + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, type: 3} +--- !u!4 &3769247313527994625 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + m_PrefabInstance: {fileID: 4304742951693597515} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4323740264674268969 PrefabInstance: m_ObjectHideFlags: 0