diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png index bc414f47..d6f4416e 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_fill.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_fill.png index 24799121..a00c01d3 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_fill.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_fill.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detail_yellow_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detail_yellow_Dither.png index 64f915bd..27043ba0 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detail_yellow_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detail_yellow_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_button_icon_completion_logo.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_button_icon_completion_logo.png index a0ce2b29..e587338a 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_button_icon_completion_logo.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_button_icon_completion_logo.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_off.png b/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_off.png index 32432d14..af7351d9 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_off.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_off.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_on.png b/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_on.png index 32f8c139..536f92ab 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_on.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_on.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index a6c23150..e280b07c 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -2213,6 +2213,119 @@ Transform: type: 3} m_PrefabInstance: {fileID: 715927680} m_PrefabAsset: {fileID: 0} +--- !u!1 &774451456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 774451457} + m_Layer: 0 + m_Name: switch + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &774451457 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774451456} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.03, y: -3.33, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 779475524} + - {fileID: 1564034575} + m_Father: {fileID: 1448897407} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &779475523 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 779475524} + - component: {fileID: 779475525} + m_Layer: 0 + m_Name: off + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &779475524 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 779475523} + 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: [] + m_Father: {fileID: 774451457} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &779475525 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 779475523} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -5 + m_Sprite: {fileID: 21300000, guid: e7f5fafa8b1613e49b2ac5da18124fc0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.58, y: 1.38} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &785034261 GameObject: m_ObjectHideFlags: 0 @@ -3471,6 +3584,7 @@ Transform: - {fileID: 1129457738} - {fileID: 162168170} - {fileID: 1295632043} + - {fileID: 774451457} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3624,6 +3738,106 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1508807685} m_PrefabAsset: {fileID: 0} +--- !u!1 &1564034574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1564034575} + - component: {fileID: 1564034576} + - component: {fileID: 1564034577} + m_Layer: 0 + m_Name: on + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1564034575 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1564034574} + 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: [] + m_Father: {fileID: 774451457} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1564034576 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1564034574} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -5 + m_Sprite: {fileID: 21300000, guid: c6d68ba53c0d4384daa747a5aec22e00, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.58, y: 1.38} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1564034577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1564034574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1442ead2048664015b98b24bfb5fbac1, type: 3} + m_Name: + m_EditorClassIdentifier: + seInfoArray: + - delay: 0 + time: 0 + interval: 0 + filename: se_cooking_switch + maxCount: 0 --- !u!1 &1585657223 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index ea643b82..6d2b2077 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -73,7 +73,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 120.00012, y: -58.500034} - m_SizeDelta: {x: 240, y: 112} + m_SizeDelta: {x: 240, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8166373738923674638 CanvasRenderer: @@ -326,11 +326,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -711,7 +711,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 94, y: -50} + m_AnchoredPosition: {x: 90, y: -50} m_SizeDelta: {x: 130, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915278008547943 @@ -1072,7 +1072,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 354} + m_AnchoredPosition: {x: 0, y: 358} m_SizeDelta: {x: 0, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4082915278280054938 @@ -1402,7 +1402,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 240, y: 112} + m_SizeDelta: {x: 240, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915278942985869 CanvasRenderer: @@ -1674,7 +1674,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 120.00012, y: -58.500034} - m_SizeDelta: {x: 240, y: 112} + m_SizeDelta: {x: 240, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915279019759809 CanvasRenderer: @@ -1912,11 +1912,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index cdc33d30..45542f96 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -414,8 +414,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -226.89996} - m_SizeDelta: {x: 196, y: 98} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823238410846 CanvasRenderer: @@ -621,7 +621,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 172.99995, y: -38.5} + m_AnchoredPosition: {x: 178.99995, y: -38.5} m_SizeDelta: {x: 180, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823370329762 @@ -653,11 +653,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -799,7 +799,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 304} + m_AnchoredPosition: {x: 0, y: 76} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2377818823724858331 @@ -837,7 +837,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 46, y: 32} + m_SizeDelta: {x: 64, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823724858326 CanvasRenderer: @@ -866,7 +866,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47b10191009972140a30c32a0e7fd9a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -988,7 +988,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 173, y: -38.5} + m_AnchoredPosition: {x: 179, y: -38.5} m_SizeDelta: {x: 180, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823802633422 @@ -1020,11 +1020,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1140,7 +1140,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 173, y: -38.5} + m_AnchoredPosition: {x: 179, y: -38.5} m_SizeDelta: {x: 180, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823929203718 @@ -1172,11 +1172,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1294,7 +1294,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -37.5} + m_AnchoredPosition: {x: 37, y: -37.5} m_SizeDelta: {x: 54, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818824019765599 @@ -1435,14 +1435,14 @@ RectTransform: m_GameObject: {fileID: 2377818824174324137} 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 2377818824244898183} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 131, y: -113} + m_AnchoredPosition: {x: 152, y: -113} m_SizeDelta: {x: 206, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818824174324132 @@ -1714,14 +1714,14 @@ RectTransform: m_GameObject: {fileID: 2377818824328388907} 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 2377818824244898183} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 96.29999, y: 78.00003} + m_AnchoredPosition: {x: 149, y: 78} m_SizeDelta: {x: 130, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818824328388902 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab index 294bccb9..95aa2b78 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab @@ -37,7 +37,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 192.6, y: 2.000026} - m_SizeDelta: {x: 210, y: 74} + m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074208586581398 CanvasRenderer: @@ -184,7 +184,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -37.5} + m_AnchoredPosition: {x: 36, y: -37.5} m_SizeDelta: {x: 54, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074208878078349 @@ -362,7 +362,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 140, y: 125.10004} - m_SizeDelta: {x: 240, y: 98} + m_SizeDelta: {x: 240, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074209150459481 CanvasRenderer: @@ -575,7 +575,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -38, y: 2.000026} - m_SizeDelta: {x: 210, y: 74} + m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074209173202452 CanvasRenderer: @@ -726,7 +726,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -159, y: 125.1} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 196, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074209291994454 CanvasRenderer: @@ -1009,8 +1009,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96.00003, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 130, y: -38.5} + m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074209543196489 CanvasRenderer: @@ -1041,11 +1041,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1402,7 +1402,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96.299995, y: -76.00004} + m_AnchoredPosition: {x: 90, y: -76.00004} m_SizeDelta: {x: 130, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074210099131600 @@ -1550,8 +1550,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 130, y: -38.5} + m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074210139745725 CanvasRenderer: @@ -1582,11 +1582,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index a57788b4..9e567d22 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -160,8 +160,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96.00003, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 128, y: -38.5} + m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754686580462761 CanvasRenderer: @@ -192,11 +192,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -238,7 +238,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96.299995, y: -76.00004} + m_AnchoredPosition: {x: 96.299995, y: -76} m_SizeDelta: {x: 130, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754686625492746 @@ -389,7 +389,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: 705, y: 794} + m_SizeDelta: {x: 720, y: 820} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9217531184726761281 MonoBehaviour: @@ -440,7 +440,7 @@ RectTransform: m_GameObject: {fileID: 4315754687099534942} 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_LocalScale: {x: 1.15, y: 1.15, z: 1.15} m_Children: - {fileID: 4315754688526726639} - {fileID: 3058138224988021536} @@ -450,7 +450,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 123} + m_AnchoredPosition: {x: 0, y: 117} m_SizeDelta: {x: 550, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4315754687099534941 @@ -525,7 +525,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 344} + m_AnchoredPosition: {x: 0, y: 95} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4315754687482315020 @@ -565,7 +565,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -38, y: 2.000026} - m_SizeDelta: {x: 210, y: 74} + m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687482315027 CanvasRenderer: @@ -638,7 +638,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -37.5} + m_AnchoredPosition: {x: 36, y: -37.5} m_SizeDelta: {x: 54, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687558309304 @@ -894,8 +894,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -226.89996} - m_SizeDelta: {x: 196, y: 98} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687626831808 CanvasRenderer: @@ -1107,8 +1107,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -125} - m_SizeDelta: {x: 648, y: 156} + m_AnchoredPosition: {x: 0, y: -154} + m_SizeDelta: {x: 668, y: 156} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687736309298 CanvasRenderer: @@ -1182,7 +1182,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: 705, y: 794} + m_SizeDelta: {x: 720, y: 820} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687931289287 CanvasRenderer: @@ -1255,8 +1255,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 128, y: -38.5} + m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688005591444 CanvasRenderer: @@ -1287,11 +1287,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1333,7 +1333,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: -79} + m_AnchoredPosition: {x: 0, y: -68} m_SizeDelta: {x: 416, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688123097775 @@ -1410,7 +1410,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 192.6, y: 2.000026} - m_SizeDelta: {x: 210, y: 74} + m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688138076305 CanvasRenderer: @@ -1652,7 +1652,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 46, y: 32} + m_SizeDelta: {x: 64, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688581755600 CanvasRenderer: @@ -1681,7 +1681,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47b10191009972140a30c32a0e7fd9a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2094,12 +2094,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} ---- !u!224 &3058138224889858367 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, - type: 3} - m_PrefabInstance: {fileID: 4315754688263163599} - m_PrefabAsset: {fileID: 0} --- !u!114 &1755114094215964333 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2576005101485369442, guid: 7c3046c0280714d4bb45d41bcbb71ce1, @@ -2112,6 +2106,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &3058138224889858367 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + m_PrefabInstance: {fileID: 4315754688263163599} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4315754688290612432 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab index 7ab581de..c998ec70 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 40ed79e6ffdfa424fbf23ffa60973bb2, type: 3} + m_Sprite: {fileID: 21300000, guid: ee73db39cff93334a92789ac47e0e509, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab index 3061052a..fe6b5c67 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab @@ -1210,7 +1210,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 40ed79e6ffdfa424fbf23ffa60973bb2, type: 3} + m_Sprite: {fileID: 21300000, guid: ee73db39cff93334a92789ac47e0e509, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1