diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_Footer_ReinforcementMax_logo.png b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_Footer_ReinforcementMax_logo.png index 6deb35cb..57754741 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_Footer_ReinforcementMax_logo.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_Footer_ReinforcementMax_logo.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_release_logo.png b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_release_logo.png index 2ab6943b..608a797d 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_release_logo.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_release_logo.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_release_logo_gray.png b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_release_logo_gray.png index 5d403764..43cc95a4 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_release_logo_gray.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_release_logo_gray.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_strengthening_logo.png b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_strengthening_logo.png index 0d168da6..2b58c071 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_strengthening_logo.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_strengthening_logo.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_strengthening_logo_gray.png b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_strengthening_logo_gray.png index 9080c4cb..17c03ebb 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_strengthening_logo_gray.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_icon_strengthening_logo_gray.png differ diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index 5741f769..bead7451 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab @@ -486,7 +486,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: -430.99988, y: 0.00012207031} + m_AnchoredPosition: {x: -430, y: 0} m_SizeDelta: {x: 284, y: 228} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7872349617253565850 @@ -820,7 +820,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 40ed79e6ffdfa424fbf23ffa60973bb2, type: 3} + m_Sprite: {fileID: 21300000, guid: ee73db39cff93334a92789ac47e0e509, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -924,7 +924,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 118, y: 38} + m_SizeDelta: {x: 122, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114270452900658 CanvasRenderer: @@ -1841,7 +1841,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1.3000093, y: 4} - m_SizeDelta: {x: 118, y: 38} + m_SizeDelta: {x: 122, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114271397819352 CanvasRenderer: @@ -1952,7 +1952,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1.3, y: 4} - m_SizeDelta: {x: 118, y: 38} + m_SizeDelta: {x: 122, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114271449284242 CanvasRenderer: @@ -2600,7 +2600,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 118, y: 38} + m_SizeDelta: {x: 122, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114271781323280 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index be217013..765cf8a8 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -484,7 +484,7 @@ RectTransform: m_GameObject: {fileID: 575026009} 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.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 1192264082} m_RootOrder: 0 @@ -567,7 +567,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -71} - m_SizeDelta: {x: 648, y: 156} + m_SizeDelta: {x: 650, y: 156} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &653404267 MonoBehaviour: @@ -928,7 +928,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 140, y: -226.89993} - m_SizeDelta: {x: 240, y: 98} + m_SizeDelta: {x: 240, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &865761136 MonoBehaviour: @@ -992,7 +992,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 40ed79e6ffdfa424fbf23ffa60973bb2, type: 3} + m_Sprite: {fileID: 21300000, guid: ee73db39cff93334a92789ac47e0e509, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1203,7 +1203,7 @@ RectTransform: m_GameObject: {fileID: 1020149465} 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.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 865761135} m_RootOrder: 0 @@ -1431,7 +1431,7 @@ RectTransform: m_GameObject: {fileID: 1122617362} 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.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 1130921225} m_RootOrder: 0 @@ -1516,7 +1516,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -159, y: -226.89996} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 196, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1130921226 MonoBehaviour: @@ -1730,7 +1730,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 140, y: -226.89993} - m_SizeDelta: {x: 240, y: 98} + m_SizeDelta: {x: 240, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1192264083 MonoBehaviour: @@ -2846,7 +2846,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index cc423b35..bab2fd1d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity @@ -158,8 +158,8 @@ 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: -159, y: 60.999924} - m_SizeDelta: {x: 196, y: 98} + m_AnchoredPosition: {x: -159, y: 61} + m_SizeDelta: {x: 196, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4540746 MonoBehaviour: @@ -470,7 +470,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 140, y: 61} - m_SizeDelta: {x: 240, y: 98} + m_SizeDelta: {x: 240, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &208413211 MonoBehaviour: @@ -732,7 +732,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -159, y: 113.999985} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 196, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &371454781 MonoBehaviour: @@ -1588,7 +1588,7 @@ RectTransform: m_GameObject: {fileID: 1664081616} 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.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 4540745} m_RootOrder: 0 @@ -1662,7 +1662,7 @@ RectTransform: m_GameObject: {fileID: 1689124038} 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.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 1986250437} m_RootOrder: 0 @@ -2111,7 +2111,7 @@ RectTransform: m_GameObject: {fileID: 1965744824} 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.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 371454780} m_RootOrder: 0 @@ -2196,7 +2196,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 140, y: 113.999985} - m_SizeDelta: {x: 240, y: 98} + m_SizeDelta: {x: 240, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1986250438 MonoBehaviour: @@ -2321,7 +2321,7 @@ RectTransform: m_GameObject: {fileID: 2130390879} 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.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 208413210} m_RootOrder: 0