diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index d8829651..125d156d 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -200,163 +200,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 13667850, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.x - value: 82 - objectReference: {fileID: 0} - - target: {fileID: 13667850, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.y - value: 64 - objectReference: {fileID: 0} - - target: {fileID: 13667850, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.x - value: -50.00001 - objectReference: {fileID: 0} - - target: {fileID: 118497225, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.x - value: 234 - objectReference: {fileID: 0} - - target: {fileID: 118497225, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.y - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 130281749, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_Name - value: Button_growth - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.y - value: -2108 - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.x - value: -215 - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.y - value: -212 - objectReference: {fileID: 0} - - target: {fileID: 1339603269, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1339603269, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.y - value: 42 - objectReference: {fileID: 0} - - target: {fileID: 1339603269, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 1464061989, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1464061989, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.y - value: 42 - objectReference: {fileID: 0} - - target: {fileID: 1464061989, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.x - value: 44.00004 - objectReference: {fileID: 0} - - target: {fileID: 1823819595, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.x - value: 254 - objectReference: {fileID: 0} - - target: {fileID: 1823819595, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.y - value: 106 - objectReference: {fileID: 0} - - target: {fileID: 1974020075, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.x - value: 82 - objectReference: {fileID: 0} - - target: {fileID: 1974020075, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.y - value: 64 - objectReference: {fileID: 0} - - target: {fileID: 1974020075, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.x - value: -50 - objectReference: {fileID: 0} - - target: {fileID: 2041305253, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2041305254, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.x - value: 234 - objectReference: {fileID: 0} - - target: {fileID: 2041305254, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.y - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3664916832564167473, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Name @@ -482,11 +325,6 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} --- !u!1 &536970157 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index f9b43467..e28fb009 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -1004,6 +1004,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 130281749, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 320398123, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 885868be..9e7755cc 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -34,8 +34,8 @@ RectTransform: 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: -63, y: -4} - m_SizeDelta: {x: 98, y: 80} + m_AnchoredPosition: {x: -50.00001, y: -4} + m_SizeDelta: {x: 82, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &13667852 CanvasRenderer: @@ -112,7 +112,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 291, y: 150} + m_SizeDelta: {x: 234, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &118497228 CanvasRenderer: @@ -204,7 +204,7 @@ GameObject: m_Component: - component: {fileID: 130281750} m_Layer: 5 - m_Name: Button_ + m_Name: Button_growth m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -227,10 +227,10 @@ RectTransform: m_Father: {fileID: 3664916832844628215} m_RootOrder: 4 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: 418, y: -202} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -215, y: -212} + m_SizeDelta: {x: 100, y: -2108} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &320398123 GameObject: @@ -386,8 +386,8 @@ RectTransform: 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: 51, y: 8} - m_SizeDelta: {x: 120, y: 52} + m_AnchoredPosition: {x: 44, y: 8} + m_SizeDelta: {x: 100, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1339603271 CanvasRenderer: @@ -608,8 +608,8 @@ RectTransform: 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: 51.000053, y: -5} - m_SizeDelta: {x: 120, y: 52} + m_AnchoredPosition: {x: 44.00004, y: -5} + m_SizeDelta: {x: 100, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1464061991 CanvasRenderer: @@ -683,7 +683,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -29} - m_SizeDelta: {x: 320, y: 136} + m_SizeDelta: {x: 254, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1823819597 CanvasRenderer: @@ -756,8 +756,8 @@ RectTransform: 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: -63.000004, y: 9} - m_SizeDelta: {x: 98, y: 80} + m_AnchoredPosition: {x: -50, y: 9} + m_SizeDelta: {x: 82, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1974020077 CanvasRenderer: @@ -814,7 +814,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2041305254 RectTransform: m_ObjectHideFlags: 0 @@ -834,7 +834,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 291, y: 150} + m_SizeDelta: {x: 234, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2041305257 CanvasRenderer: