diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_GrainFrame.png b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_GrainFrame.png index ce972b6d..3cff09f1 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_GrainFrame.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_GrainFrame.png differ diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/MachineFrame.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/MachineFrame.prefab index d7659f13..b38fbc0e 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/MachineFrame.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/MachineFrame.prefab @@ -178,7 +178,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index bead7451..9553c670 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab @@ -2063,8 +2063,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: 139.3, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 149.2, y: -40.3} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114271522345133 CanvasRenderer: @@ -2095,11 +2095,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -2443,8 +2443,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: 139.3, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 149.20003, y: -40.3} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114271730917459 CanvasRenderer: @@ -2475,11 +2475,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab index 54ab2ceb..6a06faf3 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab @@ -113,8 +113,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: 139.3, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 149.2, y: -40.3} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2616693359208994954 CanvasRenderer: @@ -145,11 +145,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index 765cf8a8..723cfa33 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -184,14 +184,14 @@ RectTransform: m_GameObject: {fileID: 239476807} 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_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 1929329151} 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: 34.9, y: -38.2} + m_AnchoredPosition: {x: 36.6, y: -37.3} m_SizeDelta: {x: 44, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &239476809 @@ -339,8 +339,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: 161.3, y: -38.9} - m_SizeDelta: {x: 210, y: 50} + m_AnchoredPosition: {x: 170, y: -40.4} + m_SizeDelta: {x: 180, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &457453804 MonoBehaviour: @@ -363,11 +363,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1