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

デイリーミッションでのスクロール非表示を修正

This commit is contained in:
kimura 2021-12-08 14:48:52 +09:00
parent 3f51e0cd8f
commit ebcf6967a8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab
View File

@ -2401,6 +2401,7 @@ MonoBehaviour:
normalTab: {fileID: 6646618123281136623} normalTab: {fileID: 6646618123281136623}
dailyTab: {fileID: 415616349821126505} dailyTab: {fileID: 415616349821126505}
scrollRect: {fileID: 5142847172670219607} scrollRect: {fileID: 5142847172670219607}
scrollViewSlider: {fileID: 701131806975526614}
itemViewPrefab: {fileID: 6952489502391719718, guid: 1559aa4b9e5d85c46ae00275092f8d28, itemViewPrefab: {fileID: 6952489502391719718, guid: 1559aa4b9e5d85c46ae00275092f8d28,
type: 3} type: 3}
dailyCompleteItemViewPrefab: {fileID: 2736644940225485096, guid: 5efec1563da076e43b72d4631cb86748, dailyCompleteItemViewPrefab: {fileID: 2736644940225485096, guid: 5efec1563da076e43b72d4631cb86748,
@ -2743,7 +2744,6 @@ MonoBehaviour:
backgroundAnimator: {fileID: 2660639677613226246} backgroundAnimator: {fileID: 2660639677613226246}
closeButton: {fileID: 2660639677226912964} closeButton: {fileID: 2660639677226912964}
listView: {fileID: 8549305145373062209} listView: {fileID: 8549305145373062209}
scrollViewSlider: {fileID: 701131806975526614}
timeLimitText: {fileID: 2660639677480706697} timeLimitText: {fileID: 2660639677480706697}
--- !u!1 &2660639678575329506 --- !u!1 &2660639678575329506
GameObject: GameObject:

3
popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs
View File

@ -10,6 +10,7 @@ public class MissionListView : MonoBehaviour
[SerializeField] private MissionTabView normalTab; [SerializeField] private MissionTabView normalTab;
[SerializeField] private MissionTabView dailyTab; [SerializeField] private MissionTabView dailyTab;
[SerializeField] private ScrollRect scrollRect; [SerializeField] private ScrollRect scrollRect;
[SerializeField] private ScrollViewSlider scrollViewSlider;
[SerializeField] private MissionView itemViewPrefab; [SerializeField] private MissionView itemViewPrefab;
[SerializeField] private MissionView dailyCompleteItemViewPrefab; [SerializeField] private MissionView dailyCompleteItemViewPrefab;
@ -41,6 +42,8 @@ public class MissionListView : MonoBehaviour
scrollRect.verticalNormalizedPosition = 1; scrollRect.verticalNormalizedPosition = 1;
} }
}); });
scrollViewSlider.gameObject.SetActive(tabName == MissionCategory.Normal);
scrollRect.vertical = tabName != MissionCategory.Daily;
}).AddTo(this); }).AddTo(this);
normalTab.ClickObservable.Select(_ => MissionCategory.Normal) normalTab.ClickObservable.Select(_ => MissionCategory.Normal)
.Merge(dailyTab.ClickObservable.Select(_ => MissionCategory.Daily)) .Merge(dailyTab.ClickObservable.Select(_ => MissionCategory.Daily))

2
popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
View File

@ -18,7 +18,6 @@ public class MissionManager : MonoBehaviour
[SerializeField] private Animator backgroundAnimator; [SerializeField] private Animator backgroundAnimator;
[SerializeField] private Button closeButton; [SerializeField] private Button closeButton;
[SerializeField] private MissionListView listView; [SerializeField] private MissionListView listView;
[SerializeField] private ScrollViewSlider scrollViewSlider;
[SerializeField] private Text timeLimitText; [SerializeField] private Text timeLimitText;
private int normalIndicateFlag; private int normalIndicateFlag;
@ -43,7 +42,6 @@ public class MissionManager : MonoBehaviour
listView.SelectedTab.Subscribe(category => listView.SelectedTab.Subscribe(category =>
{ {
scrollViewSlider.gameObject.SetActive(category == MissionCategory.Normal);
timeLimitText.gameObject.SetActive(category == MissionCategory.Daily); timeLimitText.gameObject.SetActive(category == MissionCategory.Daily);
}).AddTo(this); }).AddTo(this);