From 189b23aa553a603fd91cf61d46aa2f488e3b7dd3 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Tue, 15 Feb 2022 11:25:13 +0900
Subject: [PATCH] =?UTF-8?q?Information=E3=81=AELayoutGroup=E6=8F=8F?=
 =?UTF-8?q?=E7=94=BB=E6=94=B9=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/Main/Scripts/Information.cs   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

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<BrotherScriptData> scriptList, bool unreleased)