diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity index 8b14f3c6..03b8a89a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity @@ -128,56 +128,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2491106385478250891, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2491106385478250891, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2491106385478250891, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2491106385478250891, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4082915278229527154, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4082915278280054884, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4082915278942985864, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4082915278942985864, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4082915278942985864, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4082915278942985864, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4082915279371560208, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Name @@ -288,65 +238,5 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6299910495887276473, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6299910495887276473, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6299910495887276473, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6299910495887276473, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7325254816105691106, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7325254816105691106, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7325254816105691106, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7325254816105691106, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7325254816271539690, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7325254816271539690, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7325254816271539690, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7325254816271539690, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index c5680a4c..d29935f9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -993,8 +993,8 @@ RectTransform: m_Father: {fileID: 4082915278031755625} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -119} m_SizeDelta: {x: 1000, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1005,7 +1005,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4082915278229527155} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: @@ -1019,7 +1019,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4082915278229527155} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: @@ -2686,6 +2686,11 @@ PrefabInstance: propertyPath: m_Name value: Frame_BulkOrder objectReference: {fileID: 0} + - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Pivot.x @@ -2704,27 +2709,27 @@ PrefabInstance: - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1000 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -2769,12 +2774,12 @@ PrefabInstance: - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -500 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 914 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -2823,6 +2828,11 @@ PrefabInstance: propertyPath: m_Name value: Frame_BulkOrder (1) objectReference: {fileID: 0} + - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Pivot.x @@ -2841,27 +2851,27 @@ PrefabInstance: - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1000 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -2906,12 +2916,12 @@ PrefabInstance: - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -500 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 642.6666 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -2978,27 +2988,27 @@ PrefabInstance: - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1000 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3043,12 +3053,12 @@ PrefabInstance: - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -500 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 371.33328 objectReference: {fileID: 0} - target: {fileID: 6701890203127158495, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3}