diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity index 03b8a89a..a01421d6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity @@ -121,6 +121,81 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &759556296 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_Name + value: UICamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} +--- !u!20 &759556297 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + m_PrefabInstance: {fileID: 759556296} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4082915279172730651 PrefabInstance: m_ObjectHideFlags: 0 @@ -128,6 +203,51 @@ 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: 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 @@ -146,7 +266,7 @@ PrefabInstance: - target: {fileID: 4082915279371560212, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4082915279371560212, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -238,5 +358,30 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4082915279371560213, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 759556297} + - target: {fileID: 4082915279371560213, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_PlaneDistance + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5195025793093851047, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 32.199997 + objectReference: {fileID: 0} + - target: {fileID: 5195025793196932527, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 32.199997 + objectReference: {fileID: 0} + - target: {fileID: 8853301888902362100, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 32.199997 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity index 24491018..01fa9568 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity @@ -121,6 +121,81 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &306200262 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_Name + value: UICamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} +--- !u!20 &306200263 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + m_PrefabInstance: {fileID: 306200262} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2377818822982279870 PrefabInstance: m_ObjectHideFlags: 0 @@ -146,7 +221,7 @@ PrefabInstance: - target: {fileID: 2377818823490934338, guid: 5a98de00194aa40f6a3050df19f4e5f5, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2377818823490934338, guid: 5a98de00194aa40f6a3050df19f4e5f5, type: 3} @@ -238,6 +313,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2377818823490934341, guid: 5a98de00194aa40f6a3050df19f4e5f5, + type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 306200263} + - target: {fileID: 2377818823490934341, guid: 5a98de00194aa40f6a3050df19f4e5f5, + type: 3} + propertyPath: m_PlaneDistance + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2377818823490934342, guid: 5a98de00194aa40f6a3050df19f4e5f5, type: 3} propertyPath: m_Name diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity index f26f5ac9..3c9fbf9e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity @@ -121,6 +121,81 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &306200262 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_Name + value: UICamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} +--- !u!20 &306200263 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + m_PrefabInstance: {fileID: 306200262} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4187074209805441001 PrefabInstance: m_ObjectHideFlags: 0 @@ -133,6 +208,16 @@ PrefabInstance: propertyPath: m_Name value: Canvas objectReference: {fileID: 0} + - target: {fileID: 4187074209012466682, guid: c2d6a4625b62147e080e95799c45c8ad, + type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 306200263} + - target: {fileID: 4187074209012466682, guid: c2d6a4625b62147e080e95799c45c8ad, + type: 3} + propertyPath: m_PlaneDistance + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4187074209012466685, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_Pivot.x @@ -146,7 +231,7 @@ PrefabInstance: - target: {fileID: 4187074209012466685, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4187074209012466685, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} @@ -238,5 +323,15 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4187074209291994453, guid: c2d6a4625b62147e080e95799c45c8ad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 125.100006 + objectReference: {fileID: 0} + - target: {fileID: 4187074210099131614, guid: c2d6a4625b62147e080e95799c45c8ad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 96.29999 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity index e49a2830..966b0136 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity @@ -121,6 +121,81 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &306200262 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_Name + value: UICamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} +--- !u!20 &306200263 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + m_PrefabInstance: {fileID: 306200262} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4315754688439791842 PrefabInstance: m_ObjectHideFlags: 0 @@ -191,7 +266,7 @@ PrefabInstance: - target: {fileID: 4315754687615340680, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4315754687615340680, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} @@ -283,6 +358,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4315754687615340683, guid: a1725d421d10a4e348ad0cf68ac29f68, + type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 306200263} + - target: {fileID: 4315754687615340683, guid: a1725d421d10a4e348ad0cf68ac29f68, + type: 3} + propertyPath: m_PlaneDistance + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4315754688526726639, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} propertyPath: m_AnchorMax.y diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index d2a40d1e..b412f137 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -339,6 +339,11 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2660639679028779569, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 1944170688} - target: {fileID: 2660639679028779570, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_Name @@ -357,7 +362,7 @@ PrefabInstance: - target: {fileID: 2660639679028779574, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2660639679028779574, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -479,6 +484,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5306379771047912363, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5306379771047912363, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5306379771047912363, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5306379771047912363, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6700388378296198159, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6700388378296198159, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7226408133874038176, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.x @@ -491,3 +526,78 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} +--- !u!1001 &1944170687 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_Name + value: UICamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} +--- !u!20 &1944170688 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + m_PrefabInstance: {fileID: 1944170687} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity b/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity index 0061bb9d..7eec1586 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity @@ -121,6 +121,81 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &1944170687 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + propertyPath: m_Name + value: UICamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} +--- !u!20 &1944170688 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, + type: 3} + m_PrefabInstance: {fileID: 1944170687} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7864277047505245954 PrefabInstance: m_ObjectHideFlags: 0 @@ -128,6 +203,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 7864277046184303261, guid: a2309e5e619554230b1f6d3d9426ed51, + type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 1944170688} - target: {fileID: 7864277046184303262, guid: a2309e5e619554230b1f6d3d9426ed51, type: 3} propertyPath: m_Name @@ -146,7 +226,7 @@ PrefabInstance: - target: {fileID: 7864277046184303266, guid: a2309e5e619554230b1f6d3d9426ed51, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7864277046184303266, guid: a2309e5e619554230b1f6d3d9426ed51, 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 5caf683a..d904a3f9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -2254,7 +2254,7 @@ Canvas: m_GameObject: {fileID: 4082915279371560208} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 + m_RenderMode: 1 m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -2264,7 +2264,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 100 + m_SortingOrder: 200 m_TargetDisplay: 0 --- !u!114 &4082915279371560214 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index b0b8342c..ca45baf2 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -715,7 +715,7 @@ Canvas: m_GameObject: {fileID: 2377818823490934342} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 + m_RenderMode: 1 m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -725,7 +725,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 100 + m_SortingOrder: 201 m_TargetDisplay: 0 --- !u!114 &2377818823490934340 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab index 1508bde0..294bccb9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab @@ -273,7 +273,7 @@ Canvas: m_GameObject: {fileID: 4187074209012466681} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 + m_RenderMode: 1 m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -283,7 +283,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 100 + m_SortingOrder: 201 m_TargetDisplay: 0 --- !u!114 &4187074209012466683 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index 4254223d..a57788b4 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -806,7 +806,7 @@ Canvas: m_GameObject: {fileID: 4315754687615340676} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 + m_RenderMode: 1 m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -816,7 +816,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 100 + m_SortingOrder: 200 m_TargetDisplay: 0 --- !u!114 &4315754687615340682 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab index d1e8bdaa..047a0044 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab @@ -49,9 +49,9 @@ Canvas: m_GameObject: {fileID: 7864277046184303262} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 + m_RenderMode: 1 m_Camera: {fileID: 0} - m_PlaneDistance: 100 + m_PlaneDistance: 0 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -59,7 +59,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 100 + m_SortingOrder: 201 m_TargetDisplay: 0 --- !u!114 &7864277046184303260 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 589e7f9b..2cd03360 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -3581,9 +3581,9 @@ Canvas: m_GameObject: {fileID: 2660639679028779570} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 + m_RenderMode: 1 m_Camera: {fileID: 0} - m_PlaneDistance: 100 + m_PlaneDistance: 0 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -3591,7 +3591,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 100 + m_SortingOrder: 200 m_TargetDisplay: 0 --- !u!114 &2660639679028779568 MonoBehaviour: