diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index c5829c4f..29287c22 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -438,12 +438,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 276 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 336 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -468,17 +468,17 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -510,6 +510,11 @@ PrefabInstance: propertyPath: m_Name value: Customize_Frame (1) objectReference: {fileID: 0} + - target: {fileID: 9136989296408743460, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ae614796715fc949a96921656b66a62, type: 3} --- !u!1001 &247710335 @@ -767,12 +772,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 276 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 336 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -797,17 +802,17 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -839,6 +844,11 @@ PrefabInstance: propertyPath: m_Name value: Customize_Frame objectReference: {fileID: 0} + - target: {fileID: 9136989296408743460, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ae614796715fc949a96921656b66a62, type: 3} --- !u!1 &339006504 @@ -1201,7 +1211,7 @@ MonoBehaviour: m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 429811579} - m_FillRect: {fileID: 847511109} + m_FillRect: {fileID: 0} m_HandleRect: {fileID: 1895333848} m_Direction: 0 m_MinValue: 0 @@ -1869,12 +1879,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 276 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 336 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1899,17 +1909,17 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1941,6 +1951,11 @@ PrefabInstance: propertyPath: m_Name value: Customize_Frame (3) objectReference: {fileID: 0} + - target: {fileID: 9136989296408743460, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ae614796715fc949a96921656b66a62, type: 3} --- !u!1 &847511108 @@ -1975,9 +1990,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} + m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &886883852 GameObject: @@ -3190,12 +3205,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 276 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 336 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3220,17 +3235,17 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3262,6 +3277,11 @@ PrefabInstance: propertyPath: m_Name value: Customize_Frame (2) objectReference: {fileID: 0} + - target: {fileID: 9136989296408743460, guid: 6ae614796715fc949a96921656b66a62, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ae614796715fc949a96921656b66a62, type: 3} --- !u!1 &1443084304 @@ -4034,7 +4054,7 @@ MonoBehaviour: m_EditorClassIdentifier: scrollRect: {fileID: 2083561337} verticalSlider: {fileID: 429811578} - direction: 1 + direction: 0 --- !u!1 &1135563714249534642 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab index 01ff190f..eefa2019 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab @@ -1118,7 +1118,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9136989296408743460} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -1131,7 +1131,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 276, y: 336} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9016739176424896693 MonoBehaviour: @@ -1155,6 +1155,125 @@ MonoBehaviour: unlockLevelText: {fileID: 2013268342774345650} priceText: {fileID: 9136989294777611129} iconTarget: {fileID: 1400898384260248944} +--- !u!1001 &2922218160002474093 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1400898384260248944} + m_Modifications: + - target: {fileID: 2360777173817456306, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_Name + value: Customize_icon (1) + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_SizeDelta.x + value: 230 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_SizeDelta.y + value: 230 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4049156041507099319, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} --- !u!1001 &5025614481332414584 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Panel.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Panel.prefab index 385b1c4f..c16c094b 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Panel.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Panel.prefab @@ -50,12 +50,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 140 - m_Right: 0 - m_Top: 170 + m_Left: 15 + m_Right: 15 + m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 290 + m_Spacing: 20.19 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0