diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 176d812e..4614ee02 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -223,7 +223,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -135, y: 0} + m_AnchoredPosition: {x: -135, y: -23} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1458252247847964818 @@ -473,7 +473,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -97} + m_AnchoredPosition: {x: 108, y: -97} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8536603423272752951 @@ -721,7 +721,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -19, y: 38} - m_SizeDelta: {x: 380, y: 6} + m_SizeDelta: {x: 598, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603423802307196 CanvasRenderer: @@ -751,7 +751,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 330475f93063a144cb533e10ad7095e1, type: 3} - m_Type: 0 + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1024,7 +1024,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -21, y: 59.4} - m_SizeDelta: {x: 380, y: 40} + m_SizeDelta: {x: 580, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424255746890 CanvasRenderer: @@ -1060,7 +1060,7 @@ MonoBehaviour: m_BestFit: 1 m_MinSize: 30 m_MaxSize: 35 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 @@ -1311,7 +1311,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8536603424566114135 RectTransform: m_ObjectHideFlags: 0 @@ -1331,7 +1331,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: 198, y: 138} + m_SizeDelta: {x: 198, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424566114133 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab index 39b8b986..aa386278 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab @@ -1736,6 +1736,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406392151677628 stripped @@ -1866,6 +1871,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406391892073053 stripped @@ -1996,6 +2006,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406391604408560 stripped @@ -2126,6 +2141,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406392636603953 stripped @@ -2256,6 +2276,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406392265446442 stripped @@ -2386,6 +2411,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406392476026602 stripped @@ -2525,11 +2555,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &2912042418010952920 stripped diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index 5fb1d3be..1817ea05 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -463,7 +463,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: listView: {fileID: 1188209735} - headerView: {fileID: 1188209734} --- !u!114 &980038344 MonoBehaviour: m_ObjectHideFlags: 0 @@ -847,6 +846,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6969874152703327186, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 260.69922 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} --- !u!224 &1098091308 stripped @@ -1186,18 +1190,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} ---- !u!114 &1188209734 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2912042418274684488, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - m_PrefabInstance: {fileID: 1188209733} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 988fc455527e44edbbc26f8ebb8d5f56, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1188209735 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7513283637877447830, guid: 2ceb27afa38c74b76b130f23621f7f50,