yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

店舗情報Popのタブとコンテンツ入れ替え修正

This commit is contained in:
kimura 2021-10-15 15:34:10 +09:00
parent 033f86417c
commit eaa3ec3f04
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/Canvas.prefab
View File

@ -674,7 +674,7 @@ GameObject:
- component: {fileID: 1642413381154068434} - component: {fileID: 1642413381154068434}
- component: {fileID: 636377501859366768} - component: {fileID: 636377501859366768}
m_Layer: 5 m_Layer: 5
m_Name: ShopInfoPanel m_Name: RecordPanel
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -1530,8 +1530,8 @@ MonoBehaviour:
shopInfoButton: {fileID: 6859128401074204927} shopInfoButton: {fileID: 6859128401074204927}
recordButton: {fileID: 6859128402628860639} recordButton: {fileID: 6859128402628860639}
scrollRect: {fileID: 6859128403032312400} scrollRect: {fileID: 6859128403032312400}
shopInfoObject: {fileID: 6859128401107917369} shopInfoObject: {fileID: 6859128401516038726}
recordObject: {fileID: 6859128401516038726} recordObject: {fileID: 6859128401107917369}
historyTarget: {fileID: 6859128401143531340} historyTarget: {fileID: 6859128401143531340}
productTarget: {fileID: 2283608498504545933} productTarget: {fileID: 2283608498504545933}
materialTarget: {fileID: 41559837514718277} materialTarget: {fileID: 41559837514718277}
@ -2389,7 +2389,7 @@ GameObject:
- component: {fileID: 6859128401516038713} - component: {fileID: 6859128401516038713}
- component: {fileID: 6859128401516038712} - component: {fileID: 6859128401516038712}
m_Layer: 5 m_Layer: 5
m_Name: RecordPanel m_Name: ShopInfoPanel
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0

8
popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs
View File

@ -63,10 +63,8 @@ public class Information : MonoBehaviour
recordEnabled.SetActive(!isShopInfo); recordEnabled.SetActive(!isShopInfo);
recordObject.SetActive(!isShopInfo); recordObject.SetActive(!isShopInfo);
scrollRect.content = (isShopInfo ? shopInfoObject.transform : recordObject.transform) as RectTransform; scrollRect.content = (isShopInfo ? shopInfoObject.transform : recordObject.transform) as RectTransform;
LayoutRebuilder.ForceRebuildLayoutImmediate(scrollRect.content);
scrollRect.verticalNormalizedPosition = 1; scrollRect.verticalNormalizedPosition = 1;
}).AddTo(this); }).AddTo(this);
shopInfoButton.onClick.Invoke();
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet); var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
@ -159,5 +157,11 @@ public class Information : MonoBehaviour
view.SetData(materialList.First(data => data.itemId == materialData.Id), materialData.Amount); 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();
} }
} }