diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 15a0e0cf..c5fad56c 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -3436,7 +3436,7 @@ PrefabInstance: - target: {fileID: 1833305669461938315, guid: 078121e9c141f42a69af3f5c4c54904b, type: 3} propertyPath: m_AnchoredPosition.x - value: -13.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1833305669461938315, guid: 078121e9c141f42a69af3f5c4c54904b, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab index 51cb2d67..a70502d6 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab @@ -3200,6 +3200,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2912042419400614768} m_Modifications: + - target: {fileID: 3335798841777737922, guid: d72f141ba8dae41e9ba8f1d65e53c00b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3335798841777737922, guid: d72f141ba8dae41e9ba8f1d65e53c00b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3335798841777737922, guid: d72f141ba8dae41e9ba8f1d65e53c00b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 3335798841777737922, guid: d72f141ba8dae41e9ba8f1d65e53c00b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5743171820789586225, guid: d72f141ba8dae41e9ba8f1d65e53c00b, type: 3} propertyPath: m_Pivot.x @@ -3218,32 +3238,32 @@ PrefabInstance: - target: {fileID: 5743171820789586225, guid: d72f141ba8dae41e9ba8f1d65e53c00b, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5743171820789586225, guid: d72f141ba8dae41e9ba8f1d65e53c00b, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5743171820789586225, guid: d72f141ba8dae41e9ba8f1d65e53c00b, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5743171820789586225, guid: d72f141ba8dae41e9ba8f1d65e53c00b, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5743171820789586225, guid: d72f141ba8dae41e9ba8f1d65e53c00b, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5743171820789586225, guid: d72f141ba8dae41e9ba8f1d65e53c00b, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5743171820789586225, guid: d72f141ba8dae41e9ba8f1d65e53c00b, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/sale.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/sale.prefab index 8f723155..ba2931a1 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/sale.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/sale.prefab @@ -396,7 +396,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -526, y: -573.99994} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6060285219868908872 @@ -431,8 +431,8 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index 9076b933..1c455d9e 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -187,32 +187,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &355620160 -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: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091312} ---- !u!114 &462971875 -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: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091308} --- !u!1 &553363513 GameObject: m_ObjectHideFlags: 0 @@ -296,31 +270,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &555286545 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4137968107648010471, guid: 667a93fb2929943078b944050cddd464, - type: 3} - m_PrefabInstance: {fileID: 3078490422721459368} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &700940153 -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: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091311} --- !u!114 &715888784 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4826861628800619564, guid: 667a93fb2929943078b944050cddd464, @@ -503,7 +452,7 @@ PrefabInstance: - target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3213111080442531914, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -751,105 +700,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} ---- !u!114 &1098091308 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091309 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091310 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091311 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091312 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1135861150 -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: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091309} ---- !u!114 &1351454005 -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: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091310} ---- !u!114 &1369737881 -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: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1789499952} --- !u!1001 &1450416387 PrefabInstance: m_ObjectHideFlags: 0 @@ -925,31 +775,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1450416387} m_PrefabAsset: {fileID: 0} ---- !u!114 &1789499952 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2365797324462302900, guid: 667a93fb2929943078b944050cddd464, - type: 3} - m_PrefabInstance: {fileID: 3078490422721459368} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2010180996 -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: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 555286545} --- !u!1001 &3078490422721459368 PrefabInstance: m_ObjectHideFlags: 0 @@ -1053,6 +878,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} + - target: {fileID: 583619684917774370, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 788033435718677201, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_AnchorMax.x @@ -1527,6 +1357,26 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 84efab5b8d1b5274cb7510ddcb5b2187, type: 3} + - target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7296979764273611571, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite