diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab index be809567..04d99a22 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab @@ -157,6 +157,82 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &6182018219473053258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2527706427024380501} + - component: {fileID: 1685352538201636397} + - component: {fileID: 5909604695489458563} + m_Layer: 5 + m_Name: SubCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2527706427024380501 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6182018219473053258} + 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: + - {fileID: 6859128403032312415} + m_Father: {fileID: 6859128402226682912} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &1685352538201636397 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6182018219473053258} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &5909604695489458563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6182018219473053258} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &6859128400961489648 GameObject: m_ObjectHideFlags: 0 @@ -4546,7 +4622,7 @@ RectTransform: - {fileID: 6859128402035751651} - {fileID: 6859128402367647429} - {fileID: 6859128402407862776} - - {fileID: 6859128403032312415} + - {fileID: 2527706427024380501} m_Father: {fileID: 6859128401238650767} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5616,9 +5692,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6859128402620403790} - - component: {fileID: 6859128402620403777} - - component: {fileID: 6859128402620403776} - - component: {fileID: 6859128402620403791} + - component: {fileID: 3386064689513134880} + - component: {fileID: 8847486339906058744} + - component: {fileID: 5753615855694589438} m_Layer: 5 m_Name: Viewport m_TagString: Untagged @@ -5647,15 +5723,15 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 930, y: 980} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6859128402620403777 +--- !u!222 &3386064689513134880 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6859128402620403789} - m_CullTransparentMesh: 0 ---- !u!114 &6859128402620403776 + m_CullTransparentMesh: 1 +--- !u!114 &8847486339906058744 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5668,13 +5744,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5684,7 +5760,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6859128402620403791 +--- !u!114 &5753615855694589438 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5693,10 +5769,11 @@ MonoBehaviour: m_GameObject: {fileID: 6859128402620403789} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} --- !u!1 &6859128402625189666 GameObject: m_ObjectHideFlags: 0 @@ -6587,8 +6664,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6859128403032312415} - - component: {fileID: 6859128403032312402} - - component: {fileID: 6859128403032312401} - component: {fileID: 6859128403032312400} m_Layer: 5 m_Name: Scroll View @@ -6610,51 +6685,14 @@ RectTransform: m_Children: - {fileID: 6859128402620403790} - {fileID: 6859128401381016016} - m_Father: {fileID: 6859128402226682912} - m_RootOrder: 4 + m_Father: {fileID: 2527706427024380501} + m_RootOrder: 0 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: 22, y: -795} m_SizeDelta: {x: 930, y: 980} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6859128403032312402 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6859128403032312414} - m_CullTransparentMesh: 0 ---- !u!114 &6859128403032312401 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6859128403032312414} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!114 &6859128403032312400 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 138eaf8d..850f09fd 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -1732,9 +1732,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2660639677115137991} - - component: {fileID: 2660639677115138042} - - component: {fileID: 2660639677115137989} - - component: {fileID: 2660639677115137988} + - component: {fileID: 4618968635005671603} + - component: {fileID: 7372708880411455469} + - component: {fileID: 1304497722492393377} m_Layer: 5 m_Name: Viewport m_TagString: Untagged @@ -1762,15 +1762,15 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -21, y: 0} m_Pivot: {x: 0, y: 1} ---- !u!222 &2660639677115138042 +--- !u!222 &4618968635005671603 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2660639677115137990} - m_CullTransparentMesh: 0 ---- !u!114 &2660639677115137989 + m_CullTransparentMesh: 1 +--- !u!114 &7372708880411455469 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1783,14 +1783,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1799,7 +1799,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2660639677115137988 +--- !u!114 &1304497722492393377 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1808,10 +1808,11 @@ MonoBehaviour: m_GameObject: {fileID: 2660639677115137990} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} --- !u!1 &2660639677226912966 GameObject: m_ObjectHideFlags: 0 @@ -2528,7 +2529,7 @@ RectTransform: - {fileID: 2660639677226912967} - {fileID: 2660639677099381256} - {fileID: 2660639677480706696} - - {fileID: 2660639678889033266} + - {fileID: 7177516523083103512} m_Father: {fileID: 2660639678456833894} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3392,14 +3393,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2660639678889033277} - 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: - {fileID: 2660639677115137991} - {fileID: 2660639679014174935} - m_Father: {fileID: 2660639677971123135} - m_RootOrder: 3 + m_Father: {fileID: 7177516523083103512} + 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} @@ -4416,9 +4417,9 @@ RectTransform: m_Father: {fileID: 2660639677693138925} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 420, y: -592} m_SizeDelta: {x: 840, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5505592798233738046 @@ -4493,9 +4494,9 @@ RectTransform: m_Father: {fileID: 2660639677693138925} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 420, y: -352} m_SizeDelta: {x: 840, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7028437475535944935 @@ -5143,9 +5144,9 @@ RectTransform: m_Father: {fileID: 2660639677693138925} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 420, y: -832} m_SizeDelta: {x: 840, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6662879993327949048 @@ -5693,6 +5694,82 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image +--- !u!1 &7159122159722577984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7177516523083103512} + - component: {fileID: 8338661229294286840} + - component: {fileID: 1500322050980728953} + m_Layer: 5 + m_Name: SubCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7177516523083103512 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7159122159722577984} + 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: + - {fileID: 2660639678889033266} + m_Father: {fileID: 2660639677971123135} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &8338661229294286840 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7159122159722577984} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1500322050980728953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7159122159722577984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &7306252699778113546 GameObject: m_ObjectHideFlags: 0 @@ -7281,7 +7358,7 @@ PrefabInstance: - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} @@ -7291,7 +7368,7 @@ PrefabInstance: - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} @@ -7341,12 +7418,12 @@ PrefabInstance: - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 415 objectReference: {fileID: 0} - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -112 objectReference: {fileID: 0} - target: {fileID: 1551768131284131804, guid: 5efec1563da076e43b72d4631cb86748, type: 3} @@ -7517,15 +7594,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} ---- !u!1 &2129846913188432060 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, - type: 3} - m_PrefabInstance: {fileID: 6934984148779113488} - m_PrefabAsset: {fileID: 0} --- !u!224 &1213671486866128169 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, type: 3} m_PrefabInstance: {fileID: 6934984148779113488} m_PrefabAsset: {fileID: 0} +--- !u!1 &2129846913188432060 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 6934984148779113488} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 37cd9f23..9fc40c88 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -169,10 +169,11 @@ MonoBehaviour: m_GameObject: {fileID: 25421134} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} --- !u!114 &25421137 MonoBehaviour: m_ObjectHideFlags: 0 @@ -186,13 +187,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -209,7 +210,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 25421134} - m_CullTransparentMesh: 0 + m_CullTransparentMesh: 1 --- !u!1 &28991871 GameObject: m_ObjectHideFlags: 0 @@ -373,19 +374,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 96916714} m_CullTransparentMesh: 0 ---- !u!114 &100486159 -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: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 914692727} --- !u!1 &103445604 GameObject: m_ObjectHideFlags: 0 @@ -939,8 +927,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 203585998} - - component: {fileID: 203586001} - - component: {fileID: 203586000} - component: {fileID: 203585999} - component: {fileID: 203586002} m_Layer: 5 @@ -1002,43 +988,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!114 &203586000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 203585997} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &203586001 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 203585997} - m_CullTransparentMesh: 0 --- !u!114 &203586002 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1927,31 +1876,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2929932626674485991} m_PrefabAsset: {fileID: 0} ---- !u!114 &721804044 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1139637482908115965, guid: 2beb2d436ad55734186e797d315796b3, - type: 3} - m_PrefabInstance: {fileID: 1771084670} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &740635448 -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: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1582513103} --- !u!1001 &759959152 PrefabInstance: m_ObjectHideFlags: 0 @@ -2212,44 +2136,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 759959152} m_PrefabAsset: {fileID: 0} ---- !u!114 &764035412 -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: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1512403929} ---- !u!114 &799127797 -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: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 721804044} ---- !u!114 &914692727 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2929932626752093611, guid: 2beb2d436ad55734186e797d315796b3, - type: 3} - m_PrefabInstance: {fileID: 1771084670} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &968322475 GameObject: m_ObjectHideFlags: 0 @@ -2936,30 +2822,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} ---- !u!114 &1282215901 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2929932626752093611, guid: 2beb2d436ad55734186e797d315796b3, - type: 3} - m_PrefabInstance: {fileID: 2929932626674485991} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1380624351 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2929932626752093611, guid: 2beb2d436ad55734186e797d315796b3, - type: 3} - m_PrefabInstance: {fileID: 425834632} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &1396650753 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, @@ -3249,6 +3111,8 @@ GameObject: m_Component: - component: {fileID: 1455181832} - component: {fileID: 1455181833} + - component: {fileID: 1455181835} + - component: {fileID: 1455181834} m_Layer: 5 m_Name: InnnerObject m_TagString: Untagged @@ -3290,6 +3154,44 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!114 &1455181834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1455181831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!223 &1455181835 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1455181831} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1001 &1464274323 PrefabInstance: m_ObjectHideFlags: 0 @@ -3544,31 +3446,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} ---- !u!114 &1468534603 -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: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1282215901} ---- !u!114 &1512403929 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2929932626752093611, guid: 2beb2d436ad55734186e797d315796b3, - type: 3} - m_PrefabInstance: {fileID: 1568730406} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1554563048 GameObject: m_ObjectHideFlags: 0 @@ -3981,18 +3858,6 @@ RectTransform: m_AnchoredPosition: {x: -33.149994, y: -2.1000366} m_SizeDelta: {x: -42.69995, y: 40} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1582513103 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2929932626752093611, guid: 2beb2d436ad55734186e797d315796b3, - type: 3} - m_PrefabInstance: {fileID: 759959152} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1594398329 GameObject: m_ObjectHideFlags: 0 @@ -5367,19 +5232,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2120123252} m_CullTransparentMesh: 0 ---- !u!114 &2144741537 -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: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1380624351} --- !u!1001 &2929932626674485991 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab index 4554d58a..3bcb2f4e 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab @@ -159,8 +159,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2912042418150409391} - - component: {fileID: 2912042418150409386} - - component: {fileID: 2912042418150409389} - component: {fileID: 2912042418150409388} m_Layer: 5 m_Name: Scroll View @@ -190,43 +188,6 @@ RectTransform: m_AnchoredPosition: {x: 22, y: -412} m_SizeDelta: {x: 930, y: 1050} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2912042418150409386 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2912042418150409390} - m_CullTransparentMesh: 0 ---- !u!114 &2912042418150409389 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2912042418150409390} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!114 &2912042418150409388 MonoBehaviour: m_ObjectHideFlags: 0 @@ -298,7 +259,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -691.30005} + m_AnchoredPosition: {x: 0, y: -525.00024} m_SizeDelta: {x: 18, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2912042418150870075 @@ -801,9 +762,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2912042419129627537} - - component: {fileID: 2912042419129627548} - - component: {fileID: 2912042419129627551} - - component: {fileID: 2912042419129627550} + - component: {fileID: 4797137308869886508} + - component: {fileID: 7403362074400744893} + - component: {fileID: 3165213793854744633} m_Layer: 5 m_Name: Viewport m_TagString: Untagged @@ -831,15 +792,15 @@ RectTransform: m_AnchoredPosition: {x: -10.5, y: 0} m_SizeDelta: {x: -21, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2912042419129627548 +--- !u!222 &4797137308869886508 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2912042419129627536} - m_CullTransparentMesh: 0 ---- !u!114 &2912042419129627551 + m_CullTransparentMesh: 1 +--- !u!114 &7403362074400744893 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -852,14 +813,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -868,7 +829,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2912042419129627550 +--- !u!114 &3165213793854744633 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -877,10 +838,11 @@ MonoBehaviour: m_GameObject: {fileID: 2912042419129627536} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} --- !u!1 &2912042419150224392 GameObject: m_ObjectHideFlags: 0 @@ -1414,6 +1376,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2912042419879831596} + - component: {fileID: 68167510942518128} + - component: {fileID: 797451158269691933} m_Layer: 5 m_Name: Medium m_TagString: Untagged @@ -1441,6 +1405,44 @@ RectTransform: m_AnchoredPosition: {x: -35.4, y: 417.9} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &68167510942518128 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2912042419879831599} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &797451158269691933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2912042419879831599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &2912042419929665555 GameObject: m_ObjectHideFlags: 0