From 3db9b5bfa37eb510edef1e90e7c722c8dc3105c5 Mon Sep 17 00:00:00 2001 From: hirokei Date: Mon, 4 Jul 2022 10:14:10 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=9F=E3=83=8B=E3=82=B2=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E6=BC=94=E5=87=BA=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Brother/Brother_pink_FallDown.anim | 116 +++++++++------ .../Animation/Brother/Brother_pink_run.anim | 132 ++++++++++++------ .../MiniGame/Prefabs/Brother_pink.prefab | 10 +- .../Scenes/MiniGame/Prefabs/Item.prefab | 14 +- 4 files changed, 181 insertions(+), 91 deletions(-) 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 0dc3bc79..6a5b9a26 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim @@ -20,15 +20,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: 0, z: 44.074} - inSlope: {x: 0, y: 0, z: -76.20924} - outSlope: {x: 0, y: 0, z: -76.20924} + inSlope: {x: 0, y: 0, z: -147.09198} + outSlope: {x: 0, y: 0, z: -147.09198} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.38405845} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.16393444} - serializedVersion: 3 time: 0.28333333 - value: {x: 0, y: 0, z: 35.144924} + value: {x: 0, y: 0, z: 26.437298} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -38,11 +38,11 @@ AnimationClip: - serializedVersion: 3 time: 0.53333336 value: {x: 0, y: 0, z: 44.074} - inSlope: {x: 0, y: 0, z: 69.09161} + inSlope: {x: 0, y: 0, z: 150.8636} outSlope: {x: 0, y: 0, z: -45.46705} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.49271458} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.19890699} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.74431366} m_PreInfinity: 2 m_PostInfinity: 2 @@ -146,15 +146,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 1.3457108, y: -1.2956285, z: 0} - inSlope: {x: 0, y: 0.017254356, z: 0} - outSlope: {x: 0, y: 12.737325, z: 0} + inSlope: {x: -3.440333, y: 0.017254356, z: 0} + outSlope: {x: -3.440333, y: 12.737325, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.57309645, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.21678068, z: 0.33333334} + outWeight: {x: 0.5185951, y: 0.21678068, z: 0.33333334} - serializedVersion: 3 time: 0.28333333 - value: {x: 1.3457108, y: 0.17907894, z: 0} + value: {x: 0.8993912, y: 0.33847833, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -164,11 +164,11 @@ AnimationClip: - serializedVersion: 3 time: 0.53333336 value: {x: 1.3457108, y: -1.2956285, z: 0} - inSlope: {x: 0, y: -15.697801, z: 0} + inSlope: {x: 4.6796384, y: -15.697801, z: 0} outSlope: {x: 0, y: 7.232945, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.12783264, z: 0.33333334} + inWeight: {x: 0.45025653, y: 0.12783264, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.34686986, z: 0.33333334} - serializedVersion: 3 time: 0.73333335 @@ -201,14 +201,14 @@ AnimationClip: time: 1.3166667 value: {x: 1.3457108, y: -1.2956285, z: 0} inSlope: {x: 0, y: -3.7606313, z: 0} - outSlope: {x: 0, y: 2.7347202, z: 0} + outSlope: {x: 0, y: 3.0077975, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.4563444, z: 0.33333334} - outWeight: {x: 0.33333334, y: 1, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.6939897, z: 0.33333334} - serializedVersion: 3 time: 1.4666667 - value: {x: 1.3457108, y: -1.1384737, z: 0} + value: {x: 1.3457108, y: -1.0983431, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -333,7 +333,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.13333334 + time: 0.15 value: {x: 1.0082018, y: 1.0082018, z: 1.0082018} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -342,7 +342,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.16666667 + time: 0.2 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -567,6 +567,15 @@ AnimationClip: - 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.53333336 value: 1 @@ -863,12 +872,30 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1.3457108 + inSlope: -3.440333 + outSlope: -3.440333 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.5185951 + - serializedVersion: 3 + time: 0.28333333 + value: 0.8993912 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.53333336 + value: 1.3457108 + inSlope: 4.6796384 + outSlope: 0 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.45025653 + outWeight: 0.33333334 - serializedVersion: 3 time: 1.65 value: 1.3457108 @@ -899,7 +926,7 @@ AnimationClip: outWeight: 0.21678068 - serializedVersion: 3 time: 0.28333333 - value: 0.17907894 + value: 0.33847833 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -946,14 +973,14 @@ AnimationClip: time: 1.3166667 value: -1.2956285 inSlope: -3.7606313 - outSlope: 2.7347202 + outSlope: 3.0077975 tangentMode: 1 weightedMode: 0 inWeight: 0.4563444 - outWeight: 1 + outWeight: 0.6939897 - serializedVersion: 3 time: 1.4666667 - value: -1.1384737 + value: -1.0983431 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1039,15 +1066,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 44.074 - inSlope: -76.20924 - outSlope: -76.20924 + inSlope: -147.09198 + outSlope: -147.09198 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.38405845 + outWeight: 0.16393444 - serializedVersion: 3 time: 0.28333333 - value: 35.144924 + value: 26.437298 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1057,11 +1084,11 @@ AnimationClip: - serializedVersion: 3 time: 0.53333336 value: 44.074 - inSlope: 69.09161 + inSlope: 150.8636 outSlope: -45.46705 tangentMode: 1 weightedMode: 0 - inWeight: 0.49271458 + inWeight: 0.19890699 outWeight: 0.74431366 m_PreInfinity: 2 m_PostInfinity: 2 @@ -1708,6 +1735,15 @@ AnimationClip: - 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.53333336 value: 1 @@ -1774,7 +1810,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.15 value: 1.0082018 inSlope: 0 outSlope: 0 @@ -1783,7 +1819,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -1829,7 +1865,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.15 value: 1.0082018 inSlope: 0 outSlope: 0 @@ -1838,7 +1874,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -1884,7 +1920,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.15 value: 1.0082018 inSlope: 0 outSlope: 0 @@ -1893,7 +1929,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -1916,7 +1952,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: AnimationPivot_pink + path: AnimationPivot_pink/pink/wing/right_b classID: 4 script: {fileID: 0} - curve: @@ -1926,7 +1962,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: AnimationPivot_pink + path: AnimationPivot_pink/pink/wing/right_b classID: 4 script: {fileID: 0} - curve: @@ -1936,7 +1972,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: AnimationPivot_pink + path: AnimationPivot_pink/pink/wing/right_b classID: 4 script: {fileID: 0} - curve: @@ -2036,7 +2072,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: AnimationPivot_pink/pink/wing/right_b + path: AnimationPivot_pink classID: 4 script: {fileID: 0} - curve: @@ -2046,7 +2082,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: AnimationPivot_pink/pink/wing/right_b + path: AnimationPivot_pink classID: 4 script: {fileID: 0} - curve: @@ -2056,7 +2092,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: AnimationPivot_pink/pink/wing/right_b + path: AnimationPivot_pink classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 @@ -2069,7 +2105,7 @@ AnimationClip: floatParameter: 0 intParameter: 0 messageOptions: 0 - - time: 0.5833333 + - time: 0.53333336 functionName: OnPlaySE data: se_minigame_FallDown objectReferenceParameter: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_run.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_run.anim index 85f48a1f..0f3f730c 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_run.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_run.anim @@ -25,16 +25,43 @@ AnimationClip: 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.29637715} - serializedVersion: 3 - time: 0.33333334 - value: {x: 0, y: 0, z: 7.463} + time: 0.35 + value: {x: 0, y: 0, z: 10.435579} 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: 0.8333333 + value: {x: 0, y: 0, z: 7.463} + 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.2035047} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.25761148} + - serializedVersion: 3 + time: 1.1833333 + value: {x: 0, y: 0, z: 10.435579} + 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.6666666 + value: {x: 0, y: 0, z: 7.463} + 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.2035047} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.29637715} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -595,10 +622,10 @@ AnimationClip: 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.14319597, z: 0.33333334} - serializedVersion: 3 time: 0.35 - value: {x: 1, y: 0.97254425, z: 1} + value: {x: 1, y: 0.9514146, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -612,11 +639,11 @@ AnimationClip: 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} + inWeight: {x: 0.33333334, y: 0.13405779, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.13532521, z: 0.33333334} - serializedVersion: 3 time: 1.1833333 - value: {x: 1, y: 0.97254425, z: 1} + value: {x: 1, y: 0.9548746, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -630,7 +657,7 @@ AnimationClip: outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.15230063, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -969,6 +996,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1016787908 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 - serializedVersion: 2 path: 2938359398 attribute: 4 @@ -1060,13 +1094,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1016787908 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 - serializedVersion: 2 path: 1249092771 attribute: 4 @@ -1187,7 +1214,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.35 value: 0 inSlope: 0 outSlope: 0 @@ -1215,7 +1242,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.35 value: 0 inSlope: 0 outSlope: 0 @@ -1238,19 +1265,46 @@ AnimationClip: value: 7.463 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.29637715 - serializedVersion: 3 - time: 0.33333334 - value: 7.463 + time: 0.35 + value: 10.435579 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 7.463 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.2035047 + outWeight: 0.25761148 + - serializedVersion: 3 + time: 1.1833333 + value: 10.435579 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.6666666 + value: 7.463 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.2035047 + outWeight: 0.29637715 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1266,7 +1320,7 @@ AnimationClip: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1285,13 +1339,13 @@ AnimationClip: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.14319597 - serializedVersion: 3 time: 0.35 - value: 0.97254425 + value: 0.9514146 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1303,13 +1357,13 @@ AnimationClip: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0.13405779 + outWeight: 0.13532521 - serializedVersion: 3 time: 1.1833333 - value: 0.97254425 + value: 0.9548746 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1321,9 +1375,9 @@ AnimationClip: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.15230063 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -1340,7 +1394,7 @@ AnimationClip: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -3668,7 +3722,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: AnimationPivot_pink + path: AnimationPivot_pink/pink/eye/left classID: 4 script: {fileID: 0} - curve: @@ -3678,7 +3732,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: AnimationPivot_pink + path: AnimationPivot_pink/pink/eye/left classID: 4 script: {fileID: 0} - curve: @@ -3688,7 +3742,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: AnimationPivot_pink + path: AnimationPivot_pink/pink/eye/left classID: 4 script: {fileID: 0} - curve: @@ -3788,7 +3842,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: AnimationPivot_pink/pink/eye/left + path: AnimationPivot_pink classID: 4 script: {fileID: 0} - curve: @@ -3798,7 +3852,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: AnimationPivot_pink/pink/eye/left + path: AnimationPivot_pink classID: 4 script: {fileID: 0} - curve: @@ -3808,7 +3862,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: AnimationPivot_pink/pink/eye/left + path: AnimationPivot_pink classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab index 9697470e..0a640a05 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab @@ -12762,12 +12762,12 @@ PrefabInstance: - target: {fileID: 4446879967393919678, guid: 43c94bfac7a232f4fa8c039b03c4de02, type: 3} propertyPath: m_LocalPosition.x - value: 0.1 + value: 0.16 objectReference: {fileID: 0} - target: {fileID: 4446879967393919678, guid: 43c94bfac7a232f4fa8c039b03c4de02, type: 3} propertyPath: m_LocalPosition.y - value: -0.96 + value: -1.02 objectReference: {fileID: 0} - target: {fileID: 4446879967393919678, guid: 43c94bfac7a232f4fa8c039b03c4de02, type: 3} @@ -12812,7 +12812,7 @@ PrefabInstance: - target: {fileID: 4468132009541508291, guid: 43c94bfac7a232f4fa8c039b03c4de02, type: 3} propertyPath: lengthInSec - value: 1 + value: 1.3 objectReference: {fileID: 0} - target: {fileID: 4468132009541508291, guid: 43c94bfac7a232f4fa8c039b03c4de02, type: 3} @@ -12877,7 +12877,7 @@ PrefabInstance: - target: {fileID: 8052677272981811247, guid: 43c94bfac7a232f4fa8c039b03c4de02, type: 3} propertyPath: lengthInSec - value: 1 + value: 1.3 objectReference: {fileID: 0} - target: {fileID: 8052677272981811247, guid: 43c94bfac7a232f4fa8c039b03c4de02, type: 3} @@ -12887,7 +12887,7 @@ PrefabInstance: - target: {fileID: 8052677272981811247, guid: 43c94bfac7a232f4fa8c039b03c4de02, type: 3} propertyPath: EmissionModule.rateOverTime.scalar - value: 15.255594 + value: 12.088389 objectReference: {fileID: 0} - target: {fileID: 8052677272981811247, guid: 43c94bfac7a232f4fa8c039b03c4de02, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab index 53ce2969..0471bbbb 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab @@ -5048,9 +5048,9 @@ ParticleSystem: enabled: 1 startLifetime: serializedVersion: 2 - minMaxState: 0 + minMaxState: 3 scalar: 0.6 - minScalar: 0.3 + minScalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -5154,7 +5154,7 @@ ParticleSystem: m_RotationOrder: 4 startColor: serializedVersion: 2 - minMaxState: 0 + minMaxState: 2 minColor: {r: 1, g: 1, b: 1, a: 1} maxColor: {r: 1, g: 0.9048595, b: 0.2971698, a: 1} maxGradient: @@ -9897,7 +9897,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &3823135948477190933 Transform: m_ObjectHideFlags: 0 @@ -9906,7 +9906,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6352865023114671538} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.14} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6625499126368277584} @@ -14933,7 +14933,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 0 - scalar: 0.3 + scalar: 0.2 minScalar: 1 maxCurve: serializedVersion: 2 @@ -19438,7 +19438,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8742748765146090464} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.17999995} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2248795472090075867}