From ebcf6967a807769157aa998a67e3db5647aea801 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Wed, 8 Dec 2021 14:48:52 +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=81=AE=E3=82=B9?=
 =?UTF-8?q?=E3=82=AF=E3=83=AD=E3=83=BC=E3=83=AB=E9=9D=9E=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab    | 2 +-
 popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs   | 3 +++
 popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs    | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab
index b8d524e4..9c1b88f3 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab
+++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab
@@ -2401,6 +2401,7 @@ MonoBehaviour:
   normalTab: {fileID: 6646618123281136623}
   dailyTab: {fileID: 415616349821126505}
   scrollRect: {fileID: 5142847172670219607}
+  scrollViewSlider: {fileID: 701131806975526614}
   itemViewPrefab: {fileID: 6952489502391719718, guid: 1559aa4b9e5d85c46ae00275092f8d28,
     type: 3}
   dailyCompleteItemViewPrefab: {fileID: 2736644940225485096, guid: 5efec1563da076e43b72d4631cb86748,
@@ -2743,7 +2744,6 @@ MonoBehaviour:
   backgroundAnimator: {fileID: 2660639677613226246}
   closeButton: {fileID: 2660639677226912964}
   listView: {fileID: 8549305145373062209}
-  scrollViewSlider: {fileID: 701131806975526614}
   timeLimitText: {fileID: 2660639677480706697}
 --- !u!1 &2660639678575329506
 GameObject:
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs
index 126fa088..c4b668a7 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs
@@ -10,6 +10,7 @@ public class MissionListView : MonoBehaviour
     [SerializeField] private MissionTabView normalTab;
     [SerializeField] private MissionTabView dailyTab;
     [SerializeField] private ScrollRect scrollRect;
+    [SerializeField] private ScrollViewSlider scrollViewSlider;
     [SerializeField] private MissionView itemViewPrefab;
     [SerializeField] private MissionView dailyCompleteItemViewPrefab;
 
@@ -41,6 +42,8 @@ public class MissionListView : MonoBehaviour
                     scrollRect.verticalNormalizedPosition = 1;
                 }
             });
+            scrollViewSlider.gameObject.SetActive(tabName == MissionCategory.Normal);
+            scrollRect.vertical = tabName != MissionCategory.Daily;
         }).AddTo(this);
         normalTab.ClickObservable.Select(_ => MissionCategory.Normal)
             .Merge(dailyTab.ClickObservable.Select(_ => MissionCategory.Daily))
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
index fcfc9838..b9eb8755 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
@@ -18,7 +18,6 @@ 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;
@@ -43,7 +42,6 @@ public class MissionManager : MonoBehaviour
 
         listView.SelectedTab.Subscribe(category =>
         {
-            scrollViewSlider.gameObject.SetActive(category == MissionCategory.Normal);
             timeLimitText.gameObject.SetActive(category == MissionCategory.Daily);
         }).AddTo(this);