From 277787fb745b4bd2110cdd709f51d071145da96e Mon Sep 17 00:00:00 2001 From: koya_15 Date: Wed, 24 Nov 2021 17:49:32 +0900 Subject: [PATCH] =?UTF-8?q?=E7=95=91=E6=96=87=E5=AD=97=E7=AD=89=E3=82=B5?= =?UTF-8?q?=E3=82=A4=E3=82=BA=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui_ComField_pop_GrainFrame.png | Bin 3838 -> 3474 bytes .../CornField/Prefabs/MachineFrame.prefab | 2 +- .../Scenes/CornField/Prefabs/detail.prefab | 20 +++++++++--------- .../Scenes/CornField/Prefabs/machine.prefab | 10 ++++----- .../CornField/ReinforcementDetail.unity | 14 ++++++------ 5 files changed, 23 insertions(+), 23 deletions(-) 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 ce972b6dba3840193ebc471d674030005d75292a..3cff09f1a4b7693cbbe96e596fe77f47da28f677 100644 GIT binary patch delta 3435 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�aX1lIeKE97xw|!ryQvPW7K%IeH%oYwK^_-?W zEA1uL<9U2!@3SRJEnQ%5U!t3|IAC62gYUrjlzbNx4I3DA82n#=0RXptd(|T}#ODA2 N002ovPDHLkV1g)r%q0K- delta 3802 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 Q7XSbN07*qoM6N<$g0|Xawg3PC 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