diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab index fc8396ca..1df7d8d1 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab @@ -688,7 +688,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8705702251614975607} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2288,6 +2288,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 3233636912317429793} - {fileID: 3310671341184677559} m_Father: {fileID: 3310671341034218321} m_RootOrder: 0 @@ -3603,3 +3604,148 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &6632112567178762520 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8705702251614975607} + m_Modifications: + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.x + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 71 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 71 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Name + value: icon_get + objectReference: {fileID: 0} + - target: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} +--- !u!224 &3233636912317429793 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 6632112567178762520} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab index 58e85745..aa3b0524 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab @@ -31,6 +31,7 @@ RectTransform: m_Children: - {fileID: 2912042419614313715} - {fileID: 1181189223863516272} + - {fileID: 2507491505730647147} m_Father: {fileID: 2912042418828803474} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -917,7 +918,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 12, y: 11} - m_SizeDelta: {x: 514, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2912042419150224407 MonoBehaviour: @@ -2608,6 +2609,151 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2912042419908788299} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5919338097824175442 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2912042418098885679} + m_Modifications: + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.x + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 199 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 47 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Name + value: icon_get + objectReference: {fileID: 0} + - target: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} +--- !u!224 &2507491505730647147 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 5919338097824175442} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6778406392213836409 PrefabInstance: m_ObjectHideFlags: 0