diff --git a/popcorn/Assets/MyGame/Resource/Animation/minigame_mala.anim b/popcorn/Assets/MyGame/Resource/Animation/minigame_mala.anim index 53ea8b74..008e2cff 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/minigame_mala.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/minigame_mala.anim @@ -20,15 +20,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 19.487432} + outSlope: {x: 0, y: 0, z: 19.487432} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.40068} - serializedVersion: 3 time: 1 - value: {x: 0, y: 0, z: 10.933001} + value: {x: 0, y: 0, z: 14.684053} 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, y: 0, z: -9.657001} + value: {x: 0, y: 0, z: -13.042102} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -45,80 +45,19 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 5 - value: {x: 0, y: 0, z: 10.933001} - 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: 6.5 + time: 4 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 19.487432} + outSlope: {x: 0, y: 0, z: 19.487432} 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: Sprite - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, 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: 1 - value: {x: 0.123, y: 0, 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: -0.104, y: 0.0000000026753106, 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: 5 - value: {x: 0.123, y: 0, 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: 6.5 - value: {x: 0, y: 0, 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} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.40068} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 path: Sprite + m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -129,13 +68,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 850496168 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 850496168 attribute: 4 @@ -149,7 +81,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 6.5 + m_StopTime: 4 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -177,42 +109,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.5 - 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 @@ -232,42 +128,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.5 - 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 @@ -281,15 +141,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: 19.487432 + outSlope: 19.487432 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.40068 - serializedVersion: 3 time: 1 - value: 10.933001 + value: 14.684053 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -298,7 +158,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: -9.657001 + value: -13.042102 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -306,23 +166,14 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5 - value: 10.933001 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.5 + time: 4 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: 19.487432 + outSlope: 19.487432 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.40068 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -330,171 +181,6 @@ AnimationClip: path: Sprite 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: 1 - value: 0.123 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3 - value: -0.104 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0.123 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.5 - 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.x - path: Sprite - 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: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3 - value: 0.0000000026753106 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.5 - 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.y - path: Sprite - 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: 1 - 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 - - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.5 - 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: Sprite - classID: 4 - script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png.meta b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png.meta index c09b76a4..0ebd6b92 100644 --- a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png.meta @@ -43,8 +43,8 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.39380047, y: 0.8876277} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab index 5396cae9..54ba24dd 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab @@ -57,7 +57,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1639218262903504554} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -0.05, y: 0.75, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6539942726493018669} @@ -228,7 +228,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.08 + scalar: 0.13 minScalar: 1 maxCurve: serializedVersion: 2 @@ -397,7 +397,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 0 - scalar: 1.2 + scalar: 1.7 minScalar: 0.6 maxCurve: serializedVersion: 2 @@ -5048,8 +5048,8 @@ ParticleSystem: enabled: 1 startLifetime: serializedVersion: 2 - minMaxState: 3 - scalar: 0.4 + minMaxState: 0 + scalar: 0.6 minScalar: 0.3 maxCurve: serializedVersion: 2 @@ -5102,7 +5102,7 @@ ParticleSystem: startSpeed: serializedVersion: 2 minMaxState: 0 - scalar: 6.5 + scalar: 8 minScalar: 5 maxCurve: serializedVersion: 2 @@ -5156,7 +5156,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 1, b: 0.5372549, a: 1} + maxColor: {r: 1, g: 0.9048595, b: 0.2971698, a: 1} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -5218,8 +5218,8 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 3 - scalar: 0.31 - minScalar: 0.8 + scalar: 0.4 + minScalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -5680,7 +5680,7 @@ ParticleSystem: sphericalDirectionAmount: 0 randomPositionAmount: 0 radius: - value: 0.58 + value: 1 mode: 0 spread: 0 speed: @@ -14764,7 +14764,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.1 + scalar: 0.2 minScalar: 5 maxCurve: serializedVersion: 2 @@ -14933,7 +14933,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 0 - scalar: 0.12 + scalar: 0.18 minScalar: 1 maxCurve: serializedVersion: 2 @@ -19581,8 +19581,8 @@ ParticleSystem: startSpeed: serializedVersion: 2 minMaxState: 3 - scalar: 16.1 - minScalar: 20 + scalar: 4 + minScalar: 7 maxCurve: serializedVersion: 2 m_Curve: @@ -20159,7 +20159,7 @@ ParticleSystem: sphericalDirectionAmount: 0 randomPositionAmount: 0 radius: - value: 0.66 + value: 1 mode: 0 spread: 0 speed: @@ -21984,7 +21984,7 @@ ParticleSystem: magnitude: serializedVersion: 2 minMaxState: 1 - scalar: 11.751969 + scalar: 27.780933 minScalar: 1 maxCurve: serializedVersion: 2 @@ -21992,21 +21992,21 @@ ParticleSystem: - serializedVersion: 3 time: 0 value: 1 - inSlope: -11.062949 - outSlope: -11.062949 + inSlope: -6.969014 + outSlope: -6.969014 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.16652925 + outWeight: 0.0549272 - serializedVersion: 3 - time: 0.13278762 - value: 0.16854498 - inSlope: -0.64351463 - outSlope: -0.64351463 + time: 0.25037605 + value: 0.21145853 + inSlope: -0.59182775 + outSlope: -0.59182775 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.12266508 - serializedVersion: 3 time: 1 value: 0 @@ -24349,7 +24349,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.3 + scalar: 0.5 minScalar: 1 maxCurve: serializedVersion: 2 @@ -24456,7 +24456,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 0.9445122, b: 0, a: 1} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -24518,7 +24518,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 1.5 minScalar: 0.6 maxCurve: serializedVersion: 2