diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop.png b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop.png index 60e2f3d7..2403e3d3 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop.png differ diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index 6943a99f..ac887c6d 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -155,7 +155,7 @@ 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: 0, y: 655} + m_AnchoredPosition: {x: 0, y: 640} m_SizeDelta: {x: 658, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &90350696 @@ -578,8 +578,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: 0, y: 0} - m_SizeDelta: {x: 1000, y: 1470} + m_AnchoredPosition: {x: 0, y: 58} + m_SizeDelta: {x: 960, y: 1470} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &308891214 MonoBehaviour: @@ -674,7 +674,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: -86 + m_Top: -74 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 20 @@ -736,11 +736,11 @@ RectTransform: - {fileID: 1440832244} - {fileID: 90350695} m_Father: {fileID: 884928058} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 58} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &698470368 @@ -783,7 +783,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 308891213} - - {fileID: 1977630791} - {fileID: 698470367} m_Father: {fileID: 2144327477} m_RootOrder: 1 @@ -829,7 +828,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 117} + m_AnchoredPosition: {x: 0, y: 128} m_SizeDelta: {x: 300, y: 138} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1440832245 @@ -1115,80 +1114,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1977630790 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1977630791} - - component: {fileID: 1977630793} - - component: {fileID: 1977630792} - m_Layer: 5 - m_Name: Window_mat_White - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1977630791 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1977630790} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 884928058} - m_RootOrder: 1 - 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: 0, y: 43} - m_SizeDelta: {x: 930, y: 1140} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1977630792 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1977630790} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1d59fea183dad9049913c26dbc9000f7, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1977630793 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1977630790} - m_CullTransparentMesh: 0 --- !u!1 &2144327473 GameObject: m_ObjectHideFlags: 0