diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index bc62fdcf..696e41fa 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -393,19 +393,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 0} ---- !u!114 &206365035 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 6725113439449511084} --- !u!1001 &227427381 PrefabInstance: m_ObjectHideFlags: 0 @@ -436,7 +423,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -446,7 +433,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -496,12 +483,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 430 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -765,7 +752,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -775,7 +762,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -825,12 +812,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1867,7 +1854,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1877,7 +1864,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1927,12 +1914,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 1010 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3170,7 +3157,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3180,7 +3167,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3230,12 +3217,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 720 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3745,19 +3732,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895333847} m_CullTransparentMesh: 0 ---- !u!114 &1950673774 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 6725113439449511085} --- !u!1 &2064821506 GameObject: m_ObjectHideFlags: 0 @@ -4029,6 +4003,7 @@ MonoBehaviour: m_EditorClassIdentifier: scrollRect: {fileID: 2083561337} verticalSlider: {fileID: 429811578} + direction: 1 --- !u!1 &1135563714249534642 GameObject: m_ObjectHideFlags: 0 @@ -4184,6 +4159,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -5445172056466922481, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: m_RootOrder @@ -4254,20 +4234,13 @@ PrefabInstance: propertyPath: mLocalizeTarget value: objectReference: {fileID: 134216885} + - target: {fileID: 7003894107540878320, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} ---- !u!212 &6725113439449511084 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 5124423628195254865, guid: 343971e948dfe44ddab5ab4f736c3f06, - type: 3} - m_PrefabInstance: {fileID: 6725113439449511083} - m_PrefabAsset: {fileID: 0} ---- !u!212 &6725113439449511085 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 3032185678243775837, guid: 343971e948dfe44ddab5ab4f736c3f06, - type: 3} - m_PrefabInstance: {fileID: 6725113439449511083} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7213633219263105217 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/ScrollViewSlider.cs b/popcorn/Assets/MyGame/Scripts/ScrollViewSlider.cs index 3f94eb04..6a0c6f1e 100644 --- a/popcorn/Assets/MyGame/Scripts/ScrollViewSlider.cs +++ b/popcorn/Assets/MyGame/Scripts/ScrollViewSlider.cs @@ -7,10 +7,11 @@ public class ScrollViewSlider : MonoBehaviour { [SerializeField] private ScrollRect scrollRect; [SerializeField] private Slider verticalSlider; + [SerializeField] private Slider.Direction direction = Slider.Direction.BottomToTop; private void Start() { - verticalSlider.direction = Slider.Direction.BottomToTop; + verticalSlider.direction = direction; verticalSlider.OnValueChangedAsObservable().Subscribe(x => { scrollRect.verticalNormalizedPosition = x;