diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/Canvas.prefab index 115146b8..3677dcde 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/Canvas.prefab @@ -674,7 +674,7 @@ GameObject: - component: {fileID: 1642413381154068434} - component: {fileID: 636377501859366768} m_Layer: 5 - m_Name: ShopInfoPanel + m_Name: RecordPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1530,8 +1530,8 @@ MonoBehaviour: shopInfoButton: {fileID: 6859128401074204927} recordButton: {fileID: 6859128402628860639} scrollRect: {fileID: 6859128403032312400} - shopInfoObject: {fileID: 6859128401107917369} - recordObject: {fileID: 6859128401516038726} + shopInfoObject: {fileID: 6859128401516038726} + recordObject: {fileID: 6859128401107917369} historyTarget: {fileID: 6859128401143531340} productTarget: {fileID: 2283608498504545933} materialTarget: {fileID: 41559837514718277} @@ -2389,7 +2389,7 @@ GameObject: - component: {fileID: 6859128401516038713} - component: {fileID: 6859128401516038712} m_Layer: 5 - m_Name: RecordPanel + m_Name: ShopInfoPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs index f5277c8c..3ce3557f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs @@ -63,10 +63,8 @@ public class Information : MonoBehaviour recordEnabled.SetActive(!isShopInfo); recordObject.SetActive(!isShopInfo); scrollRect.content = (isShopInfo ? shopInfoObject.transform : recordObject.transform) as RectTransform; - LayoutRebuilder.ForceRebuildLayoutImmediate(scrollRect.content); scrollRect.verticalNormalizedPosition = 1; }).AddTo(this); - shopInfoButton.onClick.Invoke(); var gameData = GameDataManager.GameData; var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); @@ -159,5 +157,11 @@ public class Information : MonoBehaviour view.SetData(materialList.First(data => data.itemId == materialData.Id), materialData.Amount); } } + + shopInfoObject.SetActive(true); + scrollRect.content = shopInfoObject.transform as RectTransform; + LayoutRebuilder.ForceRebuildLayoutImmediate(scrollRect.content); + scrollRect.verticalNormalizedPosition = 1; + shopInfoButton.onClick.Invoke(); } }