From 6ca4babfbeeae286cd99cc9689b8251c6b0eb9f5 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Wed, 8 Dec 2021 14:31:01 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=82=A4=E3=83=AA=E3=83=BC=E3=83=9F?=
 =?UTF-8?q?=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=A7=E3=82=B9=E3=82=AF?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=AB=E9=9D=9E=E8=A1=A8=E7=A4=BA=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Main/Prefabs/Mission/MissionCanvas.prefab       | 13 +++++++------
 .../MyGame/Scenes/Main/Scripts/MissionManager.cs    |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab
index cd144199..b8d524e4 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab
+++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab
@@ -2743,6 +2743,7 @@ MonoBehaviour:
   backgroundAnimator: {fileID: 2660639677613226246}
   closeButton: {fileID: 2660639677226912964}
   listView: {fileID: 8549305145373062209}
+  scrollViewSlider: {fileID: 701131806975526614}
   timeLimitText: {fileID: 2660639677480706697}
 --- !u!1 &2660639678575329506
 GameObject:
@@ -6609,18 +6610,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3}
---- !u!224 &6170226839459316569 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
-    type: 3}
-  m_PrefabInstance: {fileID: 2686639074240930400}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6410983111595538124 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e,
     type: 3}
   m_PrefabInstance: {fileID: 2686639074240930400}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &6170226839459316569 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
+    type: 3}
+  m_PrefabInstance: {fileID: 2686639074240930400}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6641948177867439223
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
index b9eb8755..fcfc9838 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
@@ -18,6 +18,7 @@ public class MissionManager : MonoBehaviour
     [SerializeField] private Animator backgroundAnimator;
     [SerializeField] private Button closeButton;
     [SerializeField] private MissionListView listView;
+    [SerializeField] private ScrollViewSlider scrollViewSlider;
     [SerializeField] private Text timeLimitText;
 
     private int normalIndicateFlag;
@@ -42,6 +43,7 @@ public class MissionManager : MonoBehaviour
 
         listView.SelectedTab.Subscribe(category =>
         {
+            scrollViewSlider.gameObject.SetActive(category == MissionCategory.Normal);
             timeLimitText.gameObject.SetActive(category == MissionCategory.Daily);
         }).AddTo(this);