diff --git a/popcorn/Assets/MyGame/Resource/Animation/StockCorn_addition.anim b/popcorn/Assets/MyGame/Resource/Animation/StockCorn_addition.anim index 5c48902f..a1171b8a 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/StockCorn_addition.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/StockCorn_addition.anim @@ -28,7 +28,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: 0, y: 0, z: -6.7960005} + value: {x: 0, y: 0, z: -4.175} 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: 0.33333334 - value: {x: 0, y: 0, z: 4.9430003} + value: {x: 0, y: 0, z: 2.8060002} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -46,7 +46,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 0, y: 0, z: -3.8380003} + value: {x: 0, y: 0, z: -4.175} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -55,7 +55,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0, y: 0, z: 4.7700005} + value: {x: 0, y: 0, z: 2.8060002} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -257,7 +257,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: -6.7960005 + value: -4.175 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -266,7 +266,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 4.9430003 + value: 2.8060002 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -275,7 +275,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: -3.8380003 + value: -4.175 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -284,7 +284,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 4.7700005 + value: 2.8060002 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resource/Animation/StockCorn_addition_appear.anim b/popcorn/Assets/MyGame/Resource/Animation/StockCorn_addition_appear.anim index b7163ed4..50110c6a 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/StockCorn_addition_appear.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/StockCorn_addition_appear.anim @@ -21,7 +21,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.6, z: 1} + value: {x: 0, y: 0.3375, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -30,7 +30,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: 1.0251564, y: 1.0504688, z: 1} + value: {x: 1.025, y: 1.0121875, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -50,44 +50,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -207 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -105 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: -105 - 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_AnchoredPosition.x - path: - classID: 224 - script: {fileID: 0} + m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -103,13 +66,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 - isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -146,7 +102,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: 1.0251564 + value: 1.025 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -174,7 +130,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.6 + value: 0.3375 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -183,7 +139,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: 1.0504688 + value: 1.0121875 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -243,43 +199,6 @@ AnimationClip: path: classID: 224 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -207 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -105 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: -105 - 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_AnchoredPosition.x - path: - classID: 224 - script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_text_grain_addition.png b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_text_grain_addition.png index fb6941c7..d8f29c78 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_text_grain_addition.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_text_grain_addition.png differ diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index b02c1cbc..4cefc585 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -693,10 +693,10 @@ RectTransform: m_Father: {fileID: 457045028} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 151.37857, y: -50} - m_SizeDelta: {x: 159.35715, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &323920547 MonoBehaviour: @@ -730,7 +730,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\uFF0B1000" + m_Text: "\uFF0B10" --- !u!222 &323920548 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1352,8 +1352,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -127.10715, y: 41.000015} - m_SizeDelta: {x: 289.05713, y: 88} + m_AnchoredPosition: {x: -32.99994, y: 15.999985} + m_SizeDelta: {x: 0, y: 88} m_Pivot: {x: 0, y: 1} --- !u!114 &457045029 MonoBehaviour: @@ -1370,7 +1370,7 @@ MonoBehaviour: m_Padding: m_Left: 39 m_Right: 58 - m_Top: 0 + m_Top: 4 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 32.7 @@ -2345,9 +2345,9 @@ RectTransform: m_Father: {fileID: 457045028} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &973728754 @@ -2627,7 +2627,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1106859980 RectTransform: m_ObjectHideFlags: 0 @@ -2643,11 +2643,11 @@ RectTransform: m_Father: {fileID: 387414334} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -101, y: 926} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 66, y: -241} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!95 &1106859981 Animator: serializedVersion: 3 @@ -13541,7 +13541,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 13.8, y: -23.8} + m_AnchoredPosition: {x: 9, y: -26} m_SizeDelta: {x: 38, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1881129200