diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs index abb01490..9763a7eb 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs @@ -61,10 +61,10 @@ public class Information : MonoBehaviour { shopInfoButton.gameObject.SetActive(!isShopInfo); shopInfoEnabled.SetActive(isShopInfo); - shopInfoObject.SetActive(isShopInfo); + shopInfoObject.transform.SetLocalScale(isShopInfo ? 1f : 0f); recordButton.gameObject.SetActive(isShopInfo); recordEnabled.SetActive(!isShopInfo); - recordObject.SetActive(!isShopInfo); + recordObject.transform.SetLocalScale(isShopInfo ? 0f : 1f); scrollRect.content = (isShopInfo ? shopInfoObject.transform : recordObject.transform) as RectTransform; scrollRect.verticalNormalizedPosition = 1; }).AddTo(this); @@ -154,11 +154,16 @@ public class Information : MonoBehaviour } } - shopInfoObject.SetActive(true); - scrollRect.content = shopInfoObject.transform as RectTransform; - LayoutRebuilder.ForceRebuildLayoutImmediate(scrollRect.content); - scrollRect.verticalNormalizedPosition = 1; shopInfoButton.onClick.Invoke(); + + // 描画計算 + shopInfoObject.SetActive(true); + recordObject.SetActive(true); + Observable.TimerFrame(0, FrameCountType.EndOfFrame).Subscribe(_ => + { + LayoutRebuilder.ForceRebuildLayoutImmediate(recordObject.transform as RectTransform); + LayoutRebuilder.ForceRebuildLayoutImmediate(shopInfoObject.transform as RectTransform); + }).AddTo(this); } private void SetHistory(ShopLevelData levelData, List scriptList, bool unreleased)